From b6aa5d99efc1c2498aea25a95f11239409563f1f Mon Sep 17 00:00:00 2001
From: Abhimanyu Rajeesh <63541653+abhimanyurajeesh@users.noreply.github.com>
Date: Thu, 20 Feb 2025 18:01:40 +0530
Subject: [PATCH 1/9] Refactor organization search to use query params (#10717)

---
 .../organizations/FacilityOrganizationView.tsx       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pages/Facility/settings/organizations/FacilityOrganizationView.tsx b/src/pages/Facility/settings/organizations/FacilityOrganizationView.tsx
index 5efc8fc4076..4aec8578195 100644
--- a/src/pages/Facility/settings/organizations/FacilityOrganizationView.tsx
+++ b/src/pages/Facility/settings/organizations/FacilityOrganizationView.tsx
@@ -1,6 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
 import { Link } from "raviger";
-import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
@@ -62,11 +61,10 @@ function OrganizationCard({
 
 export default function FacilityOrganizationView({ id, facilityId }: Props) {
   const { t } = useTranslation();
-  const { qParams, Pagination, resultsPerPage } = useFilters({
+  const { qParams, Pagination, resultsPerPage, updateQuery } = useFilters({
     limit: 12,
     cacheBlacklist: ["username"],
   });
-  const [searchQuery, setSearchQuery] = useState("");
 
   const { data: children, isLoading } = useQuery({
     queryKey: [
@@ -76,7 +74,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
       id,
       qParams.page,
       resultsPerPage,
-      searchQuery,
+      qParams.search,
     ],
     queryFn: query.debounced(routes.facilityOrganization.list, {
       pathParams: { facilityId },
@@ -84,7 +82,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
         parent: id,
         offset: ((qParams.page || 1) - 1) * resultsPerPage,
         limit: resultsPerPage,
-        name: searchQuery || undefined,
+        name: qParams.search || undefined,
       },
     }),
   });
@@ -102,9 +100,9 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
                 />
                 <Input
                   placeholder={t("search_by_department_team_name")}
-                  value={searchQuery}
+                  value={qParams.search || ""}
                   onChange={(e) => {
-                    setSearchQuery(e.target.value);
+                    updateQuery({ search: e.target.value || undefined });
                   }}
                   className="w-full pl-8"
                 />

From ac6ba9c30b29b73ce4e2b186c916b622ca04f0ed Mon Sep 17 00:00:00 2001
From: Mahendar Chikolla <119734520+Mahendar0701@users.noreply.github.com>
Date: Thu, 20 Feb 2025 19:44:55 +0530
Subject: [PATCH 2/9] Add count to resource and encounter page (#10700)

---
 src/components/Resource/ResourceList.tsx | 17 ++++++++++++++++-
 src/pages/Encounters/EncounterList.tsx   | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx
index 566a19dedde..288b7780ec3 100644
--- a/src/components/Resource/ResourceList.tsx
+++ b/src/components/Resource/ResourceList.tsx
@@ -103,7 +103,22 @@ export default function ResourceList({ facilityId }: { facilityId: string }) {
   const resources = queryResources?.results || [];
 
   return (
-    <Page title={t("resource")}>
+    <Page
+      title={t("resource")}
+      componentRight={
+        <Badge
+          className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3 w-max"
+          variant="outline"
+        >
+          {isLoading
+            ? t("loading")
+            : t("entity_count", {
+                count: queryResources?.count ?? 0,
+                entity: "Resource",
+              })}
+        </Badge>
+      }
+    >
       <div className="space-y-4 mt-2">
         <div className="rounded-lg border bg-card shadow-sm">
           <div className="flex flex-col">
diff --git a/src/pages/Encounters/EncounterList.tsx b/src/pages/Encounters/EncounterList.tsx
index 18f5331bb3b..39667da3bd9 100644
--- a/src/pages/Encounters/EncounterList.tsx
+++ b/src/pages/Encounters/EncounterList.tsx
@@ -213,7 +213,22 @@ export function EncounterList({
   const { t } = useTranslation();
 
   return (
-    <Page title={t("encounters")}>
+    <Page
+      title={t("encounters")}
+      componentRight={
+        <Badge
+          className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3 w-max"
+          variant="outline"
+        >
+          {isLoading
+            ? t("loading")
+            : t("entity_count", {
+                count: queryEncounters?.count ?? 0,
+                entity: "Encounter",
+              })}
+        </Badge>
+      }
+    >
       <div className="space-y-4 mt-2 flex flex-col">
         <div className="rounded-lg border bg-card shadow-sm flex flex-col">
           <div className="flex flex-col">

From bb382e842e378e52fa80bd6d29f2a49a1d8ace63 Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:04:16 +0530
Subject: [PATCH 3/9] Fixed Pagination in facility specific user tab (#10729)

---
 src/components/Facility/FacilityUsers.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx
index 76f1dfd008f..8fced137410 100644
--- a/src/components/Facility/FacilityUsers.tsx
+++ b/src/components/Facility/FacilityUsers.tsx
@@ -22,7 +22,7 @@ import { useView } from "@/Utils/useView";
 
 export default function FacilityUsers(props: { facilityId: string }) {
   const { t } = useTranslation();
-  const { qParams, updateQuery, Pagination } = useFilters({
+  const { qParams, updateQuery, Pagination, resultsPerPage } = useFilters({
     limit: 15,
     cacheBlacklist: ["username"],
   });
@@ -33,13 +33,13 @@ export default function FacilityUsers(props: { facilityId: string }) {
   let usersList: JSX.Element = <></>;
 
   const { data: userListData, isFetching: userListFetching } = useQuery({
-    queryKey: ["facilityUsers", facilityId, qParams],
+    queryKey: ["facilityUsers", facilityId, qParams, resultsPerPage],
     queryFn: query.debounced(routes.facility.getUsers, {
       pathParams: { facility_id: facilityId },
       queryParams: {
         username: qParams.username,
-        limit: qParams.limit,
-        offset: (qParams.page - 1) * qParams.limit,
+        limit: resultsPerPage,
+        offset: (qParams.page - 1) * resultsPerPage,
       },
     }),
     enabled: !!facilityId,

From 89918fe016d99a36686a1161cdf0f28b2822fadb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:38:17 +0530
Subject: [PATCH 4/9] Update dependency vite-plugin-checker to ^0.9.0 (#10730)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 266 +++++++++++++++++++++-------------------------
 package.json      |   4 +-
 2 files changed, 121 insertions(+), 149 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1b338809fe9..6f14216fc5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "care_fe",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "care_fe",
-      "version": "3.3.0",
+      "version": "3.4.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -134,7 +134,7 @@
         "unimported": "^1.31.0",
         "uuid": "^11.0.2",
         "vite": "^5.4.10",
-        "vite-plugin-checker": "^0.8.0",
+        "vite-plugin-checker": "^0.9.0",
         "vite-plugin-pwa": "^0.21.0",
         "vite-plugin-static-copy": "^2.0.0",
         "zod": "^3.23.8"
@@ -17187,23 +17187,26 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.10.tgz",
-      "integrity": "sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==",
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
+      "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.4.2",
+        "fdir": "^6.4.3",
         "picomatch": "^4.0.2"
       },
       "engines": {
         "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
     "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz",
-      "integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
+      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -18089,6 +18092,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unimported": {
       "version": "1.31.1",
       "resolved": "https://registry.npmjs.org/unimported/-/unimported-1.31.1.tgz",
@@ -18916,26 +18932,21 @@
       }
     },
     "node_modules/vite-plugin-checker": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.8.0.tgz",
-      "integrity": "sha512-UA5uzOGm97UvZRTdZHiQVYFnd86AVn8EVaD4L3PoVzxH+IZSfaAw14WGFwX9QS23UW3lV/5bVKZn6l0w+q9P0g==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.9.0.tgz",
+      "integrity": "sha512-gf/zc0KWX8ATEOgnpgAM1I+IbvWkkO80RB+FxlLtC5cabXSesbJmAUw6E+mMDDMGIT+VHAktmxJZpMTt3lSubQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "ansi-escapes": "^4.3.0",
-        "chalk": "^4.1.1",
-        "chokidar": "^3.5.1",
-        "commander": "^8.0.0",
-        "fast-glob": "^3.2.7",
-        "fs-extra": "^11.1.0",
-        "npm-run-path": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "tiny-invariant": "^1.1.0",
-        "vscode-languageclient": "^7.0.0",
-        "vscode-languageserver": "^7.0.0",
-        "vscode-languageserver-textdocument": "^1.0.1",
-        "vscode-uri": "^3.0.2"
+        "@babel/code-frame": "^7.26.2",
+        "chokidar": "^4.0.3",
+        "npm-run-path": "^6.0.0",
+        "picocolors": "^1.1.1",
+        "picomatch": "^4.0.2",
+        "strip-ansi": "^7.1.0",
+        "tiny-invariant": "^1.3.3",
+        "tinyglobby": "^0.2.12",
+        "vscode-uri": "^3.1.0"
       },
       "engines": {
         "node": ">=14.16"
@@ -18943,14 +18954,14 @@
       "peerDependencies": {
         "@biomejs/biome": ">=1.7",
         "eslint": ">=7",
-        "meow": "^9.0.0",
+        "meow": "^13.2.0",
         "optionator": "^0.9.1",
-        "stylelint": ">=13",
+        "stylelint": ">=16",
         "typescript": "*",
         "vite": ">=2.0.0",
         "vls": "*",
         "vti": "*",
-        "vue-tsc": "~2.1.6"
+        "vue-tsc": "~2.2.2"
       },
       "peerDependenciesMeta": {
         "@biomejs/biome": {
@@ -18982,58 +18993,106 @@
         }
       }
     },
-    "node_modules/vite-plugin-checker/node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+    "node_modules/vite-plugin-checker/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/vite-plugin-checker/node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.21.3"
+        "readdirp": "^4.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/vite-plugin-checker/node_modules/npm-run-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+      "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/vite-plugin-checker/node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+    "node_modules/vite-plugin-checker/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 12"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/vite-plugin-checker/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/vite-plugin-checker/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+      "engines": {
+        "node": ">=12"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/vite-plugin-checker/node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.14"
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/vite-plugin-checker/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+    "node_modules/vite-plugin-checker/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/vite-plugin-pwa": {
@@ -19536,97 +19595,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/vscode-jsonrpc": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
-      "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.0.0 || >=10.0.0"
-      }
-    },
-    "node_modules/vscode-languageclient": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz",
-      "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimatch": "^3.0.4",
-        "semver": "^7.3.4",
-        "vscode-languageserver-protocol": "3.16.0"
-      },
-      "engines": {
-        "vscode": "^1.52.0"
-      }
-    },
-    "node_modules/vscode-languageclient/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/vscode-languageclient/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/vscode-languageserver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
-      "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "vscode-languageserver-protocol": "3.16.0"
-      },
-      "bin": {
-        "installServerIntoExtension": "bin/installServerIntoExtension"
-      }
-    },
-    "node_modules/vscode-languageserver-protocol": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
-      "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "vscode-jsonrpc": "6.0.0",
-        "vscode-languageserver-types": "3.16.0"
-      }
-    },
-    "node_modules/vscode-languageserver-textdocument": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
-      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/vscode-languageserver-types": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-      "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/package.json b/package.json
index 695fc983700..781a160f862 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "care_fe",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "Care is a Digital Public Good enabling TeleICU & Decentralised Administration of Healthcare Capacity across States.",
   "private": true,
   "repository": {
@@ -174,7 +174,7 @@
     "unimported": "^1.31.0",
     "uuid": "^11.0.2",
     "vite": "^5.4.10",
-    "vite-plugin-checker": "^0.8.0",
+    "vite-plugin-checker": "^0.9.0",
     "vite-plugin-pwa": "^0.21.0",
     "vite-plugin-static-copy": "^2.0.0",
     "zod": "^3.23.8"

From 39f79e20479497f691387c9eac764ad9f804307c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:40:13 +0530
Subject: [PATCH 5/9] Update all dependencies (minor, patch) (#10709)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f14216fc5e..271aab0f8e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5195,9 +5195,9 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.66.7",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.7.tgz",
-      "integrity": "sha512-qd3q/tUpF2K1xItfPZddk1k/8pSXnovg41XyCqJgPoyYEirMBtB0sVEVVQ/CsAOngzgWtBPXimVf4q4kM9uO6A==",
+      "version": "5.66.8",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.8.tgz",
+      "integrity": "sha512-LqYHYArmM7ycyT1I/Txc/n6KzI8S/hBFw2SQ9Uj1GpbZ89AvZLEvetquiQEHkZ5rFEm+iVNpZ6zYjTiPmJ9N5Q==",
       "license": "MIT",
       "dependencies": {
         "@tanstack/query-core": "5.66.4"
@@ -5211,9 +5211,9 @@
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.66.7",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.7.tgz",
-      "integrity": "sha512-40z4PPkz06tYIF0vwLZZIZfZxKUH4OAaBOR14blCFyYm6hlU6qc+M82mkZ+D00HcEMhV7P4XeJiEuDhFq0q9Qw==",
+      "version": "5.66.8",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.8.tgz",
+      "integrity": "sha512-OOdGk4ijs1SEliluWoE5D0ghxwDQz4x2LKzO69K6++VuxtizONXEXtk/oC3QGa9Tru/2CQmsJ5HUk8pmUAi9Qg==",
       "license": "MIT",
       "dependencies": {
         "@tanstack/query-devtools": "5.65.0"
@@ -5223,7 +5223,7 @@
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.66.7",
+        "@tanstack/react-query": "^5.66.8",
         "react": "^18 || ^19"
       }
     },
@@ -10841,9 +10841,9 @@
       }
     },
     "node_modules/i18next-browser-languagedetector": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.3.tgz",
-      "integrity": "sha512-beOOLArattPBc2YZG5IXGJytdYFgUR7cS8Wd6HT4IczIoWKgmTspOQ2yasaGklelVo5seLPmnEKvLHR+E/MdWQ==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.4.tgz",
+      "integrity": "sha512-f3frU3pIxD50/Tz20zx9TD9HobKYg47fmAETb117GKGPrhwcSSPJDoCposXlVycVebQ9GQohC3Efbpq7/nnJ5w==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2"
@@ -18789,9 +18789,9 @@
       }
     },
     "node_modules/uuid": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz",
-      "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/broofa",

From e2505482d8533e8a8d608acc8da16a7015972b98 Mon Sep 17 00:00:00 2001
From: Tanuj Nainwal <125687187+Tanuj1718@users.noreply.github.com>
Date: Fri, 21 Feb 2025 01:52:28 +0530
Subject: [PATCH 6/9] fix: Organization Users page needs responsiveness
 (#10413)

Co-authored-by: Jacob John Jeevan <mail@jacobjeevan.me>
---
 src/components/Common/UserSelector.tsx        |  2 +-
 src/components/Users/UserListAndCard.tsx      |  5 +++-
 .../components/EditFacilityUserRoleSheet.tsx  | 24 +++++++++++--------
 .../components/LinkFacilityUserSheet.tsx      | 10 ++++----
 src/pages/Organization/OrganizationUsers.tsx  |  4 ++--
 .../Organization/components/LinkUserSheet.tsx | 13 +++++-----
 6 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/components/Common/UserSelector.tsx b/src/components/Common/UserSelector.tsx
index 5c898e336da..3d068034791 100644
--- a/src/components/Common/UserSelector.tsx
+++ b/src/components/Common/UserSelector.tsx
@@ -71,7 +71,7 @@ export default function UserSelector({
                 className="size-6 rounded-full"
               />
               <TooltipComponent content={formatName(selected)} side="bottom">
-                <p className="font-medium text-gray-900 truncate max-w-56 sm:max-w-48 md:max-w-64 lg:max-w-64 xl:max-w-36">
+                <p className="font-medium text-gray-900 truncate max-w-48 sm:max-w-56 md:max-w-64">
                   {formatName(selected)}
                 </p>
               </TooltipComponent>
diff --git a/src/components/Users/UserListAndCard.tsx b/src/components/Users/UserListAndCard.tsx
index bf8b2b3e96d..c11c2bc5199 100644
--- a/src/components/Users/UserListAndCard.tsx
+++ b/src/components/Users/UserListAndCard.tsx
@@ -64,7 +64,10 @@ export const UserStatusIndicator = ({
           </span>
         </Badge>
       ) : (
-        <Badge variant="secondary" className="bg-gray-100 whitespace-nowrap">
+        <Badge
+          variant="secondary"
+          className="bg-gray-100 whitespace-nowrap text-wrap"
+        >
           <span className="inline-block h-2 w-2 shrink-0 rounded-full bg-gray-500 mr-2" />
           <span className="text-xs text-gray-700">{t("never_logged_in")}</span>
         </Badge>
diff --git a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
index dfae40ba31f..6af8838d2dd 100644
--- a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
+++ b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
@@ -157,18 +157,22 @@ export default function EditUserRoleSheet({
               </div>
             </div>
 
-            <div className="grid grid-cols-2 gap-4 pt-2 border-t">
-              <div>
-                <span className="text-sm text-gray-500">{t("username")}</span>
-                <p className="text-sm font-medium">{userRole.user.username}</p>
+            <div className="flex flex-col flex-wrap gap-2 pt-2 border-t">
+              <div className="flex flex-wrap">
+                <div className="mr-3">
+                  <span className="text-sm text-gray-500">{t("username")}</span>
+                  <p className="text-sm font-medium truncate ">
+                    {userRole.user.username}
+                  </p>
+                </div>
+                <div>
+                  <span className="text-sm text-gray-500">
+                    {t("current_role")}
+                  </span>
+                  <p className="text-sm font-medium">{userRole.role.name}</p>
+                </div>
               </div>
               <div>
-                <span className="text-sm text-gray-500">
-                  {t("current_role")}
-                </span>
-                <p className="text-sm font-medium">{userRole.role.name}</p>
-              </div>
-              <div className="col-span-2">
                 <span className="text-sm text-gray-500">
                   {t("last_login")}{" "}
                 </span>
diff --git a/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx b/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx
index c0cb464b2b1..8c7cea2e719 100644
--- a/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx
+++ b/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx
@@ -136,16 +136,16 @@ export default function LinkFacilityUserSheet({
           {selectedUser && (
             <div className="space-y-4">
               <div className="rounded-lg border p-4 space-y-4">
-                <div className="flex items-start gap-4">
+                <div className="flex gap-4 flex-row">
                   <Avatar
                     imageUrl={selectedUser.profile_picture_url}
                     name={formatName(selectedUser)}
                     className="h-12 w-12"
                   />
-                  <div className="flex flex-col flex-1">
-                    <span className="font-medium text-lg">
+                  <div className="w-3/4">
+                    <p className="font-medium text-lg truncate">
                       {selectedUser.first_name} {selectedUser.last_name}
-                    </span>
+                    </p>
                     <span className="text-sm text-gray-500">
                       {selectedUser.email}
                     </span>
@@ -153,7 +153,7 @@ export default function LinkFacilityUserSheet({
                 </div>
 
                 <div className="grid grid-cols-2 gap-4 pt-2 border-t">
-                  <div>
+                  <div className="truncate">
                     <span className="text-sm text-gray-500">Username</span>
                     <p className="text-sm font-medium">
                       {selectedUser.username}
diff --git a/src/pages/Organization/OrganizationUsers.tsx b/src/pages/Organization/OrganizationUsers.tsx
index e05e6374097..b81c3313b17 100644
--- a/src/pages/Organization/OrganizationUsers.tsx
+++ b/src/pages/Organization/OrganizationUsers.tsx
@@ -102,7 +102,7 @@ export default function OrganizationUsers({ id, navOrganizationId }: Props) {
   return (
     <OrganizationLayout id={id} navOrganizationId={navOrganizationId}>
       <div className="space-y-6">
-        <div className="flex justify-between items-center">
+        <div className="justify-between items-center flex flex-wrap">
           <div className="mt-1 flex flex-col justify-start space-y-2 md:flex-row md:justify-between md:space-y-0">
             <EntityBadge
               title={t("users")}
@@ -111,7 +111,7 @@ export default function OrganizationUsers({ id, navOrganizationId }: Props) {
               translationParams={{ entity: "User" }}
             />
           </div>
-          <div className="flex gap-2">
+          <div className="gap-2 flex flex-wrap mt-2">
             <AddUserSheet
               open={openAddUserSheet}
               setOpen={(open) => {
diff --git a/src/pages/Organization/components/LinkUserSheet.tsx b/src/pages/Organization/components/LinkUserSheet.tsx
index 967783d61be..a442cdf1a3e 100644
--- a/src/pages/Organization/components/LinkUserSheet.tsx
+++ b/src/pages/Organization/components/LinkUserSheet.tsx
@@ -111,7 +111,7 @@ export default function LinkUserSheet({
   return (
     <Sheet open={open} onOpenChange={setOpen}>
       <SheetTrigger asChild>
-        <Button>
+        <Button variant="primary_gradient">
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
           Link User
         </Button>
@@ -135,16 +135,16 @@ export default function LinkUserSheet({
           {selectedUser && (
             <div className="space-y-4">
               <div className="rounded-lg border p-4 space-y-4">
-                <div className="flex items-start gap-4">
+                <div className="flex gap-4 flex-row">
                   <Avatar
                     name={`${selectedUser.first_name} ${selectedUser.last_name}`}
                     imageUrl={selectedUser.profile_picture_url}
                     className="h-12 w-12"
                   />
-                  <div className="flex flex-col flex-1">
-                    <span className="font-medium text-lg">
+                  <div className="w-3/4">
+                    <p className="font-medium text-lg truncate">
                       {selectedUser.first_name} {selectedUser.last_name}
-                    </span>
+                    </p>
                     <span className="text-sm text-gray-500">
                       {selectedUser.email}
                     </span>
@@ -154,7 +154,7 @@ export default function LinkUserSheet({
                 <div className="grid grid-cols-2 gap-4 pt-2 border-t">
                   <div>
                     <span className="text-sm text-gray-500">Username</span>
-                    <p className="text-sm font-medium">
+                    <p className="text-sm font-medium truncate">
                       {selectedUser.username}
                     </p>
                   </div>
@@ -192,7 +192,6 @@ export default function LinkUserSheet({
                   </SelectContent>
                 </Select>
               </div>
-
               <Button
                 className="w-full"
                 onClick={handleAddUser}

From ba6b0fc181d7c0c254082da3c8e65e967d4ab761 Mon Sep 17 00:00:00 2001
From: Aditya Jindal <adityajindal2305@gmail.com>
Date: Fri, 21 Feb 2025 01:53:18 +0530
Subject: [PATCH 7/9] Redesign the Facility Details Page  (#10380)

---
 public/locale/en.json                    |   1 +
 src/components/Common/ContactLink.tsx    |  10 +-
 src/components/Facility/FacilityHome.tsx | 333 +++++++++++------------
 3 files changed, 158 insertions(+), 186 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 630cacec9aa..3e92b18fb50 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -803,6 +803,7 @@
   "edit_caution_note": "A new prescription will be added to the consultation with the edited details and the current prescription will be discontinued.",
   "edit_cover_photo": "Edit Cover Photo",
   "edit_facility": "Edit Facility",
+  "edit_facility_details": "Edit Facility Details",
   "edit_history": "Edit History",
   "edit_location": "Edit Location",
   "edit_location_description": "Edit the Location to make any changes",
diff --git a/src/components/Common/ContactLink.tsx b/src/components/Common/ContactLink.tsx
index c8115b42a1f..fc3cf7729e1 100644
--- a/src/components/Common/ContactLink.tsx
+++ b/src/components/Common/ContactLink.tsx
@@ -7,14 +7,8 @@ type ContactLinkProps =
 export default function ContactLink(props: ContactLinkProps) {
   return (
     <div>
-      <a
-        href={props.tel ? `tel:${props.tel}` : `mailto:${props.mailto}`}
-        className="flex items-center gap-2 border-b border-blue-500 text-base font-medium tracking-wider text-blue-500"
-      >
-        <CareIcon
-          icon={props.tel ? "l-outgoing-call" : "l-envelope-alt"}
-          className="h-5 fill-secondary-700"
-        />
+      <a href={props.tel ? `tel:${props.tel}` : `mailto:${props.mailto}`}>
+        <CareIcon icon={props.tel ? "l-outgoing-call" : "l-envelope-alt"} />
         {props.tel ? props.tel : props.mailto}
       </a>
     </div>
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 195e4d700bf..39c2510590b 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -1,39 +1,16 @@
 import careConfig from "@careConfig";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@radix-ui/react-tooltip";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useMutation } from "@tanstack/react-query";
-import { Edit2, Hospital, MapPin, MoreVertical, Settings } from "lucide-react";
-import { navigate } from "raviger";
+import { Hospital } from "lucide-react";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
-import { cn } from "@/lib/utils";
+import CareIcon from "@/CAREUI/icons/CareIcon";
 
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
 import { Badge } from "@/components/ui/badge";
-import { Button, buttonVariants } from "@/components/ui/button";
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import { Markdown } from "@/components/ui/markdown";
 
 import { Avatar } from "@/components/Common/Avatar";
@@ -84,25 +61,28 @@ const renderGeoOrganizations = (geoOrg: Organization) => {
     currentParent = currentParent.parent;
   }
 
+  const formatValue = (name: string, label: string) => {
+    return name.endsWith(label)
+      ? name.replace(new RegExp(`${label}$`), "").trim()
+      : name;
+  };
+
   const parentDetails = orgParents.map((org) => {
+    const label = getOrgLabel(org.org_type, org.metadata);
     return {
-      label: getOrgLabel(org.org_type, org.metadata),
-      value: org.name,
+      label,
+      value: formatValue(org.name, label),
     };
   });
 
+  const geoOrgLabel = getOrgLabel(geoOrg.org_type, geoOrg.metadata);
+
   return [
     {
-      label: getOrgLabel(geoOrg.org_type, geoOrg.metadata),
-      value: geoOrg.name,
+      label: geoOrgLabel,
+      value: formatValue(geoOrg.name, geoOrgLabel),
     },
-  ]
-    .concat(parentDetails)
-    .map((org, index) => (
-      <div key={index}>
-        <span className="text-gray-500">{org.value}</span>
-      </div>
-    ));
+  ].concat(parentDetails);
 };
 
 export const FacilityHome = ({ facilityId }: Props) => {
@@ -117,18 +97,6 @@ export const FacilityHome = ({ facilityId }: Props) => {
     }),
   });
 
-  const { mutate: deleteFacility, isPending: isDeleting } = useMutation({
-    mutationFn: mutate(routes.deleteFacility, {
-      pathParams: { id: facilityId },
-    }),
-    onSuccess: () => {
-      toast.success(
-        t("facility_deleted_successfully", { name: facilityData?.name }),
-      );
-      navigate("/facility");
-    },
-  });
-
   const { mutateAsync: deleteAvatar } = useMutation({
     mutationFn: mutate(routes.deleteFacilityCoverImage, {
       pathParams: { id: facilityId },
@@ -184,6 +152,8 @@ export const FacilityHome = ({ facilityId }: Props) => {
 
   const hasPermissionToEditCoverImage = true;
 
+  //  TODO: get permissions from backend to delete facility
+
   const coverImageHint = (
     <>
       {t("max_size_for_image_uploaded_should_be", { maxSize: "1MB" })}
@@ -206,163 +176,170 @@ export const FacilityHome = ({ facilityId }: Props) => {
       />
       <div className="container mx-auto p-6">
         <div className="mx-auto max-w-3xl space-y-6">
-          <Card className="overflow-hidden border-none bg-transparent shadow-none">
-            <div className="group relative h-64 w-full overflow-hidden rounded-xl bg-gradient-to-br from-emerald-400 via-emerald-500 to-emerald-600">
+          <Card className="border-none bg-transparent shadow-none">
+            <div className="group rounded-3xl relative h-64 w-full bg-gradient-to-br from-emerald-400 via-emerald-500 to-emerald-600">
               {facilityData?.read_cover_image_url ? (
                 <>
                   <img
                     src={facilityData.read_cover_image_url}
                     alt={facilityData?.name}
-                    className="h-full w-full object-cover transition-transform duration-500 group-hover:scale-105"
+                    className="h-full w-full object-cover rounded-2xl"
                   />
-                  <div className="absolute inset-0 bg-gradient-to-t from-black/60 via-black/30 to-transparent transition-opacity group-hover:opacity-70" />
+                  <div className="absolute rounded-lg inset-0 bg-gradient-to-t from-black/60 via-black/30 to-transparent transition-opacity group-hover:opacity-70" />
                 </>
               ) : (
-                <div className="relative h-full w-full bg-[radial-gradient(circle_at_50%_120%,rgba(255,255,255,0.2),transparent)]" />
+                <div className="relative rounded-3xl  h-full w-full bg-[radial-gradient(circle_at_50%_120%,rgba(255,255,255,0.2),transparent)]" />
               )}
+              <div className="absolute bottom-0 left-0 translate-x-0 translate-y-1/3">
+                <Button variant="link">
+                  <Avatar
+                    name={facilityData.name}
+                    className="h-24 w-24 rounded-md border-4 border-white shadow-lg"
+                  />
+                </Button>
+              </div>
 
-              <div className="absolute inset-x-0 bottom-0 p-6 text-white">
+              <div className="absolute bottom-0 left-0 translate-x-0 ml-[8rem]">
                 <div className="flex flex-wrap items-center gap-4 md:gap-6">
                   <div className="flex-1 min-w-0">
-                    <div className="flex items-center gap-2 md:gap-4">
-                      <Avatar
-                        name={facilityData.name}
-                        className="h-9 w-9 md:h-12 md:w-12 shrink-0 rounded-xl border-2 border-white/10 shadow-xl"
-                      />
-                      <div className="min-w-0">
-                        <TooltipProvider>
-                          <Tooltip>
-                            <TooltipTrigger asChild>
-                              <h1 className="text-sm md:text-3xl text-white md:font-bold">
-                                {facilityData?.name}
-                              </h1>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                              <p className="text-sm text-white bg-black rounded-md p-2">
-                                {facilityData?.name}
-                              </p>
-                            </TooltipContent>
-                          </Tooltip>
-                        </TooltipProvider>
-                      </div>
+                    <div className="text-white">
+                      <h1 className="text-lg sm:text-sm md:text-2xl lg:text-3xl font-bold">
+                        {facilityData?.name}
+                      </h1>
+                      <h2 className="text-base sm:text-sm md:text-md lg:text-sm text-white/70">
+                        {facilityData?.facility_type}
+                      </h2>
                     </div>
                   </div>
                   <div className="flex-shrink-0">
-                    <DropdownMenu modal={false}>
-                      <DropdownMenuTrigger asChild>
-                        <Button
-                          variant="secondary"
-                          size="icon"
-                          aria-label={t("facility_actions_menu")}
-                          className="bg-white/20 hover:bg-white/40 w-8 h-8"
-                        >
-                          <MoreVertical className="h-4 w-4 text-white" />
-                        </Button>
-                      </DropdownMenuTrigger>
-                      <DropdownMenuContent align="end" className="w-48 md:w-56">
-                        {hasPermissionToEditCoverImage && (
-                          <DropdownMenuItem
-                            className="cursor-pointer"
-                            onClick={() => setEditCoverImage(true)}
+                    <PLUGIN_Component
+                      __name="FacilityHomeActions"
+                      facility={facilityData}
+                    />
+                    {/* <AlertDialog>
+                      TODO: add delete facility
+                      <AlertDialogTrigger asChild>
+                        <Trash2 className="mr-2 h-4 w-4" />
+                        {t("delete_facility")}
+                      </AlertDialogTrigger>
+                      <AlertDialogContent>
+                        <AlertDialogHeader>
+                          <AlertDialogTitle>
+                            {t("delete_facility")}
+                          </AlertDialogTitle>
+                          <AlertDialogDescription>
+                            {t("delete_facility_confirmation", {
+                              name: facilityData?.name,
+                            })}
+                          </AlertDialogDescription>
+                        </AlertDialogHeader>
+                        <AlertDialogFooter>
+                          <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+                          <div
+                            onClick={() => deleteFacility()}
+                            className={cn(
+                              buttonVariants({ variant: "destructive" }),
+                            )}
+                            // disabled={isDeleting}
                           >
-                            <Edit2 className="mr-2 h-4 w-4" />
-                            {t("edit_cover_photo")}
-                          </DropdownMenuItem>
-                        )}
-
-                        <EditFacilitySheet
-                          facilityId={facilityId}
-                          trigger={
-                            <DropdownMenuItem
-                              className="cursor-pointer"
-                              onSelect={(e) => {
-                                e.preventDefault();
-                              }}
-                            >
-                              <Settings className="mr-2 h-4 w-4" />
-                              {t("update_facility")}
-                            </DropdownMenuItem>
-                          }
-                        />
-                        <AlertDialog>
-                          {/* TODO: add delete facility */}
-                          {/* <AlertDialogTrigger asChild>
-                            <DropdownMenuItem
-                              className="cursor-pointer text-danger-500"
-                              onSelect={(e) => e.preventDefault()}
-                            >
-                              <Trash2 className="mr-2 h-4 w-4" />
-                              {t("delete_facility")}
-                            </DropdownMenuItem>
-                          </AlertDialogTrigger> */}
-                          <AlertDialogContent>
-                            <AlertDialogHeader>
-                              <AlertDialogTitle>
-                                {t("delete_facility")}
-                              </AlertDialogTitle>
-                              <AlertDialogDescription>
-                                {t("delete_facility_confirmation", {
-                                  name: facilityData?.name,
-                                })}
-                              </AlertDialogDescription>
-                            </AlertDialogHeader>
-                            <AlertDialogFooter>
-                              <AlertDialogCancel>
-                                {t("cancel")}
-                              </AlertDialogCancel>
-                              <AlertDialogAction
-                                onClick={() => deleteFacility()}
-                                className={cn(
-                                  buttonVariants({ variant: "destructive" }),
-                                )}
-                                disabled={isDeleting}
-                              >
-                                {isDeleting ? t("deleting") : t("delete")}
-                              </AlertDialogAction>
-                            </AlertDialogFooter>
-                          </AlertDialogContent>
-                        </AlertDialog>
-
-                        <PLUGIN_Component
-                          __name="FacilityHomeActions"
-                          facility={facilityData}
-                        />
-                      </DropdownMenuContent>
-                    </DropdownMenu>
+                            {isDeleting ? t("deleting") : t("delete")}
+                          </div>
+                        </AlertDialogFooter>
+                      </AlertDialogContent>
+                    </AlertDialog> */}
                   </div>
                 </div>
               </div>
+              <div className="absolute right-0 bottom-0 p-1 text-white [@media(max-width:35rem)]:top-0">
+                {hasPermissionToEditCoverImage && (
+                  <Button
+                    variant="link"
+                    onClick={() => setEditCoverImage(true)}
+                    aria-label={t("edit_cover_photo")}
+                  >
+                    <CareIcon
+                      icon="l-edit"
+                      className="text-white"
+                      aria-hidden="true"
+                    />
+                    <span className="underline text-white">
+                      {t("edit_cover_photo")}
+                    </span>
+                  </Button>
+                )}
+              </div>
             </div>
 
             <div className="mt-2 space-y-2">
-              <Card>
-                <CardContent>
-                  <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:gap-12 mt-4">
-                    <div className="flex items-start gap-3">
-                      <MapPin className="mt-2 h-5 w-5 flex-shrink-0 text-gray-500" />
-                      <div>
-                        {facilityData?.geo_organization && (
-                          <div className="mt-2 text-sm">
-                            {renderGeoOrganizations(
-                              facilityData?.geo_organization,
-                            )}
-                          </div>
-                        )}
+              <div className="mt-2 space-y-2 flex justify-end">
+                <EditFacilitySheet
+                  facilityId={facilityId}
+                  trigger={
+                    <Button
+                      className="cursor-pointer mt-2 [@media(max-width:25rem)]:mt-12 [@media(max-width:25rem)]:w-full"
+                      variant="outline"
+                    >
+                      <CareIcon icon="l-edit" />
+                      {t("edit_facility_details")}
+                    </Button>
+                  }
+                />
+              </div>
+              <div className="flex flex-col [@media(min-width:60rem)]:flex-row gap-3">
+                <Card className="basis-1/2">
+                  <CardContent>
+                    <div className="grid grid-cols-1 sm:grid-cols-2 gap-4 mt-3">
+                      <div className="col-span-1 sm:col-span-2 flex flex-col">
+                        <span className="font-semibold text-lg">
+                          {t("address")}
+                        </span>
+                        <span className="text-gray-700 truncate">
+                          {facilityData.address}
+                        </span>
                       </div>
-                    </div>
 
-                    <div className="flex items-center gap-3">
-                      <div>
-                        <div className="mt-1">
+                      <div className="flex flex-col">
+                        <span className="font-semibold text-lg">
+                          {t("mobile_number")}
+                        </span>
+                        <span className="text-gray-800 truncate">
                           <ContactLink
                             tel={String(facilityData?.phone_number)}
                           />
-                        </div>
+                        </span>
+                      </div>
+
+                      <div className="flex flex-col">
+                        <span className="font-semibold text-lg">
+                          {t("location_details")}
+                        </span>
+                        <span className="text-gray-800 truncate">
+                          {/* Add Location Link Here */}
+                        </span>
                       </div>
                     </div>
-                  </div>
-                </CardContent>
-              </Card>
+                  </CardContent>
+                </Card>
+                <Card className="basis-1/2">
+                  <CardContent>
+                    <div className="grid grid-cols-1 mt-3 sm:grid-cols-2 gap-4">
+                      {facilityData.geo_organization &&
+                        renderGeoOrganizations(
+                          facilityData.geo_organization,
+                        ).map((item, index) => (
+                          <div key={index} className="flex flex-col">
+                            <span className="font-semibold text-lg truncate">
+                              {item.label}
+                            </span>
+                            <span className="text-gray-800 truncate">
+                              {item.value}
+                            </span>
+                          </div>
+                        ))}
+                    </div>
+                  </CardContent>
+                </Card>
+              </div>
 
               {facilityData?.features?.some((feature: number) =>
                 FACILITY_FEATURE_TYPES.some((f) => f.id === feature),
@@ -383,7 +360,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
                             <Badge
                               key={feature}
                               variant="secondary"
-                              className="flex items-center gap-2 bg-emerald-50 text-emerald-700 hover:bg-emerald-100"
+                              className="flex items-center gap-2 rounded-md bg-blue-100 text-blue-700 hover:bg-blue-200 px-3 py-1"
                             >
                               {getFacilityFeatureIcon(feature)}
                               <span>

From 213fb25bc0ed57fb2596182b9646726792f801ae Mon Sep 17 00:00:00 2001
From: Tanuj Nainwal <125687187+Tanuj1718@users.noreply.github.com>
Date: Fri, 21 Feb 2025 01:55:29 +0530
Subject: [PATCH 8/9] solved cover image upload type error (#10630)

---
 src/components/Common/AvatarEditModal.tsx | 41 +++++++++++++++++------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/components/Common/AvatarEditModal.tsx b/src/components/Common/AvatarEditModal.tsx
index 3c278ea80b0..7ef393d0fa8 100644
--- a/src/components/Common/AvatarEditModal.tsx
+++ b/src/components/Common/AvatarEditModal.tsx
@@ -62,8 +62,8 @@ const AvatarEditModal = ({
   const [selectedFile, setSelectedFile] = useState<File>();
   const [preview, setPreview] = useState<string>();
   const [isCameraOpen, setIsCameraOpen] = useState<boolean>(false);
-  const webRef = useRef<any>(null);
-  const [previewImage, setPreviewImage] = useState(null);
+  const webRef = useRef<Webcam>(null);
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [isCaptureImgBeingUploaded, setIsCaptureImgBeingUploaded] =
     useState(false);
   const [constraint, setConstraint] = useState<IVideoConstraint>(
@@ -81,16 +81,35 @@ const AvatarEditModal = ({
   }, []);
 
   const captureImage = () => {
-    setPreviewImage(webRef.current.getScreenshot());
-    const canvas = webRef.current.getCanvas();
-    canvas?.toBlob((blob: Blob) => {
-      const myFile = new File([blob], "image.png", {
-        type: blob.type,
-      });
-      setSelectedFile(myFile);
+    if (webRef.current) {
+      setPreviewImage(webRef.current.getScreenshot());
+    }
+    const canvas = webRef.current?.getCanvas();
+    canvas?.toBlob((blob) => {
+      if (blob) {
+        const myFile = new File([blob], "image.png", {
+          type: blob.type,
+        });
+        setSelectedFile(myFile);
+      } else {
+        toast.error(t("failed_to_capture_image"));
+      }
     });
   };
-
+  const stopCamera = useCallback(() => {
+    try {
+      if (webRef.current) {
+        const openCamera = webRef.current?.video?.srcObject as MediaStream;
+        if (openCamera) {
+          openCamera.getTracks().forEach((track) => track.stop());
+        }
+      }
+    } catch {
+      toast.error("Failed to stop camera");
+    } finally {
+      setIsCameraOpen(false);
+    }
+  }, []);
   const closeModal = () => {
     setPreview(undefined);
     setIsProcessing(false);
@@ -410,7 +429,7 @@ const AvatarEditModal = ({
                     onClick={() => {
                       setPreviewImage(null);
                       setIsCameraOpen(false);
-                      webRef.current.stopCamera();
+                      stopCamera();
                     }}
                     disabled={isProcessing}
                   >

From d58936da559c1bbbf103a2ee1b4cdec697697270 Mon Sep 17 00:00:00 2001
From: Agastya Gaur <71458414+Agastya18@users.noreply.github.com>
Date: Fri, 21 Feb 2025 07:57:17 +0530
Subject: [PATCH 9/9] Fixes delete button alignment in ValueSet Form (#10737)

---
 src/components/ValueSet/ValueSetForm.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ValueSet/ValueSetForm.tsx b/src/components/ValueSet/ValueSetForm.tsx
index b3e76eaaa23..bea305bc5f2 100644
--- a/src/components/ValueSet/ValueSetForm.tsx
+++ b/src/components/ValueSet/ValueSetForm.tsx
@@ -374,6 +374,7 @@ function RuleFields({
                 )}
               />
               <Button
+                className="mt-5"
                 type="button"
                 variant="ghost"
                 size="icon"