From 8d4ba311444747994585655bdfe53898f105e4b8 Mon Sep 17 00:00:00 2001
From: Anvesh Nalimela <151531961+AnveshNalimela@users.noreply.github.com>
Date: Sat, 4 Jan 2025 21:06:41 +0530
Subject: [PATCH 1/5] Added no user assingned message (#9666)

Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
---
 public/locale/en.json                         |   9 +
 .../PatientDetailsTab/PatientUsers.tsx        | 165 ++++++++++--------
 2 files changed, 101 insertions(+), 73 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 65093b6acae..1a858bb77a8 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -376,6 +376,7 @@
   "are_you_still_watching": "Are you still watching?",
   "are_you_sure_want_to_delete": "Are you sure you want to delete {{name}}?",
   "are_you_sure_want_to_delete_this_record": "Are you sure want to delete this record?",
+  "are_you_sure_want_to_remove": "Are you sure you want to remove {{name}} from the patient? This action cannot be undone",
   "ari": "ARI - Acute Respiratory illness",
   "arrived": "Arrived",
   "asset_class": "Asset Class",
@@ -388,7 +389,10 @@
   "assign": "Assign",
   "assign_a_volunteer_to": "Assign a volunteer to {{name}}",
   "assign_bed": "Assign Bed",
+  "assign_to_patient": "Assign to Patient",
   "assign_to_volunteer": "Assign to a Volunteer",
+  "assign_user": "Assign User",
+  "assign_user_to_patient": "Assign User to Patient",
   "assigned_doctor": "Assigned Doctor",
   "assigned_facility": "Facility assigned",
   "assigned_to": "Assigned to",
@@ -1239,6 +1243,7 @@
   "no_staff": "No staff found",
   "no_tests_taken": "No tests taken",
   "no_treating_physicians_available": "This facility does not have any home facility doctors. Please contact your admin.",
+  "no_user_assigned": "No User Assigned to this patient",
   "no_users_found": "No Users Found",
   "no_vitals_present": "No Vitals Monitor present in this location or facility",
   "none": "None",
@@ -1482,6 +1487,7 @@
   "rejected": "Rejected",
   "reload": "Reload",
   "remove": "Remove",
+  "remove_user": "Remove User",
   "rename": "Rename",
   "replace_home_facility": "Replace Home Facility",
   "replace_home_facility_confirm": "Are you sure you want to replace",
@@ -1570,6 +1576,8 @@
   "search_medication": "Search Medication",
   "search_patients": "Search Patients",
   "search_resource": "Search Resource",
+  "search_user": "Search User",
+  "search_user_description": "Search for a user and assign a role to add them to the patient.",
   "searching": "Searching...",
   "see_attachments": "See Attachments",
   "select": "Select",
@@ -1588,6 +1596,7 @@
   "select_policy_to_add_items": "Select a Policy to Add Items",
   "select_practitioner": "Select Practicioner",
   "select_register_patient": "Select/Register Patient",
+  "select_role": "Select Role",
   "select_seven_day_period": "Select a seven day period",
   "select_skills": "Select and add some skills",
   "select_time": "Select time",
diff --git a/src/components/Patient/PatientDetailsTab/PatientUsers.tsx b/src/components/Patient/PatientDetailsTab/PatientUsers.tsx
index e494b13fe9d..989b3ed0ac3 100644
--- a/src/components/Patient/PatientDetailsTab/PatientUsers.tsx
+++ b/src/components/Patient/PatientDetailsTab/PatientUsers.tsx
@@ -1,4 +1,5 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { t } from "i18next";
 import { useState } from "react";
 import { toast } from "sonner";
 
@@ -38,6 +39,7 @@ import UserSelector from "@/components/Common/UserSelector";
 import routes from "@/Utils/request/api";
 import mutate from "@/Utils/request/mutate";
 import query from "@/Utils/request/query";
+import { formatDisplayName } from "@/Utils/utils";
 import { UserBase } from "@/types/user/user";
 
 import { PatientProps } from ".";
@@ -103,19 +105,17 @@ function AddUserSheet({ patientId }: AddUserSheetProps) {
       <SheetTrigger asChild>
         <Button>
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
-          Add User
+          {t("assign_user")}
         </Button>
       </SheetTrigger>
       <SheetContent>
         <SheetHeader>
-          <SheetTitle>Add User to Patient</SheetTitle>
-          <SheetDescription>
-            Search for a user and assign a role to add them to the patient.
-          </SheetDescription>
+          <SheetTitle>{t("assign_user_to_patient")}</SheetTitle>
+          <SheetDescription>{t("search_user_description")}</SheetDescription>
         </SheetHeader>
         <div className="space-y-6 py-4">
           <div className="space-y-4">
-            <h3 className="text-sm font-medium">Search User</h3>
+            <h3 className="text-sm font-medium">{t("search_user")}</h3>
             <UserSelector
               selected={selectedUser}
               onChange={handleUserChange}
@@ -128,13 +128,13 @@ function AddUserSheet({ patientId }: AddUserSheetProps) {
               <div className="rounded-lg border p-4 space-y-4">
                 <div className="flex items-start gap-4">
                   <Avatar
-                    name={`${selectedUser.first_name} ${selectedUser.last_name}`}
+                    name={formatDisplayName(selectedUser)}
                     imageUrl={selectedUser.profile_picture_url}
                     className="h-12 w-12"
                   />
                   <div className="flex flex-col flex-1">
                     <span className="font-medium text-lg">
-                      {selectedUser.first_name} {selectedUser.last_name}
+                      {formatDisplayName(selectedUser)}
                     </span>
                     <span className="text-sm text-gray-500">
                       {selectedUser.email}
@@ -144,13 +144,17 @@ function AddUserSheet({ patientId }: AddUserSheetProps) {
 
                 <div className="grid grid-cols-2 gap-4 pt-2 border-t">
                   <div>
-                    <span className="text-sm text-gray-500">Username</span>
+                    <span className="text-sm text-gray-500">
+                      {t("username")}
+                    </span>
                     <p className="text-sm font-medium">
                       {selectedUser.username}
                     </p>
                   </div>
                   <div>
-                    <span className="text-sm text-gray-500">User Type</span>
+                    <span className="text-sm text-gray-500">
+                      {t("user_type")}
+                    </span>
                     <p className="text-sm font-medium">
                       {selectedUser.user_type}
                     </p>
@@ -159,7 +163,9 @@ function AddUserSheet({ patientId }: AddUserSheetProps) {
               </div>
 
               <div className="space-y-2">
-                <label className="text-sm font-medium">Select Role</label>
+                <label className="text-sm font-medium">
+                  {t("select_role")}
+                </label>
                 <Select value={selectedRole} onValueChange={setSelectedRole}>
                   <SelectTrigger>
                     <SelectValue placeholder="Select a role" />
@@ -186,7 +192,7 @@ function AddUserSheet({ patientId }: AddUserSheetProps) {
                 onClick={handleAddUser}
                 disabled={!selectedRole}
               >
-                Add to Patient
+                {t("assign_to_patient")}
               </Button>
             </div>
           )}
@@ -227,76 +233,89 @@ export const PatientUsers = (props: PatientProps) => {
     },
   });
 
+  const ManageUsers = () => {
+    if (!users?.results?.length) {
+      return (
+        <div className="h-full text-center space-y-2 mt-2 text-center rounded-lg bg-white px-7 py-12 border border-secondary-300 text-lg text-secondary-600">
+          {t("no_user_assigned")}
+        </div>
+      );
+    }
+    return (
+      <div className="mt-4 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+        {users?.results.map((user) => (
+          <div
+            key={user.id}
+            className="rounded-lg border border-gray-200 bg-white p-4 shadow-sm"
+          >
+            <div className="flex items-start justify-between">
+              <div className="flex items-start space-x-4">
+                <Avatar
+                  name={formatDisplayName(user)}
+                  className="h-10 w-10"
+                  imageUrl={user.profile_picture_url}
+                />
+                <div>
+                  <h3 className="text-sm font-medium text-gray-900">
+                    {formatDisplayName(user)}
+                  </h3>
+                  <p className="text-sm text-gray-500">{user.username}</p>
+                </div>
+              </div>
+              <AlertDialog>
+                <AlertDialogTrigger asChild>
+                  <Button variant="ghost" size="icon">
+                    <CareIcon icon="l-trash" className="h-4 w-4" />
+                  </Button>
+                </AlertDialogTrigger>
+                <AlertDialogContent>
+                  <AlertDialogHeader>
+                    <AlertDialogTitle>{t("remove_user")}</AlertDialogTitle>
+                    <AlertDialogDescription>
+                      {t("are_you_sure_want_to_remove", {
+                        name: formatDisplayName(user),
+                      })}
+                    </AlertDialogDescription>
+                  </AlertDialogHeader>
+                  <AlertDialogFooter>
+                    <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+                    <AlertDialogAction
+                      onClick={() => removeUser(user.id)}
+                      className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                    >
+                      {t("remove")}
+                    </AlertDialogAction>
+                  </AlertDialogFooter>
+                </AlertDialogContent>
+              </AlertDialog>
+            </div>
+            <div className="mt-4 grid grid-cols-2 gap-x-4 gap-y-2">
+              <div className="text-sm">
+                <div className="text-gray-500">{t("phone_number")}</div>
+                <div className="font-medium">{user.phone_number}</div>
+              </div>
+              <div className="text-sm">
+                <div className="text-gray-500">{t("user_type")}</div>
+                <div className="font-medium">{user.user_type}</div>
+              </div>
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  };
+
   return (
     <div className="mt-4 px-4 md:px-0" data-test-id="patient-users">
       <div className="group my-2 w-full">
         <div className="h-full space-y-2">
           <div className="flex flex-row items-center justify-between">
             <div className="mr-4 text-xl font-bold text-secondary-900">
-              Users
+              {t("users")}
             </div>
             <AddUserSheet patientId={id} />
           </div>
-          <div className="mt-4 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-            {users?.results?.map((user: UserBase) => (
-              <div
-                key={user.id}
-                className="rounded-lg border border-gray-200 bg-white p-4 shadow-sm"
-              >
-                <div className="flex items-start justify-between">
-                  <div className="flex items-start space-x-4">
-                    <Avatar
-                      name={`${user.first_name} ${user.last_name}`}
-                      className="h-10 w-10"
-                      imageUrl={user.profile_picture_url}
-                    />
-                    <div>
-                      <h3 className="text-sm font-medium text-gray-900">
-                        {user.first_name} {user.last_name}
-                      </h3>
-                      <p className="text-sm text-gray-500">{user.username}</p>
-                    </div>
-                  </div>
-                  <AlertDialog>
-                    <AlertDialogTrigger asChild>
-                      <Button variant="ghost" size="icon">
-                        <CareIcon icon="l-trash" className="h-4 w-4" />
-                      </Button>
-                    </AlertDialogTrigger>
-                    <AlertDialogContent>
-                      <AlertDialogHeader>
-                        <AlertDialogTitle>Remove User</AlertDialogTitle>
-                        <AlertDialogDescription>
-                          Are you sure you want to remove {user.first_name}{" "}
-                          {user.last_name} from this patient? This action cannot
-                          be undone.
-                        </AlertDialogDescription>
-                      </AlertDialogHeader>
-                      <AlertDialogFooter>
-                        <AlertDialogCancel>Cancel</AlertDialogCancel>
-                        <AlertDialogAction
-                          onClick={() => removeUser(user.id)}
-                          className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
-                        >
-                          Remove
-                        </AlertDialogAction>
-                      </AlertDialogFooter>
-                    </AlertDialogContent>
-                  </AlertDialog>
-                </div>
-                <div className="mt-4 grid grid-cols-2 gap-x-4 gap-y-2">
-                  <div className="text-sm">
-                    <div className="text-gray-500">Phone Number</div>
-                    <div className="font-medium">{user.phone_number}</div>
-                  </div>
-                  <div className="text-sm">
-                    <div className="text-gray-500">User Type</div>
-                    <div className="font-medium">{user.user_type}</div>
-                  </div>
-                </div>
-              </div>
-            ))}
-          </div>
+          <ManageUsers />
         </div>
       </div>
     </div>

From 4850743d79c07ce1ca82933bb0f8a1afb9d5a275 Mon Sep 17 00:00:00 2001
From: Mahendar Chikolla <119734520+Mahendar0701@users.noreply.github.com>
Date: Sat, 4 Jan 2025 21:32:12 +0530
Subject: [PATCH 2/5] Remove facility name from facility users page (#9746)

---
 src/components/Facility/FacilityUsers.tsx | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx
index 2e8e7b4a769..8678c5ebf99 100644
--- a/src/components/Facility/FacilityUsers.tsx
+++ b/src/components/Facility/FacilityUsers.tsx
@@ -11,7 +11,6 @@ import useFilters from "@/hooks/useFilters";
 
 import routes from "@/Utils/request/api";
 import query from "@/Utils/request/query";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
 
 export default function FacilityUsers(props: { facilityId: number }) {
   const { t } = useTranslation();
@@ -22,16 +21,6 @@ export default function FacilityUsers(props: { facilityId: number }) {
   const [activeTab, setActiveTab] = useState(0);
   const { facilityId } = props;
 
-  const { data: facilityData } = useTanStackQueryInstead(
-    routes.getAnyFacility,
-    {
-      pathParams: {
-        id: facilityId,
-      },
-      prefetch: facilityId !== undefined,
-    },
-  );
-
   const { data: userListData, isLoading: userListLoading } = useQuery({
     queryKey: ["facilityUsers", facilityId],
     queryFn: query(routes.facility.getUsers, {
@@ -44,15 +33,11 @@ export default function FacilityUsers(props: { facilityId: number }) {
     return <div>Loading...</div>;
   }
   if (!userListData) {
-    return <div>No users found</div>;
+    return <div>{t("no_users_found")}</div>;
   }
 
   return (
-    <Page
-      title={`${t("users")} - ${facilityData?.name}`}
-      hideBack={true}
-      breadcrumbs={false}
-    >
+    <Page title={`${t("users")}`} hideBack={true} breadcrumbs={false}>
       <CountBlock
         text={t("total_users")}
         count={userListData.count}

From 11664931a0e0f8bd0012e6f7e0f996f08546f6f1 Mon Sep 17 00:00:00 2001
From: Bodhish Thomas <bodhish@gmail.com>
Date: Sun, 5 Jan 2025 16:30:11 +0530
Subject: [PATCH 3/5] Enhance organization management by adding new
 organization types and updating related components. Refactor organization
 level retrieval to use metadata for improved localization. Remove deprecated
 organization levels constant and clean up unused code in various components.

---
 public/locale/en.json                         | 13 ++++++
 src/common/constants.tsx                      |  9 ----
 src/components/Facility/FacilityHome.tsx      | 10 ++---
 .../Patient/PatientDetailsTab/Demography.tsx  | 43 ++-----------------
 src/pages/Organization/OrganizationIndex.tsx  |  8 ++--
 src/pages/Organization/OrganizationView.tsx   | 16 ++++---
 .../components/OrganizationLayout.tsx         |  6 +--
 .../components/OrganizationSelector.tsx       | 24 +++++------
 src/pages/UserDashboard.tsx                   |  5 +--
 src/types/organization/organization.ts        | 23 +++++-----
 10 files changed, 62 insertions(+), 95 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 1a858bb77a8..20885bf0435 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -224,6 +224,19 @@
   "SPO2_LEVEL_MODERATE_HYPOXEMIA": "Moderate Hypoxemia",
   "SPO2_LEVEL_NORMAL": "Normal",
   "SPO2_LEVEL_SEVERE_HYPOXEMIA": "Severe Hypoxemia",
+  "SYSTEM__govt_org_type__block_panchayat": "Block Panchayat",
+  "SYSTEM__govt_org_type__corporation": "Corporation",
+  "SYSTEM__govt_org_type__default": "State",
+  "SYSTEM__govt_org_type__district": "District",
+  "SYSTEM__govt_org_type__grama_panchayat": "Grama Panchayat",
+  "SYSTEM__govt_org_type__local_body": "Local Body",
+  "SYSTEM__govt_org_type__muncipality": "Muncipality",
+  "SYSTEM__govt_org_type__state": "State",
+  "SYSTEM__govt_org_type__ward": "Ward",
+  "SYSTEM__org_type__default": "Organization",
+  "SYSTEM__org_type__govt": "Government",
+  "SYSTEM__org_type__role": "Role",
+  "SYSTEM__org_type__team": "Team",
   "Submit": "Submit",
   "TELEMEDICINE": "Telemedicine",
   "TRANSPORTATION TO BE ARRANGED": "Transportation",
diff --git a/src/common/constants.tsx b/src/common/constants.tsx
index b31691bda30..39fe769520c 100644
--- a/src/common/constants.tsx
+++ b/src/common/constants.tsx
@@ -1762,12 +1762,3 @@ export const ADMIN_USER_TYPES = ["DistrictAdmin", "StateAdmin"] as const;
  * @deprecated use `LocalStorageKeys.patientTokenKey` instead
  */
 export const CarePatientTokenKey = LocalStorageKeys.patientTokenKey;
-
-// organization_levels map based of type. for govt
-// thought: This might be better placed in the organization types files
-export const ORGANIZATION_LEVELS = {
-  govt: ["State", "District", "LocalBody", "Ward"],
-  team: ["Team"],
-  role: ["Role"],
-  other: ["Other"],
-};
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 615952be3ba..85d688d1740 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -38,7 +38,7 @@ import type {
   Organization,
   OrganizationParent,
 } from "@/types/organization/organization";
-import { getOrgLevelLabel } from "@/types/organization/organization";
+import { getOrgLabel } from "@/types/organization/organization";
 
 import type { UserModel } from "../Users/models";
 
@@ -77,7 +77,7 @@ const renderGeoOrganizations = (geoOrg: Organization) => {
 
   const parentDetails = orgParents.map((org) => {
     return {
-      label: getOrgLevelLabel(org.org_type, org.level_cache),
+      label: getOrgLabel(org.org_type, org.metadata),
       value: org.name,
     };
   });
@@ -85,14 +85,14 @@ const renderGeoOrganizations = (geoOrg: Organization) => {
   return parentDetails
     .reverse()
     .concat({
-      label: getOrgLevelLabel(geoOrg.org_type, geoOrg.level_cache),
+      label: getOrgLabel(geoOrg.org_type, geoOrg.metadata),
       value: geoOrg.name,
     })
     .map((org, index) => (
       <span key={org.value}>
-        <span className="text-muted-foreground">{org.value}</span>
+        <span className="text-gray-500">{org.value}</span>
         {index < parentDetails.length - 1 && (
-          <span className="mx-2 text-muted-foreground/50">→</span>
+          <span className="mx-2 text-gray-500">→</span>
         )}
       </span>
     ));
diff --git a/src/components/Patient/PatientDetailsTab/Demography.tsx b/src/components/Patient/PatientDetailsTab/Demography.tsx
index e472da1b474..f970011e221 100644
--- a/src/components/Patient/PatientDetailsTab/Demography.tsx
+++ b/src/components/Patient/PatientDetailsTab/Demography.tsx
@@ -16,7 +16,7 @@ import { formatPatientAge } from "@/Utils/utils";
 import {
   Organization,
   OrganizationParent,
-  getOrgLevelLabel,
+  getOrgLabel,
 } from "@/types/organization/organization";
 
 export const Demography = (props: PatientProps) => {
@@ -25,34 +25,6 @@ export const Demography = (props: PatientProps) => {
 
   const [activeSection, _setActiveSection] = useState<string | null>(null);
 
-  // useEffect(() => {
-  //   setAssignedVolunteerObject(patientData.assigned_to_object);
-
-  //   const observedSections: Element[] = [];
-  //   const sections = document.querySelectorAll("div[id]");
-  //   const observer = new IntersectionObserver(
-  //     (entries) => {
-  //       entries.forEach((entry) => {
-  //         if (entry.isIntersecting) {
-  //           setActiveSection(entry.target.id);
-  //         }
-  //       });
-  //     },
-  //     {
-  //       threshold: 0.6,
-  //     },
-  //   );
-
-  //   sections.forEach((section) => {
-  //     observer.observe(section);
-  //     observedSections.push(section);
-  //   });
-
-  //   return () => {
-  //     observedSections.forEach((section) => observer.unobserve(section));
-  //   };
-  // }, [patientData.assigned_to_object]);
-
   const patientGender = GENDER_TYPES.find(
     (i) => i.id === patientData.gender,
   )?.text;
@@ -137,15 +109,6 @@ export const Demography = (props: PatientProps) => {
     details: (React.ReactNode | { label: string; value: React.ReactNode })[];
   };
 
-  // const orgParents: OrganizationParent[] = [];
-  // let currentParent = org.parent;
-  // while (currentParent) {
-  //   if (currentParent.id) {
-  //     orgParents.push(currentParent);
-  //   }
-  //   currentParent = currentParent.parent;
-  // }
-
   const getGeoOrgDetails = (geoOrg: Organization) => {
     const orgParents: OrganizationParent[] = [];
     let currentParent = geoOrg.parent;
@@ -158,13 +121,13 @@ export const Demography = (props: PatientProps) => {
 
     const parentDetails = orgParents.map((org) => {
       return {
-        label: getOrgLevelLabel(org.org_type, org.level_cache),
+        label: getOrgLabel(org.org_type, org.metadata),
         value: org.name,
       };
     });
 
     return parentDetails.reverse().concat({
-      label: getOrgLevelLabel(geoOrg.org_type, geoOrg.level_cache),
+      label: getOrgLabel(geoOrg.org_type, geoOrg.metadata),
       value: geoOrg.name,
     });
   };
diff --git a/src/pages/Organization/OrganizationIndex.tsx b/src/pages/Organization/OrganizationIndex.tsx
index ddd3abbab0d..1719b70caab 100644
--- a/src/pages/Organization/OrganizationIndex.tsx
+++ b/src/pages/Organization/OrganizationIndex.tsx
@@ -17,8 +17,10 @@ import { Skeleton } from "@/components/ui/skeleton";
 import Page from "@/components/Common/Page";
 
 import query from "@/Utils/request/query";
-import type { Organization } from "@/types/organization/organization";
-import { getOrgLevel } from "@/types/organization/organization";
+import {
+  type Organization,
+  getOrgLabel,
+} from "@/types/organization/organization";
 import organizationApi from "@/types/organization/organizationApi";
 
 export default function OrganizationIndex() {
@@ -88,7 +90,7 @@ export default function OrganizationIndex() {
                   {org.name}
                 </CardTitle>
                 <CardDescription>
-                  {getOrgLevel(org.org_type, org.level_cache)}
+                  {getOrgLabel(org.org_type, org.metadata)}
                 </CardDescription>
               </div>
             </CardHeader>
diff --git a/src/pages/Organization/OrganizationView.tsx b/src/pages/Organization/OrganizationView.tsx
index 92a0b741eca..cd2c1b492a4 100644
--- a/src/pages/Organization/OrganizationView.tsx
+++ b/src/pages/Organization/OrganizationView.tsx
@@ -12,7 +12,7 @@ import { Input } from "@/components/ui/input";
 import Pagination from "@/components/Common/Pagination";
 
 import query from "@/Utils/request/query";
-import { Organization, getOrgLevel } from "@/types/organization/organization";
+import { Organization, getOrgLabel } from "@/types/organization/organization";
 import organizationApi from "@/types/organization/organizationApi";
 
 import OrganizationLayout from "./components/OrganizationLayout";
@@ -95,12 +95,14 @@ export default function OrganizationView({ id, navOrganizationId }: Props) {
                               <Badge variant="outline">
                                 {orgChild.org_type}
                               </Badge>
-                              <Badge variant="outline">
-                                {getOrgLevel(
-                                  orgChild.org_type,
-                                  orgChild.level_cache,
-                                )}
-                              </Badge>
+                              {orgChild.metadata?.govt_org_type && (
+                                <Badge variant="outline">
+                                  {getOrgLabel(
+                                    orgChild.org_type,
+                                    orgChild.metadata,
+                                  )}
+                                </Badge>
+                              )}
                             </div>
                           </div>
                           <Button variant="link" asChild>
diff --git a/src/pages/Organization/components/OrganizationLayout.tsx b/src/pages/Organization/components/OrganizationLayout.tsx
index b28e50884cc..5264acedb8f 100644
--- a/src/pages/Organization/components/OrganizationLayout.tsx
+++ b/src/pages/Organization/components/OrganizationLayout.tsx
@@ -18,7 +18,6 @@ import query from "@/Utils/request/query";
 import {
   Organization,
   OrganizationParent,
-  getOrgLevel,
 } from "@/types/organization/organization";
 import organizationApi from "@/types/organization/organizationApi";
 
@@ -93,10 +92,7 @@ export default function OrganizationLayout({
   }
 
   return (
-    <Page
-      title={`${org.name} ${getOrgLevel(org.org_type, org.level_cache)}`}
-      breadcrumbs={false}
-    >
+    <Page title={`${org.name}`} breadcrumbs={false}>
       {/* Since we have links to all parent organizations, we can show the breadcrumb here */}
       <Breadcrumb className="mt-1">
         <BreadcrumbList>
diff --git a/src/pages/Organization/components/OrganizationSelector.tsx b/src/pages/Organization/components/OrganizationSelector.tsx
index 5220e7d7c5b..a90881f1825 100644
--- a/src/pages/Organization/components/OrganizationSelector.tsx
+++ b/src/pages/Organization/components/OrganizationSelector.tsx
@@ -1,4 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
+import { t } from "i18next";
 import { useState } from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
@@ -9,10 +10,8 @@ import InputWithError from "@/components/ui/input-with-error";
 
 import useDebouncedState from "@/hooks/useDebouncedState";
 
-import { ORGANIZATION_LEVELS } from "@/common/constants";
-
 import query from "@/Utils/request/query";
-import { Organization, getOrgLevel } from "@/types/organization/organization";
+import { Organization } from "@/types/organization/organization";
 import organizationApi from "@/types/organization/organizationApi";
 
 interface OrganizationSelectorProps {
@@ -27,6 +26,7 @@ interface AutoCompleteOption {
   value: string;
 }
 
+// TODO: Rename to GovtOrganizationSelector
 export default function OrganizationSelector(props: OrganizationSelectorProps) {
   const { onChange, required } = props;
   const [selectedLevels, setSelectedLevels] = useState<Organization[]>([]);
@@ -99,15 +99,12 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
     }));
   };
 
-  const getLevelLabel = (org: Organization) => {
-    const orgLevel = getOrgLevel(org.org_type, org.level_cache);
-    return typeof orgLevel === "string" ? orgLevel : orgLevel[0];
-  };
-
   const handleEdit = (level: number) => {
     setSelectedLevels((prev) => prev.slice(0, level));
   };
 
+  const lastLevel = selectedLevels[selectedLevels.length - 1];
+
   return (
     <>
       {/* Selected Levels */}
@@ -115,9 +112,7 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
         <div>
           <InputWithError
             key={level.id}
-            label={
-              index === 0 ? ORGANIZATION_LEVELS.govt[0] : getLevelLabel(level)
-            }
+            label={t(`SYSTEM__govt_org_type__${level.metadata?.govt_org_type}`)}
             required={required}
           >
             <div className="flex">
@@ -144,8 +139,11 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
         selectedLevels[selectedLevels.length - 1]?.has_children) && (
         <div>
           <InputWithError
-            label={ORGANIZATION_LEVELS.govt[selectedLevels.length]}
-            required={selectedLevels.length === 0 && required}
+            label={t(
+              lastLevel
+                ? `SYSTEM__govt_org_type__${lastLevel.metadata?.govt_org_children_type || "default"}`
+                : "SYSTEM__govt_org_type__default",
+            )}
           >
             <Autocomplete
               value=""
diff --git a/src/pages/UserDashboard.tsx b/src/pages/UserDashboard.tsx
index e4a9d051936..6cff07e4591 100644
--- a/src/pages/UserDashboard.tsx
+++ b/src/pages/UserDashboard.tsx
@@ -8,7 +8,7 @@ import { Avatar } from "@/components/Common/Avatar";
 
 import useAuthUser, { useAuthContext } from "@/hooks/useAuthUser";
 
-import { getOrgLevel } from "@/types/organization/organization";
+import { getOrgLabel } from "@/types/organization/organization";
 
 export default function UserDashboard() {
   const user = useAuthUser();
@@ -118,8 +118,7 @@ export default function UserDashboard() {
                         {org.name}
                       </h3>
                       <p className="text-xs md:text-sm text-muted-foreground truncate">
-                        {org.org_type} ·{" "}
-                        {getOrgLevel(org.org_type, org.level_cache)}
+                        {getOrgLabel(org.org_type, org.metadata)}
                       </p>
                     </div>
                     <ChevronRight className="h-4 w-4 md:h-5 md:w-5 text-muted-foreground" />
diff --git a/src/types/organization/organization.ts b/src/types/organization/organization.ts
index 246088f8d9c..68a11895758 100644
--- a/src/types/organization/organization.ts
+++ b/src/types/organization/organization.ts
@@ -1,4 +1,4 @@
-import { ORGANIZATION_LEVELS } from "@/common/constants";
+import { t } from "i18next";
 
 import { PaginatedResponse } from "@/Utils/request/types";
 
@@ -6,10 +6,16 @@ import { UserBase } from "../user/user";
 
 type org_type = "team" | "govt" | "role" | "other";
 
+export type Metadata = {
+  govt_org_children_type?: string;
+  govt_org_type?: string;
+};
+
 export interface OrganizationParent {
   id: string;
   name: string;
   description?: string;
+  metadata: Metadata | null;
   org_type: org_type;
   level_cache: number;
   parent?: OrganizationParent;
@@ -26,6 +32,7 @@ export interface Organization {
   parent?: OrganizationParent;
   created_at: string;
   updated_at: string;
+  metadata: Metadata | null;
 }
 
 export interface OrganizationUserRole {
@@ -49,15 +56,11 @@ export type OrganizationUserRoleResponse =
   PaginatedResponse<OrganizationUserRole>;
 export type RoleResponse = PaginatedResponse<Role>;
 
-export const getOrgLevel = (org_type: org_type, level_cache: number) => {
+export const getOrgLabel = (org_type: org_type, metadata: Metadata | null) => {
   if (org_type === "govt") {
-    return ORGANIZATION_LEVELS.govt[level_cache];
-  } else {
-    return ORGANIZATION_LEVELS[org_type];
+    return metadata?.govt_org_type
+      ? t(`SYSTEM__govt_org_type__${metadata?.govt_org_type}`)
+      : t(`SYSTEM__org_type__${org_type}`);
   }
-};
-
-export const getOrgLevelLabel = (org_type: org_type, level_cache: number) => {
-  const orgLevel = getOrgLevel(org_type, level_cache);
-  return typeof orgLevel === "string" ? orgLevel : orgLevel[0];
+  return org_type;
 };

From fd0a7443024f94a4bc97a708397531fcc8f238eb Mon Sep 17 00:00:00 2001
From: Arham Athar <67058487+arhamathar@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:33:53 +0530
Subject: [PATCH 4/5] Cancel button fix in Book Appointment screen (#9757)

---
 .../Schedule/Appointments/AppointmentCreatePage.tsx        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Schedule/Appointments/AppointmentCreatePage.tsx b/src/components/Schedule/Appointments/AppointmentCreatePage.tsx
index 1ea55aad66d..772e7b90361 100644
--- a/src/components/Schedule/Appointments/AppointmentCreatePage.tsx
+++ b/src/components/Schedule/Appointments/AppointmentCreatePage.tsx
@@ -30,6 +30,8 @@ import {
 } from "@/components/Schedule/Appointments/utils";
 import { ScheduleAPIs } from "@/components/Schedule/api";
 
+import useAppHistory from "@/hooks/useAppHistory";
+
 import mutate from "@/Utils/request/mutate";
 import query from "@/Utils/request/query";
 import { dateQueryString, formatDisplayName, formatName } from "@/Utils/utils";
@@ -41,6 +43,7 @@ interface Props {
 
 export default function AppointmentCreatePage(props: Props) {
   const { t } = useTranslation();
+  const { goBack } = useAppHistory();
 
   const [resourceId, setResourceId] = useState<string>();
   const [selectedMonth, setSelectedMonth] = useState(new Date());
@@ -363,7 +366,9 @@ export default function AppointmentCreatePage(props: Props) {
           </div>
 
           <div className="flex justify-end gap-4">
-            <Button variant="outline">{t("cancel")}</Button>
+            <Button variant="outline" type="button" onClick={() => goBack()}>
+              {t("cancel")}
+            </Button>
             <Button
               variant="primary"
               type="submit"

From ef649a4f6812f359761c20925085cca604747848 Mon Sep 17 00:00:00 2001
From: Bodhish Thomas <bodhish@gmail.com>
Date: Sun, 5 Jan 2025 17:56:23 +0530
Subject: [PATCH 5/5] Add public flag to facility (#9759)

---
 public/locale/en.json                         |   2 +-
 .../QuestionnaireResponsesList.tsx            |   1 -
 .../Facility/CreateFacilityForm.tsx           | 342 +++++++++++-------
 src/components/Facility/FacilityCreate.tsx    |  36 +-
 src/components/Facility/FacilityHome.tsx      |  18 +-
 src/components/Facility/models.tsx            |   1 +
 .../Questionnaire/QuestionnaireForm.tsx       |   2 -
 src/components/ui/sidebar/app-sidebar.tsx     |  48 ++-
 .../ui/sidebar/facility-switcher.tsx          |   5 +-
 .../ui/sidebar/organization-switcher.tsx      |   3 +-
 src/pages/Organization/OrganizationUsers.tsx  |   2 +-
 .../components/OrganizationLayout.tsx         |   1 +
 .../components/OrganizationSelector.tsx       |   1 +
 src/types/facility/facility.ts                |   2 +
 14 files changed, 304 insertions(+), 160 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 20885bf0435..2a485441d4f 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -230,7 +230,7 @@
   "SYSTEM__govt_org_type__district": "District",
   "SYSTEM__govt_org_type__grama_panchayat": "Grama Panchayat",
   "SYSTEM__govt_org_type__local_body": "Local Body",
-  "SYSTEM__govt_org_type__muncipality": "Muncipality",
+  "SYSTEM__govt_org_type__municipality": "Municipality",
   "SYSTEM__govt_org_type__state": "State",
   "SYSTEM__govt_org_type__ward": "Ward",
   "SYSTEM__org_type__default": "Organization",
diff --git a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
index 5f3d62b9809..b82b37aaca5 100644
--- a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
+++ b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
@@ -258,7 +258,6 @@ export default function QuestionnaireResponsesList({ encounter }: Props) {
                         // New structured response rendering
                         Object.entries(item.structured_responses).map(
                           ([type, response]) => {
-                            console.log("LOGGG", type, response);
                             return (
                               <StructuredResponseView
                                 key={response.id}
diff --git a/src/components/Facility/CreateFacilityForm.tsx b/src/components/Facility/CreateFacilityForm.tsx
index 264c99be558..8ad9887d2ef 100644
--- a/src/components/Facility/CreateFacilityForm.tsx
+++ b/src/components/Facility/CreateFacilityForm.tsx
@@ -1,5 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as z from "zod";
@@ -7,6 +8,7 @@ import * as z from "zod";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   Form,
   FormControl,
@@ -62,6 +64,7 @@ const facilityFormSchema = z.object({
     .string()
     .optional()
     .refine((val) => !val || validateLongitude(val), "Invalid longitude"),
+  is_public: z.boolean().default(false),
 });
 
 type FacilityFormValues = z.infer<typeof facilityFormSchema>;
@@ -77,6 +80,7 @@ export default function CreateFacilityForm({
 }: Props) {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
+  const [isGettingLocation, setIsGettingLocation] = useState(false);
 
   const form = useForm<FacilityFormValues>({
     resolver: zodResolver(facilityFormSchema),
@@ -90,6 +94,7 @@ export default function CreateFacilityForm({
       phone_number: "+91",
       latitude: "",
       longitude: "",
+      is_public: false,
     },
   });
 
@@ -132,16 +137,23 @@ export default function CreateFacilityForm({
 
   const handleGetCurrentLocation = () => {
     if (navigator.geolocation) {
+      setIsGettingLocation(true);
       navigator.geolocation.getCurrentPosition(
         (position) => {
           form.setValue("latitude", position.coords.latitude.toString());
           form.setValue("longitude", position.coords.longitude.toString());
+          setIsGettingLocation(false);
+          Notification.Success({
+            msg: "Location updated successfully",
+          });
         },
         (error) => {
+          setIsGettingLocation(false);
           Notification.Error({
             msg: "Unable to get location: " + error.message,
           });
         },
+        { timeout: 10000 }, // 10 second timeout
       );
     } else {
       Notification.Error({
@@ -152,108 +164,138 @@ export default function CreateFacilityForm({
 
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-        <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-          <FormField
-            control={form.control}
-            name="facility_type"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Facility Type</FormLabel>
-                <Select onValueChange={field.onChange} value={field.value}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+        {/* Basic Information */}
+        <div className="space-y-4 rounded-lg border p-4">
+          <h3 className="text-lg font-medium">Basic Information</h3>
+          <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="facility_type"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Facility Type</FormLabel>
+                  <Select onValueChange={field.onChange} value={field.value}>
+                    <FormControl>
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select facility type" />
+                      </SelectTrigger>
+                    </FormControl>
+                    <SelectContent>
+                      {FACILITY_TYPES.map((type) => (
+                        <SelectItem key={type.text} value={type.text}>
+                          {type.text}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Facility Name</FormLabel>
                   <FormControl>
-                    <SelectTrigger>
-                      <SelectValue placeholder="Select facility type" />
-                    </SelectTrigger>
+                    <Input placeholder="Enter facility name" {...field} />
                   </FormControl>
-                  <SelectContent>
-                    {FACILITY_TYPES.map((type) => (
-                      <SelectItem key={type.text} value={type.text}>
-                        {type.text}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
 
           <FormField
             control={form.control}
-            name="name"
+            name="description"
             render={({ field }) => (
               <FormItem>
-                <FormLabel>Facility Name</FormLabel>
+                <FormLabel>Description</FormLabel>
                 <FormControl>
-                  <Input {...field} />
+                  <Textarea
+                    {...field}
+                    placeholder="Describe your facility (Markdown supported)"
+                    className="h-24"
+                  />
                 </FormControl>
                 <FormMessage />
               </FormItem>
             )}
           />
-        </div>
-
-        <FormField
-          control={form.control}
-          name="description"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>Description</FormLabel>
-              <FormControl>
-                <Textarea {...field} placeholder="Markdown supported" />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        <FormField
-          control={form.control}
-          name="features"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>Features</FormLabel>
-              <FormControl>
-                <MultiSelectFormField
-                  name={field.name}
-                  value={field.value}
-                  placeholder={t("features")}
-                  options={FACILITY_FEATURE_TYPES}
-                  optionLabel={(o) => o.name}
-                  optionValue={(o) => o.id}
-                  onChange={handleFeatureChange}
-                  error={form.formState.errors.features?.message}
-                />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
 
-        <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
           <FormField
             control={form.control}
-            name="phone_number"
+            name="features"
             render={({ field }) => (
               <FormItem>
-                <FormLabel>Phone Number</FormLabel>
+                <FormLabel>Features</FormLabel>
                 <FormControl>
-                  <Input placeholder="+91XXXXXXXXXX" {...field} />
+                  <MultiSelectFormField
+                    name={field.name}
+                    value={field.value}
+                    placeholder="Select facility features"
+                    options={FACILITY_FEATURE_TYPES}
+                    optionLabel={(o) => o.name}
+                    optionValue={(o) => o.id}
+                    onChange={handleFeatureChange}
+                    error={form.formState.errors.features?.message}
+                  />
                 </FormControl>
                 <FormMessage />
               </FormItem>
             )}
           />
+        </div>
+
+        {/* Contact Information */}
+        <div className="space-y-4 rounded-lg border p-4">
+          <h3 className="text-lg font-medium">Contact Information</h3>
+          <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="phone_number"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Phone Number</FormLabel>
+                  <FormControl>
+                    <Input placeholder="+91XXXXXXXXXX" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="pincode"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Pincode</FormLabel>
+                  <FormControl>
+                    <Input placeholder="Enter pincode" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
 
           <FormField
             control={form.control}
-            name="pincode"
+            name="address"
             render={({ field }) => (
               <FormItem>
-                <FormLabel>Pincode</FormLabel>
+                <FormLabel>Address</FormLabel>
                 <FormControl>
-                  <Input {...field} />
+                  <Textarea
+                    {...field}
+                    placeholder="Enter complete address"
+                    className="h-20"
+                  />
                 </FormControl>
                 <FormMessage />
               </FormItem>
@@ -261,83 +303,133 @@ export default function CreateFacilityForm({
           />
         </div>
 
-        <FormField
-          control={form.control}
-          name="address"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>Address</FormLabel>
-              <FormControl>
-                <Textarea {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
+        {/* Location Information */}
+        <div className="space-y-4 rounded-lg border p-4">
+          <div className="flex items-center justify-between">
+            <h3 className="text-lg font-medium">Location Details</h3>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={handleGetCurrentLocation}
+              disabled={isGettingLocation}
+              className="flex items-center gap-2"
+            >
+              {isGettingLocation ? (
+                <>
+                  <CareIcon icon="l-spinner" className="h-4 w-4 animate-spin" />
+                  Getting Location...
+                </>
+              ) : (
+                <>
+                  <CareIcon icon="l-location-point" className="h-4 w-4" />
+                  Get Current Location
+                </>
+              )}
+            </Button>
+          </div>
 
-        <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-          <div className="flex gap-2">
+          <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
             <FormField
               control={form.control}
               name="latitude"
               render={({ field }) => (
-                <FormItem className="flex-1">
+                <FormItem>
                   <FormLabel>Latitude</FormLabel>
-                  <div className="flex gap-2">
-                    <FormControl>
-                      <Input {...field} />
-                    </FormControl>
-                    <Button
-                      type="button"
-                      variant="outline"
-                      size="icon"
-                      onClick={handleGetCurrentLocation}
-                    >
-                      <CareIcon icon="l-location-point" className="h-4 w-4" />
-                    </Button>
-                  </div>
+                  <FormControl>
+                    <Input
+                      {...field}
+                      placeholder="Enter latitude"
+                      disabled={isGettingLocation}
+                      className={isGettingLocation ? "animate-pulse" : ""}
+                    />
+                  </FormControl>
                   <FormMessage />
                 </FormItem>
               )}
             />
-          </div>
 
-          <FormField
-            control={form.control}
-            name="longitude"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Longitude</FormLabel>
-                <FormControl>
-                  <Input {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+            <FormField
+              control={form.control}
+              name="longitude"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Longitude</FormLabel>
+                  <FormControl>
+                    <Input
+                      {...field}
+                      placeholder="Enter longitude"
+                      disabled={isGettingLocation}
+                      className={isGettingLocation ? "animate-pulse" : ""}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
         </div>
 
-        {!organizationId && (
+        {/* Visibility Settings */}
+        <div className="space-y-4 rounded-lg border p-4">
+          <h3 className="text-lg font-medium">Visibility Settings</h3>
           <FormField
-            name="geo_organization"
+            control={form.control}
+            name="is_public"
             render={({ field }) => (
-              <FormItem>
-                <FormLabel>Organization</FormLabel>
+              <FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4 bg-muted/5">
                 <FormControl>
-                  <OrganizationSelector
-                    value={field.value}
-                    onChange={field.onChange}
-                    required
+                  <Checkbox
+                    checked={field.value}
+                    onCheckedChange={field.onChange}
                   />
                 </FormControl>
+                <div className="space-y-1 leading-none">
+                  <FormLabel className="text-base">
+                    Make this facility public
+                  </FormLabel>
+                  <p className="text-sm text-muted-foreground">
+                    When enabled, this facility will be visible to the public
+                    and can be discovered by anyone using the platform
+                  </p>
+                </div>
                 <FormMessage />
               </FormItem>
             )}
           />
-        )}
+
+          {!organizationId && (
+            <FormField
+              name="geo_organization"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Organization</FormLabel>
+                  <FormControl>
+                    <OrganizationSelector
+                      value={field.value}
+                      onChange={field.onChange}
+                      required
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          )}
+        </div>
 
         <Button type="submit" className="w-full" disabled={isPending}>
-          {isPending ? "Creating..." : "Create Facility"}
+          {isPending ? (
+            <>
+              <CareIcon
+                icon="l-spinner"
+                className="mr-2 h-4 w-4 animate-spin"
+              />
+              Creating Facility...
+            </>
+          ) : (
+            "Create Facility"
+          )}
         </Button>
       </form>
     </Form>
diff --git a/src/components/Facility/FacilityCreate.tsx b/src/components/Facility/FacilityCreate.tsx
index 53a9d4cb50b..f5c3fecd40b 100644
--- a/src/components/Facility/FacilityCreate.tsx
+++ b/src/components/Facility/FacilityCreate.tsx
@@ -16,6 +16,7 @@ import Card from "@/CAREUI/display/Card";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   Form,
   FormControl,
@@ -109,6 +110,7 @@ export const FacilityCreate = (props: FacilityProps) => {
       .refine((val) => !val || validateLongitude(val), {
         message: t("longitude_invalid"),
       }),
+    is_public: z.boolean().default(false),
   });
 
   type FacilityFormValues = z.infer<typeof facilityFormSchema>;
@@ -134,6 +136,7 @@ export const FacilityCreate = (props: FacilityProps) => {
       phone_number: "",
       latitude: "",
       longitude: "",
+      is_public: false,
     },
   });
 
@@ -146,12 +149,13 @@ export const FacilityCreate = (props: FacilityProps) => {
         name: facilityData.name,
         description: facilityData.description || "",
         features: facilityData.features || [],
-        pincode: facilityData.pincode,
+        pincode: facilityData.pincode?.toString() || "",
         geo_organization: facilityData.geo_organization,
         address: facilityData.address,
         phone_number: facilityData.phone_number,
         latitude: facilityData.latitude?.toString() || "",
         longitude: facilityData.longitude?.toString() || "",
+        is_public: facilityData.is_public,
       });
     }
   }, [facilityData, form]);
@@ -461,6 +465,36 @@ export const FacilityCreate = (props: FacilityProps) => {
                 />
               </div>
 
+              {/* Visibility Settings */}
+              <div className="space-y-4 rounded-lg border p-4">
+                <h3 className="text-lg font-medium">Visibility Settings</h3>
+                <FormField
+                  control={form.control}
+                  name="is_public"
+                  render={({ field }) => (
+                    <FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4 bg-muted/5">
+                      <FormControl>
+                        <Checkbox
+                          checked={field.value}
+                          onCheckedChange={field.onChange}
+                        />
+                      </FormControl>
+                      <div className="space-y-1 leading-none">
+                        <FormLabel className="text-base">
+                          Make this facility public
+                        </FormLabel>
+                        <p className="text-sm text-muted-foreground">
+                          When enabled, this facility will be visible to the
+                          public and can be discovered by anyone using the
+                          platform
+                        </p>
+                      </div>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+
               <div className="mt-6 flex flex-col-reverse justify-end gap-3 sm:flex-row">
                 <Button
                   variant="outline"
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 85d688d1740..7f33dec2b1b 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -82,19 +82,17 @@ const renderGeoOrganizations = (geoOrg: Organization) => {
     };
   });
 
-  return parentDetails
-    .reverse()
-    .concat({
+  return [
+    {
       label: getOrgLabel(geoOrg.org_type, geoOrg.metadata),
       value: geoOrg.name,
-    })
+    },
+  ]
+    .concat(parentDetails)
     .map((org, index) => (
-      <span key={org.value}>
+      <div key={index}>
         <span className="text-gray-500">{org.value}</span>
-        {index < parentDetails.length - 1 && (
-          <span className="mx-2 text-gray-500">→</span>
-        )}
-      </span>
+      </div>
     ));
 };
 
@@ -284,7 +282,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
             <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 flex-col gap-4 items-start mt-4">
                     <div className="flex items-start gap-3">
                       <MapPin className="mt-1 h-5 w-5 flex-shrink-0 text-muted-foreground" />
                       <div>
diff --git a/src/components/Facility/models.tsx b/src/components/Facility/models.tsx
index 57832d1a512..2ebbfc7161a 100644
--- a/src/components/Facility/models.tsx
+++ b/src/components/Facility/models.tsx
@@ -31,6 +31,7 @@ export interface FacilityModel {
   facility_flags?: FeatureFlag[];
   latitude?: string;
   longitude?: string;
+  is_public?: boolean;
 }
 
 export interface OptionsType {
diff --git a/src/components/Questionnaire/QuestionnaireForm.tsx b/src/components/Questionnaire/QuestionnaireForm.tsx
index 2a0a2c760c7..4dd14541a05 100644
--- a/src/components/Questionnaire/QuestionnaireForm.tsx
+++ b/src/components/Questionnaire/QuestionnaireForm.tsx
@@ -187,13 +187,11 @@ export function QuestionnaireForm({
           if (response.structured_type) {
             const structuredData = response.values?.[0]?.value;
             if (Array.isArray(structuredData) && structuredData.length > 0) {
-              console.log("structuredData", structuredData);
               const structuredRequests = getStructuredRequests(
                 response.structured_type,
                 structuredData,
                 context,
               );
-              console.log("structuredRequests", structuredRequests);
               requests.push(...structuredRequests);
             }
           }
diff --git a/src/components/ui/sidebar/app-sidebar.tsx b/src/components/ui/sidebar/app-sidebar.tsx
index 7e2fa302349..1f0c942f992 100644
--- a/src/components/ui/sidebar/app-sidebar.tsx
+++ b/src/components/ui/sidebar/app-sidebar.tsx
@@ -1,5 +1,6 @@
+import { DashboardIcon } from "@radix-ui/react-icons";
 import { TFunction } from "i18next";
-import { usePathParams } from "raviger";
+import { Link, usePathParams } from "raviger";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 
@@ -8,6 +9,9 @@ import {
   SidebarContent,
   SidebarFooter,
   SidebarHeader,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
   SidebarRail,
 } from "@/components/ui/sidebar";
 import { FacilitySwitcher } from "@/components/ui/sidebar/facility-switcher";
@@ -61,10 +65,8 @@ function generateFacilityLinks(
     },
     { name: t("encounters"), url: `${baseUrl}/encounters`, icon: "d-patient" },
     // { name: t("assets"), url: `${baseUrl}/assets`, icon: "d-folder" },
-    // { name: t("shifting"), url: "/shifting", icon: "d-ambulance" },
     { name: t("resource"), url: "/resource", icon: "d-book-open" },
     { name: t("users"), url: `${baseUrl}/users`, icon: "d-people" },
-    // { name: t("All users"), url: "/users", icon: "d-people" },
     {
       name: t("organization"),
       url: `${baseUrl}/organization`,
@@ -165,19 +167,39 @@ export function AppSidebar({
       className="group-data-[side=left]:border-r-0"
     >
       <SidebarHeader>
-        {selectedOrganization && hasOrganizations && user?.organizations ? (
+        {selectedOrganization && hasOrganizations && (
           <OrganizationSwitcher
-            organizations={user.organizations}
+            organizations={user?.organizations || []}
             selectedOrganization={selectedOrganization}
           />
-        ) : (
-          hasFacilities &&
-          user?.facilities && (
-            <FacilitySwitcher
-              facilities={user.facilities}
-              selectedFacility={selectedFacility}
-            />
-          )
+        )}
+        {selectedFacility && hasFacilities && (
+          <FacilitySwitcher
+            facilities={user?.facilities || []}
+            selectedFacility={selectedFacility}
+          />
+        )}
+        {!selectedFacility && !selectedOrganization && (
+          <SidebarMenu>
+            <SidebarMenuItem>
+              <SidebarMenuButton
+                asChild
+                size="lg"
+                className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground hover:bg-white mt-2"
+              >
+                <Link href="/">
+                  <div className="flex aspect-square size-8 items-center justify-center rounded-lg bg-primary text-sidebar-primary-foreground">
+                    <DashboardIcon className="size-4" />
+                  </div>
+                  <div className="grid flex-1 text-left text-sm leading-tight text-gray-900">
+                    <span className="truncate font-semibold">
+                      View Dashboard
+                    </span>
+                  </div>
+                </Link>
+              </SidebarMenuButton>
+            </SidebarMenuItem>
+          </SidebarMenu>
         )}
       </SidebarHeader>
 
diff --git a/src/components/ui/sidebar/facility-switcher.tsx b/src/components/ui/sidebar/facility-switcher.tsx
index a166269ac4b..cc63509381b 100644
--- a/src/components/ui/sidebar/facility-switcher.tsx
+++ b/src/components/ui/sidebar/facility-switcher.tsx
@@ -1,7 +1,6 @@
 import { CaretSortIcon, DashboardIcon } from "@radix-ui/react-icons";
 import { Hospital } from "lucide-react";
 import { navigate } from "raviger";
-import * as React from "react";
 
 import {
   DropdownMenu,
@@ -9,7 +8,6 @@ import {
   DropdownMenuItem,
   DropdownMenuLabel,
   DropdownMenuSeparator,
-  DropdownMenuShortcut,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import {
@@ -65,7 +63,7 @@ export function FacilitySwitcher({
             <DropdownMenuSeparator />
             {facilities.map((facility, index) => (
               <DropdownMenuItem
-                key={facility.name}
+                key={index}
                 onClick={() => navigate(`/facility/${facility.id}`)}
                 className="gap-2 p-2"
               >
@@ -73,7 +71,6 @@ export function FacilitySwitcher({
                   <Hospital className="size-4 shrink-0" />
                 </div>
                 {facility.name}
-                <DropdownMenuShortcut>⌘{index + 1}</DropdownMenuShortcut>
               </DropdownMenuItem>
             ))}
           </DropdownMenuContent>
diff --git a/src/components/ui/sidebar/organization-switcher.tsx b/src/components/ui/sidebar/organization-switcher.tsx
index 684f0aad617..675abd5e28c 100644
--- a/src/components/ui/sidebar/organization-switcher.tsx
+++ b/src/components/ui/sidebar/organization-switcher.tsx
@@ -1,7 +1,6 @@
 import { CaretSortIcon, DashboardIcon } from "@radix-ui/react-icons";
 import { Globe } from "lucide-react";
 import { navigate } from "raviger";
-import * as React from "react";
 
 import {
   DropdownMenu,
@@ -46,7 +45,7 @@ export function OrganizationSwitcher({
               <div className="grid flex-1 text-left text-sm leading-tight">
                 <span className="truncate font-semibold">
                   {selectedOrganization
-                    ? "Organizations"
+                    ? "My Organizations"
                     : "Select Organization"}
                 </span>
               </div>
diff --git a/src/pages/Organization/OrganizationUsers.tsx b/src/pages/Organization/OrganizationUsers.tsx
index c1fae8281fe..a94c466ec3b 100644
--- a/src/pages/Organization/OrganizationUsers.tsx
+++ b/src/pages/Organization/OrganizationUsers.tsx
@@ -67,7 +67,7 @@ export default function OrganizationUsers({ id, navOrganizationId }: Props) {
   }
 
   return (
-    <OrganizationLayout id={id}>
+    <OrganizationLayout id={id} navOrganizationId={navOrganizationId}>
       <div className="space-y-6">
         <div className="flex justify-between items-center">
           <h2 className="text-lg font-semibold">Users</h2>
diff --git a/src/pages/Organization/components/OrganizationLayout.tsx b/src/pages/Organization/components/OrganizationLayout.tsx
index 5264acedb8f..ab80cd485a1 100644
--- a/src/pages/Organization/components/OrganizationLayout.tsx
+++ b/src/pages/Organization/components/OrganizationLayout.tsx
@@ -72,6 +72,7 @@ export default function OrganizationLayout({
     queryFn: query(organizationApi.get, {
       pathParams: { id },
     }),
+    enabled: !!id,
   });
 
   if (isLoading) {
diff --git a/src/pages/Organization/components/OrganizationSelector.tsx b/src/pages/Organization/components/OrganizationSelector.tsx
index a90881f1825..a5880f30872 100644
--- a/src/pages/Organization/components/OrganizationSelector.tsx
+++ b/src/pages/Organization/components/OrganizationSelector.tsx
@@ -64,6 +64,7 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
       queryParams: {
         parent: selectedLevels[selectedLevels.length - 1]?.id,
         org_type: "govt",
+        limit: 200,
         name: searchQuery || undefined,
       },
       ...headers,
diff --git a/src/types/facility/facility.ts b/src/types/facility/facility.ts
index 7708f1ac587..b6527063616 100644
--- a/src/types/facility/facility.ts
+++ b/src/types/facility/facility.ts
@@ -11,6 +11,7 @@ export interface BaseFacility {
   cover_image_url?: string;
   features: number[];
   geo_organization?: string;
+  is_public: boolean;
 }
 
 export type CreateFacility = Omit<BaseFacility, "id">;
@@ -26,4 +27,5 @@ export interface FacilityData {
   features: number[];
   geo_organization: Organization;
   pincode?: string;
+  is_public: boolean;
 }