fix infinite powerbi filters loading (#599)

* fix infinite powerbi filters loading * Prettified Code! * ready to test --------- Co-authored-by: Gustav-Eikaas <Gustav-Eikaas@users.noreply.github.com>
equinor · Apr 25, 2024 · f29cb2a · f29cb2a
1 parent 0628564
commit f29cb2a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/power-bi/package.json b/packages/power-bi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-powerbi",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

diff --git a/packages/power-bi/src/lib/components/Filter/Filter.tsx b/packages/power-bi/src/lib/components/Filter/Filter.tsx
@@ -46,6 +46,7 @@ type PowerBIFilterProps = {
 export const PowerBIFilter = ({ report, options }: PowerBIFilterProps): JSX.Element | null => {
   const [activeFilters, setActiveFilters] = useState<Record<string, ActiveFilter[]>>({});
   const [slicerFilters, setSlicerFilters] = useState<PowerBiFilter[] | null>(null);
+  const [isFiltersLoading, setisFiltersLoading] = useState(true);
   const [filterGroupVisible, setFilterGroupVisible] = useVisibleFilters(report, options);
 
   const [isFilterExpanded, setIsFilterExpanded] = useState(false);
@@ -172,6 +173,7 @@ export const PowerBIFilter = ({ report, options }: PowerBIFilterProps): JSX.Elem
         } else {
           setFilterGroupVisible(filters.map((s) => s.type));
         }
+        setisFiltersLoading(false);
       };
 
       initFilters();
@@ -205,7 +207,7 @@ export const PowerBIFilter = ({ report, options }: PowerBIFilterProps): JSX.Elem
     }
   }, [activeFilters, Object.keys(activeFilters).length]);
 
-  if (!slicerFilters || Object.keys(activeFilters).length === 0) return <QuickFilterLoading />;
+  if (isFiltersLoading || !activeFilters || !slicerFilters) return <QuickFilterLoading />;
 
   const controller: FilterController = {
     handleChangeGroup,

diff --git a/packages/workspace-fusion/package.json b/packages/workspace-fusion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-fusion",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",