Merge branch 'develop' into cypress-parallel

.env

@@ -1,11 +1,10 @@
 # Whitelabelling envs
 
-REACT_APP_TITLE="CARE"
-REACT_APP_META_DESCRIPTION="CoronaSafe Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. CoronaSafe Care is a Digital Public Good recognised by United Nations."
+REACT_APP_TITLE=CARE
+REACT_APP_META_DESCRIPTION=CoronaSafe Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. CoronaSafe Care is a Digital Public Good recognised by United Nations.
 REACT_APP_COVER_IMAGE=https://cdn.coronasafe.network/care_logo.svg
 REACT_APP_COVER_IMAGE_ALT=https://cdn.coronasafe.network/care_logo.svg
-REACT_APP_CONFIG=""
-REACT_PUBLIC_URL="https://care.coronasafe.in"
+REACT_PUBLIC_URL=https://care.coronasafe.in
 
 # Dev envs
 ESLINT_NO_DEV_ERRORS=true

.github/workflows/cypress.yaml

@@ -29,12 +29,13 @@ jobs:
           path: care
 
       - name: Run docker compose up on care 🐳
-        run: cd care && touch .env && make docker_config_file=docker-compose.pre-built.yaml up && cd .. && sleep 60s
-        # Voluntarily kept 60 seconds delay to wait for migrations to complete.
-
-      - name: Run Django collectstatic and load dummy data on care 🐍
         run: |
-          docker exec care python manage.py load_dummy_data
+          cd care  
+          make docker_config_file=docker-compose.pre-built.yaml up 
+          sleep 60s
+          docker compose exec backend bash -c "python manage.py load_dummy_data"
+          cd ..
+        # Voluntarily kept 60 seconds delay to wait for migrations to complete.
 
       - name: Check care is up ♻
         run: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000

.gitignore

@@ -54,6 +54,7 @@ public/build-meta.json
 # Using NPM
 yarn.lock
 pnpm-lock.yaml
+bun.lockb
 
 # Cypress
 cypress/downloads

cypress/e2e/assets_spec/asset_tab.cy.ts → cypress/e2e/assets_spec/asset_homepage.cy.ts

@@ -5,15 +5,21 @@ import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
 import { AssetQRScanPage } from "../../pageobject/Asset/AssetQRScan";
 import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
 import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
+import LoginPage from "../../pageobject/Login/LoginPage";
+import { v4 as uuidv4 } from "uuid";
 
 describe("Asset Tab", () => {
   const assetSearchPage = new AssetSearchPage();
   const assetQRScanPage = new AssetQRScanPage();
   const assetPagination = new AssetPagination();
   const assetFilters = new AssetFilters();
+  const loginPage = new LoginPage();
+  const assetName = "Dummy Camera 10";
+  const qrCode = uuidv4();
+  const serialNumber = Math.floor(Math.random() * 10 ** 10).toString();
 
   before(() => {
-    cy.loginByApi("devdistrictadmin", "Coronasafe@123");
+    loginPage.loginAsDisctrictAdmin();
     cy.saveLocalStorage();
   });
 
@@ -24,11 +30,23 @@ describe("Asset Tab", () => {
 
   // search for a element
 
-  it("Search Asset Name", () => {
-    const initialUrl = cy.url();
-    assetSearchPage.typeSearchKeyword("dummy camera 30");
+  it("Search Asset Name/QR_ID/Serial_number", () => {
+    assetSearchPage.typeSearchKeyword(assetName);
     assetSearchPage.pressEnter();
-    assetSearchPage.verifyUrlChanged(initialUrl);
+    assetSearchPage.verifyBadgeContent(assetName);
+    assetSearchPage.clickAssetByName(assetName);
+    assetSearchPage.clickUpdateButton();
+    assetSearchPage.clearAndTypeQRCode(qrCode);
+    assetSearchPage.clearAndTypeSerialNumber(serialNumber);
+    assetSearchPage.clickAssetSubmitButton();
+    assetSearchPage.visitAssetsPage();
+    assetSearchPage.typeSearchKeyword(qrCode);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyAssetListContains(assetName);
+    assetSearchPage.verifyBadgeContent(qrCode);
+    assetSearchPage.typeSearchKeyword(serialNumber);
+    assetSearchPage.verifyAssetListContains(assetName);
+    assetSearchPage.verifyBadgeContent(serialNumber);
   });
 
   // scan a asset qr code

cypress/e2e/assets_spec/assets_manage.cy.ts

@@ -1,4 +1,5 @@
 /// <reference types="cypress" />
+import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import { v4 as uuidv4 } from "uuid";
 import LoginPage from "../../pageobject/Login/LoginPage";
@@ -84,7 +85,9 @@ describe("Asset", () => {
       "Test note for asset creation!"
     );
 
+    assetPage.interceptAssetCreation();
     assetPage.clickCreateAsset();
+    assetPage.verifyAssetCreation();
     assetPage.verifySuccessNotification("Asset created successfully");
 
     assetSearchPage.typeSearchKeyword("New Test Asset 2");
@@ -104,19 +107,80 @@ describe("Asset", () => {
       "Manufacturer's Name Edited",
       "Customer Support's Name Edited",
       "Vendor's Name Edited",
-      "Test note for asset creation edited!"
+      "Test note for asset creation edited!",
+      "25122021"
     );
 
     assetPage.clickUpdateAsset();
 
     assetPage.verifySuccessNotification("Asset updated successfully");
   });
 
+  it("Configure an asset", () => {
+    assetPage.openCreatedAsset();
+    assetPage.spyAssetConfigureApi();
+    assetPage.configureAsset(
+      "Host name",
+      "192.168.1.64",
+      "remote_user",
+      "2jCkrCRSeahzKEU",
+      "d5694af2-21e2-4a39-9bad-2fb98d9818bd"
+    );
+    assetPage.clickConfigureAsset();
+    assetPage.verifyAssetConfiguration(200);
+  });
+
+  it("Add an vital monitor asset and configure it", () => {
+    assetPage.createAsset();
+    assetPage.selectFacility("Dummy Facility 1");
+    assetPage.selectLocation("Camera Loc");
+    assetPage.selectAssetType("Internal");
+    assetPage.selectAssetClass("HL7 Vitals Monitor");
+
+    const qr_id_1 = uuidv4();
+
+    assetPage.enterAssetDetails(
+      "New Test Asset Vital",
+      "Test Description",
+      "Working",
+      qr_id_1,
+      "Manufacturer's Name",
+      "2025-12-25",
+      "Customer Support's Name",
+      phone_number,
+      "[email protected]",
+      "Vendor's Name",
+      serialNumber,
+      "25122021",
+      "Test note for asset creation!"
+    );
+    assetPage.interceptAssetCreation();
+    assetPage.clickCreateAsset();
+    assetPage.verifyAssetCreation();
+
+    assetSearchPage.typeSearchKeyword("New Test Asset Vital");
+    assetSearchPage.pressEnter();
+
+    assetPage.openCreatedAsset();
+    assetPage.configureVitalAsset("Host name", "192.168.1.64");
+    assetPage.clickConfigureVital();
+  });
+
   it("Delete an Asset", () => {
     assetPage.openCreatedAsset();
+    assetPage.interceptDeleteAssetApi();
     assetPage.deleteAsset();
+    assetPage.verifyDeleteStatus();
+  });
+
+  it("Import new asset", () => {
+    assetPage.selectImportOption();
+    assetPage.selectImportFacility("Dummy Facility 1");
+    assetPage.importAssetFile();
+    assetPage.selectImportLocation("Camera Locations");
+    assetPage.clickImportAsset();
 
-    assetPage.verifySuccessNotification("Asset deleted successfully");
+    assetPage.verifySuccessNotification("Assets imported successfully");
   });
 
   afterEach(() => {

cypress/e2e/facility_spec/facility.cy.ts

@@ -1,12 +1,16 @@
 // FacilityCreation
+import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import LoginPage from "../../pageobject/Login/LoginPage";
 
 describe("Facility Creation", () => {
   let facilityUrl: string;
   const facilityPage = new FacilityPage();
+  const loginPage = new LoginPage();
+  const phone_number = "9999999999";
 
   before(() => {
-    cy.loginByApi("devdistrictadmin", "Coronasafe@123");
+    loginPage.loginAsDisctrictAdmin();
     cy.saveLocalStorage();
   });
 
@@ -51,6 +55,7 @@ describe("Facility Creation", () => {
     facilityPage.visitUpdateFacilityPage(facilityUrl);
     facilityPage.clickManageFacilityDropdown();
     facilityPage.clickUpdateFacilityOption();
+    facilityPage.clickUpdateFacilityType();
     facilityPage.fillFacilityName("cypress facility updated");
     facilityPage.fillAddress("Cypress Facility Updated Address");
     facilityPage.fillOxygenCapacity("100");
@@ -61,6 +66,40 @@ describe("Facility Creation", () => {
     cy.url().should("not.include", "/update");
   });
 
+  it("Configure the existing facility", () => {
+    facilityPage.visitUpdateFacilityPage(facilityUrl);
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickConfigureFacilityOption();
+    facilityPage.fillMiddleWareAddress("dev_middleware.coronasafe.live");
+    facilityPage.clickupdateMiddleWare();
+    facilityPage.verifySuccessNotification("Facility updated successfully");
+  });
+
+  it("Create a resource request", () => {
+    facilityPage.visitUpdateFacilityPage(facilityUrl);
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickResourceRequestOption();
+    facilityPage.fillResourceRequestDetails(
+      "Test User",
+      phone_number,
+      "cypress",
+      "Test title",
+      "10",
+      "Test description"
+    );
+    facilityPage.clickSubmitRequestButton();
+    facilityPage.verifySuccessNotification(
+      "Resource request created successfully"
+    );
+  });
+
+  it("Delete a facility", () => {
+    facilityPage.visitUpdateFacilityPage(facilityUrl);
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickDeleteFacilityOption();
+    facilityPage.confirmDeleteFacility();
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });

cypress/e2e/facility_spec/inventory.cy.ts

@@ -1,32 +1,30 @@
 import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import LoginPage from "../../pageobject/Login/LoginPage";
 
 describe("Inventory Management Section", () => {
+  const facilityPage = new FacilityPage();
+  const loginPage = new LoginPage();
+
   before(() => {
-    cy.loginByApi("devdistrictadmin", "Coronasafe@123");
+    loginPage.loginAsDisctrictAdmin();
     cy.saveLocalStorage();
   });
 
   beforeEach(() => {
     cy.restoreLocalStorage();
     cy.awaitUrl("/");
     cy.viewport(1280, 720);
-    cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
-    cy.get("[id='facility-details']").first().click();
-    cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
-    cy.get("#manage-facility-dropdown button").should("be.visible");
-    cy.get("[id='manage-facility-dropdown']").scrollIntoView().click();
-    cy.get("[id=inventory-management]").click();
   });
 
   it("Adds Inventory", () => {
-    cy.contains("Manage Inventory").click();
-    cy.get("div#id").click();
-    cy.get("div#id ul li").contains("Liquid Oxygen").click();
-    cy.get("div#isIncoming").click();
-    cy.get("div#isIncoming ul li").contains("Add Stock").click();
-    cy.get("[name='quantity']").type("120");
-    cy.get("button").contains("Add/Update Inventory").click();
-    cy.verifyNotification("Inventory created successfully");
+    facilityPage.visitAlreadyCreatedFacility();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickInventoryManagementOption();
+    facilityPage.clickManageInventory();
+    facilityPage.fillInventoryDetails("Liquid Oxygen", "Add Stock", "120");
+    facilityPage.clickAddInventory();
+    facilityPage.verifySuccessNotification("Inventory created successfully");
   });
 
   afterEach(() => {