Merge branch 'develop' into lint

.github/workflows/cypress.yaml

@@ -14,6 +14,10 @@ jobs:
     permissions: write-all
     if: github.repository == 'coronasafe/care_fe'
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        containers: [1,2,3,4,5,6,7,8]
     steps:
       - name: Checkout 📥
         uses: actions/checkout@v3
@@ -24,14 +28,22 @@ jobs:
           repository: coronasafe/care
           path: care
 
-      - name: Run docker compose up on care 🐳
+      - name: Start care docker containers 🐳
         run: |
-          cd care  
+          cd care
           make docker_config_file=docker-compose.pre-built.yaml up 
-          sleep 60s
+          while docker compose exec backend bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
+            >&2 echo "Migrations are not yet applied - sleeping"
+            sleep 5
+          done
+          echo "Migrations are applied"
+          cd ..
+
+      - name: Load dummy data into care backend 📂
+        run: |
+          cd care
           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
@@ -52,39 +64,14 @@ jobs:
           wait-on-timeout: 300
           browser: chrome
           record: true
+          parallel: true
         env:
           CARE_API: http://localhost:9000
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_OPTIONS: --max_old_space_size=4096
-
-      - name: Remove cypress passed label on failure 🏷️
-        uses: actions-ecosystem/action-remove-labels@v1
-        if: failure()
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          labels: cypress passed
-
-      - name: Add cypress passed label on success 🏷️
-        uses: actions-ecosystem/action-add-labels@v1
-        if: success()
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          labels: cypress passed
-
-      - name: Remove cypress failed label on success 🏷️
-        uses: actions-ecosystem/action-remove-labels@v1
-        if: success()
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          labels: cypress failed
-
-      - name: Add cypress failed label on failure 🏷️
-        uses: actions-ecosystem/action-add-labels@v1
-        if: failure()
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          labels: cypress failed
+          COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
+          COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
 
       - name: Upload cypress screenshots on failure 📸
         uses: actions/upload-artifact@v3
@@ -93,10 +80,3 @@ jobs:
           name: cypress-screenshots
           path: cypress/screenshots
 
-      # Test run video was always captured, so this action uses "always()" condition
-      - name: Upload cypress videos 📹
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: cypress-videos
-          path: cypress/videos

cypress.config.ts

@@ -19,7 +19,6 @@ export default defineConfig({
           return null;
         },
       });
-
       return config;
     },
     baseUrl: "http://localhost:4000",

cypress/e2e/assets_spec/asset_homepage.cy.ts

@@ -5,6 +5,7 @@ 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 { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { v4 as uuidv4 } from "uuid";
 
@@ -13,6 +14,7 @@ describe("Asset Tab", () => {
   const assetQRScanPage = new AssetQRScanPage();
   const assetPagination = new AssetPagination();
   const assetFilters = new AssetFilters();
+  const assetPage = new AssetPage();
   const loginPage = new LoginPage();
   const assetName = "Dummy Camera 10";
   const qrCode = uuidv4();
@@ -62,8 +64,18 @@ describe("Asset Tab", () => {
       "Dummy Facility 1",
       "INTERNAL",
       "ACTIVE",
-      "ONVIF Camera"
+      "ONVIF Camera",
+      "Camera Loc"
     );
+    assetFilters.clickadvancefilter();
+    assetFilters.clickslideoverbackbutton(); // to verify the back button doesn't clear applied filters
+    assetFilters.assertFacilityText("Dummy Facility 1");
+    assetFilters.assertAssetTypeText("INTERNAL");
+    assetFilters.assertAssetClassText("ONVIF");
+    assetFilters.assertStatusText("ACTIVE");
+    assetFilters.assertLocationText("Camera Loc");
+    assetFilters.clickadvancefilter();
+    assetFilters.clearFilters();
   });
 
   // Verify the pagination in the page
@@ -73,6 +85,28 @@ describe("Asset Tab", () => {
     assetPagination.navigateToPreviousPage();
   });
 
+  it("Import new asset", () => {
+    assetPage.selectassetimportbutton();
+    assetPage.selectImportOption();
+    assetPage.selectImportFacility("Dummy Facility 1");
+    assetPage.importAssetFile();
+    assetPage.selectImportLocation("Camera Locations");
+    assetPage.clickImportAsset();
+  });
+
+  it("verify imported asset", () => {
+    assetSearchPage.typeSearchKeyword("New Test Asset");
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyAssetIsPresent("New Test Asset");
+  });
+
+  it("Export asset", () => {
+    assetPage.selectassetimportbutton();
+    assetPage.selectjsonexportbutton();
+    assetPage.selectassetimportbutton();
+    assetPage.selectcsvexportbutton();
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });

cypress/e2e/assets_spec/assets_creation.cy.ts

@@ -0,0 +1,178 @@
+/// <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";
+import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
+
+describe("Asset", () => {
+  const assetPage = new AssetPage();
+  const assetSearchPage = new AssetSearchPage();
+  const loginPage = new LoginPage();
+  const phone_number = "9999999999";
+  const serialNumber = Math.floor(Math.random() * 10 ** 10).toString();
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.awaitUrl("/assets");
+  });
+
+  it("Verify asset creation fields throws error if empty", () => {
+    assetPage.createAsset();
+    assetPage.selectFacility("Dummy Facility 1");
+    assetPage.clickCreateAsset();
+
+    assetPage.verifyEmptyAssetNameError();
+    assetPage.verifyEmptyAssetTypeError();
+    assetPage.verifyEmptyLocationError();
+    assetPage.verifyEmptyStatusError();
+    assetPage.verifyEmptyPhoneError();
+  });
+
+  //Create an asset
+
+  it("Create an Asset", () => {
+    assetPage.createAsset();
+    assetPage.selectFacility("Dummy Facility 1");
+    assetPage.selectLocation("Camera Loc");
+    assetPage.selectAssetType("Internal");
+    assetPage.selectAssetClass("ONVIF Camera");
+
+    const qr_id_1 = uuidv4();
+
+    assetPage.enterAssetDetails(
+      "New Test Asset 1",
+      "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.clickCreateAddMore();
+    assetPage.verifySuccessNotification("Asset created successfully");
+
+    const qr_id_2 = uuidv4();
+
+    assetPage.selectLocation("Camera Loc");
+    assetPage.selectAssetType("Internal");
+    assetPage.selectAssetClass("ONVIF Camera");
+    assetPage.enterAssetDetails(
+      "New Test Asset 2",
+      "Test Description",
+      "Working",
+      qr_id_2,
+      "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();
+    assetPage.verifySuccessNotification("Asset created successfully");
+
+    assetSearchPage.typeSearchKeyword("New Test Asset 2");
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyAssetIsPresent("New Test Asset 2");
+  });
+
+  it("Edit an Asset", () => {
+    assetPage.openCreatedAsset();
+
+    const qr_id = uuidv4();
+
+    assetPage.editAssetDetails(
+      "New Test Asset Edited",
+      "Test Description Edited",
+      qr_id,
+      "Manufacturer's Name Edited",
+      "Customer Support's Name Edited",
+      "Vendor's Name Edited",
+      "Test note for asset creation edited!",
+      "25122021"
+    );
+
+    assetPage.clickUpdateAsset();
+
+    assetPage.verifySuccessNotification("Asset updated successfully");
+  });
+
+  it("Verify Editted Asset", () => {
+    assetSearchPage.typeSearchKeyword("New Test Asset Edited");
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyAssetIsPresent("New Test Asset Edited");
+  });
+
+  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();
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});