mirror of https://github.com/apache/superset.git
fix(dashboard): Infinite load when filter with default first value is out of scope (#23299)
This commit is contained in:
parent
ed11123709
commit
a3d49ca335
|
@ -124,6 +124,11 @@ const FilterControls: FC<FilterControlsProps> = ({
|
|||
const [filtersInScope, filtersOutOfScope] =
|
||||
useSelectFiltersInScope(filtersWithValues);
|
||||
|
||||
const hasRequiredFirst = useMemo(
|
||||
() => filtersWithValues.some(filter => filter.requiredFirst),
|
||||
[filtersWithValues],
|
||||
);
|
||||
|
||||
const dashboardHasTabs = useDashboardHasTabs();
|
||||
const showCollapsePanel = dashboardHasTabs && filtersWithValues.length > 0;
|
||||
|
||||
|
@ -149,6 +154,7 @@ const FilterControls: FC<FilterControlsProps> = ({
|
|||
{showCollapsePanel && (
|
||||
<FiltersOutOfScopeCollapsible
|
||||
filtersOutOfScope={filtersOutOfScope}
|
||||
forceRender={hasRequiredFirst}
|
||||
hasTopMargin={filtersInScope.length > 0}
|
||||
renderer={renderer}
|
||||
/>
|
||||
|
@ -264,6 +270,7 @@ const FilterControls: FC<FilterControlsProps> = ({
|
|||
renderer={renderer}
|
||||
rendererCrossFilter={rendererCrossFilter}
|
||||
showCollapsePanel={showCollapsePanel}
|
||||
forceRenderOutOfScope={hasRequiredFirst}
|
||||
/>
|
||||
)
|
||||
: undefined
|
||||
|
|
|
@ -34,6 +34,7 @@ export interface FiltersDropdownContentProps {
|
|||
last: CrossFilterIndicator,
|
||||
) => ReactNode;
|
||||
showCollapsePanel?: boolean;
|
||||
forceRenderOutOfScope?: boolean;
|
||||
}
|
||||
|
||||
export const FiltersDropdownContent = ({
|
||||
|
@ -43,6 +44,7 @@ export const FiltersDropdownContent = ({
|
|||
renderer,
|
||||
rendererCrossFilter,
|
||||
showCollapsePanel,
|
||||
forceRenderOutOfScope,
|
||||
}: FiltersDropdownContentProps) => (
|
||||
<div
|
||||
css={(theme: SupersetTheme) =>
|
||||
|
@ -64,6 +66,7 @@ export const FiltersDropdownContent = ({
|
|||
<FiltersOutOfScopeCollapsible
|
||||
filtersOutOfScope={filtersOutOfScope}
|
||||
renderer={renderer}
|
||||
forceRender={forceRenderOutOfScope}
|
||||
horizontalOverflow
|
||||
/>
|
||||
)}
|
||||
|
|
|
@ -26,6 +26,7 @@ export interface FiltersOutOfScopeCollapsibleProps {
|
|||
renderer: (filter: Filter | Divider, index: number) => ReactNode;
|
||||
hasTopMargin?: boolean;
|
||||
horizontalOverflow?: boolean;
|
||||
forceRender?: boolean;
|
||||
}
|
||||
|
||||
export const FiltersOutOfScopeCollapsible = ({
|
||||
|
@ -33,6 +34,7 @@ export const FiltersOutOfScopeCollapsible = ({
|
|||
renderer,
|
||||
hasTopMargin,
|
||||
horizontalOverflow,
|
||||
forceRender = false,
|
||||
}: FiltersOutOfScopeCollapsibleProps) => (
|
||||
<AntdCollapse
|
||||
ghost
|
||||
|
@ -80,6 +82,7 @@ export const FiltersOutOfScopeCollapsible = ({
|
|||
}
|
||||
>
|
||||
<AntdCollapse.Panel
|
||||
forceRender={forceRender}
|
||||
header={
|
||||
<span
|
||||
css={(theme: SupersetTheme) => css`
|
||||
|
|
Loading…
Reference in New Issue