Merge pull request #1 from ohcnetwork/develop

from develop

.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,

.dockerignore

@@ -3,3 +3,4 @@ build
 .dockerignore
 Dockerfile
 .git
+apps

.env

@@ -12,4 +12,6 @@ REACT_CARE_API_URL=https://careapi.ohc.network
 # Dev envs
 ESLINT_NO_DEV_ERRORS=true
 CARE_CDN_URL="https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com http://localhost:4566"
-REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
+REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
+
+REACT_ENABLED_APPS="ohcnetwork/care_livekit_fe@main"

.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

.github/workflows/cypress.yaml

@@ -1,8 +1,6 @@
 name: Cypress Tests
 
 on:
-  schedule:
-    - cron: "30 22 * * *"
   pull_request:
     branches:
       - develop
@@ -17,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4, 5, 6, 7, 8]
+        containers: [1, 2, 3, 4]
     env:
       REACT_CARE_API_URL: http://localhost:9000
     steps:
@@ -136,4 +134,4 @@ jobs:
         if: steps.pr_origin.outputs.is_forked == 'true'
         with:
           name: cypress-videos
-          path: cypress/videos
+          path: cypress/videos

.github/workflows/generate-sbom.yml

@@ -0,0 +1,32 @@
+name: Generate SBOM using CycloneDX
+
+on:
+  workflow_dispatch:
+
+jobs:
+  generate-sbom:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Install CycloneDX NPM tool
+        run: npm install -g @cyclonedx/cyclonedx-npm
+
+      - name: Generate SBOM
+        run: cyclonedx-npm --output-file sbom.json
+
+      - name: Upload SBOM
+        uses: actions/upload-artifact@v3
+        with:
+          name: sbom
+          path: sbom.json
+          if-no-files-found: error

Dockerfile

@@ -5,16 +5,17 @@ WORKDIR /app
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
-RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then apt-get update && apt-get install -y python3-dev make g++; fi
+RUN apt-get update && apt-get install -y git
+
+RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then apt-get install -y python3-dev make g++; fi
+
 
 COPY package.json package-lock.json ./
 
 RUN npm install
 
 COPY . .
 
-RUN npm run setup
-
 RUN npm run build
 
 

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/PatientConsultationCreation.cy.ts

@@ -86,7 +86,7 @@ describe("Patient Consultation in multiple combination", () => {
     patientConsultationPage.selectPatientPrincipalDiagnosis(diagnosis4);
     patientTreatmentPlan.clickAddProcedure();
     patientTreatmentPlan.typeProcedureName(procedureName);
-    patientTreatmentPlan.typeProcedureTime("2024-02-22T12:30");
+    patientTreatmentPlan.typeProcedureTime("220220241230");
     patientTreatmentPlan.typeTreatmentPlan(patientTreatment);
     patientTreatmentPlan.typePatientGeneralInstruction(generalInstruction);
     patientTreatmentPlan.typeSpecialInstruction(specialInstruction);
@@ -182,12 +182,12 @@ describe("Patient Consultation in multiple combination", () => {
     patientConsultationPage.typeCauseOfDeath("Cause of Death");
     patientConsultationPage.typePatientConsultationDate(
       "#death_datetime",
-      "2024-02-22T12:45",
+      "220220241230",
     );
     patientConsultationPage.typeDeathConfirmedBy(doctorName);
     patientConsultationPage.typePatientConsultationDate(
       "#encounter_date",
-      "2024-02-22T12:30",
+      "220220241230",
     );
     cy.submitButton("Create Consultation");
     cy.verifyNotification(
@@ -245,7 +245,7 @@ describe("Patient Consultation in multiple combination", () => {
     );
     patientConsultationPage.typePatientConsultationDate(
       "#icu_admission_date",
-      "2024-02-23T12:30",
+      "230220241230",
     );
     // add investigation
     patientInvestigation.clickAddInvestigation();

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

@@ -25,7 +25,7 @@ const getRelativeDateString = (deltaDays = 0) => {
       month: "2-digit",
       year: "numeric",
     })
-    .replace("/", "");
+    .replace(/\//g, "");
 };
 
 describe("Patient Creation with consultation", () => {
@@ -239,17 +239,9 @@ 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(
-      patientOneFirstSubscriberId,
-      patientOneFirstPolicyId,
-      patientOneFirstInsurerId,
-      patientOneFirstInsurerName,
-      isHCXEnabled,
-    );
-
     patientInsurance.clickPatientInsuranceViewDetail();
     cy.wait(3000);
     patientInsurance.verifyPatientPolicyDetails(

cypress/e2e/users_spec/UsersCreation.cy.ts

@@ -79,13 +79,10 @@ describe("User Creation", () => {
     );
     userCreationPage.typeIntoElementByIdPostClear("lastName", "Cypress");
     userCreationPage.selectDropdownOption("gender", "Male");
-    userCreationPage.typeIntoElementByIdPostClear(
-      "phoneNumber",
-      "+91" + phone_number,
-    );
+    userCreationPage.typeIntoElementByIdPostClear("phoneNumber", phone_number);
     userCreationPage.typeIntoElementByIdPostClear(
       "altPhoneNumber",
-      "+91" + emergency_phone_number,
+      emergency_phone_number,
     );
     userCreationPage.typeIntoElementByIdPostClear("email", "test@test.com");
     userCreationPage.typeIntoElementByIdPostClear("weekly_working_hours", "14");
@@ -148,7 +145,7 @@ describe("User Creation", () => {
     userCreationPage.typeIntoElementById("password", "Test@123");
     userCreationPage.selectHomeFacility("Dummy Shifting Center");
     userCreationPage.typeIntoElementById("phone_number", phone_number);
-    userCreationPage.setInputDate("date_of_birth", "date-input", "25081999");
+    userCreationPage.setInputDate("date_of_birth", "25081999");
     userCreationPage.selectDropdownOption("user_type", "Doctor");
     userCreationPage.typeIntoElementById("c_password", "Test@123");
     userCreationPage.typeIntoElementById("qualification", "MBBS");

cypress/e2e/users_spec/UsersProfile.cy.ts

@@ -10,7 +10,7 @@ describe("Manage User Profile", () => {
   const date_of_birth = "01011999";
   const gender = "Male";
   const email = "test@example.com";
-  const phone = "+918899887788";
+  const phone = "8899887788";
   const workinghours = "8";
   const qualification = "MBBS";
   const doctorYoE = "10";

cypress/pageobject/Asset/AssetCreation.ts

@@ -59,10 +59,10 @@ export class AssetPage {
     cy.get("[data-testid=asset-support-email-input] input").type(supportEmail);
     cy.get("[data-testid=asset-vendor-name-input] input").type(vendorName);
     cy.get("[data-testid=asset-serial-number-input] input").type(serialNumber);
-    cy.get(
-      "[data-testid=asset-last-serviced-on-input] input[type='text']",
-    ).click();
-    cy.get("#date-input").click().type(lastServicedOn);
+    cy.clickAndTypeDate(
+      "[data-testid=asset-last-serviced-on-input]",
+      lastServicedOn,
+    );
     cy.get("[data-testid=asset-notes-input] textarea").type(notes);
   }
 
@@ -117,10 +117,10 @@ export class AssetPage {
     cy.get("[data-testid=asset-vendor-name-input] input")
       .clear()
       .type(vendorName);
-    cy.get(
-      "[data-testid=asset-last-serviced-on-input] input[type='text']",
-    ).click();
-    cy.get("#date-input").click().clear().type(lastServicedOn);
+    cy.clickAndTypeDate(
+      "[data-testid=asset-last-serviced-on-input]",
+      lastServicedOn,
+    );
     cy.get("[data-testid=asset-notes-input] textarea").clear().type(notes);
   }
 
@@ -267,8 +267,7 @@ export class AssetPage {
   }
 
   enterAssetservicedate(text: string) {
-    cy.get("input[name='last_serviced_on']").click();
-    cy.get("#date-input").click().type(text);
+    cy.clickAndTypeDate("input[name='last_serviced_on']", text);
   }
 
   scrollintoWarrantyDetails() {

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/FacilityCreation.ts

@@ -58,7 +58,7 @@ class FacilityPage {
   }
 
   fillAddress(address: string) {
-    cy.get("#address").click().clear().type(address);
+    cy.get("#address").click().type(address);
   }
 
   fillPhoneNumber(phoneNumber: string) {
@@ -245,8 +245,7 @@ class FacilityPage {
   }
 
   fillEntryDate(date: string) {
-    cy.get("#entry_date").click();
-    cy.get("#date-input").click().type(date);
+    cy.clickAndTypeDate("#entry_date", date);
   }
 
   clickEditButton() {

cypress/pageobject/Facility/FacilityLocation.ts

@@ -84,7 +84,7 @@ class FacilityLocation {
   }
 
   clickNotification() {
-    cy.get(".pnotify").click();
+    cy.get(".pnotify-container").click();
   }
 
   enterBedName(name: string) {

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();

cypress/pageobject/Patient/PatientConsultation.ts

@@ -61,7 +61,7 @@ export class PatientConsultationPage {
   }
 
   typePatientConsultationDate(selector: string, date: string) {
-    cy.get(selector).clear().click().type(date);
+    cy.clickAndTypeDate(selector, date);
   }
 
   clickPatientDetails() {