From dd7109af0e8eba8411dcc7169578c3e6b9dcca29 Mon Sep 17 00:00:00 2001
From: Bodhish Thomas <bodhish@gmail.com>
Date: Sun, 5 Jan 2025 17:56:23 +0530
Subject: [PATCH] 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 172d3316935..e53709ae7ff 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;
 }