@gooddata/sdk-ui-dashboard 11.2.0 → 11.3.0-alpha.2
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/NOTICE +32 -74
- package/esm/__version.d.ts +1 -1
- package/esm/__version.d.ts.map +1 -1
- package/esm/__version.js +1 -1
- package/esm/__version.js.map +1 -1
- package/esm/_staging/catalog/displayFormMap.d.ts.map +1 -1
- package/esm/_staging/catalog/displayFormMap.js +2 -3
- package/esm/_staging/catalog/displayFormMap.js.map +1 -1
- package/esm/_staging/dashboard/flexibleLayout/builder/item.js +2 -3
- package/esm/_staging/dashboard/flexibleLayout/builder/item.js.map +1 -1
- package/esm/_staging/dashboard/flexibleLayout/builder/layout.js +2 -2
- package/esm/_staging/dashboard/flexibleLayout/builder/layout.js.map +1 -1
- package/esm/_staging/dashboard/flexibleLayout/builder/section.d.ts.map +1 -1
- package/esm/_staging/dashboard/flexibleLayout/builder/section.js +2 -2
- package/esm/_staging/dashboard/flexibleLayout/builder/section.js.map +1 -1
- package/esm/_staging/dashboard/flexibleLayout/facade/items.js +1 -2
- package/esm/_staging/dashboard/flexibleLayout/facade/items.js.map +1 -1
- package/esm/_staging/dashboard/flexibleLayout/facade/sections.d.ts.map +1 -1
- package/esm/_staging/dashboard/flexibleLayout/facade/sections.js +1 -2
- package/esm/_staging/dashboard/flexibleLayout/facade/sections.js.map +1 -1
- package/esm/_staging/dateFilterConfig/validation.js +2 -2
- package/esm/_staging/dateFilterConfig/validation.js.map +1 -1
- package/esm/_staging/insight/insightBuilder.d.ts.map +1 -1
- package/esm/_staging/insight/insightBuilder.js +1 -2
- package/esm/_staging/insight/insightBuilder.js.map +1 -1
- package/esm/model/commandHandlers/common/validateDrills.js +1 -2
- package/esm/model/commandHandlers/common/validateDrills.js.map +1 -1
- package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/loadInaccessibleDashboards.js +4 -2
- package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/loadInaccessibleDashboards.js.map +1 -1
- package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/resolveDashboardConfig.js +1 -2
- package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/resolveDashboardConfig.js.map +1 -1
- package/esm/model/commandHandlers/drill/common/intersectionUtils.d.ts +1 -1
- package/esm/model/commandHandlers/drill/common/intersectionUtils.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/common/intersectionUtils.js +3 -7
- package/esm/model/commandHandlers/drill/common/intersectionUtils.js.map +1 -1
- package/esm/model/commandHandlers/drill/crossFilteringHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/crossFilteringHandler.js +9 -14
- package/esm/model/commandHandlers/drill/crossFilteringHandler.js.map +1 -1
- package/esm/model/commandHandlers/drill/drillDownHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/drillDownHandler.js +2 -3
- package/esm/model/commandHandlers/drill/drillDownHandler.js.map +1 -1
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.js +6 -11
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.js.map +1 -1
- package/esm/model/commandHandlers/drill/drillToInsightHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/drillToInsightHandler.js +2 -3
- package/esm/model/commandHandlers/drill/drillToInsightHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js +3 -9
- package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js +2 -7
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js +3 -9
- package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/filterValidation.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/filterValidation.js +10 -3
- package/esm/model/commandHandlers/widgets/validation/filterValidation.js.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/insightDrillDefinitionUtils.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/insightDrillDefinitionUtils.js +7 -8
- package/esm/model/commandHandlers/widgets/validation/insightDrillDefinitionUtils.js.map +1 -1
- package/esm/model/store/_infra/undoEnhancer.d.ts.map +1 -1
- package/esm/model/store/_infra/undoEnhancer.js +2 -2
- package/esm/model/store/_infra/undoEnhancer.js.map +1 -1
- package/esm/model/store/catalog/catalogSelectors.js +5 -5
- package/esm/model/store/catalog/catalogSelectors.js.map +1 -1
- package/esm/model/store/config/configSelectors.d.ts +18 -6
- package/esm/model/store/config/configSelectors.d.ts.map +1 -1
- package/esm/model/store/config/configSelectors.js +24 -8
- package/esm/model/store/config/configSelectors.js.map +1 -1
- package/esm/model/store/filterContext/filterContextReducers.d.ts +0 -2
- package/esm/model/store/filterContext/filterContextReducers.d.ts.map +1 -1
- package/esm/model/store/filterContext/filterContextReducers.js +1 -8
- package/esm/model/store/filterContext/filterContextReducers.js.map +1 -1
- package/esm/model/store/filterContext/filterContextSelectors.d.ts.map +1 -1
- package/esm/model/store/filterContext/filterContextSelectors.js +2 -2
- package/esm/model/store/filterContext/filterContextSelectors.js.map +1 -1
- package/esm/model/store/index.d.ts +1 -1
- package/esm/model/store/index.d.ts.map +1 -1
- package/esm/model/store/index.js +1 -1
- package/esm/model/store/index.js.map +1 -1
- package/esm/model/store/widgetDrills/widgetDrillSelectors.js +5 -5
- package/esm/model/store/widgetDrills/widgetDrillSelectors.js.map +1 -1
- package/esm/model/types/commonTypes.d.ts.map +1 -1
- package/esm/model/types/commonTypes.js +1 -2
- package/esm/model/types/commonTypes.js.map +1 -1
- package/esm/plugins/customizationApis/insightCustomizer.d.ts.map +1 -1
- package/esm/plugins/customizationApis/insightCustomizer.js +2 -2
- package/esm/plugins/customizationApis/insightCustomizer.js.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DashboardParametersSection.d.ts.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DashboardParametersSection.js +2 -3
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DashboardParametersSection.js.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/ParameterDetails/AttributeDisplayFormParameterDetail.d.ts.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/ParameterDetails/AttributeDisplayFormParameterDetail.js +2 -3
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/ParameterDetails/AttributeDisplayFormParameterDetail.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.js +2 -3
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDisplayFormConfiguration.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDisplayFormConfiguration.js +4 -24
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDisplayFormConfiguration.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.js +13 -22
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/filterViews/AddFilterView.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/filterViews/AddFilterView.js +2 -2
- package/esm/presentation/filterBar/filterBar/filterViews/AddFilterView.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js +4 -8
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js.map +1 -1
- package/esm/presentation/flexibleLayout/DefaultDashboardLayoutRenderer/DashboardLayoutSection.d.ts.map +1 -1
- package/esm/presentation/flexibleLayout/DefaultDashboardLayoutRenderer/DashboardLayoutSection.js +4 -2
- package/esm/presentation/flexibleLayout/DefaultDashboardLayoutRenderer/DashboardLayoutSection.js.map +1 -1
- package/esm/presentation/localization/bundles/en-US.json +16 -0
- package/esm/presentation/localization/bundles/en-US.localization-bundle.d.ts +4 -0
- package/esm/presentation/localization/bundles/en-US.localization-bundle.d.ts.map +1 -1
- package/esm/presentation/localization/bundles/en-US.localization-bundle.js +5 -1
- package/esm/presentation/localization/bundles/en-US.localization-bundle.js.map +1 -1
- package/esm/presentation/topBar/buttonBar/button/saveAsButton/DefaultSaveAsNewButton.d.ts.map +1 -1
- package/esm/presentation/topBar/buttonBar/button/saveAsButton/DefaultSaveAsNewButton.js +4 -1
- package/esm/presentation/topBar/buttonBar/button/saveAsButton/DefaultSaveAsNewButton.js.map +1 -1
- package/esm/presentation/topBar/buttonBar/button/shareButton/DefaultShareButton.d.ts.map +1 -1
- package/esm/presentation/topBar/buttonBar/button/shareButton/DefaultShareButton.js +5 -1
- package/esm/presentation/topBar/buttonBar/button/shareButton/DefaultShareButton.js.map +1 -1
- package/esm/presentation/topBar/menuButton/DefaultSubmenuHeader.d.ts.map +1 -1
- package/esm/presentation/topBar/menuButton/DefaultSubmenuHeader.js +3 -9
- package/esm/presentation/topBar/menuButton/DefaultSubmenuHeader.js.map +1 -1
- package/esm/presentation/topBar/menuButton/useDefaultMenuItems.d.ts.map +1 -1
- package/esm/presentation/topBar/menuButton/useDefaultMenuItems.js +21 -6
- package/esm/presentation/topBar/menuButton/useDefaultMenuItems.js.map +1 -1
- package/esm/presentation/widget/common/configuration/DateDatasetDropdown.d.ts +1 -0
- package/esm/presentation/widget/common/configuration/DateDatasetDropdown.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/DateDatasetDropdown.js +32 -20
- package/esm/presentation/widget/common/configuration/DateDatasetDropdown.js.map +1 -1
- package/esm/presentation/widget/common/configuration/DateDatasetFilter.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/DateDatasetFilter.js +7 -3
- package/esm/presentation/widget/common/configuration/DateDatasetFilter.js.map +1 -1
- package/esm/presentation/widget/common/configuration/DateDatasetPicker.d.ts +1 -0
- package/esm/presentation/widget/common/configuration/DateDatasetPicker.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/DateDatasetPicker.js +2 -2
- package/esm/presentation/widget/common/configuration/DateDatasetPicker.js.map +1 -1
- package/esm/presentation/widget/common/configuration/DateFilterCheckbox.d.ts +1 -0
- package/esm/presentation/widget/common/configuration/DateFilterCheckbox.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/DateFilterCheckbox.js +3 -2
- package/esm/presentation/widget/common/configuration/DateFilterCheckbox.js.map +1 -1
- package/esm/presentation/widget/common/configuration/utils.d.ts +1 -1
- package/esm/presentation/widget/common/configuration/utils.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/utils.js +10 -2
- package/esm/presentation/widget/common/configuration/utils.js.map +1 -1
- package/esm/presentation/widget/common/useInsightExport.d.ts.map +1 -1
- package/esm/presentation/widget/common/useInsightExport.js +10 -6
- package/esm/presentation/widget/common/useInsightExport.js.map +1 -1
- package/esm/presentation/widget/insight/ViewModeDashboardInsight/InsightDrillDialog/DrillDialog.d.ts.map +1 -1
- package/esm/presentation/widget/insight/ViewModeDashboardInsight/InsightDrillDialog/DrillDialog.js +14 -9
- package/esm/presentation/widget/insight/ViewModeDashboardInsight/InsightDrillDialog/DrillDialog.js.map +1 -1
- package/esm/presentation/widget/insight/insightToTable.d.ts.map +1 -1
- package/esm/presentation/widget/insight/insightToTable.js +4 -5
- package/esm/presentation/widget/insight/insightToTable.js.map +1 -1
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/CustomUiMenuComponents.js +1 -1
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/CustomUiMenuComponents.js.map +1 -1
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/DashboardInsightSubmenuContainer.d.ts.map +1 -1
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/DashboardInsightSubmenuContainer.js +2 -3
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/DashboardInsightSubmenuContainer.js.map +1 -1
- package/esm/presentation/widget/visualizationSwitcher/configuration/InsightPicker.d.ts.map +1 -1
- package/esm/presentation/widget/visualizationSwitcher/configuration/InsightPicker.js +4 -4
- package/esm/presentation/widget/visualizationSwitcher/configuration/InsightPicker.js.map +1 -1
- package/esm/presentation/widget/widget/InsightWidget/DefaultDashboardInsightWidget.d.ts.map +1 -1
- package/esm/presentation/widget/widget/InsightWidget/DefaultDashboardInsightWidget.js +23 -14
- package/esm/presentation/widget/widget/InsightWidget/DefaultDashboardInsightWidget.js.map +1 -1
- package/esm/sdk-ui-dashboard.d.ts +21 -7
- package/esm/tools/InsightWidgetBuilder.d.ts.map +1 -1
- package/esm/tools/InsightWidgetBuilder.js +1 -2
- package/esm/tools/InsightWidgetBuilder.js.map +1 -1
- package/package.json +16 -17
- package/styles/css/attributeFilterConfig.css +2 -1
- package/styles/css/attributeFilterConfig.css.map +1 -1
- package/styles/css/dashboard.css +1 -0
- package/styles/css/dashboard.css.map +1 -1
- package/styles/css/dateFilterConfig.css +2 -1
- package/styles/css/dateFilterConfig.css.map +1 -1
- package/styles/css/filterBar.css +7 -1
- package/styles/css/filterBar.css.map +1 -1
- package/styles/css/insightConfiguration.css +4 -1
- package/styles/css/insightConfiguration.css.map +1 -1
- package/styles/css/main.css +119 -3
- package/styles/css/main.css.map +1 -1
- package/styles/css/sharedFilterConfig.css +2 -1
- package/styles/css/sharedFilterConfig.css.map +1 -1
- package/styles/scss/dashboard.scss +1 -0
- package/styles/scss/filterBar.scss +9 -1
- package/styles/scss/insightConfiguration.scss +4 -2
- package/styles/scss/sharedFilterConfig.scss +2 -1
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/DashboardInsightSubmenuHeader.d.ts +0 -8
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/DashboardInsightSubmenuHeader.d.ts.map +0 -1
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/DashboardInsightSubmenuHeader.js +0 -13
- package/esm/presentation/widget/insightMenu/DefaultDashboardInsightMenu/DashboardInsightMenu/DashboardInsightSubmenuHeader.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadInaccessibleDashboards.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/loadInaccessibleDashboards.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"loadInaccessibleDashboards.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/loadInaccessibleDashboards.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAmB,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,sEAAsE,CAAC;AACrH,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAK/F,MAAM,SAAS,CAAC,CAAC,0BAA0B,CAAC,GAAqB,EAAE,OAAkB;IACjF,MAAM,uBAAuB,GAAqD,MAAM,MAAM,CAC1F,6BAA6B,CAChC,CAAC;IACF,MAAM,qBAAqB,GAAG,OAAO;SAChC,MAAM,CAAC,eAAe,CAAC;SACvB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAChE,MAAM,wBAAwB,GAAG,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5F,MAAM,+BAA+B,GAAG,wBAAwB,CAAC,MAAM,CACnE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,CAC7C,CAAC;IACF,MAAM,kBAAkB,GAAsD,MAAM,IAAI,CACpF,qBAAqB,EACrB,GAAG,EACH,+BAA+B,CAClC,CAAC;IACF,MAAM,sBAAsB,GAA6B,kBAAkB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QAC1F,OAAO;YACH,GAAG,SAAS;YACZ,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,EAAE;YAC5B,uBAAuB,EAAE,SAAS,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW;SACrF,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,CAAC,CAAC;AAC/F,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,GAAqB,EAAE,aAAuB;IAC/E,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACD,OAAO,MAAM,GAAG,CAAC,OAAO;aACnB,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC;aACxB,UAAU,EAAE;aACZ,2BAA2B,CAAC,aAAa,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACL,oFAAoF;QACpF,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC"}
|
package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/resolveDashboardConfig.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
// (C) 2021-2025 GoodData Corporation
|
|
2
|
-
import { includes } from "lodash-es";
|
|
3
2
|
import { all, call, put } from "redux-saga/effects";
|
|
4
3
|
import { resolveLocale } from "@gooddata/sdk-ui";
|
|
5
4
|
import { onDateFilterConfigValidationError } from "./onDateFilterConfigValidationError.js";
|
|
@@ -39,7 +38,7 @@ async function loadCustomDateFilterConfig(ctx) {
|
|
|
39
38
|
return undefined;
|
|
40
39
|
}
|
|
41
40
|
const configValidation = validateDateFilterConfig(customDateFilterConfig.items[0]);
|
|
42
|
-
const validConfig = !includes(
|
|
41
|
+
const validConfig = !FallbackToDefault.includes(configValidation);
|
|
43
42
|
return validConfig ? customDateFilterConfig.items[0] : undefined;
|
|
44
43
|
}
|
|
45
44
|
function loadColorPalette(ctx) {
|
package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/resolveDashboardConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveDashboardConfig.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/resolveDashboardConfig.ts"],"names":[],"mappings":"AAAA,qCAAqC;
|
|
1
|
+
{"version":3,"file":"resolveDashboardConfig.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/resolveDashboardConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export interface IConversionResult {
|
|
|
4
4
|
attributeFilter: IDashboardAttributeFilter;
|
|
5
5
|
primaryLabel?: ObjRef;
|
|
6
6
|
}
|
|
7
|
-
export declare function convertIntersectionToAttributeFilters(intersection: IDrillEventIntersectionElement[], dateDataSetsAttributesRefs: ObjRef[],
|
|
7
|
+
export declare function convertIntersectionToAttributeFilters(intersection: IDrillEventIntersectionElement[], dateDataSetsAttributesRefs: ObjRef[], enableAliasTitles?: boolean, filtersCount?: number): IConversionResult[];
|
|
8
8
|
/**
|
|
9
9
|
* @internal
|
|
10
10
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intersectionUtils.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"intersectionUtils.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,yBAAyB,EACzB,MAAM,EAGT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,8BAA8B,EAGjC,MAAM,kBAAkB,CAAC;AAmB1B,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,iBAAiB,UAAQ,EACzB,YAAY,GAAE,MAAU,GACzB,iBAAiB,EAAE,CAuBrB;AAED;;GAEG;AACH,wBAAgB,wCAAwC,CACpD,YAAY,EAAE,8BAA8B,EAAE,EAC9C,kCAAkC,EAAE,MAAM,EAAE,GAC7C,8BAA8B,EAAE,CAQlC"}
|
|
@@ -12,16 +12,14 @@ function filterIntersection(intersection, dateDataSetsAttributesRefs) {
|
|
|
12
12
|
const ref = attributeItem?.attributeHeader?.formOf?.ref;
|
|
13
13
|
return ref ? !dateDataSetsAttributesRefs.some((ddsRef) => areObjRefsEqual(ddsRef, ref)) : false;
|
|
14
14
|
}
|
|
15
|
-
export function convertIntersectionToAttributeFilters(intersection, dateDataSetsAttributesRefs,
|
|
15
|
+
export function convertIntersectionToAttributeFilters(intersection, dateDataSetsAttributesRefs, enableAliasTitles = false, filtersCount = 0) {
|
|
16
16
|
return intersection
|
|
17
17
|
.map((i) => i.header)
|
|
18
18
|
.filter((i) => filterIntersection(i, dateDataSetsAttributesRefs))
|
|
19
19
|
.filter(isDrillIntersectionAttributeItem)
|
|
20
20
|
.reduce((result, h) => {
|
|
21
21
|
const ref = h.attributeHeader.ref;
|
|
22
|
-
const elementValue =
|
|
23
|
-
? h.attributeHeaderItem.uri
|
|
24
|
-
: h.attributeHeaderItem.name;
|
|
22
|
+
const elementValue = h.attributeHeaderItem.uri;
|
|
25
23
|
const titleObj = enableAliasTitles ? { title: h.attributeHeader.formOf?.name } : {};
|
|
26
24
|
result.push({
|
|
27
25
|
attributeFilter: {
|
|
@@ -33,9 +31,7 @@ export function convertIntersectionToAttributeFilters(intersection, dateDataSets
|
|
|
33
31
|
...titleObj,
|
|
34
32
|
},
|
|
35
33
|
},
|
|
36
|
-
|
|
37
|
-
? { primaryLabel: h.attributeHeader.primaryLabel }
|
|
38
|
-
: {}),
|
|
34
|
+
primaryLabel: h.attributeHeader.primaryLabel,
|
|
39
35
|
});
|
|
40
36
|
return result;
|
|
41
37
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intersectionUtils.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;
|
|
1
|
+
{"version":3,"file":"intersectionUtils.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/drill/common/intersectionUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAGH,eAAe,EACf,qBAAqB,GACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIH,gCAAgC,GACnC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEpF;;;;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,iBAAiB,GAAG,KAAK,EACzB,eAAuB,CAAC;IAExB,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,GAAG,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC;QAC/C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,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,6BAA6B,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;oBACjF,GAAG,QAAQ;iBACd;aACJ;YACD,YAAY,EAAE,CAAC,CAAC,eAAe,CAAC,YAAY;SAC/C,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,EAAyB,CAAC,CAAC;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wCAAwC,CACpD,YAA8C,EAC9C,kCAA4C;IAE5C,OAAO,YAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,IAAI,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,gCAAgC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;YAChF,OAAO,CAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QACnG,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossFilteringHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAA+C,MAAM,qBAAqB,CAAC;AAG7G,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"crossFilteringHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAA+C,MAAM,qBAAqB,CAAC;AAG7G,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAqBzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAK9D,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,cAAc;;;2UAgKhF"}
|
|
@@ -9,7 +9,7 @@ import { crossFilteringRequested, crossFilteringResolved } from "../../events/dr
|
|
|
9
9
|
import { generateFilterLocalIdentifier } from "../../store/_infra/generators.js";
|
|
10
10
|
import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
11
11
|
import { selectCatalogDateAttributes } from "../../store/catalog/catalogSelectors.js";
|
|
12
|
-
import { selectEnableCrossFilteringAliasTitles,
|
|
12
|
+
import { selectEnableCrossFilteringAliasTitles, selectIsApplyFiltersAllAtOnceEnabledAndSet, } from "../../store/config/configSelectors.js";
|
|
13
13
|
import { selectCrossFilteringFiltersLocalIdentifiers, selectCrossFilteringItemByWidgetRef, } from "../../store/drill/drillSelectors.js";
|
|
14
14
|
import { drillActions } from "../../store/drill/index.js";
|
|
15
15
|
import { selectFilterContextDraggableFilters } from "../../store/filterContext/filterContextSelectors.js";
|
|
@@ -18,9 +18,7 @@ import { changeAttributeFilterSelectionHandler } from "../filterContext/attribut
|
|
|
18
18
|
import { removeAttributeFiltersHandler } from "../filterContext/attributeFilter/removeAttributeFiltersHandler.js";
|
|
19
19
|
export function* crossFilteringHandler(ctx, cmd) {
|
|
20
20
|
yield put(crossFilteringRequested(ctx, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId));
|
|
21
|
-
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
22
21
|
const enableCrossFilteringAliasTitles = yield select(selectEnableCrossFilteringAliasTitles);
|
|
23
|
-
const backendSupportsElementUris = !!ctx.backend.capabilities.supportsElementUris;
|
|
24
22
|
const widgetRef = cmd.payload.drillEvent.widgetRef;
|
|
25
23
|
const currentFilters = yield select(selectFilterContextDraggableFilters);
|
|
26
24
|
const dateAttributes = yield select(selectCatalogDateAttributes);
|
|
@@ -34,7 +32,7 @@ export function* crossFilteringHandler(ctx, cmd) {
|
|
|
34
32
|
const crossFilteringItemByWidget = yield select(selectCrossFilteringItemByWidgetRef(widgetRef));
|
|
35
33
|
//default date filter is not included in currentFilters so we need to add 1 to the length
|
|
36
34
|
const filtersCount = currentFilters.length + 1;
|
|
37
|
-
const drillIntersectionFilters = convertIntersectionToAttributeFilters(cmd.payload.drillEvent.drillContext.intersection ?? [], dateDataSetsAttributesRefs,
|
|
35
|
+
const drillIntersectionFilters = convertIntersectionToAttributeFilters(cmd.payload.drillEvent.drillContext.intersection ?? [], dateDataSetsAttributesRefs, enableCrossFilteringAliasTitles, filtersCount);
|
|
38
36
|
const attributeFilterDisplayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
39
37
|
const shouldUpdateExistingCrossFiltering = !isEmpty(crossFilteringItemByWidget) &&
|
|
40
38
|
/**
|
|
@@ -47,16 +45,13 @@ export function* crossFilteringHandler(ctx, cmd) {
|
|
|
47
45
|
const { displayForm, attributeElements, negativeSelection, title } = attributeFilter.attributeFilter;
|
|
48
46
|
const existingVirtualFilter = shouldUpdateExistingCrossFiltering
|
|
49
47
|
? currentVirtualFilters.find((vf) => {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
(vfDisplayAsLabel
|
|
56
|
-
|
|
57
|
-
: true));
|
|
58
|
-
}
|
|
59
|
-
return areObjRefsEqual(vf.attributeFilter.displayForm, displayForm);
|
|
48
|
+
const vfDisplayAsLabel = attributeFilterDisplayAsLabelMap.get(vf.attributeFilter.localIdentifier);
|
|
49
|
+
const useDisplayAsLabel = displayForm && primaryLabel && !areObjRefsEqual(displayForm, primaryLabel);
|
|
50
|
+
// strict checking of both primary and secondary label means that cross filtering is able to create two filters using same primary label but different display as label. It was possible even before.
|
|
51
|
+
return (areObjRefsEqual(vf.attributeFilter.displayForm, primaryLabel) &&
|
|
52
|
+
(vfDisplayAsLabel || useDisplayAsLabel
|
|
53
|
+
? areObjRefsEqual(vfDisplayAsLabel, displayForm)
|
|
54
|
+
: true));
|
|
60
55
|
})
|
|
61
56
|
: undefined;
|
|
62
57
|
const dashboardFilter = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossFilteringHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAA6B,eAAe,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAE7G,OAAO,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAC;AAEtF,OAAO,EACH,kBAAkB,EAClB,8BAA8B,EAC9B,sBAAsB,EACtB,kCAAkC,GACrC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,6CAA6C,EAAE,MAAM,uEAAuE,CAAC;AACtI,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EACH,qCAAqC,EACrC,
|
|
1
|
+
{"version":3,"file":"crossFilteringHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillDownHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"drillDownHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ1C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAyC,MAAM,uBAAuB,CAAC;AAE1G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,wBAAiB,gBAAgB,CAC7B,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,SAAS,GACf,YAAY,CAAC,0BAA0B,CAAC,CAqD1C"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
+
// (C) 2021-2025 GoodData Corporation
|
|
1
2
|
import { put, select } from "redux-saga/effects";
|
|
2
3
|
import { isInsightWidget } from "@gooddata/sdk-model";
|
|
3
4
|
import { getInsightWithAppliedDrillDown } from "@gooddata/sdk-ui-ext";
|
|
4
5
|
import { removeIgnoredValuesFromDrillIntersection } from "./common/intersectionUtils.js";
|
|
5
6
|
import { isDrillDownIntersectionIgnoredAttributesForHierarchy } from "../../../_staging/drills/drillingUtils.js";
|
|
6
7
|
import { drillDownRequested, drillDownResolved } from "../../events/drill.js";
|
|
7
|
-
import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../store/config/configSelectors.js";
|
|
8
8
|
import { selectWidgetByRef } from "../../store/layout/layoutSelectors.js";
|
|
9
9
|
export function* drillDownHandler(ctx, cmd) {
|
|
10
10
|
const { drillDefinition, drillEvent, insight } = cmd.payload;
|
|
11
11
|
yield put(drillDownRequested(ctx, insight, drillDefinition, drillEvent, cmd.correlationId));
|
|
12
|
-
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
13
12
|
let effectiveDrillEvent = drillEvent;
|
|
14
13
|
const widget = yield select(selectWidgetByRef(drillEvent.widgetRef));
|
|
15
14
|
const drillDownIntersectionIgnoredAttributes = isInsightWidget(widget)
|
|
@@ -28,7 +27,7 @@ export function* drillDownHandler(ctx, cmd) {
|
|
|
28
27
|
},
|
|
29
28
|
};
|
|
30
29
|
}
|
|
31
|
-
const insightWithDrillDownApplied = getInsightWithAppliedDrillDown(insight, effectiveDrillEvent, drillDefinition, ctx.backend.capabilities.supportsElementUris ?? true
|
|
30
|
+
const insightWithDrillDownApplied = getInsightWithAppliedDrillDown(insight, effectiveDrillEvent, drillDefinition, ctx.backend.capabilities.supportsElementUris ?? true);
|
|
32
31
|
return drillDownResolved(ctx, insightWithDrillDownApplied, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId);
|
|
33
32
|
}
|
|
34
33
|
//# sourceMappingURL=drillDownHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillDownHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"drillDownHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAGrC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,EAAE,oDAAoD,EAAE,MAAM,2CAA2C,CAAC;AAEjH,OAAO,EAA8B,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1G,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG1E,MAAM,SAAS,CAAC,CAAC,gBAAgB,CAC7B,GAAqB,EACrB,GAAc;IAEd,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAE7D,MAAM,GAAG,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAE5F,IAAI,mBAAmB,GAAG,UAAU,CAAC;IAErC,MAAM,MAAM,GAAqD,MAAM,MAAM,CACzE,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAC1C,CAAC;IAEF,MAAM,sCAAsC,GAAG,eAAe,CAAC,MAAM,CAAC;QAClE,CAAC,CAAC,MAAM,CAAC,sCAAsC;QAC/C,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,yDAAyD,GAC3D,sCAAsC,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QACrD,OAAO,oDAAoD,CACvD,OAAO,EACP,eAAe,CAAC,YAAa,CAChC,CAAC;IACN,CAAC,CAAC,CAAC;IAEP,MAAM,iCAAiC,GACnC,yDAAyD,EAAE,iBAAiB,IAAI,EAAE,CAAC;IAEvF,IAAI,iCAAiC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/C,mBAAmB,GAAG;YAClB,GAAG,UAAU;YACb,YAAY,EAAE;gBACV,GAAG,UAAU,CAAC,YAAY;gBAC1B,YAAY,EAAE,wCAAwC,CAClD,UAAU,CAAC,YAAY,CAAC,YAAY,IAAI,EAAE,EAC1C,yDAAyD,EAAE,iBAAiB,IAAI,EAAE,CACrF;aACJ;SACJ,CAAC;IACN,CAAC;IAED,MAAM,2BAA2B,GAAG,8BAA8B,CAC9D,OAAO,EACP,mBAAmB,EACnB,eAAe,EACf,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,IAAI,IAAI,CACvD,CAAC;IAEF,OAAO,iBAAiB,CACpB,GAAG,EACH,2BAA2B,EAC3B,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"drillToDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAkC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,iCAAiC,EAGpC,MAAM,uBAAuB,CAAC;AAiB/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,iCAAiC,CAAC,CAiGjD"}
|
|
@@ -10,7 +10,7 @@ import { generateFilterLocalIdentifier } from "../../store/_infra/generators.js"
|
|
|
10
10
|
import { selectAttributeFilterConfigsDisplayAsLabelMap, selectAttributeFilterConfigsOverrides, } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
11
11
|
import { selectSupportsMultipleDateFilters } from "../../store/backendCapabilities/backendCapabilitiesSelectors.js";
|
|
12
12
|
import { selectCatalogDateAttributes } from "../../store/catalog/catalogSelectors.js";
|
|
13
|
-
import {
|
|
13
|
+
import { selectEnableMultipleDateFilters } from "../../store/config/configSelectors.js";
|
|
14
14
|
import { selectFilterContextAttributeFilters, selectFilterContextDateFilter, selectFilterContextDraggableFilters, } from "../../store/filterContext/filterContextSelectors.js";
|
|
15
15
|
import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
|
|
16
16
|
import { selectAnalyticalWidgetByRef } from "../../store/layout/layoutSelectors.js";
|
|
@@ -45,22 +45,17 @@ export function* drillToDashboardHandler(ctx, cmd) {
|
|
|
45
45
|
: // if drilling to other, resolve widget filter ignores
|
|
46
46
|
widgetAwareFilters;
|
|
47
47
|
const dateAttributes = yield select(selectCatalogDateAttributes);
|
|
48
|
-
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
49
48
|
const filteredIntersection = cmd.payload.drillDefinition.drillIntersectionIgnoredAttributes
|
|
50
49
|
? removeIgnoredValuesFromDrillIntersection(cmd.payload.drillEvent.drillContext.intersection ?? [], cmd.payload.drillDefinition.drillIntersectionIgnoredAttributes ?? [])
|
|
51
50
|
: cmd.payload.drillEvent.drillContext.intersection;
|
|
52
51
|
const filtersCount = dashboardFilters.length;
|
|
53
|
-
const drillIntersectionFilters = convertIntersectionToAttributeFilters(filteredIntersection, dateAttributes.map((dA) => dA.attribute.ref),
|
|
52
|
+
const drillIntersectionFilters = convertIntersectionToAttributeFilters(filteredIntersection, dateAttributes.map((dA) => dA.attribute.ref), false, filtersCount);
|
|
54
53
|
const [transformedFilters, attributeFilterConfigsFromTransformation] = transformToPrimaryLabelFilters(drillIntersectionFilters, filtersCount);
|
|
55
|
-
const attributeFilterConfigs =
|
|
56
|
-
const intersectionFilters =
|
|
57
|
-
? transformedFilters
|
|
58
|
-
: drillIntersectionFilters.map((f) => f.attributeFilter);
|
|
54
|
+
const attributeFilterConfigs = attributeFilterConfigsFromTransformation;
|
|
55
|
+
const intersectionFilters = transformedFilters;
|
|
59
56
|
const attributeFilterDisplayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
attributeFilterConfigs.push(...dashboardFilterConfigs);
|
|
63
|
-
}
|
|
57
|
+
const dashboardFilterConfigs = getDashboardFilterConfigs(dashboardFilters, attributeFilterDisplayAsLabelMap);
|
|
58
|
+
attributeFilterConfigs.push(...dashboardFilterConfigs);
|
|
64
59
|
// concat everything, order is important – drill filters must go first
|
|
65
60
|
const resultingFilters = compact([commonDateFilter, ...intersectionFilters, ...dashboardFilters]);
|
|
66
61
|
// put end event
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToDashboardHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;
|
|
1
|
+
{"version":3,"file":"drillToDashboardHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEtD,OAAO,EAAkB,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAWH,eAAe,EACf,eAAe,EACf,0BAA0B,EAC1B,YAAY,EACZ,eAAe,EACf,cAAc,EACd,6BAA6B,GAChC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAEH,qCAAqC,EACrC,wCAAwC,GAC3C,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACH,yCAAyC,EACzC,uCAAuC,GAC1C,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAEH,yBAAyB,EACzB,wBAAwB,GAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EACH,6CAA6C,EAC7C,qCAAqC,GACxC,MAAM,uEAAuE,CAAC;AAC/E,OAAO,EAAE,iCAAiC,EAAE,MAAM,iEAAiE,CAAC;AACpH,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACxF,OAAO,EACH,mCAAmC,EACnC,6BAA6B,EAC7B,mCAAmC,GACtC,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAIpF,MAAM,SAAS,CAAC,CAAC,uBAAuB,CACpC,GAAqB,EACrB,GAAqB;IAErB,kBAAkB;IAClB,MAAM,GAAG,CACL,yBAAyB,CACrB,GAAG,EACH,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CACJ,CAAC;IAEF,mFAAmF;IACnF,MAAM,MAAM,GAAmB,MAAM,MAAM,CACvC,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,SAAU,CAAC,CACjE,CAAC;IACF,MAAM,OAAO,GAAa,MAAM,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAE3E,kFAAkF;IAClF,SAAS,CAAC,OAAO,CAAC,CAAC;IAEnB,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACnF,4HAA4H;IAC5H,MAAM,gBAAgB,GAAgD,mBAAmB;QACrF,CAAC,CAAC,MAAM,MAAM,CAAC,wBAAwB,CAAC;QACxC,CAAC,CAAC,SAAS,CAAC;IAEhB,0BAA0B;IAC1B,MAAM,gBAAgB,GAAG,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAE/F,MAAM,2BAA2B,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACpF,MAAM,yBAAyB,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;IAChF,MAAM,uBAAuB,GAAG,2BAA2B,IAAI,yBAAyB,CAAC;IAEzF,MAAM,eAAe,GAA6C,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACtG,MAAM,mBAAmB,GACrB,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAE5C,MAAM,kBAAkB,GAA0D,gBAAgB;QAC9F,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE,MAAM,EAAE,uBAAuB,CAAC,CAAC;IAEvF,MAAM,gBAAgB,GAAG,gBAAgB;QACrC,CAAC,CAAC,6CAA6C;YAC7C,uBAAuB;gBACrB,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,mBAAmB;QACzB,CAAC,CAAC,sDAAsD;YACtD,kBAAkB,CAAC;IAEzB,MAAM,cAAc,GAChB,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAE9C,MAAM,oBAAoB,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,kCAAkC;QACvF,CAAC,CAAC,wCAAwC,CACpC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,YAAY,IAAI,EAAE,EACtD,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,kCAAkC,IAAI,EAAE,CACvE;QACH,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,YAAa,CAAC;IAExD,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC7C,MAAM,wBAAwB,GAAG,qCAAqC,CAClE,oBAAoB,EACpB,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAC5C,KAAK,EACL,YAAY,CACf,CAAC;IAEF,MAAM,CAAC,kBAAkB,EAAE,wCAAwC,CAAC,GAAG,8BAA8B,CACjG,wBAAwB,EACxB,YAAY,CACf,CAAC;IAEF,MAAM,sBAAsB,GACxB,wCAAwC,CAAC;IAC7C,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;IAE/C,MAAM,gCAAgC,GAClC,MAAM,MAAM,CAAC,6CAA6C,CAAC,CAAC;IAEhE,MAAM,sBAAsB,GAAG,yBAAyB,CACpD,gBAAgB,EAChB,gCAAgC,CACnC,CAAC;IACF,sBAAsB,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvD,sEAAsE;IACtE,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,gBAAgB,EAAE,GAAG,mBAAmB,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;IAElG,gBAAgB;IAChB,OAAO,wBAAwB,CAC3B,GAAG,EACH,gBAAgB,EAChB,sBAAsB,EACtB,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC;AAED,SAAS,yBAAyB,CAC9B,gBAAmE,EACnE,gCAAqD;IAErD,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;QAC9C,IAAI,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC;YAC/D,MAAM,cAAc,GAAG,eAAe;gBAClC,CAAC,CAAC,gCAAgC,CAAC,GAAG,CAAC,eAAe,CAAC;gBACvD,CAAC,CAAC,SAAS,CAAC;YAChB,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;gBACpC,MAAM,CAAC,IAAI,CAAC;oBACR,eAAe;oBACf,cAAc;iBACjB,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,EAAuC,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,8BAA8B,CACnC,wBAA6C,EAC7C,eAAuB,CAAC;IAExB,MAAM,sBAAsB,GAAsC,EAAE,CAAC;IACrE,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7D,IACI,CAAC,CAAC,YAAY;YACd,CAAC,eAAe,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,WAAW,CAAC,EACjF,CAAC;YACC,MAAM,eAAe,GACjB,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,eAAe;gBACjD,6BAA6B,CACzB,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,WAAW,EAC7C,YAAY,GAAG,CAAC,CACnB,CAAC;YACN,sBAAsB,CAAC,IAAI,CAAC;gBACxB,eAAe;gBACf,cAAc,EAAE,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,WAAW;aAChE,CAAC,CAAC;YACH,OAAO;gBACH,eAAe,EAAE;oBACb,GAAG,CAAC,CAAC,eAAe,CAAC,eAAe;oBACpC,eAAe,EAAE,6BAA6B;oBAC9C,WAAW,EAAE,CAAC,CAAC,YAAY;iBAC9B;aACJ,CAAC;QACN,CAAC;QACD,OAAO,CAAC,CAAC,eAAe,CAAC;IAC7B,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;AACxD,CAAC;AAED,wEAAwE;AACxE,SAAS,wBAAwB,CAAC,KAAqB;IACnD,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAE9D,OAAO,gBAAgB,IAAI,6BAA6B,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,yBAAyB,CAAC,KAAqB;IACpD,OAAO,mCAAmC,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAqB;IAChD,OAAO,mCAAmC,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,2BAA2B,CAChC,MAAwD,EACxD,MAAsB;IAEtB,OAAO,0BAA0B,CAAC,MAAM,CAAC;QACrC,CAAC,CAAC,yCAAyC,CAAC,MAAM,CAAC;QACnD,CAAC,CAAC,uCAAuC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAClE,CAAC;AAED,QAAQ,CAAC,CAAC,8BAA8B,CACpC,GAAqB,EACrB,MAAsB,EACtB,uBAAgC;IAEhC,MAAM,kBAAkB,GAA2D,MAAM,MAAM,CAC3F,uBAAuB,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,mCAAmC,CACtG,CAAC;IAEF,MAAM,sBAAsB,GAA6D,MAAM,MAAM,CACjG,qCAAqC,CACxC,CAAC;IAEF,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,EAAE,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;QACnD,cAAc,EAAE,MAAM;KACzB,CAAC,CAAC,CAAC;IAEJ,MAAM,aAAa,GAAG,MAAM,IAAI,CAC5B,2BAA2B,EAC3B,GAAG,EACH,MAAM,EACN,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EACvC,sBAAsB,CACzB,CAAC;IACF,OAAO,YAAY;SACd,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAW,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC/E,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAiB;IAC3C,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAE1C,OAAO,OAAO,CAAC,QAAQ,CAAC;QACpB,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE;YACvB,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBACxC,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;AACb,CAAC;AAED,SAAS,2BAA2B,CAChC,GAAqB,EACrB,MAAsB,EACtB,OAA2B,EAC3B,sBAAyD;IAEzD,OAAO,GAAG,CAAC,OAAO;SACb,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC;SACxB,UAAU,EAAE;SACZ,kDAAkD,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;AACzG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToInsightHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"drillToInsightHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM1C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACH,+BAA+B,EAGlC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,wBAAiB,qBAAqB,CAClC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,cAAc,GACpB,YAAY,CAAC,+BAA+B,CAAC,CAyB/C"}
|
|
@@ -1,18 +1,17 @@
|
|
|
1
|
+
// (C) 2021-2025 GoodData Corporation
|
|
1
2
|
import { put, select } from "redux-saga/effects";
|
|
2
3
|
import { addIntersectionFiltersToInsight } from "@gooddata/sdk-ui-ext";
|
|
3
4
|
import { removeIgnoredValuesFromDrillIntersection } from "./common/intersectionUtils.js";
|
|
4
5
|
import { drillToInsightRequested, drillToInsightResolved, } from "../../events/drill.js";
|
|
5
|
-
import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../store/config/configSelectors.js";
|
|
6
6
|
import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
|
|
7
7
|
export function* drillToInsightHandler(ctx, cmd) {
|
|
8
8
|
const { drillDefinition, drillEvent } = cmd.payload;
|
|
9
9
|
const insight = yield select(selectInsightByRef(drillDefinition.target));
|
|
10
10
|
yield put(drillToInsightRequested(ctx, insight, drillDefinition, drillEvent, cmd.correlationId));
|
|
11
|
-
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
12
11
|
const filteredIntersection = cmd.payload.drillDefinition.drillIntersectionIgnoredAttributes
|
|
13
12
|
? removeIgnoredValuesFromDrillIntersection(cmd.payload.drillEvent.drillContext.intersection ?? [], cmd.payload.drillDefinition.drillIntersectionIgnoredAttributes ?? [])
|
|
14
13
|
: cmd.payload.drillEvent.drillContext.intersection;
|
|
15
|
-
const insightWithDrillsApplied = addIntersectionFiltersToInsight(insight, filteredIntersection, ctx.backend.capabilities.supportsElementUris ?? true
|
|
14
|
+
const insightWithDrillsApplied = addIntersectionFiltersToInsight(insight, filteredIntersection, ctx.backend.capabilities.supportsElementUris ?? true);
|
|
16
15
|
return drillToInsightResolved(ctx, insightWithDrillsApplied, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId);
|
|
17
16
|
}
|
|
18
17
|
//# sourceMappingURL=drillToInsightHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToInsightHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"drillToInsightHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAGrC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,wCAAwC,EAAE,MAAM,+BAA+B,CAAC;AAEzF,OAAO,EAEH,uBAAuB,EACvB,sBAAsB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAG/E,MAAM,SAAS,CAAC,CAAC,qBAAqB,CAClC,GAAqB,EACrB,GAAmB;IAEnB,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IACpD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,GAAG,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAEjG,MAAM,oBAAoB,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,kCAAkC;QACvF,CAAC,CAAC,wCAAwC,CACpC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,YAAY,IAAI,EAAE,EACtD,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,kCAAkC,IAAI,EAAE,CACvE;QACH,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,YAAa,CAAC;IAExD,MAAM,wBAAwB,GAAG,+BAA+B,CAC5D,OAAO,EACP,oBAAqB,EACrB,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,IAAI,IAAI,CACvD,CAAC;IAEF,OAAO,sBAAsB,CACzB,GAAG,EACH,wBAAwB,EACxB,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
|
package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addAttributeFilterHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"addAttributeFilterHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK1C,OAAO,EACH,yBAAyB,EACzB,MAAM,EAIT,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAgBlE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAMjE,wBAAiB,yBAAyB,CACtC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,kBAAkB,EACvB,IAAI,GAAE,QAAQ,GAAG,aAAwB,GAC1C,YAAY,CAAC,IAAI,CAAC,CAsIpB;AAED,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,oBAAoB,EAAE,MAAM,EAC5B,cAAc,EAAE,yBAAyB;;;;;;sLAqC5C"}
|
package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js
CHANGED
|
@@ -10,7 +10,6 @@ import { invalidArgumentsProvided } from "../../../events/general.js";
|
|
|
10
10
|
import { dispatchDashboardEvent } from "../../../store/_infra/eventDispatcher.js";
|
|
11
11
|
import { attributeFilterConfigsActions } from "../../../store/attributeFilterConfigs/index.js";
|
|
12
12
|
import { selectBackendCapabilities } from "../../../store/backendCapabilities/backendCapabilitiesSelectors.js";
|
|
13
|
-
import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../../store/config/configSelectors.js";
|
|
14
13
|
import { selectCrossFilteringFiltersLocalIdentifiers } from "../../../store/drill/drillSelectors.js";
|
|
15
14
|
import { selectAttributeFilterDisplayFormsMap, selectCanAddMoreFilters, selectFilterContextAttributeFilterByDisplayForm, selectFilterContextAttributeFilterByLocalId, selectFilterContextAttributeFilters, } from "../../../store/filterContext/filterContextSelectors.js";
|
|
16
15
|
import { filterContextActions } from "../../../store/filterContext/index.js";
|
|
@@ -21,13 +20,8 @@ import { dispatchFilterContextChanged } from "../common.js";
|
|
|
21
20
|
export function* addAttributeFilterHandler(ctx, cmd, type = "normal") {
|
|
22
21
|
const { displayForm, index, initialIsNegativeSelection, initialSelection, parentFilters, selectionMode, mode, localIdentifier, primaryDisplayForm, title, } = cmd.payload;
|
|
23
22
|
const isUnderFilterCountLimit = yield select(selectCanAddMoreFilters);
|
|
24
|
-
const
|
|
25
|
-
const
|
|
26
|
-
const displayAsLabel = enableDuplicatedLabelValuesInAttributeFilter &&
|
|
27
|
-
primaryDisplayForm &&
|
|
28
|
-
!areObjRefsEqual(primaryDisplayForm, displayForm)
|
|
29
|
-
? displayForm
|
|
30
|
-
: undefined;
|
|
23
|
+
const usedDisplayForm = primaryDisplayForm || displayForm;
|
|
24
|
+
const displayAsLabel = primaryDisplayForm && !areObjRefsEqual(primaryDisplayForm, displayForm) ? displayForm : undefined;
|
|
31
25
|
if (!isUnderFilterCountLimit && type !== "crossfilter") {
|
|
32
26
|
throw invalidArgumentsProvided(ctx, cmd, `Attempting to add filter, even though the limit on the count of filters has been reached.`);
|
|
33
27
|
}
|
|
@@ -70,7 +64,7 @@ export function* addAttributeFilterHandler(ctx, cmd, type = "normal") {
|
|
|
70
64
|
mode,
|
|
71
65
|
}));
|
|
72
66
|
}
|
|
73
|
-
if (
|
|
67
|
+
if (displayAsLabel) {
|
|
74
68
|
attributeFilterConfigActions.push(attributeFilterConfigsActions.changeDisplayAsLabel({
|
|
75
69
|
localIdentifier: addedFilter.attributeFilter.localIdentifier,
|
|
76
70
|
displayAsLabel,
|
package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addAttributeFilterHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;
|
|
1
|
+
{"version":3,"file":"addAttributeFilterHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.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":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"changeAttributeDisplayFormHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAa7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,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
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
// (C) 2022-2025 GoodData Corporation
|
|
2
|
-
import { flatMap } from "lodash-es";
|
|
3
2
|
import { batchActions } from "redux-batched-actions";
|
|
4
3
|
import { call, put, select } from "redux-saga/effects";
|
|
5
4
|
import { invariant } from "ts-invariant";
|
|
@@ -11,16 +10,15 @@ import { queryAttributeByDisplayForm } from "../../../queries/index.js";
|
|
|
11
10
|
import { dispatchDashboardEvent } from "../../../store/_infra/eventDispatcher.js";
|
|
12
11
|
import { query } from "../../../store/_infra/queryCall.js";
|
|
13
12
|
import { selectAllCatalogDisplayFormsMap } from "../../../store/catalog/catalogSelectors.js";
|
|
14
|
-
import {
|
|
13
|
+
import { selectEnableImmediateAttributeFilterDisplayAsLabelMigration, selectIsApplyFiltersAllAtOnceEnabledAndSet, } from "../../../store/config/configSelectors.js";
|
|
15
14
|
import { selectFilterContextAttributeFilterByLocalId } from "../../../store/filterContext/filterContextSelectors.js";
|
|
16
15
|
import { filterContextActions } from "../../../store/filterContext/index.js";
|
|
17
16
|
import { dispatchFilterContextChanged } from "../common.js";
|
|
18
17
|
export function* changeAttributeDisplayFormHandler(ctx, cmd) {
|
|
19
18
|
const { filterLocalId, displayForm, isWorkingSelectionChange, isResultOfMigration } = cmd.payload;
|
|
20
|
-
const { backend: { capabilities: { supportsElementUris }, }, } = ctx;
|
|
21
19
|
const catalogDisplayFormsMap = yield select(selectAllCatalogDisplayFormsMap);
|
|
22
20
|
const attributes = yield call(query, queryAttributeByDisplayForm([displayForm]));
|
|
23
|
-
const attributeDisplayFormsMap = newDisplayFormMap([...flatMap(
|
|
21
|
+
const attributeDisplayFormsMap = newDisplayFormMap([...attributes.flatMap((a) => a.displayForms)]);
|
|
24
22
|
const displayFormData = catalogDisplayFormsMap.get(displayForm) || attributeDisplayFormsMap.get(displayForm);
|
|
25
23
|
invariant(displayFormData, "Inconsistent state in changeAttributeDisplayFormHandler, cannot update attribute filter with display form not available in the catalog.");
|
|
26
24
|
const attribute = displayFormData?.attribute;
|
|
@@ -31,7 +29,6 @@ export function* changeAttributeDisplayFormHandler(ctx, cmd) {
|
|
|
31
29
|
: "Cannot find the attribute for the display form used on the attribute filter.";
|
|
32
30
|
throw invalidArgumentsProvided(ctx, cmd, message);
|
|
33
31
|
}
|
|
34
|
-
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
35
32
|
const enableImmediateAttributeFilterDisplayAsLabelMigration = yield select(selectEnableImmediateAttributeFilterDisplayAsLabelMigration);
|
|
36
33
|
const isApplyAllAtOnceEnabledAndSet = yield select(selectIsApplyFiltersAllAtOnceEnabledAndSet);
|
|
37
34
|
yield put(batchActions([
|
|
@@ -40,8 +37,6 @@ export function* changeAttributeDisplayFormHandler(ctx, cmd) {
|
|
|
40
37
|
filterContextActions.changeAttributeDisplayForm({
|
|
41
38
|
filterLocalId,
|
|
42
39
|
displayForm,
|
|
43
|
-
supportsElementUris,
|
|
44
|
-
enableDuplicatedLabelValuesInAttributeFilter,
|
|
45
40
|
isWorkingSelectionChange: isWorkingSelectionChange &&
|
|
46
41
|
!enableImmediateAttributeFilterDisplayAsLabelMigration &&
|
|
47
42
|
isApplyAllAtOnceEnabledAndSet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeAttributeDisplayFormHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;
|
|
1
|
+
{"version":3,"file":"changeAttributeDisplayFormHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.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":"
|
|
1
|
+
{"version":3,"file":"changeFilterContextSelectionHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA0B1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAgBvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAI9D,wBAAiB,mCAAmC,CAChD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,4BAA4B,GAClC,YAAY,CAAC,IAAI,CAAC,CAoEpB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
// (C) 2021-2025 GoodData Corporation
|
|
1
2
|
import { compact, partition, uniqBy } from "lodash-es";
|
|
2
3
|
import { batchActions } from "redux-batched-actions";
|
|
3
4
|
import { all, call, put, select } from "redux-saga/effects";
|
|
@@ -7,7 +8,6 @@ import { canApplyDateFilter, dispatchFilterContextChanged, resetCrossFiltering }
|
|
|
7
8
|
import { dashboardFilterToFilterContextItem } from "../../../_staging/dashboard/dashboardFilterContext.js";
|
|
8
9
|
import { selectAttributeFilterConfigsOverrides } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
9
10
|
import { attributeFilterConfigsActions } from "../../store/attributeFilterConfigs/index.js";
|
|
10
|
-
import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../store/config/configSelectors.js";
|
|
11
11
|
import { selectIsCrossFiltering } from "../../store/drill/drillSelectors.js";
|
|
12
12
|
import { selectFilterContextAttributeFilterByDisplayForm, selectFilterContextAttributeFilterByLocalId, selectFilterContextAttributeFilters, selectFilterContextDateFilterByDataSet, selectFilterContextDateFiltersWithDimension, } from "../../store/filterContext/filterContextSelectors.js";
|
|
13
13
|
import { filterContextActions } from "../../store/filterContext/index.js";
|
|
@@ -27,13 +27,12 @@ export function* changeFilterContextSelectionHandler(ctx, cmd) {
|
|
|
27
27
|
return dashboardFilterToFilterContextItem(filter, !!ctx.backend.capabilities.supportsMultipleDateFilters);
|
|
28
28
|
}
|
|
29
29
|
});
|
|
30
|
-
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
31
30
|
const uniqueFilters = uniqBy(normalizedFilters, (filter) => {
|
|
32
31
|
const identification = isDashboardAttributeFilter(filter)
|
|
33
32
|
? filter.attributeFilter.displayForm
|
|
34
33
|
: filter.dateFilter.dataSet;
|
|
35
34
|
let config;
|
|
36
|
-
if (isDashboardAttributeFilter(filter)
|
|
35
|
+
if (isDashboardAttributeFilter(filter)) {
|
|
37
36
|
config = attributeFilterConfigs.find((config) => config.localIdentifier === filter.attributeFilter.localIdentifier);
|
|
38
37
|
}
|
|
39
38
|
// do not remove duplicates using same primary label, but different display as label
|
|
@@ -94,7 +93,6 @@ function* getDashboardFilterByDisplayAsLabelMatching(attributeFilter, attributeF
|
|
|
94
93
|
function* getAttributeFiltersUpdateActions(attributeFilters, attributeFilterConfigs, resetOthers, ctx) {
|
|
95
94
|
const updateActions = [];
|
|
96
95
|
const handledLocalIds = new Set();
|
|
97
|
-
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
98
96
|
const resolvedDisplayForms = yield call(resolveDisplayFormMetadata, ctx, attributeFilters.map((af) => af.attributeFilter.displayForm));
|
|
99
97
|
for (const attributeFilter of attributeFilters) {
|
|
100
98
|
const filterRef = attributeFilter.attributeFilter.displayForm;
|
|
@@ -104,7 +102,7 @@ function* getAttributeFiltersUpdateActions(attributeFilters, attributeFilterConf
|
|
|
104
102
|
}
|
|
105
103
|
let foundByDisplayAsLabel = false;
|
|
106
104
|
let foundByDashboardFilterDisplayAsLabel = false;
|
|
107
|
-
if (
|
|
105
|
+
if (!dashboardFilter) {
|
|
108
106
|
const result = yield call(getDashboardFilterByDisplayAsLabelMatching, attributeFilter, attributeFilterConfigs);
|
|
109
107
|
foundByDisplayAsLabel = result.foundByDisplayAsLabel;
|
|
110
108
|
foundByDashboardFilterDisplayAsLabel = result.foundByDashboardFilterDisplayAsLabel;
|
|
@@ -118,8 +116,6 @@ function* getAttributeFiltersUpdateActions(attributeFilters, attributeFilterConf
|
|
|
118
116
|
filterContextActions.addAttributeFilterDisplayForm(displayFormData), filterContextActions.changeAttributeDisplayForm({
|
|
119
117
|
filterLocalId: dashboardFilter.attributeFilter.localIdentifier,
|
|
120
118
|
displayForm: filterRef,
|
|
121
|
-
supportsElementUris: ctx.backend.capabilities.supportsElementUris,
|
|
122
|
-
enableDuplicatedLabelValuesInAttributeFilter,
|
|
123
119
|
}),
|
|
124
120
|
// backup current displayForm to the displayAsLabel
|
|
125
121
|
attributeFilterConfigsActions.changeDisplayAsLabel({
|
|
@@ -133,8 +129,6 @@ function* getAttributeFiltersUpdateActions(attributeFilters, attributeFilterConf
|
|
|
133
129
|
filterContextActions.addAttributeFilterDisplayForm(displayFormData), filterContextActions.changeAttributeDisplayForm({
|
|
134
130
|
filterLocalId: dashboardFilter.attributeFilter.localIdentifier,
|
|
135
131
|
displayForm: filterRef,
|
|
136
|
-
supportsElementUris: ctx.backend.capabilities.supportsElementUris,
|
|
137
|
-
enableDuplicatedLabelValuesInAttributeFilter,
|
|
138
132
|
}),
|
|
139
133
|
// clear displayAsLabel
|
|
140
134
|
attributeFilterConfigsActions.changeDisplayAsLabel({
|