@gooddata/sdk-ui-dashboard 11.62.0-alpha.1 → 11.62.0-alpha.3

package/esm/model/commandHandlers/dashboard/common/stateInitializers.js

@@ -11,7 +11,7 @@ import { DEFAULT_FISCAL_DATE_FILTER_PRESET } from "../../../../_staging/dateFilt
 import { configHasFiscalPresets } from "../../../../_staging/dateFilterConfig/validation.js";
 import { getPrivateContext } from "../../../store/_infra/contexts.js";
 import { drillActions } from "../../../store/drill/index.js";
-import { isDashboardFilterRestricted, isDashboardObjectRestricted, } from "../../../store/filtering/restrictedFilterUtils.js";
+import { isDashboardFilterUsingRestrictedObject, isDashboardObjectRestricted, } from "../../../store/filtering/restrictedFilterUtils.js";
 import { insightsActions } from "../../../store/insights/index.js";
 import { metaActions } from "../../../store/meta/index.js";
 import { selectIsNewDashboard } from "../../../store/meta/metaSelectors.js";
@@ -70,7 +70,7 @@ function* processExistingTabFilterContext(ctx, tab, effectiveDateFilterConfig, d
     const storeUnavailableObjects = yield select(selectUnavailableObjects);
     const unavailableObjects = unavailableObjectsOverride ?? storeUnavailableObjects;
     // Resolve display forms for filters
-    const attributeFilterDisplayForms = yield call(resolveFilterDisplayForms, ctx, migratedFilterContext.filters.filter((filter) => !isDashboardFilterRestricted(filter, unavailableObjects)), displayAsLabels.filter((displayForm) => !isDashboardObjectRestricted(displayForm, "displayForm", unavailableObjects)), displayForms);
+    const attributeFilterDisplayForms = yield call(resolveFilterDisplayForms, ctx, migratedFilterContext.filters.filter((filter) => !isDashboardFilterUsingRestrictedObject(filter, unavailableObjects)), displayAsLabels.filter((displayForm) => !isDashboardObjectRestricted(displayForm, "displayForm", unavailableObjects)), displayForms);
     // Return the complete FilterContextState for this tab
     return [
         {
@@ -256,7 +256,7 @@ function* actionsToInitializeOrFillNewDashboard(ctx, settings, dateFilterConfig,
     const displayAsLabels = getDisplayAsLabels(effectiveAttributeFilterConfigs);
     const unavailableObjects = yield select(selectUnavailableObjects);
     // load DFs for both filter refs and displayAsLabels
-    const attributeFilterDisplayForms = yield call(resolveFilterDisplayForms, ctx, filterContextDefinition.filters.filter((filter) => !isDashboardFilterRestricted(filter, unavailableObjects)), displayAsLabels.filter((displayForm) => !isDashboardObjectRestricted(displayForm, "displayForm", unavailableObjects)), displayForms);
+    const attributeFilterDisplayForms = yield call(resolveFilterDisplayForms, ctx, filterContextDefinition.filters.filter((filter) => !isDashboardFilterUsingRestrictedObject(filter, unavailableObjects)), displayAsLabels.filter((displayForm) => !isDashboardObjectRestricted(displayForm, "displayForm", unavailableObjects)), displayForms);
     /*
      * NOTE: cannot do without the cast here. The layout in IDashboard is parameterized with IDashboardWidget
      * which also includes KPI and Insight widget definitions = those without identity. That is however
@@ -278,7 +278,7 @@ function* actionsToInitializeOrFillNewDashboard(ctx, settings, dateFilterConfig,
     };
 }
 const keepOnlyFiltersWithValidRef = (filter, availableDfRefs, validDataSetIds, unavailableObjects) => {
-    if (isDashboardFilterRestricted(filter, unavailableObjects)) {
+    if (isDashboardFilterUsingRestrictedObject(filter, unavailableObjects)) {
         return true;
     }
     if (!isDashboardAttributeFilter(filter)) {
@@ -306,7 +306,7 @@ function* sanitizeFilterContext(ctx, filterContext, dataSets = [], displayForms,
     const unavailableObjects = unavailableObjectsOverride ?? storeUnavailableObjects;
     const usedFilterDisplayForms = filterContext.filters
         .filter(isDashboardAttributeFilter)
-        .filter((filter) => !isDashboardFilterRestricted(filter, unavailableObjects))
+        .filter((filter) => !isDashboardFilterUsingRestrictedObject(filter, unavailableObjects))
         .map((f) => f.attributeFilter.displayForm);
     // With enableDashboardPartialRendering on, the unavailableObjects store already knows which of
     // these display forms are missing (resolved from the filter-context labels), so the lookups
@@ -334,7 +334,6 @@ function* sanitizeFilterContext(ctx, filterContext, dataSets = [], displayForms,
     const additionalDateFilters = filterContext.filters
         .filter((filter) => !isDashboardAttributeFilter(filter))
         .filter(isDashboardDateFilterWithDimension)
-        .filter((filter) => !isDashboardFilterRestricted(filter, unavailableObjects))
         .map((filter) => filter.dateFilter.dataSet);
     // check which are missing and load them
     const missingDataSets = additionalDateFilters

package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACH,KAAK,UAAU,EAIf,KAAK,sBAAsB,EAW9B,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AA0B1E,OAAO,EACH,KAAK,gBAAgB,EAGxB,MAAM,+BAA+B,CAAC;AAofvC,wBAAiB,cAAc,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,mBAAmB;;;uIAyB9E;AAkCD,wBAAiB,2BAA2B,CAAC,GAAG,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU;;;8KAOxF;AAED,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,sNAW3D;AAoCD,wBAAiB,0BAA0B,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,mBAAmB,GAAG,YAAY,CAoCzG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACH,KAAK,UAAU,EAIf,KAAK,sBAAsB,EAW9B,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AA0B1E,OAAO,EACH,KAAK,gBAAgB,EAGxB,MAAM,+BAA+B,CAAC;AAyfvC,wBAAiB,cAAc,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,mBAAmB;;;uIAyB9E;AAkCD,wBAAiB,2BAA2B,CAAC,GAAG,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU;;;8KAOxF;AAED,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,sNAW3D;AAoCD,wBAAiB,0BAA0B,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,mBAAmB,GAAG,YAAY,CAoCzG"}

package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/index.js

@@ -191,7 +191,7 @@ function* loadExistingDashboard(ctx, cmd, dashboardRef) {
     // FF off => nothing is ever marked unavailable and behavior is unchanged
     const unavailableReferences = yield call(loadUnavailableReferences, ctx, loadedDashboard, unavailable, Boolean(config.settings?.enableDashboardPartialRendering), !!cmd.payload.persistedDashboard);
     yield put(unavailableObjectsActions.setUnavailableObjects(unavailableReferences));
-    const dashboardWithFilterView = applyDefaultFilterView(loadedDashboard, filterViews, config.exportId);
+    const dashboardWithFilterView = applyDefaultFilterView(loadedDashboard, filterViews, config.exportId, unavailableReferences);
     // Resolve active tab: URL's initialTabId takes precedence, otherwise default to first tab
     // Note: activeTabLocalIdentifier is app state only, NOT persisted to/read from dashboard MD
     const resolvedActiveTabId = resolveActiveTabId(dashboardWithFilterView.tabs, cmd.payload.initialTabId, undefined);

package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/loadUnavailableReferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadUnavailableReferences.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/loadUnavailableReferences.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,8BAA8B,EAC9B,gCAAgC,EACnC,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AA6BtE;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAC1C,uBAAuB,EAAE,OAAO,GACjC,gCAAgC,EAAE,CAEpC;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,gBAAgB,GAAG,gCAAgC,EAAE,CAErG;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC3C,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,8BAA8B,EAAE,GAAG,SAAS,EAC7D,uBAAuB,EAAE,OAAO,EAChC,qBAAqB,EAAE,OAAO,GAC/B,OAAO,CAAC,8BAA8B,EAAE,CAAC,CAkB3C"}
+{"version":3,"file":"loadUnavailableReferences.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/initializeDashboardHandler/loadUnavailableReferences.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,8BAA8B,EAC9B,gCAAgC,EACnC,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AA+BtE;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAC1C,uBAAuB,EAAE,OAAO,GACjC,gCAAgC,EAAE,CAEpC;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,gBAAgB,GAAG,gCAAgC,EAAE,CAErG;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC3C,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,8BAA8B,EAAE,GAAG,SAAS,EAC7D,uBAAuB,EAAE,OAAO,EAChC,qBAAqB,EAAE,OAAO,GAC/B,OAAO,CAAC,8BAA8B,EAAE,CAAC,CAkB3C"}

package/esm/model/commandHandlers/dashboard/initializeDashboardHandler/loadUnavailableReferences.js

@@ -7,6 +7,7 @@ const ALL_TYPES = [
     "analyticalDashboard",
     "measure",
     "fact",
+    "attribute",
     "computedAttribute",
 ];
 const ENRICHED_TYPES = [
@@ -14,6 +15,7 @@ const ENRICHED_TYPES = [
     "analyticalDashboard",
     "measure",
     "fact",
+    "attribute",
     "computedAttribute",
 ];
 /**

package/esm/model/commandHandlers/dashboard/resetDashboardHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resetDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/dashboard/resetDashboardHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAa/C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,KAAK,kBAAkB,EAAqB,MAAM,2BAA2B,CAAC;AAevF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAWnE,wBAAiB,qBAAqB,CAClC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,eAAe,GACrB,YAAY,CAAC,kBAAkB,CAAC,CAOlC;AAED,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,eAAe;;;;;;;;;;;;;;;GASjF"}
+{"version":3,"file":"resetDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/dashboard/resetDashboardHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAa/C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,KAAK,kBAAkB,EAAqB,MAAM,2BAA2B,CAAC;AAgBvF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAWnE,wBAAiB,qBAAqB,CAClC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,eAAe,GACrB,YAAY,CAAC,kBAAkB,CAAC,CAOlC;AAED,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,eAAe;;;;;;;;;;;;;;;GASjF"}

package/esm/model/commandHandlers/dashboard/resetDashboardHandler.js

@@ -11,6 +11,7 @@ import { selectFilterViews } from "../../store/filterViews/filterViewsReducersSe
 import { selectPersistedDashboard } from "../../store/meta/metaSelectors.js";
 import { selectActiveTabLocalIdentifier, selectTabs } from "../../store/tabs/tabsSelectors.js";
 import { DEFAULT_TAB_ID } from "../../store/tabs/tabsState.js";
+import { selectUnavailableObjects } from "../../store/unavailableObjects/unavailableObjectsSelectors.js";
 import { resolveInsights } from "../../utils/insightResolver.js";
 import { applyDefaultFilterView } from "./common/filterViews.js";
 import { insightReferencesFromDashboard } from "./common/insightReferences.js";
@@ -111,7 +112,8 @@ function* resetDashboardFromPersisted(ctx) {
         // end of ad-hoc migration content
         const settings = yield select(selectSettings);
         const filterViews = yield select(selectFilterViews);
-        const dashboardWithUpdatedFilterContext = applyDefaultFilterView(persistedDashboard, filterViews, ctx.config?.exportId);
+        const unavailableObjects = yield select(selectUnavailableObjects);
+        const dashboardWithUpdatedFilterContext = applyDefaultFilterView(persistedDashboard, filterViews, ctx.config?.exportId, unavailableObjects);
         const insightRefsFromWidgets = insightReferencesFromDashboard(dashboardWithUpdatedFilterContext);
         const uniqueInsightRefsFromWidgets = uniqWith(insightRefsFromWidgets, areObjRefsEqual);
         const resolvedInsights = yield call(resolveInsights, ctx, uniqueInsightRefsFromWidgets);

package/esm/model/commandHandlers/dashboard/saveDashboardHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saveDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/dashboard/saveDashboardHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,OAAO,EAGH,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAWxB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE,OAAO,EAAE,KAAK,cAAc,EAAkB,MAAM,2BAA2B,CAAC;AAkChF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AA2L1E,wBAAgB,uBAAuB,CACnC,SAAS,EAAE,oBAAoB,EAC/B,gBAAgB,EAAE,OAAO,YAAO,EAChC,cAAc,EAAE,OAAO,GACxB,oBAAoB,CAkBtB;AAyED,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,GAAG,gBAAgB,CAEjG;AAsUD,wBAAiB,oBAAoB,CACjC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,cAAc,GACpB,YAAY,CAAC,cAAc,GAAG,SAAS,CAAC,CAsG1C"}
+{"version":3,"file":"saveDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/dashboard/saveDashboardHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,OAAO,EAGH,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAYxB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE,OAAO,EAAE,KAAK,cAAc,EAAkB,MAAM,2BAA2B,CAAC;AAkChF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AA4M1E,wBAAgB,uBAAuB,CACnC,SAAS,EAAE,oBAAoB,EAC/B,gBAAgB,EAAE,OAAO,YAAO,EAChC,cAAc,EAAE,OAAO,GACxB,oBAAoB,CAkBtB;AAyED,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,GAAG,gBAAgB,CAEjG;AAwUD,wBAAiB,oBAAoB,CACjC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,cAAc,GACpB,YAAY,CAAC,cAAc,GAAG,SAAS,CAAC,CA2G1C"}

package/esm/model/commandHandlers/dashboard/saveDashboardHandler.js

@@ -3,7 +3,7 @@ import { batchActions } from "redux-batched-actions";
 import { all, call, put, select, take } from "redux-saga/effects";
 import { invariant } from "ts-invariant";
 import { isUnexpectedResponseError } from "@gooddata/sdk-backend-spi";
-import { areObjRefsEqual, insightRef, isTempFilterContext, } from "@gooddata/sdk-model";
+import { areObjRefsEqual, insightRef, isIdentifierRef, isTempFilterContext, } from "@gooddata/sdk-model";
 import { dashboardFilterContextIdentity } from "../../../_staging/dashboard/dashboardFilterContext.js";
 import { dashboardLayoutRemoveIdentity, dashboardLayoutWidgetIdentityMap, } from "../../../_staging/dashboard/dashboardLayout.js";
 import { createListedDashboard } from "../../../_staging/listedDashboard/listedDashboardUtils.js";
@@ -14,7 +14,7 @@ import { dashboardSaved } from "../../events/dashboard.js";
 import { dispatchDashboardEvent } from "../../store/_infra/eventDispatcher.js";
 import { accessibleDashboardsActions } from "../../store/accessibleDashboards/index.js";
 import { selectBackendCapabilities } from "../../store/backendCapabilities/backendCapabilitiesSelectors.js";
-import { selectLocale } from "../../store/config/configSelectors.js";
+import { selectIsAiMode, selectLocale } from "../../store/config/configSelectors.js";
 import { insightsActions } from "../../store/insights/index.js";
 import { selectDraftInsightsUsedOnDashboard, selectInsights, } from "../../store/insights/insightsSelectors.js";
 import { listedDashboardsActions } from "../../store/listedDashboards/index.js";
@@ -40,6 +40,7 @@ import { changeRenderModeHandler } from "../renderMode/changeRenderModeHandler.j
 import { switchDashboardTabHandler } from "../tabs/switchDashboardTabHandler.js";
 import { dashboardWithDrillReferences } from "./dashboardDrillReferences.js";
 function* persistDraftInsights(ctx, cmd, insights) {
+    const savedInsights = [];
     for (const draftInsight of insights) {
         const persistedInsight = yield call(async () => {
             return ctx.backend.workspace(ctx.workspace).insights().createInsight(draftInsight, false);
@@ -72,7 +73,19 @@ function* persistDraftInsights(ctx, cmd, insights) {
             }));
         }
         yield put(insightsActions.setInsights(updatedInsights));
+        const originalInsightRef = insightRef(draftInsight);
+        const savedInsightRef = insightRef(persistedInsight);
+        const originalInsightId = isIdentifierRef(originalInsightRef)
+            ? originalInsightRef.identifier
+            : draftInsight.insight.identifier;
+        const savedInsightId = isIdentifierRef(savedInsightRef)
+            ? savedInsightRef.identifier
+            : persistedInsight.insight.identifier;
+        if (originalInsightId && savedInsightId) {
+            savedInsights.push({ originalInsightId, savedInsightId });
+        }
     }
+    return savedInsights;
 }
 async function draftInsightExistsOnBackend(ctx, draftInsight) {
     const ref = insightRef(draftInsight);
@@ -128,7 +141,7 @@ function saveDashboard(ctx, saveCtx) {
             return ctx.backend
                 .workspace(ctx.workspace)
                 .dashboards()
-                .createDashboard(dashboardToSave, !ctx.config?.isAiMode)
+                .createDashboard(dashboardToSave, !saveCtx.isAiMode)
                 .then((dashboard) => ({ dashboard, created: true }));
         }
         throw error;
@@ -246,7 +259,7 @@ function resolveProcessedTabs(tabs, rootFilterContext, layout, dateFilterConfig,
  *  capability, this code should use either the selectBasicLayout (that strips any custom widgets) or
  *  selectLayout (that keeps custom widgets).
  */
-function* createDashboardSaveContext(cmd, isNewDashboard) {
+function* createDashboardSaveContext(cmd, isNewDashboard, isAiMode) {
     const persistedDashboard = yield select(selectPersistedDashboard);
     const dashboardDescriptor = yield select(selectDashboardDescriptor);
     const tabs = yield select(selectTabs);
@@ -324,6 +337,7 @@ function* createDashboardSaveContext(cmd, isNewDashboard) {
     const insights = yield select(selectInsights);
     return {
         cmd,
+        isAiMode,
         persistedDashboard,
         dashboardFromState,
         dashboardToSave: getDashboardWithSharing(dashboardWithDrillReferences(dashboardToSave, insights), capabilities.supportsAccessControl, isNewDashboard),
@@ -431,13 +445,13 @@ export function* saveDashboardHandler(ctx, cmd) {
         if (isInsightNotSavedDialogOpen) {
             yield put(uiActions.closeInsightNotSavedDialog());
         }
-        if (shouldPersistDraftInsights && draftInsightsToPersist.length > 0) {
-            yield call(persistDraftInsights, ctx, cmd, draftInsightsToPersist);
-        }
+        const savedInsights = shouldPersistDraftInsights && draftInsightsToPersist.length > 0
+            ? yield call(persistDraftInsights, ctx, cmd, draftInsightsToPersist)
+            : [];
         const persistedDashboard = yield select(selectPersistedDashboard);
         const isNewDashboard = persistedDashboard === undefined;
-        const isAiBuilder = ctx.config?.isAiMode;
-        const saveCtx = yield call(createDashboardSaveContext, cmd, isNewDashboard);
+        const isAiBuilder = yield select(selectIsAiMode);
+        const saveCtx = yield call(createDashboardSaveContext, cmd, isNewDashboard, isAiBuilder);
         let result;
         if (isAiBuilder) {
             result = yield call(save, ctx, saveCtx, saveDashboard, "@@GDC.DASH.SAVE_BUILDED");
@@ -470,7 +484,10 @@ export function* saveDashboardHandler(ctx, cmd) {
             yield dispatchDashboardEvent(switchedEvent);
         }
         yield put(savingActions.setSavingSuccess());
-        return dashboardSaved(ctx, dashboard, created, cmd.correlationId);
+        return dashboardSaved(ctx, dashboard, created, cmd.correlationId, {
+            ...(isAiBuilder ? { originalDashboardId: saveCtx.dashboardFromState.identifier } : {}),
+            ...(savedInsights.length > 0 ? { savedInsights } : {}),
+        });
     }
     catch (e) {
         yield put(savingActions.setSavingError(e));

package/esm/model/commandHandlers/drill/drillToDashboardHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drillToDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAiC/C,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EACH,KAAK,kCAAkC,EAG1C,MAAM,uBAAuB,CAAC;AAkB/B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAWnE,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,GACvB,YAAY,CAAC,kCAAkC,CAAC,CA+HlD"}
+{"version":3,"file":"drillToDashboardHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToDashboardHandler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAiC/C,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EACH,KAAK,kCAAkC,EAG1C,MAAM,uBAAuB,CAAC;AAmB/B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAWnE,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,iBAAiB,GACvB,YAAY,CAAC,kCAAkC,CAAC,CAoIlD"}

package/esm/model/commandHandlers/drill/drillToDashboardHandler.js

@@ -8,6 +8,7 @@ import { drillToDashboardRequested, drillToDashboardResolved, } from "../../even
 import { generateFilterLocalIdentifier } from "../../store/_infra/generators.js";
 import { selectSupportsMultipleDateFilters } from "../../store/backendCapabilities/backendCapabilitiesSelectors.js";
 import { selectCatalogDateAttributes } from "../../store/catalog/catalogSelectors.js";
+import { selectRestrictedDashboardFilterLocalIdentifiers } from "../../store/filtering/dashboardFilterSelectors.js";
 import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
 import { selectAttributeFilterConfigsDisplayAsLabelMap, selectAttributeFilterConfigsOverrides, } from "../../store/tabs/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
 import { selectFilterContextAttributeFilterItems, selectFilterContextDateFilter, selectFilterContextDraggableFilterItems, selectFilterContextMeasureValueFilters, } from "../../store/tabs/filterContext/filterContextSelectors.js";
@@ -40,7 +41,9 @@ export function* drillToDashboardHandler(ctx, cmd) {
     const allAttributeFilters = yield select(selectAllAttributeFilters);
     const allMeasureValueFilters = yield select(selectAllMeasureValueFilters);
     const allNonDateFilters = [...allAttributeFilters, ...allMeasureValueFilters];
-    const dashboardFiltersToResolve = includeOtherDateFilters ? allDraggableFilters : allNonDateFilters;
+    const restrictedLocalIdentifiers = yield select(selectRestrictedDashboardFilterLocalIdentifiers);
+    // a restricted filter is applied nowhere, so the target dashboard does not get it either
+    const dashboardFiltersToResolve = (includeOtherDateFilters ? allDraggableFilters : allNonDateFilters).filter((filter) => !restrictedLocalIdentifiers.has(dashboardFilterLocalIdentifier(filter) ?? ""));
     const widgetAwareFilters = isDrillingToSelf
         ? []
         : yield call(getWidgetAwareDashboardFilters, ctx, widget, dashboardFiltersToResolve);

package/esm/model/commandHandlers/drill/keyDriverAnalysisHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keyDriverAnalysisHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/keyDriverAnalysisHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAc/C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACH,KAAK,mCAAmC,EAG3C,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,wBAAiB,wBAAwB,CACrC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,kBAAkB,GACxB,YAAY,CAAC,mCAAmC,CAAC,CA0HnD"}
+{"version":3,"file":"keyDriverAnalysisHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/keyDriverAnalysisHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAc/C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACH,KAAK,mCAAmC,EAG3C,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,wBAAiB,wBAAwB,CACrC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,kBAAkB,GACxB,YAAY,CAAC,mCAAmC,CAAC,CA4HnD"}

package/esm/model/commandHandlers/drill/keyDriverAnalysisHandler.js

@@ -5,7 +5,8 @@ import { keyDriverAnalysisRequested, keyDriverAnalysisResolved, } from "../../ev
 import { invalidArgumentsProvided } from "../../events/general.js";
 import { generateFilterLocalIdentifier } from "../../store/_infra/generators.js";
 import { selectCatalogDateAttributes } from "../../store/catalog/catalogSelectors.js";
-import { isDashboardFilterRestricted } from "../../store/filtering/restrictedFilterUtils.js";
+import { selectRestrictedDashboardFilterLocalIdentifiers } from "../../store/filtering/dashboardFilterSelectors.js";
+import { isDashboardFilterCopyRestricted, isDashboardFilterUsingRestrictedObject, } from "../../store/filtering/restrictedFilterUtils.js";
 import { selectWidgetByRef } from "../../store/tabs/layout/layoutSelectors.js";
 import { selectUnavailableObjects } from "../../store/unavailableObjects/unavailableObjectsSelectors.js";
 import { getAttributeFilters, removeIgnoredWidgetFilters } from "../../utils/widgetFilters.js";
@@ -55,14 +56,15 @@ export function* keyDriverAnalysisHandler(ctx, cmd) {
     });
     const widget = yield select(selectWidgetByRef(drillEvent.widgetRef));
     const unavailableObjects = yield select(selectUnavailableObjects);
-    const executableFilters = availableFilters.filter((filter) => !isDashboardFilterRestricted(filter, unavailableObjects));
+    const restrictedLocalIdentifiers = yield select(selectRestrictedDashboardFilterLocalIdentifiers);
+    const executableFilters = availableFilters.filter((filter) => !isDashboardFilterCopyRestricted(filter, restrictedLocalIdentifiers, unavailableObjects));
     const widgetFilters = removeIgnoredWidgetFilters(executableFilters, widget);
     // KDA defines its own date range — drop date filters. Keep attribute and measure value
     // filters so the change analysis respects the rest of the dashboard filter context.
     const attributeFilters = getAttributeFilters(widgetFilters);
     const measureValueFilters = widgetFilters.filter(isDashboardMeasureValueFilter);
     // the drill intersection brings its own attribute filters, which the check above did not see
-    const filters = mergeFilters(intersectionFilters, attributeFilters).filter((filter) => !isDashboardFilterRestricted(filter, unavailableObjects));
+    const filters = mergeFilters(intersectionFilters, attributeFilters).filter((filter) => !isDashboardFilterUsingRestrictedObject(filter, unavailableObjects));
     return keyDriverAnalysisResolved(ctx, cmd.payload.drillDefinition, cmd.payload.drillEvent, {
         metric: {
             ...metric,

package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.d.ts

@@ -1,7 +1,9 @@
 import { type SagaIterator } from "redux-saga";
-import { type DashboardTextAttributeFilter, type IAttributeDisplayFormMetadataObject, type IDrillToCustomUrl as IDrillToCustomUrlModel, type MeasureValueFilterCondition, type ObjRef, type TextAttributeFilter } from "@gooddata/sdk-model";
+import { type DashboardAttributeFilterItem, type DashboardTextAttributeFilter, type IAttributeDisplayFormMetadataObject, type IDashboardAttributeFilter, type IDrillToCustomUrl as IDrillToCustomUrlModel, type MeasureValueFilterCondition, type ObjRef, type TextAttributeFilter } from "@gooddata/sdk-model";
 import { type IDrillEvent, type IDrillEventIntersectionElement } from "@gooddata/sdk-ui";
 import { type IDrillToCustomUrl } from "../../commands/drill.js";
+import { selectAllCatalogDisplayFormsMap } from "../../store/catalog/catalogSelectors.js";
+import { selectAttributeFilterConfigsOverrides } from "../../store/tabs/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
 import { type DashboardContext } from "../../types/commonTypes.js";
 interface IDrillToUrlPlaceholderReplacement {
     toBeReplaced: string;
@@ -24,6 +26,24 @@ export declare function splitDFToLoadingAndMapping(attributesDisplayForms: IAttr
 }>;
 export declare function loadAttributeElementsForDrillIntersection(drillIntersectionElements: IDrillEventIntersectionElement[], attributesDisplayForms: IAttributeDisplayFormMetadataObject[], ctx: DashboardContext): SagaIterator<IDrillToUrlElement[]>;
 export declare function getAttributeIdentifiersReplacements(url: string, drillIntersectionElements: IDrillEventIntersectionElement[], ctx: DashboardContext): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
+/**
+ * The filter a dashboard attribute filter placeholder names. A readable filter wins: a text filter with
+ * the placeholder's label, then a list filter with it, then a list filter displayed by it. A restricted
+ * filter matched in any of these ways is applied nowhere, so it filters nothing.
+ */
+export type DashboardAttributeFilterPlaceholderMatch = {
+    type: "text";
+    filter: DashboardTextAttributeFilter;
+} | {
+    type: "label";
+    filter: IDashboardAttributeFilter;
+} | {
+    type: "displayAsLabel";
+    filter: IDashboardAttributeFilter;
+} | {
+    type: "restricted";
+};
+export declare function findDashboardAttributeFilterPlaceholderMatch(ref: ObjRef, attributeFilters: DashboardAttributeFilterItem[], restrictedLocalIdentifiers: ReadonlySet<string>, catalogDisplayForms: ReturnType<typeof selectAllCatalogDisplayFormsMap>, attributeFilterConfigs: ReturnType<typeof selectAttributeFilterConfigsOverrides>): DashboardAttributeFilterPlaceholderMatch | undefined;
 export declare function getDashboardAttributeFilterReplacements(url: string, ctx: DashboardContext): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
 export declare function getDashboardMeasureValueFilterReplacements(url: string): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
 export declare function getInsightMeasureValueFilterReplacements(url: string, widgetRef: ObjRef): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;

package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDrillToCustomUrl.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/resolveDrillToCustomUrl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveDrillToCustomUrl.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/resolveDrillToCustomUrl.ts"],"names":[],"mappings":"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"}

package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.js

@@ -2,12 +2,13 @@
 import stringify from "json-stable-stringify";
 import { groupBy } from "lodash-es";
 import { all, call, select } from "redux-saga/effects";
-import { areObjRefsEqual, dashboardAttributeFilterItemDisplayForm, dashboardFilterObjRef, filterAttributeElements, filterObjRef, insightFilters as insightDefinitionFilters, insightId, isArbitraryAttributeFilter, isAttributeDescriptor, isAttributeElementsByValue, isAttributeFilter, isComparisonCondition, isDashboardArbitraryAttributeFilter, isDashboardAttributeFilter, isDashboardTextAttributeFilter, isIdentifierRef, isMeasureValueFilter, isNegativeAttributeFilter, isRangeCondition, isTextAttributeFilter, isUriRef, measureValueFilterConditions, measureValueFilterMeasure, } from "@gooddata/sdk-model";
+import { areObjRefsEqual, dashboardAttributeFilterItemDisplayForm, dashboardAttributeFilterItemLocalIdentifier, dashboardFilterLocalIdentifier, dashboardMeasureValueFilterLocalIdentifier, filterAttributeElements, filterObjRef, insightFilters as insightDefinitionFilters, insightId, isArbitraryAttributeFilter, isAttributeDescriptor, isAttributeElementsByValue, isAttributeFilter, isComparisonCondition, isDashboardArbitraryAttributeFilter, isDashboardAttributeFilter, isDashboardTextAttributeFilter, isIdentifierRef, isMeasureValueFilter, isNegativeAttributeFilter, isRangeCondition, isTextAttributeFilter, isUriRef, measureValueFilterConditions, measureValueFilterMeasure, } from "@gooddata/sdk-model";
 import { DRILL_TO_URL_PLACEHOLDER, displayFormPlaceholderRef, getAttributeIdentifiersPlaceholdersFromUrl, getDashboardAttributeFilterPlaceholdersFromUrl, getDashboardMeasureValueFilterPlaceholdersFromUrl, getDrillUrlPlaceholderTypes, getInsightAttributeFilterPlaceholdersFromUrl, getInsightMeasureValueFilterPlaceholdersFromUrl, } from "@gooddata/sdk-model/internal";
 import { isDrillIntersectionAttributeItem, } from "@gooddata/sdk-ui";
 import { invalidArgumentsProvided } from "../../events/general.js";
 import { selectAllCatalogDisplayFormsMap, selectAllCatalogMeasuresMap, selectCatalogDateAttributes, } from "../../store/catalog/catalogSelectors.js";
 import { selectEnableMeasureValueFilterKD } from "../../store/config/configSelectors.js";
+import { selectRestrictedDashboardFilterLocalIdentifiers } from "../../store/filtering/dashboardFilterSelectors.js";
 import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
 import { selectDashboardId } from "../../store/meta/metaSelectors.js";
 import { selectAttributeFilterConfigsOverrides } from "../../store/tabs/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
@@ -167,55 +168,51 @@ export function* getAttributeIdentifiersReplacements(url, drillIntersectionEleme
         };
     });
 }
-function* resolveDashboardAttributeFilterReplacement({ placeholder: toBeReplaced, ref }, attributeFilters, catalogDisplayForms, attributeFilterConfigs, ctx) {
-    // Check for text filters (arbitrary/match) first — they use different value structures.
-    const textFilter = attributeFilters.find((filter) => {
-        if (!isDashboardTextAttributeFilter(filter)) {
-            return false;
-        }
+export function findDashboardAttributeFilterPlaceholderMatch(ref, attributeFilters, restrictedLocalIdentifiers, catalogDisplayForms, attributeFilterConfigs) {
+    const isReadable = (filter) => !restrictedLocalIdentifiers.has(dashboardFilterLocalIdentifier(filter) ?? "");
+    const hasLabel = (filter) => {
         const df = catalogDisplayForms.get(dashboardAttributeFilterItemDisplayForm(filter));
-        return df && areObjRefsEqual(displayFormPlaceholderRef(df), ref);
-    });
-    if (textFilter && isDashboardTextAttributeFilter(textFilter)) {
-        const parsedFilter = stringifyTextFilterSelection(textFilter);
-        const replacement = encodeParameterIfSet(parsedFilter);
-        return {
-            toBeReplaced,
-            replacement: replacement,
-        };
+        return !!df && areObjRefsEqual(displayFormPlaceholderRef(df), ref);
+    };
+    const isDisplayedByLabel = (filter) => attributeFilterConfigs.some((config) => config.localIdentifier === dashboardAttributeFilterItemLocalIdentifier(filter) &&
+        !!config.displayAsLabel &&
+        areObjRefsEqual(config.displayAsLabel, ref));
+    const textFilter = attributeFilters.find((filter) => isDashboardTextAttributeFilter(filter) && isReadable(filter) && hasLabel(filter));
+    if (textFilter) {
+        return { type: "text", filter: textFilter };
     }
-    // Standard (element-based) attribute filters
-    const standardFilters = attributeFilters.filter(isDashboardAttributeFilter);
-    let usedFilter = standardFilters.find((filter) => {
-        const df = catalogDisplayForms.get(filter.attributeFilter.displayForm);
-        return df && areObjRefsEqual(displayFormPlaceholderRef(df), ref);
-    });
-    let attributeElementsValues = [];
-    if (usedFilter) {
-        const elements = usedFilter?.attributeFilter.attributeElements;
-        attributeElementsValues = isAttributeElementsByValue(elements)
-            ? elements.values
-            : (elements?.uris ?? []);
+    const labelFilter = attributeFilters.find((filter) => isDashboardAttributeFilter(filter) && isReadable(filter) && hasLabel(filter));
+    if (labelFilter) {
+        return { type: "label", filter: labelFilter };
     }
-    else {
-        const usedConfig = attributeFilterConfigs.find((config) => {
-            return config.displayAsLabel && areObjRefsEqual(config.displayAsLabel, ref);
-        });
-        usedFilter = standardFilters.find((filter) => {
-            return filter.attributeFilter.localIdentifier === usedConfig?.localIdentifier;
-        });
-        const elements = usedFilter?.attributeFilter.attributeElements;
-        const primaryElementsValues = elements
-            ? isAttributeElementsByValue(elements)
-                ? elements.values
-                : elements.uris
-            : [];
-        attributeElementsValues = yield call(loadSecondaryElementTitles, ref, primaryElementsValues, ctx);
+    const displayedFilter = attributeFilters.find((filter) => isDashboardAttributeFilter(filter) && isReadable(filter) && isDisplayedByLabel(filter));
+    if (displayedFilter) {
+        return { type: "displayAsLabel", filter: displayedFilter };
     }
-    const isNegative = usedFilter?.attributeFilter.negativeSelection;
-    const parsedFilter = usedFilter
-        ? stringifyAttributeFilterSelection(attributeElementsValues, isNegative)
+    return attributeFilters.some((filter) => !isReadable(filter) && (hasLabel(filter) || isDisplayedByLabel(filter)))
+        ? { type: "restricted" }
         : undefined;
+}
+function* resolveDashboardAttributeFilterReplacement({ placeholder: toBeReplaced, ref }, attributeFilters, restrictedLocalIdentifiers, catalogDisplayForms, attributeFilterConfigs, ctx) {
+    const match = findDashboardAttributeFilterPlaceholderMatch(ref, attributeFilters, restrictedLocalIdentifiers, catalogDisplayForms, attributeFilterConfigs);
+    // a placeholder whose filter is missing from the dashboard stays unresolved, which rejects the drill
+    let parsedFilter;
+    if (match?.type === "text") {
+        parsedFilter = stringifyTextFilterSelection(match.filter);
+    }
+    else if (match?.type === "label") {
+        const elements = match.filter.attributeFilter.attributeElements;
+        parsedFilter = stringifyAttributeFilterSelection(isAttributeElementsByValue(elements) ? elements.values : elements.uris, match.filter.attributeFilter.negativeSelection);
+    }
+    else if (match?.type === "displayAsLabel") {
+        const elements = match.filter.attributeFilter.attributeElements;
+        const primaryElementsValues = isAttributeElementsByValue(elements) ? elements.values : elements.uris;
+        const elementTitles = yield call(loadSecondaryElementTitles, ref, primaryElementsValues, ctx);
+        parsedFilter = stringifyAttributeFilterSelection(elementTitles, match.filter.attributeFilter.negativeSelection);
+    }
+    else if (match?.type === "restricted") {
+        parsedFilter = stringifyAttributeFilterSelection([], true);
+    }
     const replacement = encodeParameterIfSet(parsedFilter);
     return {
         toBeReplaced,
@@ -228,17 +225,21 @@ export function* getDashboardAttributeFilterReplacements(url, ctx) {
         return [];
     }
     const attributeFilters = yield select(selectFilterContextAttributeFilterItems);
+    const restrictedLocalIdentifiers = yield select(selectRestrictedDashboardFilterLocalIdentifiers);
     const catalogDisplayForms = yield select(selectAllCatalogDisplayFormsMap);
     const attributeFilterConfigs = yield select(selectAttributeFilterConfigsOverrides);
-    return yield all(attributeFilterPlaceholders.map((placeholder) => call(resolveDashboardAttributeFilterReplacement, placeholder, attributeFilters, catalogDisplayForms, attributeFilterConfigs, ctx)));
+    return yield all(attributeFilterPlaceholders.map((placeholder) => call(resolveDashboardAttributeFilterReplacement, placeholder, attributeFilters, restrictedLocalIdentifiers, catalogDisplayForms, attributeFilterConfigs, ctx)));
 }
-function resolveDashboardMeasureValueFilterReplacement({ placeholder: toBeReplaced, identifier }, measureValueFilters, catalogMeasures) {
-    const usedFilter = measureValueFilters.find((filter) => {
-        const measureRef = dashboardFilterObjRef(filter);
-        return dashboardMeasureValueFilterMatchesIdentifier(measureRef, identifier, catalogMeasures);
-    });
-    const parsedFilter = stringifyMeasureValueFilterCondition(usedFilter?.dashboardMeasureValueFilter.conditions);
-    const replacement = usedFilter ? encodeParameterIfSet(parsedFilter) : undefined;
+function resolveDashboardMeasureValueFilterReplacement({ placeholder: toBeReplaced, identifier }, measureValueFilters, restrictedLocalIdentifiers, catalogMeasures) {
+    const isPlaceholderFilter = (filter) => dashboardMeasureValueFilterMatchesIdentifier(filter.dashboardMeasureValueFilter.measure, identifier, catalogMeasures);
+    const usedFilter = measureValueFilters.find((filter) => !restrictedLocalIdentifiers.has(dashboardMeasureValueFilterLocalIdentifier(filter)) &&
+        isPlaceholderFilter(filter));
+    // A restricted filter is applied nowhere, so it filters nothing and resolves as "ALL". A
+    // placeholder whose filter is missing from the dashboard stays unresolved, which rejects the drill.
+    const parsedFilter = usedFilter || measureValueFilters.some(isPlaceholderFilter)
+        ? stringifyMeasureValueFilterCondition(usedFilter?.dashboardMeasureValueFilter.conditions)
+        : undefined;
+    const replacement = encodeParameterIfSet(parsedFilter);
     return {
         toBeReplaced,
         replacement: replacement,
@@ -250,8 +251,9 @@ export function* getDashboardMeasureValueFilterReplacements(url) {
         return [];
     }
     const measureValueFilters = yield select(selectFilterContextMeasureValueFilters);
+    const restrictedLocalIdentifiers = yield select(selectRestrictedDashboardFilterLocalIdentifiers);
     const catalogMeasures = yield select(selectAllCatalogMeasuresMap);
-    return measureValueFilterPlaceholders.map((placeholder) => resolveDashboardMeasureValueFilterReplacement(placeholder, measureValueFilters, catalogMeasures));
+    return measureValueFilterPlaceholders.map((placeholder) => resolveDashboardMeasureValueFilterReplacement(placeholder, measureValueFilters, restrictedLocalIdentifiers, catalogMeasures));
 }
 function resolveInsightMeasureValueFilterReplacement({ placeholder: toBeReplaced, identifier }, measureValueFilters) {
     const usedFilter = measureValueFilters.find((filter) => {

package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeFilterSelectionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changeAttributeFilterSelectionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeFilterSelectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EAAE,KAAK,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAiBnF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,wBAAiB,qCAAqC,CAClD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,8BAA8B,GACpC,YAAY,CAAC,IAAI,CAAC,CA4EpB"}
+{"version":3,"file":"changeAttributeFilterSelectionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/changeAttributeFilterSelectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EAAE,KAAK,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAmBnF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAStE,wBAAiB,qCAAqC,CAClD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,8BAA8B,GACpC,YAAY,CAAC,IAAI,CAAC,CA4FpB"}

package/esm/model/commandHandlers/filterContext/attributeFilter/changeAttributeFilterSelectionHandler.js

@@ -1,14 +1,15 @@
-// (C) 2021-2025 GoodData Corporation
+// (C) 2021-2026 GoodData Corporation
 import { all, call, put, select } from "redux-saga/effects";
 import { invariant } from "ts-invariant";
 import { attributeFilterSelectionChanged } from "../../../events/filters.js";
 import { invalidArgumentsProvided } from "../../../events/general.js";
 import { dispatchDashboardEvent } from "../../../store/_infra/eventDispatcher.js";
 import { selectEnableImmediateAttributeFilterDisplayAsLabelMigration, selectIsApplyFiltersAllAtOnceEnabledAndSet, } from "../../../store/config/configSelectors.js";
-import { selectIsCrossFiltering, selectIsFilterFromCrossFilteringByLocalIdentifier, } from "../../../store/drill/drillSelectors.js";
+import { selectCrossFilteringFiltersLocalIdentifiersByTab, selectIsCrossFiltering, selectIsFilterFromCrossFilteringByLocalIdentifier, } from "../../../store/drill/drillSelectors.js";
+import { selectEnablePersistentFiltersAcrossTabs } from "../../../store/meta/metaSelectors.js";
 import { selectAttributeFilterDescendants, selectFilterContextAttributeFilterByLocalId, } from "../../../store/tabs/filterContext/filterContextSelectors.js";
 import { tabsActions } from "../../../store/tabs/index.js";
-import { dispatchFilterContextChanged, resetCrossFiltering } from "../common.js";
+import { captureFilterContextByTabSnapshot, dispatchFilterContextChanged, dispatchFilterContextChangedForMutatedTabs, resetCrossFiltering, } from "../common.js";
 export function* changeAttributeFilterSelectionHandler(ctx, cmd) {
     const { elements, filterLocalId, selectionType, isWorkingSelectionChange, isResultOfMigration, isSelectionInvalid, } = cmd.payload;
     // validate filterLocalId
@@ -18,6 +19,9 @@ export function* changeAttributeFilterSelectionHandler(ctx, cmd) {
     }
     const isApplyAllAtOnceEnabledAndSet = yield select(selectIsApplyFiltersAllAtOnceEnabledAndSet);
     const enableImmediateAttributeFilterDisplayAsLabelMigration = yield select(selectEnableImmediateAttributeFilterDisplayAsLabelMigration);
+    const crossFilteringLocalIdsByTab = yield select(selectCrossFilteringFiltersLocalIdentifiersByTab);
+    const enablePersistentFiltersAcrossTabs = yield select(selectEnablePersistentFiltersAcrossTabs);
+    const filterContextSnapshot = yield call(captureFilterContextByTabSnapshot);
     yield put(tabsActions.updateAttributeFilterSelection({
         elements,
         filterLocalId,
@@ -26,6 +30,8 @@ export function* changeAttributeFilterSelectionHandler(ctx, cmd) {
         enableImmediateAttributeFilterDisplayAsLabelMigration,
         isResultOfMigration,
         isSelectionInvalid,
+        crossFilteringLocalIdsByTab,
+        enablePersistentFiltersAcrossTabs,
     }));
     const changedFilter = yield select(selectFilterContextAttributeFilterByLocalId(cmd.payload.filterLocalId));
     invariant(changedFilter, "Inconsistent state in attributeFilterChangeSelectionCommandHandler");
@@ -38,6 +44,8 @@ export function* changeAttributeFilterSelectionHandler(ctx, cmd) {
             },
             negativeSelection: true,
             isWorkingSelectionChange: isWorkingSelectionChange && isApplyAllAtOnceEnabledAndSet,
+            crossFilteringLocalIdsByTab,
+            enablePersistentFiltersAcrossTabs,
         }))));
     }
     const isCrossFiltering = yield select(selectIsCrossFiltering);
@@ -48,5 +56,10 @@ export function* changeAttributeFilterSelectionHandler(ctx, cmd) {
         yield call(resetCrossFiltering, cmd);
     }
     yield dispatchDashboardEvent(attributeFilterSelectionChanged(ctx, changedFilter, cmd.correlationId));
-    yield call(dispatchFilterContextChanged, ctx, cmd);
+    if (enablePersistentFiltersAcrossTabs) {
+        yield call(dispatchFilterContextChangedForMutatedTabs, ctx, cmd, filterContextSnapshot);
+    }
+    else {
+        yield call(dispatchFilterContextChanged, ctx, cmd);
+    }
 }

package/esm/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceAttributeFilterItemSelectionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,OAAO,EAAE,KAAK,mCAAmC,EAAE,MAAM,8BAA8B,CAAC;AAWxF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAKtE,wBAAiB,0CAA0C,CACvD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,mCAAmC,GACzC,YAAY,CAAC,IAAI,CAAC,CAoDpB"}
+{"version":3,"file":"replaceAttributeFilterItemSelectionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,OAAO,EAAE,KAAK,mCAAmC,EAAE,MAAM,8BAA8B,CAAC;AAaxF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAKtE,wBAAiB,0CAA0C,CACvD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,mCAAmC,GACzC,YAAY,CAAC,IAAI,CAAC,CA0DpB"}

package/esm/model/commandHandlers/filterContext/attributeFilter/replaceAttributeFilterItemSelectionHandler.js

@@ -5,7 +5,8 @@ import { attributeFilterItemSelectionReplaced } from "../../../events/filters.js
 import { invalidArgumentsProvided } from "../../../events/general.js";
 import { dispatchDashboardEvent } from "../../../store/_infra/eventDispatcher.js";
 import { selectIsApplyFiltersAllAtOnceEnabledAndSet } from "../../../store/config/configSelectors.js";
-import { selectIsCrossFiltering, selectIsFilterFromCrossFilteringByLocalIdentifier, } from "../../../store/drill/drillSelectors.js";
+import { selectCrossFilteringFiltersLocalIdentifiersByTab, selectIsCrossFiltering, selectIsFilterFromCrossFilteringByLocalIdentifier, } from "../../../store/drill/drillSelectors.js";
+import { selectEnablePersistentFiltersAcrossTabs } from "../../../store/meta/metaSelectors.js";
 import { selectFilterContextAttributeFilterItemByLocalId } from "../../../store/tabs/filterContext/filterContextSelectors.js";
 import { tabsActions } from "../../../store/tabs/index.js";
 import { dispatchFilterContextChanged, resetCrossFiltering } from "../common.js";
@@ -18,11 +19,15 @@ export function* replaceAttributeFilterItemSelectionHandler(ctx, cmd) {
         throw invalidArgumentsProvided(ctx, cmd, `Filter with filterLocalId ${filterLocalId} not found.`);
     }
     const isApplyAllAtOnceEnabledAndSet = yield select(selectIsApplyFiltersAllAtOnceEnabledAndSet);
+    const crossFilteringLocalIdsByTab = yield select(selectCrossFilteringFiltersLocalIdentifiersByTab);
+    const enablePersistentFiltersAcrossTabs = yield select(selectEnablePersistentFiltersAcrossTabs);
     yield put(tabsActions.replaceAttributeFilterItem({
         filterLocalId,
         filter,
         isWorkingSelectionChange: isWorkingSelectionChange && isApplyAllAtOnceEnabledAndSet,
         isSelectionInvalid,
+        crossFilteringLocalIdsByTab,
+        enablePersistentFiltersAcrossTabs,
     }));
     // Ensure the new filter's displayForm is registered in the displayFormsMap.
     // This is needed for cross-type migration (e.g. text→list) where the new filter's