From d0476d4b3a4ddf857b22da7e5af805ebafe9ecac Mon Sep 17 00:00:00 2001
From: G0V1NDK <govind.kush2001@gmail.com>
Date: Thu, 29 Jan 2026 11:39:50 +0530
Subject: [PATCH 1/5] Fix: Add null checks for facility group IDs and names
 during filtering.

---
 src/components/AddFacilityGroupModal.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/AddFacilityGroupModal.vue b/src/components/AddFacilityGroupModal.vue
index 69775f6b..55f7a93b 100644
--- a/src/components/AddFacilityGroupModal.vue
+++ b/src/components/AddFacilityGroupModal.vue
@@ -252,11 +252,15 @@ export default defineComponent({
 
       this.filteredFacilityGroupsByType = Object.values(this.facilityGroupsByType).reduce((filteredGroups: any, groups: any) => {
         groups.map((group: any) => {
-          if(group.facilityGroupId.toLowerCase().includes(keyword) || group.facilityGroupName.toLowerCase().includes(keyword)) {
-            if(filteredGroups[group.facilityGroupTypeId]) {
-              filteredGroups[group.facilityGroupTypeId].push(group)
+          const groupId = group.facilityGroupId ? group.facilityGroupId.toLowerCase() : '';
+          const groupName = group.facilityGroupName ? group.facilityGroupName.toLowerCase() : '';
+
+          if (groupId.includes(keyword) || groupName.includes(keyword)) {
+            const groupTypeId = group?.facilityGroupTypeId;
+            if (filteredGroups[groupTypeId]) {
+              filteredGroups[groupTypeId].push(group)
             } else {
-              filteredGroups[group.facilityGroupTypeId] = [group]
+              filteredGroups[groupTypeId] = [group]
             }
           }
         })

From f0cae0ad4f92a32a5e7d4a45e53a12cd5859d17f Mon Sep 17 00:00:00 2001
From: G0V1NDK <govind.kush2001@gmail.com>
Date: Thu, 29 Jan 2026 19:05:13 +0530
Subject: [PATCH 2/5] Move search bar into a new toolbar within the modal
 header.

---
 src/components/AddFacilityGroupModal.vue |  4 +-
 src/components/AddStaffMemberModal.vue   |  4 +-
 src/views/FindFacilities.vue             | 76 ++++++++++++++----------
 3 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/src/components/AddFacilityGroupModal.vue b/src/components/AddFacilityGroupModal.vue
index 55f7a93b..dc973e7c 100644
--- a/src/components/AddFacilityGroupModal.vue
+++ b/src/components/AddFacilityGroupModal.vue
@@ -8,10 +8,12 @@
       </ion-buttons>
       <ion-title>{{ translate("Add Group") }}</ion-title>
     </ion-toolbar>
+    <ion-toolbar>
+      <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; findGroups()"/>
+    </ion-toolbar>
   </ion-header>
 
   <ion-content>
-    <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; findGroups()"/>
     <div class="empty-state" v-if="!Object.keys(filteredFacilityGroupsByType).length || isSearching">
       <p>{{ translate("No facility groups found") }}</p>
     </div>
diff --git a/src/components/AddStaffMemberModal.vue b/src/components/AddStaffMemberModal.vue
index 04c21c90..3ca7598a 100644
--- a/src/components/AddStaffMemberModal.vue
+++ b/src/components/AddStaffMemberModal.vue
@@ -8,10 +8,12 @@
       </ion-buttons>
       <ion-title>{{ translate("Staff") }}</ion-title>
     </ion-toolbar>
+    <ion-toolbar>
+      <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; findParties()"/>
+    </ion-toolbar>
   </ion-header>
 
   <ion-content class="ion-padding">
-    <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; findParties()"/>
 
     <div class="ion-padding" v-if="!parties.length">
       {{ translate("No party found") }}
diff --git a/src/views/FindFacilities.vue b/src/views/FindFacilities.vue
index b428eb49..5266c60e 100644
--- a/src/views/FindFacilities.vue
+++ b/src/views/FindFacilities.vue
@@ -15,39 +15,41 @@
 
     <ion-content ref="contentRef" id="filter-content">
       <div class="find">
-        <section class="search">
-          <ion-searchbar :placeholder="translate('Search facilities')" v-model="query.queryString" @keyup.enter="updateQuery()" />
-        </section>
-
-        <aside class="filters">
-          <ion-list>
-            <ion-item lines="none">
-              <ion-icon :icon="globeOutline" slot="start" />
-              <ion-select :label="translate('Product Store')" interface="popover" v-model="query.productStoreId" @ionChange="updateQuery()">
-                <ion-select-option value="">{{ translate("All") }}</ion-select-option>
-                <ion-select-option :value="productStore.productStoreId" :key="index" v-for="(productStore, index) in productStores">{{ productStore.storeName ? productStore.storeName : productStore.productStoreId }}</ion-select-option>
-              </ion-select>
-            </ion-item>
-            <ion-item lines="none">
-              <ion-icon :icon="businessOutline" slot="start" />
-              <ion-select :label="translate('Type')" interface="popover" v-model="query.facilityTypeId" @ionChange="updateQuery()">
-                <ion-select-option value="">{{ translate("All") }}</ion-select-option>
-                <ion-select-option :value="facilityTypeId" :key="facilityTypeId" v-for="(type, facilityTypeId) in facilityTypes">
-                  {{ type.description }}
-                </ion-select-option>
-              </ion-select>
-            </ion-item>
-            <ion-item lines="none">
-              <ion-icon :icon="albumsOutline" slot="start" />
-              <ion-select :label="translate('Group')" interface="popover" v-model="query.facilityGroupId" @ionChange="updateQuery()">
-                <ion-select-option value="">{{ translate("All") }}</ion-select-option>
-                <ion-select-option :value="group.facilityGroupId" :key="group.facilityGroupId" v-for="group in facilityGroups">
-                  {{ group.facilityGroupName }}
-                </ion-select-option>
-              </ion-select>
-            </ion-item>
-          </ion-list>
-        </aside>
+        <div class="sidebar">
+          <section class="search">
+            <ion-searchbar :placeholder="translate('Search facilities')" v-model="query.queryString" @keyup.enter="updateQuery()" />
+          </section>
+  
+          <aside class="filters">
+            <ion-list>
+              <ion-item lines="none">
+                <ion-icon :icon="globeOutline" slot="start" />
+                <ion-select :label="translate('Product Store')" interface="popover" v-model="query.productStoreId" @ionChange="updateQuery()">
+                  <ion-select-option value="">{{ translate("All") }}</ion-select-option>
+                  <ion-select-option :value="productStore.productStoreId" :key="index" v-for="(productStore, index) in productStores">{{ productStore.storeName ? productStore.storeName : productStore.productStoreId }}</ion-select-option>
+                </ion-select>
+              </ion-item>
+              <ion-item lines="none">
+                <ion-icon :icon="businessOutline" slot="start" />
+                <ion-select :label="translate('Type')" interface="popover" v-model="query.facilityTypeId" @ionChange="updateQuery()">
+                  <ion-select-option value="">{{ translate("All") }}</ion-select-option>
+                  <ion-select-option :value="facilityTypeId" :key="facilityTypeId" v-for="(type, facilityTypeId) in facilityTypes">
+                    {{ type.description }}
+                  </ion-select-option>
+                </ion-select>
+              </ion-item>
+              <ion-item lines="none">
+                <ion-icon :icon="albumsOutline" slot="start" />
+                <ion-select :label="translate('Group')" interface="popover" v-model="query.facilityGroupId" @ionChange="updateQuery()">
+                  <ion-select-option value="">{{ translate("All") }}</ion-select-option>
+                  <ion-select-option :value="group.facilityGroupId" :key="group.facilityGroupId" v-for="group in facilityGroups">
+                    {{ group.facilityGroupName }}
+                  </ion-select-option>
+                </ion-select>
+              </ion-item>
+            </ion-list>
+          </aside>
+        </div>
 
         <main v-if="facilities?.length">
           <div class="list-item" v-for="(facility, index) in facilities" :key="index" @click="viewFacilityDetails(facility.facilityId)">
@@ -371,6 +373,14 @@ config-note {
   text-align: center;
 }
 
+.sidebar {
+  position: sticky;
+  top: 0;
+  z-index: 10;
+  background: var(--ion-background-color, #fff);
+  border-bottom: 1px solid var(--ion-color-light-shade, #f4f5f8);
+}
+
 @media screen and (min-width: 991px) {
   ion-content {
     --padding-bottom: 80px;

From 845ec37be20c4072c9083ab4a4d32a7f2bf28bc7 Mon Sep 17 00:00:00 2001
From: Govind Kushwaha <83280091+G0V1NDK@users.noreply.github.com>
Date: Fri, 30 Jan 2026 19:03:48 +0530
Subject: [PATCH 3/5] Set default value for groupTypeId to 'Others'

---
 src/components/AddFacilityGroupModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AddFacilityGroupModal.vue b/src/components/AddFacilityGroupModal.vue
index 55f7a93b..976fa86c 100644
--- a/src/components/AddFacilityGroupModal.vue
+++ b/src/components/AddFacilityGroupModal.vue
@@ -256,7 +256,7 @@ export default defineComponent({
           const groupName = group.facilityGroupName ? group.facilityGroupName.toLowerCase() : '';
 
           if (groupId.includes(keyword) || groupName.includes(keyword)) {
-            const groupTypeId = group?.facilityGroupTypeId;
+            const groupTypeId = group?.facilityGroupTypeId || 'Others';
             if (filteredGroups[groupTypeId]) {
               filteredGroups[groupTypeId].push(group)
             } else {

From 5b2b084e37523716a475bba12788f24c873d924f Mon Sep 17 00:00:00 2001
From: G0V1NDK <govind.kush2001@gmail.com>
Date: Tue, 10 Feb 2026 12:31:44 +0530
Subject: [PATCH 4/5] fix: Add `@ionClear` event handler to the searchbar in
 `AddFacilityGroupModal` to clear the query and refetch groups.

---
 src/components/AddFacilityGroupModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AddFacilityGroupModal.vue b/src/components/AddFacilityGroupModal.vue
index dc973e7c..9416ecf9 100644
--- a/src/components/AddFacilityGroupModal.vue
+++ b/src/components/AddFacilityGroupModal.vue
@@ -9,7 +9,7 @@
       <ion-title>{{ translate("Add Group") }}</ion-title>
     </ion-toolbar>
     <ion-toolbar>
-      <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; findGroups()"/>
+      <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; findGroups()" @ionClear="queryString = ''; findGroups()"/>
     </ion-toolbar>
   </ion-header>
 

From a052e8b79966bebc5ba761c17304f5d85b51def0 Mon Sep 17 00:00:00 2001
From: G0V1NDK <govind.kush2001@gmail.com>
Date: Tue, 10 Feb 2026 12:36:18 +0530
Subject: [PATCH 5/5] Revert "Merge branch
 '386-fix-clear-search-in-link-groups' of
 https://github.com/G0V1NDK/facilities into
 386-fix-clear-search-in-link-groups"

This reverts commit d2d4e416ead232204f12d0f8af0ea9b2e80ca281, reversing
changes made to 5b2b084e37523716a475bba12788f24c873d924f.
---
 src/components/AddFacilityGroupModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AddFacilityGroupModal.vue b/src/components/AddFacilityGroupModal.vue
index d77a435a..9416ecf9 100644
--- a/src/components/AddFacilityGroupModal.vue
+++ b/src/components/AddFacilityGroupModal.vue
@@ -258,7 +258,7 @@ export default defineComponent({
           const groupName = group.facilityGroupName ? group.facilityGroupName.toLowerCase() : '';
 
           if (groupId.includes(keyword) || groupName.includes(keyword)) {
-            const groupTypeId = group?.facilityGroupTypeId || 'Others';
+            const groupTypeId = group?.facilityGroupTypeId;
             if (filteredGroups[groupTypeId]) {
               filteredGroups[groupTypeId].push(group)
             } else {