From 269d00ff74901614198bb6b2db1542291f767e00 Mon Sep 17 00:00:00 2001
From: "Tasnimul H. Tauhid" <thtauhid.71@gmail.com>
Date: Tue, 26 Sep 2023 18:52:38 +0530
Subject: [PATCH 1/4] Added logic for showing "Track Shifting" button when
 patient has active shifting (#6318)

* logic for track shifting button

* removed console log

* cypress fix

* cypress fix

---------

Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
---
 cypress/e2e/patient_spec/patient_crud.cy.ts   |  2 +
 .../pageobject/Facility/FacilityCreation.ts   |  2 -
 .../pageobject/Patient/PatientConsultation.ts |  1 +
 cypress/pageobject/Patient/PatientCreation.ts |  4 ++
 .../Facility/ConsultationDetails/index.tsx    | 67 +++++++++++++++----
 5 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
index b55732fa440..b22ccdbce13 100644
--- a/cypress/e2e/patient_spec/patient_crud.cy.ts
+++ b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -33,6 +33,7 @@ describe("Patient Creation with consultation", () => {
   it("Create a new patient with no consultation", () => {
     patientPage.createPatient();
     patientPage.selectFacility("dummy facility");
+    patientPage.patientformvisibility();
     patientPage.enterPatientDetails(
       phone_number,
       emergency_phone_number,
@@ -69,6 +70,7 @@ describe("Patient Creation with consultation", () => {
     patientPage.interceptFacilities();
     patientPage.visitUpdatePatientUrl();
     patientPage.verifyStatusCode();
+    patientPage.patientformvisibility();
     updatePatientPage.enterPatientDetails(
       "Test E2E User Edited",
       "O+",
diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
index b6285bff72b..42ec6d8fd7c 100644
--- a/cypress/pageobject/Facility/FacilityCreation.ts
+++ b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -191,9 +191,7 @@ class FacilityPage {
   }
 
   verifyfacilitycreateassetredirection() {
-    cy.intercept("GET", "**/api/v1/facility/**").as("getNewAssets");
     cy.url().should("include", "/assets/new");
-    cy.wait("@getNewAssets").its("response.statusCode").should("eq", 200);
   }
 
   verifyassetfacilitybackredirection() {
diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index c0ba0c260d8..b1c95d19140 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -16,6 +16,7 @@ export class PatientConsultationPage {
   }
 
   fillIllnessHistory(history: string) {
+    cy.wait(5000);
     cy.get("#history_of_present_illness").scrollIntoView();
     cy.get("#history_of_present_illness").should("be.visible");
     cy.get("#history_of_present_illness").click().type(history);
diff --git a/cypress/pageobject/Patient/PatientCreation.ts b/cypress/pageobject/Patient/PatientCreation.ts
index 9b8df4a287e..4fcd43dc490 100644
--- a/cypress/pageobject/Patient/PatientCreation.ts
+++ b/cypress/pageobject/Patient/PatientCreation.ts
@@ -124,4 +124,8 @@ export class PatientPage {
   verifyStatusCode() {
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
   }
+
+  patientformvisibility() {
+    cy.get("[data-testid='current-address']").scrollIntoView();
+  }
 }
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index c23bf071fa1..403f1752704 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -5,7 +5,11 @@ import {
   SYMPTOM_CHOICES,
 } from "../../../Common/constants";
 import { ConsultationModel, ICD11DiagnosisModel } from "../models";
-import { getConsultation, getPatient } from "../../../Redux/actions";
+import {
+  getConsultation,
+  getPatient,
+  listShiftRequests,
+} from "../../../Redux/actions";
 import { statusType, useAbortableEffect } from "../../../Common/utils";
 import { lazy, useCallback, useState } from "react";
 import ToolTip from "../../Common/utils/Tooltip";
@@ -79,6 +83,7 @@ export const ConsultationDetails = (props: any) => {
     {} as ConsultationModel
   );
   const [patientData, setPatientData] = useState<PatientModel>({});
+  const [activeShiftingData, setActiveShiftingData] = useState<Array<any>>([]);
   const [openDischargeSummaryDialog, setOpenDischargeSummaryDialog] =
     useState(false);
   const [openDischargeDialog, setOpenDischargeDialog] = useState(false);
@@ -140,6 +145,15 @@ export const ConsultationDetails = (props: any) => {
             };
             setPatientData(data);
           }
+
+          // Get shifting data
+          const shiftingRes = await dispatch(
+            listShiftRequests({ patient: id }, "shift-list-call")
+          );
+          if (shiftingRes?.data?.results) {
+            const data = shiftingRes.data.results;
+            setActiveShiftingData(data);
+          }
         } else {
           navigate("/not-found");
         }
@@ -168,6 +182,19 @@ export const ConsultationDetails = (props: any) => {
 
   const SelectedTab = TABS[tab];
 
+  const hasActiveShiftingRequest = () => {
+    if (activeShiftingData.length > 0) {
+      return [
+        "PENDING",
+        "APPROVED",
+        "DESTINATION APPROVED",
+        "PATIENT TO BE PICKED UP",
+      ].includes(activeShiftingData[activeShiftingData.length - 1].status);
+    }
+
+    return false;
+  };
+
   if (isLoading) {
     return <Loading />;
   }
@@ -265,17 +292,33 @@ export const ConsultationDetails = (props: any) => {
           <div className="-right-6 top-0 flex w-full flex-col space-y-1 sm:w-min sm:flex-row sm:items-center sm:space-y-0 sm:divide-x-2 lg:absolute xl:right-0">
             {!consultationData.discharge_date && (
               <div className="flex w-full flex-col px-2 sm:flex-row">
-                <ButtonV2
-                  onClick={() =>
-                    navigate(
-                      `/facility/${patientData.facility}/patient/${patientData.id}/shift/new`
-                    )
-                  }
-                  className="btn btn-primary m-1 w-full hover:text-white"
-                >
-                  <CareIcon className="care-l-ambulance h-5 w-5" />
-                  Shift Patient
-                </ButtonV2>
+                {hasActiveShiftingRequest() ? (
+                  <ButtonV2
+                    onClick={() =>
+                      navigate(
+                        `/shifting/${
+                          activeShiftingData[activeShiftingData.length - 1].id
+                        }`
+                      )
+                    }
+                    className="btn btn-primary m-1 w-full hover:text-white"
+                  >
+                    <CareIcon className="care-l-ambulance h-5 w-5" />
+                    Track Shifting
+                  </ButtonV2>
+                ) : (
+                  <ButtonV2
+                    onClick={() =>
+                      navigate(
+                        `/facility/${patientData.facility}/patient/${patientData.id}/shift/new`
+                      )
+                    }
+                    className="btn btn-primary m-1 w-full hover:text-white"
+                  >
+                    <CareIcon className="care-l-ambulance h-5 w-5" />
+                    Shift Patient
+                  </ButtonV2>
+                )}
                 <button
                   onClick={() => {
                     triggerGoal("Doctor Connect Clicked", {

From 9bc19ed6c4d396bfdbb6db8d7d90cee4ea5eaace Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Wed, 27 Sep 2023 15:59:02 +0530
Subject: [PATCH 2/4] `request`: adds type check for `TBody` (#6358)

* `request`: adds type check for `TBody`

* rename `Res` to `Type`

* update docs
---
 src/Redux/api.tsx            | 13 +++++++------
 src/Utils/request/README.md  |  9 +++++----
 src/Utils/request/request.ts |  8 ++++----
 src/Utils/request/types.ts   | 11 +++++++----
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 8eff2594af0..1aa06c7e1bc 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -8,7 +8,7 @@ import { PaginatedResponse } from "../Utils/request/types";
  * A fake function that returns an empty object casted to type T
  * @returns Empty object as type T
  */
-function Res<T>(): T {
+function Type<T>(): T {
   return {} as T;
 }
 
@@ -22,7 +22,7 @@ const routes = {
     path: import.meta.env.REACT_APP_CONFIG ?? "/config.json",
     method: "GET",
     noAuth: true,
-    TRes: Res<IConfig>(),
+    TRes: Type<IConfig>(),
   },
 
   // Auth Endpoints
@@ -35,7 +35,8 @@ const routes = {
   token_refresh: {
     path: "/api/v1/auth/token/refresh/",
     method: "POST",
-    TRes: Res<JwtTokenObtainPair>(),
+    TRes: Type<JwtTokenObtainPair>(),
+    TBody: Type<{ refresh: string }>(),
   },
 
   token_verify: {
@@ -65,7 +66,7 @@ const routes = {
   // User Endpoints
   currentUser: {
     path: "/api/v1/users/getcurrentuser/",
-    TRes: Res<UserModel>(),
+    TRes: Type<UserModel>(),
   },
 
   userList: {
@@ -199,7 +200,7 @@ const routes = {
   listFacilityAssetLocation: {
     path: "/api/v1/facility/{facility_external_id}/asset_location/",
     method: "GET",
-    TRes: Res<PaginatedResponse<LocationModel>>(),
+    TRes: Type<PaginatedResponse<LocationModel>>(),
   },
   createFacilityAssetLocation: {
     path: "/api/v1/facility/{facility_external_id}/asset_location/",
@@ -805,7 +806,7 @@ const routes = {
   getAsset: {
     path: "/api/v1/asset/{external_id}/",
     method: "GET",
-    TRes: Res<AssetData>(),
+    TRes: Type<AssetData>(),
   },
   deleteAsset: {
     path: "/api/v1/asset/{external_id}/",
diff --git a/src/Utils/request/README.md b/src/Utils/request/README.md
index a9948d48f41..b0fa4459ef7 100644
--- a/src/Utils/request/README.md
+++ b/src/Utils/request/README.md
@@ -56,7 +56,8 @@ const FooRoutes = {
     path: "/api/v1/foo/{id}/",  // 👈 The path to the endpoint. Slug parameters can be specified using curly braces.
 
     method: "GET",              // 👈 The HTTP method to use. Optional; defaults to "GET".
-    TRes: Res<Foo()>,           // 👈 The type of the response body (for type inference).
+    TRes: Type<Foo>(),          // 👈 The type of the response body (for type inference).
+    TBody: Type<Foo>(),         // 👈 The type of the request body (for type inference).
     noAuth: true,               // 👈 Whether to skip adding the Authorization header to the request.
   },
 } as const; // 👈 This is important for type inference to work properly.
@@ -78,7 +79,7 @@ const options = {
   // thrown before the request is made.
 
   query: { limit: 10 },         // 👈 The query parameters to be added to the request URL.
-  body: { name: "foo" },        // 👈 The body to be sent with the request.
+  body: { name: "foo" },        // 👈 The body to be sent with the request. Should be compatible with the TBody type of the route.
   headers: { "X-Foo": "bar" },  // 👈 Additional headers to be sent with the request. (Coming soon...)
 
   silent: true,                 // 👈 Whether to suppress notifications for this request.
@@ -103,7 +104,7 @@ The `useQuery` hook returns an object with the following properties:
 
 ```ts
 {
-  res: Res<TRes> | undefined;   // 👈 The response object. `undefined` if the request has not been made yet.
+  res: Type<TRes> | undefined;  // 👈 The response object. `undefined` if the request has not been made yet.
   
   data: TRes | null;            // 👈 The response body. `null` if the request has not been made yet.
 
@@ -129,7 +130,7 @@ import FooRoutes from "@foo/routes";
 export default async function updateFoo(id: string, object: Foo) {
   const { res, data } = await request(FooRoutes.updateFoo, {
     pathParams: { id },
-    body: object,               // 👈 The body is automatically serialized to JSON.
+    body: object,               // 👈 The body is automatically serialized to JSON. Should be compatible with the TBody type of the route.
   });
 
   if (res.status === 403) {
diff --git a/src/Utils/request/request.ts b/src/Utils/request/request.ts
index c946f524ab9..2d735734aae 100644
--- a/src/Utils/request/request.ts
+++ b/src/Utils/request/request.ts
@@ -2,12 +2,12 @@ import handleResponse from "./handleResponse";
 import { RequestOptions, RequestResult, Route } from "./types";
 import { makeHeaders, makeUrl } from "./utils";
 
-interface Options<TData> extends RequestOptions<TData> {
+interface Options<TData, TBody> extends RequestOptions<TData, TBody> {
   controller?: AbortController;
 }
 
-export default async function request<TData>(
-  { path, method, noAuth }: Route<TData>,
+export default async function request<TData, TBody>(
+  { path, method, noAuth }: Route<TData, TBody>,
   {
     query,
     body,
@@ -16,7 +16,7 @@ export default async function request<TData>(
     onResponse,
     silent,
     reattempts = 3,
-  }: Options<TData> = {}
+  }: Options<TData, TBody> = {}
 ): Promise<RequestResult<TData>> {
   const signal = controller?.signal;
   const url = makeUrl(path, query, pathParams);
diff --git a/src/Utils/request/types.ts b/src/Utils/request/types.ts
index 7f01ef91d9c..e22d37f3090 100644
--- a/src/Utils/request/types.ts
+++ b/src/Utils/request/types.ts
@@ -12,11 +12,14 @@ export interface QueryRoute<TData> extends RouteBase<TData> {
   method?: "GET";
 }
 
-export interface MutationRoute<TData> extends RouteBase<TData> {
+export interface MutationRoute<TData, TBody> extends RouteBase<TData> {
   method: "POST" | "PUT" | "PATCH" | "DELETE";
+  TBody?: TBody;
 }
 
-export type Route<TData> = QueryRoute<TData> | MutationRoute<TData>;
+export type Route<TData, TBody> =
+  | QueryRoute<TData>
+  | MutationRoute<TData, TBody>;
 
 export interface RequestResult<TData> {
   res: Response | undefined;
@@ -24,9 +27,9 @@ export interface RequestResult<TData> {
   error: undefined | Record<string, unknown>;
 }
 
-export interface RequestOptions<TData = unknown> {
+export interface RequestOptions<TData = unknown, TBody = unknown> {
   query?: QueryParams;
-  body?: object;
+  body?: TBody;
   pathParams?: Record<string, string>;
   onResponse?: (res: RequestResult<TData>) => void;
   silent?: boolean;

From 6319cff72c0909cfc838b7da248c0cdb86ffc65b Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Wed, 27 Sep 2023 20:21:28 +0530
Subject: [PATCH 3/4] Remove default selection of patient category (#6354)

* Remove default selection of patient category

* Fix cypress
---
 cypress/e2e/patient_spec/patient_crud.cy.ts    |  1 +
 .../pageobject/Patient/PatientConsultation.ts  |  8 ++++++++
 src/Components/Facility/ConsultationForm.tsx   |  6 +++---
 src/Components/Patient/DailyRounds.tsx         | 18 ++++++++++++------
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
index b22ccdbce13..fcfd97039f7 100644
--- a/cypress/e2e/patient_spec/patient_crud.cy.ts
+++ b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -115,6 +115,7 @@ describe("Patient Creation with consultation", () => {
     patientConsultationPage.selectSymptoms("ASYMPTOMATIC");
 
     patientConsultationPage.enterConsultationDetails(
+      "Stable",
       "Examination details and Clinical conditions",
       "70",
       "170",
diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index b1c95d19140..6937559d548 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -23,6 +23,7 @@ export class PatientConsultationPage {
   }
 
   enterConsultationDetails(
+    category: string,
     examinationDetails: string,
     weight: string,
     height: string,
@@ -31,6 +32,11 @@ export class PatientConsultationPage {
     verificationBy: string
   ) {
     cy.get("#symptoms").click();
+    cy.get("#category")
+      .click()
+      .then(() => {
+        cy.get("[role='option']").contains(category).click();
+      });
     cy.get("#examination_details").click().type(examinationDetails);
     cy.get("#weight").click().type(height);
     cy.get("#height").click().type(weight);
@@ -39,10 +45,12 @@ export class PatientConsultationPage {
     cy.get(
       "#icd11_diagnoses_object input[placeholder='Select'][role='combobox']"
     )
+      .scrollIntoView()
       .click()
       .type("1A");
     cy.get("#icd11_diagnoses_object [role='option']")
       .contains("1A03 Intestinal infections due to Escherichia coli")
+      .scrollIntoView()
       .click();
     cy.get("label[for='icd11_diagnoses_object']").click();
     cy.wait("@getIcdResults").its("response.statusCode").should("eq", 200);
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 6c7e8a6760e..01a5f02b7b1 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -123,7 +123,7 @@ const initForm: FormDetails = {
   facility: "",
   admitted: "false",
   admitted_to: "",
-  category: "Comfort",
+  category: "",
   admission_date: new Date(),
   discharge_date: null,
   referred_to: "",
@@ -373,8 +373,8 @@ export const ConsultationForm = (props: any) => {
             admitted_to: res.data.admitted_to ? res.data.admitted_to : "",
             category: res.data.category
               ? PATIENT_CATEGORIES.find((i) => i.text === res.data.category)
-                  ?.id ?? "Comfort"
-              : "Comfort",
+                  ?.id ?? ""
+              : "",
             patient_no: res.data.patient_no ?? "",
             OPconsultation: res.data.consultation_notes,
             is_telemedicine: `${res.data.is_telemedicine}`,
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 351136e32d4..a84ad4a3e8b 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -42,7 +42,7 @@ const initForm: any = {
   other_symptoms: "",
   physical_examination_info: "",
   other_details: "",
-  patient_category: "Comfort",
+  patient_category: "",
   current_health: 0,
   recommend_discharge: false,
   action: null,
@@ -142,14 +142,14 @@ export const DailyRounds = (props: any) => {
       );
 
       if (!status.aborted) {
-        if (res && res.data) {
+        if (res?.data) {
           const data = {
             ...res.data,
             patient_category: res.data.patient_category
               ? PATIENT_CATEGORIES.find(
                   (i) => i.text === res.data.patient_category
-                )?.id || "Comfort"
-              : "Comfort",
+                )?.id ?? ""
+              : "",
             rhythm:
               (res.data.rhythm &&
                 RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
@@ -186,8 +186,8 @@ export const DailyRounds = (props: any) => {
             patient_category: res.data.patient_category
               ? PATIENT_CATEGORIES.find(
                   (i) => i.text === res.data.patient_category
-                )?.id || "Comfort"
-              : "Comfort",
+                )?.id ?? ""
+              : "",
             rhythm:
               (res.data.rhythm &&
                 RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
@@ -205,6 +205,12 @@ export const DailyRounds = (props: any) => {
     let invalidForm = false;
     Object.keys(state.form).forEach((field) => {
       switch (field) {
+        case "patient_category":
+          if (!state.form[field]) {
+            errors[field] = "Please select a category";
+            invalidForm = true;
+          }
+          return;
         case "other_symptoms":
           if (
             state.form.additional_symptoms?.includes(9) &&

From bebb693d0a8489701059a59272e2bef32723bbe8 Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Wed, 27 Sep 2023 22:02:38 +0530
Subject: [PATCH 4/4] Remove phone duplication check on patient update (#6359)

* Delay patient phone duplicate check

* Revert "Delay patient phone duplicate check"

This reverts commit 1fc93a73e719df2d88d56ce019c72806de593653.

* Remove phone duplication check on patient update
---
 src/Components/ExternalResult/FacilitiesSelectDialogue.tsx | 2 +-
 src/Components/Patient/PatientRegister.tsx                 | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
index 763d92f2d1f..7239e0b912d 100644
--- a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
+++ b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
@@ -34,7 +34,7 @@ const FacilitiesSelectDialog = (props: Props) => {
         <Cancel onClick={handleCancel} />
         <Submit
           onClick={handleOk}
-          disabled={!selectedFacility.id}
+          disabled={!selectedFacility?.id}
           label={t("select")}
           data-testid="submit-button"
         />
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index 41f36bffd35..c515e7584c1 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -72,8 +72,6 @@ import { FormContextValue } from "../Form/FormContext.js";
 const Loading = lazy(() => import("../Common/Loading"));
 const PageTitle = lazy(() => import("../Common/PageTitle"));
 
-// const debounce = require("lodash.debounce");
-
 interface PatientRegisterProps extends PatientModel {
   facilityId: string;
 }
@@ -1260,7 +1258,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                               required
                               label="Phone Number"
                               onChange={(event) => {
-                                duplicateCheck(event.value);
+                                if (!id) duplicateCheck(event.value);
                                 field("phone_number").onChange(event);
                               }}
                               types={["mobile", "landline"]}