Merge branch 'develop' into care-connect

Author: Ashesh3

.env

@@ -6,4 +6,4 @@ REACT_APP_COVER_IMAGE=https://cdn.coronasafe.network/care_logo.svg
 REACT_APP_COVER_IMAGE_ALT=https://cdn.coronasafe.network/care_logo.svg
 
 # Dev envs
-ESLINT_NO_DEV_ERRORS=true
+ESLINT_NO_DEV_ERRORS=true

.github/workflows/codeql-analysis.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   CodeQL-Build:
     runs-on: ubuntu-latest
+    if: github.repository == 'coronasafe/care_fe'
     permissions:
       security-events: write
       actions: read

.github/workflows/comment-p1-issues.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   add-comment:
-    if: github.event.label.name == 'P1'
+    if: github.event.label.name == 'P1' && github.repository == 'coronasafe/care_fe'
     runs-on: ubuntu-latest
     permissions:
       issues: write

.github/workflows/cypress.yaml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   cypress-run:
+    if: github.repository == 'coronasafe/care_fe'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 📥

.github/workflows/deploy.yaml

@@ -21,6 +21,7 @@ env:
 
 jobs:
   test:
+    if: github.repository == 'coronasafe/care_fe'
     runs-on: ubuntu-latest
     name: Test
     steps:

.github/workflows/issue-automation.yml

@@ -10,7 +10,7 @@ jobs:
   issue_opened_and_reopened:
     name: issue_opened_and_reopened
     runs-on: ubuntu-latest
-    if: github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
+    if: github.repository == 'coronasafe/care_fe' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
     steps:
       - name: 'Move issue to "Triage"'
         uses: leonsteinhaeuser/[email protected]
@@ -23,7 +23,7 @@ jobs:
   issue_closed:
     name: issue_closed
     runs-on: ubuntu-latest
-    if: github.event_name == 'issues' && github.event.action == 'closed'
+    if: github.repository == 'coronasafe/care_fe' &&  github.event_name == 'issues' && github.event.action == 'closed'
     steps:
       - name: 'Moved issue to "Done"'
         uses: leonsteinhaeuser/[email protected]
@@ -36,7 +36,7 @@ jobs:
   issue_assigned:
     name: issue_assigned
     runs-on: ubuntu-latest
-    if: github.event_name == 'issues' && github.event.action == 'assigned'
+    if: github.repository == 'coronasafe/care_fe' &&  github.event_name == 'issues' && github.event.action == 'assigned'
     steps:
       - name: 'Move issue to "In Progress"'
         uses: leonsteinhaeuser/[email protected]

.github/workflows/label-deploy-failed.yml

@@ -13,7 +13,7 @@ jobs:
   auto-label-deploy-failed:
     runs-on: ubuntu-latest
     if: |
-      github.event.issue.pull_request &&
+      github.repository == 'coronasafe/care_fe' && github.event.issue.pull_request &&
       contains(github.event.comment.body, 'Deploy Preview')
     steps:
       - name: Add 'Deploy-Failed'

.github/workflows/label-merge-conflict.yml

@@ -12,6 +12,7 @@ on:
 
 jobs:
   auto-label:
+    if: github.repository == 'coronasafe/care_fe'
     runs-on: ubuntu-latest
     steps:
       - uses: prince-chrismc/label-merge-conflicts-action@v2

.github/workflows/label-wip.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   check-linked-issues:
+    if: github.repository == 'coronasafe/care_fe'
     name: Check linked issues
     runs-on: ubuntu-latest
     outputs:
@@ -28,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: check-linked-issues
     permissions: write-all
-    if: join(needs.check-linked-issues.outputs.linked_issues) != ''
+    if: github.repository == 'coronasafe/care_fe' && 'join(needs.check-linked-issues.outputs.linked_issues) != ''
     steps:
       - name: Label
         uses: actions/github-script@v6

.github/workflows/ossar-analysis.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   OSSAR-Scan:
+    if: github.repository == 'coronasafe/care_fe'
     # OSSAR runs on windows-latest.
     # ubuntu-latest and macos-latest support coming soon
     runs-on: windows-latest

.github/workflows/stale.yml

@@ -6,6 +6,7 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    if: github.repository == 'coronasafe/care_fe'
     steps:
       - uses: actions/stale@v6
         with:

package-lock.json

@@ -39,7 +39,6 @@
     "@livekit/react-components": "^1.1.0",
     "@loadable/component": "^5.15.0",
     "@material-ui/core": "^4.11.4",
-    "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.58",
     "@material-ui/pickers": "^3.3.10",
     "@material-ui/styles": "^4.11.4",

package.json

@@ -0,0 +1,41 @@
+import CareIcon from "../icons/CareIcon";
+
+export default function CountBlock(props: {
+  count: number;
+  text: string;
+  loading: boolean;
+  icon: string;
+  color?: string;
+  containerClass?: string;
+}) {
+  const {
+    count,
+    text,
+    loading,
+    icon,
+    color = "primary",
+    containerClass,
+  } = props;
+
+  return (
+    <div className={"rounded-lg p-4 shadow flex-1 bg-white " + containerClass}>
+      <dl className="">
+        <div
+          className={`flex items-center justify-center rounded-lg text-xl w-10 h-10 bg-${color}-100`}
+        >
+          <CareIcon className={`care-l-${icon} text-${color}-600`} />
+        </div>
+        <div>
+          <dt className="text-sm font-semibold text-gray-700 truncate my-2">
+            {text}
+          </dt>
+          {loading ? (
+            <dd className="rounded-lg w-full max-w-[100px] h-10 bg-gray-300 animate-pulse" />
+          ) : (
+            <dd className="text-5xl leading-9 font-black">{count}</dd>
+          )}
+        </div>
+      </dl>
+    </div>
+  );
+}

src/CAREUI/display/Count.tsx

@@ -171,6 +171,20 @@ export const PATIENT_FILTER_ORDER: (OptionsType & { order: string })[] = [
   { id: 4, text: "-modified_date", desc: "Modified Date", order: "Descending" },
   { id: 5, text: "review_time", desc: "Review Time", order: "Ascending" },
   { id: 6, text: "-review_time", desc: "Review Time", order: "Descending" },
+  { id: 7, text: "name", desc: "Patient Name", order: "Ascending" },
+  { id: 8, text: "-name", desc: "Patient Name", order: "Descending" },
+  {
+    id: 7,
+    text: "facility__name,last_consultation__current_bed__bed__name",
+    desc: "Bed Number",
+    order: "Ascending",
+  },
+  {
+    id: 8,
+    text: "facility__name,-last_consultation__current_bed__bed__name",
+    desc: "Bed Number",
+    order: "Descending",
+  },
 ];
 
 export const getBedTypes = ({

src/Common/constants.tsx

@@ -50,9 +50,9 @@ export function useAsyncOptions<T extends Record<string, unknown>>(
     if (!selected?.length) return queryOptions;
 
     return [
-      ...queryOptions,
-      ...selected.filter(
-        (obj) => !queryOptions.some((s) => s[uniqueKey] === obj[uniqueKey])
+      ...selected,
+      ...queryOptions.filter(
+        (option) => !selected.find((s) => s[uniqueKey] === option[uniqueKey])
       ),
     ];
   };

src/Common/hooks/useAsyncOptions.ts

@@ -49,6 +49,10 @@ export interface IConfig {
    * URL of the sample format for external result import.
    */
   sample_format_external_result_import: string;
+  /**
+   * Env to enable HCX features
+   */
+  enable_hcx: boolean;
 }
 
 const useConfig = () => {

src/Common/hooks/useConfig.ts

@@ -0,0 +1,16 @@
+import { useEffect } from "react";
+
+type onMessage = (data: any) => void;
+
+export const useMessageListener = (onMessage: onMessage) => {
+  useEffect(() => {
+    const handleMessage = (e: MessageEvent) => {
+      onMessage(e.data);
+    };
+    navigator.serviceWorker.addEventListener("message", handleMessage);
+
+    return () => {
+      navigator.serviceWorker.removeEventListener("message", handleMessage);
+    };
+  });
+};

src/Common/hooks/useMessageListener.ts

@@ -113,8 +113,8 @@ function AssetFilter(props: any) {
   const handleFacilitySelect = (selected: FacilityModel) => {
     setFacility(selected ? selected : { name: "" });
   };
-  const handleLocationSelect = (selected: AssetLocationObject) => {
-    setLocation(selected ? selected : initialLocation);
+  const handleLocationSelect = (selectedId: string) => {
+    setLocationId(selectedId);
   };
 
   return (
@@ -149,10 +149,10 @@ function AssetFilter(props: any) {
               <FieldLabel className="text-sm">Location</FieldLabel>
               <LocationSelect
                 name="Facilities"
-                setSelected={(selected) =>
-                  handleLocationSelect(selected as AssetLocationObject)
+                setSelected={(selectedId) =>
+                  handleLocationSelect((selectedId as string) || "")
                 }
-                selected={location}
+                selected={location.id}
                 errors=""
                 showAll={false}
                 multiple={false}