@gooddata/sdk-ui-dashboard 10.10.0-alpha.8 → 10.10.0-alpha.9
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/drillToDashboardHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.js +5 -4
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js +0 -24
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js.map +1 -1
- package/esm/model/commandHandlers/layout/validation/itemValidation.d.ts.map +1 -1
- package/esm/model/commandHandlers/layout/validation/itemValidation.js +9 -3
- package/esm/model/commandHandlers/layout/validation/itemValidation.js.map +1 -1
- package/esm/model/commandHandlers/widgets/changeInsightWidgetFilterSettingsHandler.js +2 -2
- package/esm/model/commandHandlers/widgets/changeInsightWidgetFilterSettingsHandler.js.map +1 -1
- package/esm/model/commandHandlers/widgets/changeKpiWidgetFilterSettingsHandler.js +2 -2
- package/esm/model/commandHandlers/widgets/changeKpiWidgetFilterSettingsHandler.js.map +1 -1
- package/esm/model/commandHandlers/widgets/common/filterOperations.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/common/filterOperations.js +15 -6
- package/esm/model/commandHandlers/widgets/common/filterOperations.js.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/filterValidation.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/filterValidation.js +8 -2
- package/esm/model/commandHandlers/widgets/validation/filterValidation.js.map +1 -1
- package/esm/model/queryServices/queryWidgetBrokenAlerts.d.ts.map +1 -1
- package/esm/model/queryServices/queryWidgetBrokenAlerts.js +4 -2
- package/esm/model/queryServices/queryWidgetBrokenAlerts.js.map +1 -1
- package/esm/model/queryServices/queryWidgetFilters.d.ts.map +1 -1
- package/esm/model/queryServices/queryWidgetFilters.js +12 -7
- package/esm/model/queryServices/queryWidgetFilters.js.map +1 -1
- package/esm/model/utils/alertsUtils.d.ts +2 -2
- package/esm/model/utils/alertsUtils.d.ts.map +1 -1
- package/esm/model/utils/alertsUtils.js +6 -4
- package/esm/model/utils/alertsUtils.js.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useAttachmentDashboardFilters.d.ts.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useAttachmentDashboardFilters.js +9 -4
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useAttachmentDashboardFilters.js.map +1 -1
- package/esm/presentation/widget/common/configuration/AttributeFilterConfigurationItem.d.ts +1 -0
- package/esm/presentation/widget/common/configuration/AttributeFilterConfigurationItem.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/AttributeFilterConfigurationItem.js +3 -3
- package/esm/presentation/widget/common/configuration/AttributeFilterConfigurationItem.js.map +1 -1
- package/esm/presentation/widget/common/configuration/FilterConfiguration.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/FilterConfiguration.js +5 -2
- package/esm/presentation/widget/common/configuration/FilterConfiguration.js.map +1 -1
- package/esm/presentation/widget/kpi/common/filterUtils.d.ts +0 -1
- package/esm/presentation/widget/kpi/common/filterUtils.d.ts.map +1 -1
- package/esm/presentation/widget/kpi/common/filterUtils.js +2 -5
- package/esm/presentation/widget/kpi/common/filterUtils.js.map +1 -1
- package/package.json +15 -15
package/esm/__version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "10.10.0-alpha.
|
|
1
|
+
export declare const LIB_VERSION = "10.10.0-alpha.9";
|
|
2
2
|
//# sourceMappingURL=__version.d.ts.map
|
package/esm/__version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,iCAAiC,EAGpC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"drillToDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,iCAAiC,EAGpC,MAAM,uBAAuB,CAAC;AAkD/B,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,iCAAiC,CAAC,CA4GjD"}
|
|
@@ -14,7 +14,7 @@ import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
|
|
|
14
14
|
import { convertIntersectionToAttributeFilters, removeIgnoredValuesFromDrillIntersection, } from "./common/intersectionUtils.js";
|
|
15
15
|
import { selectSupportsMultipleDateFilters } from "../../store/backendCapabilities/backendCapabilitiesSelectors.js";
|
|
16
16
|
import { selectEnableDrillIntersectionIgnoredAttributes, selectEnableDuplicatedLabelValuesInAttributeFilter, selectEnableMultipleDateFilters, } from "../../store/config/configSelectors.js";
|
|
17
|
-
import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
17
|
+
import { selectAttributeFilterConfigsDisplayAsLabelMap, selectAttributeFilterConfigsOverrides, } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
18
18
|
export function* drillToDashboardHandler(ctx, cmd) {
|
|
19
19
|
// put start event
|
|
20
20
|
yield put(drillToDashboardRequested(ctx, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId));
|
|
@@ -124,11 +124,12 @@ function convertFilterItemsToFilters(filter, widget) {
|
|
|
124
124
|
}
|
|
125
125
|
function* getWidgetAwareDashboardFilters(ctx, widget, includeOtherDateFilters) {
|
|
126
126
|
const filterContextItems = yield select(includeOtherDateFilters ? selectFilterContextDraggableFilters : selectFilterContextAttributeFilters);
|
|
127
|
+
const attributeFilterConfigs = yield select(selectAttributeFilterConfigsOverrides);
|
|
127
128
|
const filtersPairs = filterContextItems.map((filter) => ({
|
|
128
129
|
filter: convertFilterItemsToFilters(filter, widget),
|
|
129
130
|
originalFilter: filter,
|
|
130
131
|
}));
|
|
131
|
-
const widgetFilters = yield call(getResolvedFiltersForWidget, ctx, widget, filtersPairs.map((pair) => pair.filter));
|
|
132
|
+
const widgetFilters = yield call(getResolvedFiltersForWidget, ctx, widget, filtersPairs.map((pair) => pair.filter), attributeFilterConfigs);
|
|
132
133
|
return filtersPairs
|
|
133
134
|
.filter((pair) => widgetFilters.some((wf) => isEqual(wf, pair.filter)))
|
|
134
135
|
.map((pair) => pair.originalFilter);
|
|
@@ -145,10 +146,10 @@ function isDateFilterDisabled(insight) {
|
|
|
145
146
|
return true;
|
|
146
147
|
});
|
|
147
148
|
}
|
|
148
|
-
function getResolvedFiltersForWidget(ctx, widget, filters) {
|
|
149
|
+
function getResolvedFiltersForWidget(ctx, widget, filters, attributeFilterConfigs) {
|
|
149
150
|
return ctx.backend
|
|
150
151
|
.workspace(ctx.workspace)
|
|
151
152
|
.dashboards()
|
|
152
|
-
.getResolvedFiltersForWidgetWithMultipleDateFilters(widget, [], filters);
|
|
153
|
+
.getResolvedFiltersForWidgetWithMultipleDateFilters(widget, [], filters, attributeFilterConfigs);
|
|
153
154
|
}
|
|
154
155
|
//# sourceMappingURL=drillToDashboardHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToDashboardHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAkB,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAEH,yBAAyB,EACzB,wBAAwB,GAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,mCAAmC,EACnC,6BAA6B,EAC7B,mCAAmC,GACtC,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAEpF,OAAO,EACH,yCAAyC,EACzC,uCAAuC,GAC1C,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACH,eAAe,EAGf,eAAe,EACf,eAAe,EACf,cAAc,EACd,YAAY,EAKZ,6BAA6B,EAE7B,0BAA0B,GAI7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAEH,qCAAqC,EACrC,wCAAwC,GAC3C,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iCAAiC,EAAE,MAAM,iEAAiE,CAAC;AACpH,OAAO,EACH,8CAA8C,EAC9C,kDAAkD,EAClD,+BAA+B,GAClC,MAAM,uCAAuC,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"drillToDashboardHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeAttributeDisplayFormHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"changeAttributeDisplayFormHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAYjE,wBAAiB,iCAAiC,CAC9C,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,6BAA6B,GACnC,YAAY,CAAC,IAAI,CAAC,CAuEpB"}
|
package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js
CHANGED
|
@@ -11,17 +11,13 @@ import { dispatchDashboardEvent } from "../../../store/_infra/eventDispatcher.js
|
|
|
11
11
|
import { validateFilterDisplayForm } from "./validation/filterDisplayFormValidation.js";
|
|
12
12
|
import { invalidArgumentsProvided } from "../../../events/general.js";
|
|
13
13
|
import { selectAllCatalogDisplayFormsMap } from "../../../store/catalog/catalogSelectors.js";
|
|
14
|
-
import { areObjRefsEqual, isDashboardAttributeFilterReference, } from "@gooddata/sdk-model";
|
|
15
14
|
import { query } from "../../../store/_infra/queryCall.js";
|
|
16
15
|
import { queryAttributeByDisplayForm } from "../../../queries/index.js";
|
|
17
16
|
import { newDisplayFormMap } from "../../../../_staging/metadata/objRefMap.js";
|
|
18
17
|
import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../../store/config/configSelectors.js";
|
|
19
|
-
import { selectWidgets } from "../../../store/layout/layoutSelectors.js";
|
|
20
|
-
import { ignoreFilterOnInsightWidget, unignoreFilterOnInsightWidget } from "../../../commands/insight.js";
|
|
21
18
|
export function* changeAttributeDisplayFormHandler(ctx, cmd) {
|
|
22
19
|
const { filterLocalId, displayForm } = cmd.payload;
|
|
23
20
|
const { backend: { capabilities: { supportsElementUris }, }, } = ctx;
|
|
24
|
-
const originalFilter = yield select(selectFilterContextAttributeFilterByLocalId(filterLocalId));
|
|
25
21
|
const catalogDisplayFormsMap = yield select(selectAllCatalogDisplayFormsMap);
|
|
26
22
|
const attributes = yield call(query, queryAttributeByDisplayForm([displayForm]));
|
|
27
23
|
const attributeDisplayFormsMap = newDisplayFormMap([...flatMap(attributes, (a) => a.displayForms)]);
|
|
@@ -48,27 +44,7 @@ export function* changeAttributeDisplayFormHandler(ctx, cmd) {
|
|
|
48
44
|
]));
|
|
49
45
|
const changedFilter = yield select(selectFilterContextAttributeFilterByLocalId(filterLocalId));
|
|
50
46
|
invariant(changedFilter, "Inconsistent state in changeAttributeDisplayFormHandler, cannot update attribute filter for given local identifier.");
|
|
51
|
-
if (enableDuplicatedLabelValuesInAttributeFilter) {
|
|
52
|
-
// sync change of filter's DF with potential ignoreDashboardFilters on insight widgets
|
|
53
|
-
const widgets = yield select(selectWidgets);
|
|
54
|
-
for (const widget of widgets) {
|
|
55
|
-
const isWidgetReferencingChangedFilter = getIsWidgetReferencingChangedFilter(widget, originalFilter);
|
|
56
|
-
if (originalFilter && isWidgetReferencingChangedFilter) {
|
|
57
|
-
yield put(unignoreFilterOnInsightWidget(widget.ref, originalFilter.attributeFilter.displayForm));
|
|
58
|
-
yield put(ignoreFilterOnInsightWidget(widget.ref, changedFilter.attributeFilter.displayForm));
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
47
|
yield dispatchDashboardEvent(attributeDisplayFormChanged(ctx, changedFilter, cmd.correlationId));
|
|
63
48
|
yield call(dispatchFilterContextChanged, ctx, cmd);
|
|
64
49
|
}
|
|
65
|
-
function getIsWidgetReferencingChangedFilter(widget, originalFilter) {
|
|
66
|
-
return (originalFilter &&
|
|
67
|
-
widget.ignoreDashboardFilters?.some((reference) => {
|
|
68
|
-
if (!isDashboardAttributeFilterReference(reference)) {
|
|
69
|
-
return false;
|
|
70
|
-
}
|
|
71
|
-
return areObjRefsEqual(reference.displayForm, originalFilter.attributeFilter.displayForm);
|
|
72
|
-
}));
|
|
73
|
-
}
|
|
74
50
|
//# sourceMappingURL=changeAttributeDisplayFormHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeAttributeDisplayFormHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,2CAA2C,EAAE,MAAM,wDAAwD,CAAC;AAErH,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"changeAttributeDisplayFormHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"itemValidation.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/layout/validation/itemValidation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"itemValidation.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/layout/validation/itemValidation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAgBtE,OAAO,EAAE,uBAAuB,EAAmB,MAAM,mCAAmC,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAc/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AA2B5D,KAAK,oBAAoB,GAAG;IACxB,eAAe,EAAE,oBAAoB,CAAC;IACtC,gBAAgB,EAAE,uBAAuB,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAiB,+BAA+B,CAC5C,GAAG,EAAE,gBAAgB,EACrB,KAAK,EAAE,oBAAoB,EAC3B,GAAG,EAAE,iBAAiB,GACvB,YAAY,CAAC,oBAAoB,CAAC,CAyBpC;AA+FD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAiB,oCAAoC,CACjD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,oBAAoB,EAC3B,eAAe,GAAE,OAAe,GACjC,YAAY,CAAC,qBAAqB,EAAE,CAAC,CAuFvC"}
|
|
@@ -9,6 +9,7 @@ import { insightSelectDateDataset, queryDateDatasetsForInsight, queryDateDataset
|
|
|
9
9
|
import { query } from "../../../store/_infra/queryCall.js";
|
|
10
10
|
import { validateAttributeFiltersToIgnore, validateDatasetForInsightWidgetDateFilter, validateDatasetForKpiWidgetDateFilter, } from "../../widgets/validation/filterValidation.js";
|
|
11
11
|
import { selectFilterContextAttributeFilters } from "../../../store/filterContext/filterContextSelectors.js";
|
|
12
|
+
import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
12
13
|
function normalizeItems(items, insights) {
|
|
13
14
|
return items.map((item) => {
|
|
14
15
|
if (isInsightWidget(item.widget)) {
|
|
@@ -92,10 +93,14 @@ function* validateAndResolveKpiFilters(ctx, cmd, widget, autoDateDataset) {
|
|
|
92
93
|
return widget;
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
|
-
function removeObsoleteAttributeFilterIgnores(widget, attributeFilters) {
|
|
96
|
+
function removeObsoleteAttributeFilterIgnores(widget, attributeFilters, displayAsLabelMap) {
|
|
96
97
|
const onlyExistingFilterIgnores = widget.ignoreDashboardFilters.filter((filterRef) => {
|
|
97
98
|
if (isDashboardAttributeFilterReference(filterRef)) {
|
|
98
|
-
return attributeFilters.find((filter) =>
|
|
99
|
+
return attributeFilters.find((filter) => {
|
|
100
|
+
const displayAsLabel = displayAsLabelMap.get(filter.attributeFilter.localIdentifier);
|
|
101
|
+
return (areObjRefsEqual(filter.attributeFilter.displayForm, filterRef.displayForm) ||
|
|
102
|
+
areObjRefsEqual(filter.attributeFilter.displayForm, displayAsLabel));
|
|
103
|
+
});
|
|
99
104
|
}
|
|
100
105
|
return true;
|
|
101
106
|
});
|
|
@@ -123,6 +128,7 @@ function removeObsoleteAttributeFilterIgnores(widget, attributeFilters) {
|
|
|
123
128
|
*/
|
|
124
129
|
export function* validateAndResolveItemFilterSettings(ctx, cmd, items, autoDateDataset = false) {
|
|
125
130
|
const attributeFilters = yield select(selectFilterContextAttributeFilters);
|
|
131
|
+
const displayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
126
132
|
const { resolvedInsights, normalizedItems } = items;
|
|
127
133
|
const updatedItems = [];
|
|
128
134
|
let i = 0;
|
|
@@ -144,7 +150,7 @@ export function* validateAndResolveItemFilterSettings(ctx, cmd, items, autoDateD
|
|
|
144
150
|
*
|
|
145
151
|
* Any ignored filters that are obsolete can be safely removed.
|
|
146
152
|
*/
|
|
147
|
-
const updatedWidget = removeObsoleteAttributeFilterIgnores(widget, attributeFilters);
|
|
153
|
+
const updatedWidget = removeObsoleteAttributeFilterIgnores(widget, attributeFilters, displayAsLabelMap);
|
|
148
154
|
updatedItems.push({
|
|
149
155
|
...item,
|
|
150
156
|
widget: updatedWidget,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"itemValidation.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/layout/validation/itemValidation.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,eAAe,EAEf,UAAU,EACV,cAAc,EAEd,mCAAmC,EAGnC,WAAW,EACX,eAAe,
|
|
1
|
+
{"version":3,"file":"itemValidation.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/layout/validation/itemValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2021-
|
|
1
|
+
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { selectWidgetsMap } from "../../store/layout/layoutSelectors.js";
|
|
3
3
|
import { call, put, select } from "redux-saga/effects";
|
|
4
4
|
import { validateExistingInsightWidget } from "./validation/widgetValidations.js";
|
|
@@ -45,7 +45,7 @@ export function* changeInsightWidgetFilterSettingsHandler(ctx, cmd) {
|
|
|
45
45
|
yield put(layoutActions.replaceWidgetFilterSettings({
|
|
46
46
|
ref: insightWidget.ref,
|
|
47
47
|
dateDataSet: dateDataSet?.dataSet.ref,
|
|
48
|
-
ignoreDashboardFilters
|
|
48
|
+
ignoreDashboardFilters,
|
|
49
49
|
undo: {
|
|
50
50
|
cmd,
|
|
51
51
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeInsightWidgetFilterSettingsHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/changeInsightWidgetFilterSettingsHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAMrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAIH,0BAA0B,EAE1B,kCAAkC,GACrC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAoB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EACH,gCAAgC,EAChC,yCAAyC,EACzC,2BAA2B,GAC9B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,8BAA8B,GAAqC;IACrE,oBAAoB,EAAE,yCAAyC;IAC/D,wBAAwB,EAAE,gCAAgC;IAC1D,mBAAmB,EAAE,2BAA2B;CACnD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,SAAS,CAAC,CAAC,wCAAwC,CACrD,GAAqB,EACrB,GAAsC;IAEtC,MAAM,OAAO,GAAwC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpF,MAAM,aAAa,GAAG,6BAA6B,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAEvE,MAAM,MAAM,GAA2C,MAAM,IAAI,CAC7D,eAAe,EACf,GAAG,EACH,8BAAqE,EACrE,GAAG,EACH,aAAa,CAChB,CAAC;IACF,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAE/C,MAAM,sBAAsB,GAAG,cAAc,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1D,IAAI,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,MAAM,eAAe,GAAuC;gBACxD,IAAI,EAAE,0BAA0B;gBAChC,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,WAAW;aAClD,CAAC;YAEF,OAAO,eAAe,CAAC;QAC3B,CAAC;QACD,MAAM,eAAe,GAAkC;YACnD,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,OAAQ;SACtC,CAAC;QAEF,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,CACL,aAAa,CAAC,2BAA2B,CAAC;QACtC,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG;QACrC,sBAAsB
|
|
1
|
+
{"version":3,"file":"changeInsightWidgetFilterSettingsHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/changeInsightWidgetFilterSettingsHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAMrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAIH,0BAA0B,EAE1B,kCAAkC,GACrC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAoB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EACH,gCAAgC,EAChC,yCAAyC,EACzC,2BAA2B,GAC9B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,8BAA8B,GAAqC;IACrE,oBAAoB,EAAE,yCAAyC;IAC/D,wBAAwB,EAAE,gCAAgC;IAC1D,mBAAmB,EAAE,2BAA2B;CACnD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,SAAS,CAAC,CAAC,wCAAwC,CACrD,GAAqB,EACrB,GAAsC;IAEtC,MAAM,OAAO,GAAwC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpF,MAAM,aAAa,GAAG,6BAA6B,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAEvE,MAAM,MAAM,GAA2C,MAAM,IAAI,CAC7D,eAAe,EACf,GAAG,EACH,8BAAqE,EACrE,GAAG,EACH,aAAa,CAChB,CAAC;IACF,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAE/C,MAAM,sBAAsB,GAAG,cAAc,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1D,IAAI,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,MAAM,eAAe,GAAuC;gBACxD,IAAI,EAAE,0BAA0B;gBAChC,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,WAAW;aAClD,CAAC;YAEF,OAAO,eAAe,CAAC;QAC3B,CAAC;QACD,MAAM,eAAe,GAAkC;YACnD,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,OAAQ;SACtC,CAAC;QAEF,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,CACL,aAAa,CAAC,2BAA2B,CAAC;QACtC,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG;QACrC,sBAAsB;QACtB,IAAI,EAAE;YACF,GAAG;SACN;KACJ,CAAC,CACL,CAAC;IAEF,OAAO,kCAAkC,CACrC,GAAG,EACH,aAAa,CAAC,GAAG,EACjB,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,0BAA0B,CAAC,EACzD,MAAM,CAAC,WAAW,EAClB,GAAG,CAAC,aAAa,EACjB,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,kCAAkC,CAAC,CACpE,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2021-
|
|
1
|
+
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { selectWidgetsMap } from "../../store/layout/layoutSelectors.js";
|
|
3
3
|
import { call, put, select } from "redux-saga/effects";
|
|
4
4
|
import { validateExistingKpiWidget } from "./validation/widgetValidations.js";
|
|
@@ -39,7 +39,7 @@ export function* changeKpiWidgetFilterSettingsHandler(ctx, cmd) {
|
|
|
39
39
|
yield put(layoutActions.replaceWidgetFilterSettings({
|
|
40
40
|
ref: kpiWidget.ref,
|
|
41
41
|
dateDataSet: dateDataSet?.dataSet.ref,
|
|
42
|
-
ignoreDashboardFilters
|
|
42
|
+
ignoreDashboardFilters,
|
|
43
43
|
undo: {
|
|
44
44
|
cmd,
|
|
45
45
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeKpiWidgetFilterSettingsHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/changeKpiWidgetFilterSettingsHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAMrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAIH,0BAA0B,GAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAoB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EACH,gCAAgC,EAChC,qCAAqC,GACxC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,0BAA0B,GAAiC;IAC7D,oBAAoB,EAAE,qCAAqC;IAC3D,wBAAwB,EAAE,gCAAgC;CAC7D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,SAAS,CAAC,CAAC,oCAAoC,CACjD,GAAqB,EACrB,GAAkC;IAElC,MAAM,OAAO,GAAwC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpF,MAAM,SAAS,GAAG,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAE/D,MAAM,MAAM,GAA2C,MAAM,IAAI,CAC7D,eAAe,EACf,GAAG,EACH,0BAAiE,EACjE,GAAG,EACH,SAAS,CACZ,CAAC;IACF,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAE/C,sCAAsC;IACtC,MAAM,uBAAuB,GAAG,cAAc,EAAE,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAEnF,MAAM,sBAAsB,GAAG,uBAAuB,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACnE,MAAM,eAAe,GAAuC;YACxD,IAAI,EAAE,0BAA0B;YAChC,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,WAAW;SAClD,CAAC;QAEF,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,CACL,aAAa,CAAC,2BAA2B,CAAC;QACtC,GAAG,EAAE,SAAS,CAAC,GAAG;QAClB,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG;QACrC,sBAAsB
|
|
1
|
+
{"version":3,"file":"changeKpiWidgetFilterSettingsHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/changeKpiWidgetFilterSettingsHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAMrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAIH,0BAA0B,GAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAoB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EACH,gCAAgC,EAChC,qCAAqC,GACxC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,0BAA0B,GAAiC;IAC7D,oBAAoB,EAAE,qCAAqC;IAC3D,wBAAwB,EAAE,gCAAgC;CAC7D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,SAAS,CAAC,CAAC,oCAAoC,CACjD,GAAqB,EACrB,GAAkC;IAElC,MAAM,OAAO,GAAwC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpF,MAAM,SAAS,GAAG,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAE/D,MAAM,MAAM,GAA2C,MAAM,IAAI,CAC7D,eAAe,EACf,GAAG,EACH,0BAAiE,EACjE,GAAG,EACH,SAAS,CACZ,CAAC;IACF,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAE/C,sCAAsC;IACtC,MAAM,uBAAuB,GAAG,cAAc,EAAE,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAEnF,MAAM,sBAAsB,GAAG,uBAAuB,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACnE,MAAM,eAAe,GAAuC;YACxD,IAAI,EAAE,0BAA0B;YAChC,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,WAAW;SAClD,CAAC;QAEF,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,CACL,aAAa,CAAC,2BAA2B,CAAC;QACtC,GAAG,EAAE,SAAS,CAAC,GAAG;QAClB,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG;QACrC,sBAAsB;QACtB,IAAI,EAAE;YACF,GAAG;SACN;KACJ,CAAC,CACL,CAAC;IAEF,OAAO,8BAA8B,CACjC,GAAG,EACH,SAAS,CAAC,GAAG,EACb,uBAAuB,IAAI,EAAE,EAC7B,MAAM,CAAC,WAAW,EAClB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterOperations.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/common/filterOperations.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,MAAM,EACN,yBAAyB,EAGzB,iBAAiB,EACjB,mBAAmB,EAGnB,oBAAoB,EAGvB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAQH,qBAAqB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"filterOperations.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/common/filterOperations.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,MAAM,EACN,yBAAyB,EAGzB,iBAAiB,EACjB,mBAAmB,EAGnB,oBAAoB,EAGvB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAQH,qBAAqB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAsb1C;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAElC;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,yBAAyB,GAAG,oBAAoB,CAAC,CAAC;CAC5E;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAC5D,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,MAAM,KACV,YAAY,CAAC,mBAAmB,CAAC,CAAC;AACvC,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAChE,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,CAAC,EACT,IAAI,EAAE,MAAM,EAAE,KACb,YAAY,CAAC,yBAAyB,EAAE,GAAG,SAAS,CAAC,CAAC;AAC3D,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAC3D,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,CAAC,EACT,IAAI,EAAE,MAAM,EAAE,KACb,YAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC;AAC1C,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,iBAAiB,IAAI;IACxD,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAC9C,wBAAwB,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;IACtD,mBAAmB,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACtD,OAAO,EAAE;QACL,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC;KAC7C,CAAC;CACL;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAiB,eAAe,CAC5B,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC/C,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,iBAAiB,GAC1B,YAAY,CAAC,cAAc,CAAC,CA+B9B"}
|
|
@@ -6,6 +6,7 @@ import { selectFilterContextAttributeFilters, selectFilterContextDateFiltersWith
|
|
|
6
6
|
import { selectAllCatalogDateDatasetsMap } from "../../../store/catalog/catalogSelectors.js";
|
|
7
7
|
import { query } from "../../../store/_infra/queryCall.js";
|
|
8
8
|
import { insightSelectDateDataset, queryDateDatasetsForInsight, queryDateDatasetsForMeasure, } from "../../../queries/index.js";
|
|
9
|
+
import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
9
10
|
function toAttributeDisplayFormRefs(references) {
|
|
10
11
|
return references.filter(isDashboardAttributeFilterReference).map((reference) => reference.displayForm);
|
|
11
12
|
}
|
|
@@ -20,10 +21,14 @@ function toRefs(references) {
|
|
|
20
21
|
return reference.displayForm;
|
|
21
22
|
});
|
|
22
23
|
}
|
|
23
|
-
function getIgnoredAttributeFilters(filters, ignored) {
|
|
24
|
+
function getIgnoredAttributeFilters(filters, displayAsLabelMap, ignored) {
|
|
24
25
|
const ignoredRefs = toAttributeDisplayFormRefs(ignored);
|
|
25
26
|
return filters.filter((filter) => {
|
|
26
|
-
return ignoredRefs.some((ref) =>
|
|
27
|
+
return ignoredRefs.some((ref) => {
|
|
28
|
+
const displayAsLabel = displayAsLabelMap.get(filter.attributeFilter.localIdentifier);
|
|
29
|
+
return (areObjRefsEqual(filter.attributeFilter.displayForm, ref) ||
|
|
30
|
+
areObjRefsEqual(displayAsLabel, ref));
|
|
31
|
+
});
|
|
27
32
|
});
|
|
28
33
|
}
|
|
29
34
|
function getIgnoredDateFilters(filters, ignored) {
|
|
@@ -32,14 +37,16 @@ function getIgnoredDateFilters(filters, ignored) {
|
|
|
32
37
|
return ignoredRefs.some((ref) => areObjRefsEqual(filter.dateFilter.dataSet, ref));
|
|
33
38
|
});
|
|
34
39
|
}
|
|
35
|
-
function getIgnoredFilters(filters, ignored) {
|
|
40
|
+
function getIgnoredFilters(filters, displayAsLabelMap, ignored) {
|
|
36
41
|
const ignoredRefs = toRefs(ignored);
|
|
37
42
|
return filters.filter((filter) => {
|
|
38
43
|
return ignoredRefs.some((ref) => {
|
|
39
44
|
if (isDashboardDateFilter(filter)) {
|
|
40
45
|
return areObjRefsEqual(filter.dateFilter.dataSet, ref);
|
|
41
46
|
}
|
|
42
|
-
|
|
47
|
+
const displayAsLabel = displayAsLabelMap.get(filter.attributeFilter.localIdentifier);
|
|
48
|
+
return (areObjRefsEqual(filter.attributeFilter.displayForm, ref) ||
|
|
49
|
+
areObjRefsEqual(displayAsLabel, ref));
|
|
43
50
|
});
|
|
44
51
|
});
|
|
45
52
|
}
|
|
@@ -63,7 +70,8 @@ function* replaceFilterSettings(ctx, validators, cmd, widget, op) {
|
|
|
63
70
|
}
|
|
64
71
|
function* changeDateFilterIgnore(widget, dateDataSet) {
|
|
65
72
|
const filters = yield select(selectFilterContextDraggableFilters);
|
|
66
|
-
const
|
|
73
|
+
const displayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
74
|
+
const ignoredFilters = getIgnoredFilters(filters, displayAsLabelMap, widget.ignoreDashboardFilters);
|
|
67
75
|
return {
|
|
68
76
|
dateDataSet,
|
|
69
77
|
ignoredFilters,
|
|
@@ -114,7 +122,8 @@ function* getIgnoredDateFiltersWorWidget(widget) {
|
|
|
114
122
|
}
|
|
115
123
|
function* getIgnoredAttributeFiltersWorWidget(widget) {
|
|
116
124
|
const attributeFilters = yield select(selectFilterContextAttributeFilters);
|
|
117
|
-
|
|
125
|
+
const displayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
126
|
+
return getIgnoredAttributeFilters(attributeFilters, displayAsLabelMap, widget.ignoreDashboardFilters);
|
|
118
127
|
}
|
|
119
128
|
function* ignoreAttributeFilter(ctx, validators, cmd, widget, op) {
|
|
120
129
|
const ignoredFilters = yield call(validators.attributeFilterValidator, ctx, cmd, widget, op.displayFormRefs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterOperations.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/common/filterOperations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"filterOperations.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/common/filterOperations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterValidation.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/validation/filterValidation.ts"],"names":[],"mappings":"AAYA,OAAO,EAEH,QAAQ,EACR,MAAM,EAEN,yBAAyB,EACzB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"filterValidation.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/validation/filterValidation.ts"],"names":[],"mappings":"AAYA,OAAO,EAEH,QAAQ,EACR,MAAM,EAEN,yBAAyB,EACzB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAQ/D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAiB,yCAAyC,CACtD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,QAAQ,GAC3B,YAAY,CAAC,mBAAmB,CAAC,CAsBnC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAiB,qCAAqC,CAClD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,MAAM,GACpB,YAAY,CAAC,mBAAmB,CAAC,CAkBnC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAiB,gCAAgC,CAC7C,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,MAAM,EAAE,GACnB,YAAY,CAAC,yBAAyB,EAAE,CAAC,CAsD3C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAiB,2BAA2B,CACxC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,MAAM,EAAE,GACnB,YAAY,CAAC,oBAAoB,EAAE,CAAC,CA6CtC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2021-
|
|
1
|
+
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { queryDateDatasetsForInsight, queryDateDatasetsForMeasure, } from "../../../queries/index.js";
|
|
3
3
|
import { call, select } from "redux-saga/effects";
|
|
4
4
|
import partition from "lodash/partition.js";
|
|
@@ -11,6 +11,7 @@ import isEmpty from "lodash/isEmpty.js";
|
|
|
11
11
|
import { selectFilterContextAttributeFilters, selectFilterContextDateFiltersWithDimension, } from "../../../store/filterContext/filterContextSelectors.js";
|
|
12
12
|
import { selectEnableUnavailableItemsVisibility } from "../../../store/config/configSelectors.js";
|
|
13
13
|
import { selectAllCatalogDateDatasetsMap, selectCatalogDateDatasets, } from "../../../store/catalog/catalogSelectors.js";
|
|
14
|
+
import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
14
15
|
/**
|
|
15
16
|
* This generator validates that a date dataset with the provided ref can be used for date filtering of insight in
|
|
16
17
|
* particular insight widget. If the result is positive, a catalog entry of the date dataset will be returned.
|
|
@@ -105,10 +106,15 @@ export function* validateAttributeFiltersToIgnore(ctx, cmd, _widget, toIgnore) {
|
|
|
105
106
|
.join(", ")}`);
|
|
106
107
|
}
|
|
107
108
|
const existingFilters = yield select(selectFilterContextAttributeFilters);
|
|
109
|
+
const displayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
108
110
|
const badIgnores = [];
|
|
109
111
|
const filtersToIgnore = [];
|
|
110
112
|
for (const toIgnore of resolved.values()) {
|
|
111
|
-
const filterForDisplayForm = existingFilters.find((filter) =>
|
|
113
|
+
const filterForDisplayForm = existingFilters.find((filter) => {
|
|
114
|
+
const displayAsLabel = displayAsLabelMap.get(filter.attributeFilter.localIdentifier);
|
|
115
|
+
return (areObjRefsEqual(filter.attributeFilter.displayForm, toIgnore.ref) ||
|
|
116
|
+
areObjRefsEqual(displayAsLabel, toIgnore.ref));
|
|
117
|
+
});
|
|
112
118
|
if (!filterForDisplayForm) {
|
|
113
119
|
badIgnores.push(toIgnore.ref);
|
|
114
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterValidation.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/validation/filterValidation.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAGH,2BAA2B,EAC3B,2BAA2B,GAC9B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,IAAI,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EACH,eAAe,EAGf,cAAc,GAOjB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,EACH,mCAAmC,EACnC,2CAA2C,GAC9C,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,sCAAsC,EAAE,MAAM,0CAA0C,CAAC;AAClG,OAAO,EACH,+BAA+B,EAC/B,yBAAyB,GAC5B,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"filterValidation.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/widgets/validation/filterValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryWidgetBrokenAlerts.d.ts","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetBrokenAlerts.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAKhE,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"queryWidgetBrokenAlerts.d.ts","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetBrokenAlerts.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAKhE,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAMrE,eAAO,MAAM,6BAA6B,2KAGzC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2021-
|
|
1
|
+
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { objRefToString, isDashboardAttributeFilter, isKpiWidget, } from "@gooddata/sdk-model";
|
|
3
3
|
import { filterContextItemsToDashboardFiltersByWidget } from "../../converters/index.js";
|
|
4
4
|
import isEmpty from "lodash/isEmpty.js";
|
|
@@ -11,6 +11,7 @@ import { selectAnalyticalWidgetByRef } from "../store/layout/layoutSelectors.js"
|
|
|
11
11
|
import { createQueryService } from "../store/_infra/queryService.js";
|
|
12
12
|
import { resolveDisplayFormMetadata } from "../utils/displayFormResolver.js";
|
|
13
13
|
import { getBrokenAlertFiltersBasicInfo } from "../utils/alertsUtils.js";
|
|
14
|
+
import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
14
15
|
export const QueryWidgetBrokenAlertService = createQueryService("GDC.DASH/QUERY.WIDGET.BROKEN_ALERTS", queryService);
|
|
15
16
|
function* queryService(ctx, query) {
|
|
16
17
|
const { payload: { widgetRef }, correlationId, } = query;
|
|
@@ -22,7 +23,8 @@ function* queryService(ctx, query) {
|
|
|
22
23
|
}
|
|
23
24
|
const displayFormsMap = yield call(resolveDisplayForms, alert, ctx);
|
|
24
25
|
const appliedFilters = yield call(getDashboardFilters, kpiWidget);
|
|
25
|
-
|
|
26
|
+
const displayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
27
|
+
return getBrokenAlertFiltersBasicInfo(alert, kpiWidget, appliedFilters, displayFormsMap, displayAsLabelMap);
|
|
26
28
|
}
|
|
27
29
|
function* getKpiWidgetAndAlert(widgetRef, ctx, correlationId) {
|
|
28
30
|
const widgetSelector = selectAnalyticalWidgetByRef(widgetRef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryWidgetBrokenAlerts.js","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetBrokenAlerts.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAEH,cAAc,EACd,0BAA0B,EAI1B,WAAW,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,4CAA4C,EAAE,MAAM,2BAA2B,CAAC;AACzF,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAkB,MAAM,oBAAoB,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAC9F,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"queryWidgetBrokenAlerts.js","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetBrokenAlerts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryWidgetFilters.d.ts","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetFilters.ts"],"names":[],"mappings":"AAKA,OAAO,EAMH,OAAO,
|
|
1
|
+
{"version":3,"file":"queryWidgetFilters.d.ts","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetFilters.ts"],"names":[],"mappings":"AAKA,OAAO,EAMH,OAAO,EAsBV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAc3D,eAAO,MAAM,yBAAyB,iGAAoE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { all, call, select } from "redux-saga/effects";
|
|
2
2
|
import { createQueryService } from "../store/_infra/queryService.js";
|
|
3
|
-
import { areObjRefsEqual, filterObjRef, idRef, insightFilters, isAllTimeDateFilter, isAttributeFilter, isDateFilter, isMeasureValueFilter, isRankingFilter, newAllTimeFilter, objRefToString, uriRef, isDashboardAttributeFilterReference, isInsightWidget, isDashboardDateFilterReference, } from "@gooddata/sdk-model";
|
|
3
|
+
import { areObjRefsEqual, filterObjRef, idRef, insightFilters, isAllTimeDateFilter, isAttributeFilter, isDateFilter, isMeasureValueFilter, isRankingFilter, newAllTimeFilter, objRefToString, uriRef, isDashboardAttributeFilterReference, isInsightWidget, isDashboardDateFilterReference, filterLocalIdentifier, } from "@gooddata/sdk-model";
|
|
4
4
|
import { selectAllFiltersForWidgetByRef, selectWidgetByRef } from "../store/layout/layoutSelectors.js";
|
|
5
5
|
import { selectInsightByRef } from "../store/insights/insightsSelectors.js";
|
|
6
6
|
import { invalidQueryArguments } from "../events/general.js";
|
|
@@ -10,6 +10,7 @@ import { resolveDisplayFormMetadata } from "../utils/displayFormResolver.js";
|
|
|
10
10
|
import { invariant } from "ts-invariant";
|
|
11
11
|
import isEmpty from "lodash/isEmpty.js";
|
|
12
12
|
import { selectSupportsMultipleDateFilters } from "../store/backendCapabilities/backendCapabilitiesSelectors.js";
|
|
13
|
+
import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
13
14
|
export const QueryWidgetFiltersService = createQueryService("GDC.DASH/QUERY.WIDGET.FILTERS", queryService);
|
|
14
15
|
function refMatchesMdObject(ref, mdObject, type) {
|
|
15
16
|
return (areObjRefsEqual(ref, mdObject.ref) ||
|
|
@@ -45,15 +46,19 @@ function* getResolvedInsightAttributeFilters(ctx, widget, dashboardAttributeFilt
|
|
|
45
46
|
}
|
|
46
47
|
function* getResolvedAttributeFilters(ctx, widget, attributeFilters) {
|
|
47
48
|
const attributeFilterDisplayFormPairs = yield call(loadDisplayFormsForAttributeFilters, ctx, attributeFilters);
|
|
48
|
-
const
|
|
49
|
+
const displayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
50
|
+
const attributeFilterDisplayFormPairsWithIgnoreResolved = resolveWidgetFilterIgnore(widget, attributeFilterDisplayFormPairs, displayAsLabelMap);
|
|
49
51
|
return attributeFilterDisplayFormPairsWithIgnoreResolved.map((item) => item.filter);
|
|
50
52
|
}
|
|
51
|
-
function resolveWidgetFilterIgnore(widget, dashboardNonDateFilterDisplayFormPairs) {
|
|
52
|
-
return dashboardNonDateFilterDisplayFormPairs.filter(({ displayForm }) => {
|
|
53
|
+
function resolveWidgetFilterIgnore(widget, dashboardNonDateFilterDisplayFormPairs, displayAsLabelMap) {
|
|
54
|
+
return dashboardNonDateFilterDisplayFormPairs.filter(({ filter, displayForm }) => {
|
|
53
55
|
const matches = displayForm &&
|
|
54
|
-
widget.ignoreDashboardFilters
|
|
55
|
-
|
|
56
|
-
.
|
|
56
|
+
widget.ignoreDashboardFilters?.filter(isDashboardAttributeFilterReference).some((ignored) => {
|
|
57
|
+
const filterLocalId = filterLocalIdentifier(filter);
|
|
58
|
+
const displayAsLabel = filterLocalId ? displayAsLabelMap.get(filterLocalId) : undefined;
|
|
59
|
+
return (refMatchesMdObject(ignored.displayForm, displayForm, "displayForm") ||
|
|
60
|
+
areObjRefsEqual(ignored.displayForm, displayAsLabel));
|
|
61
|
+
});
|
|
57
62
|
return !matches;
|
|
58
63
|
});
|
|
59
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryWidgetFilters.js","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetFilters.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EACH,eAAe,EACf,YAAY,EAGZ,KAAK,EAGL,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAGhB,cAAc,EACd,MAAM,EACN,mCAAmC,EAKnC,eAAe,EACf,8BAA8B,
|
|
1
|
+
{"version":3,"file":"queryWidgetFilters.js","sourceRoot":"","sources":["../../../src/model/queryServices/queryWidgetFilters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IFilter, IWidgetAlertDefinition, IAttributeDisplayFormMetadataObject, IWidgetDefinition } from "@gooddata/sdk-model";
|
|
1
|
+
import { IFilter, ObjRef, IWidgetAlertDefinition, IAttributeDisplayFormMetadataObject, IWidgetDefinition } from "@gooddata/sdk-model";
|
|
2
2
|
import { IBrokenAlertFilterBasicInfo } from "../types/alertTypes.js";
|
|
3
3
|
import { ObjRefMap } from "../../_staging/metadata/objRefMap.js";
|
|
4
4
|
/**
|
|
@@ -13,5 +13,5 @@ import { ObjRefMap } from "../../_staging/metadata/objRefMap.js";
|
|
|
13
13
|
*
|
|
14
14
|
* @internal
|
|
15
15
|
*/
|
|
16
|
-
export declare function getBrokenAlertFiltersBasicInfo(alert: IWidgetAlertDefinition | undefined, kpi: IWidgetDefinition, appliedFilters: IFilter[], displayFormsMap: ObjRefMap<IAttributeDisplayFormMetadataObject>): IBrokenAlertFilterBasicInfo[];
|
|
16
|
+
export declare function getBrokenAlertFiltersBasicInfo(alert: IWidgetAlertDefinition | undefined, kpi: IWidgetDefinition, appliedFilters: IFilter[], displayFormsMap: ObjRefMap<IAttributeDisplayFormMetadataObject>, displayAsLabelMap: Map<string, ObjRef>): IBrokenAlertFilterBasicInfo[];
|
|
17
17
|
//# sourceMappingURL=alertsUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alertsUtils.d.ts","sourceRoot":"","sources":["../../../src/model/utils/alertsUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EAGH,OAAO,
|
|
1
|
+
{"version":3,"file":"alertsUtils.d.ts","sourceRoot":"","sources":["../../../src/model/utils/alertsUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EAGH,OAAO,EAEP,MAAM,EAMN,sBAAsB,EACtB,mCAAmC,EACnC,iBAAiB,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAGjE;;;;;;;;;;;GAWG;AACH,wBAAgB,8BAA8B,CAC1C,KAAK,EAAE,sBAAsB,GAAG,SAAS,EACzC,GAAG,EAAE,iBAAiB,EACtB,cAAc,EAAE,OAAO,EAAE,EACzB,eAAe,EAAE,SAAS,CAAC,mCAAmC,CAAC,EAC/D,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,2BAA2B,EAAE,CAuE/B"}
|
|
@@ -15,7 +15,7 @@ import { invariant } from "ts-invariant";
|
|
|
15
15
|
*
|
|
16
16
|
* @internal
|
|
17
17
|
*/
|
|
18
|
-
export function getBrokenAlertFiltersBasicInfo(alert, kpi, appliedFilters, displayFormsMap) {
|
|
18
|
+
export function getBrokenAlertFiltersBasicInfo(alert, kpi, appliedFilters, displayFormsMap, displayAsLabelMap) {
|
|
19
19
|
const alertFilters = alert?.filterContext?.filters;
|
|
20
20
|
// no filters -> no filters can be broken, bail early
|
|
21
21
|
if (!alertFilters) {
|
|
@@ -29,7 +29,7 @@ export function getBrokenAlertFiltersBasicInfo(alert, kpi, appliedFilters, displ
|
|
|
29
29
|
const attributeFilterDisplayForm = displayFormsMap.get(alertFilter.attributeFilter.displayForm);
|
|
30
30
|
invariant(attributeFilterDisplayForm, `Alert filter display form not resolved ${alertFilter.attributeFilter.displayForm}`);
|
|
31
31
|
// ignored attribute filters are broken even if they are noop
|
|
32
|
-
const isIgnored = isAttributeFilterIgnored(kpi, attributeFilterDisplayForm.ref);
|
|
32
|
+
const isIgnored = isAttributeFilterIgnored(kpi, attributeFilterDisplayForm.ref, displayAsLabelMap.get(alertFilter.attributeFilter.localIdentifier));
|
|
33
33
|
if (isIgnored) {
|
|
34
34
|
result.push({
|
|
35
35
|
alertFilter,
|
|
@@ -65,8 +65,10 @@ export function getBrokenAlertFiltersBasicInfo(alert, kpi, appliedFilters, displ
|
|
|
65
65
|
}
|
|
66
66
|
return result;
|
|
67
67
|
}
|
|
68
|
-
function isAttributeFilterIgnored(widget, displayForm) {
|
|
69
|
-
return widget.ignoreDashboardFilters.some((filter) => isDashboardAttributeFilterReference(filter) &&
|
|
68
|
+
function isAttributeFilterIgnored(widget, displayForm, displayAsLabel) {
|
|
69
|
+
return widget.ignoreDashboardFilters.some((filter) => isDashboardAttributeFilterReference(filter) &&
|
|
70
|
+
(areObjRefsEqual(filter.displayForm, displayForm) ||
|
|
71
|
+
areObjRefsEqual(filter.displayForm, displayAsLabel)));
|
|
70
72
|
}
|
|
71
73
|
function isDateFilterIrrelevant(widget) {
|
|
72
74
|
const dateDataSetRef = widget.dateDataSet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alertsUtils.js","sourceRoot":"","sources":["../../../src/model/utils/alertsUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EACH,eAAe,EACf,YAAY,EAEZ,iBAAiB,EAIjB,mCAAmC,EACnC,qBAAqB,EACrB,8BAA8B,GAIjC,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,8BAA8B,CAC1C,KAAyC,EACzC,GAAsB,EACtB,cAAyB,EACzB,eAA+D
|
|
1
|
+
{"version":3,"file":"alertsUtils.js","sourceRoot":"","sources":["../../../src/model/utils/alertsUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAttachmentDashboardFilters.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useAttachmentDashboardFilters.ts"],"names":[],"mappings":"AAGA,OAAO,EAMH,iBAAiB,
|
|
1
|
+
{"version":3,"file":"useAttachmentDashboardFilters.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useAttachmentDashboardFilters.ts"],"names":[],"mappings":"AAGA,OAAO,EAMH,iBAAiB,EAUpB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EACH,uBAAuB,EAc1B,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAEH,gBAAgB,EAGnB,MAAM,0BAA0B,CAAC;AAKlC,MAAM,WAAW,qBAAqB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1C,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACvC;AAED,UAAU,qBAAqB;IAC3B;;;;OAIG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC;;OAEG;IACH,oBAAoB,EAAE,qBAAqB,EAAE,CAAC;CACjD;AAED,eAAO,MAAM,6BAA6B;IAItC;;OAEG;;IAEH;;OAEG;;MAEH,qBAiHH,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { areObjRefsEqual, DashboardAttributeFilterConfigModeValues, DashboardDat
|
|
|
4
4
|
import { invariant } from "ts-invariant";
|
|
5
5
|
import isEqual from "lodash/isEqual.js";
|
|
6
6
|
import { useIntl } from "react-intl";
|
|
7
|
-
import { selectAllCatalogAttributesMap, selectAttributeFilterDisplayFormsMap, selectCrossFilteringItems, selectEffectiveAttributeFiltersModeMap, selectEffectiveDateFilterMode, selectEffectiveDateFiltersModeMap, selectFilterContextFilters, selectLocale, selectOriginalFilterContextFilters, selectSettings, useDashboardSelector, } from "../../../../model/index.js";
|
|
7
|
+
import { selectAllCatalogAttributesMap, selectAttributeFilterConfigsDisplayAsLabelMap, selectAttributeFilterDisplayFormsMap, selectCrossFilteringItems, selectEffectiveAttributeFiltersModeMap, selectEffectiveDateFilterMode, selectEffectiveDateFiltersModeMap, selectFilterContextFilters, selectLocale, selectOriginalFilterContextFilters, selectSettings, useDashboardSelector, } from "../../../../model/index.js";
|
|
8
8
|
import { matchDateFilterToDateFilterOptionWithPreference } from "../../../../_staging/dateFilterConfig/dateFilterOptionMapping.js";
|
|
9
9
|
import { defaultDateFilterConfig } from "../../../../_staging/dateFilterConfig/defaultConfig.js";
|
|
10
10
|
import { DateFilterHelpers, getAttributeFilterSubtitle, getLocalizedIcuDateFormatPattern, } from "@gooddata/sdk-ui-filters";
|
|
@@ -28,7 +28,8 @@ export const useAttachmentDashboardFilters = ({ customFilters, widget, }) => {
|
|
|
28
28
|
const originalFilters = useDashboardSelector(selectOriginalFilterContextFilters);
|
|
29
29
|
const areFiltersChanged = !isEqual(filtersWithoutCrossFiltering, originalFilters);
|
|
30
30
|
// remove ignored widget filters
|
|
31
|
-
const
|
|
31
|
+
const displayAsLabelMap = useDashboardSelector(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
32
|
+
const filtersToStore = removeIgnoredWidgetFilters(filtersWithoutCrossFiltering, widget, displayAsLabelMap);
|
|
32
33
|
// additionaly remove hidden filters to get filters suitable for display
|
|
33
34
|
const commonDateFilterMode = useDashboardSelector(selectEffectiveDateFilterMode);
|
|
34
35
|
const dateFiltersModeMap = useDashboardSelector(selectEffectiveDateFiltersModeMap);
|
|
@@ -91,7 +92,7 @@ export const useAttachmentDashboardFilters = ({ customFilters, widget, }) => {
|
|
|
91
92
|
filtersToDisplayInfo,
|
|
92
93
|
};
|
|
93
94
|
};
|
|
94
|
-
const removeIgnoredWidgetFilters = (filters, widget) => {
|
|
95
|
+
const removeIgnoredWidgetFilters = (filters, widget, displayAsLabelMap) => {
|
|
95
96
|
if (!widget) {
|
|
96
97
|
return filters;
|
|
97
98
|
}
|
|
@@ -107,7 +108,11 @@ const removeIgnoredWidgetFilters = (filters, widget) => {
|
|
|
107
108
|
if (isDashboardDateFilter(filter)) {
|
|
108
109
|
return areObjRefsEqual(filter.dateFilter.dataSet, ref);
|
|
109
110
|
}
|
|
110
|
-
|
|
111
|
+
const displayAsLabel = filter.attributeFilter.localIdentifier
|
|
112
|
+
? displayAsLabelMap.get(filter.attributeFilter.localIdentifier)
|
|
113
|
+
: undefined;
|
|
114
|
+
return (areObjRefsEqual(filter.attributeFilter.displayForm, ref) ||
|
|
115
|
+
areObjRefsEqual(displayAsLabel, ref));
|
|
111
116
|
});
|
|
112
117
|
});
|
|
113
118
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAttachmentDashboardFilters.js","sourceRoot":"","sources":["../../../../../src/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useAttachmentDashboardFilters.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EACH,eAAe,EAEf,wCAAwC,EAExC,mCAAmC,EAEnC,yBAAyB,EAEzB,0BAA0B,EAC1B,2BAA2B,EAC3B,qBAAqB,EACrB,8BAA8B,EAC9B,kCAAkC,
|
|
1
|
+
{"version":3,"file":"useAttachmentDashboardFilters.js","sourceRoot":"","sources":["../../../../../src/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useAttachmentDashboardFilters.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { IWidget, ObjRef } from "@gooddata/sdk-model";
|
|
|
3
3
|
interface IAttributeFilterConfigurationItemProps {
|
|
4
4
|
widget: IWidget;
|
|
5
5
|
displayFormRef: ObjRef;
|
|
6
|
+
displayAsLabel?: ObjRef;
|
|
6
7
|
title: string;
|
|
7
8
|
}
|
|
8
9
|
export declare const AttributeFilterConfigurationItem: React.FC<IAttributeFilterConfigurationItemProps>;
|
package/esm/presentation/widget/common/configuration/AttributeFilterConfigurationItem.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeFilterConfigurationItem.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/AttributeFilterConfigurationItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,OAAO,EAIH,OAAO,EACP,MAAM,EAET,MAAM,qBAAqB,CAAC;AAQ7B,UAAU,sCAAsC;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,gCAAgC,EAAE,KAAK,CAAC,EAAE,CAAC,sCAAsC,CA0E7F,CAAC"}
|
|
1
|
+
{"version":3,"file":"AttributeFilterConfigurationItem.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/AttributeFilterConfigurationItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,OAAO,EAIH,OAAO,EACP,MAAM,EAET,MAAM,qBAAqB,CAAC;AAQ7B,UAAU,sCAAsC;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,gCAAgC,EAAE,KAAK,CAAC,EAAE,CAAC,sCAAsC,CA0E7F,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2022 GoodData Corporation
|
|
1
|
+
// (C) 2022-2024 GoodData Corporation
|
|
2
2
|
import React, { useState } from "react";
|
|
3
3
|
import { FormattedMessage } from "react-intl";
|
|
4
4
|
import cx from "classnames";
|
|
@@ -10,14 +10,14 @@ import { useAttributeFilterConfigurationHandling } from "./useAttributeFilterCon
|
|
|
10
10
|
import { useIsFilterNotApplied } from "./useIsFilterNotApplied.js";
|
|
11
11
|
const tooltipAlignPoints = [{ align: "cl cr", offset: { x: -20, y: 0 } }];
|
|
12
12
|
export const AttributeFilterConfigurationItem = (props) => {
|
|
13
|
-
const { widget, displayFormRef, title } = props;
|
|
13
|
+
const { widget, displayFormRef, displayAsLabel, title } = props;
|
|
14
14
|
const dfMap = useDashboardSelector(selectAttributeFilterDisplayFormsMap);
|
|
15
15
|
const [isApplied, setIsApplied] = useState(() => !widget.ignoreDashboardFilters.some((reference) => {
|
|
16
16
|
if (!isDashboardAttributeFilterReference(reference)) {
|
|
17
17
|
return false;
|
|
18
18
|
}
|
|
19
19
|
const df = dfMap.get(reference.displayForm);
|
|
20
|
-
return areObjRefsEqual(df?.ref, displayFormRef);
|
|
20
|
+
return areObjRefsEqual(df?.ref, displayFormRef) || areObjRefsEqual(df?.ref, displayAsLabel);
|
|
21
21
|
}));
|
|
22
22
|
const isFilterNotApplied = useIsFilterNotApplied(widget, displayFormRef);
|
|
23
23
|
const { handleIgnoreChanged, status } = useAttributeFilterConfigurationHandling(widget, displayFormRef, setIsApplied);
|
package/esm/presentation/widget/common/configuration/AttributeFilterConfigurationItem.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeFilterConfigurationItem.js","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/AttributeFilterConfigurationItem.tsx"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"AttributeFilterConfigurationItem.js","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/AttributeFilterConfigurationItem.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterConfiguration.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/FilterConfiguration.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAIH,OAAO,EAEV,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"FilterConfiguration.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/FilterConfiguration.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAIH,OAAO,EAEV,MAAM,qBAAqB,CAAC;AAe7B,UAAU,yBAAyB;IAC/B,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CA8EnE,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import React, { useMemo } from "react";
|
|
3
3
|
import { isAttributeMetadataObject, isDashboardAttributeFilter, isDashboardDateFilterWithDimension, objRefToString, } from "@gooddata/sdk-model";
|
|
4
4
|
import { invariant } from "ts-invariant";
|
|
5
|
-
import { selectAllCatalogAttributesMap, selectAllCatalogDateDatasetsMap, selectAttributeFilterDisplayFormsMap, selectFilterContextFilters, useDashboardSelector, } from "../../../../model/index.js";
|
|
5
|
+
import { selectAllCatalogAttributesMap, selectAllCatalogDateDatasetsMap, selectAttributeFilterConfigsDisplayAsLabelMap, selectAttributeFilterDisplayFormsMap, selectFilterContextFilters, useDashboardSelector, } from "../../../../model/index.js";
|
|
6
6
|
import { AttributeFilterConfigurationItem } from "./AttributeFilterConfigurationItem.js";
|
|
7
7
|
import { DateFilterConfigurationItem } from "./DateFilterConfigurationItem.js";
|
|
8
8
|
import { getAttributeByDisplayForm } from "./utils.js";
|
|
@@ -13,6 +13,7 @@ export const FilterConfiguration = (props) => {
|
|
|
13
13
|
const dfMap = useDashboardSelector(selectAttributeFilterDisplayFormsMap);
|
|
14
14
|
const attrMap = useDashboardSelector(selectAllCatalogAttributesMap);
|
|
15
15
|
const ddsMap = useDashboardSelector(selectAllCatalogDateDatasetsMap);
|
|
16
|
+
const displayAsLabelMap = useDashboardSelector(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
16
17
|
const draggableFilters = useMemo(() => {
|
|
17
18
|
return allFilters.filter((f) => isDashboardAttributeFilter(f) || isDashboardDateFilterWithDimension(f));
|
|
18
19
|
}, [allFilters]);
|
|
@@ -42,7 +43,9 @@ export const FilterConfiguration = (props) => {
|
|
|
42
43
|
const attributeTitle = isAttributeMetadataObject(attribute)
|
|
43
44
|
? attribute.title
|
|
44
45
|
: attribute.attribute.title;
|
|
45
|
-
|
|
46
|
+
const localIdentifier = filter.attributeFilter.localIdentifier;
|
|
47
|
+
const displayAsLabel = displayAsLabelMap.get(localIdentifier);
|
|
48
|
+
return (React.createElement(AttributeFilterConfigurationItem, { key: objRefToString(displayForm.ref), displayFormRef: displayForm.ref, displayAsLabel: displayAsLabel, title: filter.attributeFilter.title ?? attributeTitle, widget: widget }));
|
|
46
49
|
}
|
|
47
50
|
else {
|
|
48
51
|
return (React.createElement(DateFilterConfigurationItem, { key: objRefToString(filter.dateFilter.dataSet), dataSetRef: filter.dateFilter.dataSet, widget: widget }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterConfiguration.js","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/FilterConfiguration.tsx"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACH,yBAAyB,EACzB,0BAA0B,EAC1B,kCAAkC,EAElC,cAAc,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACH,6BAA6B,EAC7B,+BAA+B,EAC/B,oCAAoC,EACpC,0BAA0B,EAC1B,oBAAoB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAMlF,MAAM,CAAC,MAAM,mBAAmB,GAAwC,CAAC,KAAK,EAAE,EAAE;IAC9E,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,MAAM,UAAU,GAAG,oBAAoB,CAAC,0BAA0B,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,oBAAoB,CAAC,oCAAoC,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,oBAAoB,CAAC,6BAA6B,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FilterConfiguration.js","sourceRoot":"","sources":["../../../../../src/presentation/widget/common/configuration/FilterConfiguration.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ export declare function dashboardFilterToFilterContextItem(filter: IDashboardFil
|
|
|
10
10
|
* @param filter - filter to strip date dataset from
|
|
11
11
|
*/
|
|
12
12
|
export declare function stripDateDatasets(filter: FilterContextItem): FilterContextItem;
|
|
13
|
-
export declare function isAttributeFilterIgnored(widget: IWidgetDefinition, displayForm: ObjRef): boolean;
|
|
14
13
|
export declare function isDateFilterIgnored(widget: IWidgetDefinition, displayForm: ObjRef): boolean;
|
|
15
14
|
export declare function isDateFilterIrrelevant(widget: IWidgetDefinition): boolean;
|
|
16
15
|
//# sourceMappingURL=filterUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterUtils.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/widget/kpi/common/filterUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EASH,MAAM,EAEN,iBAAiB,
|
|
1
|
+
{"version":3,"file":"filterUtils.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/widget/kpi/common/filterUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EASH,MAAM,EAEN,iBAAiB,EAKjB,iBAAiB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;GAGG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,CAoD9F;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAS9E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAI3F;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAOzE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
// (C) 2021-
|
|
1
|
+
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { NotSupported } from "@gooddata/sdk-backend-spi";
|
|
3
|
-
import { areObjRefsEqual, filterAttributeElements, filterObjRef, isAbsoluteDateFilter, isAttributeElementsByRef, isAttributeFilter, isNegativeAttributeFilter, isRelativeDateFilter, isDateFilterGranularity,
|
|
3
|
+
import { areObjRefsEqual, filterAttributeElements, filterObjRef, isAbsoluteDateFilter, isAttributeElementsByRef, isAttributeFilter, isNegativeAttributeFilter, isRelativeDateFilter, isDateFilterGranularity, isDashboardDateFilter, isDashboardDateFilterReference, } from "@gooddata/sdk-model";
|
|
4
4
|
/**
|
|
5
5
|
* Converts a {@link IDashboardFilter} to a {@link FilterContextItem}.
|
|
6
6
|
* @param filter - filter to convert
|
|
@@ -65,9 +65,6 @@ export function stripDateDatasets(filter) {
|
|
|
65
65
|
dateFilter: rest,
|
|
66
66
|
};
|
|
67
67
|
}
|
|
68
|
-
export function isAttributeFilterIgnored(widget, displayForm) {
|
|
69
|
-
return widget.ignoreDashboardFilters.some((filter) => isDashboardAttributeFilterReference(filter) && areObjRefsEqual(filter.displayForm, displayForm));
|
|
70
|
-
}
|
|
71
68
|
export function isDateFilterIgnored(widget, displayForm) {
|
|
72
69
|
return widget.ignoreDashboardFilters.some((filter) => isDashboardDateFilterReference(filter) && areObjRefsEqual(filter.dataSet, displayForm));
|
|
73
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterUtils.js","sourceRoot":"","sources":["../../../../../src/presentation/widget/kpi/common/filterUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACH,eAAe,EACf,uBAAuB,EACvB,YAAY,EACZ,oBAAoB,EACpB,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,EAEpB,uBAAuB,EAIvB,
|
|
1
|
+
{"version":3,"file":"filterUtils.js","sourceRoot":"","sources":["../../../../../src/presentation/widget/kpi/common/filterUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-ui-dashboard",
|
|
3
|
-
"version": "10.10.0-alpha.
|
|
3
|
+
"version": "10.10.0-alpha.9",
|
|
4
4
|
"description": "GoodData SDK - Dashboard Component",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -56,17 +56,17 @@
|
|
|
56
56
|
"ts-invariant": "^0.7.5",
|
|
57
57
|
"tslib": "^2.5.0",
|
|
58
58
|
"uuid": "^8.3.2",
|
|
59
|
-
"@gooddata/sdk-backend-
|
|
60
|
-
"@gooddata/sdk-backend-
|
|
61
|
-
"@gooddata/sdk-
|
|
62
|
-
"@gooddata/sdk-
|
|
63
|
-
"@gooddata/sdk-ui-
|
|
64
|
-
"@gooddata/sdk-ui-
|
|
65
|
-
"@gooddata/sdk-ui-geo": "10.10.0-alpha.
|
|
66
|
-
"@gooddata/sdk-ui-
|
|
67
|
-
"@gooddata/sdk-ui-
|
|
68
|
-
"@gooddata/
|
|
69
|
-
"@gooddata/
|
|
59
|
+
"@gooddata/sdk-backend-spi": "10.10.0-alpha.9",
|
|
60
|
+
"@gooddata/sdk-backend-base": "10.10.0-alpha.9",
|
|
61
|
+
"@gooddata/sdk-ui": "10.10.0-alpha.9",
|
|
62
|
+
"@gooddata/sdk-model": "10.10.0-alpha.9",
|
|
63
|
+
"@gooddata/sdk-ui-filters": "10.10.0-alpha.9",
|
|
64
|
+
"@gooddata/sdk-ui-ext": "10.10.0-alpha.9",
|
|
65
|
+
"@gooddata/sdk-ui-geo": "10.10.0-alpha.9",
|
|
66
|
+
"@gooddata/sdk-ui-theme-provider": "10.10.0-alpha.9",
|
|
67
|
+
"@gooddata/sdk-ui-kit": "10.10.0-alpha.9",
|
|
68
|
+
"@gooddata/sdk-ui-vis-commons": "10.10.0-alpha.9",
|
|
69
|
+
"@gooddata/util": "10.10.0-alpha.9"
|
|
70
70
|
},
|
|
71
71
|
"peerDependencies": {
|
|
72
72
|
"react": "^16.10.0 || ^17.0.0 || ^18.0.0",
|
|
@@ -119,9 +119,9 @@
|
|
|
119
119
|
"typescript": "5.3.3",
|
|
120
120
|
"vitest": "1.0.4",
|
|
121
121
|
"vitest-dom": "0.1.1",
|
|
122
|
-
"@gooddata/i18n-toolkit": "10.10.0-alpha.
|
|
123
|
-
"@gooddata/reference-workspace": "10.10.0-alpha.
|
|
124
|
-
"@gooddata/sdk-backend-mockingbird": "10.10.0-alpha.
|
|
122
|
+
"@gooddata/i18n-toolkit": "10.10.0-alpha.9",
|
|
123
|
+
"@gooddata/reference-workspace": "10.10.0-alpha.9",
|
|
124
|
+
"@gooddata/sdk-backend-mockingbird": "10.10.0-alpha.9"
|
|
125
125
|
},
|
|
126
126
|
"scripts": {
|
|
127
127
|
"clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",
|