Merge branch 'develop' into eslint_version_upgrade_v9

AdityaJ2305 · Jan 22, 2025 · 5d4f49a · 5d4f49a
2 parents 4ed7956 + 6eea7f5
commit 5d4f49a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/hooks/useGovtOrganizationLevel.ts b/src/hooks/useGovtOrganizationLevel.ts
@@ -35,7 +35,7 @@ export function useGovtOrganizationLevel({
       }
     : {};
 
-  const { data: organizations, isLoading } = useQuery({
+  const { data: organizations, isFetching } = useQuery({
     queryKey: ["organizations-level", parentId, searchQuery],
     queryFn: query.debounced(organizationApi.list, {
       queryParams: {
@@ -74,6 +74,6 @@ export function useGovtOrganizationLevel({
     handleChange,
     handleSearch,
     organizations: organizations?.results,
-    isLoading,
+    isFetching,
   };
 }
diff --git a/src/pages/Organization/components/GovtOrganizationSelector.tsx b/src/pages/Organization/components/GovtOrganizationSelector.tsx
@@ -41,7 +41,7 @@ function OrganizationLevelSelect({
 }: OrganizationLevelProps) {
   const parentId = index === 0 ? "" : previousLevel?.id || "";
 
-  const { options, handleChange, handleSearch, organizations, isLoading } =
+  const { options, handleChange, handleSearch, organizations, isFetching } =
     useGovtOrganizationLevel({
       index,
       onChange: (filter: FilterState, index: number) => {
@@ -68,9 +68,8 @@ function OrganizationLevelSelect({
         )}
         {required && <span className="text-red-500">*</span>}
       </Label>
-      {isLoading ? (
-        <Loader2 className="h-6 w-6 animate-spin" />
-      ) : (
+      <div className="flex items-center gap-2">
+        {isFetching && <Loader2 className="h-6 w-6 animate-spin" />}
         <Autocomplete
           value={currentLevel?.id || ""}
           options={options}
@@ -82,7 +81,7 @@ function OrganizationLevelSelect({
             "state"
           }`}
         />
-      )}
+      </div>
     </div>
   );
 }