Merge pull request #8835 from ohcnetwork/develop

Staging Release - October Week 3 Release Patch (v24.43.1)

.devcontainer/devcontainer.json

@@ -26,7 +26,7 @@
     "cpus": 4
   },
   "waitFor": "onCreateCommand",
-  "postCreateCommand": "npm install",
+  "postCreateCommand": "npm run install-all",
   "postAttachCommand": {
     "server": "npm run dev"
   },

.github/workflows/cypress.yaml

@@ -70,7 +70,7 @@ jobs:
           node-version: "20"
 
       - name: Install dependencies 📦
-        run: npm install
+        run: npm run install-all
 
       - name: Build ⚙️
         run: npm run build

Dockerfile

@@ -13,6 +13,8 @@ RUN npm install
 
 COPY . .
 
+RUN npm run setup
+
 RUN npm run build
 
 

cypress/e2e/users_spec/UsersManage.cy.ts

@@ -26,9 +26,7 @@ describe("Manage User", () => {
 
   beforeEach(() => {
     cy.restoreLocalStorage();
-    console.log(localStorage);
     cy.clearLocalStorage(/filters--.+/);
-    console.log(localStorage);
     cy.awaitUrl("/users");
   });
 

cypress/e2e/users_spec/UsersProfile.cy.ts

@@ -25,9 +25,7 @@ describe("Manage User Profile", () => {
 
   beforeEach(() => {
     cy.restoreLocalStorage();
-    console.log(localStorage);
     cy.clearLocalStorage(/filters--.+/);
-    console.log(localStorage);
     cy.awaitUrl("/user/profile");
   });
 

cypress/pageobject/Asset/AssetCreation.ts

@@ -154,7 +154,7 @@ export class AssetPage {
   }
 
   clickConfigureAsset() {
-    cy.get("#submit").contains("Set Configuration").click();
+    cy.get("#submit").contains("Update").click();
   }
 
   clickConfigureVital() {

cypress/pageobject/Facility/FacilityHome.ts

@@ -72,7 +72,7 @@ class FacilityHome {
   }
 
   verifyOccupancyBadgeVisibility() {
-    cy.get("#occupany-badge").should("be.visible");
+    cy.get('[data-test-id="occupancy-badge"]').should("be.visible");
   }
 
   verifyAndCloseNotifyModal() {

netlify.toml

@@ -13,12 +13,12 @@ to = "/index.html"
 status = 200
 
 [[headers]]
-  for = "/*"
-  [headers.values]
-    cache-control = "max-age=0, no-store"
-    X-Frame-Options = "DENY"
-    X-Content-Type-Options = "nosniff"
-    Content-Security-Policy-Report-Only = '''
+for = "/*"
+[headers.values]
+cache-control = "max-age=0, no-store"
+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;
       style-src 'self' 'unsafe-inline';

package.json

@@ -78,7 +78,7 @@
     "echarts": "^5.5.1",
     "echarts-for-react": "^3.0.2",
     "events": "^3.3.0",
-    "hi-profiles": "^1.0.6",
+    "hi-profiles": "^1.1.0",
     "i18next": "^23.11.4",
     "i18next-browser-languagedetector": "^7.2.1",
     "lodash-es": "^4.17.21",

scripts/sort-locales.js

@@ -1,26 +1,15 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fs = require("fs");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require("path");
-
-const directory = "src/Locale";
 
-fs.readdir(directory, (err, files) => {
-  if (err) throw err;
+const file = "src/Locale/en.json";
 
-  files.forEach((file) => {
-    if (file.endsWith(".json")) {
-      const filePath = path.join(directory, file);
-      const data = JSON.parse(fs.readFileSync(filePath, "utf8"));
+const data = JSON.parse(fs.readFileSync(file, "utf8"));
 
-      const sortedData = Object.keys(data)
-        .sort()
-        .reduce((acc, key) => {
-          acc[key] = data[key];
-          return acc;
-        }, {});
+const sortedData = Object.keys(data)
+  .sort()
+  .reduce((acc, key) => {
+    acc[key] = data[key];
+    return acc;
+  }, {});
 
-      fs.writeFileSync(filePath, JSON.stringify(sortedData, null, 2) + "\n");
-    }
-  });
-});
+fs.writeFileSync(file, JSON.stringify(sortedData, null, 2) + "\n");

src/CAREUI/display/Count.tsx

@@ -11,15 +11,13 @@ interface Props {
 
 export default function CountBlock(props: Props) {
   return (
-    <div
-      className={classNames("rounded-lg bg-white p-4 shadow", props.className)}
-    >
-      <dl>
-        <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-primary-100 text-xl">
+    <div className={classNames("rounded-lg", props.className)}>
+      <dl className="flex gap-3">
+        <div className="flex aspect-square h-16 items-center justify-center rounded-lg border border-black/10 bg-primary-100 text-2xl">
           <CareIcon icon={props.icon} className="text-primary-600" />
         </div>
         <div>
-          <dt className="my-2 truncate text-sm font-semibold text-secondary-700">
+          <dt className="mb-1 truncate text-sm font-semibold text-secondary-700">
             {props.text}
           </dt>
           {props.loading ? (

src/CAREUI/interactive/KeyboardShortcut.tsx

@@ -31,7 +31,10 @@ export default function KeyboardShortcut(props: Props) {
         )}
         {(props.altShortcuts || [props.shortcut]).map((shortcut, idx, arr) => (
           <>
-            <kbd className="hidden items-center px-1.5 font-sans font-medium text-zinc-300 shadow lg:inline-flex">
+            <kbd
+              key={`shortcut-${idx}`}
+              className="hidden items-center px-1.5 font-sans font-medium text-zinc-300 shadow lg:inline-flex"
+            >
               {shortcut.map((key, idx, keys) => (
                 <>
                   {SHORTCUT_KEY_MAP[key] || key}
@@ -42,7 +45,12 @@ export default function KeyboardShortcut(props: Props) {
               ))}
             </kbd>
             {idx !== arr.length - 1 && (
-              <span className="text-zinc-300/60">or</span>
+              <span
+                key={`shortcut-separator-${idx}`}
+                className="text-zinc-300/60"
+              >
+                or
+              </span>
             )}
           </>
         ))}

src/Common/constants.tsx

@@ -839,20 +839,6 @@ export const LOCATION_BED_TYPES = [
   { id: "REGULAR", name: "Regular" },
 ] as const;
 
-export const ASSET_META_TYPE = [
-  { id: "CAMERA", text: "Camera(ONVIF)" },
-  { id: "HL7MONITOR", text: "Vitals Monitor(HL7)" },
-];
-
-export const CAMERA_TYPE = [
-  { id: "HIKVISION", text: "ONVIF Camera (HIKVISION)" },
-];
-
-export const GENDER: { [key: number]: string } = GENDER_TYPES.reduce(
-  (acc, curr) => ({ ...acc, [curr.id]: curr.text }),
-  {},
-);
-
 export type CameraPTZ = {
   icon?: IconName;
   label: string;
@@ -1158,23 +1144,23 @@ export const AssetImportSchema: SchemaType = {
 
 // ABDM
 export const ABDM_CONSENT_PURPOSE = [
-  { value: "CAREMGT", label: "Care Management" },
-  { value: "BTG", label: "Break The Glass" },
-  { value: "PUBHLTH", label: "Public Health" },
-  { value: "HPAYMT", label: "Healthcare Payment" },
-  { value: "DSRCH", label: "Disease Specific Healthcare Research" },
-  { value: "PATRQT", label: "Self Requested" },
-] as { value: ConsentPurpose; label: string }[];
+  "CAREMGT",
+  "BTG",
+  "PUBHLTH",
+  "HPAYMT",
+  "DSRCH",
+  "PATRQT",
+] as ConsentPurpose[];
 
 export const ABDM_HI_TYPE = [
-  { value: "Prescription", label: "Prescription" },
-  { value: "DiagnosticReport", label: "Diagnostic Report" },
-  { value: "OPConsultation", label: "Op Consultation" },
-  { value: "DischargeSummary", label: "Discharge Summary" },
-  { value: "ImmunizationRecord", label: "Immunization Record" },
-  { value: "HealthDocumentRecord", label: "Record Artifact" },
-  { value: "WellnessRecord", label: "Wellness Record" },
-] as { value: ConsentHIType; label: string }[];
+  "Prescription",
+  "DiagnosticReport",
+  "OPConsultation",
+  "DischargeSummary",
+  "ImmunizationRecord",
+  "HealthDocumentRecord",
+  "WellnessRecord",
+] as ConsentHIType[];
 
 export const USER_TYPES_MAP = {
   Pharmacist: "Pharmacist",