Skip to content

Commit f29cb2a

Browse files
fix infinite powerbi filters loading (#599)
* fix infinite powerbi filters loading * Prettified Code! * ready to test --------- Co-authored-by: Gustav-Eikaas <[email protected]>
1 parent 0628564 commit f29cb2a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

packages/power-bi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@equinor/workspace-powerbi",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"type": "module",
55
"sideEffects": false,
66
"license": "MIT",

packages/power-bi/src/lib/components/Filter/Filter.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ type PowerBIFilterProps = {
4646
export const PowerBIFilter = ({ report, options }: PowerBIFilterProps): JSX.Element | null => {
4747
const [activeFilters, setActiveFilters] = useState<Record<string, ActiveFilter[]>>({});
4848
const [slicerFilters, setSlicerFilters] = useState<PowerBiFilter[] | null>(null);
49+
const [isFiltersLoading, setisFiltersLoading] = useState(true);
4950
const [filterGroupVisible, setFilterGroupVisible] = useVisibleFilters(report, options);
5051

5152
const [isFilterExpanded, setIsFilterExpanded] = useState(false);
@@ -172,6 +173,7 @@ export const PowerBIFilter = ({ report, options }: PowerBIFilterProps): JSX.Elem
172173
} else {
173174
setFilterGroupVisible(filters.map((s) => s.type));
174175
}
176+
setisFiltersLoading(false);
175177
};
176178

177179
initFilters();
@@ -205,7 +207,7 @@ export const PowerBIFilter = ({ report, options }: PowerBIFilterProps): JSX.Elem
205207
}
206208
}, [activeFilters, Object.keys(activeFilters).length]);
207209

208-
if (!slicerFilters || Object.keys(activeFilters).length === 0) return <QuickFilterLoading />;
210+
if (isFiltersLoading || !activeFilters || !slicerFilters) return <QuickFilterLoading />;
209211

210212
const controller: FilterController = {
211213
handleChangeGroup,

packages/workspace-fusion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@equinor/workspace-fusion",
3-
"version": "8.0.2",
3+
"version": "8.0.3",
44
"type": "module",
55
"sideEffects": false,
66
"license": "MIT",

0 commit comments

Comments
 (0)