@gooddata/sdk-ui-dashboard 10.7.0-alpha.17 → 10.7.0-alpha.18

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.
Files changed (44) hide show
  1. package/esm/__version.d.ts +1 -1
  2. package/esm/__version.js +1 -1
  3. package/esm/model/commandHandlers/dashboard/common/stateInitializers.d.ts.map +1 -1
  4. package/esm/model/commandHandlers/dashboard/common/stateInitializers.js +11 -1
  5. package/esm/model/commandHandlers/dashboard/common/stateInitializers.js.map +1 -1
  6. package/esm/model/commandHandlers/drill/common/intersectionUtils.d.ts +3 -4
  7. package/esm/model/commandHandlers/drill/common/intersectionUtils.d.ts.map +1 -1
  8. package/esm/model/commandHandlers/drill/common/intersectionUtils.js +18 -19
  9. package/esm/model/commandHandlers/drill/common/intersectionUtils.js.map +1 -1
  10. package/esm/model/commandHandlers/drill/crossFilteringHandler.d.ts.map +1 -1
  11. package/esm/model/commandHandlers/drill/crossFilteringHandler.js +2 -4
  12. package/esm/model/commandHandlers/drill/crossFilteringHandler.js.map +1 -1
  13. package/esm/model/commandHandlers/drill/drillToDashboardHandler.d.ts.map +1 -1
  14. package/esm/model/commandHandlers/drill/drillToDashboardHandler.js +64 -10
  15. package/esm/model/commandHandlers/drill/drillToDashboardHandler.js.map +1 -1
  16. package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.d.ts.map +1 -1
  17. package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js +94 -18
  18. package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js.map +1 -1
  19. package/esm/model/commands/dashboard.d.ts +1 -1
  20. package/esm/model/commands/dashboard.d.ts.map +1 -1
  21. package/esm/model/commands/filters.d.ts +32 -1
  22. package/esm/model/commands/filters.d.ts.map +1 -1
  23. package/esm/model/commands/filters.js +27 -0
  24. package/esm/model/commands/filters.js.map +1 -1
  25. package/esm/model/commands/index.d.ts +1 -1
  26. package/esm/model/commands/index.d.ts.map +1 -1
  27. package/esm/model/commands/index.js +1 -1
  28. package/esm/model/commands/index.js.map +1 -1
  29. package/esm/model/events/drill.d.ts +6 -2
  30. package/esm/model/events/drill.d.ts.map +1 -1
  31. package/esm/model/events/drill.js +2 -1
  32. package/esm/model/events/drill.js.map +1 -1
  33. package/esm/model/events/filters.d.ts +2 -2
  34. package/esm/model/events/filters.d.ts.map +1 -1
  35. package/esm/model/events/filters.js.map +1 -1
  36. package/esm/model/store/dashboardStore.d.ts.map +1 -1
  37. package/esm/model/store/dashboardStore.js +4 -1
  38. package/esm/model/store/dashboardStore.js.map +1 -1
  39. package/esm/model/utils/filterResolver.d.ts +2 -2
  40. package/esm/model/utils/filterResolver.d.ts.map +1 -1
  41. package/esm/model/utils/filterResolver.js +2 -2
  42. package/esm/model/utils/filterResolver.js.map +1 -1
  43. package/esm/sdk-ui-dashboard.d.ts +38 -1
  44. package/package.json +15 -15
package/esm/__version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const LIB_VERSION = "10.7.0-alpha.17";
1
+ export declare const LIB_VERSION = "10.7.0-alpha.18";
2
2
  //# sourceMappingURL=__version.d.ts.map
package/esm/__version.js CHANGED
@@ -1,4 +1,4 @@
1
1
  // (C) 2021 GoodData Corporation
2
2
  // DO NOT CHANGE THIS FILE, IT IS RE-GENERATED ON EVERY BUILD
3
- export const LIB_VERSION = "10.7.0-alpha.17";
3
+ export const LIB_VERSION = "10.7.0-alpha.18";
4
4
  //# sourceMappingURL=__version.js.map
package/esm/model/commandHandlers/dashboard/common/stateInitializers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stateInitializers.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/stateInitializers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEH,QAAQ,EACR,iBAAiB,EAGjB,mCAAmC,EACnC,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,mBAAmB,EAGtB,MAAM,qBAAqB,CAAC;AAe7B,OAAO,EAAE,gBAAgB,EAA2B,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AAUvE,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,OAAO,CAG1D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC3C,gBAAgB,EAAE,iBAAiB,GACpC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAY3B;AAqDD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAiB,oCAAoC,CACjD,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,QAAQ,EAAE,EACpB,QAAQ,EAAE,SAAS,EACnB,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EAAE,EACnC,YAAY,CAAC,EAAE,SAAS,CAAC,mCAAmC,CAAC,EAC7D,kBAAkB,CAAC,EAAE,UAAU,GAChC,YAAY,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAiEzC"}
1
+ {"version":3,"file":"stateInitializers.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/stateInitializers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEH,QAAQ,EACR,iBAAiB,EAGjB,mCAAmC,EACnC,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,mBAAmB,EAGtB,MAAM,qBAAqB,CAAC;AAe7B,OAAO,EAAE,gBAAgB,EAA2B,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AAUvE,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,OAAO,CAG1D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC3C,gBAAgB,EAAE,iBAAiB,GACpC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAY3B;AAgED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAiB,oCAAoC,CACjD,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,QAAQ,EAAE,EACpB,QAAQ,EAAE,SAAS,EACnB,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EAAE,EACnC,YAAY,CAAC,EAAE,SAAS,CAAC,mCAAmC,CAAC,EAC7D,kBAAkB,CAAC,EAAE,UAAU,GAChC,YAAY,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAoEzC"}
package/esm/model/commandHandlers/dashboard/common/stateInitializers.js CHANGED
@@ -66,6 +66,14 @@ function* sanitizeFilterContext(ctx, filterContext, dateDataSets = []) {
66
66
  return keepOnlyFiltersWithValidRef(filter, availableRefs, dateDataSets);
67
67
  }), filterContext);
68
68
  }
69
+ function getDisplayAsLabels(dashboard) {
70
+ return (dashboard.attributeFilterConfigs?.reduce((labels, config) => {
71
+ if (typeof config.displayAsLabel !== "undefined") {
72
+ labels.push(config.displayAsLabel);
73
+ }
74
+ return labels;
75
+ }, []) ?? []);
76
+ }
69
77
  /**
70
78
  * Returns a list of actions which when processed will initialize filter context, layout and meta parts
71
79
  * of the state for an existing dashboard.
@@ -101,7 +109,9 @@ export function* actionsToInitializeExistingDashboard(ctx, dashboard, insights,
101
109
  const modifiedWidgets = privateCtx?.widgetsOverlayFn?.(customizedDashboard) ?? {};
102
110
  const filterContextDefinition = dashboardFilterContextDefinition(customizedDashboard, dateFilterConfig);
103
111
  const filterContextIdentity = dashboardFilterContextIdentity(customizedDashboard);
104
- const attributeFilterDisplayForms = yield call(resolveFilterDisplayForms, ctx, filterContextDefinition.filters, displayForms);
112
+ const displayAsLabels = getDisplayAsLabels(dashboard);
113
+ // load DFs for both filter refs and displayAsLabels
114
+ const attributeFilterDisplayForms = yield call(resolveFilterDisplayForms, ctx, filterContextDefinition.filters, displayAsLabels, displayForms);
105
115
  /*
106
116
  * NOTE: cannot do without the cast here. The layout in IDashboard is parameterized with IDashboardWidget
107
117
  * which also includes KPI and Insight widget definitions = those without identity. That is however
package/esm/model/commandHandlers/dashboard/common/stateInitializers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stateInitializers.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/stateInitializers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAExC,OAAO,EACH,eAAe,EAIf,0BAA0B,EAO1B,kCAAkC,GAErC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,wDAAwD,CAAC;AACpG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EACH,gCAAgC,EAChC,8BAA8B,GACjC,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAI7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,MAAM,CAAC,MAAM,oBAAoB,GAA8B;IAC3D,IAAI,EAAE,kBAAkB;IACxB,QAAQ,EAAE,EAAE;CACf,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,+BAA+B,CAC3C,gBAAmC;IAEnC,OAAO;QACH,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,oBAAoB,CAAC,gBAAgB,CAAC;YAClC,uBAAuB,EAAE,0BAA0B,CAAC,gBAAgB,CAAC;YACrE,2BAA2B,EAAE,EAAE;SAClC,CAAC;QACF,aAAa,CAAC,SAAS,CAAC,oBAAoB,CAAC;QAC7C,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,YAAY,CAAC,mBAAmB,EAAE;KACrC,CAAC;AACN,CAAC;AAED,MAAM,2BAA2B,GAAG,CAChC,MAAyB,EACzB,eAAyB,EACzB,qBAA4C,EAC9C,EAAE;IACA,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,IAAI,kCAAkC,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7C,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAC9C,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,OAAQ,CAAC,CACvE,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,CAAC,oCAAoC;IACrD,CAAC;IAED,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AACnG,CAAC,CAAC;AAEF,QAAQ,CAAC,CAAC,qBAAqB,CAC3B,GAAqB,EACrB,aAA0C,EAC1C,eAAsC,EAAE;IAExC,wFAAwF;IACxF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,2BAA2B,EAAE,CAAC;QACxD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,MAAM,sBAAsB,GAAG,aAAa,CAAC,OAAO;SAC/C,MAAM,CAAC,0BAA0B,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAE/C,MAAM,aAAa,GAA6D,MAAM,IAAI,CACtF,4BAA4B,EAC5B,GAAG,EACH,sBAAsB,CACzB,CAAC;IAEF,OAAO,MAAM,CACT,SAAS,EACT,CAAC,OAA4B,EAAE,EAAE,CAC7B,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QACtB,OAAO,2BAA2B,CAAC,MAAM,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;IAC5E,CAAC,CAAC,EACN,aAAa,CAChB,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,SAAS,CAAC,CAAC,oCAAoC,CACjD,GAAqB,EACrB,SAAqB,EACrB,QAAoB,EACpB,QAAmB,EACnB,gBAAmC,EACnC,YAAmC,EACnC,YAA6D,EAC7D,kBAA+B;IAE/B,MAAM,sBAAsB,GAAG,MAAM,IAAI,CACrC,qBAAqB,EACrB,GAAG,EACH,SAAS,CAAC,aAAa,EACvB,YAAY,CACf,CAAC;IAEF,MAAM,kBAAkB,GAAwC;QAC5D,GAAG,SAAS;QACZ,MAAM,EAAG,SAAS,CAAC,MAAoC,IAAI,oBAAoB;QAC/E,aAAa,EAAE,sBAAsB;KACxC,CAAC;IAEF,MAAM,UAAU,GAA4B,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC1E,MAAM,mBAAmB,GACrB,UAAU,EAAE,4BAA4B,EAAE,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,CAAC;IACzF,MAAM,eAAe,GAAG,UAAU,EAAE,gBAAgB,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAElF,MAAM,uBAAuB,GAAG,gCAAgC,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC;IACxG,MAAM,qBAAqB,GAAG,8BAA8B,CAAC,mBAAmB,CAAC,CAAC;IAClF,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAC1C,yBAAyB,EACzB,GAAG,EACH,uBAAuB,CAAC,OAAO,EAC/B,YAAY,CACf,CAAC;IAEF;;;;;;OAMG;IACH,MAAM,eAAe,GAAG,uBAAuB,CAC3C,mBAAmB,CAAC,MAAM,IAAI,oBAAoB,EAClD,QAAQ,EACR,QAAQ,CACX,CAAC;IAEF,OAAO;QACH,oBAAoB,CAAC,gBAAgB,CAAC;YAClC,+BAA+B,EAAE,uBAAuB;YACxD,uBAAuB;YACvB,qBAAqB;YACrB,2BAA2B;SAC9B,CAAC;QACF,aAAa,CAAC,SAAS,CAAC,eAAe,CAAC;QACxC,WAAW,CAAC,OAAO,CAAC;YAChB,SAAS,EAAE,kBAAkB,IAAI,SAAS;SAC7C,CAAC;QACF,6BAA6B,CAAC,yBAAyB,CAAC;YACpD,sBAAsB,EAAE,SAAS,CAAC,sBAAsB;SAC3D,CAAC;QACF,uBAAuB,CAAC,sBAAsB,CAAC,SAAS,CAAC,gBAAiB,CAAC;QAC3E,wBAAwB,CAAC,oBAAoB,CAAC;YAC1C,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;SACjD,CAAC;QACF,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC;QACrC,WAAW,CAAC,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,6EAA6E;QAC7H,SAAS,CAAC,oBAAoB,EAAE;QAChC,SAAS,CAAC,iBAAiB,CAAC,eAAe,CAAC;QAC5C,YAAY,CAAC,mBAAmB,EAAE;KACrC,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"stateInitializers.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/stateInitializers.ts"],"names":[],"mappings":"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"}
package/esm/model/commandHandlers/drill/common/intersectionUtils.d.ts CHANGED
@@ -1,9 +1,8 @@
1
1
  import { IDrillEventIntersectionElement } from "@gooddata/sdk-ui";
2
- import { ObjRef, IAttributeFilter } from "@gooddata/sdk-model";
3
- interface IConversionResult {
4
- attributeFilter: IAttributeFilter;
2
+ import { ObjRef, IDashboardAttributeFilter } from "@gooddata/sdk-model";
3
+ export interface IConversionResult {
4
+ attributeFilter: IDashboardAttributeFilter;
5
5
  primaryLabel?: ObjRef;
6
6
  }
7
7
  export declare function convertIntersectionToAttributeFilters(intersection: IDrillEventIntersectionElement[], dateDataSetsAttributesRefs: ObjRef[], backendSupportsElementUris: boolean, enableDuplicatedLabelValuesInAttributeFilter: boolean): IConversionResult[];
8
- export {};
9
8
  //# sourceMappingURL=intersectionUtils.d.ts.map
package/esm/model/commandHandlers/drill/common/intersectionUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"intersectionUtils.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,8BAA8B,EAGjC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAmB,MAAM,EAAE,gBAAgB,EAA8B,MAAM,qBAAqB,CAAC;AAiB5G,UAAU,iBAAiB;IACvB,eAAe,EAAE,gBAAgB,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,qCAAqC,CACjD,YAAY,EAAE,8BAA8B,EAAE,EAC9C,0BAA0B,EAAE,MAAM,EAAE,EACpC,0BAA0B,EAAE,OAAO,EACnC,4CAA4C,EAAE,OAAO,GACtD,iBAAiB,EAAE,CA0BrB"}
1
+ {"version":3,"file":"intersectionUtils.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,8BAA8B,EAGjC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAmB,MAAM,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAiBzF,MAAM,WAAW,iBAAiB;IAC9B,eAAe,EAAE,yBAAyB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,qCAAqC,CACjD,YAAY,EAAE,8BAA8B,EAAE,EAC9C,0BAA0B,EAAE,MAAM,EAAE,EACpC,0BAA0B,EAAE,OAAO,EACnC,4CAA4C,EAAE,OAAO,GACtD,iBAAiB,EAAE,CA0BrB"}
package/esm/model/commandHandlers/drill/common/intersectionUtils.js CHANGED
@@ -1,6 +1,7 @@
1
1
  // (C) 2023-2024 GoodData Corporation
2
+ import { v4 as uuid } from "uuid";
2
3
  import { isDrillIntersectionAttributeItem, } from "@gooddata/sdk-ui";
3
- import { areObjRefsEqual, newPositiveAttributeFilter } from "@gooddata/sdk-model";
4
+ import { areObjRefsEqual } from "@gooddata/sdk-model";
4
5
  /**
5
6
  * For correct drill intersection that should be converted into AttributeFilters must be drill intersection:
6
7
  * 1. AttributeItem
@@ -18,24 +19,22 @@ export function convertIntersectionToAttributeFilters(intersection, dateDataSets
18
19
  .filter(isDrillIntersectionAttributeItem)
19
20
  .reduce((result, h) => {
20
21
  const ref = h.attributeHeader.ref;
21
- if (backendSupportsElementUris || enableDuplicatedLabelValuesInAttributeFilter) {
22
- result.push({
23
- attributeFilter: newPositiveAttributeFilter(ref, {
24
- uris: [h.attributeHeaderItem.uri],
25
- }),
26
- primaryLabel: h.attributeHeader.primaryLabel,
27
- });
28
- }
29
- else {
30
- result.push({
31
- attributeFilter: newPositiveAttributeFilter(ref, {
32
- uris: [h.attributeHeaderItem.name],
33
- }),
34
- ...(enableDuplicatedLabelValuesInAttributeFilter
35
- ? { primaryLabel: h.attributeHeader.primaryLabel }
36
- : {}),
37
- });
38
- }
22
+ const elementValue = backendSupportsElementUris || enableDuplicatedLabelValuesInAttributeFilter
23
+ ? h.attributeHeaderItem.uri
24
+ : h.attributeHeaderItem.name;
25
+ result.push({
26
+ attributeFilter: {
27
+ attributeFilter: {
28
+ attributeElements: { uris: [elementValue] },
29
+ displayForm: ref,
30
+ negativeSelection: false,
31
+ localIdentifier: uuid(),
32
+ },
33
+ },
34
+ ...(enableDuplicatedLabelValuesInAttributeFilter
35
+ ? { primaryLabel: h.attributeHeader.primaryLabel }
36
+ : {}),
37
+ });
39
38
  return result;
40
39
  }, []);
41
40
  }
package/esm/model/commandHandlers/drill/common/intersectionUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"intersectionUtils.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAIH,gCAAgC,GACnC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAA4B,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAE5G;;;;GAIG;AACH,SAAS,kBAAkB,CACvB,YAAiD,EACjD,0BAAoC;IAEpC,MAAM,aAAa,GAAG,gCAAgC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,MAAM,GAAG,GAAG,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC;IAExD,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACpG,CAAC;AAOD,MAAM,UAAU,qCAAqC,CACjD,YAA8C,EAC9C,0BAAoC,EACpC,0BAAmC,EACnC,4CAAqD;IAErD,OAAO,YAAY;SACd,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACpB,MAAM,CAAC,CAAC,CAAsC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,0BAA0B,CAAC,CAAC;SACrG,MAAM,CAAC,gCAAgC,CAAC;SACxC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAkC,EAAE,EAAE;QACnD,MAAM,GAAG,GAAG,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC;QAClC,IAAI,0BAA0B,IAAI,4CAA4C,EAAE,CAAC;YAC7E,MAAM,CAAC,IAAI,CAAC;gBACR,eAAe,EAAE,0BAA0B,CAAC,GAAG,EAAE;oBAC7C,IAAI,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC;iBACpC,CAAC;gBACF,YAAY,EAAE,CAAC,CAAC,eAAe,CAAC,YAAY;aAC/C,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC;gBACR,eAAe,EAAE,0BAA0B,CAAC,GAAG,EAAE;oBAC7C,IAAI,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC;iBACrC,CAAC;gBACF,GAAG,CAAC,4CAA4C;oBAC5C,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,eAAe,CAAC,YAAY,EAAE;oBAClD,CAAC,CAAC,EAAE,CAAC;aACZ,CAAC,CAAC;QACP,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,EAAyB,CAAC,CAAC;AACtC,CAAC"}
1
+ {"version":3,"file":"intersectionUtils.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAIH,gCAAgC,GACnC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAqC,MAAM,qBAAqB,CAAC;AAEzF;;;;GAIG;AACH,SAAS,kBAAkB,CACvB,YAAiD,EACjD,0BAAoC;IAEpC,MAAM,aAAa,GAAG,gCAAgC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,MAAM,GAAG,GAAG,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC;IAExD,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACpG,CAAC;AAOD,MAAM,UAAU,qCAAqC,CACjD,YAA8C,EAC9C,0BAAoC,EACpC,0BAAmC,EACnC,4CAAqD;IAErD,OAAO,YAAY;SACd,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACpB,MAAM,CAAC,CAAC,CAAsC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,0BAA0B,CAAC,CAAC;SACrG,MAAM,CAAC,gCAAgC,CAAC;SACxC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAkC,EAAE,EAAE;QACnD,MAAM,GAAG,GAAG,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC;QAClC,MAAM,YAAY,GACd,0BAA0B,IAAI,4CAA4C;YACtE,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG;YAC3B,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC;YACR,eAAe,EAAE;gBACb,eAAe,EAAE;oBACb,iBAAiB,EAAE,EAAE,IAAI,EAAE,CAAC,YAAY,CAAC,EAAE;oBAC3C,WAAW,EAAE,GAAG;oBAChB,iBAAiB,EAAE,KAAK;oBACxB,eAAe,EAAE,IAAI,EAAE;iBAC1B;aACJ;YACD,GAAG,CAAC,4CAA4C;gBAC5C,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,eAAe,CAAC,YAAY,EAAE;gBAClD,CAAC,CAAC,EAAE,CAAC;SACZ,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,EAAyB,CAAC,CAAC;AACtC,CAAC"}
package/esm/model/commandHandlers/drill/crossFilteringHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crossFilteringHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,yBAAyB,EAM5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAQ9D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAezD,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,cAAc;;;mSAqIhF"}
1
+ {"version":3,"file":"crossFilteringHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAA+C,MAAM,qBAAqB,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAQ9D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAezD,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,cAAc;;;mSAoIhF"}
package/esm/model/commandHandlers/drill/crossFilteringHandler.js CHANGED
@@ -1,6 +1,6 @@
1
1
  // (C) 2023-2024 GoodData Corporation
2
2
  import { all, put, call, select } from "redux-saga/effects";
3
- import { areObjRefsEqual, filterAttributeElements, filterObjRef, isDashboardAttributeFilter, isNegativeAttributeFilter, } from "@gooddata/sdk-model";
3
+ import { areObjRefsEqual, isDashboardAttributeFilter } from "@gooddata/sdk-model";
4
4
  import { selectFilterContextDraggableFilters } from "../../store/filterContext/filterContextSelectors.js";
5
5
  import { convertIntersectionToAttributeFilters } from "./common/intersectionUtils.js";
6
6
  import { addAttributeFilter, changeAttributeFilterSelection, removeAttributeFilters, } from "../../commands/filters.js";
@@ -38,9 +38,7 @@ export function* crossFilteringHandler(ctx, cmd) {
38
38
  */
39
39
  crossFilteringItemByWidget?.filterLocalIdentifiers.length <= drillIntersectionFilters.length;
40
40
  const virtualFilters = drillIntersectionFilters.map(({ attributeFilter }) => {
41
- const displayForm = filterObjRef(attributeFilter);
42
- const attributeElements = filterAttributeElements(attributeFilter);
43
- const negativeSelection = isNegativeAttributeFilter(attributeFilter);
41
+ const { displayForm, attributeElements, negativeSelection } = attributeFilter.attributeFilter;
44
42
  const existingVirtualFilter = shouldUpdateExistingCrossFiltering
45
43
  ? currentVirtualFilters.find((vf) => {
46
44
  return areObjRefsEqual(vf.attributeFilter.displayForm, displayForm);
package/esm/model/commandHandlers/drill/crossFilteringHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crossFilteringHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crossFilteringHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"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"}
package/esm/model/commandHandlers/drill/drillToDashboardHandler.d.ts.map 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;AAK1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,iCAAiC,EAGpC,MAAM,uBAAuB,CAAC;AAuC/B,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,iCAAiC,CAAC,CAgFjD"}
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;AA0C/B,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,iCAAiC,CAAC,CAiGjD"}
package/esm/model/commandHandlers/drill/drillToDashboardHandler.js CHANGED
@@ -1,6 +1,8 @@
1
+ import { v4 as uuid } from "uuid";
1
2
  import { call, put, select } from "redux-saga/effects";
2
3
  import compact from "lodash/compact.js";
3
4
  import isEmpty from "lodash/isEmpty.js";
5
+ import isEqual from "lodash/isEqual.js";
4
6
  import { invariant } from "ts-invariant";
5
7
  import { drillToDashboardRequested, drillToDashboardResolved, } from "../../events/drill.js";
6
8
  import { selectFilterContextAttributeFilters, selectFilterContextDateFilter, selectFilterContextDraggableFilters, } from "../../store/filterContext/filterContextSelectors.js";
@@ -12,6 +14,7 @@ import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
12
14
  import { convertIntersectionToAttributeFilters } from "./common/intersectionUtils.js";
13
15
  import { selectSupportsMultipleDateFilters } from "../../store/backendCapabilities/backendCapabilitiesSelectors.js";
14
16
  import { selectEnableDuplicatedLabelValuesInAttributeFilter, selectEnableMultipleDateFilters, } from "../../store/config/configSelectors.js";
17
+ import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
15
18
  export function* drillToDashboardHandler(ctx, cmd) {
16
19
  // put start event
17
20
  yield put(drillToDashboardRequested(ctx, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId));
@@ -33,7 +36,7 @@ export function* drillToDashboardHandler(ctx, cmd) {
33
36
  const allOtherFilters = yield select(selectAllOtherFilters);
34
37
  const allAttributeFilters = yield select(selectAllAttributeFilters);
35
38
  const widgetAwareFilters = !isDrillingToSelf
36
- ? yield call(getWidgetAwareFilters, ctx, widget, includeOtherDateFilters)
39
+ ? yield call(getWidgetAwareDashboardFilters, ctx, widget, includeOtherDateFilters)
37
40
  : [];
38
41
  const dashboardFilters = isDrillingToSelf
39
42
  ? // if drilling to self, just take all filters
@@ -45,14 +48,59 @@ export function* drillToDashboardHandler(ctx, cmd) {
45
48
  const dateAttributes = yield select(selectCatalogDateAttributes);
46
49
  const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
47
50
  const drillIntersectionFilters = convertIntersectionToAttributeFilters(cmd.payload.drillEvent.drillContext.intersection, dateAttributes.map((dA) => dA.attribute.ref), ctx.backend.capabilities.supportsElementUris ?? true, enableDuplicatedLabelValuesInAttributeFilter);
51
+ const [transformedFilters, attributeFilterConfigsFromTransformation] = transformToPrimaryLabelFilters(drillIntersectionFilters);
52
+ const attributeFilterConfigs = enableDuplicatedLabelValuesInAttributeFilter ? attributeFilterConfigsFromTransformation : [];
53
+ const intersectionFilters = enableDuplicatedLabelValuesInAttributeFilter
54
+ ? transformedFilters
55
+ : drillIntersectionFilters.map((f) => f.attributeFilter);
56
+ const attributeFilterDisplayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
57
+ if (enableDuplicatedLabelValuesInAttributeFilter) {
58
+ const dashboardFilterConfigs = getDashboardFilterConfigs(dashboardFilters, attributeFilterDisplayAsLabelMap);
59
+ attributeFilterConfigs.push(...dashboardFilterConfigs);
60
+ }
48
61
  // concat everything, order is important – drill filters must go first
49
- const resultingFilters = compact([
50
- commonDateFilter,
51
- ...drillIntersectionFilters.map((f) => f.attributeFilter),
52
- ...dashboardFilters,
53
- ]);
62
+ const resultingFilters = compact([commonDateFilter, ...intersectionFilters, ...dashboardFilters]);
54
63
  // put end event
55
- return drillToDashboardResolved(ctx, resultingFilters, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId);
64
+ return drillToDashboardResolved(ctx, resultingFilters, attributeFilterConfigs, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId);
65
+ }
66
+ function getDashboardFilterConfigs(dashboardFilters, attributeFilterDisplayAsLabelMap) {
67
+ return dashboardFilters.reduce((result, filter) => {
68
+ if (isDashboardAttributeFilter(filter)) {
69
+ const localIdentifier = filter.attributeFilter.localIdentifier;
70
+ const displayAsLabel = localIdentifier
71
+ ? attributeFilterDisplayAsLabelMap.get(localIdentifier)
72
+ : undefined;
73
+ if (displayAsLabel && localIdentifier) {
74
+ result.push({
75
+ localIdentifier,
76
+ displayAsLabel,
77
+ });
78
+ }
79
+ }
80
+ return result;
81
+ }, []);
82
+ }
83
+ function transformToPrimaryLabelFilters(drillIntersectionFilters) {
84
+ const attributeFilterConfigs = [];
85
+ const transformedFilters = drillIntersectionFilters.map((f) => {
86
+ if (f.primaryLabel &&
87
+ !areObjRefsEqual(f.primaryLabel, f.attributeFilter.attributeFilter.displayForm)) {
88
+ const localIdentifier = f.attributeFilter.attributeFilter.localIdentifier ?? uuid();
89
+ attributeFilterConfigs.push({
90
+ localIdentifier,
91
+ displayAsLabel: f.attributeFilter.attributeFilter.displayForm,
92
+ });
93
+ return {
94
+ attributeFilter: {
95
+ ...f.attributeFilter.attributeFilter,
96
+ localIdentifier, // in case uuid was generated
97
+ displayForm: f.primaryLabel,
98
+ },
99
+ };
100
+ }
101
+ return f.attributeFilter;
102
+ });
103
+ return [transformedFilters, attributeFilterConfigs];
56
104
  }
57
105
  // result needs to be IDashboardDateFilter to allow optional dateDataSet
58
106
  function selectDrillingDateFilter(state) {
@@ -70,10 +118,16 @@ function convertFilterItemsToFilters(filter, widget) {
70
118
  ? dashboardAttributeFilterToAttributeFilter(filter)
71
119
  : dashboardDateFilterToDateFilterByWidget(filter, widget);
72
120
  }
73
- function* getWidgetAwareFilters(ctx, widget, includeOtherDateFilters) {
121
+ function* getWidgetAwareDashboardFilters(ctx, widget, includeOtherDateFilters) {
74
122
  const filterContextItems = yield select(includeOtherDateFilters ? selectFilterContextDraggableFilters : selectFilterContextAttributeFilters);
75
- const filters = filterContextItems.map((filter) => convertFilterItemsToFilters(filter, widget));
76
- return yield call(getResolvedFiltersForWidget, ctx, widget, filters);
123
+ const filtersPairs = filterContextItems.map((filter) => ({
124
+ filter: convertFilterItemsToFilters(filter, widget),
125
+ originalFilter: filter,
126
+ }));
127
+ const widgetFilters = yield call(getResolvedFiltersForWidget, ctx, widget, filtersPairs.map((pair) => pair.filter));
128
+ return filtersPairs
129
+ .filter((pair) => widgetFilters.some((wf) => isEqual(wf, pair.filter)))
130
+ .map((pair) => pair.originalFilter);
77
131
  }
78
132
  function isDateFilterDisabled(insight) {
79
133
  const measures = insightMeasures(insight);
package/esm/model/commandHandlers/drill/drillToDashboardHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"drillToDashboardHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"drillToDashboardHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"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"}
package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"changeFilterContextSelectionHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAmFvE,wBAAiB,mCAAmC,CAChD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,4BAA4B,GAClC,YAAY,CAAC,IAAI,CAAC,CA+CpB"}
1
+ {"version":3,"file":"changeFilterContextSelectionHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AA0FvE,wBAAiB,mCAAmC,CAChD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,4BAA4B,GAClC,YAAY,CAAC,IAAI,CAAC,CAmEpB"}
package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js CHANGED
@@ -1,16 +1,19 @@
1
1
  // (C) 2021-2024 GoodData Corporation
2
2
  import { all, call, put, select } from "redux-saga/effects";
3
3
  import { filterContextActions } from "../../store/filterContext/index.js";
4
- import { selectFilterContextAttributeFilterByDisplayForm, selectFilterContextAttributeFilters, selectFilterContextDateFilterByDataSet, selectFilterContextDateFiltersWithDimension, } from "../../store/filterContext/filterContextSelectors.js";
4
+ import { selectFilterContextAttributeFilterByDisplayForm, selectFilterContextAttributeFilterByLocalId, selectFilterContextAttributeFilters, selectFilterContextDateFilterByDataSet, selectFilterContextDateFiltersWithDimension, } from "../../store/filterContext/filterContextSelectors.js";
5
5
  import { batchActions } from "redux-batched-actions";
6
6
  import { canApplyDateFilter, dispatchFilterContextChanged } from "./common.js";
7
7
  import partition from "lodash/partition.js";
8
8
  import uniqBy from "lodash/uniqBy.js";
9
9
  import compact from "lodash/compact.js";
10
- import { objRefToString, isUriRef, isAllTimeDashboardDateFilter, isDashboardAttributeFilter, isDashboardDateFilter, updateAttributeElementsItems, getAttributeElementsItems, attributeElementsIsEmpty, isSingleSelectionFilter, isAttributeFilter, isNegativeAttributeFilter, filterObjRef, filterAttributeElements, isAbsoluteDateFilter, newAbsoluteDashboardDateFilter, isAllTimeDateFilter, newAllTimeDashboardDateFilter, isRelativeDateFilter, newRelativeDashboardDateFilter, serializeObjRef, isDashboardCommonDateFilter, } from "@gooddata/sdk-model";
10
+ import { objRefToString, isUriRef, isAllTimeDashboardDateFilter, isDashboardAttributeFilter, isDashboardDateFilter, updateAttributeElementsItems, getAttributeElementsItems, attributeElementsIsEmpty, isSingleSelectionFilter, isAttributeFilter, isNegativeAttributeFilter, filterObjRef, filterAttributeElements, isAbsoluteDateFilter, newAbsoluteDashboardDateFilter, isAllTimeDateFilter, newAllTimeDashboardDateFilter, isRelativeDateFilter, newRelativeDashboardDateFilter, serializeObjRef, isDashboardCommonDateFilter, areObjRefsEqual, } from "@gooddata/sdk-model";
11
11
  import { NotSupported } from "@gooddata/sdk-backend-spi";
12
12
  import { resolveDisplayFormMetadata } from "../../utils/displayFormResolver.js";
13
13
  import { resolveAttributeMetadata } from "../../utils/attributeResolver.js";
14
+ import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../store/config/configSelectors.js";
15
+ import { attributeFilterConfigsActions } from "../../store/attributeFilterConfigs/index.js";
16
+ import { selectAttributeFilterConfigsOverrides } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
14
17
  function dashboardFilterToFilterContextItem(filter, keepDatasets) {
15
18
  if (isAttributeFilter(filter)) {
16
19
  return {
@@ -34,7 +37,7 @@ function dashboardFilterToFilterContextItem(filter, keepDatasets) {
34
37
  throw new NotSupported("Unsupported filter type! Please provide valid dashboard filter.");
35
38
  }
36
39
  export function* changeFilterContextSelectionHandler(ctx, cmd) {
37
- const { filters, resetOthers } = cmd.payload;
40
+ const { filters, resetOthers, attributeFilterConfigs = [] } = cmd.payload;
38
41
  const normalizedFilters = filters.map((filter) => {
39
42
  if (isDashboardAttributeFilter(filter) || isDashboardDateFilter(filter)) {
40
43
  return filter;
@@ -43,16 +46,25 @@ export function* changeFilterContextSelectionHandler(ctx, cmd) {
43
46
  return dashboardFilterToFilterContextItem(filter, !!ctx.backend.capabilities.supportsMultipleDateFilters);
44
47
  }
45
48
  });
49
+ const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
46
50
  const uniqueFilters = uniqBy(normalizedFilters, (filter) => {
47
51
  const identification = isDashboardAttributeFilter(filter)
48
52
  ? filter.attributeFilter.displayForm
49
53
  : filter.dateFilter.dataSet;
50
- return identification ? objRefToString(identification) : identification;
54
+ let config;
55
+ if (isDashboardAttributeFilter(filter) && enableDuplicatedLabelValuesInAttributeFilter) {
56
+ config = attributeFilterConfigs.find((config) => config.localIdentifier === filter.attributeFilter.localIdentifier);
57
+ }
58
+ // do not remove duplicates using same primary label, but different display as label
59
+ const secondaryIdentification = config?.displayAsLabel ? objRefToString(config.displayAsLabel) : "";
60
+ return identification
61
+ ? objRefToString(identification) + secondaryIdentification
62
+ : identification + secondaryIdentification;
51
63
  });
52
64
  const [dateFilters, attributeFilters] = partition(uniqueFilters, isDashboardDateFilter);
53
65
  const [[commonDateFilter], dateFiltersWithDimension] = partition(dateFilters, isDashboardCommonDateFilter);
54
66
  const [attributeFilterUpdateActions, commonDateFilterUpdateActions, dateFiltersUpdateActions,] = yield all([
55
- call(getAttributeFiltersUpdateActions, attributeFilters, resetOthers, ctx),
67
+ call(getAttributeFiltersUpdateActions, [...attributeFilters].reverse(), attributeFilterConfigs, resetOthers, ctx),
56
68
  call(getDateFilterUpdateActions, commonDateFilter, resetOthers),
57
69
  call(getDateFiltersUpdateActions, dateFiltersWithDimension, resetOthers),
58
70
  ]);
@@ -63,28 +75,92 @@ export function* changeFilterContextSelectionHandler(ctx, cmd) {
63
75
  ]));
64
76
  yield call(dispatchFilterContextChanged, ctx, cmd);
65
77
  }
66
- function* getAttributeFiltersUpdateActions(attributeFilters, resetOthers, ctx) {
78
+ function* getDashboardFilterByAttributeMatching(filterRef, resolvedDisplayForms, ctx) {
79
+ if (isUriRef(filterRef) && !ctx.backend.capabilities.supportsObjectUris) {
80
+ throw new NotSupported("Unsupported filter ObjRef! Please provide IdentifierRef instead of UriRef.");
81
+ }
82
+ const filterDF = resolvedDisplayForms.resolved.get(filterRef);
83
+ const resolvedAttribute = yield call(resolveAttributeMetadata, ctx, compact([filterDF?.attribute]));
84
+ const attribute = filterDF?.attribute && resolvedAttribute.resolved.get(filterDF?.attribute);
85
+ for (const displayForm of attribute?.displayForms ?? []) {
86
+ const dashboardFilter = yield select(selectFilterContextAttributeFilterByDisplayForm(displayForm.ref));
87
+ if (dashboardFilter) {
88
+ return dashboardFilter;
89
+ }
90
+ }
91
+ return null;
92
+ }
93
+ function* getDashboardFilterByDisplayAsLabelMatching(attributeFilter, attributeFilterConfigs) {
94
+ let foundByDisplayAsLabel = false;
95
+ let foundByDashboardFilterDisplayAsLabel = false;
96
+ let dashboardFilter = undefined;
97
+ const filterRef = attributeFilter.attributeFilter.displayForm;
98
+ const filterConfig = attributeFilterConfigs.find((config) => config.localIdentifier === attributeFilter.attributeFilter.localIdentifier);
99
+ if (filterConfig?.displayAsLabel) {
100
+ dashboardFilter = yield select(selectFilterContextAttributeFilterByDisplayForm(filterConfig.displayAsLabel));
101
+ foundByDisplayAsLabel = !!dashboardFilter;
102
+ }
103
+ if (!foundByDisplayAsLabel) {
104
+ const dashboardFiltersConfigs = yield select(selectAttributeFilterConfigsOverrides);
105
+ const matchingDashboardFilterConfig = dashboardFiltersConfigs.find((config) => areObjRefsEqual(config.displayAsLabel, filterRef));
106
+ if (matchingDashboardFilterConfig) {
107
+ dashboardFilter = yield select(selectFilterContextAttributeFilterByLocalId(matchingDashboardFilterConfig?.localIdentifier));
108
+ foundByDashboardFilterDisplayAsLabel = !!dashboardFilter;
109
+ }
110
+ }
111
+ return { foundByDisplayAsLabel, foundByDashboardFilterDisplayAsLabel, dashboardFilter };
112
+ }
113
+ function* getAttributeFiltersUpdateActions(attributeFilters, attributeFilterConfigs, resetOthers, ctx) {
67
114
  const updateActions = [];
68
115
  const handledLocalIds = new Set();
116
+ const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
69
117
  const resolvedDisplayForms = yield call(resolveDisplayFormMetadata, ctx, attributeFilters.map((af) => af.attributeFilter.displayForm));
70
118
  for (const attributeFilter of attributeFilters) {
71
119
  const filterRef = attributeFilter.attributeFilter.displayForm;
72
120
  let dashboardFilter = yield select(selectFilterContextAttributeFilterByDisplayForm(filterRef));
73
121
  if (!dashboardFilter && canMapDashboardFilterFromAnotherDisplayForm(ctx)) {
74
- if (isUriRef(filterRef) && !ctx.backend.capabilities.supportsObjectUris) {
75
- throw new NotSupported("Unsupported filter ObjRef! Please provide IdentifierRef instead of UriRef.");
76
- }
77
- const filterDF = resolvedDisplayForms.resolved.get(filterRef);
78
- const resolvedAttribute = yield call(resolveAttributeMetadata, ctx, compact([filterDF?.attribute]));
79
- const attribute = filterDF?.attribute && resolvedAttribute.resolved.get(filterDF?.attribute);
80
- for (const displayForm of attribute?.displayForms ?? []) {
81
- dashboardFilter = yield select(selectFilterContextAttributeFilterByDisplayForm(displayForm.ref));
82
- if (dashboardFilter) {
83
- break;
84
- }
85
- }
122
+ dashboardFilter = yield call(getDashboardFilterByAttributeMatching, filterRef, resolvedDisplayForms, ctx);
123
+ }
124
+ let foundByDisplayAsLabel = false;
125
+ let foundByDashboardFilterDisplayAsLabel = false;
126
+ if (enableDuplicatedLabelValuesInAttributeFilter && !dashboardFilter) {
127
+ const result = yield call(getDashboardFilterByDisplayAsLabelMatching, attributeFilter, attributeFilterConfigs);
128
+ foundByDisplayAsLabel = result.foundByDisplayAsLabel;
129
+ foundByDashboardFilterDisplayAsLabel = result.foundByDashboardFilterDisplayAsLabel;
130
+ dashboardFilter = result.dashboardFilter;
86
131
  }
132
+ const displayFormData = resolvedDisplayForms.resolved.get(filterRef);
87
133
  if (dashboardFilter) {
134
+ if (foundByDisplayAsLabel && displayFormData) {
135
+ updateActions.push(
136
+ // keep the attribute display form field up to date
137
+ filterContextActions.addAttributeFilterDisplayForm(displayFormData), filterContextActions.changeAttributeDisplayForm({
138
+ filterLocalId: dashboardFilter.attributeFilter.localIdentifier,
139
+ displayForm: filterRef,
140
+ supportsElementUris: ctx.backend.capabilities.supportsElementUris,
141
+ enableDuplicatedLabelValuesInAttributeFilter,
142
+ }),
143
+ // backup current displayForm to the displayAsLabel
144
+ attributeFilterConfigsActions.changeDisplayAsLabel({
145
+ localIdentifier: dashboardFilter.attributeFilter.localIdentifier,
146
+ displayAsLabel: dashboardFilter.attributeFilter.displayForm,
147
+ }));
148
+ }
149
+ if (foundByDashboardFilterDisplayAsLabel && displayFormData) {
150
+ updateActions.push(
151
+ // keep the attribute display form field up to date
152
+ filterContextActions.addAttributeFilterDisplayForm(displayFormData), filterContextActions.changeAttributeDisplayForm({
153
+ filterLocalId: dashboardFilter.attributeFilter.localIdentifier,
154
+ displayForm: filterRef,
155
+ supportsElementUris: ctx.backend.capabilities.supportsElementUris,
156
+ enableDuplicatedLabelValuesInAttributeFilter,
157
+ }),
158
+ // clear displayAsLabel
159
+ attributeFilterConfigsActions.changeDisplayAsLabel({
160
+ localIdentifier: dashboardFilter.attributeFilter.localIdentifier,
161
+ displayAsLabel: undefined,
162
+ }));
163
+ }
88
164
  updateActions.push(filterContextActions.updateAttributeFilterSelection(getAttributeFilterSelectionPayload(attributeFilter, dashboardFilter)));
89
165
  handledLocalIds.add(dashboardFilter.attributeFilter.localIdentifier);
90
166
  }
package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"changeFilterContextSelectionHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"changeFilterContextSelectionHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.ts"],"names":[],"mappings":"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"}
package/esm/model/commands/dashboard.d.ts CHANGED
@@ -390,7 +390,7 @@ export interface SetDashboardAttributeFilterConfigDisplayAsLabelPayload {
390
390
  /**
391
391
  * Display as label of the attribute filter. Used to present filter in UI
392
392
  */
393
- displayAsLabel: ObjRef;
393
+ displayAsLabel: ObjRef | undefined;
394
394
  }
395
395
  /**
396
396
  * Command for changing attribute filter mode.