Merge branch 'develop' into fix#7046

.eslintrc.json

@@ -16,7 +16,8 @@
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:i18next/recommended",
-    "plugin:tailwindcss/recommended"
+    "plugin:tailwindcss/recommended",
+    "plugin:storybook/recommended"
   ],
   "overrides": [
     {
@@ -31,7 +32,7 @@
         "react/jsx-no-target-blank": "off",
         "i18next/no-literal-string": "off"
       }
-    }    
+    }
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
@@ -42,11 +43,14 @@
     "sourceType": "module"
   },
   "plugins": [
-    "@typescript-eslint", 
+    "@typescript-eslint",
     "i18next"
   ],
   "rules": {
-    "quotes": ["error", "double"],
+    "quotes": [
+      "error",
+      "double"
+    ],
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": [
       "error",
@@ -62,21 +66,29 @@
       {
         "mode": "jsx-only",
         "jsx-attributes": {
-          "include": ["label", "placeholder", "error", "title"],
-          "exclude": [".*"]
+          "include": [
+            "label",
+            "placeholder",
+            "error",
+            "title"
+          ],
+          "exclude": [
+            ".*"
+          ]
         },
         "callees": {
-          "exclude": [".*"]
+          "exclude": [
+            ".*"
+          ]
         }
       }
     ],
     "tailwindcss/no-custom-classname": "off",
     "tailwindcss/migration-from-tailwind-2": "error",
     "tailwindcss/classnames-order": "error",
-    "tailwindcss/enforces-shorthand": "error",
+    "tailwindcss/enforces-shorthand": "off",
     "tailwindcss/no-contradicting-classname": "error"
   },
-
   "ignorePatterns": [
     "dist",
     "public",

.storybook/main.ts

@@ -8,19 +8,15 @@ const config: StorybookConfig = {
   ],
   framework: {
     name: "@storybook/react-vite",
-    options: {},
+    options: {
+      builder: {
+        viteConfigPath: "./.storybook/vite.config.mts",
+      },
+    },
   },
   docs: {
     autodocs: "tag",
   },
   staticDirs: ["../public"],
-  core: {
-    builder: {
-      name: "@storybook/builder-vite",
-      options: {
-        viteConfigPath: "./.storybook/vite.config.ts",
-      },
-    },
-  },
 };
 export default config;

cypress/e2e/facility_spec/locations.cy.ts

@@ -5,6 +5,7 @@ import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import FacilityLocation from "../../pageobject/Facility/FacilityLocation";
 import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
+import { v4 as uuidv4 } from "uuid";
 
 describe("Location Management Section", () => {
   const assetPage = new AssetPage();
@@ -40,6 +41,9 @@ describe("Location Management Section", () => {
   const bedModifiedType = "Isolation";
   const numberOfBeds = 10;
   const numberOfModifiedBeds = 25;
+  const qr_id_1 = uuidv4();
+  const phone_number = "9999999999";
+  const serialNumber = Math.floor(Math.random() * 10 ** 10).toString();
 
   before(() => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");
@@ -51,9 +55,7 @@ describe("Location Management Section", () => {
     cy.restoreLocalStorage();
     cy.clearLocalStorage(/filters--.+/);
     cy.awaitUrl("/");
-    facilityPage.visitAlreadyCreatedFacility();
-    facilityPage.clickManageFacilityDropdown();
-    facilityLocation.clickFacilityLocationManagement();
+    facilityLocation.loadLocationManagementPage("Dummy Shifting Center");
   });
 
   it("Add a Bed to facility location along with duplication and deleting a bed", () => {
@@ -103,6 +105,7 @@ describe("Location Management Section", () => {
     facilityLocation.verifyBedNameBadge(bedModifiedName);
     facilityLocation.verifyBedBadge(bedModifiedType);
     facilityLocation.verifyBedBadge(bedStatus);
+    facilityLocation.closeNotification();
   });
 
   it("Adds Location to a facility and modify it", () => {
@@ -134,6 +137,7 @@ describe("Location Management Section", () => {
     facilityLocation.verifyLocationType(locationModifiedType);
     facilityLocation.verifyLocationDescription(locationModifiedDescription);
     facilityLocation.verifyLocationMiddleware(locationModifiedMiddleware);
+    facilityLocation.closeNotification();
   });
 
   it("Multiple Bed to a facility location and delete a bed", () => {
@@ -155,6 +159,7 @@ describe("Location Management Section", () => {
     facilityLocation.deleteBedRequest();
     assetPage.clickassetupdatebutton();
     facilityLocation.deleteBedRequest();
+    facilityLocation.closeNotification();
   });
 
   it("Add Multiple Bed to a facility location and verify pagination", () => {
@@ -169,6 +174,106 @@ describe("Location Management Section", () => {
     // pagination
     assetPagination.navigateToNextPage();
     assetPagination.navigateToPreviousPage();
+    facilityLocation.closeNotification();
+  });
+
+  it("Delete location", () => {
+    facilityLocation.clickAddNewLocationButton();
+    facilityLocation.enterLocationName("Test Location");
+    facilityLocation.selectLocationType("OTHER");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.deleteLocation("Test Location");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.verifyNotification(
+      "Location Test Location deleted successfully"
+    );
+    facilityLocation.closeNotification();
+  });
+
+  it("Delete location with linked beds", () => {
+    facilityLocation.clickAddNewLocationButton();
+    facilityLocation.enterLocationName("Test Location with Beds");
+    facilityLocation.selectLocationType("OTHER");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.clickManageBedButton();
+    facilityLocation.clickAddBedButton();
+    facilityLocation.enterBedName("Bed 1");
+    facilityLocation.selectBedType("Regular");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.loadLocationManagementPage("Dummy Shifting Center");
+    facilityLocation.deleteLocation("Test Location with Beds");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.verifyNotification(
+      "Cannot delete a Location with associated Beds"
+    );
+    facilityLocation.closeNotification();
+
+    // delete bed
+    facilityLocation.clickManageBeds();
+    facilityLocation.deleteFirstBed();
+    assetPage.clickassetupdatebutton();
+    facilityLocation.closeNotification();
+
+    // delete location
+    facilityLocation.loadLocationManagementPage("Dummy Shifting Center");
+    facilityLocation.deleteLocation("Test Location with Beds");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.verifyNotification(
+      "Location Test Location with Beds deleted successfully"
+    );
+    facilityLocation.closeNotification();
+  });
+
+  it("Delete location with linked assets", () => {
+    facilityLocation.clickAddNewLocationButton();
+    facilityLocation.enterLocationName("Test Location with linked Assets");
+    facilityLocation.selectLocationType("OTHER");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.verifyNotification("Location created successfully");
+    facilityLocation.closeNotification();
+    // create asset and link it to location
+    cy.awaitUrl("/assets");
+    assetPage.createAsset();
+    assetPage.selectFacility("Dummy Shifting Center");
+    assetPage.selectLocation("Test Location with linked Assets");
+    assetPage.enterAssetDetails(
+      "Test Asset linked to Facility",
+      "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.clickassetupdatebutton();
+    facilityLocation.loadLocationManagementPage("Dummy Shifting Center");
+    facilityLocation.deleteLocation("Test Location with linked Assets");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.verifyNotification(
+      "Cannot delete a Location with associated Assets"
+    );
+    facilityLocation.closeNotification();
+
+    // delete asset
+    facilityLocation.clickManageAssets();
+    assetPage.openCreatedAsset();
+    assetPage.deleteAsset();
+    facilityLocation.closeNotification();
+
+    // delete location
+    facilityLocation.loadLocationManagementPage("Dummy Shifting Center");
+    facilityLocation.deleteLocation("Test Location with linked Assets");
+    assetPage.clickassetupdatebutton();
+    facilityLocation.verifyNotification(
+      "Location Test Location with linked Assets deleted successfully"
+    );
+    facilityLocation.closeNotification();
   });
 
   afterEach(() => {

cypress/pageobject/Facility/FacilityLocation.ts

@@ -1,4 +1,23 @@
 class FacilityLocation {
+  loadLocationManagementPage(name: string) {
+    cy.awaitUrl("/");
+    cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
+    cy.get("[id='facility-name-card']").contains(name).click();
+    cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
+    cy.get("h1.text-3xl.font-bold", { timeout: 10000 }).should("be.visible");
+    cy.get("#manage-facility-dropdown button").should("be.visible");
+    cy.get("[id='manage-facility-dropdown']").scrollIntoView().click();
+    cy.get("[id=location-management]").click();
+  }
+
+  closeNotification() {
+    cy.get(".pnotify")
+      .should("exist")
+      .each(($div) => {
+        cy.wrap($div).click();
+      });
+  }
+
   clickAddNewLocationButton() {
     cy.get("#add-new-location").click();
   }
@@ -19,6 +38,14 @@ class FacilityLocation {
     cy.get("#description").clear().click().type(description);
   }
 
+  clickText(name: string) {
+    cy.get("div").contains(name).click();
+  }
+
+  enterLocationName(name: string) {
+    cy.get("input[id=name]").type(name);
+  }
+
   selectLocationType(type: string) {
     cy.get("#location-type").click();
     cy.get("li[role=option]").contains(type).click();
@@ -101,6 +128,22 @@ class FacilityLocation {
     }
   }
 
+  clickManageBeds() {
+    cy.get("#manage-beds").click();
+  }
+
+  clickManageAssets() {
+    cy.get("#manage-assets").click();
+  }
+
+  deleteLocation(name: string) {
+    cy.contains("div", name)
+      .should("exist")
+      .then(($div) => {
+        $div.parents("div").eq(2).find("button#delete-location-button").click();
+      });
+  }
+
   deleteFirstBed() {
     cy.get("#delete-bed-button").first().click();
   }