Merge branch 'develop' into doctors-notes

SECURITY.md

@@ -23,4 +23,4 @@
 
 ## Reporting a Vulnerability
 
-Please create a ticket at https://support.coronasafe.network
+Please create an issue at https://github.com/coronasafe/care_fe/issues/new

cypress/e2e/patient_spec/patient_consultation.cy.ts

@@ -66,7 +66,7 @@ describe("Patient Consultation in multiple combination", () => {
     );
     patientConsultationPage.typePatientWeight(patientWeight);
     patientConsultationPage.typePatientHeight(patientHeight);
-    patientConsultationPage.selectPatientCategory("Stable");
+    patientConsultationPage.selectPatientCategory("Mild");
     // icd 11 - 4 diagnosis with one principal
     patientConsultationPage.selectPatientDiagnosis(
       diagnosis1,
@@ -236,7 +236,7 @@ describe("Patient Consultation in multiple combination", () => {
     // Asymptomatic
     cy.searchAndSelectOption("#symptoms", "ASYMPTOMATIC");
     // Abnormal category
-    patientConsultationPage.selectPatientCategory("Abnormal");
+    patientConsultationPage.selectPatientCategory("Moderate");
     patientConsultationPage.selectPatientSuggestion("Domiciliary Care");
     // one ICD-11 diagnosis
     patientConsultationPage.selectPatientDiagnosis(
@@ -299,7 +299,7 @@ describe("Patient Consultation in multiple combination", () => {
       "SORE THROAT",
     ]);
     // Stable category
-    patientConsultationPage.selectPatientCategory("Stable");
+    patientConsultationPage.selectPatientCategory("Mild");
     // Date of symptoms
     patientConsultationPage.selectSymptomsDate(
       "#symptoms_onset_date",

cypress/e2e/patient_spec/patient_logupdate.cy.ts

@@ -10,7 +10,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
   const patientPage = new PatientPage();
   const patientLogupdate = new PatientLogupdate();
   const domicilaryPatient = "Dummy Patient 11";
-  const patientCategory = "Abnormal";
+  const patientCategory = "Moderate";
   const additionalSymptoms = "ASYMPTOMATIC";
   const physicalExamination = "physical examination details";
   const otherExamination = "Other";

cypress/e2e/shifting_spec/filter.cy.ts

@@ -20,7 +20,7 @@ describe("Shifting section filter", () => {
     shiftingPage.filterByFacility(
       "Dummy Shifting",
       "Dummy Shifting",
-      "District"
+      "District",
     );
 
     shiftingPage.facilityAssignedBadge().should("exist");
@@ -32,13 +32,10 @@ describe("Shifting section filter", () => {
       "ASC Created Date",
       "yes",
       "yes",
-      "POSITIVE",
       "no",
       "MODERATE",
-      "9999999999"
+      "9999999999",
     );
-
-    shiftingPage.diseaseStatusBadge().should("exist");
     shiftingPage.orderingBadge().should("exist");
     shiftingPage.breathlessnessLevelBadge().should("exist");
     shiftingPage.phoneNumberBadge().should("exist");

cypress/pageobject/Shift/ShiftFilters.ts

@@ -27,10 +27,6 @@ class ShiftingPage {
     return cy.get("#is-up-shift");
   }
 
-  diseaseStatusInput() {
-    return cy.get("#disease-status");
-  }
-
   isAntenatalInput() {
     return cy.get("#is-antenatal");
   }
@@ -63,10 +59,6 @@ class ShiftingPage {
     return cy.get("[data-testid='Current facility']");
   }
 
-  diseaseStatusBadge() {
-    return cy.get("[data-testid='Disease status']");
-  }
-
   orderingBadge() {
     return cy.get("[data-testid='Ordering']");
   }
@@ -98,7 +90,7 @@ class ShiftingPage {
   filterByFacility(
     origin_facility: string,
     assigned_facility: string,
-    assigned_to: string
+    assigned_to: string,
   ) {
     this.originFacilityInput().click().type(origin_facility);
     cy.get("[role='option']").contains(origin_facility).click();
@@ -116,10 +108,9 @@ class ShiftingPage {
     ordering: string,
     emergency: string,
     is_up_shift: string,
-    disease_status: string,
     is_antenatal: string,
     breathlessness_level: string,
-    patient_phone_number: string
+    patient_phone_number: string,
   ) {
     this.orderingInput().click();
     cy.get("[role='option']").contains(ordering).click();
@@ -130,9 +121,6 @@ class ShiftingPage {
     this.isUpShiftInput().click();
     cy.get("[role='option']").contains(is_up_shift).click();
 
-    this.diseaseStatusInput().click();
-    cy.get("[role='option']").contains(disease_status).click();
-
     this.isAntenatalInput().click();
     cy.get("[role='option']").contains(is_antenatal).click();
 
@@ -148,7 +136,7 @@ class ShiftingPage {
     created_date_start: string,
     created_date_end: string,
     modified_date_start: string,
-    modified_date_end: string
+    modified_date_end: string,
   ) {
     this.createdDateStartInput().click();
     cy.get("[id^='headlessui-popover-panel-'] .care-l-angle-left-b")

src/CAREUI/misc/PaginatedList.tsx

@@ -1,4 +1,4 @@
-import { createContext, useContext, useState } from "react";
+import { createContext, useContext, useEffect, useState } from "react";
 import { PaginatedResponse, QueryRoute } from "../../Utils/request/types";
 import useQuery, { QueryOptions } from "../../Utils/request/useQuery";
 import ButtonV2, {
@@ -33,6 +33,9 @@ function useContextualized<TItem>() {
 interface Props<TItem> extends QueryOptions<PaginatedResponse<TItem>> {
   route: QueryRoute<PaginatedResponse<TItem>>;
   perPage?: number;
+  queryCB?: (
+    query: ReturnType<typeof useQuery<PaginatedResponse<TItem>>>,
+  ) => void;
   children: (
     ctx: PaginatedListContext<TItem>,
     query: ReturnType<typeof useQuery<PaginatedResponse<TItem>>>,
@@ -43,6 +46,7 @@ export default function PaginatedList<TItem extends object>({
   children,
   route,
   perPage = DEFAULT_PER_PAGE_LIMIT,
+  queryCB,
   ...queryOptions
 }: Props<TItem>) {
   const [currentPage, setPage] = useState(1);
@@ -57,6 +61,12 @@ export default function PaginatedList<TItem extends object>({
 
   const items = query.data?.results ?? [];
 
+  useEffect(() => {
+    if (queryCB) {
+      queryCB(query);
+    }
+  }, [query]);
+
   return (
     <context.Provider
       value={{ ...query, items, perPage, currentPage, setPage }}

src/Common/constants.tsx

@@ -431,8 +431,8 @@ export const PATIENT_CATEGORIES: {
   twClass: string;
 }[] = [
   { id: "Comfort", text: "Comfort Care", twClass: "patient-comfort" },
-  { id: "Stable", text: "Stable", twClass: "patient-stable" },
-  { id: "Moderate", text: "Abnormal", twClass: "patient-abnormal" },
+  { id: "Stable", text: "Mild", twClass: "patient-stable" },
+  { id: "Moderate", text: "Moderate", twClass: "patient-abnormal" },
   { id: "Critical", text: "Critical", twClass: "patient-critical" },
 ];
 
@@ -470,13 +470,6 @@ export const SAMPLE_FLOW_RULES = {
   RECEIVED_AT_LAB: ["COMPLETED"],
 };
 
-export const DISEASE_STATUS = [
-  "POSITIVE",
-  "SUSPECTED",
-  "NEGATIVE",
-  "RECOVERED",
-];
-
 export const TEST_TYPE = [
   "UNK",
   "ANTIGEN",

src/Common/hooks/useMSEplayer.ts

@@ -149,7 +149,6 @@ export const useMSEMediaPlayer = ({
             const ws = wsRef.current;
             ws.binaryType = "arraybuffer";
             ws.onopen = function (_event) {
-              console.log("Connected to ws");
               onSuccess && onSuccess(undefined);
             };
             ws.onmessage = function (event) {

src/Components/Assets/configure/MonitorConfigure.tsx

@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { BedSelect } from "../../Common/BedSelect";
 import { BedModel } from "../../Facility/models";
-import { AssetData } from "../AssetTypes";
+import { AssetClass, AssetData } from "../AssetTypes";
 import * as Notification from "../../../Utils/Notifications.js";
 import { Submit } from "../../Common/components/ButtonV2";
 import { FieldLabel } from "../../Form/FormFields/FormField";
@@ -73,6 +73,7 @@ export default function MonitorConfigure({ asset }: { asset: AssetData }) {
             multiple={false}
             location={asset?.location_object?.id}
             facility={asset?.location_object?.facility?.id}
+            not_occupied_by_asset_type={AssetClass.HL7MONITOR}
             className="w-full"
           />
         </div>

src/Components/CameraFeed/AssetBedSelect.tsx

@@ -1,39 +1,28 @@
 import { Fragment } from "react";
-import useSlug from "../../Common/hooks/useSlug";
-import routes from "../../Redux/api";
-import useQuery from "../../Utils/request/useQuery";
-import { AssetBedModel, AssetData } from "../Assets/AssetTypes";
-import { BedModel } from "../Facility/models";
+import { AssetBedModel } from "../Assets/AssetTypes";
 import { Listbox, Transition } from "@headlessui/react";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 
 interface Props {
-  asset?: AssetData;
-  bed?: BedModel;
+  options: AssetBedModel[];
   value?: AssetBedModel;
+  label?: (value: AssetBedModel) => string;
   onChange?: (value: AssetBedModel) => void;
 }
 
 export default function AssetBedSelect(props: Props) {
-  const facility = useSlug("facility");
+  const selected = props.value;
 
-  const { data, loading } = useQuery(routes.listAssetBeds, {
-    query: {
-      limit: 100,
-      facility,
-      asset: props.asset?.id,
-      bed: props.bed?.id,
-    },
-  });
+  const options = props.options.filter(({ meta }) => meta.type !== "boundary");
 
-  const selected = props.value;
+  const label = props.label ?? defaultLabel;
 
   return (
-    <Listbox value={selected} onChange={props.onChange} disabled={loading}>
-      <div className="relative">
+    <Listbox value={selected} onChange={props.onChange}>
+      <div className="relative flex-1">
         <Listbox.Button className="relative w-full cursor-default pr-6 text-right text-xs text-zinc-400 focus:outline-none disabled:cursor-not-allowed disabled:bg-transparent disabled:text-zinc-700 sm:text-sm">
           <span className="block truncate">
-            {selected?.bed_object.name ?? "No Preset"}
+            {selected ? label(selected) : "No Preset"}
           </span>
           <span className="pointer-events-none absolute inset-y-0 right-0 mt-1 flex items-center">
             <CareIcon icon="l-angle-down" className="text-lg text-zinc-500" />
@@ -46,7 +35,7 @@ export default function AssetBedSelect(props: Props) {
           leaveTo="opacity-0"
         >
           <Listbox.Options className="absolute z-20 mt-1 max-h-48 w-full overflow-auto rounded-b-lg bg-zinc-900/75 py-1 text-base shadow-lg ring-1 ring-white/5 backdrop-blur-sm focus:outline-none sm:text-sm md:max-h-60">
-            {data?.results.map((obj) => (
+            {options?.map((obj) => (
               <Listbox.Option
                 key={obj.id}
                 className={({ active }) =>
@@ -63,7 +52,7 @@ export default function AssetBedSelect(props: Props) {
                         selected ? "font-bold text-white" : "font-normal"
                       }`}
                     >
-                      {obj.bed_object.name}: {obj.meta.preset_name}
+                      {label(obj)}
                     </span>
                   </>
                 )}
@@ -75,3 +64,7 @@ export default function AssetBedSelect(props: Props) {
     </Listbox>
   );
 }
+
+const defaultLabel = ({ bed_object, meta }: AssetBedModel) => {
+  return `${bed_object.name}: ${meta.preset_name}`;
+};

src/Components/CameraFeed/CameraFeed.tsx

@@ -24,6 +24,7 @@ interface Props {
   // Controls
   constrolsDisabled?: boolean;
   shortcutsDisabled?: boolean;
+  onMove?: () => void;
 }
 
 export default function CameraFeed(props: Props) {
@@ -76,7 +77,7 @@ export default function CameraFeed(props: Props) {
       },
       onError: props.onStreamError,
     });
-  }, [player.initializeStream, props.onStreamSuccess, props.onStreamError]);
+  }, [player.initializeStream]);
 
   // Start stream on mount
   useEffect(() => initializeStream(), [initializeStream]);
@@ -90,7 +91,7 @@ export default function CameraFeed(props: Props) {
     <Fullscreen fullscreen={isFullscreen} onExit={() => setFullscreen(false)}>
       <div
         className={classNames(
-          "flex flex-col overflow-clip rounded-xl bg-black",
+          "flex max-h-screen flex-col overflow-clip rounded-xl bg-black",
           props.className,
         )}
       >
@@ -180,6 +181,7 @@ export default function CameraFeed(props: Props) {
               setFullscreen={setFullscreen}
               onReset={resetStream}
               onMove={async (data) => {
+                props.onMove?.();
                 setState("moving");
                 const { res } = await operate({ type: "relative_move", data });
                 setTimeout(() => {

src/Components/CameraFeed/CameraFeedWithBedPresets.tsx

@@ -2,14 +2,22 @@ import { useState } from "react";
 import { AssetBedModel, AssetData } from "../Assets/AssetTypes";
 import CameraFeed from "./CameraFeed";
 import AssetBedSelect from "./AssetBedSelect";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
+import useSlug from "../../Common/hooks/useSlug";
 
 interface Props {
   asset: AssetData;
 }
 
 export default function LocationFeedTile(props: Props) {
+  const facility = useSlug("facility");
   const [preset, setPreset] = useState<AssetBedModel>();
 
+  const { data, loading } = useQuery(routes.listAssetBeds, {
+    query: { limit: 100, facility, asset: props.asset?.id },
+  });
+
   return (
     <CameraFeed
       asset={props.asset}
@@ -18,11 +26,15 @@ export default function LocationFeedTile(props: Props) {
       shortcutsDisabled
     >
       <div className="w-64">
-        <AssetBedSelect
-          asset={props.asset}
-          value={preset}
-          onChange={setPreset}
-        />
+        {loading ? (
+          <span>loading presets...</span>
+        ) : (
+          <AssetBedSelect
+            options={data?.results ?? []}
+            value={preset}
+            onChange={setPreset}
+          />
+        )}
       </div>
     </CameraFeed>
   );