From cdbe306ffb860544cfc4eaa3267da7821fb4e516 Mon Sep 17 00:00:00 2001
From: Vedant Jain <129421822+jainvedant392@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:33:02 +0530
Subject: [PATCH 01/22] Add loading screen in index.html (#6836)

---
 index.html | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/index.html b/index.html
index 58cb9fffcd1..83c80ef3214 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,34 @@
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
+    <div id="root">
+      <style>
+        .App-logo {
+          height: 10vmin;
+          pointer-events: none;
+          filter: brightness(80%);
+        }
+       @media (prefers-reduced-motion: no-preference) {
+          .App-logo {
+            animation: App-logo-blink 1s linear infinite;
+          }
+        }
+        @keyframes App-logo-blink {
+          0% { opacity: 0;}
+          25% { opacity: 0.5;}
+          50% {opacity: 1;}
+          75% {opacity: 0.5;}
+          100% {opacity: 0;}
+        }
+      </style>
+      <div style="display: grid;place-items: center;height: 100vh; text-align: center;">
+        <img 
+        class="App-logo"
+        src="https://cdn.coronasafe.network/light-logo.svg"
+        alt="Care is loading"
+        />
+      </div>
+    </div>
     <script type="module" src="/src/index.tsx"></script>
     <script
       src="https://kit.fontawesome.com/d69454c2e7.js"

From bd4dd9597cdbdcfe7a4b03a0f3823b1e64bb288b Mon Sep 17 00:00:00 2001
From: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:36:28 +0530
Subject: [PATCH 02/22] Show error for invalid records of import external
 results page (#6832)

* show error for invalid records

* refactor filter logic

* add warning icons
---
 .../ExternalResult/ExternalResultUpload.tsx   | 56 +++++++++++++++++--
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/Components/ExternalResult/ExternalResultUpload.tsx b/src/Components/ExternalResult/ExternalResultUpload.tsx
index 5a9262b2990..a8f9e339254 100644
--- a/src/Components/ExternalResult/ExternalResultUpload.tsx
+++ b/src/Components/ExternalResult/ExternalResultUpload.tsx
@@ -1,6 +1,6 @@
 import _ from "lodash-es";
 import { navigate } from "raviger";
-import { lazy, useState } from "react";
+import { lazy, useEffect, useState } from "react";
 import CSVReader from "react-csv-reader";
 import useConfig from "../../Common/hooks/useConfig";
 import * as Notification from "../../Utils/Notifications.js";
@@ -11,6 +11,7 @@ import useAppHistory from "../../Common/hooks/useAppHistory";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
 import { IExternalResult } from "./models";
+import CareIcon from "../../CAREUI/icons/CareIcon";
 
 export default function ExternalResultUpload() {
   const { sample_format_external_result_import } = useConfig();
@@ -18,12 +19,31 @@ export default function ExternalResultUpload() {
   const [loading, setLoading] = useState(false);
   const [csvData, setCsvData] = useState(new Array<IExternalResult>());
   const [errors, setErrors] = useState<any>([]);
+  const [validationErrorCount, setValidationErrorCount] = useState(0);
+  const [user, setUser] = useState<any>({});
   const handleForce = (data: any) => {
     setCsvData(data);
+    setValidationErrorCount(
+      data.filter(
+        (result: IExternalResult) =>
+          result.district !== user.district_object.name
+      ).length
+    );
   };
   const { t } = useTranslation();
   const { goBack } = useAppHistory();
 
+  const fetchUser = async () => {
+    const { data: userData } = await request(routes.currentUser, {
+      pathParams: {},
+    });
+    setUser(userData);
+  };
+
+  useEffect(() => {
+    fetchUser();
+  }, []);
+
   const papaparseOptions = {
     header: true,
     dynamicTyping: true,
@@ -44,13 +64,21 @@ export default function ExternalResultUpload() {
         try {
           const { res, data } = await request(routes.externalResultUploadCsv, {
             body: {
-              sample_tests: csvData,
+              sample_tests: validationErrorCount
+                ? csvData.filter(
+                    (data: IExternalResult) =>
+                      data.district === user.district_object.name
+                  )
+                : csvData,
             },
           });
 
           if (res && res.status === 202) {
             setLoading(false);
             navigate("/external_results");
+            Notification.Success({
+              msg: "External Results imported successfully",
+            });
           } else {
             if (data) {
               setErrors(data.map((err: any) => Object.entries(err)));
@@ -59,6 +87,9 @@ export default function ExternalResultUpload() {
           }
         } catch (error) {
           console.error("An error occurred:", error);
+          Notification.Error({
+            msg: "Something went wrong: " + error,
+          });
           setLoading(false);
         }
       } else {
@@ -121,6 +152,9 @@ export default function ExternalResultUpload() {
               </div>
             </div>
           </div>
+          {csvData.length > 0 && (
+            <p className="flex justify-end p-2">Total: {csvData.length}</p>
+          )}
           <div className=" rounded bg-white shadow">
             {csvData.map((data: any, index: number) => {
               return (
@@ -140,6 +174,14 @@ export default function ExternalResultUpload() {
                         })
                       : null}
                   </div>
+                  <div>
+                    {data.district !== user.district_object.name && (
+                      <p className="mt-2 flex items-center justify-center gap-1 text-red-500">
+                        <CareIcon icon="l-exclamation-triangle" /> Different
+                        districts
+                      </p>
+                    )}
+                  </div>
                 </div>
               );
             })}
@@ -149,8 +191,14 @@ export default function ExternalResultUpload() {
             <Cancel onClick={() => goBack()} />
             <Submit
               onClick={handleSubmit}
-              disabled={loading}
-              label={t("save")}
+              disabled={loading || csvData.length === validationErrorCount}
+              label={
+                validationErrorCount
+                  ? `Save Valid Records(${
+                      csvData.length - validationErrorCount
+                    })`
+                  : t("save")
+              }
               data-testid="submit-button"
             />
           </div>

From e292fb7e55a4e2eb5ba9cd1324075f7d0cf7e8b2 Mon Sep 17 00:00:00 2001
From: konavivekramakrishna
 <101407963+konavivekramakrishna@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:36:59 +0530
Subject: [PATCH 03/22] Refactor TransferPatientDialog component to display
 patient name in success notification (#6829)

---
 src/Components/Facility/TransferPatientDialog.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Components/Facility/TransferPatientDialog.tsx b/src/Components/Facility/TransferPatientDialog.tsx
index 632765c2492..e6133279a9e 100644
--- a/src/Components/Facility/TransferPatientDialog.tsx
+++ b/src/Components/Facility/TransferPatientDialog.tsx
@@ -125,8 +125,11 @@ const TransferPatientDialog = (props: Props) => {
       if (res && res.data && res.status === 200) {
         dispatch({ type: "set_form", form: initForm });
         handleOk();
+
+        const patientName =
+          patientOptions.find((p) => p.id === state.form.patient)?.text || "";
         Notification.Success({
-          msg: `Patient ${res.data.patient} transferred successfully`,
+          msg: `Patient ${patientName} transferred successfully`,
         });
         const newFacilityId =
           res.data && res.data.facility_object && res.data.facility_object.id;

From 27c5766455f60f324b636070ebfa72f8d5363da3 Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Wed, 13 Dec 2023 19:38:13 +0530
Subject: [PATCH 04/22] =?UTF-8?q?Prevent=20CARE=20from=20reloading=20durin?=
 =?UTF-8?q?g=20sign=20in/out=20=F0=9F=8F=83=E2=80=8D=E2=99=82=EF=B8=8F=20(?=
 =?UTF-8?q?#6828)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improve sign in flow

* Improve sign out flow

* Apply suggestions from code review

* lints

* i should have fixed lints from vscode itself ig
---
 src/Common/hooks/useAuthUser.ts               |  28 ++++-
 src/Components/Auth/Login.tsx                 |  43 +++-----
 .../Common/Sidebar/SidebarUserCard.tsx        |  15 ++-
 src/Components/ErrorPages/SessionExpired.tsx  |  12 +--
 src/Components/Users/UserProfile.tsx          |   7 +-
 src/Providers/AuthUserProvider.tsx            | 101 +++++++++++++++---
 src/Redux/api.tsx                             |  10 +-
 src/Routers/AppRouter.tsx                     |  16 +--
 src/Utils/request/utils.ts                    |   2 +-
 src/Utils/utils.ts                            |  37 -------
 10 files changed, 141 insertions(+), 130 deletions(-)

diff --git a/src/Common/hooks/useAuthUser.ts b/src/Common/hooks/useAuthUser.ts
index e46bbb4f0b2..dda5f399952 100644
--- a/src/Common/hooks/useAuthUser.ts
+++ b/src/Common/hooks/useAuthUser.ts
@@ -1,14 +1,32 @@
 import { createContext, useContext } from "react";
 import { UserModel } from "../../Components/Users/models";
+import { RequestResult } from "../../Utils/request/types";
+import { JwtTokenObtainPair, LoginCredentials } from "../../Redux/api";
 
-export const AuthUserContext = createContext<UserModel | null>(null);
+type SignInReturnType = RequestResult<JwtTokenObtainPair>;
 
-export default function useAuthUser() {
-  const user = useContext(AuthUserContext);
+type AuthContextType = {
+  user: UserModel | undefined;
+  signIn: (creds: LoginCredentials) => Promise<SignInReturnType>;
+  signOut: () => Promise<void>;
+};
 
-  if (!user) {
-    throw new Error("useAuthUser must be used within an AuthUserProvider");
+export const AuthUserContext = createContext<AuthContextType | null>(null);
+
+export const useAuthContext = () => {
+  const ctx = useContext(AuthUserContext);
+  if (!ctx) {
+    throw new Error(
+      "'useAuthContext' must be used within 'AuthUserProvider' only"
+    );
   }
+  return ctx;
+};
 
+export default function useAuthUser() {
+  const user = useAuthContext().user;
+  if (!user) {
+    throw new Error("'useAuthUser' must be used within 'AppRouter' only");
+  }
   return user;
 }
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index 4aad207c25a..c2acb88cf0c 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -9,12 +9,13 @@ import LanguageSelectorLogin from "../Common/LanguageSelectorLogin";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import useConfig from "../../Common/hooks/useConfig";
 import CircularProgress from "../Common/components/CircularProgress";
-import { LocalStorageKeys } from "../../Common/constants";
 import ReactMarkdown from "react-markdown";
 import rehypeRaw from "rehype-raw";
-import { handleRedirection, invalidateFiltersCache } from "../../Utils/utils";
+import { invalidateFiltersCache } from "../../Utils/utils";
+import { useAuthContext } from "../../Common/hooks/useAuthUser";
 
 export const Login = (props: { forgot?: boolean }) => {
+  const { signIn } = useAuthContext();
   const {
     main_logo,
     recaptcha_site_key,
@@ -82,7 +83,7 @@ export const Login = (props: { forgot?: boolean }) => {
     return form;
   };
 
-  // set loading to false when component is dismounted
+  // set loading to false when component is unmounted
   useEffect(() => {
     return () => {
       setLoading(false);
@@ -91,35 +92,17 @@ export const Login = (props: { forgot?: boolean }) => {
 
   const handleSubmit = async (e: any) => {
     e.preventDefault();
+
+    setLoading(true);
     invalidateFiltersCache();
-    const valid = validateData();
-    if (valid) {
-      // replaces button with spinner
-      setLoading(true);
 
-      const { res, data } = await request(routes.login, {
-        body: { ...valid },
-      });
-      if (res && res.status === 429) {
-        setCaptcha(true);
-        // captcha displayed set back to login button
-        setLoading(false);
-      } else if (res && res.status === 200 && data) {
-        localStorage.setItem(LocalStorageKeys.accessToken, data.access);
-        localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
-        if (
-          window.location.pathname === "/" ||
-          window.location.pathname === "/login"
-        ) {
-          handleRedirection();
-        } else {
-          window.location.href = window.location.pathname.toString();
-        }
-      } else {
-        // error from server set back to login button
-        setLoading(false);
-      }
-    }
+    const validated = validateData();
+    if (!validated) return;
+
+    const { res } = await signIn(validated);
+
+    setCaptcha(res?.status === 429);
+    setLoading(false);
   };
 
   const validateForgetData = () => {
diff --git a/src/Components/Common/Sidebar/SidebarUserCard.tsx b/src/Components/Common/Sidebar/SidebarUserCard.tsx
index 59970e8a73c..75cf2d9ce43 100644
--- a/src/Components/Common/Sidebar/SidebarUserCard.tsx
+++ b/src/Components/Common/Sidebar/SidebarUserCard.tsx
@@ -1,13 +1,13 @@
 import { Link } from "raviger";
 import { useTranslation } from "react-i18next";
 import CareIcon from "../../../CAREUI/icons/CareIcon";
-import { handleSignOut } from "../../../Utils/utils";
-import useAuthUser from "../../../Common/hooks/useAuthUser";
+import { formatName } from "../../../Utils/utils";
+import useAuthUser, { useAuthContext } from "../../../Common/hooks/useAuthUser";
 
 const SidebarUserCard = ({ shrinked }: { shrinked: boolean }) => {
   const { t } = useTranslation();
   const user = useAuthUser();
-  const profileName = `${user.first_name ?? ""} ${user.last_name ?? ""}`.trim();
+  const { signOut } = useAuthContext();
 
   return (
     <div
@@ -18,10 +18,7 @@ const SidebarUserCard = ({ shrinked }: { shrinked: boolean }) => {
       <Link href="/user/profile" className="flex-none py-3">
         <CareIcon className="care-l-user-circle text-3xl text-white" />
       </Link>
-      <div
-        className="flex cursor-pointer justify-center"
-        onClick={() => handleSignOut(true)}
-      >
+      <div className="flex cursor-pointer justify-center" onClick={signOut}>
         <CareIcon
           className={`care-l-sign-out-alt text-2xl text-gray-400 ${
             shrinked ? "visible" : "hidden"
@@ -39,12 +36,12 @@ const SidebarUserCard = ({ shrinked }: { shrinked: boolean }) => {
             className="flex-nowrap overflow-hidden break-words font-semibold text-white"
             id="profilenamelink"
           >
-            {profileName}
+            {formatName(user)}
           </Link>
         </div>
         <div
           className="min-h-6 flex cursor-pointer items-center"
-          onClick={() => handleSignOut(true)}
+          onClick={signOut}
         >
           <CareIcon
             className={`care-l-sign-out-alt ${
diff --git a/src/Components/ErrorPages/SessionExpired.tsx b/src/Components/ErrorPages/SessionExpired.tsx
index 25b57e789c9..419c9c44dce 100644
--- a/src/Components/ErrorPages/SessionExpired.tsx
+++ b/src/Components/ErrorPages/SessionExpired.tsx
@@ -1,12 +1,12 @@
 import * as Notification from "../../Utils/Notifications";
 import { useNavigate } from "raviger";
-import { useContext, useEffect } from "react";
-import { handleSignOut } from "../../Utils/utils";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import { AuthUserContext } from "../../Common/hooks/useAuthUser";
+import { useAuthContext } from "../../Common/hooks/useAuthUser";
 
 export default function SessionExpired() {
-  const isAuthenticated = !!useContext(AuthUserContext);
+  const { signOut, user } = useAuthContext();
+  const isAuthenticated = !!user;
   const navigate = useNavigate();
   const { t } = useTranslation();
 
@@ -32,9 +32,7 @@ export default function SessionExpired() {
           <br />
           <br />
           <div
-            onClick={() => {
-              handleSignOut(false);
-            }}
+            onClick={signOut}
             className="hover:bg-primary- inline-block cursor-pointer rounded-lg bg-primary-600 px-4 py-2 text-white hover:text-white"
           >
             {t("return_to_login")}
diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx
index 76a94745c1a..2dc75d33613 100644
--- a/src/Components/Users/UserProfile.tsx
+++ b/src/Components/Users/UserProfile.tsx
@@ -5,7 +5,7 @@ import * as Notification from "../../Utils/Notifications.js";
 import LanguageSelector from "../../Components/Common/LanguageSelector";
 import TextFormField from "../Form/FormFields/TextFormField";
 import ButtonV2, { Submit } from "../Common/components/ButtonV2";
-import { classNames, handleSignOut, parsePhoneNumber } from "../../Utils/utils";
+import { classNames, parsePhoneNumber } from "../../Utils/utils";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import { FieldChangeEvent } from "../Form/FormFields/Utils";
@@ -13,7 +13,7 @@ import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import { GenderType, SkillModel, UpdatePasswordForm } from "../Users/models";
 import UpdatableApp, { checkForUpdate } from "../Common/UpdatableApp";
 import dayjs from "../../Utils/dayjs";
-import useAuthUser from "../../Common/hooks/useAuthUser";
+import useAuthUser, { useAuthContext } from "../../Common/hooks/useAuthUser";
 import { PhoneNumberValidator } from "../Form/FieldValidators";
 import useQuery from "../../Utils/request/useQuery";
 import routes from "../../Redux/api";
@@ -100,6 +100,7 @@ const editFormReducer = (state: State, action: Action) => {
 };
 
 export default function UserProfile() {
+  const { signOut } = useAuthContext();
   const [states, dispatch] = useReducer(editFormReducer, initialState);
   const [updateStatus, setUpdateStatus] = useState({
     isChecking: false,
@@ -413,7 +414,7 @@ export default function UserProfile() {
                 >
                   {showEdit ? "Cancel" : "Edit User Profile"}
                 </ButtonV2>
-                <ButtonV2 variant="danger" onClick={(_) => handleSignOut(true)}>
+                <ButtonV2 variant="danger" onClick={signOut}>
                   <CareIcon className="care-l-sign-out-alt" />
                   Sign out
                 </ButtonV2>
diff --git a/src/Providers/AuthUserProvider.tsx b/src/Providers/AuthUserProvider.tsx
index d515149341e..5435b0f0b45 100644
--- a/src/Providers/AuthUserProvider.tsx
+++ b/src/Providers/AuthUserProvider.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useCallback, useEffect } from "react";
 import { AuthUserContext } from "../Common/hooks/useAuthUser";
 import Loading from "../Components/Common/Loading";
 import routes from "../Redux/api";
@@ -6,6 +6,7 @@ import useQuery from "../Utils/request/useQuery";
 import { LocalStorageKeys } from "../Common/constants";
 import request from "../Utils/request/request";
 import useConfig from "../Common/hooks/useConfig";
+import { navigate } from "raviger";
 
 interface Props {
   children: React.ReactNode;
@@ -14,34 +15,78 @@ interface Props {
 
 export default function AuthUserProvider({ children, unauthorized }: Props) {
   const { jwt_token_refresh_interval } = useConfig();
-  const { res, data, loading } = useQuery(routes.currentUser, {
-    refetchOnWindowFocus: false,
-    prefetch: true,
-    silent: true,
-  });
+  const tokenRefreshInterval = jwt_token_refresh_interval ?? 5 * 60 * 1000;
+
+  const {
+    res,
+    data: user,
+    loading,
+    refetch,
+  } = useQuery(routes.currentUser, { silent: true });
 
   useEffect(() => {
-    if (!data) {
+    if (!user) {
       return;
     }
 
     updateRefreshToken(true);
-    setInterval(
-      () => updateRefreshToken(),
-      jwt_token_refresh_interval ?? 5 * 60 * 1000
-    );
-  }, [data, jwt_token_refresh_interval]);
+    setInterval(() => updateRefreshToken(), tokenRefreshInterval);
+  }, [user, tokenRefreshInterval]);
+
+  const signIn = useCallback(
+    async (creds: { username: string; password: string }) => {
+      const query = await request(routes.login, { body: creds });
+
+      if (query.res?.ok && query.data) {
+        localStorage.setItem(LocalStorageKeys.accessToken, query.data.access);
+        localStorage.setItem(LocalStorageKeys.refreshToken, query.data.refresh);
+
+        await refetch();
+        navigate(getRedirectOr("/"));
+      }
+
+      return query;
+    },
+    [refetch]
+  );
+
+  const signOut = useCallback(async () => {
+    localStorage.removeItem(LocalStorageKeys.accessToken);
+    localStorage.removeItem(LocalStorageKeys.refreshToken);
+
+    await refetch();
+
+    const redirectURL = getRedirectURL();
+    navigate(redirectURL ? `/?redirect=${redirectURL}` : "/");
+  }, [refetch]);
+
+  // Handles signout from current tab, if signed out from another tab.
+  useEffect(() => {
+    const listener = (event: any) => {
+      if (
+        !event.newValue &&
+        (LocalStorageKeys.accessToken === event.key ||
+          LocalStorageKeys.refreshToken === event.key)
+      ) {
+        signOut();
+      }
+    };
+
+    addEventListener("storage", listener);
+
+    return () => {
+      removeEventListener("storage", listener);
+    };
+  }, [signOut]);
 
   if (loading || !res) {
     return <Loading />;
   }
 
-  if (res.status !== 200 || !data) {
-    return unauthorized;
-  }
-
   return (
-    <AuthUserContext.Provider value={data}>{children}</AuthUserContext.Provider>
+    <AuthUserContext.Provider value={{ signIn, signOut, user }}>
+      {!res.ok || !user ? unauthorized : children}
+    </AuthUserContext.Provider>
   );
 }
 
@@ -66,3 +111,25 @@ const updateRefreshToken = async (silent = false) => {
   localStorage.setItem(LocalStorageKeys.accessToken, data.access);
   localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
 };
+
+const getRedirectURL = () => {
+  return new URLSearchParams(window.location.search).get("redirect");
+};
+
+const getRedirectOr = (fallback: string) => {
+  const url = getRedirectURL();
+
+  if (url) {
+    try {
+      const redirect = new URL(url);
+      if (window.location.origin === redirect.origin) {
+        return redirect.pathname + redirect.search;
+      }
+      console.error("Redirect does not belong to same origin.");
+    } catch {
+      console.error(`Invalid redirect URL: ${url}`);
+    }
+  }
+
+  return fallback;
+};
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 2a7681975a4..31284d60ecf 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -80,12 +80,12 @@ export function Type<T>(): T {
   return {} as T;
 }
 
-interface JwtTokenObtainPair {
+export interface JwtTokenObtainPair {
   access: string;
   refresh: string;
 }
 
-interface LoginInput {
+export interface LoginCredentials {
   username: string;
   password: string;
 }
@@ -104,16 +104,14 @@ const routes = {
     method: "POST",
     noAuth: true,
     TRes: Type<JwtTokenObtainPair>(),
-    TBody: Type<LoginInput>(),
+    TBody: Type<LoginCredentials>(),
   },
 
   token_refresh: {
     path: "/api/v1/auth/token/refresh/",
     method: "POST",
     TRes: Type<JwtTokenObtainPair>(),
-    TBody: Type<{
-      refresh: string;
-    }>(),
+    TBody: Type<{ refresh: JwtTokenObtainPair["refresh"] }>(),
   },
 
   token_verify: {
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index d098a480149..5e238627bc8 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -10,9 +10,8 @@ import {
   SIDEBAR_SHRINK_PREFERENCE_KEY,
   SidebarShrinkContext,
 } from "../Components/Common/Sidebar/Sidebar";
-import { BLACKLISTED_PATHS, LocalStorageKeys } from "../Common/constants";
+import { BLACKLISTED_PATHS } from "../Common/constants";
 import useConfig from "../Common/hooks/useConfig";
-import { handleSignOut } from "../Utils/utils";
 import SessionExpired from "../Components/ErrorPages/SessionExpired";
 
 import UserRoutes from "./routes/UserRoutes";
@@ -63,19 +62,6 @@ export default function AppRouter() {
   const path = usePath();
   const [sidebarOpen, setSidebarOpen] = useState(false);
 
-  useEffect(() => {
-    addEventListener("storage", (event: any) => {
-      if (
-        [LocalStorageKeys.accessToken, LocalStorageKeys.refreshToken].includes(
-          event.key
-        ) &&
-        !event.newValue
-      ) {
-        handleSignOut(true);
-      }
-    });
-  }, []);
-
   useEffect(() => {
     setSidebarOpen(false);
     let flag = false;
diff --git a/src/Utils/request/utils.ts b/src/Utils/request/utils.ts
index f22dca369f2..dd1f79fce4f 100644
--- a/src/Utils/request/utils.ts
+++ b/src/Utils/request/utils.ts
@@ -92,6 +92,6 @@ export function mergeRequestOptions<TData>(
       options.onResponse?.(res);
       overrides.onResponse?.(res);
     },
-    silent: overrides.silent || options.silent,
+    silent: overrides.silent ?? options.silent,
   };
 }
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index c3e2030b3ed..5f763c9c445 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -1,8 +1,6 @@
-import { navigate } from "raviger";
 import {
   AREACODES,
   IN_LANDLINE_AREA_CODES,
-  LocalStorageKeys,
   USER_TYPES,
 } from "../Common/constants";
 import phoneCodesJson from "../Common/static/countryPhoneAndFlags.json";
@@ -121,41 +119,6 @@ export const dateQueryString = (date: DateLike) => {
 
 export const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
 
-export const handleSignOut = (forceReload: boolean) => {
-  Object.values(LocalStorageKeys).forEach((key) =>
-    localStorage.removeItem(key)
-  );
-  const redirectURL = new URLSearchParams(window.location.search).get(
-    "redirect"
-  );
-  const url = redirectURL ? `/?redirect=${redirectURL}` : "/";
-  if (forceReload) {
-    window.location.href = url;
-  } else {
-    navigate(url);
-  }
-};
-
-export const handleRedirection = () => {
-  const redirectParam = new URLSearchParams(window.location.search).get(
-    "redirect"
-  );
-  try {
-    if (redirectParam) {
-      const redirectURL = new URL(redirectParam);
-
-      if (redirectURL.origin === window.location.origin) {
-        const newPath = redirectURL.pathname + redirectURL.search;
-        window.location.href = `${window.location.origin}${newPath}`;
-        return;
-      }
-    }
-    window.location.href = "/facility";
-  } catch {
-    window.location.href = "/facility";
-  }
-};
-
 /**
  * Referred from: https://stackoverflow.com/a/9039885/7887936
  * @returns `true` if device is iOS, else `false`

From 20e706f7d648a95be29610921421330951869874 Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:40:20 +0530
Subject: [PATCH 05/22] fix tooltip (#6827)

---
 src/Components/Users/SkillsSlideOver.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Components/Users/SkillsSlideOver.tsx b/src/Components/Users/SkillsSlideOver.tsx
index 744dfacde7e..1819333451d 100644
--- a/src/Components/Users/SkillsSlideOver.tsx
+++ b/src/Components/Users/SkillsSlideOver.tsx
@@ -105,7 +105,11 @@ export default ({ show, setShow, username }: IProps) => {
         <div>
           <div className="col-span-full sm:col-span-3 sm:col-start-2">
             {(!isLoading || !skillsLoading) && (
-              <div className="tooltip flex items-center gap-2">
+              <div
+                className={`${
+                  !authorizeForAddSkill && "tooltip"
+                } flex items-center gap-2`}
+              >
                 <SkillSelect
                   id="select-skill"
                   multiple={false}

From 68fbb0459c1a9e53b9b24c80d50f46f94e30d6c7 Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:48:08 +0530
Subject: [PATCH 06/22] Update API path for asset service records (#6826)

* Update API path for asset service records

* Update resource API path to include trailing slash
---
 src/Redux/api.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 31284d60ecf..9d09f7e889f 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -953,7 +953,7 @@ const routes = {
     TBody: Type<Partial<IResource>>(),
   },
   updateResource: {
-    path: "/api/v1/resource/{id}",
+    path: "/api/v1/resource/{id}/",
     method: "PUT",
     TRes: Type<IResource>(),
     TBody: Type<Partial<IResource>>(),
@@ -1055,7 +1055,7 @@ const routes = {
     method: "GET",
   },
   updateAssetService: {
-    path: "/api/v1/asset/{asset_external_id}/service_records/{external_id}",
+    path: "/api/v1/asset/{asset_external_id}/service_records/{external_id}/",
     method: "PUT",
     TRes: Type<AssetService>(),
     TBody: Type<AssetServiceUpdate>(),

From e857d03e4ae5ae418a0db965e7c3bdd2b7b2eb4d Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:48:48 +0530
Subject: [PATCH 07/22] Resolve page scroll resets in consultations tabs.
 (#6825)

* add whitespace

* add min height
---
 .../Facility/ConsultationDetails/ConsultationABGTab.tsx    | 2 +-
 .../ConsultationDetails/ConsultationDialysisTab.tsx        | 2 +-
 .../ConsultationNeurologicalMonitoringTab.tsx              | 2 +-
 .../ConsultationDetails/ConsultationNursingTab.tsx         | 2 +-
 .../ConsultationDetails/ConsultationNutritionTab.tsx       | 2 +-
 .../ConsultationDetails/ConsultationSummaryTab.tsx         | 2 +-
 .../ConsultationDetails/ConsultationVentilatorTab.tsx      | 2 +-
 src/Components/Facility/ConsultationDetails/index.tsx      | 1 -
 src/Components/Facility/Consultations/NursingPlot.tsx      | 2 +-
 .../Facility/Investigations/ViewInvestigations.tsx         | 5 ++++-
 .../Medicine/MedicineAdministrationSheet/index.tsx         | 4 +++-
 src/Components/Patient/FileUpload.tsx                      | 7 ++++++-
 12 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
index cf0ce7bd6af..ea0e466dffa 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationABGTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></ABGPlots>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
index c3515a80953..43aaf627534 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
@@ -8,7 +8,7 @@ export const ConsultationDialysisTab = (props: ConsultationTabProps) => {
   return (
     <div>
       <PageTitle title="Dialysis Plots" hideBack={true} breadcrumbs={false} />
-      <DialysisPlots consultationId={props.consultationId}></DialysisPlots>
+      <DialysisPlots consultationId={props.consultationId} />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
index 85f34f0ec63..5956071e5fa 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
@@ -18,7 +18,7 @@ export const ConsultationNeurologicalMonitoringTab = (
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NeurologicalTable>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
index 721ee18d13e..f8d38b2adb3 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
@@ -12,7 +12,7 @@ export const ConsultationNursingTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NursingPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
index 74e250f0577..75e0987cffd 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
@@ -12,7 +12,7 @@ export const ConsultationNutritionTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NutritionPlots>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
index 69d20dd64c9..09f6cb05a7b 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationSummaryTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></PrimaryParametersPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
index d14b54cc096..36a72ab789e 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationVentilatorTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></VentilatorPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 2f6ca03ef06..54eee52878e 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -462,7 +462,6 @@ export const ConsultationDetails = (props: any) => {
             </div>
           </div>
         </div>
-
         <SelectedTab {...consultationTabProps} />
       </div>
 
diff --git a/src/Components/Facility/Consultations/NursingPlot.tsx b/src/Components/Facility/Consultations/NursingPlot.tsx
index 83444b6c50f..b141e18f987 100644
--- a/src/Components/Facility/Consultations/NursingPlot.tsx
+++ b/src/Components/Facility/Consultations/NursingPlot.tsx
@@ -121,7 +121,7 @@ export const NursingPlot = (props: any) => {
         </div>
       </div>
 
-      {totalCount > PAGINATION_LIMIT && (
+      {!areFieldsEmpty() && totalCount > PAGINATION_LIMIT && (
         <div className="mt-4 flex w-full justify-center">
           <Pagination
             cPage={currentPage}
diff --git a/src/Components/Facility/Investigations/ViewInvestigations.tsx b/src/Components/Facility/Investigations/ViewInvestigations.tsx
index a1381015963..7c420522c44 100644
--- a/src/Components/Facility/Investigations/ViewInvestigations.tsx
+++ b/src/Components/Facility/Investigations/ViewInvestigations.tsx
@@ -4,6 +4,7 @@ import ReportTable from "./Reports/ReportTable";
 import { formatDateTime } from "../../../Utils/utils";
 import { InvestigationSessionType } from "./investigationsTab";
 import { lazy } from "react";
+
 const Loading = lazy(() => import("../../Common/Loading"));
 
 export default function ViewInvestigations(props: {
@@ -26,7 +27,9 @@ export default function ViewInvestigations(props: {
   return (
     <div className="mx-auto max-w-7xl">
       {isLoading ? (
-        <Loading />
+        <div className="min-h-screen">
+          <Loading />
+        </div>
       ) : (
         <div className="mt-4 space-y-2 ">
           {investigations.length > 0 && (
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 9b37c53f599..e94d740c0db 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -117,7 +117,9 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
           }
         >
           {loading ? (
-            <Loading />
+            <div className="min-h-screen">
+              <Loading />
+            </div>
           ) : (
             <>
               {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx
index f4d02404b7f..e1ea368af72 100644
--- a/src/Components/Patient/FileUpload.tsx
+++ b/src/Components/Patient/FileUpload.tsx
@@ -239,6 +239,7 @@ export const FileUpload = (props: FileUploadProps) => {
         setFacilityName("");
       }
     }
+
     fetchPatientName();
   }, [dispatch, patientId]);
 
@@ -898,7 +899,11 @@ export const FileUpload = (props: FileUploadProps) => {
   };
 
   if (isLoading) {
-    return <Loading />;
+    return (
+      <div className="min-h-screen">
+        <Loading />
+      </div>
+    );
   }
 
   const onFileChange = (e: ChangeEvent<HTMLInputElement>): any => {

From c8a71f6606d17568d456df785577bb153832b6db Mon Sep 17 00:00:00 2001
From: konavivekramakrishna
 <101407963+konavivekramakrishna@users.noreply.github.com>
Date: Wed, 13 Dec 2023 20:38:57 +0530
Subject: [PATCH 08/22] Removed required attribute from Respiratory Rate
 (#6738)

* Remove required attribute from Respiratory Rate
input field

* Fix validation error for respiratory rate field
---
 src/Components/Patient/DailyRounds.tsx | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 30aab2c28fb..4105cffb96c 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -256,16 +256,7 @@ export const DailyRounds = (props: any) => {
             invalidForm = true;
           }
           return;
-        case "resp":
-          if (
-            state.form.resp === null &&
-            state.form.rounds_type === "NORMAL" &&
-            state.form.clone_last !== true
-          ) {
-            errors[field] = "Please enter a respiratory rate";
-            invalidForm = true;
-          }
-          return;
+
         default:
           return;
       }
@@ -588,7 +579,6 @@ export const DailyRounds = (props: any) => {
                   {...field("resp")}
                   label="Respiratory Rate"
                   unit="bpm"
-                  required
                   start={0}
                   end={50}
                   step={1}

From 12b4847cd5a70adde0daa7277d7ae06508afd567 Mon Sep 17 00:00:00 2001
From: Aakash Singh <mail@singhaakash.dev>
Date: Thu, 14 Dec 2023 13:47:54 +0530
Subject: [PATCH 09/22] use celery beat to check for pending migrations (#6845)

* use celery beat to check for pending migrations

* increase wait time for migrations

* Facility Module Fix

* Patient crud fix

* Patient Module Fix

* Fix for external results

* Patient manage fix

* revert vite

* fix flaky test

* try restarting backend after loading dummy data

* Update cypress.yaml

* retry check if care is up with delay

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
---
 .github/workflows/cypress.yaml                | 17 ++++++----
 .../e2e/external_results_spec/filter.cy.ts    |  2 +-
 .../e2e/facility_spec/facility_creation.cy.ts |  8 ++++-
 cypress/e2e/patient_spec/patient_crud.cy.ts   |  7 +++-
 cypress/e2e/patient_spec/patient_manage.cy.ts |  8 ++---
 .../pageobject/Facility/FacilityCreation.ts   | 34 +++++++++++++++++++
 .../pageobject/Patient/PatientConsultation.ts |  9 +++--
 cypress/pageobject/Patient/PatientCreation.ts | 19 ++++-------
 cypress/pageobject/Users/ManageUserPage.ts    |  1 +
 src/Components/Patient/ManagePatients.tsx     |  5 ++-
 src/Components/Patient/PatientInfoCard.tsx    |  5 ++-
 11 files changed, 85 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index f04045d0c72..001ceda68dc 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1,2,3,4,5,6,7,8]
+        containers: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
       - name: Checkout 📥
         uses: actions/checkout@v3
@@ -32,9 +32,9 @@ jobs:
         run: |
           cd care
           make docker_config_file=docker-compose.pre-built.yaml up 
-          while docker compose exec backend bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
+          while docker compose exec celery-beat bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
             >&2 echo "Migrations are not yet applied - sleeping"
-            sleep 5
+            sleep 10
           done
           echo "Migrations are applied"
           cd ..
@@ -43,10 +43,16 @@ jobs:
         run: |
           cd care
           docker compose exec backend bash -c "python manage.py load_dummy_data"
+          docker restart care-backend-1
           cd ..
 
-      - name: Check care is up ♻
-        run: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
+      - name: Wait for care to be up ♻
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 1
+          max_attempts: 5
+          command: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
+          on_retry_command: sleep 5
 
       - name: Install dependencies 📦
         run: npm install
@@ -79,4 +85,3 @@ jobs:
         with:
           name: cypress-screenshots
           path: cypress/screenshots
-
diff --git a/cypress/e2e/external_results_spec/filter.cy.ts b/cypress/e2e/external_results_spec/filter.cy.ts
index 577b6a46d98..3dd18704a46 100644
--- a/cypress/e2e/external_results_spec/filter.cy.ts
+++ b/cypress/e2e/external_results_spec/filter.cy.ts
@@ -20,7 +20,7 @@ describe("External Results Filters", () => {
     cy.get("#local_bodies").click();
     cy.get("#wards").click();
     cy.get("[role='option']").should("be.visible");
-    cy.contains("[role='option']", "12").click();
+    cy.contains("[role='option']", "4").click();
     cy.contains("Apply").click();
   });
 
diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts
index 9fe78f84256..9725ed42a28 100644
--- a/cypress/e2e/facility_spec/facility_creation.cy.ts
+++ b/cypress/e2e/facility_spec/facility_creation.cy.ts
@@ -120,6 +120,8 @@ describe("Facility Creation", () => {
       cy.get("[role='option']").contains(featureText).click();
     });
     facilityPage.fillPincode("682001");
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
     facilityPage.selectLocalBody("Aluva");
     facilityPage.selectWard("4");
     facilityPage.fillAddress(facilityAddress);
@@ -190,6 +192,8 @@ describe("Facility Creation", () => {
     facilityPage.visitCreateFacilityPage();
     facilityPage.fillFacilityName(facilityName);
     facilityPage.fillPincode("682001");
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
     facilityPage.selectLocalBody("Aluva");
     facilityPage.selectWard("4");
     facilityPage.fillAddress(facilityAddress);
@@ -217,7 +221,7 @@ describe("Facility Creation", () => {
       .should("be.visible");
     // verify the facility homepage
     cy.visit("/facility");
-    cy.clearAllFilters();
+    cy.get("#removeicon").click();
     manageUserPage.typeFacilitySearch(facilityName);
     facilityPage.verifyFacilityBadgeContent(facilityName);
     manageUserPage.assertFacilityInCard(facilityName);
@@ -228,6 +232,8 @@ describe("Facility Creation", () => {
     facilityPage.visitCreateFacilityPage();
     facilityPage.fillFacilityName(facilityName);
     facilityPage.fillPincode("682001");
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
     facilityPage.selectLocalBody("Aluva");
     facilityPage.selectWard("4");
     facilityPage.fillAddress(facilityAddress);
diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
index b9843c1556d..06a27333b9e 100644
--- a/cypress/e2e/patient_spec/patient_crud.cy.ts
+++ b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -2,6 +2,7 @@ import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import { UpdatePatientPage } from "../../pageobject/Patient/PatientUpdate";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
 import {
   emergency_phone_number,
@@ -19,6 +20,7 @@ describe("Patient Creation with consultation", () => {
   const patientPage = new PatientPage();
   const updatePatientPage = new UpdatePatientPage();
   const patientConsultationPage = new PatientConsultationPage();
+  const facilityPage = new FacilityPage();
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -42,10 +44,13 @@ describe("Patient Creation with consultation", () => {
       "Male",
       "Test Patient Address",
       "682001",
-      "1: PAZHAMTHOTTAM",
       "O+",
       "01012001"
     );
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
+    facilityPage.selectLocalBody("Aluva");
+    facilityPage.selectWard("4");
     patientPage.clickCreatePatient();
 
     patientPage.verifyPatientIsCreated();
diff --git a/cypress/e2e/patient_spec/patient_manage.cy.ts b/cypress/e2e/patient_spec/patient_manage.cy.ts
index 89d00b6bb9f..6c58767c06b 100644
--- a/cypress/e2e/patient_spec/patient_manage.cy.ts
+++ b/cypress/e2e/patient_spec/patient_manage.cy.ts
@@ -36,7 +36,7 @@ describe("Patient", () => {
   // commented out the shifting request, as logic need to be re-visited
 
   it("Post doctor notes for an already created patient", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 3");
     patientConsultationPage.visitDoctorNotesPage();
     patientConsultationPage.addDoctorsNotes("Test Doctor Notes");
     patientConsultationPage.postDoctorNotes();
@@ -46,7 +46,7 @@ describe("Patient", () => {
   });
 
   it("Edit prescription for an already created patient", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 4");
     patientConsultationPage.visitEditPrescriptionPage();
     patientConsultationPage.clickAddPrescription();
     patientConsultationPage.interceptMediaBase();
@@ -59,14 +59,14 @@ describe("Patient", () => {
   });
 
   it("Upload consultations file ", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 5");
     patientConsultationPage.visitFilesPage();
     patientConsultationPage.uploadFile();
     patientConsultationPage.clickUploadFile();
   });
 
   it("Discharge a patient", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 6");
     patientConsultationPage.clickDischargePatient();
     patientConsultationPage.selectDischargeReason("Recovered");
     patientConsultationPage.addDischargeNotes("Discharge notes");
diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
index c13f5beac8e..608dd9c357b 100644
--- a/cypress/pageobject/Facility/FacilityCreation.ts
+++ b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -402,6 +402,40 @@ class FacilityPage {
       .its("response.statusCode")
       .should("eq", 201);
   }
+
+  getStateElement() {
+    return cy.get("#state");
+  }
+
+  getDistrictElement() {
+    return cy.get("#district");
+  }
+
+  selectStateOnPincode(stateName) {
+    this.getStateElement()
+      .scrollIntoView()
+      .should("be.visible")
+      .then(($element) => {
+        const text = $element.text();
+        if (!text.includes(stateName)) {
+          this.getStateElement().click();
+          cy.get("li[role=option]").contains(stateName).click();
+        }
+      });
+  }
+
+  selectDistrictOnPincode(districtName) {
+    this.getDistrictElement()
+      .scrollIntoView()
+      .should("be.visible")
+      .then(($element) => {
+        const text = $element.text();
+        if (!text.includes(districtName)) {
+          this.getDistrictElement().click();
+          cy.get("li[role=option]").contains(districtName).click();
+        }
+      });
+  }
 }
 
 export default FacilityPage;
diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index 26d75feba2e..7528b30da06 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -103,7 +103,8 @@ export class PatientConsultationPage {
   }
 
   visitFilesPage() {
-    cy.get("a").contains("Files").click();
+    cy.get("#consultation_tab_nav").scrollIntoView();
+    cy.get("#consultation_tab_nav").contains("Files").click();
   }
 
   uploadFile() {
@@ -199,11 +200,13 @@ export class PatientConsultationPage {
   }
 
   visitDoctorNotesPage() {
+    cy.get("#patient_doctor_notes").scrollIntoView();
     cy.get("#patient_doctor_notes").click();
   }
 
   addDoctorsNotes(notes: string) {
-    cy.get("#doctor_notes_textarea").type(notes);
+    cy.get("#doctor_notes_textarea").scrollIntoView();
+    cy.get("#doctor_notes_textarea").click().type(notes);
   }
 
   postDoctorNotes() {
@@ -213,6 +216,7 @@ export class PatientConsultationPage {
   }
 
   clickDischargePatient() {
+    cy.get("#show-more").scrollIntoView();
     cy.get("#show-more").click();
     cy.contains("p", "Discharge from CARE").click();
   }
@@ -248,6 +252,7 @@ export class PatientConsultationPage {
   }
 
   visitEditPrescriptionPage() {
+    cy.get("#consultation_tab_nav").scrollIntoView();
     cy.get("#consultation_tab_nav").contains("Medicines").click();
     cy.get("a[href='prescriptions']").first().click();
   }
diff --git a/cypress/pageobject/Patient/PatientCreation.ts b/cypress/pageobject/Patient/PatientCreation.ts
index 47bf9c913ad..4e2f92ac040 100644
--- a/cypress/pageobject/Patient/PatientCreation.ts
+++ b/cypress/pageobject/Patient/PatientCreation.ts
@@ -10,10 +10,14 @@ export class PatientPage {
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
   }
 
-  visitPatient() {
+  visitPatient(patientName) {
+    cy.get("#name").click().type(patientName);
     cy.intercept("GET", "**/api/v1/consultation/**").as("getPatient");
-    cy.get("[data-cy='patient']").first().click();
+    cy.get("#patient-name-list").contains(patientName).click();
     cy.wait("@getPatient").its("response.statusCode").should("eq", 200);
+    cy.get("#patient-name-consultation")
+      .should("be.visible")
+      .contains(patientName);
   }
 
   selectFacility(facilityName: string) {
@@ -41,7 +45,6 @@ export class PatientPage {
     gender: string,
     address: string,
     pincode: string,
-    wardName: string,
     bloodGroup: string,
     dateOfBirth: string
   ) {
@@ -58,16 +61,6 @@ export class PatientPage {
     cy.get("[data-testid=current-address] textarea").type(address);
     cy.get("[data-testid=permanent-address] input").check();
     cy.get("#pincode").type(pincode);
-    cy.get("[data-testid=localbody] button")
-      .click()
-      .then(() => {
-        cy.get("[role='option']").first().click();
-      });
-    cy.get("[data-testid=ward-respective-lsgi] button")
-      .click()
-      .then(() => {
-        cy.get("[role='option']").contains(wardName).click();
-      });
     cy.get("[name=medical_history_check_1]").check();
     cy.get("[data-testid=blood-group] button")
       .click()
diff --git a/cypress/pageobject/Users/ManageUserPage.ts b/cypress/pageobject/Users/ManageUserPage.ts
index b79b96447f0..d3f7e17e7d5 100644
--- a/cypress/pageobject/Users/ManageUserPage.ts
+++ b/cypress/pageobject/Users/ManageUserPage.ts
@@ -94,6 +94,7 @@ export class ManageUserPage {
   }
 
   typeFacilitySearch(facilityName) {
+    cy.get("#search").click().clear();
     cy.get("#search").click().type(facilityName);
   }
 
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index 9988a7b9576..9113e8654bf 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -590,7 +590,10 @@ export const PatientManager = () => {
             </div>
             <div className="flex w-full flex-col gap-2 pl-2 md:block md:flex-row">
               <div className="flex w-full items-center justify-between gap-2">
-                <div className="flex flex-wrap gap-2 font-semibold">
+                <div
+                  className="flex flex-wrap gap-2 font-semibold"
+                  id="patient-name-list"
+                >
                   <span className="text-xl capitalize">{patient.name}</span>
                   <span className="text-gray-800">
                     {formatAge(patient.age, patient.date_of_birth, true)}
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index adcdcb1a98d..ed4cd609aa2 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -190,7 +190,10 @@ export default function PatientInfoCard(props: {
             </ButtonV2>
           </div>
           <div className="flex flex-col items-center gap-4 lg:items-start lg:gap-0 lg:pl-6">
-            <div className="mb-1 font-semibold sm:text-xl md:text-4xl">
+            <div
+              className="mb-1 font-semibold sm:text-xl md:text-4xl"
+              id="patient-name-consultation"
+            >
               {patient.name}
             </div>
             <div>

From 881e247244d8cd0573eef4303311cd41507c0f6d Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Thu, 14 Dec 2023 14:46:02 +0530
Subject: [PATCH 10/22] fix flaky test (#6864)

---
 cypress/pageobject/Users/UserSearch.ts | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/cypress/pageobject/Users/UserSearch.ts b/cypress/pageobject/Users/UserSearch.ts
index 4956532277f..12ac64c51b3 100644
--- a/cypress/pageobject/Users/UserSearch.ts
+++ b/cypress/pageobject/Users/UserSearch.ts
@@ -104,9 +104,25 @@ export class UserPage {
     cy.url().should("include", `page=${pageNumber}`);
   }
 
-  verifyMultipleBadgesWithSameId(expectedContents: string[]) {
-    cy.get("#user-view-name").each((el, index) => {
-      expect(el.text().trim()).to.equal(expectedContents[index]);
+  verifyMultipleBadgesWithSameId(alreadylinkedusersviews: string[]) {
+    cy.get("#user-view-name").then(($elements) => {
+      const userViews = $elements
+        .map((_, el) => Cypress.$(el).text().trim())
+        .get();
+      let foundMatches = 0;
+
+      alreadylinkedusersviews.forEach((expectedContent) => {
+        const index = userViews.findIndex((actualContent) =>
+          actualContent.includes(expectedContent)
+        );
+        if (index !== -1) {
+          userViews.splice(index, 1); // Remove the matched element
+          foundMatches++;
+        }
+        if (foundMatches === alreadylinkedusersviews.length) {
+          return false; // Break the loop if all matches are found
+        }
+      });
     });
   }
 }

From 56f0c2b394968eac16b93825a0bfadfd29c32f0b Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Thu, 14 Dec 2023 17:12:00 +0530
Subject: [PATCH 11/22] Sort wards by ward number in filters + adds utility
 method: `compareBy` (#6852)

* Add utility: `compareByKey`, sort wards in filters

* rename `compareByKey` to `compareBy`
---
 .../Diagnosis/LegacyDiagnosesList.tsx         |   3 +-
 src/Components/ExternalResult/ListFilter.tsx  | 100 ++++++++----------
 .../ExternalResult/ResultUpdate.tsx           |   9 +-
 src/Components/Facility/FacilityCreate.tsx    |  41 ++++---
 src/Components/Facility/models.tsx            |   3 +-
 .../FormFields/RangeAutocompleteFormField.tsx |   5 +-
 src/Components/Patient/PatientRegister.tsx    |   3 +-
 src/Utils/utils.ts                            |   6 ++
 8 files changed, 80 insertions(+), 90 deletions(-)

diff --git a/src/Components/Diagnosis/LegacyDiagnosesList.tsx b/src/Components/Diagnosis/LegacyDiagnosesList.tsx
index 2a2ed7b9c3a..408bee7b52a 100644
--- a/src/Components/Diagnosis/LegacyDiagnosesList.tsx
+++ b/src/Components/Diagnosis/LegacyDiagnosesList.tsx
@@ -6,6 +6,7 @@ import {
 } from "./types";
 import { useTranslation } from "react-i18next";
 import CareIcon from "../../CAREUI/icons/CareIcon";
+import { compareBy } from "../../Utils/utils";
 
 interface Props {
   diagnoses: ConsultationDiagnosis[];
@@ -22,7 +23,7 @@ function groupDiagnoses(diagnoses: ConsultationDiagnosis[]) {
   for (const status of ActiveConditionVerificationStatuses) {
     groupedDiagnoses[status] = diagnoses
       .filter((d) => d.verification_status === status)
-      .sort((a, b) => Number(b.is_principal) - Number(a.is_principal));
+      .sort(compareBy("is_principal"));
   }
 
   return groupedDiagnoses;
diff --git a/src/Components/ExternalResult/ListFilter.tsx b/src/Components/ExternalResult/ListFilter.tsx
index 898fe9ecb31..80e3905f389 100644
--- a/src/Components/ExternalResult/ListFilter.tsx
+++ b/src/Components/ExternalResult/ListFilter.tsx
@@ -6,11 +6,12 @@ import TextFormField from "../Form/FormFields/TextFormField";
 import { MultiSelectFormField } from "../Form/FormFields/SelectFormField";
 import DateRangeFormField from "../Form/FormFields/DateRangeFormField";
 import dayjs from "dayjs";
-import { dateQueryString } from "../../Utils/utils";
+import { dateQueryString, compareBy } from "../../Utils/utils";
 import useAuthUser from "../../Common/hooks/useAuthUser";
 import useQuery from "../../Utils/request/useQuery";
 import routes from "../../Redux/api";
 import Loading from "../Common/Loading";
+import { LocalBodyModel, WardModel } from "../Facility/models";
 
 const clearFilterState = {
   created_date_before: "",
@@ -27,10 +28,10 @@ const getDate = (value: any) =>
 
 export default function ListFilter(props: any) {
   const { filter, onChange, closeFilter, dataList, removeFilters } = props;
-  const [wardList, setWardList] = useState<any[]>([]);
-  const [lsgList, setLsgList] = useState<any[]>([]);
-  const [wards, setWards] = useState<any[]>([]);
-  const [selectedLsgs, setSelectedLsgs] = useState<any[]>([]);
+  const [wardList, setWardList] = useState<WardModel[]>([]);
+  const [lsgList, setLsgList] = useState<LocalBodyModel[]>([]);
+  const [wards, setWards] = useState<WardModel[]>([]);
+  const [selectedLsgs, setSelectedLsgs] = useState<LocalBodyModel[]>([]);
   const authUser = useAuthUser();
   const [filterState, setFilterState] = useMergeState({
     created_date_before: filter.created_date_before || null,
@@ -47,32 +48,32 @@ export default function ListFilter(props: any) {
     pathParams: { id: String(authUser.district) },
     onResponse: ({ res, data }) => {
       if (res && data) {
-        let allWards: any[] = [];
-        let allLsgs: any[] = [];
+        const allWards: any[] = [];
+        const allLsgs: any[] = [];
+
         if (res && data) {
           data.forEach((local: any) => {
-            allLsgs = [...allLsgs, { id: local.id, name: local.name }];
+            allLsgs.push({ id: local.id, name: local.name });
             if (local.wards) {
               local.wards.forEach((ward: any) => {
-                allWards = [
-                  ...allWards,
-                  {
-                    id: ward.id,
-                    name: ward.number + ": " + ward.name,
-                    panchayath: local.name,
-                    number: ward.number,
-                    local_body_id: local.id,
-                  },
-                ];
+                allWards.push({
+                  id: ward.id,
+                  name: ward.number + ": " + ward.name,
+                  panchayath: local.name,
+                  number: ward.number,
+                  local_body_id: local.id,
+                });
               });
             }
           });
         }
 
-        sortByName(allWards);
-        sortByName(allLsgs);
-        setWardList(allWards || []);
-        setLsgList(allLsgs || []);
+        allWards.sort(compareBy("number"));
+        allLsgs.sort(compareBy("name"));
+
+        setWardList(allWards);
+        setLsgList(allLsgs);
+
         const filteredWard = filter?.wards?.split(",").map(Number);
         const selectedWards: any =
           filteredWard && allWards
@@ -106,13 +107,6 @@ export default function ListFilter(props: any) {
     setFilterState(filterData);
   };
 
-  const handleWardChange = (value: any) => {
-    setWards(value);
-  };
-  const handleLsgChange = (value: any) => {
-    setSelectedLsgs(value);
-  };
-
   const field = (name: string) => ({
     name,
     label: t(name),
@@ -161,12 +155,6 @@ export default function ListFilter(props: any) {
     dataList(selectedLsgs, wards);
   };
 
-  const sortByName = (items: any) => {
-    items.sort(function (a: any, b: any) {
-      return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;
-    });
-  };
-
   const filterWards = () => {
     const selectedLsgIds: any = selectedLsgs.map((e) => {
       return e.id;
@@ -205,29 +193,27 @@ export default function ListFilter(props: any) {
         closeFilter();
       }}
     >
-      <div>
-        <MultiSelectFormField
-          name="local_bodies"
-          options={lsgList}
-          label={t("Local Body")}
-          placeholder={t("select_local_body")}
-          value={selectedLsgs}
-          optionLabel={(option: any) => option.name}
-          onChange={(e: any) => handleLsgChange(e.value)}
-        />
-      </div>
+      <MultiSelectFormField
+        name="local_bodies"
+        options={lsgList}
+        label={t("Local Body")}
+        placeholder={t("select_local_body")}
+        value={selectedLsgs}
+        optionLabel={(option) => option.name}
+        optionDescription={(option) => option.localbody_code}
+        onChange={({ value }) => setSelectedLsgs(value)}
+      />
 
-      <div>
-        <MultiSelectFormField
-          name="wards"
-          options={filterWards()}
-          label={t("Ward")}
-          placeholder={t("select_wards")}
-          value={wards}
-          optionLabel={(option: any) => option.name}
-          onChange={(e: any) => handleWardChange(e.value)}
-        />
-      </div>
+      <MultiSelectFormField
+        name="wards"
+        options={filterWards() as WardModel[]}
+        label={t("Ward")}
+        placeholder={t("select_wards")}
+        value={wards}
+        optionLabel={(option) => option.name}
+        optionDescription={(option) => option.panchayath}
+        onChange={({ value }) => setWards(value)}
+      />
       <DateRangeFormField
         name="created_date"
         id="created_date"
diff --git a/src/Components/ExternalResult/ResultUpdate.tsx b/src/Components/ExternalResult/ResultUpdate.tsx
index 92d4d63b427..38d14c368c7 100644
--- a/src/Components/ExternalResult/ResultUpdate.tsx
+++ b/src/Components/ExternalResult/ResultUpdate.tsx
@@ -11,6 +11,7 @@ import Page from "../Common/components/Page.js";
 import useQuery from "../../Utils/request/useQuery.js";
 import routes from "../../Redux/api.js";
 import request from "../../Utils/request/request.js";
+import { compareBy } from "../../Utils/utils.js";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -265,11 +266,9 @@ export default function UpdateResult(props: any) {
                     name="ward"
                     label="Ward/Division of respective LSGI"
                     required
-                    options={ward
-                      .sort((a, b) => a.number - b.number)
-                      .map((e) => {
-                        return { id: e.id, name: e.number + ": " + e.name };
-                      })}
+                    options={ward.sort(compareBy("number")).map((e) => {
+                      return { id: e.id, name: e.number + ": " + e.name };
+                    })}
                     value={state.form.ward}
                     optionLabel={(ward) => ward.name}
                     optionValue={(ward) => ward.id}
diff --git a/src/Components/Facility/FacilityCreate.tsx b/src/Components/Facility/FacilityCreate.tsx
index 8a7887ebc25..584d577dcb1 100644
--- a/src/Components/Facility/FacilityCreate.tsx
+++ b/src/Components/Facility/FacilityCreate.tsx
@@ -1,7 +1,14 @@
 import * as Notification from "../../Utils/Notifications.js";
 
 import ButtonV2, { Cancel, Submit } from "../Common/components/ButtonV2";
-import { CapacityModal, DoctorModal } from "./models";
+import {
+  CapacityModal,
+  DistrictModel,
+  DoctorModal,
+  LocalBodyModel,
+  StateModel,
+  WardModel,
+} from "./models";
 import { DraftSection, useAutoSaveReducer } from "../../Utils/AutoSave.js";
 import {
   FACILITY_FEATURE_TYPES,
@@ -30,6 +37,7 @@ import {
   getPincodeDetails,
   includesIgnoreCase,
   parsePhoneNumber,
+  compareBy,
 } from "../../Utils/utils";
 import {
   phonePreg,
@@ -67,15 +75,6 @@ interface FacilityProps {
   facilityId?: string;
 }
 
-interface StateObj {
-  id: number;
-  name: string;
-}
-
-interface WardObj extends StateObj {
-  number: number;
-}
-
 type FacilityForm = {
   facility_type: string;
   name: string;
@@ -162,10 +161,10 @@ export const FacilityCreate = (props: FacilityProps) => {
   const [isDistrictLoading, setIsDistrictLoading] = useState(false);
   const [isLocalbodyLoading, setIsLocalbodyLoading] = useState(false);
   const [isWardLoading, setIsWardLoading] = useState(false);
-  const [states, setStates] = useState<StateObj[]>([]);
-  const [districts, setDistricts] = useState<StateObj[]>([]);
-  const [localBodies, setLocalBodies] = useState<StateObj[]>([]);
-  const [ward, setWard] = useState<WardObj[]>([]);
+  const [states, setStates] = useState<StateModel[]>([]);
+  const [districts, setDistricts] = useState<DistrictModel[]>([]);
+  const [localBodies, setLocalBodies] = useState<LocalBodyModel[]>([]);
+  const [ward, setWard] = useState<WardModel[]>([]);
   const [currentStep, setCurrentStep] = useState(1);
   const [createdFacilityId, setCreatedFacilityId] = useState("");
   const [showAutoFilledPincode, setShowAutoFilledPincode] = useState(false);
@@ -855,14 +854,12 @@ export const FacilityCreate = (props: FacilityProps) => {
                     className={isWardLoading ? "animate-pulse" : ""}
                     disabled={isWardLoading}
                     placeholder="Choose Ward"
-                    options={ward
-                      .sort((a, b) => a.number - b.number)
-                      .map((e) => {
-                        return {
-                          id: e.id,
-                          name: e.number + ": " + e.name,
-                        };
-                      })}
+                    options={ward.sort(compareBy("number")).map((e) => {
+                      return {
+                        id: e.id,
+                        name: e.number + ": " + e.name,
+                      };
+                    })}
                     optionLabel={(o) => o.name}
                     optionValue={(o) => o.id}
                   />
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 64f79198cf9..92daaf4ca5b 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -29,7 +29,8 @@ export interface WardModel {
   id: number;
   name: string;
   number: number;
-  local_body: number;
+  panchayath: string;
+  local_body_id: LocalBodyModel["id"];
 }
 
 export interface FacilityModel {
diff --git a/src/Components/Form/FormFields/RangeAutocompleteFormField.tsx b/src/Components/Form/FormFields/RangeAutocompleteFormField.tsx
index 441164adbc0..901dc9f60c8 100644
--- a/src/Components/Form/FormFields/RangeAutocompleteFormField.tsx
+++ b/src/Components/Form/FormFields/RangeAutocompleteFormField.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from "react";
 import AutocompleteFormField from "./Autocomplete";
 import { FormFieldBaseProps } from "./Utils";
-import { classNames } from "../../../Utils/utils";
+import { classNames, compareBy } from "../../../Utils/utils";
 import ButtonV2 from "../../Common/components/ButtonV2";
 
 interface Threshold {
@@ -23,8 +23,7 @@ type Props = FormFieldBaseProps<number> & {
 
 export default function RangeAutocompleteFormField(props: Props) {
   const options = useMemo(() => {
-    const sortedThresholds =
-      props.thresholds?.sort((a, b) => a.value - b.value) || [];
+    const sortedThresholds = props.thresholds?.sort(compareBy("value")) || [];
 
     const getThreshold = (value: number) => {
       const threshold = sortedThresholds.findLast(
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index e051ecd70fe..f2683f2f775 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -27,6 +27,7 @@ import {
   includesIgnoreCase,
   parsePhoneNumber,
   scrollTo,
+  compareBy,
 } from "../../Utils/utils";
 import { navigate, useQueryParams } from "raviger";
 import { statusType, useAbortableEffect } from "../../Common/utils";
@@ -1507,7 +1508,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                     {...field("ward")}
                                     label="Ward"
                                     options={ward
-                                      .sort((a, b) => a.number - b.number)
+                                      .sort(compareBy("number"))
                                       .map((e) => {
                                         return {
                                           id: e.id,
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 5f763c9c445..90e6b323db7 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -455,3 +455,9 @@ export const invalidateFiltersCache = () => {
     }
   }
 };
+
+export const compareBy = <T extends object>(key: keyof T) => {
+  return (a: T, b: T) => {
+    return a[key] < b[key] ? -1 : a[key] > b[key] ? 1 : 0;
+  };
+};

From 5b0bca7da66cd129f62247d7a888db438ffee7a4 Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 17:12:24 +0530
Subject: [PATCH 12/22] trim trailing spaces (#6848)

---
 src/Components/Users/UserAdd.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx
index 7df0089cdac..d26d0832b27 100644
--- a/src/Components/Users/UserAdd.tsx
+++ b/src/Components/Users/UserAdd.tsx
@@ -357,6 +357,7 @@ export const UserAdd = (props: UserProps) => {
           return;
         case "first_name":
         case "last_name":
+          state.form[field] = state.form[field].trim();
           if (!state.form[field]) {
             errors[field] = `${field
               .split("_")
@@ -440,6 +441,7 @@ export const UserAdd = (props: UserProps) => {
           }
           return;
         case "email":
+          state.form[field] = state.form[field].trim();
           if (
             state.form[field].length === 0 ||
             !validateEmailAddress(state.form[field])

From 27e19cce7eb70ab2068335d6743f2c4cb7acce38 Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 17:13:24 +0530
Subject: [PATCH 13/22] Fixed update button in bed management. (#6841)

* change update bed logic

* Update src/Components/Facility/AddBedForm.tsx

---------

Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
---
 src/Components/Facility/AddBedForm.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Components/Facility/AddBedForm.tsx b/src/Components/Facility/AddBedForm.tsx
index 785c90869ba..2fcda7a7a54 100644
--- a/src/Components/Facility/AddBedForm.tsx
+++ b/src/Components/Facility/AddBedForm.tsx
@@ -18,6 +18,7 @@ import { Cancel, Submit } from "../Common/components/ButtonV2";
 import TextFormField from "../Form/FormFields/TextFormField";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import Page from "../Common/components/Page";
+
 const Loading = lazy(() => import("../Common/Loading"));
 
 interface BedFormProps {
@@ -73,6 +74,7 @@ export const AddBedForm = (props: BedFormProps) => {
       }
       setIsLoading(false);
     }
+
     fetchFacilityLocationAndBed();
   }, [dispatchAction, facilityId, locationId]);
 
@@ -125,7 +127,7 @@ export const AddBedForm = (props: BedFormProps) => {
       name,
       description,
       bed_type: bedType,
-      number_of_beds: numberOfBeds,
+      number_of_beds: bedId ? 1 : numberOfBeds,
     };
 
     if (!validateInputs(data)) return;

From be3da2e09320e2fbc1e0a76728cdd394f85cc7b1 Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 17:13:44 +0530
Subject: [PATCH 14/22] change tooltip (#6842)

---
 src/Components/Patient/PatientInfoCard.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index ed4cd609aa2..4c509709d2a 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -156,12 +156,7 @@ export default function PatientInfoCard(props: {
             >
               {consultation?.current_bed &&
               consultation?.discharge_date === null ? (
-                <div
-                  className="flex h-full flex-col items-center justify-center"
-                  title={`
-                ${consultation?.current_bed?.bed_object?.location_object?.name}\n${consultation?.current_bed?.bed_object.name}
-              `}
-                >
+                <div className="tooltip flex h-full flex-col items-center justify-center">
                   <p className="w-full truncate px-2 text-center text-sm text-gray-900">
                     {
                       consultation?.current_bed?.bed_object?.location_object
@@ -171,6 +166,15 @@ export default function PatientInfoCard(props: {
                   <p className="w-full truncate px-2 text-center text-base font-bold">
                     {consultation?.current_bed?.bed_object.name}
                   </p>
+                  <div className="tooltip-text tooltip-right flex -translate-x-1/3 translate-y-1/2 flex-col items-center justify-center text-sm ">
+                    <span>
+                      {
+                        consultation?.current_bed?.bed_object?.location_object
+                          ?.name
+                      }
+                    </span>
+                    <span>{consultation?.current_bed?.bed_object.name}</span>
+                  </div>
                 </div>
               ) : (
                 <div className="flex h-full items-center justify-center">

From 6b1bf39c5215c50f236b872fe81f6b0c333b7e05 Mon Sep 17 00:00:00 2001
From: Kshitij Verma <101321276+kshitijv256@users.noreply.github.com>
Date: Thu, 14 Dec 2023 17:15:49 +0530
Subject: [PATCH 15/22] Added same logic for disabling in both mobile and
 desktop view (#6840)

---
 src/Components/Patient/PatientHome.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index fad482934ac..dc400ddc79b 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -385,8 +385,9 @@ export const PatientHome = (props: any) => {
   };
 
   const isPatientEligibleForNewConsultation = (patientData: PatientModel) => {
-    return !patientData.last_consultation ||
-      patientData.last_consultation?.discharge_date
+    return patientData.is_active &&
+      (!patientData?.last_consultation ||
+        patientData?.last_consultation?.discharge_date)
       ? true
       : false;
   };

From 3348268d2dd245e02070f1c4e3b6cb30627c873d Mon Sep 17 00:00:00 2001
From: khavinshankar <khavinshankar@gmail.com>
Date: Thu, 14 Dec 2023 17:38:40 +0530
Subject: [PATCH 16/22] fix resend otp in abdm aadhar signup

---
 src/Components/ABDM/LinkABHANumberModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/ABDM/LinkABHANumberModal.tsx b/src/Components/ABDM/LinkABHANumberModal.tsx
index 367c9815db1..b17865b119a 100644
--- a/src/Components/ABDM/LinkABHANumberModal.tsx
+++ b/src/Components/ABDM/LinkABHANumberModal.tsx
@@ -423,7 +423,7 @@ const VerifyAadhaarSection = ({
     if (!validateAadhaar() || !txnId) return;
 
     setIsSendingOtp(true);
-    const { res, data } = await request(routes.abha.generateAadhaarOtp, {
+    const { res, data } = await request(routes.abha.resendAadhaarOtp, {
       body: {
         txnId: txnId,
       },

From 1bb99f0ed301b907072b9b38a1a5ffd1e7a90b4a Mon Sep 17 00:00:00 2001
From: khavinshankar <khavinshankar@gmail.com>
Date: Thu, 14 Dec 2023 18:00:33 +0530
Subject: [PATCH 17/22] improved error message for resend otp

---
 src/Components/ABDM/LinkABHANumberModal.tsx | 12 +++++++++++-
 src/Components/ABDM/models.ts               |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Components/ABDM/LinkABHANumberModal.tsx b/src/Components/ABDM/LinkABHANumberModal.tsx
index b17865b119a..f5da5fedfb9 100644
--- a/src/Components/ABDM/LinkABHANumberModal.tsx
+++ b/src/Components/ABDM/LinkABHANumberModal.tsx
@@ -13,6 +13,7 @@ import TextFormField from "../Form/FormFields/TextFormField";
 import { classNames } from "../../Utils/utils";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
+import { ABDMError } from "./models";
 
 export const validateRule = (
   condition: boolean,
@@ -427,6 +428,7 @@ const VerifyAadhaarSection = ({
       body: {
         txnId: txnId,
       },
+      silent: true,
     });
     setIsSendingOtp(false);
 
@@ -436,7 +438,15 @@ const VerifyAadhaarSection = ({
         msg: "OTP has been resent to the mobile number registered with the Aadhar number.",
       });
     } else {
-      Notify.Error({ msg: JSON.stringify(data) });
+      Notify.Error({
+        msg:
+          (data as unknown as ABDMError).details
+            ?.map((detail) => detail.message)
+            .join(", ")
+            .trim() ||
+          (data as unknown as ABDMError).message ||
+          "OTP resend failed",
+      });
     }
   };
 
diff --git a/src/Components/ABDM/models.ts b/src/Components/ABDM/models.ts
index f992cc9df4f..b85445fa6cd 100644
--- a/src/Components/ABDM/models.ts
+++ b/src/Components/ABDM/models.ts
@@ -48,6 +48,15 @@ export interface IHealthId {
   authMethods?: string[];
 }
 
+export interface ABDMError {
+  code: string;
+  details?: {
+    code: string;
+    message: string;
+  }[];
+  message: string;
+}
+
 export interface IAadhaarOtp {
   txnId: string;
 }

From b7af5250c904f5a445a18990153d21df0f3619eb Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Fri, 15 Dec 2023 12:21:32 +0530
Subject: [PATCH 18/22] hide user conflict notification (#6869)

---
 src/Components/Users/UserAdd.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx
index d26d0832b27..26ba9e44b4b 100644
--- a/src/Components/Users/UserAdd.tsx
+++ b/src/Components/Users/UserAdd.tsx
@@ -189,6 +189,7 @@ export const UserAdd = (props: UserProps) => {
     setUsernameExists(userExistsEnums.checking);
     const { res: usernameCheck } = await request(routes.checkUsername, {
       pathParams: { username },
+      silent: true,
     });
     if (usernameCheck === undefined || usernameCheck.status === 409)
       setUsernameExists(userExistsEnums.exists);

From 1f5ea20a5722f6cfb1d4df4130b8309f257abb60 Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Fri, 15 Dec 2023 18:00:14 +0530
Subject: [PATCH 19/22] daily rounds, clone last default to null (#6872)

* daily rounds, clone last default to null

* i don't know what this does

* skip check for continue form
---
 src/Components/Patient/DailyRounds.tsx | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 4105cffb96c..651b278c0de 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -50,7 +50,7 @@ const initForm: any = {
   admitted_to: "",
   taken_at: null,
   rounds_type: "NORMAL",
-  clone_last: true,
+  clone_last: false,
   systolic: null,
   diastolic: null,
   pulse: null,
@@ -223,7 +223,7 @@ export const DailyRounds = (props: any) => {
                 RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
               "0",
             temperature: parseFloat(res.data.temperature),
-            clone_last: res.data.count > 0 ? true : false,
+            // clone_last: res.data.count > 0 ? true : false,
           },
         });
       }
@@ -250,12 +250,6 @@ export const DailyRounds = (props: any) => {
             invalidForm = true;
           }
           return;
-        case "clone_last":
-          if (state.form.clone_last === null) {
-            errors[field] = "Please choose a value";
-            invalidForm = true;
-          }
-          return;
 
         default:
           return;
@@ -271,7 +265,7 @@ export const DailyRounds = (props: any) => {
     if (validForm) {
       setIsLoading(true);
       const baseData = {
-        clone_last: state.form.clone_last,
+        clone_last: state.form.clone_last ?? false,
         rounds_type: state.form.rounds_type,
         patient_category: state.form.patient_category,
         taken_at: state.form.taken_at
@@ -479,7 +473,7 @@ export const DailyRounds = (props: any) => {
           />
         )}
 
-        {(state.form.clone_last === false || id) && (
+        {(!state.form.clone_last || id) && (
           <div className="grid grid-cols-1 gap-x-6 md:grid-cols-2">
             <TextAreaFormField
               {...field("physical_examination_info")}
@@ -650,6 +644,7 @@ export const DailyRounds = (props: any) => {
           <Cancel onClick={() => goBack()} />
           <Submit
             disabled={
+              buttonText === "Save" &&
               state.form.clone_last !== null &&
               !state.form.clone_last &&
               formFields.every(

From 5a8803eddeaedd8c4f19fc2c58ae65b5807d9896 Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Tue, 19 Dec 2023 18:44:26 +0530
Subject: [PATCH 20/22] thank everyone (#6777)

---
 .github/workflows/thank-you.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/thank-you.yml b/.github/workflows/thank-you.yml
index cd36e64d888..c8104ad73a5 100644
--- a/.github/workflows/thank-you.yml
+++ b/.github/workflows/thank-you.yml
@@ -1,7 +1,7 @@
 name: Say thanks for the contributors
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - closed
 

From 7d15c037d927d815b7bf2eca0dc5c8b9c78a4517 Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Tue, 19 Dec 2023 18:44:54 +0530
Subject: [PATCH 21/22] Remove Copilot for PR tags (#6725)

---
 .github/pull_request_template.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 892fea40ab3..b67b01cc863 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,9 +1,6 @@
-### WHAT
-copilot:summary
-
 ## Proposed Changes
 
-- Fixes #issue?
+- Fixes #issue_number
 - Change 1
 - Change 2
 - More?
@@ -18,6 +15,3 @@ copilot:summary
 - [ ] Prep screenshot or demo video for changelog entry, and attach it to issue.
 - [ ] Request for Peer Reviews
 - [ ] Completion of QA
-
-### HOW
-copilot:walkthrough

From 7c21b80c87f00eb50c81dda5cbf58537ea226ca8 Mon Sep 17 00:00:00 2001
From: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Date: Wed, 20 Dec 2023 13:58:42 +0530
Subject: [PATCH 22/22] Disable critical care submit if onle basic editor is
 filled (#6860)

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
---
 .../Recording/CriticalCare__Recording.res                     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res b/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res
index 0316430dcd3..b0ff4fd04cc 100644
--- a/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res
+++ b/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res
@@ -237,7 +237,9 @@ let make = (~id, ~facilityId, ~patientId, ~consultationId, ~dailyRound) => {
             <button
               onClick={_ =>
                 Notifications.success({msg: "Critical care log updates are filed successfully"})}
-              className="btn btn-primary w-full mt-6">
+              className="btn btn-primary w-full mt-6"
+              disabled={Js.Array.length(state.updatedEditors) === 0}
+              >
               {str("Complete")}
             </button>
           </Link>
