@gooddata/sdk-ui-dashboard 10.23.0-alpha.11 → 10.23.0-alpha.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/__version.d.ts +1 -1
- package/esm/__version.js +1 -1
- package/esm/model/commandHandlers/drill/crossFilteringHandler.d.ts +1 -1
- package/esm/model/commandHandlers/drill/crossFilteringHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/crossFilteringHandler.js +6 -2
- package/esm/model/commandHandlers/drill/crossFilteringHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js +4 -6
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeFilterSelectionHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeFilterSelectionHandler.js +2 -4
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeFilterSelectionHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/common.d.ts +4 -0
- package/esm/model/commandHandlers/filterContext/common.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/common.js +8 -1
- package/esm/model/commandHandlers/filterContext/common.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/dateFilter/changeDateFilterSelectionHandler.js +5 -5
- package/esm/model/commandHandlers/filterContext/dateFilter/changeDateFilterSelectionHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/filterViewHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/filterViewHandler.js +14 -2
- package/esm/model/commandHandlers/filterContext/filterViewHandler.js.map +1 -1
- package/esm/model/commandHandlers/index.d.ts.map +1 -1
- package/esm/model/commandHandlers/index.js +2 -1
- package/esm/model/commandHandlers/index.js.map +1 -1
- package/esm/model/commands/base.d.ts +1 -1
- package/esm/model/commands/base.d.ts.map +1 -1
- package/esm/model/commands/filters.d.ts +26 -0
- package/esm/model/commands/filters.d.ts.map +1 -1
- package/esm/model/commands/filters.js +14 -0
- package/esm/model/commands/filters.js.map +1 -1
- package/esm/model/commands/index.d.ts +4 -4
- package/esm/model/commands/index.d.ts.map +1 -1
- package/esm/model/commands/index.js +1 -1
- package/esm/model/commands/index.js.map +1 -1
- package/esm/model/store/filterContext/filterContextReducers.d.ts +4 -0
- package/esm/model/store/filterContext/filterContextReducers.d.ts.map +1 -1
- package/esm/model/store/filterContext/filterContextReducers.js +8 -0
- package/esm/model/store/filterContext/filterContextReducers.js.map +1 -1
- package/esm/model/store/filterContext/filterContextSelectors.d.ts.map +1 -1
- package/esm/model/store/filterContext/filterContextSelectors.js +4 -19
- package/esm/model/store/filterContext/filterContextSelectors.js.map +1 -1
- package/esm/model/store/filterContext/filterContextUtils.d.ts +5 -1
- package/esm/model/store/filterContext/filterContextUtils.d.ts.map +1 -1
- package/esm/model/store/filterContext/filterContextUtils.js +18 -1
- package/esm/model/store/filterContext/filterContextUtils.js.map +1 -1
- package/esm/model/store/filterContext/index.d.ts +4 -0
- package/esm/model/store/filterContext/index.d.ts.map +1 -1
- package/esm/model/store/index.d.ts +1 -0
- package/esm/model/store/index.d.ts.map +1 -1
- package/esm/model/store/index.js +1 -0
- package/esm/model/store/index.js.map +1 -1
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.d.ts +2 -1
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.d.ts.map +1 -1
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.js +11 -4
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.js.map +1 -1
- package/esm/presentation/dragAndDrop/draggableDateFilter/DraggableDateFilter.d.ts +2 -1
- package/esm/presentation/dragAndDrop/draggableDateFilter/DraggableDateFilter.d.ts.map +1 -1
- package/esm/presentation/dragAndDrop/draggableDateFilter/DraggableDateFilter.js +4 -3
- package/esm/presentation/dragAndDrop/draggableDateFilter/DraggableDateFilter.js.map +1 -1
- package/esm/presentation/export/DefaultDashboardExportVariables.d.ts.map +1 -1
- package/esm/presentation/export/DefaultDashboardExportVariables.js +5 -4
- package/esm/presentation/export/DefaultDashboardExportVariables.js.map +1 -1
- package/esm/presentation/export/hooks/useDashboardRelatedFilters.d.ts +4 -1
- package/esm/presentation/export/hooks/useDashboardRelatedFilters.d.ts.map +1 -1
- package/esm/presentation/export/hooks/useDashboardRelatedFilters.js +38 -3
- package/esm/presentation/export/hooks/useDashboardRelatedFilters.js.map +1 -1
- package/esm/presentation/export/types.d.ts +2 -1
- package/esm/presentation/export/types.d.ts.map +1 -1
- package/esm/presentation/export/useExportData.d.ts.map +1 -1
- package/esm/presentation/export/useExportData.js +2 -1
- package/esm/presentation/export/useExportData.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/CustomDropdownActions.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/CustomDropdownActions.js +6 -3
- package/esm/presentation/filterBar/attributeFilter/CustomDropdownActions.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.js +13 -4
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/types.d.ts +4 -0
- package/esm/presentation/filterBar/attributeFilter/types.d.ts.map +1 -1
- package/esm/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.d.ts.map +1 -1
- package/esm/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.js +4 -3
- package/esm/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.js.map +1 -1
- package/esm/presentation/filterBar/dateFilter/types.d.ts +4 -0
- package/esm/presentation/filterBar/dateFilter/types.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.js +21 -9
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBarContainer.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBarContainer.js +26 -15
- package/esm/presentation/filterBar/filterBar/DefaultFilterBarContainer.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/hooks/useResetFiltersButton.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/hooks/useResetFiltersButton.js +12 -5
- package/esm/presentation/filterBar/filterBar/hooks/useResetFiltersButton.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/types.d.ts +4 -0
- package/esm/presentation/filterBar/filterBar/types.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.d.ts +4 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js +15 -4
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js.map +1 -1
- package/esm/presentation/localization/bundles/en-US.json +5 -0
- package/esm/sdk-ui-dashboard.d.ts +49 -3
- package/package.json +15 -15
- package/styles/css/filterBar.css +14 -0
- package/styles/css/filterBar.css.map +1 -1
- package/styles/css/main.css +14 -0
- package/styles/css/main.css.map +1 -1
- package/styles/scss/filterBar.scss +16 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultDashboardDateFilter.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.tsx"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EACH,UAAU,EACV,gCAAgC,GAGnC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,eAAe,EACf,mCAAmC,GAEtC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,qCAAqC,EAAE,MAAM,yDAAyD,CAAC;AAChH,OAAO,EAAE,+CAA+C,EAAE,MAAM,+DAA+D,CAAC;AAGhI,OAAO,EACH,yBAAyB,EACzB,yBAAyB,EACzB,+BAA+B,EAC/B,sCAAsC,EACtC,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,eAAe,EACf,oBAAoB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,2BAA2B,EAAE,MAAM,gDAAgD,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,KAAgC,EAAe,EAAE;IACxF,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAC/E,MAAM,gCAAgC,GAAG,oBAAoB,CAAC,sCAAsC,CAAC,CAAC;IACtG,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"DefaultDashboardDateFilter.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.tsx"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,10 @@ export interface IDashboardDateFilterProps {
|
|
|
30
30
|
* Definition of filter to render.
|
|
31
31
|
*/
|
|
32
32
|
filter: IDashboardDateFilter | undefined;
|
|
33
|
+
/**
|
|
34
|
+
* Definition of working filter used to render selected options.
|
|
35
|
+
*/
|
|
36
|
+
workingFilter: IDashboardDateFilter | undefined;
|
|
33
37
|
/**
|
|
34
38
|
* When the user interacts with the filter and changes its value, it MUST use this callback to propagate the
|
|
35
39
|
* new filter value.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE;;;;GAIG;AACH,MAAM,WAAW,0BAA0B;IACvC;;;OAGG;IACH,sBAAsB,EAAE,qBAAqB,EAAE,CAAC;IAEhD;;;OAGG;IACH,iBAAiB,EAAE,wBAAwB,CAAC;IAE5C;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;OAEG;IACH,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAEzC;;;;;;;OAOG;IACH,eAAe,EAAE,CACb,MAAM,EAAE,oBAAoB,GAAG,SAAS,EACxC,uBAAuB,CAAC,EAAE,MAAM,EAChC,wBAAwB,CAAC,EAAE,OAAO,KACjC,IAAI,CAAC;IAEV;;OAEG;IACH,MAAM,EAAE,0BAA0B,CAAC;IAEnC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,MAAM,kCAAkC,GAAG,aAAa,CAAC,yBAAyB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE;;;;GAIG;AACH,MAAM,WAAW,0BAA0B;IACvC;;;OAGG;IACH,sBAAsB,EAAE,qBAAqB,EAAE,CAAC;IAEhD;;;OAGG;IACH,iBAAiB,EAAE,wBAAwB,CAAC;IAE5C;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;OAEG;IACH,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAEzC;;OAEG;IACH,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAEhD;;;;;;;OAOG;IACH,eAAe,EAAE,CACb,MAAM,EAAE,oBAAoB,GAAG,SAAS,EACxC,uBAAuB,CAAC,EAAE,MAAM,EAChC,wBAAwB,CAAC,EAAE,OAAO,KACjC,IAAI,CAAC;IAEV;;OAEG;IACH,MAAM,EAAE,0BAA0B,CAAC;IAEnC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,MAAM,kCAAkC,GAAG,aAAa,CAAC,yBAAyB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBar.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"DefaultFilterBar.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":";AAsDA,OAAO,EAA8B,eAAe,EAAE,MAAM,aAAa,CAAC;AAe1E;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAO,eAoHpC,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,eAAe,GAAG,GAAG,CAAC,OAAO,CA0NpE"}
|
|
@@ -3,7 +3,7 @@ import React, { useCallback } from "react";
|
|
|
3
3
|
import classNames from "classnames";
|
|
4
4
|
import { invariant } from "ts-invariant";
|
|
5
5
|
import { areObjRefsEqual, DashboardAttributeFilterConfigModeValues, DashboardDateFilterConfigModeValues, isAllTimeDashboardDateFilter, isDashboardAttributeFilter, objRefToString, serializeObjRef, } from "@gooddata/sdk-model";
|
|
6
|
-
import { changeAttributeFilterSelection, changeDateFilterSelection, clearDateFilterSelection, selectEffectiveDateFilterAvailableGranularities, selectEffectiveDateFilterMode, selectEffectiveDateFilterOptions, selectFilterContextFilters, selectIsExport, selectSupportsElementUris, useDashboardDispatch, useDashboardSelector, selectIsInEditMode, selectAttributeFilterDisplayFormsMap, selectEffectiveAttributeFiltersModeMap, selectCanAddMoreFilters, selectCatalogDateDatasets, selectEffectiveDateFiltersModeMap, selectAttributeFilterConfigsDisplayAsLabelMap, selectEnableDuplicatedLabelValuesInAttributeFilter, setAttributeFilterDisplayForm, setDashboardAttributeFilterConfigDisplayAsLabel, changeWorkingAttributeFilterSelection, selectEnableDashboardFiltersApplyModes, } from "../../../model/index.js";
|
|
6
|
+
import { changeAttributeFilterSelection, changeDateFilterSelection, clearDateFilterSelection, selectEffectiveDateFilterAvailableGranularities, selectEffectiveDateFilterMode, selectEffectiveDateFilterOptions, selectFilterContextFilters, selectIsExport, selectSupportsElementUris, useDashboardDispatch, useDashboardSelector, selectIsInEditMode, selectAttributeFilterDisplayFormsMap, selectEffectiveAttributeFiltersModeMap, selectCanAddMoreFilters, selectCatalogDateDatasets, selectEffectiveDateFiltersModeMap, selectAttributeFilterConfigsDisplayAsLabelMap, selectEnableDuplicatedLabelValuesInAttributeFilter, setAttributeFilterDisplayForm, setDashboardAttributeFilterConfigDisplayAsLabel, changeWorkingAttributeFilterSelection, selectEnableDashboardFiltersApplyModes, selectWorkingFilterContextFilters, selectCrossFilteringFiltersLocalIdentifiers, selectIsWorkingFilterContextChanged, selectDashboardFiltersApplyMode, } from "../../../model/index.js";
|
|
7
7
|
import { useDashboardComponentsContext } from "../../dashboardContexts/index.js";
|
|
8
8
|
import { DraggableFilterDropZone, DraggableFilterDropZoneHint, DraggableAttributeFilter, DraggableDateFilter, } from "../../dragAndDrop/index.js";
|
|
9
9
|
import { HiddenDashboardDateFilter } from "../dateFilter/index.js";
|
|
@@ -18,6 +18,7 @@ import { ResetFiltersButton } from "./ResetFiltersButton.js";
|
|
|
18
18
|
*/
|
|
19
19
|
export const useFilterBarProps = () => {
|
|
20
20
|
const filters = useDashboardSelector(selectFilterContextFilters);
|
|
21
|
+
const workingFilters = useDashboardSelector(selectWorkingFilterContextFilters);
|
|
21
22
|
const supportElementUris = useDashboardSelector(selectSupportsElementUris);
|
|
22
23
|
const enableDuplicatedLabelValuesInAttributeFilter = useDashboardSelector(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
23
24
|
const enableDashboardFiltersApplyModes = useDashboardSelector(selectEnableDashboardFiltersApplyModes);
|
|
@@ -64,14 +65,14 @@ export const useFilterBarProps = () => {
|
|
|
64
65
|
dispatch(changeDateFilterSelection(type, granularity, from, to, dateFilterOptionLocalId, undefined, dataSet, isWorkingSelectionChange && enableDashboardFiltersApplyModes));
|
|
65
66
|
}
|
|
66
67
|
}, [dispatch, enableDashboardFiltersApplyModes]);
|
|
67
|
-
return { filters, onAttributeFilterChanged, onDateFilterChanged, DefaultFilterBar };
|
|
68
|
+
return { filters, workingFilters, onAttributeFilterChanged, onDateFilterChanged, DefaultFilterBar };
|
|
68
69
|
};
|
|
69
70
|
/**
|
|
70
71
|
* @alpha
|
|
71
72
|
*/
|
|
72
73
|
export function DefaultFilterBar(props) {
|
|
73
|
-
const { filters, onAttributeFilterChanged, onDateFilterChanged } = props;
|
|
74
|
-
const [{ commonDateFilter, draggableFiltersWithPlaceholder, draggableFiltersCount, autoOpenFilter }, { addDraggableFilterPlaceholder, closeAttributeSelection, selectDraggableFilter, onCloseAttributeFilter, },] = useFiltersWithAddedPlaceholder(filters);
|
|
74
|
+
const { filters, workingFilters, onAttributeFilterChanged, onDateFilterChanged } = props;
|
|
75
|
+
const [{ commonDateFilter, commonWorkingDateFilter, draggableFiltersWithPlaceholder, draggableFiltersCount, autoOpenFilter, }, { addDraggableFilterPlaceholder, closeAttributeSelection, selectDraggableFilter, onCloseAttributeFilter, },] = useFiltersWithAddedPlaceholder(filters, workingFilters);
|
|
75
76
|
const isInEditMode = useDashboardSelector(selectIsInEditMode);
|
|
76
77
|
const availableGranularities = useDashboardSelector(selectEffectiveDateFilterAvailableGranularities);
|
|
77
78
|
const dateFilterOptions = useDashboardSelector(selectEffectiveDateFilterOptions);
|
|
@@ -86,6 +87,10 @@ export function DefaultFilterBar(props) {
|
|
|
86
87
|
const displayFormsMap = useDashboardSelector(selectAttributeFilterDisplayFormsMap);
|
|
87
88
|
const canAddMoreFilters = useDashboardSelector(selectCanAddMoreFilters);
|
|
88
89
|
const haveAllFiltersHidden = areAllFiltersHidden(draggableFiltersWithPlaceholder, commonDateFilterMode, attributeFiltersModeMap, dateFiltersModeMap);
|
|
90
|
+
const crossFilterLocalIds = useDashboardSelector(selectCrossFilteringFiltersLocalIdentifiers);
|
|
91
|
+
const isWorkingFilterContextChanged = useDashboardSelector(selectIsWorkingFilterContextChanged);
|
|
92
|
+
const filtersApplyMode = useDashboardSelector(selectDashboardFiltersApplyMode);
|
|
93
|
+
const enableDashboardFiltersApplyModes = useDashboardSelector(selectEnableDashboardFiltersApplyModes);
|
|
89
94
|
if (isExport || haveAllFiltersHidden) {
|
|
90
95
|
return React.createElement(HiddenFilterBar, { ...props });
|
|
91
96
|
}
|
|
@@ -98,7 +103,7 @@ export function DefaultFilterBar(props) {
|
|
|
98
103
|
React.createElement("div", { className: classNames("dash-filters-date", {
|
|
99
104
|
"dash-filter-is-edit-mode": isInEditMode,
|
|
100
105
|
}) }, commonDateFilterMode === DashboardDateFilterConfigModeValues.HIDDEN ? (React.createElement(HiddenDashboardDateFilter, null)) : (React.createElement(React.Fragment, null,
|
|
101
|
-
React.createElement(CustomCommonDateFilterComponent, { filter: commonDateFilter, onFilterChanged: onDateFilterChanged, config: commonDateFilterComponentConfig, readonly: commonDateFilterMode === DashboardDateFilterConfigModeValues.READONLY }),
|
|
106
|
+
React.createElement(CustomCommonDateFilterComponent, { filter: commonDateFilter, workingFilter: enableDashboardFiltersApplyModes ? commonWorkingDateFilter : undefined, onFilterChanged: onDateFilterChanged, config: commonDateFilterComponentConfig, readonly: commonDateFilterMode === DashboardDateFilterConfigModeValues.READONLY }),
|
|
102
107
|
React.createElement(DraggableFilterDropZoneHint, { placement: "outside", hintPosition: "next", targetIndex: 0, onAddAttributePlaceholder: addDraggableFilterPlaceholder, acceptPlaceholder: canAddMoreFilters })))),
|
|
103
108
|
draggableFiltersWithPlaceholder.map((filterOrPlaceholder) => {
|
|
104
109
|
if (isFilterBarFilterPlaceholder(filterOrPlaceholder)) {
|
|
@@ -106,7 +111,7 @@ export function DefaultFilterBar(props) {
|
|
|
106
111
|
return (React.createElement(CreatingPlaceholderComponent, { key: filterOrPlaceholder.filterIndex, onClose: closeAttributeSelection, onSelect: selectDraggableFilter }));
|
|
107
112
|
}
|
|
108
113
|
else if (isFilterBarAttributeFilter(filterOrPlaceholder)) {
|
|
109
|
-
const { filter, filterIndex } = filterOrPlaceholder;
|
|
114
|
+
const { filter, filterIndex, workingFilter } = filterOrPlaceholder;
|
|
110
115
|
const convertedFilter = supportElementUris
|
|
111
116
|
? filter
|
|
112
117
|
: convertDashboardAttributeFilterElementsUrisToValues(filter);
|
|
@@ -126,11 +131,18 @@ export function DefaultFilterBar(props) {
|
|
|
126
131
|
if (attributeFilterMode === DashboardAttributeFilterConfigModeValues.HIDDEN) {
|
|
127
132
|
return null;
|
|
128
133
|
}
|
|
129
|
-
|
|
134
|
+
if (filter.attributeFilter.localIdentifier &&
|
|
135
|
+
crossFilterLocalIds.includes(filter.attributeFilter.localIdentifier) &&
|
|
136
|
+
isWorkingFilterContextChanged &&
|
|
137
|
+
filtersApplyMode.mode === "ALL_AT_ONCE" &&
|
|
138
|
+
enableDashboardFiltersApplyModes) {
|
|
139
|
+
return null;
|
|
140
|
+
}
|
|
141
|
+
return (React.createElement(DraggableAttributeFilter, { key: `${objRefToString(displayForm.attribute)}-${filter.attributeFilter.localIdentifier}`, autoOpen: areObjRefsEqual(filter.attributeFilter.displayForm, autoOpenFilter), filter: filter, workingFilter: enableDashboardFiltersApplyModes ? workingFilter : undefined, filterIndex: filterIndex, readonly: attributeFilterMode === DashboardAttributeFilterConfigModeValues.READONLY, displayAsLabel: displayAsLabel, FilterComponent: CustomAttributeFilterComponent, onAttributeFilterChanged: onAttributeFilterChanged, onAttributeFilterAdded: addDraggableFilterPlaceholder, onAttributeFilterClose: onCloseAttributeFilter }));
|
|
130
142
|
}
|
|
131
143
|
else {
|
|
132
144
|
if (filterOrPlaceholder.filter.dateFilter.dataSet) {
|
|
133
|
-
const { filter, filterIndex } = filterOrPlaceholder;
|
|
145
|
+
const { filter, workingFilter, filterIndex } = filterOrPlaceholder;
|
|
134
146
|
const CustomDateFilterComponent = DashboardDateFilterComponentProvider(filter);
|
|
135
147
|
const dateFilterMode = dateFiltersModeMap.get(serializeObjRef(filter.dateFilter.dataSet)) ||
|
|
136
148
|
DashboardDateFilterConfigModeValues.ACTIVE;
|
|
@@ -138,7 +150,7 @@ export function DefaultFilterBar(props) {
|
|
|
138
150
|
return null;
|
|
139
151
|
}
|
|
140
152
|
const defaultDateFilterName = allDateDatasets.find((ds) => areObjRefsEqual(ds.dataSet.ref, filter.dateFilter.dataSet))?.dataSet?.title;
|
|
141
|
-
return (React.createElement(DraggableDateFilter, { key: objRefToString(filterOrPlaceholder.filter.dateFilter.dataSet), autoOpen: areObjRefsEqual(filterOrPlaceholder.filter.dateFilter.dataSet, autoOpenFilter), filter: filter, filterIndex: filterIndex, config: {
|
|
153
|
+
return (React.createElement(DraggableDateFilter, { key: objRefToString(filterOrPlaceholder.filter.dateFilter.dataSet), autoOpen: areObjRefsEqual(filterOrPlaceholder.filter.dateFilter.dataSet, autoOpenFilter), filter: filter, workingFilter: enableDashboardFiltersApplyModes ? workingFilter : undefined, filterIndex: filterIndex, config: {
|
|
142
154
|
...commonDateFilterComponentConfig,
|
|
143
155
|
customFilterName: defaultDateFilterName,
|
|
144
156
|
}, readonly: dateFilterMode === DashboardDateFilterConfigModeValues.READONLY, FilterComponent: CustomDateFilterComponent, onDateFilterChanged: onDateFilterChanged, onDateFilterAdded: addDraggableFilterPlaceholder, onDateFilterClose: onCloseAttributeFilter }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBar.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACH,eAAe,EACf,wCAAwC,EACxC,mCAAmC,EAInC,4BAA4B,EAC5B,0BAA0B,EAE1B,cAAc,EACd,eAAe,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,8BAA8B,EAC9B,yBAAyB,EACzB,wBAAwB,EACxB,+CAA+C,EAC/C,6BAA6B,EAC7B,gCAAgC,EAChC,0BAA0B,EAC1B,cAAc,EACd,yBAAyB,EACzB,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,EAClB,oCAAoC,EACpC,sCAAsC,EACtC,uBAAuB,EACvB,yBAAyB,EACzB,iCAAiC,EACjC,6CAA6C,EAC7C,kDAAkD,EAClD,6BAA6B,EAC7B,+CAA+C,EAC/C,qCAAqC,EACrC,sCAAsC,
|
|
1
|
+
{"version":3,"file":"DefaultFilterBar.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBarContainer.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarContainer.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DefaultFilterBarContainer.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarContainer.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAqKnD;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAQ9E,CAAC"}
|
|
@@ -4,7 +4,7 @@ import DefaultMeasure from "react-measure";
|
|
|
4
4
|
import cx from "classnames";
|
|
5
5
|
import { createSelector } from "@reduxjs/toolkit";
|
|
6
6
|
import { defaultImport } from "default-import";
|
|
7
|
-
import { UiButton } from "@gooddata/sdk-ui-kit";
|
|
7
|
+
import { Message, UiButton } from "@gooddata/sdk-ui-kit";
|
|
8
8
|
import { IntlWrapper } from "../../localization/index.js";
|
|
9
9
|
import { selectEnableKDCrossFiltering, selectIsInEditMode, selectLocale, selectSupportsCrossFiltering, useDashboardSelector, useDashboardDispatch, selectEnableFilterViews, selectEnableFlexibleLayout, applyFilterContextWorkingSelection, selectIsWorkingFilterContextChanged, selectDashboardFiltersApplyMode, selectEnableDashboardFiltersApplyModes, } from "../../../model/index.js";
|
|
10
10
|
import { ShowAllFiltersButton } from "./ShowAllFiltersButton.js";
|
|
@@ -15,7 +15,7 @@ import { FiltersConfigurationPanel } from "./FiltersConfigurationPanel.js";
|
|
|
15
15
|
import { FilterViews } from "./filterViews/FilterViews.js";
|
|
16
16
|
import { BulletsBar as FlexibleBulletsBar } from "../../flexibleLayout/dragAndDrop/Resize/BulletsBar/BulletsBar.js";
|
|
17
17
|
import { BulletsBar as FluidBulletsBar } from "../../layout/dragAndDrop/Resize/BulletsBar/BulletsBar.js";
|
|
18
|
-
import { useIntl } from "react-intl";
|
|
18
|
+
import { FormattedMessage, useIntl } from "react-intl";
|
|
19
19
|
const selectShowFiltersConfigurationPanel = createSelector(selectIsInEditMode, selectEnableKDCrossFiltering, selectSupportsCrossFiltering, (isEdit, enableCrossFiltering, supportsCrossFiltering) => {
|
|
20
20
|
return isEdit && enableCrossFiltering && supportsCrossFiltering;
|
|
21
21
|
});
|
|
@@ -37,19 +37,30 @@ const DefaultFilterBarContainerCore = ({ children }) => {
|
|
|
37
37
|
dispatch(applyFilterContextWorkingSelection());
|
|
38
38
|
}, [dispatch]);
|
|
39
39
|
const intl = useIntl();
|
|
40
|
-
return (React.createElement(
|
|
41
|
-
React.createElement("div", {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
40
|
+
return (React.createElement(React.Fragment, null,
|
|
41
|
+
React.createElement("div", { className: "dash-filters-wrapper s-gd-dashboard-filter-bar", ref: dropRef },
|
|
42
|
+
React.createElement("div", { style: { height }, className: cx("dash-filters-visible", {
|
|
43
|
+
scrollable: scrollable,
|
|
44
|
+
"s-dash-filters-visible-all": isFilterBarExpanded,
|
|
45
|
+
"apply-all-at-once": filtersApplyMode.mode === "ALL_AT_ONCE" && enableDashboardFiltersApplyModes,
|
|
46
|
+
}) },
|
|
47
|
+
React.createElement(AllFiltersContainer, { setCalculatedRows: setCalculatedRows }, children),
|
|
48
|
+
React.createElement(FiltersRows, { rows: rows }),
|
|
49
|
+
React.createElement("div", { className: "filter-bar-configuration", style: { alignItems: enableDashboardFiltersApplyModes ? "baseline" : undefined } },
|
|
50
|
+
filtersApplyMode.mode === "ALL_AT_ONCE" &&
|
|
51
|
+
enableDashboardFiltersApplyModes &&
|
|
52
|
+
isWorkingFilterContextChanged ? (React.createElement(UiButton, { label: intl.formatMessage({ id: "apply" }), variant: "primary", onClick: applyAllDashboardFilters })) : null,
|
|
53
|
+
isFilterViewsFeatureFlagEnabled ? React.createElement(FilterViews, null) : null,
|
|
54
|
+
showFiltersConfigurationPanel ? React.createElement(FiltersConfigurationPanel, null) : null)),
|
|
55
|
+
React.createElement(ShowAllFiltersButton, { isFilterBarExpanded: isFilterBarExpanded, isVisible: rows.length > 1, onToggle: (isExpanded) => setFilterBarExpanded(isExpanded) }),
|
|
56
|
+
isFlexibleLayoutEnabled ? React.createElement(FlexibleBulletsBar, null) : React.createElement(FluidBulletsBar, null)),
|
|
57
|
+
isWorkingFilterContextChanged &&
|
|
58
|
+
filtersApplyMode.mode === "ALL_AT_ONCE" &&
|
|
59
|
+
enableDashboardFiltersApplyModes ? (React.createElement("div", { className: "filters-message", style: { marginTop: rows.length > 1 ? "35px" : "10px" } },
|
|
60
|
+
React.createElement(Message, { type: "progress" },
|
|
61
|
+
React.createElement(FormattedMessage, { id: "filterBar.unappliedFiltersNotification", values: {
|
|
62
|
+
link: (chunks) => React.createElement("a", { onClick: applyAllDashboardFilters }, chunks),
|
|
63
|
+
} })))) : null));
|
|
53
64
|
};
|
|
54
65
|
const AllFiltersContainer = ({ setCalculatedRows, children }) => {
|
|
55
66
|
const ref = useRef(null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBarContainer.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarContainer.tsx"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,cAAc,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"DefaultFilterBarContainer.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarContainer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useResetFiltersButton.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useResetFiltersButton.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"AAkCA;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB;cACpB,OAAO;eACN,KAAK,GAAG,aAAa;kBAClB,MAAM,IAAI;CAqG3B,CAAC"}
|
|
@@ -4,7 +4,7 @@ import isEqual from "lodash/isEqual.js";
|
|
|
4
4
|
import partition from "lodash/partition.js";
|
|
5
5
|
import difference from "lodash/difference.js";
|
|
6
6
|
import { isDashboardAttributeFilter, isDashboardCommonDateFilter, newAllTimeDashboardDateFilter, } from "@gooddata/sdk-model";
|
|
7
|
-
import { changeFilterContextSelection, removeAttributeFilters, selectEnableKDCrossFiltering, selectFilterContextFilters, selectIsInEditMode, selectOriginalFilterContextFilters, selectSupportsCrossFiltering, drillActions, useDashboardDispatch, useDashboardSelector, useDashboardUserInteraction, selectDisableDashboardCrossFiltering, selectDisableDashboardUserFilterReset, selectIsDisabledCrossFiltering, selectIsDisableUserFilterReset, } from "../../../../model/index.js";
|
|
7
|
+
import { changeFilterContextSelection, removeAttributeFilters, selectEnableKDCrossFiltering, selectFilterContextFilters, selectIsInEditMode, selectOriginalFilterContextFilters, selectSupportsCrossFiltering, drillActions, useDashboardDispatch, useDashboardSelector, useDashboardUserInteraction, selectDisableDashboardCrossFiltering, selectDisableDashboardUserFilterReset, selectIsDisabledCrossFiltering, selectIsDisableUserFilterReset, selectIsWorkingFilterContextChanged, resetFilterContextWorkingSelection, selectEnableDashboardFiltersApplyModes, } from "../../../../model/index.js";
|
|
8
8
|
/**
|
|
9
9
|
* @returns tuple with two items:
|
|
10
10
|
* - a boolean specifying if the reset option makes sense for a given state (i.e. if the button should be visible)
|
|
@@ -22,6 +22,8 @@ export const useResetFiltersButton = () => {
|
|
|
22
22
|
const disableCrossFiltering = useDashboardSelector(selectDisableDashboardCrossFiltering);
|
|
23
23
|
const disableUserFilterResetByConfig = useDashboardSelector(selectIsDisableUserFilterReset);
|
|
24
24
|
const disableUserFilterReset = useDashboardSelector(selectDisableDashboardUserFilterReset);
|
|
25
|
+
const isWorkingFilterContextChanged = useDashboardSelector(selectIsWorkingFilterContextChanged);
|
|
26
|
+
const enableDashboardFiltersApplyModes = useDashboardSelector(selectEnableDashboardFiltersApplyModes);
|
|
25
27
|
const dispatch = useDashboardDispatch();
|
|
26
28
|
const { filterContextStateReset } = useDashboardUserInteraction();
|
|
27
29
|
const newlyAddedFiltersLocalIds = React.useMemo(() => {
|
|
@@ -35,10 +37,11 @@ export const useResetFiltersButton = () => {
|
|
|
35
37
|
}, [currentFilters, originalFilters]);
|
|
36
38
|
const canReset = React.useMemo(() => {
|
|
37
39
|
return (!isEditMode &&
|
|
38
|
-
!isEqual(currentFilters, originalFilters) &&
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
((!isEqual(currentFilters, originalFilters) &&
|
|
41
|
+
// If the cross filter add some filters, we should allow the reset
|
|
42
|
+
((!disableUserFilterReset && !disableUserFilterResetByConfig) ||
|
|
43
|
+
newlyAddedFiltersLocalIds.length > 0)) ||
|
|
44
|
+
!!isWorkingFilterContextChanged));
|
|
42
45
|
}, [
|
|
43
46
|
isEditMode,
|
|
44
47
|
currentFilters,
|
|
@@ -46,6 +49,7 @@ export const useResetFiltersButton = () => {
|
|
|
46
49
|
disableUserFilterReset,
|
|
47
50
|
disableUserFilterResetByConfig,
|
|
48
51
|
newlyAddedFiltersLocalIds.length,
|
|
52
|
+
isWorkingFilterContextChanged,
|
|
49
53
|
]);
|
|
50
54
|
const resetFilters = React.useCallback(() => {
|
|
51
55
|
if (!canReset) {
|
|
@@ -55,6 +59,9 @@ export const useResetFiltersButton = () => {
|
|
|
55
59
|
if (!disableUserFilterReset) {
|
|
56
60
|
// Normalize filters to include "All time" date filter
|
|
57
61
|
const [[commonDateFilter], otherFilters] = partition(originalFilters, isDashboardCommonDateFilter);
|
|
62
|
+
if (enableDashboardFiltersApplyModes) {
|
|
63
|
+
dispatch(resetFilterContextWorkingSelection());
|
|
64
|
+
}
|
|
58
65
|
// Dispatch a command, so it goes through the proper piping and trigger all the events
|
|
59
66
|
dispatch(changeFilterContextSelection([
|
|
60
67
|
commonDateFilter ?? newAllTimeDashboardDateFilter(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useResetFiltersButton.js","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAGH,0BAA0B,EAC1B,2BAA2B,EAC3B,6BAA6B,GAChC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACH,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,EAC5B,0BAA0B,EAC1B,kBAAkB,EAClB,kCAAkC,EAClC,4BAA4B,EAC5B,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC3B,oCAAoC,EACpC,qCAAqC,EACrC,8BAA8B,EAC9B,8BAA8B,
|
|
1
|
+
{"version":3,"file":"useResetFiltersButton.js","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,10 @@ export interface IFilterBarProps {
|
|
|
8
8
|
* Filters that are set for the dashboard.
|
|
9
9
|
*/
|
|
10
10
|
filters: FilterContextItem[];
|
|
11
|
+
/**
|
|
12
|
+
* Working filters that are used to dispaly filter selected values. If undefined, filters are used instead.
|
|
13
|
+
*/
|
|
14
|
+
workingFilters?: FilterContextItem[];
|
|
11
15
|
/**
|
|
12
16
|
* When value of an attribute filter that is part of the FilterBar changes, the filter bar MUST propagate the event
|
|
13
17
|
* using this callback.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EACH,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,EACpB,MAAM,EACT,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAE7B;;;;;OAKG;IACH,wBAAwB,EAAE,CAAC,MAAM,EAAE,yBAAyB,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAE/F;;;;;;OAMG;IACH,mBAAmB,EAAE,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,EAAE,uBAAuB,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAE1G;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;CACpD;AAED;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EACH,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,EACpB,MAAM,EACT,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAE7B;;OAEG;IACH,cAAc,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAErC;;;;;OAKG;IACH,wBAAwB,EAAE,CAAC,MAAM,EAAE,yBAAyB,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAE/F;;;;;;OAMG;IACH,mBAAmB,EAAE,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,EAAE,uBAAuB,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAE1G;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;CACpD;AAED;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC"}
|
|
@@ -17,6 +17,7 @@ export declare function isFilterBarFilterPlaceholder(object: any): object is Fil
|
|
|
17
17
|
export type FilterBarAttributeFilterIndexed = {
|
|
18
18
|
filter: IDashboardAttributeFilter;
|
|
19
19
|
filterIndex: number;
|
|
20
|
+
workingFilter?: IDashboardAttributeFilter;
|
|
20
21
|
};
|
|
21
22
|
/**
|
|
22
23
|
* @internal
|
|
@@ -30,6 +31,7 @@ export type FilterBarAttributeItems = FilterBarAttributeItem[];
|
|
|
30
31
|
export type FilterBarDateFilterIndexed = {
|
|
31
32
|
filter: IDashboardDateFilter;
|
|
32
33
|
filterIndex: number;
|
|
34
|
+
workingFilter?: IDashboardDateFilter;
|
|
33
35
|
};
|
|
34
36
|
/**
|
|
35
37
|
* @internal
|
|
@@ -46,9 +48,10 @@ export type FilterBarDraggableItems = FilterBarItem[];
|
|
|
46
48
|
/**
|
|
47
49
|
* @internal
|
|
48
50
|
*/
|
|
49
|
-
export declare function useFiltersWithAddedPlaceholder(filters: FilterContextItem[]): [
|
|
51
|
+
export declare function useFiltersWithAddedPlaceholder(filters: FilterContextItem[], workingFilters?: FilterContextItem[]): [
|
|
50
52
|
{
|
|
51
53
|
commonDateFilter: IDashboardDateFilter;
|
|
54
|
+
commonWorkingDateFilter?: IDashboardDateFilter;
|
|
52
55
|
draggableFiltersWithPlaceholder: FilterBarDraggableItems;
|
|
53
56
|
draggableFiltersCount: number;
|
|
54
57
|
autoOpenFilter: ObjRef | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFiltersWithAddedPlaceholder.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.tsx"],"names":[],"mappings":"AAKA,OAAO,EAEH,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"useFiltersWithAddedPlaceholder.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.tsx"],"names":[],"mappings":"AAKA,OAAO,EAEH,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,EAMpB,MAAM,EACT,MAAM,qBAAqB,CAAC;AAiB7B;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACrC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,0BAA0B,CAE9F;AAED;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC1C,MAAM,EAAE,yBAAyB,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,yBAAyB,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG,+BAA+B,CAAC;AAClG,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,+BAA+B,CAEjG;AAED;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,sBAAsB,EAAE,CAAC;AAC/D,MAAM,MAAM,0BAA0B,GAAG;IACrC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,wBAAgB,kCAAkC,CAC9C,MAAM,EAAE,aAAa,GACtB,MAAM,IAAI,0BAA0B,CAKtC;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GACnB,0BAA0B,GAC1B,+BAA+B,GAC/B,0BAA0B,CAAC;AAEjC;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,aAAa,EAAE,CAAC;AAQtD;;GAEG;AACH,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,iBAAiB,EAAE,EAC5B,cAAc,CAAC,EAAE,iBAAiB,EAAE,GACrC;IACC;QACI,gBAAgB,EAAE,oBAAoB,CAAC;QACvC,uBAAuB,CAAC,EAAE,oBAAoB,CAAC;QAC/C,+BAA+B,EAAE,uBAAuB,CAAC;QACzD,qBAAqB,EAAE,MAAM,CAAC;QAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;KACtC;IACD;QACI,6BAA6B,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QACvD,qBAAqB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;QACrD,uBAAuB,EAAE,MAAM,IAAI,CAAC;QACpC,sBAAsB,EAAE,MAAM,IAAI,CAAC;KACtC;CACJ,CAyMA"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
// (C) 2021-
|
|
1
|
+
// (C) 2021-2025 GoodData Corporation
|
|
2
2
|
import { useCallback, useMemo, useState } from "react";
|
|
3
3
|
import partition from "lodash/partition.js";
|
|
4
|
-
import { areObjRefsEqual, isDashboardAttributeFilter, isDashboardDateFilter, isDashboardDateFilterWithDimension, isIdentifierRef, } from "@gooddata/sdk-model";
|
|
5
|
-
import { addAttributeFilter as addAttributeFilterAction, addDateFilter as addDateFilterAction, dispatchAndWaitFor, selectAllCatalogDateDatasetsMap, selectCatalogAttributes, selectEnableDuplicatedLabelValuesInAttributeFilter, selectSelectedFilterIndex, uiActions, useDashboardDispatch, useDashboardSelector, } from "../../../model/index.js";
|
|
4
|
+
import { areObjRefsEqual, isDashboardAttributeFilter, isDashboardCommonDateFilter, isDashboardDateFilter, isDashboardDateFilterWithDimension, isIdentifierRef, } from "@gooddata/sdk-model";
|
|
5
|
+
import { addAttributeFilter as addAttributeFilterAction, addDateFilter as addDateFilterAction, dispatchAndWaitFor, selectAllCatalogDateDatasetsMap, selectCatalogAttributes, selectEnableDuplicatedLabelValuesInAttributeFilter, selectSelectedFilterIndex, uiActions, useDashboardDispatch, useDashboardSelector, getFilterIdentifier, } from "../../../model/index.js";
|
|
6
|
+
import find from "lodash/find.js";
|
|
6
7
|
/**
|
|
7
8
|
* @internal
|
|
8
9
|
*/
|
|
@@ -27,12 +28,13 @@ function isNotDashboardCommonDateFilter(obj) {
|
|
|
27
28
|
/**
|
|
28
29
|
* @internal
|
|
29
30
|
*/
|
|
30
|
-
export function useFiltersWithAddedPlaceholder(filters) {
|
|
31
|
+
export function useFiltersWithAddedPlaceholder(filters, workingFilters) {
|
|
31
32
|
const dispatch = useDashboardDispatch();
|
|
32
33
|
const selectedFilterIndex = useDashboardSelector(selectSelectedFilterIndex);
|
|
33
34
|
const allAttributes = useDashboardSelector(selectCatalogAttributes);
|
|
34
35
|
const dateDatasetsMap = useDashboardSelector(selectAllCatalogDateDatasetsMap);
|
|
35
36
|
const enableDuplicatedLabelValuesInAttributeFilter = useDashboardSelector(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
37
|
+
const commonWorkingDateFilter = find(workingFilters, isDashboardCommonDateFilter);
|
|
36
38
|
const [draggableFilters, [commonDateFilter]] = partition(filters, isNotDashboardCommonDateFilter);
|
|
37
39
|
const [dateFiltersWithDimensions, attributeFilters] = partition(draggableFilters, isDashboardDateFilterWithDimension);
|
|
38
40
|
const [selectedDisplayForm, setSelectedDisplayForm] = useState();
|
|
@@ -69,14 +71,22 @@ export function useFiltersWithAddedPlaceholder(filters) {
|
|
|
69
71
|
const draggableFiltersWithPlaceholder = useMemo(() => {
|
|
70
72
|
const filterObjects = draggableFilters.map((filter, filterIndex) => {
|
|
71
73
|
if (isDashboardAttributeFilter(filter)) {
|
|
74
|
+
const workingFilter = workingFilters
|
|
75
|
+
?.filter(isDashboardAttributeFilter)
|
|
76
|
+
.find((wf) => getFilterIdentifier(wf) === getFilterIdentifier(filter)) ?? filter;
|
|
72
77
|
return {
|
|
73
78
|
filter,
|
|
74
79
|
filterIndex,
|
|
80
|
+
workingFilter,
|
|
75
81
|
};
|
|
76
82
|
}
|
|
83
|
+
const workingFilter = workingFilters
|
|
84
|
+
?.filter(isDashboardDateFilter)
|
|
85
|
+
.find((wf) => getFilterIdentifier(wf) === getFilterIdentifier(filter)) ?? filter;
|
|
77
86
|
return {
|
|
78
87
|
filter,
|
|
79
88
|
filterIndex,
|
|
89
|
+
workingFilter,
|
|
80
90
|
};
|
|
81
91
|
});
|
|
82
92
|
const containsAddedAttributeDisplayForm = selectedDisplayForm &&
|
|
@@ -150,6 +160,7 @@ export function useFiltersWithAddedPlaceholder(filters) {
|
|
|
150
160
|
return [
|
|
151
161
|
{
|
|
152
162
|
commonDateFilter,
|
|
163
|
+
commonWorkingDateFilter,
|
|
153
164
|
draggableFiltersWithPlaceholder,
|
|
154
165
|
draggableFiltersCount: draggableFilters.length,
|
|
155
166
|
autoOpenFilter,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFiltersWithAddedPlaceholder.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.tsx"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAE5C,OAAO,EACH,eAAe,EAIf,0BAA0B,EAC1B,qBAAqB,EACrB,kCAAkC,EAClC,eAAe,GAElB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACH,kBAAkB,IAAI,wBAAwB,EAC9C,aAAa,IAAI,mBAAmB,EACpC,kBAAkB,EAClB,+BAA+B,EAC/B,uBAAuB,EACvB,kDAAkD,EAClD,yBAAyB,EACzB,SAAS,EACT,oBAAoB,EACpB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"useFiltersWithAddedPlaceholder.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.tsx"],"names":[],"mappings":"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"}
|
|
@@ -117,6 +117,11 @@
|
|
|
117
117
|
"comment": "",
|
|
118
118
|
"limit": 0
|
|
119
119
|
},
|
|
120
|
+
"filterBar.unappliedFiltersNotification": {
|
|
121
|
+
"value": "<link>Apply filters</link> to see updated data.",
|
|
122
|
+
"comment": "Message banner. Some filters are changed by user but not applied yet. Do not translate HTML markup enclosed in <>.",
|
|
123
|
+
"limit": 0
|
|
124
|
+
},
|
|
120
125
|
"options.menu.export": {
|
|
121
126
|
"value": "Export",
|
|
122
127
|
"comment": "Export submenu",
|