Merge branch 'develop' into issues/8162-CNS-filter-modifications

.cursorrules

@@ -7,12 +7,12 @@ Care uses a custom useQuery hook to fetch data from the API. APIs are defined in
 Here's an example of how to use the useQuery hook to fetch data from the API:
 
 ```
-useQuery from "@/Common/hooks/useQuery";
+useQuery from "@/common/hooks/useQuery";
 const { data, loading, error } = useQuery(routes.getFacilityUsers, {
   facility_id: "1",
 });
 
-request from "@/Common/utils/request";
+request from "@/common/utils/request";
 const { res } = await request(routes.partialUpdateAsset, {
   pathParams: { external_id: assetId },
   body: data,

.example.env

@@ -13,7 +13,7 @@ REACT_OHCN_URL=
 # Plausible site domain (default: care.ohc.network)
 REACT_PLAUSIBLE_SITE_DOMAIN=
 
-# Plausible server URL (default: https://plausible.10bedicu.in)
+# Plausible server URL (default: https://plausible.ohc.network)
 REACT_PLAUSIBLE_SERVER_URL=
 
 # Care Apps. repo@branch seperated by commas

care.config.ts

@@ -85,7 +85,7 @@ const careConfig = {
   // Plugins related configs...
 
   plausible: {
-    server: env.REACT_PLAUSIBLE_SERVER_URL || "https://plausible.10bedicu.in",
+    server: env.REACT_PLAUSIBLE_SERVER_URL || "https://plausible.ohc.network",
     domain: env.REACT_PLAUSIBLE_SITE_DOMAIN || "care.ohc.network",
   },
 

cypress/e2e/assets_spec/AssetHomepage.cy.ts

@@ -78,7 +78,9 @@ describe("Asset Tab", () => {
 
   it("Next/Previous Page", () => {
     assetPagination.navigateToNextPage();
+    assetPagination.verifyNextUrl();
     assetPagination.navigateToPreviousPage();
+    assetPagination.verifyPreviousUrl();
   });
 
   it("Import new asset", () => {

cypress/e2e/facility_spec/FacilityHomepage.cy.ts

@@ -81,7 +81,9 @@ describe("Facility Homepage Function", () => {
   it("Search a facility in homepage and pagination", () => {
     // pagination of the facility page
     assetPagination.navigateToNextPage();
+    assetPagination.verifyNextUrl();
     assetPagination.navigateToPreviousPage();
+    assetPagination.verifyPreviousUrl();
     // search for a facility
     manageUserPage.typeFacilitySearch(facilityName);
     facilityPage.verifyFacilityBadgeContent(facilityName);

cypress/e2e/patient_spec/PatientLogUpdate.cy.ts

@@ -113,6 +113,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.closeNotification();
     // Submit the doctors log update
     cy.submitButton("Save and Continue");
+    cy.wait(2000);
     cy.verifyNotification("Progress Note created successfully");
     cy.closeNotification();
     // modify the relevant critical care log update

cypress/e2e/patient_spec/PatientRegistration.cy.ts

@@ -239,7 +239,7 @@ describe("Patient Creation with consultation", () => {
     patientMedicalHistory.verifyNoSymptosPresent("Diabetes");
     // verify insurance details and dedicatd page
     cy.get("[data-testid=patient-details]")
-      .contains(patientOneFirstSubscriberId)
+      .contains("member id")
       .scrollIntoView();
     cy.wait(2000);
     patientInsurance.verifyPatientPolicyDetails(

cypress/pageobject/Asset/AssetPagination.ts

@@ -2,12 +2,18 @@ export class AssetPagination {
   navigateToNextPage() {
     // only works for desktop mode
     cy.get("button#next-pages").click();
+  }
+
+  verifyNextUrl() {
     cy.url().should("include", "page=2");
   }
 
   navigateToPreviousPage() {
     // only works for desktop mode
     cy.get("button#prev-pages").click();
+  }
+
+  verifyPreviousUrl() {
     cy.url().should("include", "page=1");
   }
 }

cypress/pageobject/Facility/FacilityManage.ts

@@ -1,6 +1,6 @@
 class FacilityManage {
   clickCoverImage() {
-    cy.get("#facility-coverimage").click({ force: true });
+    cy.get("#facility-coverimage").click();
   }
 
   verifyUploadButtonVisible() {
@@ -13,6 +13,11 @@ class FacilityManage {
       .wait(100); // Adjust the wait time as needed
   }
 
+  clickSaveCoverImage() {
+    cy.get("#save-cover-image").scrollIntoView();
+    cy.get("#save-cover-image").click();
+  }
+
   verifyTotalDoctorCapacity(expectedCapacity: string) {
     cy.get("#facility-doctor-totalcapacity").contains(expectedCapacity);
   }
@@ -37,11 +42,6 @@ class FacilityManage {
     cy.get("#delete-facility-bedcapacity").click();
   }
 
-  clickSaveCoverImage() {
-    cy.get("#save-cover-image").scrollIntoView();
-    cy.get("#save-cover-image").click();
-  }
-
   clickFacilityConfigureButton() {
     cy.get("#configure-facility").should("be.visible");
     cy.get("#configure-facility").click();

netlify.toml

@@ -20,9 +20,9 @@ X-Frame-Options = "DENY"
 X-Content-Type-Options = "nosniff"
 Content-Security-Policy-Report-Only = '''
       default-src 'self';
-      script-src 'self' 'nonce-f51b9742' https://plausible.10bedicu.in;
+      script-src 'self' 'nonce-f51b9742' https://plausible.ohc.network;
       style-src 'self' 'unsafe-inline';
-      connect-src 'self' https://plausible.10bedicu.in;
+      connect-src 'self' https://plausible.ohc.network;
       img-src 'self' https://cdn.ohc.network https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
       object-src 'self' https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
       report-uri https://csp-logger.ohc.network/

src/App.tsx

@@ -1,12 +1,12 @@
 import { Suspense } from "react";
 import Routers from "./Routers";
 import Integrations from "./Integrations";
-import Loading from "./Components/Common/Loading";
+import Loading from "@/components/Common/Loading";
 import HistoryAPIProvider from "./Providers/HistoryAPIProvider";
 import AuthUserProvider from "./Providers/AuthUserProvider";
 import PluginEngine from "./PluginEngine";
 import { FeatureFlagsProvider } from "./Utils/featureFlags";
-import { Toaster } from "./Components/ui/toaster";
+import { Toaster } from "@/components/ui/toaster";
 
 const App = () => {
   return (

src/CAREUI/display/Chip.tsx

@@ -1,5 +1,5 @@
 import CareIcon, { IconName } from "../icons/CareIcon";
-import { ButtonVariant } from "../../Components/Common/components/ButtonV2";
+import { ButtonVariant } from "@/components/Common/components/ButtonV2";
 import { classNames } from "../../Utils/utils";
 
 interface Props {

src/CAREUI/display/PopupModal.tsx

@@ -1,9 +1,9 @@
 import { ReactNode, useEffect, useRef, useState } from "react";
-import { Cancel, Submit } from "../../Components/Common/components/ButtonV2";
+import { Cancel, Submit } from "@/components/Common/components/ButtonV2";
 import { classNames } from "../../Utils/utils";
 import { useTranslation } from "react-i18next";
-import useBreakpoints from "../../Common/hooks/useBreakpoints";
-import DialogModal from "../../Components/Common/Dialog";
+import useBreakpoints from "@/common/hooks/useBreakpoints";
+import DialogModal from "@/components/Common/Dialog";
 
 type Props = {
   show: boolean;