@gooddata/sdk-ui-dashboard 11.26.0 → 11.27.0-alpha.1
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 +8691 -5639
- 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/dashboard/dashboardFilterContext.d.ts.map +1 -1
- package/esm/_staging/dashboard/dashboardFilterContext.js +36 -22
- package/esm/_staging/dashboard/dashboardFilterContext.js.map +1 -1
- package/esm/_staging/dashboard/dashboardFilterConverter.d.ts +8 -11
- package/esm/_staging/dashboard/dashboardFilterConverter.d.ts.map +1 -1
- package/esm/_staging/dashboard/dashboardFilterConverter.js +36 -38
- package/esm/_staging/dashboard/dashboardFilterConverter.js.map +1 -1
- package/esm/_staging/sharedHooks/useFiltersNamings.d.ts.map +1 -1
- package/esm/_staging/sharedHooks/useFiltersNamings.js +54 -3
- package/esm/_staging/sharedHooks/useFiltersNamings.js.map +1 -1
- package/esm/converters/filterConverters.d.ts +14 -1
- package/esm/converters/filterConverters.d.ts.map +1 -1
- package/esm/converters/filterConverters.js +40 -9
- package/esm/converters/filterConverters.js.map +1 -1
- package/esm/index.d.ts +5 -5
- package/esm/index.d.ts.map +1 -1
- package/esm/index.js +4 -4
- package/esm/index.js.map +1 -1
- package/esm/internal.d.ts +2 -1
- package/esm/internal.d.ts.map +1 -1
- package/esm/internal.js +2 -1
- package/esm/internal.js.map +1 -1
- package/esm/kdaDialog/components/bars/AttributeBar.d.ts.map +1 -1
- package/esm/kdaDialog/components/bars/AttributeBar.js.map +1 -1
- package/esm/kdaDialog/dialog/hooks/useChangeAnalysis.js +2 -2
- package/esm/kdaDialog/dialog/hooks/useChangeAnalysis.js.map +1 -1
- package/esm/kdaDialog/utils.d.ts +1 -2
- package/esm/kdaDialog/utils.d.ts.map +1 -1
- package/esm/kdaDialog/utils.js +1 -10
- package/esm/kdaDialog/utils.js.map +1 -1
- package/esm/model/commandHandlers/common/validateDrillToCustomUrlParams.js +4 -4
- package/esm/model/commandHandlers/common/validateDrillToCustomUrlParams.js.map +1 -1
- package/esm/model/commandHandlers/dashboard/changeAttributeFilterDisplayAsLabelHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/dashboard/changeAttributeFilterDisplayAsLabelHandler.js +18 -4
- package/esm/model/commandHandlers/dashboard/changeAttributeFilterDisplayAsLabelHandler.js.map +1 -1
- package/esm/model/commandHandlers/dashboard/changeAttributeFilterLimitingItemsHandler.js +3 -3
- package/esm/model/commandHandlers/dashboard/changeAttributeFilterLimitingItemsHandler.js.map +1 -1
- package/esm/model/commandHandlers/dashboard/changeAttributeFilterModeHandler.js +3 -3
- package/esm/model/commandHandlers/dashboard/changeAttributeFilterModeHandler.js.map +1 -1
- package/esm/model/commandHandlers/dashboard/common/filterViews.d.ts.map +1 -1
- package/esm/model/commandHandlers/dashboard/common/filterViews.js +92 -3
- package/esm/model/commandHandlers/dashboard/common/filterViews.js.map +1 -1
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.js +11 -8
- package/esm/model/commandHandlers/drill/drillToDashboardHandler.js.map +1 -1
- package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.js +9 -5
- package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js +2 -2
- 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 +4 -12
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeDisplayFormHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeSelectionModeHandler.js +3 -3
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeSelectionModeHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeTitleHandler.js +3 -3
- package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeTitleHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/moveAttributeFilterHandler.js +2 -2
- package/esm/model/commandHandlers/filterContext/attributeFilter/moveAttributeFilterHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/removeAttributeFiltersHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/removeAttributeFiltersHandler.js +21 -16
- package/esm/model/commandHandlers/filterContext/attributeFilter/removeAttributeFiltersHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.d.ts +5 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.d.ts.map +1 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.js +46 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.js.map +1 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/resolveDisplayFormMetadata.d.ts +10 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/resolveDisplayFormMetadata.d.ts.map +1 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/resolveDisplayFormMetadata.js +27 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/resolveDisplayFormMetadata.js.map +1 -0
- package/esm/model/commandHandlers/filterContext/attributeFilter/setAttributeFilterDependentDateFilterHandler.js +3 -3
- package/esm/model/commandHandlers/filterContext/attributeFilter/setAttributeFilterDependentDateFilterHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/setAttributeFilterParentHandler.js +4 -4
- package/esm/model/commandHandlers/filterContext/attributeFilter/setAttributeFilterParentHandler.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/parentFiltersValidation.d.ts +2 -2
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/parentFiltersValidation.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/parentFiltersValidation.js +8 -7
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/parentFiltersValidation.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/uniqueFiltersValidation.d.ts +2 -2
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/uniqueFiltersValidation.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/uniqueFiltersValidation.js +3 -3
- package/esm/model/commandHandlers/filterContext/attributeFilter/validation/uniqueFiltersValidation.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js +60 -7
- package/esm/model/commandHandlers/filterContext/changeFilterContextSelectionHandler.js.map +1 -1
- package/esm/model/commandHandlers/index.d.ts.map +1 -1
- package/esm/model/commandHandlers/index.js +2 -0
- package/esm/model/commandHandlers/index.js.map +1 -1
- package/esm/model/commandHandlers/layout/validation/itemValidation.d.ts.map +1 -1
- package/esm/model/commandHandlers/layout/validation/itemValidation.js +7 -6
- package/esm/model/commandHandlers/layout/validation/itemValidation.js.map +1 -1
- package/esm/model/commandHandlers/widgets/changeInsightWidgetFilterSettingsHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/changeInsightWidgetFilterSettingsHandler.js +3 -3
- package/esm/model/commandHandlers/widgets/changeInsightWidgetFilterSettingsHandler.js.map +1 -1
- package/esm/model/commandHandlers/widgets/changeRichTextWidgetFilterSettingsHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/changeRichTextWidgetFilterSettingsHandler.js +3 -3
- package/esm/model/commandHandlers/widgets/changeRichTextWidgetFilterSettingsHandler.js.map +1 -1
- package/esm/model/commandHandlers/widgets/common/filterOperations.d.ts +3 -3
- package/esm/model/commandHandlers/widgets/common/filterOperations.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/common/filterOperations.js +12 -10
- package/esm/model/commandHandlers/widgets/common/filterOperations.js.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/filterValidation.d.ts +2 -2
- package/esm/model/commandHandlers/widgets/validation/filterValidation.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/validation/filterValidation.js +6 -5
- package/esm/model/commandHandlers/widgets/validation/filterValidation.js.map +1 -1
- package/esm/model/commands/base.d.ts +1 -1
- package/esm/model/commands/base.d.ts.map +1 -1
- package/esm/model/commands/filters.d.ts +64 -2
- package/esm/model/commands/filters.d.ts.map +1 -1
- package/esm/model/commands/filters.js +69 -2
- package/esm/model/commands/filters.js.map +1 -1
- package/esm/model/commands/index.d.ts +2 -2
- package/esm/model/commands/index.d.ts.map +1 -1
- package/esm/model/events/base.d.ts +1 -1
- package/esm/model/events/base.d.ts.map +1 -1
- package/esm/model/events/base.js +1 -1
- package/esm/model/events/base.js.map +1 -1
- package/esm/model/events/filters.d.ts +55 -20
- package/esm/model/events/filters.d.ts.map +1 -1
- package/esm/model/events/filters.js +17 -0
- package/esm/model/events/filters.js.map +1 -1
- package/esm/model/events/index.d.ts +2 -2
- package/esm/model/events/index.d.ts.map +1 -1
- package/esm/model/events/index.js.map +1 -1
- package/esm/model/queryServices/queryWidgetFilters.d.ts.map +1 -1
- package/esm/model/queryServices/queryWidgetFilters.js +3 -3
- package/esm/model/queryServices/queryWidgetFilters.js.map +1 -1
- package/esm/model/react/useDashboardAlerting/useEnableAutomationFilterContext.d.ts +0 -3
- package/esm/model/react/useDashboardAlerting/useEnableAutomationFilterContext.d.ts.map +1 -1
- package/esm/model/react/useDashboardAlerting/useEnableAutomationFilterContext.js +3 -12
- package/esm/model/react/useDashboardAlerting/useEnableAutomationFilterContext.js.map +1 -1
- package/esm/model/react/useDashboardCommand.d.ts +1 -0
- package/esm/model/react/useDashboardCommand.d.ts.map +1 -1
- package/esm/model/react/useDashboardCommandProcessing.d.ts +4 -0
- package/esm/model/react/useDashboardCommandProcessing.d.ts.map +1 -1
- package/esm/model/react/useWidgetFilters.d.ts.map +1 -1
- package/esm/model/react/useWidgetFilters.js +21 -15
- package/esm/model/react/useWidgetFilters.js.map +1 -1
- package/esm/model/store/config/configSelectors.d.ts +23 -0
- package/esm/model/store/config/configSelectors.d.ts.map +1 -1
- package/esm/model/store/config/configSelectors.js +35 -0
- package/esm/model/store/config/configSelectors.js.map +1 -1
- package/esm/model/store/filtering/dashboardFilterSelectors.d.ts.map +1 -1
- package/esm/model/store/filtering/dashboardFilterSelectors.js +17 -13
- package/esm/model/store/filtering/dashboardFilterSelectors.js.map +1 -1
- package/esm/model/store/meta/metaSelectors.d.ts.map +1 -1
- package/esm/model/store/meta/metaSelectors.js +7 -3
- package/esm/model/store/meta/metaSelectors.js.map +1 -1
- package/esm/model/store/tabs/filterContext/filterContextReducers.d.ts +32 -1
- package/esm/model/store/tabs/filterContext/filterContextReducers.d.ts.map +1 -1
- package/esm/model/store/tabs/filterContext/filterContextReducers.js +164 -14
- package/esm/model/store/tabs/filterContext/filterContextReducers.js.map +1 -1
- package/esm/model/store/tabs/filterContext/filterContextSelectors.d.ts +161 -14
- package/esm/model/store/tabs/filterContext/filterContextSelectors.d.ts.map +1 -1
- package/esm/model/store/tabs/filterContext/filterContextSelectors.js +222 -30
- package/esm/model/store/tabs/filterContext/filterContextSelectors.js.map +1 -1
- package/esm/model/store/tabs/filterContext/filterContextUtils.d.ts.map +1 -1
- package/esm/model/store/tabs/filterContext/filterContextUtils.js +54 -10
- package/esm/model/store/tabs/filterContext/filterContextUtils.js.map +1 -1
- package/esm/model/store/tabs/index.d.ts +8 -0
- package/esm/model/store/tabs/index.d.ts.map +1 -1
- package/esm/model/store/tabs/layout/layoutSelectors.d.ts.map +1 -1
- package/esm/model/store/tabs/layout/layoutSelectors.js +7 -5
- package/esm/model/store/tabs/layout/layoutSelectors.js.map +1 -1
- package/esm/model/utils/alertsUtils.d.ts.map +1 -1
- package/esm/model/utils/alertsUtils.js +3 -2
- package/esm/model/utils/alertsUtils.js.map +1 -1
- package/esm/model/utils/filterResolver.d.ts.map +1 -1
- package/esm/model/utils/filterResolver.js +4 -4
- package/esm/model/utils/filterResolver.js.map +1 -1
- package/esm/plugins/customizationApis/attributeFiltersCustomizer.d.ts +2 -2
- package/esm/plugins/customizationApis/attributeFiltersCustomizer.d.ts.map +1 -1
- package/esm/presentation/automationFilters/components/AutomationAttributeFilter.d.ts +2 -2
- package/esm/presentation/automationFilters/components/AutomationAttributeFilter.d.ts.map +1 -1
- package/esm/presentation/automationFilters/components/AutomationAttributeFilter.js.map +1 -1
- package/esm/presentation/automationFilters/components/AutomationAttributeFilterContext.d.ts +2 -2
- package/esm/presentation/automationFilters/components/AutomationAttributeFilterContext.d.ts.map +1 -1
- package/esm/presentation/automationFilters/components/AutomationAttributeFilterContext.js +1 -1
- package/esm/presentation/automationFilters/components/AutomationAttributeFilterContext.js.map +1 -1
- package/esm/presentation/automationFilters/components/AutomationFiltersSelect.d.ts.map +1 -1
- package/esm/presentation/automationFilters/components/AutomationFiltersSelect.js +10 -11
- package/esm/presentation/automationFilters/components/AutomationFiltersSelect.js.map +1 -1
- package/esm/presentation/automationFilters/hooks/useDefaultSelectedFiltersForExistingAutomation.d.ts +1 -1
- package/esm/presentation/automationFilters/hooks/useDefaultSelectedFiltersForExistingAutomation.d.ts.map +1 -1
- package/esm/presentation/automationFilters/hooks/useDefaultSelectedFiltersForExistingAutomation.js +9 -4
- package/esm/presentation/automationFilters/hooks/useDefaultSelectedFiltersForExistingAutomation.js.map +1 -1
- package/esm/presentation/automationFilters/useAutomationFilters.d.ts.map +1 -1
- package/esm/presentation/automationFilters/useAutomationFilters.js +5 -13
- package/esm/presentation/automationFilters/useAutomationFilters.js.map +1 -1
- package/esm/presentation/automationFilters/utils.d.ts.map +1 -1
- package/esm/presentation/automationFilters/utils.js +17 -15
- package/esm/presentation/automationFilters/utils.js.map +1 -1
- package/esm/presentation/dashboardContexts/types.d.ts +2 -2
- package/esm/presentation/dashboardContexts/types.d.ts.map +1 -1
- package/esm/presentation/dragAndDrop/DeleteDropZone.d.ts.map +1 -1
- package/esm/presentation/dragAndDrop/DeleteDropZone.js +4 -4
- package/esm/presentation/dragAndDrop/DeleteDropZone.js.map +1 -1
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DefaultAttributeFilterDraggingComponent.d.ts.map +1 -1
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DefaultAttributeFilterDraggingComponent.js +2 -2
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DefaultAttributeFilterDraggingComponent.js.map +1 -1
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.d.ts +4 -4
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.d.ts.map +1 -1
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.js +6 -4
- package/esm/presentation/dragAndDrop/draggableAttributeFilter/DraggableAttributeFilter.js.map +1 -1
- package/esm/presentation/dragAndDrop/draggableFilterDropZone/DraggableFilterDropZoneHint.d.ts.map +1 -1
- package/esm/presentation/dragAndDrop/draggableFilterDropZone/DraggableFilterDropZoneHint.js +2 -1
- package/esm/presentation/dragAndDrop/draggableFilterDropZone/DraggableFilterDropZoneHint.js.map +1 -1
- package/esm/presentation/dragAndDrop/types.d.ts +2 -2
- package/esm/presentation/dragAndDrop/types.d.ts.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditor.js +4 -4
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditor.js.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DisplayFormParam.d.ts.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DisplayFormParam.js +5 -3
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DisplayFormParam.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.d.ts +11 -0
- package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.js +63 -7
- package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.js +119 -34
- package/esm/presentation/filterBar/attributeFilter/DefaultDashboardAttributeFilter.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.js +11 -8
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/types.d.ts +8 -5
- package/esm/presentation/filterBar/attributeFilter/types.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.d.ts +2 -2
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.js +4 -3
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/useParentFilters.d.ts +2 -2
- package/esm/presentation/filterBar/attributeFilter/useParentFilters.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/useParentFilters.js +6 -4
- package/esm/presentation/filterBar/attributeFilter/useParentFilters.js.map +1 -1
- package/esm/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.d.ts.map +1 -1
- package/esm/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.js +1 -2
- package/esm/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultDashboardFilterGroup.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultDashboardFilterGroup.js +52 -11
- package/esm/presentation/filterBar/filterBar/DefaultDashboardFilterGroup.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.js +31 -3
- package/esm/presentation/filterBar/filterBar/DefaultFilterBar.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBarItem.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/DefaultFilterBarItem.js +12 -8
- package/esm/presentation/filterBar/filterBar/DefaultFilterBarItem.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/hooks/useResetFiltersButton.js +5 -5
- package/esm/presentation/filterBar/filterBar/hooks/useResetFiltersButton.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/types.d.ts +2 -2
- package/esm/presentation/filterBar/filterBar/types.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.d.ts +3 -3
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js +14 -9
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js.map +1 -1
- package/esm/presentation/filterBar/utils.d.ts.map +1 -1
- package/esm/presentation/filterBar/utils.js +4 -2
- package/esm/presentation/filterBar/utils.js.map +1 -1
- package/esm/presentation/widget/common/configuration/AttributeFilterConfiguration.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/AttributeFilterConfiguration.js +7 -6
- package/esm/presentation/widget/common/configuration/AttributeFilterConfiguration.js.map +1 -1
- package/esm/presentation/widget/common/configuration/FilterConfiguration.d.ts.map +1 -1
- package/esm/presentation/widget/common/configuration/FilterConfiguration.js +12 -9
- package/esm/presentation/widget/common/configuration/FilterConfiguration.js.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillFilters/optionMappings/mapDashboardFilterToOption.d.ts.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillFilters/optionMappings/mapDashboardFilterToOption.js +21 -2
- package/esm/presentation/widget/insight/configuration/DrillFilters/optionMappings/mapDashboardFilterToOption.js.map +1 -1
- package/esm/sdk-ui-dashboard.d.ts +371 -33
- package/package.json +20 -20
- package/styles/css/main.css +74 -50
- package/styles/css/main.css.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultDashboardDateFilter.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,OAAO,CAAC;AAiB1E,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAkB5D;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,EACvC,MAAM,EACN,aAAa,EACb,eAAe,EACf,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,mBAAmB,EACnB,KAAK,EACR,EAAE,yBAAyB,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"DefaultDashboardDateFilter.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,OAAO,CAAC;AAiB1E,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAkB5D;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,EACvC,MAAM,EACN,aAAa,EACb,eAAe,EACf,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,mBAAmB,EACnB,KAAK,EACR,EAAE,yBAAyB,GAAG,YAAY,CA6J1C"}
|
|
@@ -31,7 +31,6 @@ export function DefaultDashboardDateFilter({ filter, workingFilter, onFilterChan
|
|
|
31
31
|
const isApplyAllAtOnceEnabledAndSet = useDashboardSelector(selectIsApplyFiltersAllAtOnceEnabledAndSet);
|
|
32
32
|
const activeCalendars = useDashboardSelector(selectActiveCalendars);
|
|
33
33
|
const enableEmptyDateValues = useDashboardSelector(selectEnableKDEmptyDateValuesFilter);
|
|
34
|
-
const enableFilterAccessibility = settings?.enableFilterAccessibility;
|
|
35
34
|
const allDateDatasets = useDashboardSelector(selectCatalogDateDatasets);
|
|
36
35
|
let defaultDateFilterName;
|
|
37
36
|
if (filter?.dateFilter.dataSet) {
|
|
@@ -78,6 +77,6 @@ export function DefaultDashboardDateFilter({ filter, workingFilter, onFilterChan
|
|
|
78
77
|
}, [intl, filter?.dateFilter.dataSet, defaultDateFilterName]);
|
|
79
78
|
return (_jsx(DateFilter, { excludeCurrentPeriod: excludeCurrentPeriod, selectedFilterOption: dateFilterOption, workingExcludeCurrentPeriod: isApplyAllAtOnceEnabledAndSet ? workingExcludeCurrentPeriod : undefined, workingSelectedFilterOption: isApplyAllAtOnceEnabledAndSet ? workingFilterOption : undefined, dateFilterMode: readonly
|
|
80
79
|
? DashboardDateFilterConfigModeValues.READONLY
|
|
81
|
-
: DashboardDateFilterConfigModeValues.ACTIVE, filterOptions: dateFilterOptions, availableGranularities: config.availableGranularities, customFilterName: title, onApply: onApply, onSelect: isApplyAllAtOnceEnabledAndSet ? onSelect : undefined, dateFormat: dateFormat, locale: locale, isTimeForAbsoluteRangeEnabled: isTimeForAbsoluteRangeEnabled, isEditMode: isInEditMode, openOnInit: autoOpen, weekStart: weekStart, customIcon: visibilityIcon, showDropDownHeaderMessage: !filter?.dateFilter.dataSet, FilterConfigurationComponent: isConfigurationEnabled ? FilterConfigurationComponent : undefined, withoutApply: isApplyAllAtOnceEnabledAndSet, ButtonComponent: ButtonComponent, overlayPositionType: overlayPositionType,
|
|
80
|
+
: DashboardDateFilterConfigModeValues.ACTIVE, filterOptions: dateFilterOptions, availableGranularities: config.availableGranularities, customFilterName: title, onApply: onApply, onSelect: isApplyAllAtOnceEnabledAndSet ? onSelect : undefined, dateFormat: dateFormat, locale: locale, isTimeForAbsoluteRangeEnabled: isTimeForAbsoluteRangeEnabled, isEditMode: isInEditMode, openOnInit: autoOpen, weekStart: weekStart, customIcon: visibilityIcon, showDropDownHeaderMessage: !filter?.dateFilter.dataSet, FilterConfigurationComponent: isConfigurationEnabled ? FilterConfigurationComponent : undefined, withoutApply: isApplyAllAtOnceEnabledAndSet, ButtonComponent: ButtonComponent, overlayPositionType: overlayPositionType, activeCalendars: activeCalendars, enableEmptyDateValues: enableEmptyDateValues, hideDisabledExclude: true }));
|
|
82
81
|
}
|
|
83
82
|
//# sourceMappingURL=DefaultDashboardDateFilter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultDashboardDateFilter.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.tsx"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,OAAO,EAAqB,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EACH,mCAAmC,EAEnC,eAAe,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,UAAU,EAGV,gCAAgC,GACnC,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,2BAA2B,EAAE,MAAM,gDAAgD,CAAC;AAE7F,OAAO,EAAE,qCAAqC,EAAE,MAAM,yDAAyD,CAAC;AAChH,OAAO,EAAE,+CAA+C,EAAE,MAAM,+DAA+D,CAAC;AAChI,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,0EAA0E,CAAC;AACrH,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC7F,OAAO,EACH,qBAAqB,EACrB,mCAAmC,EACnC,0CAA0C,EAC1C,YAAY,EACZ,cAAc,EACd,eAAe,GAClB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CAAC,EACvC,MAAM,EACN,aAAa,EACb,eAAe,EACf,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,mBAAmB,EACnB,KAAK,GACmB,EAAgB;IACxC,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACxD,MAAM,6BAA6B,GAAG,oBAAoB,CAAC,0CAA0C,CAAC,CAAC;IACvG,MAAM,eAAe,GAAG,oBAAoB,CAAC,qBAAqB,CAAC,CAAC;IACpE,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,mCAAmC,CAAC,CAAC;IAExF,MAAM,
|
|
1
|
+
{"version":3,"file":"DefaultDashboardDateFilter.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/DefaultDashboardDateFilter.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultDashboardFilterGroup.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultDashboardFilterGroup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAyC,KAAK,SAAS,EAAwB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DefaultDashboardFilterGroup.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultDashboardFilterGroup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAyC,KAAK,SAAS,EAAwB,MAAM,OAAO,CAAC;AA2CpG,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAE9E;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,0BAA0B,GAAG,SAAS,CAiKxF"}
|
|
@@ -3,13 +3,13 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
3
3
|
import { useCallback, useMemo } from "react";
|
|
4
4
|
import { isEmpty } from "lodash-es";
|
|
5
5
|
import { useIntl } from "react-intl";
|
|
6
|
-
import { DashboardAttributeFilterConfigModeValues, dashboardFilterLocalIdentifier, getSelectedElementsCount, } from "@gooddata/sdk-model";
|
|
6
|
+
import { DashboardAttributeFilterConfigModeValues, dashboardAttributeFilterItemFilterElementsBy, dashboardAttributeFilterItemFilterElementsByDate, dashboardAttributeFilterItemLocalIdentifier, dashboardFilterLocalIdentifier, getSelectedElementsCount, isDashboardArbitraryAttributeFilter, isDashboardAttributeFilter, isDashboardMatchAttributeFilter, } from "@gooddata/sdk-model";
|
|
7
7
|
import { AttributeFilterDependencyTooltip, FilterGroup, useDeepEqualRefStablizer, } from "@gooddata/sdk-ui-filters";
|
|
8
8
|
import { isFilterBarAttributeFilter, } from "./useFiltersWithAddedPlaceholder.js";
|
|
9
9
|
import { convertDashboardAttributeFilterElementsUrisToValues } from "../../../_staging/dashboard/legacyFilterConvertors.js";
|
|
10
10
|
import { useDashboardSelector } from "../../../model/react/DashboardStoreProvider.js";
|
|
11
11
|
import { selectBackendCapabilities, selectSupportsElementUris, } from "../../../model/store/backendCapabilities/backendCapabilitiesSelectors.js";
|
|
12
|
-
import { selectIsApplyFiltersAllAtOnceEnabledAndSet } from "../../../model/store/config/configSelectors.js";
|
|
12
|
+
import { selectEnableArbitraryFilterKD, selectEnableMatchFilterKD, selectIsApplyFiltersAllAtOnceEnabledAndSet, } from "../../../model/store/config/configSelectors.js";
|
|
13
13
|
import { selectAttributeFilterConfigsDisplayAsLabelMap, selectEffectiveAttributeFiltersModeMap, } from "../../../model/store/tabs/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
14
14
|
import { DefaultDashboardAttributeFilter } from "../attributeFilter/DefaultDashboardAttributeFilter.js";
|
|
15
15
|
/**
|
|
@@ -23,15 +23,28 @@ export function DefaultDashboardFilterGroup(props) {
|
|
|
23
23
|
const capabilities = useDashboardSelector(selectBackendCapabilities);
|
|
24
24
|
const attributeFiltersDisplayAsLabelMap = useDashboardSelector(selectAttributeFilterConfigsDisplayAsLabelMap);
|
|
25
25
|
const attributeFiltersModeMap = useDashboardSelector(selectEffectiveAttributeFiltersModeMap);
|
|
26
|
+
const enableArbitraryFilter = useDashboardSelector(selectEnableArbitraryFilterKD);
|
|
27
|
+
const enableMatchFilter = useDashboardSelector(selectEnableMatchFilterKD);
|
|
26
28
|
const getFilterIdentifier = useCallback((filter) => {
|
|
27
|
-
return
|
|
29
|
+
return (dashboardAttributeFilterItemLocalIdentifier(filter.filter) ??
|
|
30
|
+
dashboardFilterLocalIdentifier(filter.filter));
|
|
28
31
|
}, []);
|
|
29
32
|
const hasSelectedElements = useCallback((filter) => {
|
|
30
|
-
|
|
33
|
+
if (isDashboardAttributeFilter(filter.filter)) {
|
|
34
|
+
return getSelectedElementsCount(filter.filter) > 0;
|
|
35
|
+
}
|
|
36
|
+
if (isDashboardArbitraryAttributeFilter(filter.filter)) {
|
|
37
|
+
return filter.filter.arbitraryAttributeFilter.values.length > 0;
|
|
38
|
+
}
|
|
39
|
+
if (isDashboardMatchAttributeFilter(filter.filter)) {
|
|
40
|
+
return filter.filter.matchAttributeFilter.literal.length > 0;
|
|
41
|
+
}
|
|
42
|
+
return true;
|
|
31
43
|
}, []);
|
|
32
44
|
const renderFilter = useCallback((filter, AttributeFilterComponent) => {
|
|
33
|
-
const
|
|
34
|
-
const
|
|
45
|
+
const localId = dashboardAttributeFilterItemLocalIdentifier(filter.filter);
|
|
46
|
+
const displayAsLabel = attributeFiltersDisplayAsLabelMap.get(localId);
|
|
47
|
+
const attributeFilterMode = attributeFiltersModeMap.get(localId);
|
|
35
48
|
const DashboardAttributeFilterComponent = CustomDashboardAttributeFilterComponent ?? DefaultDashboardAttributeFilter;
|
|
36
49
|
return (_jsx(DashboardAttributeFilterComponent, { filter: filter.filter, AttributeFilterComponent: AttributeFilterComponent, onFilterChanged: onAttributeFilterChanged, workingFilter: isApplyAllAtOnceEnabledAndSet ? filter.workingFilter : undefined, displayAsLabel: displayAsLabel, readonly: attributeFilterMode === DashboardAttributeFilterConfigModeValues.READONLY, passDropdownButton: false }));
|
|
37
50
|
}, [
|
|
@@ -47,6 +60,10 @@ export function DefaultDashboardFilterGroup(props) {
|
|
|
47
60
|
if (!isFilterBarAttributeFilter(filter)) {
|
|
48
61
|
return undefined;
|
|
49
62
|
}
|
|
63
|
+
// Text filter types (arbitrary, match) don't need URI conversion
|
|
64
|
+
if (!isDashboardAttributeFilter(filter.filter)) {
|
|
65
|
+
return filter;
|
|
66
|
+
}
|
|
50
67
|
if (supportElementUris) {
|
|
51
68
|
return filter;
|
|
52
69
|
}
|
|
@@ -56,14 +73,38 @@ export function DefaultDashboardFilterGroup(props) {
|
|
|
56
73
|
};
|
|
57
74
|
})
|
|
58
75
|
.filter((filter) => filter !== undefined)
|
|
59
|
-
.filter((filter) =>
|
|
60
|
-
|
|
61
|
-
|
|
76
|
+
.filter((filter) => {
|
|
77
|
+
const localId = dashboardAttributeFilterItemLocalIdentifier(filter.filter);
|
|
78
|
+
return (attributeFiltersModeMap.get(localId) !== DashboardAttributeFilterConfigModeValues.HIDDEN);
|
|
79
|
+
})
|
|
80
|
+
.filter((filter) => {
|
|
81
|
+
// Gate text filter types by feature flags
|
|
82
|
+
if (isDashboardArbitraryAttributeFilter(filter.filter)) {
|
|
83
|
+
return enableArbitraryFilter;
|
|
84
|
+
}
|
|
85
|
+
if (isDashboardMatchAttributeFilter(filter.filter)) {
|
|
86
|
+
return enableMatchFilter;
|
|
87
|
+
}
|
|
88
|
+
return true;
|
|
89
|
+
});
|
|
90
|
+
}, [
|
|
91
|
+
groupItem.filters,
|
|
92
|
+
supportElementUris,
|
|
93
|
+
attributeFiltersModeMap,
|
|
94
|
+
enableArbitraryFilter,
|
|
95
|
+
enableMatchFilter,
|
|
96
|
+
]);
|
|
62
97
|
const filterDependenciesByLocalIdUnstable = useMemo(() => {
|
|
63
98
|
return new Map(itemFilters.map((filter) => {
|
|
64
|
-
const
|
|
99
|
+
const localId = dashboardAttributeFilterItemLocalIdentifier(filter.filter);
|
|
100
|
+
// Match filter type has no parent filter dependencies by design
|
|
101
|
+
if (isDashboardMatchAttributeFilter(filter.filter)) {
|
|
102
|
+
return [localId, false];
|
|
103
|
+
}
|
|
104
|
+
const filterElementsBy = dashboardAttributeFilterItemFilterElementsBy(filter.filter);
|
|
105
|
+
const filterElementsByDate = dashboardAttributeFilterItemFilterElementsByDate(filter.filter);
|
|
65
106
|
const isDependent = !isEmpty(filterElementsBy) || !isEmpty(filterElementsByDate);
|
|
66
|
-
return [
|
|
107
|
+
return [localId, isDependent];
|
|
67
108
|
}));
|
|
68
109
|
}, [itemFilters]);
|
|
69
110
|
const filterDependenciesByLocalId = useDeepEqualRefStablizer(filterDependenciesByLocalIdUnstable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultDashboardFilterGroup.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultDashboardFilterGroup.tsx"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,OAAO,EAAyD,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEpG,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EACH,wCAAwC,EACxC,8BAA8B,EAC9B,wBAAwB,
|
|
1
|
+
{"version":3,"file":"DefaultDashboardFilterGroup.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultDashboardFilterGroup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBar.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DefaultFilterBar.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,OAAO,CAAC;AAyBvD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AA2ClD;;GAEG;AACH,eAAO,MAAM,iBAAiB,uBAmN7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,eAAe,GAAG,YAAY,CAkHrE"}
|
|
@@ -3,7 +3,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
|
|
|
3
3
|
import { useCallback } from "react";
|
|
4
4
|
import classNames from "classnames";
|
|
5
5
|
import { generateDateFilterLocalIdentifier } from "@gooddata/sdk-backend-base";
|
|
6
|
-
import { DashboardDateFilterConfigModeValues, areObjRefsEqual, isAllTimeDashboardDateFilter, isDashboardAttributeFilter, isDashboardDateFilter, } from "@gooddata/sdk-model";
|
|
6
|
+
import { DashboardDateFilterConfigModeValues, areObjRefsEqual, dashboardAttributeFilterItemDisplayForm, dashboardAttributeFilterItemLocalIdentifier, isAllTimeDashboardDateFilter, isDashboardAttributeFilter, isDashboardAttributeFilterItem, isDashboardDateFilter, } from "@gooddata/sdk-model";
|
|
7
7
|
import { DefaultFilterBarContainer } from "./DefaultFilterBarContainer.js";
|
|
8
8
|
import { DefaultFilterBarItem } from "./DefaultFilterBarItem.js";
|
|
9
9
|
import { groupFilterItems } from "./filterGroupUtils.js";
|
|
@@ -12,7 +12,7 @@ import { ResetFiltersButton } from "./ResetFiltersButton.js";
|
|
|
12
12
|
import { useFiltersWithAddedPlaceholder } from "./useFiltersWithAddedPlaceholder.js";
|
|
13
13
|
import { convertDashboardAttributeFilterElementsValuesToUris } from "../../../_staging/dashboard/legacyFilterConvertors.js";
|
|
14
14
|
import { setDashboardAttributeFilterConfigDisplayAsLabel } from "../../../model/commands/dashboard.js";
|
|
15
|
-
import { changeAttributeFilterSelection, changeDateFilterSelection, changeMigratedAttributeFilterSelection, changeWorkingAttributeFilterSelection, clearDateFilterSelection, setAttributeFilterDisplayForm, } from "../../../model/commands/filters.js";
|
|
15
|
+
import { changeAttributeFilterSelection, changeDateFilterSelection, changeMigratedAttributeFilterSelection, changeWorkingAttributeFilterSelection, clearDateFilterSelection, replaceAttributeFilterItemSelection, replaceWorkingAttributeFilterItemSelection, setAttributeFilterDisplayForm, } from "../../../model/commands/filters.js";
|
|
16
16
|
import { useDashboardDispatch, useDashboardSelector } from "../../../model/react/DashboardStoreProvider.js";
|
|
17
17
|
import { selectSupportsElementUris } from "../../../model/store/backendCapabilities/backendCapabilitiesSelectors.js";
|
|
18
18
|
import { selectEnableDashboardFilterGroups, selectEnableDateFilterIdentifiers, selectIsApplyFiltersAllAtOnceEnabledAndSet, selectIsExport, } from "../../../model/store/config/configSelectors.js";
|
|
@@ -39,10 +39,38 @@ export const useFilterBarProps = () => {
|
|
|
39
39
|
const enableDateFilterIdentifiers = useDashboardSelector(selectEnableDateFilterIdentifiers);
|
|
40
40
|
const dispatch = useDashboardDispatch();
|
|
41
41
|
const onAttributeFilterChanged = useCallback((filter, displayAsLabel, isWorkingSelectionChange, isResultOfMigration, isSelectionInvalid) => {
|
|
42
|
+
const localIdentifier = dashboardAttributeFilterItemLocalIdentifier(filter);
|
|
43
|
+
// Detect cross-type migration: incoming filter type differs from stored filter type.
|
|
44
|
+
// e.g. text filter in store being replaced by a list filter (or vice versa).
|
|
45
|
+
const existingFilter = filters.find((f) => isDashboardAttributeFilterItem(f) &&
|
|
46
|
+
dashboardAttributeFilterItemLocalIdentifier(f) === localIdentifier);
|
|
47
|
+
const isCrossTypeMigration = existingFilter
|
|
48
|
+
? isDashboardAttributeFilter(filter) !== isDashboardAttributeFilter(existingFilter)
|
|
49
|
+
: false;
|
|
50
|
+
// For text filter types OR cross-type migrations, use the replace command which
|
|
51
|
+
// swaps the entire filter item in the filter context.
|
|
52
|
+
if (!isDashboardAttributeFilter(filter) || isCrossTypeMigration) {
|
|
53
|
+
if (isWorkingSelectionChange && isApplyAllAtOnceEnabledAndSet) {
|
|
54
|
+
dispatch(replaceWorkingAttributeFilterItemSelection(localIdentifier, filter, undefined, isSelectionInvalid));
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
dispatch(replaceAttributeFilterItemSelection(localIdentifier, filter, undefined, isSelectionInvalid));
|
|
58
|
+
}
|
|
59
|
+
// For text→list migration: transfer the old text filter's displayForm
|
|
60
|
+
// as displayAsLabel on the new list filter (it was the secondary label).
|
|
61
|
+
if (isCrossTypeMigration && isDashboardAttributeFilter(filter) && existingFilter) {
|
|
62
|
+
const secondaryLabel = dashboardAttributeFilterItemDisplayForm(existingFilter);
|
|
63
|
+
if (!areObjRefsEqual(secondaryLabel, filter.attributeFilter.displayForm)) {
|
|
64
|
+
dispatch(setDashboardAttributeFilterConfigDisplayAsLabel(localIdentifier, secondaryLabel));
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
// Standard element-based attribute filter handling (existing flow)
|
|
42
70
|
const convertedFilter = supportElementUris
|
|
43
71
|
? filter
|
|
44
72
|
: convertDashboardAttributeFilterElementsValuesToUris(filter);
|
|
45
|
-
const { attributeElements, negativeSelection
|
|
73
|
+
const { attributeElements, negativeSelection } = convertedFilter.attributeFilter;
|
|
46
74
|
const getCurrentFilter = (existingFilter, filterLocalId) => {
|
|
47
75
|
return existingFilter
|
|
48
76
|
.filter(isDashboardAttributeFilter)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBar.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,OAAO,EAAqB,WAAW,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAE,iCAAiC,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,
|
|
1
|
+
{"version":3,"file":"DefaultFilterBar.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBarItem.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarItem.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,EAGH,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"DefaultFilterBarItem.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarItem.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,EAGH,KAAK,MAAM,EAOd,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EACH,KAAK,aAAa,EAIrB,MAAM,qCAAqC,CAAC;AA+B7C;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IACxD,IAAI,EAAE,aAAa,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,6BAA6B,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,qBAAqB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACrD,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,sBAAsB,EAAE,MAAM,IAAI,CAAC;CACtC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,GAAG,SAAS,CAoK1E"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { invariant } from "ts-invariant";
|
|
3
|
-
import { DashboardAttributeFilterConfigModeValues, DashboardDateFilterConfigModeValues, areObjRefsEqual, objRefToString, serializeObjRef, } from "@gooddata/sdk-model";
|
|
3
|
+
import { DashboardAttributeFilterConfigModeValues, DashboardDateFilterConfigModeValues, areObjRefsEqual, dashboardAttributeFilterItemDisplayForm, dashboardAttributeFilterItemLocalIdentifier, isDashboardAttributeFilter, objRefToString, serializeObjRef, } from "@gooddata/sdk-model";
|
|
4
4
|
import { DefaultDashboardFilterGroup } from "./DefaultDashboardFilterGroup.js";
|
|
5
5
|
import { isFilterBarAttributeFilter, isFilterBarFilterGroupItem, isFilterBarFilterPlaceholder, } from "./useFiltersWithAddedPlaceholder.js";
|
|
6
6
|
import { convertDashboardAttributeFilterElementsUrisToValues } from "../../../_staging/dashboard/legacyFilterConvertors.js";
|
|
@@ -52,12 +52,15 @@ export function DefaultFilterBarItem(props) {
|
|
|
52
52
|
}
|
|
53
53
|
if (isFilterBarAttributeFilter(item)) {
|
|
54
54
|
const { filter, filterIndex, workingFilter } = item;
|
|
55
|
-
const
|
|
55
|
+
const filterLocalId = dashboardAttributeFilterItemLocalIdentifier(filter);
|
|
56
|
+
const filterDisplayForm = dashboardAttributeFilterItemDisplayForm(filter);
|
|
57
|
+
// URI conversion only applies to standard element-based attribute filters
|
|
58
|
+
const convertedFilter = supportElementUris || !isDashboardAttributeFilter(filter)
|
|
56
59
|
? filter
|
|
57
60
|
: convertDashboardAttributeFilterElementsUrisToValues(filter);
|
|
58
61
|
const CustomAttributeFilterComponent = AttributeFilterComponentSet.MainComponentProvider(convertedFilter);
|
|
59
|
-
const attributeFilterMode = attributeFiltersModeMap.get(
|
|
60
|
-
const displayAsLabel = attributeFiltersDisplayAsLabelMap.get(
|
|
62
|
+
const attributeFilterMode = attributeFiltersModeMap.get(filterLocalId);
|
|
63
|
+
const displayAsLabel = attributeFiltersDisplayAsLabelMap.get(filterLocalId);
|
|
61
64
|
/**
|
|
62
65
|
* Use the attribute as key, not the display form.
|
|
63
66
|
* This is to make sure we do not remount this when user changes the display form used:
|
|
@@ -66,18 +69,19 @@ export function DefaultFilterBarItem(props) {
|
|
|
66
69
|
* This is fine because we do not allow multiple filters of the same attribute to be on
|
|
67
70
|
* the same dashboard.
|
|
68
71
|
*/
|
|
69
|
-
const
|
|
72
|
+
const convertedDisplayForm = dashboardAttributeFilterItemDisplayForm(convertedFilter);
|
|
73
|
+
const displayForm = displayFormsMap.get(convertedDisplayForm);
|
|
70
74
|
invariant(displayForm, "inconsistent state, display form for a filter was not found");
|
|
71
75
|
if (attributeFilterMode === DashboardAttributeFilterConfigModeValues.HIDDEN) {
|
|
72
76
|
return null;
|
|
73
77
|
}
|
|
74
|
-
if (
|
|
75
|
-
crossFilterLocalIds.includes(
|
|
78
|
+
if (filterLocalId &&
|
|
79
|
+
crossFilterLocalIds.includes(filterLocalId) &&
|
|
76
80
|
isWorkingFilterContextChanged &&
|
|
77
81
|
isApplyAllAtOnceEnabledAndSet) {
|
|
78
82
|
return null;
|
|
79
83
|
}
|
|
80
|
-
return (_jsx(DraggableAttributeFilter, { autoOpen: areObjRefsEqual(
|
|
84
|
+
return (_jsx(DraggableAttributeFilter, { autoOpen: areObjRefsEqual(filterDisplayForm, autoOpenFilter), filter: filter, workingFilter: isApplyAllAtOnceEnabledAndSet ? workingFilter : undefined, filterIndex: filterIndex, readonly: attributeFilterMode === DashboardAttributeFilterConfigModeValues.READONLY, displayAsLabel: displayAsLabel, FilterComponent: CustomAttributeFilterComponent, onAttributeFilterChanged: onAttributeFilterChanged, onAttributeFilterAdded: addDraggableFilterPlaceholder, onAttributeFilterClose: onCloseAttributeFilter }, `${objRefToString(displayForm.attribute)}-${filterLocalId}`));
|
|
81
85
|
}
|
|
82
86
|
if (item.filter.dateFilter.dataSet) {
|
|
83
87
|
const { filter, workingFilter, filterIndex } = item;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultFilterBarItem.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarItem.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DefaultFilterBarItem.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/DefaultFilterBarItem.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { useCallback, useMemo } from "react";
|
|
3
3
|
import { difference, isEqual, partition } from "lodash-es";
|
|
4
4
|
import { generateDateFilterLocalIdentifier } from "@gooddata/sdk-backend-base";
|
|
5
|
-
import { dashboardFilterLocalIdentifier,
|
|
5
|
+
import { dashboardAttributeFilterItemLocalIdentifier, dashboardFilterLocalIdentifier, isDashboardAttributeFilterItem, isDashboardCommonDateFilter, isDashboardDateFilter, isNoopAllTimeDashboardDateFilter, newAllTimeDashboardDateFilter, } from "@gooddata/sdk-model";
|
|
6
6
|
import { changeFilterContextSelection, removeAttributeFilters, resetFilterContextWorkingSelection, } from "../../../../model/commands/filters.js";
|
|
7
7
|
import { filterContextSelectionReset } from "../../../../model/events/filters.js";
|
|
8
8
|
import { useDashboardDispatch, useDashboardSelector, } from "../../../../model/react/DashboardStoreProvider.js";
|
|
@@ -73,11 +73,11 @@ const sanitizeFilters = (currentFilters, originalFilters, enableDateFilterIdenti
|
|
|
73
73
|
};
|
|
74
74
|
const getNewlyAddedFilterLocalIds = (currentFilters, originalFilters) => {
|
|
75
75
|
const originalAttributeFiltersLocalIds = originalFilters
|
|
76
|
-
.filter(
|
|
77
|
-
.map((filter) => filter
|
|
76
|
+
.filter(isDashboardAttributeFilterItem)
|
|
77
|
+
.map((filter) => dashboardAttributeFilterItemLocalIdentifier(filter));
|
|
78
78
|
const currentFiltersLocalIds = currentFilters
|
|
79
|
-
.filter(
|
|
80
|
-
.map((filter) => filter
|
|
79
|
+
.filter(isDashboardAttributeFilterItem)
|
|
80
|
+
.map((filter) => dashboardAttributeFilterItemLocalIdentifier(filter));
|
|
81
81
|
return difference(currentFiltersLocalIds, originalAttributeFiltersLocalIds);
|
|
82
82
|
};
|
|
83
83
|
const computeCanReset = (isEditMode, normalizedCurrentFilters, normalizedOriginalFilters, disableUserFilterReset, disableUserFilterResetByConfig, newlyAddedFiltersCount, isWorkingFilterContextChanged, isApplyAllAtOnceEnabledAndSet) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useResetFiltersButton.js","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3D,OAAO,EAAE,iCAAiC,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,
|
|
1
|
+
{"version":3,"file":"useResetFiltersButton.js","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ComponentType } from "react";
|
|
2
|
-
import { type
|
|
2
|
+
import { type DashboardAttributeFilterItem, type FilterContextItem, type IDashboardDateFilter, type IDashboardFilterGroupsConfig, type ObjRef } from "@gooddata/sdk-model";
|
|
3
3
|
/**
|
|
4
4
|
* @alpha
|
|
5
5
|
*/
|
|
@@ -22,7 +22,7 @@ export interface IFilterBarProps {
|
|
|
22
22
|
*
|
|
23
23
|
* @param filter - filter that has changed
|
|
24
24
|
*/
|
|
25
|
-
onAttributeFilterChanged: (filter:
|
|
25
|
+
onAttributeFilterChanged: (filter: DashboardAttributeFilterItem, displayAsLabel?: ObjRef) => void;
|
|
26
26
|
/**
|
|
27
27
|
* When value of a date filter that is part of the FilterBar changes, the filter bar MUST propagate the event
|
|
28
28
|
* using this callback.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,EACH,KAAK,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,EACH,KAAK,4BAA4B,EACjC,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,MAAM,EACd,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAE7B;;OAEG;IACH,cAAc,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAErC;;OAEG;IACH,kBAAkB,CAAC,EAAE,4BAA4B,CAAC;IAElD;;;;;OAKG;IACH,wBAAwB,EAAE,CAAC,MAAM,EAAE,4BAA4B,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAElG;;;;;;OAMG;IACH,mBAAmB,EAAE,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,EAAE,uBAAuB,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAE1G;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;CACpD;AAED;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type DashboardAttributeFilterItem, type FilterContextItem, type IDashboardDateFilter, type IDashboardFilterGroup, type ObjRef } from "@gooddata/sdk-model";
|
|
2
2
|
/**
|
|
3
3
|
* @internal
|
|
4
4
|
*/
|
|
@@ -15,9 +15,9 @@ export declare function isFilterBarFilterPlaceholder(object: any): object is Fil
|
|
|
15
15
|
* @internal
|
|
16
16
|
*/
|
|
17
17
|
export type FilterBarAttributeFilterIndexed = {
|
|
18
|
-
filter:
|
|
18
|
+
filter: DashboardAttributeFilterItem;
|
|
19
19
|
filterIndex: number;
|
|
20
|
-
workingFilter?:
|
|
20
|
+
workingFilter?: DashboardAttributeFilterItem;
|
|
21
21
|
};
|
|
22
22
|
/**
|
|
23
23
|
* @internal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFiltersWithAddedPlaceholder.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.tsx"],"names":[],"mappings":"AAMA,OAAO,EACH,KAAK,
|
|
1
|
+
{"version":3,"file":"useFiltersWithAddedPlaceholder.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.tsx"],"names":[],"mappings":"AAMA,OAAO,EACH,KAAK,4BAA4B,EACjC,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,MAAM,EAQd,MAAM,qBAAqB,CAAC;AAgB7B;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACrC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,0BAA0B,CAE9F;AAED;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC1C,MAAM,EAAE,4BAA4B,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,4BAA4B,CAAC;CAChD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG,+BAA+B,CAAC;AAClG,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,+BAA+B,CAEjG;AAED;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,sBAAsB,EAAE,CAAC;AAE/D;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACrC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,wBAAgB,kCAAkC,CAC9C,MAAM,EAAE,aAAa,GACtB,MAAM,IAAI,0BAA0B,CAStC;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,qBAAqB,CAAC;IACnC,OAAO,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,CAAC,EAAE,aAAa,uCAEhE;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GACnB,0BAA0B,GAC1B,+BAA+B,GAC/B,0BAA0B,GAC1B,yBAAyB,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,aAAa,EAAE,CAAC;AAQtD;;GAEG;AACH,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,iBAAiB,EAAE,EAC5B,cAAc,CAAC,EAAE,iBAAiB,EAAE,GACrC;IACC;QACI,gBAAgB,EAAE,oBAAoB,CAAC;QACvC,uBAAuB,CAAC,EAAE,oBAAoB,CAAC;QAC/C,+BAA+B,EAAE,uBAAuB,CAAC;QACzD,qBAAqB,EAAE,MAAM,CAAC;QAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;KACtC;IACD;QACI,6BAA6B,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QACvD,qBAAqB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;QACrD,uBAAuB,EAAE,MAAM,IAAI,CAAC;QACpC,sBAAsB,EAAE,MAAM,IAAI,CAAC;KACtC;CACJ,CA4MA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// (C) 2021-2026 GoodData Corporation
|
|
2
2
|
import { useCallback, useMemo, useState } from "react";
|
|
3
3
|
import { partition } from "lodash-es";
|
|
4
|
-
import { areObjRefsEqual,
|
|
4
|
+
import { areObjRefsEqual, dashboardAttributeFilterItemDisplayForm, isDashboardAttributeFilterItem, isDashboardCommonDateFilter, isDashboardDateFilter, isDashboardDateFilterWithDimension, isIdentifierRef, } from "@gooddata/sdk-model";
|
|
5
5
|
import { addAttributeFilter as addAttributeFilterAction, addDateFilter as addDateFilterAction, } from "../../../model/commands/filters.js";
|
|
6
6
|
import { useDashboardDispatch, useDashboardSelector } from "../../../model/react/DashboardStoreProvider.js";
|
|
7
7
|
import { dispatchAndWaitFor } from "../../../model/store/_infra/dispatchAndWaitFor.js";
|
|
@@ -16,7 +16,7 @@ export function isFilterBarFilterPlaceholder(object) {
|
|
|
16
16
|
return object.type === "filterPlaceholder";
|
|
17
17
|
}
|
|
18
18
|
export function isFilterBarAttributeFilter(object) {
|
|
19
|
-
return
|
|
19
|
+
return isDashboardAttributeFilterItem(object.filter);
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
22
22
|
* @internal
|
|
@@ -36,7 +36,7 @@ export function isFilterBarFilterGroupItem(object) {
|
|
|
36
36
|
return object !== undefined && "groupConfig" in object;
|
|
37
37
|
}
|
|
38
38
|
function isNotDashboardCommonDateFilter(obj) {
|
|
39
|
-
return
|
|
39
|
+
return isDashboardAttributeFilterItem(obj) || isDashboardDateFilterWithDimension(obj);
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
42
|
* @internal
|
|
@@ -47,7 +47,10 @@ export function useFiltersWithAddedPlaceholder(filters, workingFilters) {
|
|
|
47
47
|
const allAttributes = useDashboardSelector(selectCatalogAttributes);
|
|
48
48
|
const dateDatasetsMap = useDashboardSelector(selectAllCatalogDateDatasetsMap);
|
|
49
49
|
const commonWorkingDateFilter = workingFilters?.find(isDashboardCommonDateFilter);
|
|
50
|
-
const [draggableFilters,
|
|
50
|
+
const [draggableFilters, nonDraggableFilters] = partition(filters, isNotDashboardCommonDateFilter);
|
|
51
|
+
// nonDraggableFilters may contain new filter types (arbitrary, match) alongside the common date filter.
|
|
52
|
+
// Use a cast since TypeScript cannot narrow FilterContextItem exclusions through .find().
|
|
53
|
+
const commonDateFilter = nonDraggableFilters.find((f) => isDashboardCommonDateFilter(f));
|
|
51
54
|
const [dateFiltersWithDimensions, attributeFilters] = partition(draggableFilters, isDashboardDateFilterWithDimension);
|
|
52
55
|
const [selectedDisplayForm, setSelectedDisplayForm] = useState();
|
|
53
56
|
const [autoOpenFilter, setAutoOpenFilter] = useState();
|
|
@@ -82,9 +85,9 @@ export function useFiltersWithAddedPlaceholder(filters, workingFilters) {
|
|
|
82
85
|
}, [selectedDisplayForm, clearAddedFilter]);
|
|
83
86
|
const draggableFiltersWithPlaceholder = useMemo(() => {
|
|
84
87
|
const filterObjects = draggableFilters.map((filter, filterIndex) => {
|
|
85
|
-
if (
|
|
88
|
+
if (isDashboardAttributeFilterItem(filter)) {
|
|
86
89
|
const workingFilter = workingFilters
|
|
87
|
-
?.filter(
|
|
90
|
+
?.filter(isDashboardAttributeFilterItem)
|
|
88
91
|
.find((wf) => getFilterIdentifier(wf) === getFilterIdentifier(filter)) ?? filter;
|
|
89
92
|
return {
|
|
90
93
|
filter,
|
|
@@ -103,8 +106,8 @@ export function useFiltersWithAddedPlaceholder(filters, workingFilters) {
|
|
|
103
106
|
});
|
|
104
107
|
const containsAddedAttributeDisplayForm = selectedDisplayForm &&
|
|
105
108
|
draggableFilters.some((draggableFilter) => {
|
|
106
|
-
if (
|
|
107
|
-
return areObjRefsEqual(draggableFilter
|
|
109
|
+
if (isDashboardAttributeFilterItem(draggableFilter)) {
|
|
110
|
+
return areObjRefsEqual(dashboardAttributeFilterItemDisplayForm(draggableFilter), selectedDisplayForm);
|
|
108
111
|
}
|
|
109
112
|
return areObjRefsEqual(draggableFilter.dateFilter.dataSet, selectedDisplayForm);
|
|
110
113
|
});
|
|
@@ -139,7 +142,9 @@ export function useFiltersWithAddedPlaceholder(filters, workingFilters) {
|
|
|
139
142
|
// attribute filter added
|
|
140
143
|
const relatedAttribute = allAttributes.find((att) => att.displayForms.some((df) => areObjRefsEqual(df.ref, ref)));
|
|
141
144
|
const usedDisplayForm = relatedAttribute?.displayForms.find((df) => {
|
|
142
|
-
return attributeFilters
|
|
145
|
+
return attributeFilters
|
|
146
|
+
.filter(isDashboardAttributeFilterItem)
|
|
147
|
+
.find((x) => areObjRefsEqual(dashboardAttributeFilterItemDisplayForm(x), df.ref));
|
|
143
148
|
});
|
|
144
149
|
const primaryDisplayForm = relatedAttribute?.displayForms.find((df) => {
|
|
145
150
|
return df.isPrimary;
|