From 89d91ec0925981ca9c535001f49133ed3f7ee5a2 Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Wed, 20 Sep 2023 02:34:13 +0530
Subject: [PATCH 1/2] Asset page redirection

---
 cypress/e2e/assets_spec/assets_manage.cy.ts   | 24 +++++++++++++
 .../pageobject/Facility/FacilityCreation.ts   | 35 +++++++++++++++++++
 src/Components/Facility/FacilityHome.tsx      |  3 ++
 3 files changed, 62 insertions(+)

diff --git a/cypress/e2e/assets_spec/assets_manage.cy.ts b/cypress/e2e/assets_spec/assets_manage.cy.ts
index f27fd302a0c..1f89facd0a3 100644
--- a/cypress/e2e/assets_spec/assets_manage.cy.ts
+++ b/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();
   });
diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
index ef4e65781e0..0c12d4655fd 100644
--- a/cypress/pageobject/Facility/FacilityCreation.ts
+++ b/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();
   }
diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index 81e7fa4906f..15317b1b56c 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -575,6 +575,7 @@ export const FacilityHome = (props: any) => {
                   Resource Request
                 </DropdownItem>
                 <DropdownItem
+                  id="create-assets"
                   onClick={() => navigate(`/facility/${facilityId}/assets/new`)}
                   authorizeFor={NonReadOnlyUsers}
                   icon={<CareIcon className="care-l-plus-circle text-lg" />}
@@ -582,12 +583,14 @@ export const FacilityHome = (props: any) => {
                   Create Asset
                 </DropdownItem>
                 <DropdownItem
+                  id="view-assets"
                   onClick={() => navigate(`/assets?facility=${facilityId}`)}
                   icon={<CareIcon className="care-l-medkit text-lg" />}
                 >
                   View Assets
                 </DropdownItem>
                 <DropdownItem
+                  id="view-users"
                   onClick={() => navigate(`/facility/${facilityId}/users`)}
                   icon={<CareIcon className="care-l-users-alt text-lg" />}
                 >

From 7f55921ae0d63f6aa4644fd06d586ee494fb8cd0 Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Tue, 26 Sep 2023 14:46:22 +0530
Subject: [PATCH 2/2] Test for asset transaction and service history

---
 cypress/e2e/assets_spec/assets_manage.cy.ts   | 47 ++++++++++--
 cypress/pageobject/Asset/AssetCreation.ts     | 74 +++++++++++++++++++
 .../pageobject/Facility/FacilityCreation.ts   |  2 -
 src/Components/Assets/AssetManage.tsx         | 17 ++++-
 .../Assets/AssetServiceEditModal.tsx          | 15 +++-
 .../Form/FormFields/Autocomplete.tsx          |  2 +-
 6 files changed, 143 insertions(+), 14 deletions(-)

diff --git a/cypress/e2e/assets_spec/assets_manage.cy.ts b/cypress/e2e/assets_spec/assets_manage.cy.ts
index 1f89facd0a3..4748de92beb 100644
--- a/cypress/e2e/assets_spec/assets_manage.cy.ts
+++ b/cypress/e2e/assets_spec/assets_manage.cy.ts
@@ -12,6 +12,9 @@ describe("Asset", () => {
   const assetSearchPage = new AssetSearchPage();
   const assetFilters = new AssetFilters();
   const fillFacilityName = "Dummy Facility 1";
+  const assetname = "Dummy Camera";
+  const locationName = "Dummy Location 1";
+  const initiallocationName = "Camera Location";
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -23,11 +26,38 @@ describe("Asset", () => {
     cy.awaitUrl("/assets");
   });
 
-  it("Delete an Asset", () => {
-    assetPage.openCreatedAsset();
-    assetPage.interceptDeleteAssetApi();
-    assetPage.deleteAsset();
-    assetPage.verifyDeleteStatus();
+  it("Create & Edit a service history and verify reflection", () => {
+    assetSearchPage.typeSearchKeyword(assetname);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyBadgeContent(assetname);
+    assetSearchPage.clickAssetByName(assetname);
+    assetPage.clickupdatedetailbutton();
+    assetPage.scrollintonotes();
+    assetPage.enterAssetNotes("Dummy Notes");
+    assetPage.enterAssetservicedate("01092023");
+    assetPage.clickassetupdatebutton();
+    assetPage.scrollintoservicehistory();
+    assetPage.clickedithistorybutton();
+    assetPage.scrollintonotes();
+    assetPage.enterAssetNotes("Dummy Notes Editted");
+    assetPage.clickassetupdatebutton();
+    assetPage.scrollintoservicehistory();
+    assetPage.viewassetservicehistorybutton();
+    assetPage.openassetservicehistory();
+    assetPage.verifyassetupdateservicehistory();
+    assetPage.viewassetservicehistorybutton();
+  });
+
+  it("Create a asset transaction and verify history", () => {
+    assetSearchPage.typeSearchKeyword(assetname);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyBadgeContent(assetname);
+    assetSearchPage.clickAssetByName(assetname);
+    assetPage.clickupdatedetailbutton();
+    assetPage.clickassetlocation(locationName);
+    assetPage.clickUpdateAsset();
+    assetPage.verifyassetlocation(locationName);
+    assetPage.verifytransactionStatus(initiallocationName, locationName);
   });
 
   it("Verify Facility Asset Page Redirection", () => {
@@ -47,6 +77,13 @@ describe("Asset", () => {
     facilityPage.verifyassetfacilitybackredirection();
   });
 
+  it("Delete an Asset", () => {
+    assetPage.openCreatedAsset();
+    assetPage.interceptDeleteAssetApi();
+    assetPage.deleteAsset();
+    assetPage.verifyDeleteStatus();
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });
diff --git a/cypress/pageobject/Asset/AssetCreation.ts b/cypress/pageobject/Asset/AssetCreation.ts
index b939c31405f..45356a1a4e7 100644
--- a/cypress/pageobject/Asset/AssetCreation.ts
+++ b/cypress/pageobject/Asset/AssetCreation.ts
@@ -276,4 +276,78 @@ export class AssetPage {
     cy.get("#submit").contains("Import").click();
     cy.wait("@importAsset").its("response.statusCode").should("eq", 201);
   }
+
+  clickupdatedetailbutton() {
+    cy.get("[data-testid=asset-update-button]").click();
+  }
+
+  scrollintonotes() {
+    cy.get("#notes").scrollIntoView();
+  }
+
+  enterAssetNotes(text) {
+    cy.get("#notes").click().clear();
+    cy.get("#notes").click().type(text);
+  }
+
+  enterAssetservicedate(text) {
+    cy.get("input[name='last_serviced_on']").click();
+    cy.get("#date-input").click().type(text);
+  }
+
+  clickassetupdatebutton() {
+    cy.get("#submit").click();
+  }
+
+  viewassetservicehistorybutton() {
+    cy.get("#view-service-history").should("be.visible");
+  }
+
+  openassetservicehistory() {
+    cy.get("#view-service-history").click();
+    cy.get("#view-asset-edit-history").first().click();
+  }
+
+  verifyassetupdateservicehistory() {
+    cy.get("#edit-history-asset-servicedon").should("have.text", "01/09/2023");
+    cy.get("#edit-history-asset-note").should(
+      "have.text",
+      "Dummy Notes Editted"
+    );
+    cy.get("#view-history-back-button").contains("Back").click();
+    cy.get("#view-history-back-button").contains("Close").click();
+  }
+
+  scrollintoservicehistory() {
+    cy.get("#service-history").scrollIntoView();
+  }
+
+  clickedithistorybutton() {
+    cy.get("#edit-service-history").click();
+  }
+
+  verifytransactionStatus(initiallocationName: string, locationName: string) {
+    cy.get("#transaction-history").scrollIntoView();
+    cy.get("#transaction-history table tbody tr:first-child td:eq(0)").should(
+      "contain",
+      initiallocationName
+    );
+    cy.get("#transaction-history table tbody tr:first-child td:eq(1)").should(
+      "contain",
+      locationName
+    );
+  }
+
+  verifyassetlocation(locationName: string) {
+    cy.get("#asset-current-location").should("contain", locationName);
+  }
+
+  clickassetlocation(locationName: string) {
+    cy.get("#clear-button").click();
+    cy.get("[data-testid=asset-location-input] button").click();
+    cy.get("[data-testid=asset-location-input] button")
+      .click()
+      .type(locationName);
+    cy.get("[role='option']").contains(locationName).click();
+  }
 }
diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
index 0c12d4655fd..b6285bff72b 100644
--- a/cypress/pageobject/Facility/FacilityCreation.ts
+++ b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -205,9 +205,7 @@ class FacilityPage {
   }
 
   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() {
diff --git a/src/Components/Assets/AssetManage.tsx b/src/Components/Assets/AssetManage.tsx
index 1df9fbde9a6..a173289fc8a 100644
--- a/src/Components/Assets/AssetManage.tsx
+++ b/src/Components/Assets/AssetManage.tsx
@@ -231,6 +231,7 @@ const AssetManage = (props: AssetManageProps) => {
             </td>
             <td className="gap-4 whitespace-nowrap px-6 py-4 text-left text-sm leading-5">
               <ButtonV2
+                id="edit-service-history"
                 authorizeFor={NonReadOnlyUsers}
                 onClick={() => {
                   setServiceEditData({ ...service, open: true });
@@ -240,6 +241,7 @@ const AssetManage = (props: AssetManageProps) => {
                 <CareIcon icon="l-pen" className="text-lg" />
               </ButtonV2>
               <ButtonV2
+                id="view-service-history"
                 authorizeFor={NonReadOnlyUsers}
                 tooltip={service.edits?.length < 2 ? "No previous edits" : ""}
                 tooltipClassName="tooltip-left"
@@ -296,7 +298,10 @@ const AssetManage = (props: AssetManageProps) => {
           </div>
           <div className="break-words text-gray-700">{item.label}</div>
         </div>
-        <div className="ml-8 grow-0 break-words text-lg font-semibold">
+        <div
+          className="ml-8 grow-0 break-words text-lg font-semibold"
+          id="asset-current-location"
+        >
           {item.content || "--"}
         </div>
       </div>
@@ -514,7 +519,10 @@ const AssetManage = (props: AssetManageProps) => {
         asset?.asset_class &&
         asset?.asset_class != AssetClass.NONE && <Uptime assetId={asset?.id} />}
       <div className="mb-4 mt-8 text-xl font-semibold">Service History</div>
-      <div className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg">
+      <div
+        className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg"
+        id="service-history"
+      >
         <table className="min-w-full divide-y divide-gray-200">
           <thead>
             <tr>
@@ -541,7 +549,10 @@ const AssetManage = (props: AssetManageProps) => {
         </table>
       </div>
       <div className="mb-4 mt-8 text-xl font-semibold">Transaction History</div>
-      <div className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg">
+      <div
+        className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg"
+        id="transaction-history"
+      >
         <table className="min-w-full divide-y divide-gray-200">
           <thead>
             <tr>
diff --git a/src/Components/Assets/AssetServiceEditModal.tsx b/src/Components/Assets/AssetServiceEditModal.tsx
index 75c9dd9fc60..66d44d11907 100644
--- a/src/Components/Assets/AssetServiceEditModal.tsx
+++ b/src/Components/Assets/AssetServiceEditModal.tsx
@@ -97,7 +97,10 @@ export const AssetServiceEditModal = (props: {
                       {edit.edited_by.username}
                     </p>
                   </div>
-                  <div className="flex items-center justify-center">
+                  <div
+                    className="flex items-center justify-center"
+                    id="view-asset-edit-history"
+                  >
                     <CareIcon icon="l-eye" className="text-lg" />
                   </div>
                 </div>
@@ -124,19 +127,25 @@ export const AssetServiceEditModal = (props: {
                   <p className="text-sm font-medium text-gray-500">
                     Serviced On
                   </p>
-                  <p className="text-gray-900">
+                  <p
+                    className="text-gray-900"
+                    id="edit-history-asset-servicedon"
+                  >
                     {formatDate(editRecord.serviced_on)}
                   </p>
                 </div>
                 <div className="mt-4 grow">
                   <p className="text-sm font-medium text-gray-500">Notes</p>
-                  <p className="text-gray-900">{editRecord.note || "-"}</p>
+                  <p className="text-gray-900" id="edit-history-asset-note">
+                    {editRecord.note || "-"}
+                  </p>
                 </div>
               </div>
             </div>
           )}
           <div className="flex justify-end">
             <ButtonV2
+              id="view-history-back-button"
               variant="secondary"
               onClick={() => {
                 editRecord ? setEditRecord(undefined) : props.handleClose();
diff --git a/src/Components/Form/FormFields/Autocomplete.tsx b/src/Components/Form/FormFields/Autocomplete.tsx
index dcf3ab5e8b6..7a2c37351e4 100644
--- a/src/Components/Form/FormFields/Autocomplete.tsx
+++ b/src/Components/Form/FormFields/Autocomplete.tsx
@@ -164,7 +164,7 @@ export const Autocomplete = <T, V>(props: AutocompleteProps<T, V>) => {
                 <span>{value?.icon}</span>
 
                 {value && !props.isLoading && !props.required && (
-                  <div className="tooltip">
+                  <div className="tooltip" id="clear-button">
                     <CareIcon
                       className="care-l-times-circle h-4 w-4 text-gray-800 transition-colors duration-200 ease-in-out hover:text-gray-500"
                       onClick={(e) => {