Merge pull request #6334 from coronasafe/develop

Production Release; Spetember Week 4

cypress/e2e/assets_spec/asset_homepage.cy.ts

@@ -104,6 +104,7 @@ describe("Asset Tab", () => {
   it("Export asset", () => {
     assetPage.selectassetimportbutton();
     assetPage.selectjsonexportbutton();
+    assetPage.selectassetimportbutton();
     assetPage.selectcsvexportbutton();
   });
 

cypress/e2e/assets_spec/assets_manage.cy.ts

@@ -1,10 +1,17 @@
 import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
+import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
 
 describe("Asset", () => {
   const assetPage = new AssetPage();
   const loginPage = new LoginPage();
+  const facilityPage = new FacilityPage();
+  const assetSearchPage = new AssetSearchPage();
+  const assetFilters = new AssetFilters();
+  const fillFacilityName = "Dummy Facility 1";
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -23,6 +30,23 @@ describe("Asset", () => {
     assetPage.verifyDeleteStatus();
   });
 
+  it("Verify Facility Asset Page Redirection", () => {
+    cy.visit("/facility");
+    assetSearchPage.typeSearchKeyword(fillFacilityName);
+    assetSearchPage.pressEnter();
+    facilityPage.verifyFacilityBadgeContent(fillFacilityName);
+    facilityPage.visitAlreadyCreatedFacility();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickCreateAssetFacilityOption();
+    facilityPage.verifyfacilitycreateassetredirection();
+    facilityPage.verifyassetfacilitybackredirection();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickviewAssetFacilityOption();
+    facilityPage.verifyfacilityviewassetredirection();
+    assetFilters.assertFacilityText(fillFacilityName);
+    facilityPage.verifyassetfacilitybackredirection();
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });

cypress/pageobject/Facility/FacilityCreation.ts

@@ -120,6 +120,14 @@ class FacilityPage {
     cy.get("#configure-facility").contains("Configure Facility").click();
   }
 
+  clickCreateAssetFacilityOption() {
+    cy.get("#create-assets").contains("Create Asset").click();
+  }
+
+  clickviewAssetFacilityOption() {
+    cy.get("#view-assets").contains("View Assets").click();
+  }
+
   clickInventoryManagementOption() {
     cy.get("#inventory-management", { timeout: 10000 }).should("be.visible");
     cy.get("#inventory-management").click();
@@ -175,6 +183,33 @@ class FacilityPage {
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
   }
 
+  verifyFacilityBadgeContent(expectedText: string) {
+    cy.get("[data-testid='Facility/District Name']").should(
+      "contain",
+      expectedText
+    );
+  }
+
+  verifyfacilitycreateassetredirection() {
+    cy.intercept("GET", "**/api/v1/facility/**").as("getNewAssets");
+    cy.url().should("include", "/assets/new");
+    cy.wait("@getNewAssets").its("response.statusCode").should("eq", 200);
+  }
+
+  verifyassetfacilitybackredirection() {
+    cy.intercept("GET", "**/api/v1/facility/**").as("getManagePage");
+    cy.go("back");
+    cy.wait("@getManagePage").its("response.statusCode").should("eq", 200);
+    cy.get("#manage-facility-dropdown").scrollIntoView();
+    cy.get("#manage-facility-dropdown").should("exist");
+  }
+
+  verifyfacilityviewassetredirection() {
+    cy.intercept("GET", "**api/v1/getallfacilities/**").as("getViewAssets");
+    cy.url().should("include", "/assets?facility=");
+    cy.wait("@getViewAssets").its("response.statusCode").should("eq", 200);
+  }
+
   clickManageInventory() {
     cy.contains("Manage Inventory").click();
   }

package.json

@@ -72,7 +72,6 @@
     "events": "^3.3.0",
     "i18next": "^23.2.7",
     "i18next-browser-languagedetector": "^7.1.0",
-    "libphonenumber-js": "^1.10.37",
     "lodash": "^4.17.21",
     "postcss-loader": "^7.3.3",
     "qrcode.react": "^3.1.0",
@@ -90,7 +89,6 @@
     "react-player": "^2.12.0",
     "react-qr-reader": "^2.2.1",
     "react-redux": "^8.1.1",
-    "react-swipeable-views": "^0.14.0",
     "react-transition-group": "^4.4.5",
     "react-webcam": "^7.1.1",
     "read-excel-file": "^5.6.1",
@@ -126,7 +124,6 @@
     "@types/react-dom": "^18.2.6",
     "@types/react-google-recaptcha": "^2.1.5",
     "@types/react-qr-reader": "^2.1.4",
-    "@types/react-swipeable-views": "^0.13.2",
     "@types/react-transition-group": "^4.4.6",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.61.0",