@gooddata/sdk-ui-dashboard 11.36.0-alpha.3 → 11.36.0-alpha.6

package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.js

@@ -3,7 +3,7 @@ import { useCallback, useMemo, useState } from "react";
 import { useIntl } from "react-intl";
 import { invariant } from "ts-invariant";
 import { DEFAULT_CSV_DELIMITER, insightProperties, isAutomationExternalUserRecipient, isAutomationUnknownUserRecipient, isAutomationUserRecipient, isExportDefinitionDashboardRequestPayload, isExportDefinitionVisualizationObjectRequestPayload, isInsightWidget, isWidget, } from "@gooddata/sdk-model";
-import { areAutomationsEqual, convertCurrentUserToAutomationRecipient, convertCurrentUserToWorkspaceUser, convertExternalRecipientToAutomationRecipient, isCsvVisualizationAutomation, isCsvVisualizationExportDefinition, isDashboardAutomation, isXlsxVisualizationAutomation, isXlsxVisualizationExportDefinition, } from "../../../../_staging/automation/index.js";
+import { areAutomationsEqual, convertCurrentUserToAutomationRecipient, convertCurrentUserToWorkspaceUser, convertExternalRecipientToAutomationRecipient, } from "../../../../_staging/automation/index.js";
 import { useDashboardSelector } from "../../../../model/react/DashboardStoreProvider.js";
 import { selectEnableAutomationEvaluationMode, selectEnableExternalRecipients, selectSettings, selectTimezone, } from "../../../../model/store/config/configSelectors.js";
 import { selectAutomationCommonDateFilterId, selectDashboardHiddenFilters, } from "../../../../model/store/filtering/dashboardFilterSelectors.js";
@@ -17,7 +17,7 @@ import { toModifiedISOStringToTimezone, toNormalizedFirstRunAndCron, toNormalize
 import { getUserTimezone } from "../../utils/timezone.js";
 import { isEmail } from "../../utils/validate.js";
 import { useScheduleValidation } from "./useScheduleValidation.js";
-export function useEditScheduledEmail({ scheduledExportToEdit, notificationChannels, insight, widget, editedAutomationFilters, dashboardFilters, editedAutomationFiltersByTab, widgetFilters, maxAutomationsRecipients, setEditedAutomationFilters, setEditedAutomationFiltersByTab, availableFiltersAsVisibleFilters, storeFilters, setStoreFilters, enableAutomationFilterContext, filtersForNewAutomation, externalRecipientOverride, enableNewScheduledExport, defaultPdfPageSize, filtersDataByTab, availableFiltersAsVisibleFiltersByTab, }) {
+export function useEditScheduledEmail({ scheduledExportToEdit, notificationChannels, insight, widget, editedAutomationFilters, dashboardFilters, editedAutomationFiltersByTab, maxAutomationsRecipients, setEditedAutomationFilters, setEditedAutomationFiltersByTab, availableFiltersAsVisibleFilters, storeFilters, setStoreFilters, filtersForNewAutomation, externalRecipientOverride, enableNewScheduledExport, defaultPdfPageSize, filtersDataByTab, availableFiltersAsVisibleFiltersByTab, }) {
     const intl = useIntl();
     const [isCronValid, setIsCronValid] = useState(true);
     const [isTitleValid, setIsTitleValid] = useState(true);
@@ -45,21 +45,13 @@ export function useEditScheduledEmail({ scheduledExportToEdit, notificationChann
     const widgetTabMap = useDashboardSelector(selectWidgetLocalIdToTabIdMap);
     // Determine target tab ID if widget is present
     const targetTabId = widget?.localIdentifier ? widgetTabMap[widget.localIdentifier] : undefined;
-    const effectiveWidgetFilters = enableAutomationFilterContext
-        ? getAppliedWidgetFilters(editedAutomationFilters ?? [], dashboardHiddenFilters, widget, insight, commonDateFilterId, false)
-        : widgetFilters;
-    const effectiveWidgetFiltersWithInsight = enableAutomationFilterContext
-        ? getAppliedWidgetFilters(editedAutomationFilters ?? [], dashboardHiddenFilters, widget, insight, commonDateFilterId, true)
-        : widgetFilters;
-    const effectiveVisibleWidgetFilters = enableAutomationFilterContext
-        ? getVisibleFiltersByFilters(editedAutomationFilters, availableFiltersAsVisibleFilters, true)
-        : undefined;
-    const effectiveDashboardFilters = enableAutomationFilterContext
-        ? getAppliedDashboardFilters(editedAutomationFilters ?? [], dashboardHiddenFilters, isWidget ? true : storeFilters)
-        : dashboardFilters;
+    const effectiveWidgetFilters = getAppliedWidgetFilters(editedAutomationFilters ?? [], dashboardHiddenFilters, widget, insight, commonDateFilterId, false);
+    const effectiveWidgetFiltersWithInsight = getAppliedWidgetFilters(editedAutomationFilters ?? [], dashboardHiddenFilters, widget, insight, commonDateFilterId, true);
+    const effectiveVisibleWidgetFilters = getVisibleFiltersByFilters(editedAutomationFilters, availableFiltersAsVisibleFilters, true);
+    const effectiveDashboardFilters = getAppliedDashboardFilters(editedAutomationFilters ?? [], dashboardHiddenFilters, isWidget ? true : storeFilters);
     // Process filters per tab if provided (for dashboard automations with tabs enabled)
     const effectiveDashboardFiltersByTab = useMemo(() => {
-        if (!editedAutomationFiltersByTab || !enableAutomationFilterContext || !storeFilters) {
+        if (!editedAutomationFiltersByTab || !storeFilters) {
             return undefined;
         }
         // Apply the same processing as effectiveDashboardFilters to each tab's filters
@@ -72,13 +64,9 @@ export function useEditScheduledEmail({ scheduledExportToEdit, notificationChann
             }
             return acc;
         }, {});
-    }, [editedAutomationFiltersByTab, enableAutomationFilterContext, filtersDataByTab, storeFilters]);
-    const effectiveVisibleDashboardFilters = enableAutomationFilterContext
-        ? getVisibleFiltersByFilters(editedAutomationFilters ?? [], availableFiltersAsVisibleFilters, storeFilters)
-        : undefined;
-    const effectiveVisibleDashboardFiltersByTab = enableAutomationFilterContext
-        ? getVisibleFiltersByFiltersByTab(editedAutomationFiltersByTab, availableFiltersAsVisibleFiltersByTab, storeFilters)
-        : undefined;
+    }, [editedAutomationFiltersByTab, filtersDataByTab, storeFilters]);
+    const effectiveVisibleDashboardFilters = getVisibleFiltersByFilters(editedAutomationFilters ?? [], availableFiltersAsVisibleFilters, storeFilters);
+    const effectiveVisibleDashboardFiltersByTab = getVisibleFiltersByFiltersByTab(editedAutomationFiltersByTab, availableFiltersAsVisibleFiltersByTab, storeFilters);
     const [editedAutomation, setEditedAutomation] = useState(scheduledExportToEdit ??
         newAutomationMetadataObjectDefinition(isWidget
             ? {
@@ -170,12 +158,7 @@ export function useEditScheduledEmail({ scheduledExportToEdit, notificationChann
             },
         }));
     };
-    const onDashboardAttachmentsChange = (formats, 
-    // this needs to be here for compatibility with old component that doesn't use enableAutomationFilterContext
-    dashboardFiltersFromComponent) => {
-        const filtersToSave = enableAutomationFilterContext
-            ? effectiveDashboardFilters
-            : (dashboardFiltersFromComponent ?? effectiveDashboardFilters);
+    const onDashboardAttachmentsChange = (formats) => {
         setEditedAutomation((s) => {
             const currentExportDefinitions = s.exportDefinitions || [];
             const currentDashboardExportDefinitions = currentExportDefinitions.filter((exportDefinition) => isExportDefinitionDashboardRequestPayload(exportDefinition.requestPayload));
@@ -186,7 +169,7 @@ export function useEditScheduledEmail({ scheduledExportToEdit, notificationChann
             const newExportDefinitions = formatsToAdd.map((format) => newDashboardExportDefinitionMetadataObjectDefinition({
                 dashboardId: dashboardId,
                 dashboardTitle,
-                dashboardFilters: storeFilters ? filtersToSave : undefined,
+                dashboardFilters: storeFilters ? effectiveDashboardFilters : undefined,
                 filtersByTab: storeFilters ? effectiveDashboardFiltersByTab : undefined,
                 format,
             }));
@@ -224,71 +207,6 @@ export function useEditScheduledEmail({ scheduledExportToEdit, notificationChann
             };
         });
     };
-    const onDashboardAttachmentsChangeOld = (dashboardSelected, dashboardFilters) => {
-        if (dashboardSelected) {
-            const dashboardExportDefinition = newDashboardExportDefinitionMetadataObjectDefinition({
-                dashboardId: dashboardId,
-                dashboardTitle,
-                dashboardFilters,
-                format: "PDF",
-            });
-            const dashboardExportDefinitionExists = isDashboardAutomation(editedAutomation);
-            const updatedExportDefinitions = dashboardExportDefinitionExists
-                ? editedAutomation.exportDefinitions?.map((exportDefinition) => isExportDefinitionDashboardRequestPayload(exportDefinition.requestPayload)
-                    ? dashboardExportDefinition
-                    : exportDefinition)
-                : [...(editedAutomation.exportDefinitions ?? []), dashboardExportDefinition];
-            setEditedAutomation((s) => ({
-                ...s,
-                exportDefinitions: updatedExportDefinitions,
-            }));
-        }
-        else {
-            setEditedAutomation((s) => ({
-                ...s,
-                exportDefinitions: s.exportDefinitions?.filter((exportDefinition) => !isExportDefinitionDashboardRequestPayload(exportDefinition.requestPayload)),
-            }));
-        }
-    };
-    const onWidgetAttachmentsChangeOld = (selected, format, 
-    /**
-     * This prop may be removed in the future, once all automations are using new
-     * automation filter context. (enableAutomationFilterContext)
-     */
-    widgetFilters) => {
-        const automationTypeGuard = format === "CSV" ? isCsvVisualizationAutomation : isXlsxVisualizationAutomation;
-        const exportDefinitionTypeGuard = format === "CSV" ? isCsvVisualizationExportDefinition : isXlsxVisualizationExportDefinition;
-        invariant(isWidget, "Widget or insight is missing in scheduling dialog context.");
-        if (selected) {
-            const newExportDefinition = newWidgetExportDefinitionMetadataObjectDefinition({
-                insight,
-                widget,
-                dashboardId: dashboardId,
-                format,
-                widgetFilters: enableAutomationFilterContext ? effectiveWidgetFilters : widgetFilters,
-                widgetFiltersWithInsight: enableAutomationFilterContext
-                    ? effectiveWidgetFiltersWithInsight
-                    : widgetFilters,
-                dashboardFilters: effectiveDashboardFilters,
-                enableNewScheduledExport,
-                defaultPdfPageSize,
-            });
-            const exportDefinitionExists = automationTypeGuard(editedAutomation);
-            const updatedExportDefinitions = exportDefinitionExists
-                ? editedAutomation.exportDefinitions?.map((exportDefinition) => exportDefinitionTypeGuard(exportDefinition) ? newExportDefinition : exportDefinition)
-                : [...(editedAutomation.exportDefinitions ?? []), newExportDefinition];
-            setEditedAutomation((s) => ({
-                ...s,
-                exportDefinitions: updatedExportDefinitions,
-            }));
-        }
-        else {
-            setEditedAutomation((s) => ({
-                ...s,
-                exportDefinitions: s.exportDefinitions?.filter((exportDefinition) => !exportDefinitionTypeGuard(exportDefinition)),
-            }));
-        }
-    };
     const onXlsxSettingsChange = useCallback((settings) => {
         setEditedAutomation((s) => ({
             ...s,
@@ -489,14 +407,16 @@ export function useEditScheduledEmail({ scheduledExportToEdit, notificationChann
         // Update the editedFiltersByTab state
         setEditedAutomationFiltersByTab?.(newFiltersByTab);
         const shouldStoreFilters = storeFiltersParam ?? storeFilters;
-        const newEffectiveFiltersByTab = Object.entries(newFiltersByTab).reduce((acc, [tabId, filters]) => {
-            const tabHiddenFilters = filtersDataByTab?.find((tab) => tab.tabId === tabId)?.hiddenFilters ?? [];
-            const appliedFilters = getAppliedDashboardFilters(filters ?? [], tabHiddenFilters, shouldStoreFilters);
-            if (appliedFilters) {
-                acc[tabId] = appliedFilters;
-            }
-            return acc;
-        }, {});
+        const newEffectiveFiltersByTab = shouldStoreFilters
+            ? Object.entries(newFiltersByTab).reduce((acc, [tabId, filters]) => {
+                const tabHiddenFilters = filtersDataByTab?.find((tab) => tab.tabId === tabId)?.hiddenFilters ?? [];
+                const appliedFilters = getAppliedDashboardFilters(filters ?? [], tabHiddenFilters, true);
+                if (appliedFilters) {
+                    acc[tabId] = appliedFilters;
+                }
+                return acc;
+            }, {})
+            : undefined;
         const newVisibleFiltersByTab = getVisibleFiltersByFiltersByTab(newFiltersByTab, availableFiltersAsVisibleFiltersByTab, shouldStoreFilters);
         // Sync to export definitions AND metadata
         setEditedAutomation((s) => ({
@@ -685,9 +605,7 @@ export function useEditScheduledEmail({ scheduledExportToEdit, notificationChann
         onSubjectChange,
         onMessageChange,
         onDashboardAttachmentsChange,
-        onDashboardAttachmentsChangeOld,
         onWidgetAttachmentsChange,
-        onWidgetAttachmentsChangeOld,
         onXlsxSettingsChange,
         onPdfSettingsChange,
         onCsvSettingsChange,

package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useSaveScheduledEmailToBackend.js

@@ -2,14 +2,11 @@
 import { useCallback, useState } from "react";
 import { omit } from "lodash-es";
 import { useIntl } from "react-intl";
-import { isAllValuesAttributeFilter, isAllValuesDashboardAttributeFilter, isExportDefinitionDashboardRequestPayload, isExportDefinitionVisualizationObjectRequestPayload, isNoopAllTimeDashboardDateFilter, isNoopAllTimeDateFilter, } from "@gooddata/sdk-model";
-import { useDashboardSelector } from "../../../../model/react/DashboardStoreProvider.js";
-import { selectEnableAutomationFilterContext } from "../../../../model/store/config/configSelectors.js";
+import { isAllValuesAttributeFilter, isAllValuesDashboardAttributeFilter, isExportDefinitionDashboardRequestPayload, isExportDefinitionVisualizationObjectRequestPayload, } from "@gooddata/sdk-model";
 import { useCreateScheduledEmail } from "./useCreateScheduledEmail.js";
 import { useUpdateScheduledEmail } from "./useUpdateScheduledEmail.js";
 export function useSaveScheduledEmailToBackend(automation, { onSuccess, onError, onSubmit, onSaveSuccess, onSaveError, onSave, }) {
     const intl = useIntl();
-    const enableAutomationFilterContext = useDashboardSelector(selectEnableAutomationFilterContext);
     const [savingErrorMessage, setSavingErrorMessage] = useState(undefined);
     const scheduledEmailCreator = useCreateScheduledEmail({
         onSuccess: (scheduledEmail) => {
@@ -33,9 +30,9 @@ export function useSaveScheduledEmailToBackend(automation, { onSuccess, onError,
         },
     });
     const handleCreateScheduledEmail = useCallback((scheduledEmail) => {
-        const sanitizedAutomation = sanitizeAutomation(scheduledEmail, intl, enableAutomationFilterContext);
+        const sanitizedAutomation = sanitizeAutomation(scheduledEmail, intl);
         scheduledEmailCreator.create(sanitizedAutomation);
-    }, [scheduledEmailCreator, enableAutomationFilterContext, intl]);
+    }, [scheduledEmailCreator, intl]);
     const scheduledEmailUpdater = useUpdateScheduledEmail({
         onSuccess: onSaveSuccess,
         onError: (error) => {
@@ -56,11 +53,11 @@ export function useSaveScheduledEmailToBackend(automation, { onSuccess, onError,
         },
     });
     const handleUpdateScheduledEmail = useCallback((scheduledEmail) => {
-        const sanitizedAutomation = sanitizeAutomation(scheduledEmail, intl, enableAutomationFilterContext);
+        const sanitizedAutomation = sanitizeAutomation(scheduledEmail, intl);
         scheduledEmailUpdater.save(sanitizedAutomation);
-    }, [scheduledEmailUpdater, enableAutomationFilterContext, intl]);
+    }, [scheduledEmailUpdater, intl]);
     const handleSaveScheduledEmail = () => {
-        const sanitizedAutomation = sanitizeAutomation(automation, intl, enableAutomationFilterContext);
+        const sanitizedAutomation = sanitizeAutomation(automation, intl);
         if (sanitizedAutomation.id) {
             handleUpdateScheduledEmail(sanitizedAutomation);
         }
@@ -72,7 +69,7 @@ export function useSaveScheduledEmailToBackend(automation, { onSuccess, onError,
         scheduledEmailUpdater.savingStatus === "running";
     return { handleSaveScheduledEmail, isSavingScheduledEmail, savingErrorMessage };
 }
-function sanitizeAutomation(automationToSave, intl, enableAutomationFilterContext) {
+function sanitizeAutomation(automationToSave, intl) {
     const automation = {
         ...automationToSave,
     };
@@ -92,16 +89,14 @@ function sanitizeAutomation(automationToSave, intl, enableAutomationFilterContex
      * - "All values" attribute filters have no effect on execution and should not appear in notifications.
      */
     if (automation.exportDefinitions) {
-        automation.exportDefinitions = removeNoopFiltersFromExportDefinitions(automation.exportDefinitions, enableAutomationFilterContext);
+        automation.exportDefinitions = removeNoopFiltersFromExportDefinitions(automation.exportDefinitions);
     }
     return automation;
 }
-function removeNoopFiltersFromExportDefinitions(exportDefinitions, enableAutomationFilterContext) {
+function removeNoopFiltersFromExportDefinitions(exportDefinitions) {
     return exportDefinitions.map((exportDefinition) => {
         if (isExportDefinitionVisualizationObjectRequestPayload(exportDefinition.requestPayload)) {
             const filters = exportDefinition.requestPayload.content.filters;
-            const format = exportDefinition.requestPayload.format;
-            const isTabularFormat = format === "XLSX" || format === "CSV";
             return {
                 ...exportDefinition,
                 requestPayload: {
@@ -110,17 +105,8 @@ function removeNoopFiltersFromExportDefinitions(exportDefinitions, enableAutomat
                         ...exportDefinition.requestPayload.content,
                         filters: filters?.filter((filter) => {
                             // Strip noop "All values" attribute filters (handles both IFilter and FilterContextItem formats).
-                            if (isAllValuesAttributeFilter(filter) ||
-                                isAllValuesDashboardAttributeFilter(filter)) {
-                                return false;
-                            }
-                            // Strip noop "All time" date filters only for legacy path.
-                            if (!enableAutomationFilterContext) {
-                                return isTabularFormat
-                                    ? !isNoopAllTimeDateFilter(filter)
-                                    : !isNoopAllTimeDashboardDateFilter(filter);
-                            }
-                            return true;
+                            return (!isAllValuesAttributeFilter(filter) &&
+                                !isAllValuesDashboardAttributeFilter(filter));
                         }),
                     },
                 },
@@ -135,14 +121,7 @@ function removeNoopFiltersFromExportDefinitions(exportDefinitions, enableAutomat
                         ...exportDefinition.requestPayload.content,
                         filters: exportDefinition.requestPayload.content.filters?.filter((filter) => {
                             // Strip noop "All values" attribute filters.
-                            if (isAllValuesDashboardAttributeFilter(filter)) {
-                                return false;
-                            }
-                            // Strip noop "All time" date filters only for legacy path.
-                            if (!enableAutomationFilterContext && isNoopAllTimeDashboardDateFilter(filter)) {
-                                return false;
-                            }
-                            return true;
+                            return !isAllValuesDashboardAttributeFilter(filter);
                         }),
                     },
                 },

package/esm/presentation/scheduledEmail/hooks/useWidgetAutomationFilters.d.ts

@@ -0,0 +1,3 @@
+import { type IFilter, type IInsightDefinition } from "@gooddata/sdk-model";
+import { type FilterableDashboardWidget } from "../../../model/types/layoutTypes.js";
+export declare function useWidgetAutomationFilters(widget?: FilterableDashboardWidget, insight?: IInsightDefinition): import("../../../index.js").QueryProcessingState<IFilter[]>;

package/esm/presentation/scheduledEmail/hooks/useWidgetAutomationFilters.js

@@ -0,0 +1,46 @@
+// (C) 2026 GoodData Corporation
+import { useMemo } from "react";
+import { filterIsEmpty, filterLocalIdentifier, isAttributeFilter, isNoopAllTimeDateFilter, } from "@gooddata/sdk-model";
+import { useDashboardSelector } from "../../../model/react/DashboardStoreProvider.js";
+import { useWidgetFilters } from "../../../model/react/useWidgetFilters.js";
+import { selectCrossFilteringItems } from "../../../model/store/drill/drillSelectors.js";
+export function useWidgetAutomationFilters(widget, insight) {
+    const widgetFiltersQuery = useWidgetFilters(widget, insight);
+    const crossFilteringItems = useDashboardSelector(selectCrossFilteringItems);
+    return useMemo(() => {
+        const { result: widgetFilters, status: widgetFiltersStatus } = widgetFiltersQuery;
+        const sanitizedWidgetFilters = widgetFilters
+            ? sanitizeWidgetFilters(widgetFilters, crossFilteringItems)
+            : undefined;
+        if (widgetFiltersStatus === "success" && sanitizedWidgetFilters) {
+            return {
+                ...widgetFiltersQuery,
+                result: sanitizedWidgetFilters,
+            };
+        }
+        return widgetFiltersQuery;
+    }, [crossFilteringItems, widgetFiltersQuery]);
+}
+function sanitizeWidgetFilters(filters, crossFilteringItems) {
+    const withoutCrossFiltering = removeCrossFilteringFilters(filters, crossFilteringItems);
+    const withoutAllTimeDateFilters = removeAllTimeDateFilters(withoutCrossFiltering);
+    return removeEmptyAttributeFilters(withoutAllTimeDateFilters);
+}
+function removeCrossFilteringFilters(filters, crossFilteringItems) {
+    const crossFilteringFilterLocalIdentifiers = crossFilteringItems.flatMap((c) => c.filterLocalIdentifiers);
+    return filters.filter((filter) => {
+        const filterLocalId = filterLocalIdentifier(filter);
+        return filterLocalId ? !crossFilteringFilterLocalIdentifiers.includes(filterLocalId) : true;
+    });
+}
+function removeEmptyAttributeFilters(filters) {
+    return filters.filter((filter) => {
+        if (isAttributeFilter(filter)) {
+            return !filterIsEmpty(filter);
+        }
+        return true;
+    });
+}
+function removeAllTimeDateFilters(filters) {
+    return filters.filter((filter) => !isNoopAllTimeDateFilter(filter));
+}

package/esm/presentation/scheduledEmail/types.d.ts

@@ -1,13 +1,7 @@
 import { type ComponentType } from "react";
-import { type FilterContextItem, type IAutomationMetadataObject, type IAutomationMetadataObjectDefinition, type IFilter, type IInsight, type INotificationChannelIdentifier, type INotificationChannelMetadataObject, type IWorkspaceUser, type ObjRef } from "@gooddata/sdk-model";
+import { type FilterContextItem, type IAutomationMetadataObject, type IAutomationMetadataObjectDefinition, type IFilter, type IInsight, type INotificationChannelIdentifier, type INotificationChannelMetadataObject, type IWorkspaceUser } from "@gooddata/sdk-model";
 import { type GoodDataSdkError } from "@gooddata/sdk-ui";
 import { type ExtendedDashboardWidget } from "../../model/types/layoutTypes.js";
-/**
- * @internal
- */
-export interface IScheduledEmailDialogPropsContext {
-    widgetRef?: ObjRef | undefined;
-}
 /**
  * @alpha
  */

package/esm/presentation/scheduledEmail/utils/filters.d.ts

@@ -0,0 +1,2 @@
+import { type FilterContextItem } from "@gooddata/sdk-model";
+export declare function getAppliedDashboardFilters(selectedAutomationFilters: FilterContextItem[], dashboardHiddenFilters: FilterContextItem[], storeFilters?: boolean): FilterContextItem[] | undefined;

package/esm/presentation/scheduledEmail/utils/filters.js

@@ -0,0 +1,5 @@
+// (C) 2026 GoodData Corporation
+import { getAppliedDashboardFilters as getAppliedDashboardFiltersFromAutomationFilters } from "../../automationFilters/utils.js";
+export function getAppliedDashboardFilters(selectedAutomationFilters, dashboardHiddenFilters, storeFilters) {
+    return getAppliedDashboardFiltersFromAutomationFilters(selectedAutomationFilters, dashboardHiddenFilters, storeFilters);
+}

package/esm/presentation/shareDialog/DefaultShareDialog.d.ts

@@ -3,4 +3,4 @@ import { type IShareDialogProps } from "./types.js";
 /**
  * @alpha
  */
-export declare function DefaultShareDialog({ workspace, backend, isVisible, sharedObject, currentUser, isLockingSupported, isCurrentUserWorkspaceManager, currentUserPermissions, dashboardFilters, isShareGrantHidden, applyShareGrantOnSelect, showDashboardShareLink, isGranteeShareLoading, onApply, onCancel, onError, onInteraction, onShareLinkCopy }: IShareDialogProps): ReactElement | null;
+export declare function DefaultShareDialog({ workspace, backend, isVisible, sharedObject, currentUser, isLockingSupported, isCurrentUserWorkspaceManager, currentUserPermissions, dashboardFilters, dashboardParameters, isShareGrantHidden, applyShareGrantOnSelect, showDashboardShareLink, isGranteeShareLoading, onApply, onCancel, onError, onInteraction, onShareLinkCopy }: IShareDialogProps): ReactElement | null;

package/esm/presentation/shareDialog/DefaultShareDialog.js

@@ -8,7 +8,7 @@ import { selectLocale } from "../../model/store/config/configSelectors.js";
 /**
  * @alpha
  */
-export function DefaultShareDialog({ workspace, backend, isVisible, sharedObject, currentUser, isLockingSupported, isCurrentUserWorkspaceManager, currentUserPermissions, dashboardFilters, isShareGrantHidden, applyShareGrantOnSelect, showDashboardShareLink, isGranteeShareLoading, onApply, onCancel, onError, onInteraction, onShareLinkCopy, }) {
+export function DefaultShareDialog({ workspace, backend, isVisible, sharedObject, currentUser, isLockingSupported, isCurrentUserWorkspaceManager, currentUserPermissions, dashboardFilters, dashboardParameters, isShareGrantHidden, applyShareGrantOnSelect, showDashboardShareLink, isGranteeShareLoading, onApply, onCancel, onError, onInteraction, onShareLinkCopy, }) {
     const locale = useDashboardSelector(selectLocale);
     const intl = useIntl();
     const labels = useMemo(() => ({
@@ -26,5 +26,5 @@ export function DefaultShareDialog({ workspace, backend, isVisible, sharedObject
     if (!isVisible) {
         return null;
     }
-    return (_jsx(ShareDialog, { locale: locale, backend: backend, workspace: workspace, sharedObject: sharedObject, currentUser: currentUser, onApply: onApply, onCancel: onCancel, onError: onError, isLockingSupported: isLockingSupported, labels: labels, isCurrentUserWorkspaceManager: isCurrentUserWorkspaceManager, currentUserPermissions: currentUserPermissions, dashboardFilters: dashboardFilters, isShareGrantHidden: isShareGrantHidden, applyShareGrantOnSelect: applyShareGrantOnSelect, showDashboardShareLink: showDashboardShareLink, isGranteeShareLoading: isGranteeShareLoading, onInteraction: onInteraction, onShareLinkCopy: onShareLinkCopy }));
+    return (_jsx(ShareDialog, { locale: locale, backend: backend, workspace: workspace, sharedObject: sharedObject, currentUser: currentUser, onApply: onApply, onCancel: onCancel, onError: onError, isLockingSupported: isLockingSupported, labels: labels, isCurrentUserWorkspaceManager: isCurrentUserWorkspaceManager, currentUserPermissions: currentUserPermissions, dashboardFilters: dashboardFilters, dashboardParameters: dashboardParameters, isShareGrantHidden: isShareGrantHidden, applyShareGrantOnSelect: applyShareGrantOnSelect, showDashboardShareLink: showDashboardShareLink, isGranteeShareLoading: isGranteeShareLoading, onInteraction: onInteraction, onShareLinkCopy: onShareLinkCopy }));
 }

package/esm/presentation/shareDialog/types.d.ts

@@ -1,6 +1,6 @@
 import { type ComponentType } from "react";
 import { type IAnalyticalBackend } from "@gooddata/sdk-backend-spi";
-import { type FilterContextItem, type IUser } from "@gooddata/sdk-model";
+import { type FilterContextItem, type IDashboardParameter, type IUser } from "@gooddata/sdk-model";
 import { type GoodDataSdkError } from "@gooddata/sdk-ui";
 import { type CurrentUserPermissions, type IShareDialogInteractionData, type ISharedObject, type ISharingApplyPayload as ISharingDialogApplyPayload } from "@gooddata/sdk-ui-kit";
 /**
@@ -48,6 +48,10 @@ export interface IShareDialogProps {
      * Dashboard filters
      */
     dashboardFilters: FilterContextItem[];
+    /**
+     * Dashboard parameters
+     */
+    dashboardParameters?: IDashboardParameter[];
     /**
      * Is share grant hidden?
      */

package/esm/presentation/widget/insight/configuration/DrillTargets/useInvalidFilteringParametersIdentifiers.d.ts

@@ -1,3 +1,3 @@
-import { type IAttributeFilter, type IDashboardAttributeFilterConfig } from "@gooddata/sdk-model";
+import { type IAttributeFilter, type IDashboardAttributeFilterConfig, type IDashboardMeasureValueFilter, type IMeasureValueFilter } from "@gooddata/sdk-model";
 import { type UrlDrillTarget } from "../../../../drill/types.js";
-export declare function useInvalidFilteringParametersIdentifiers(urlDrillTarget: UrlDrillTarget | undefined, insightFilters: IAttributeFilter[] | undefined, dashboardFilters: IAttributeFilter[] | undefined, attributeFilterConfigs: IDashboardAttributeFilterConfig[] | undefined): string[];
+export declare function useInvalidFilteringParametersIdentifiers(urlDrillTarget: UrlDrillTarget | undefined, insightFilters: IAttributeFilter[] | undefined, dashboardFilters: IAttributeFilter[] | undefined, dashboardMeasureValueFilters: IDashboardMeasureValueFilter[] | undefined, insightMeasureValueFilters: IMeasureValueFilter[] | undefined, enableInsightMeasureValueFilters: boolean, attributeFilterConfigs: IDashboardAttributeFilterConfig[] | undefined): string[];

package/esm/presentation/widget/insight/configuration/DrillTargets/useInvalidFilteringParametersIdentifiers.js

@@ -2,16 +2,20 @@
 import { useMemo } from "react";
 import { uniq } from "lodash-es";
 import { areObjRefsEqual, filterObjRef, idRef, } from "@gooddata/sdk-model";
-import { getDashboardAttributeFilterPlaceholdersFromUrl, getInsightAttributeFilterPlaceholdersFromUrl, } from "@gooddata/sdk-model/internal";
+import { getDashboardAttributeFilterPlaceholdersFromUrl, getDashboardMeasureValueFilterPlaceholdersFromUrl, getInsightAttributeFilterPlaceholdersFromUrl, getInsightMeasureValueFilterPlaceholdersFromUrl, } from "@gooddata/sdk-model/internal";
 import { useDashboardSelector } from "../../../../../model/react/DashboardStoreProvider.js";
-import { selectAllCatalogDisplayFormsMap } from "../../../../../model/store/catalog/catalogSelectors.js";
+import { selectAllCatalogDisplayFormsMap, selectAllCatalogMeasuresMap, } from "../../../../../model/store/catalog/catalogSelectors.js";
+import { dashboardMeasureValueFilterMatchesIdentifier, insightMeasureValueFilterMatchesIdentifier, } from "../../../../../model/utils/measureValueFilterUtils.js";
 import { isDrillToCustomUrlConfig } from "../../../../drill/types.js";
-export function useInvalidFilteringParametersIdentifiers(urlDrillTarget, insightFilters, dashboardFilters, attributeFilterConfigs) {
+export function useInvalidFilteringParametersIdentifiers(urlDrillTarget, insightFilters, dashboardFilters, dashboardMeasureValueFilters, insightMeasureValueFilters, enableInsightMeasureValueFilters, attributeFilterConfigs) {
     const displayForms = useDashboardSelector(selectAllCatalogDisplayFormsMap);
+    const measures = useDashboardSelector(selectAllCatalogMeasuresMap);
     return useMemo(() => {
         if (isDrillToCustomUrlConfig(urlDrillTarget)) {
             const dashboardAttributeFilterParameters = getDashboardAttributeFilterPlaceholdersFromUrl(urlDrillTarget.customUrl);
             const insightAttributeFilterParameters = getInsightAttributeFilterPlaceholdersFromUrl(urlDrillTarget.customUrl);
+            const dashboardMeasureValueFilterParameters = getDashboardMeasureValueFilterPlaceholdersFromUrl(urlDrillTarget.customUrl);
+            const insightMeasureValueFilterParameters = getInsightMeasureValueFilterPlaceholdersFromUrl(urlDrillTarget.customUrl);
             const invalidDashboardParameters = dashboardAttributeFilterParameters
                 .filter(({ identifier }) => {
                 // parameter is invalid if either it points to display form that no longer exists
@@ -40,8 +44,35 @@ export function useInvalidFilteringParametersIdentifiers(urlDrillTarget, insight
                 });
             })
                 .map(({ identifier }) => identifier);
-            return uniq([...invalidDashboardParameters, ...invalidInsightParameters]);
+            const invalidDashboardMvfParameters = dashboardMeasureValueFilterParameters
+                .filter(({ identifier }) => {
+                return !dashboardMeasureValueFilters?.some((filter) => dashboardMeasureValueFilterMatchesIdentifier(filter.dashboardMeasureValueFilter.measure, identifier, measures));
+            })
+                .map(({ identifier }) => identifier);
+            const invalidInsightMvfParameters = enableInsightMeasureValueFilters
+                ? insightMeasureValueFilterParameters
+                    .filter(({ identifier }) => {
+                    return !insightMeasureValueFilters?.some((filter) => insightMeasureValueFilterMatchesIdentifier(filter.measureValueFilter.measure, identifier));
+                })
+                    .map(({ identifier }) => identifier)
+                : insightMeasureValueFilterParameters.map(({ identifier }) => identifier);
+            return uniq([
+                ...invalidDashboardParameters,
+                ...invalidInsightParameters,
+                ...invalidDashboardMvfParameters,
+                ...invalidInsightMvfParameters,
+            ]);
         }
         return [];
-    }, [displayForms, urlDrillTarget, insightFilters, dashboardFilters, attributeFilterConfigs]);
+    }, [
+        displayForms,
+        measures,
+        urlDrillTarget,
+        insightFilters,
+        dashboardFilters,
+        dashboardMeasureValueFilters,
+        insightMeasureValueFilters,
+        enableInsightMeasureValueFilters,
+        attributeFilterConfigs,
+    ]);
 }

package/esm/presentation/widget/insight/configuration/InsightAlertConfig/EditAlert.js

@@ -2,7 +2,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 // (C) 2022-2026 GoodData Corporation
 import { FormattedMessage, defineMessages, useIntl } from "react-intl";
 import { Bubble, BubbleHoverTrigger, Button, Input, Message, } from "@gooddata/sdk-ui-kit";
-import { AlertAttributeSelectOld } from "../../../../alerting/DefaultAlertingDialog/components/AlertAttributeSelectOld.js";
+import { AlertAttributeSelect } from "../../../../alerting/DefaultAlertingDialog/components/AlertAttributeSelect.js";
 import { AlertComparisonOperatorSelect } from "../../../../alerting/DefaultAlertingDialog/components/AlertComparisonOperatorSelect.js";
 import { AlertComparisonPeriodSelect } from "../../../../alerting/DefaultAlertingDialog/components/AlertComparisonPeriodSelect.js";
 import { AlertDestinationSelect } from "../../../../alerting/DefaultAlertingDialog/components/AlertDestinationSelect.js";
@@ -72,7 +72,7 @@ export function EditAlert({ alert, execResult, isNewAlert, hasAlerts, destinatio
             : intl.formatMessage({ id: "insightAlert.config.editAlert" }), onClose: onClose, onBack: hasAlerts ? onCancel : undefined, children: _jsxs("div", { className: "gd-edit-alert", children: [
                 _jsxs("div", { className: "gd-edit-alert__form", children: [
                         _jsxs("div", { className: "gd-edit-alert__form-content", children: [
-                                _jsx("label", { htmlFor: "alert.measure", className: "gd-edit-alert__measure-label", children: _jsx(FormattedMessage, { id: "insightAlert.config.when" }) }), _jsx(AlertMeasureSelect, { selectedMeasure: selectedMeasure, onMeasureChange: changeMeasure, measures: measures, overlayPositionType: overlayPositionType, id: "alert.measure" }), Boolean(canManageAttributes) && (_jsx(_Fragment, { children: _jsx(AlertAttributeSelectOld, { id: "alert.attribute", selectedAttribute: selectedAttribute, selectedValue: selectedValue, onAttributeChange: changeAttribute, attributes: attributes, catalogAttributes: catalogAttributes, catalogDateDatasets: catalogDateDatasets, getAttributeValues: getAttributeValues, isResultLoading: isResultLoading }) })), showFilterInfo ? (_jsxs("div", { className: "gd-edit-alert__measure-info", children: [Boolean(selectedComparator?.granularity) && (_jsx(FormattedMessage, { tagName: "span", id: "insightAlert.config.for.filter", values: {
+                                _jsx("label", { htmlFor: "alert.measure", className: "gd-edit-alert__measure-label", children: _jsx(FormattedMessage, { id: "insightAlert.config.when" }) }), _jsx(AlertMeasureSelect, { selectedMeasure: selectedMeasure, onMeasureChange: changeMeasure, measures: measures, overlayPositionType: overlayPositionType, id: "alert.measure" }), Boolean(canManageAttributes) && (_jsx(_Fragment, { children: _jsx(AlertAttributeSelect, { id: "alert.attribute", selectedAttribute: selectedAttribute, selectedValue: selectedValue, onAttributeChange: changeAttribute, attributes: attributes, catalogAttributes: catalogAttributes, catalogDateDatasets: catalogDateDatasets, getAttributeValues: getAttributeValues, isResultLoading: isResultLoading, showLabel: true, closeOnParentScroll: true }) })), showFilterInfo ? (_jsxs("div", { className: "gd-edit-alert__measure-info", children: [Boolean(selectedComparator?.granularity) && (_jsx(FormattedMessage, { tagName: "span", id: "insightAlert.config.for.filter", values: {
                                                 granularity: [
                                                     intl.formatMessage({ id: "granularity.this_keyword" }),
                                                     translateGranularity(intl, selectedComparator?.granularity),

package/esm/presentation/widget/insight/configuration/InsightAlertConfig/hooks/useInsightWidgetAlerting.js

@@ -6,7 +6,6 @@ import { useToastMessage } from "@gooddata/sdk-ui-kit";
 import { convertCurrentUserToAutomationRecipient } from "../../../../../../_staging/automation/index.js";
 import { refreshAutomations } from "../../../../../../model/commands/scheduledEmail.js";
 import { useDashboardDispatch, useDashboardSelector, } from "../../../../../../model/react/DashboardStoreProvider.js";
-import { useWidgetAlertFilters } from "../../../../../../model/react/filtering/useWidgetAlertFilters.js";
 import { DEFAULT_MAX_AUTOMATIONS } from "../../../../../../model/react/useDashboardAutomations/constants.js";
 import { useDashboardUserInteraction } from "../../../../../../model/react/useDashboardUserInteraction.js";
 import { useWorkspaceUsers } from "../../../../../../model/react/useWorkspaceUsers.js";
@@ -27,6 +26,7 @@ import { messages } from "../../../../../alerting/DefaultAlertingDialog/messages
 import { createDefaultAlert } from "../../../../../alerting/DefaultAlertingDialog/utils/convertors.js";
 import { getMeasureFormatsFromExecution } from "../../../../../alerting/DefaultAlertingDialog/utils/getters.js";
 import { getSupportedInsightAttributesByInsight, getSupportedInsightMeasuresByInsight, } from "../../../../../alerting/DefaultAlertingDialog/utils/items.js";
+import { useWidgetAutomationFilters } from "../../../../../scheduledEmail/hooks/useWidgetAutomationFilters.js";
 export const useInsightWidgetAlerting = ({ widget, closeInsightWidgetMenu }) => {
     const { addSuccess, addError } = useToastMessage();
     const { automationInteraction } = useDashboardUserInteraction();
@@ -98,10 +98,7 @@ export const useInsightWidgetAlerting = ({ widget, closeInsightWidgetMenu }) =>
             addError(messages.alertSaveError);
         },
     });
-    const { result: widgetFilters, status: widgetFiltersStatus } = useWidgetAlertFilters({
-        widget,
-        insight,
-    });
+    const { result: widgetFilters, status: widgetFiltersStatus } = useWidgetAutomationFilters(widget, insight);
     const locale = useDashboardSelector(selectLocale);
     const settings = useDashboardSelector(selectSettings);
     const supportedAttributes = useMemo(() => getSupportedInsightAttributesByInsight(insight, catalogDateDatasets), [insight, catalogDateDatasets]);
@@ -163,11 +160,11 @@ export const useInsightWidgetAlerting = ({ widget, closeInsightWidgetMenu }) =>
         defaultNotificationChannelId,
         supportedMeasures,
         widgetFilters,
-        widgetFiltersStatus,
         addError,
         currentUser,
         users,
         usersStatus,
+        widgetFiltersStatus,
         measureFormatMap,
     ]);
     useEffect(() => {

package/esm/presentation/widget/insight/configuration/InsightAlerts.js

@@ -1,13 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-// (C) 2022-2026 GoodData Corporation
-import { useDashboardSelector } from "../../../../model/react/DashboardStoreProvider.js";
-import { selectEnableAutomationFilterContext } from "../../../../model/store/config/configSelectors.js";
 import { InsightAlertsNew } from "./InsightAlertsNew.js";
-import { InsightAlertsOld } from "./InsightAlertsOld.js";
 export function InsightAlerts({ widget, onClose, onGoBack }) {
-    const enableAutomationFilters = useDashboardSelector(selectEnableAutomationFilterContext);
-    if (enableAutomationFilters) {
-        return _jsx(InsightAlertsNew, { widget: widget, onClose: onClose, onGoBack: onGoBack });
-    }
-    return _jsx(InsightAlertsOld, { widget: widget, onClose: onClose, onGoBack: onGoBack });
+    return _jsx(InsightAlertsNew, { widget: widget, onClose: onClose, onGoBack: onGoBack });
 }