@gooddata/sdk-code-convertors 11.36.0-alpha.3 → 11.36.0-alpha.6

package/esm/from/declarativeDashboardToYaml.js

@@ -25,6 +25,20 @@ export function declarativeDashboardToYaml(entities, dashboard, filterContexts,
     });
     // Add intro comment to the document
     doc.commentBefore = DASHBOARD_COMMENT;
+    // Infer the YAML model version from the declarative structure:
+    //  - V3 (tabs are the sole source of content) when tabs are present and no root-level
+    //    layout / filter configs / parameters exist.
+    //  - V2 (legacy) otherwise — covers both root-only dashboards and tab dashboards that
+    //    still carry mirrored root content for backward compatibility.
+    const hasContentTabs = (content.tabs?.length ?? 0) > 0;
+    const hasRootContent = Boolean(content.layout ||
+        content.dateFilterConfig ||
+        (content.dateFilterConfigs && content.dateFilterConfigs.length > 0) ||
+        (content.attributeFilterConfigs && content.attributeFilterConfigs.length > 0) ||
+        (content.measureValueFilterConfigs && content.measureValueFilterConfigs.length > 0) ||
+        (content.parameters && content.parameters.length > 0));
+    const yamlVersion = hasContentTabs && !hasRootContent ? "3" : "2";
+    doc.add(entryWithSpace("version", yamlVersion));
     // Add optional meta fields
     fillOptionalMetaFields(doc, dashboard);
     //settings
@@ -40,10 +54,6 @@ export function declarativeDashboardToYaml(entities, dashboard, filterContexts,
     if (content.disableFilterViews) {
         doc.add(entryWithSpace("filter_views", false));
     }
-    // Add enable_section_headers
-    if (content.layout?.configuration?.sections?.enableHeader) {
-        doc.add(entryWithSpace("enable_section_headers", content.layout?.configuration?.sections?.enableHeader));
-    }
     // Add dashboard tabs
     // Note: If there's only 1 tab without a title (implicit first tab visible in edit mode),
     // treat as "no tabs" and use sections format to preserve previous YAML structure
@@ -51,12 +61,20 @@ export function declarativeDashboardToYaml(entities, dashboard, filterContexts,
     const hasSingleTabWithTitle = content.tabs?.length === 1 && content.tabs[0].title;
     const shouldUseTabs = hasMultipleTabs || hasSingleTabWithTitle;
     if (content.tabs && shouldUseTabs) {
+        // Add enable_section_headers
+        if (content.tabs[0].layout?.configuration?.sections?.enableHeader) {
+            doc.add(entryWithSpace("enable_section_headers", content.tabs[0].layout?.configuration?.sections?.enableHeader));
+        }
         const tabs = declarativeTabsToYaml(content.tabs, filterContexts, entities, updateErrorContext(errorContext, { path: ["tabs"] }));
         if (tabs) {
             doc.add(entryWithSpace("tabs", tabs));
         }
     }
     else if (content.tabs?.length === 1) {
+        // Add enable_section_headers
+        if (content.tabs[0].layout?.configuration?.sections?.enableHeader) {
+            doc.add(entryWithSpace("enable_section_headers", content.tabs[0].layout?.configuration?.sections?.enableHeader));
+        }
         // Dashboard with implicit single tab - create root yaml structure like without tabs
         // but read all metadata from a single tab
         const tab = content.tabs[0];
@@ -76,6 +94,10 @@ export function declarativeDashboardToYaml(entities, dashboard, filterContexts,
     }
     else {
         // Dashboard without tabs - add sections and filters
+        // Add enable_section_headers
+        if (content.layout?.configuration?.sections?.enableHeader) {
+            doc.add(entryWithSpace("enable_section_headers", content.layout?.configuration?.sections?.enableHeader));
+        }
         const section = declarativeSectionsToYaml(content.layout, entities, updateErrorContext(errorContext, { path: ["layout"] }));
         if (section) {
             doc.add(entryWithSpace("sections", section));

package/esm/sdk-code-convertors.d.ts

@@ -923,7 +923,8 @@ export declare enum CoreErrorCode {
     OnlyOneAttributeItemAllowed = "core.onlyOneAttributeItemAllowed",
     MultipleCommonDateFilters = "core.multipleCommonDateFilters",
     DuplicateFilterLocalIdentifier = "core.duplicateFilterLocalIdentifier",
-    DuplicateTabIdentifier = "core.duplicateTabIdentifier"
+    DuplicateTabIdentifier = "core.duplicateTabIdentifier",
+    TabsAndRootContentMutuallyExclusive = "core.tabsAndRootContentMutuallyExclusive"
 }
 
 /**
@@ -1208,7 +1209,8 @@ export declare type ExportEntities = Array<{
     data: Dataset | DateDataset | Metric | Visualisation | Dashboard | Plugin_2 | AttributeHierarchy;
     declarative?: DeclarativeDataset | DeclarativeDateDataset | DeclarativeMetric | DeclarativeVisualizationObject | DeclarativeDashboardPlugin | DeclarativeAttributeHierarchy | {
         dashboard: DeclarativeAnalyticalDashboard;
-        filterContext: DeclarativeFilterContext;
+        filterContext?: DeclarativeFilterContext;
+        tabFilterContexts?: DeclarativeFilterContext[];
     };
 }>;
 
@@ -2783,7 +2785,7 @@ export declare function yamlBucketsToDeclarative(entities: ExportEntities, input
 /** @public */
 export declare function yamlDashboardToDeclarative(entities: ExportEntities, input: Dashboard): {
     dashboard: DeclarativeAnalyticalDashboard;
-    filterContext: DeclarativeFilterContext;
+    filterContext?: DeclarativeFilterContext;
     tabFilterContexts?: DeclarativeFilterContext[];
 };
 

package/esm/to/yamlDashboardToDeclarative.d.ts

@@ -20,7 +20,7 @@ export type EmptyValueHandling = NonNullable<IDashboardDateFilter["dateFilter"][
 /** @public */
 export declare function yamlDashboardToDeclarative(entities: ExportEntities, input: Dashboard): {
     dashboard: DeclarativeAnalyticalDashboard;
-    filterContext: DeclarativeFilterContext;
+    filterContext?: DeclarativeFilterContext;
     tabFilterContexts?: DeclarativeFilterContext[];
 };
 /** @internal */

package/esm/to/yamlDashboardToDeclarative.js

@@ -2,6 +2,7 @@
 import { v4 as uuidV4 } from "uuid";
 import { VisualisationsTypes } from "../conts.js";
 import { parseUrlTarget } from "../utils/customUrl.js";
+import { CoreErrorCode, newError } from "../utils/errors.js";
 import { yamlConditionToMatch } from "../utils/filterUtils.js";
 import { convertGranularity } from "../utils/granularityUtils.js";
 import { toDeclarativePermissions } from "../utils/permissionUtils.js";
@@ -52,11 +53,11 @@ function yamlTabsToDeclarative(entities, tabs, enableSectionHeaders) {
     };
 }
 /**
- * Process dashboard with tabs - uses active tab or first tab as main dashboard for backwards compatibility
+ * V2 (legacy): tabs present in YAML — mirror tabs[0] content into root-level properties
+ * for backward compatibility with consumers that read root layout/filters.
  */
-function processDashboardWithTabs(entities, input) {
+function processDashboardWithTabsV2(entities, input) {
     const tabsResult = yamlTabsToDeclarative(entities, input.tabs, input.enable_section_headers);
-    // Use first tab as default for backwards compatibility
     const defaultTabIndex = 0;
     const defaultTab = tabsResult.tabs[defaultTabIndex];
     return {
@@ -71,10 +72,12 @@ function processDashboardWithTabs(entities, input) {
     };
 }
 /**
- * Process traditional dashboard without tabs
+ * V2 (legacy): no tabs in YAML — wrap root content in a synthetic single tab AND keep
+ * the same content at root level. Produces the duplicated declarative shape the older
+ * SDK readers expect.
  */
-function processDashboardWithoutTabs(entities, input) {
-    const { filterContext, tabFilterContexts: _tabFilterContexts, ...rest } = processDashboardWithTabs(entities, {
+function processDashboardWithoutTabsV2(entities, input) {
+    const { filterContext, tabFilterContexts: _tabFilterContexts, ...rest } = processDashboardWithTabsV2(entities, {
         ...input,
         tabs: [
             {
@@ -100,27 +103,95 @@ function processDashboardWithoutTabs(entities, input) {
         tabFilterContexts: [dashboardFilterContext],
     };
 }
+/**
+ * V3 (clean): tabs present in YAML — tabs are the sole source of layout and filter content.
+ * No root-level mirroring. Root filter context reference is left empty; per-tab filter
+ * context refs are the only source.
+ */
+function processDashboardWithTabsV3(entities, input) {
+    const tabsResult = yamlTabsToDeclarative(entities, input.tabs, input.enable_section_headers);
+    return {
+        layout: undefined,
+        filterContext: undefined,
+        dateFilterConfig: undefined,
+        dateFilterConfigs: undefined,
+        attributeFilterConfigs: undefined,
+        measureValueFilterConfigs: undefined,
+        tabs: tabsResult.tabs,
+        tabFilterContexts: tabsResult.filterContexts,
+    };
+}
+/**
+ * V3 (clean): no tabs in YAML — wrap root content in a synthetic single tab. No content
+ * is left at root level in the resulting declarative model.
+ */
+function processDashboardWithoutTabsV3(entities, input) {
+    const tabsResult = yamlTabsToDeclarative(entities, [
+        {
+            id: "defaultTabId",
+            title: "",
+            filters: input.filters,
+            sections: input.sections ?? [],
+        },
+    ], input.enable_section_headers);
+    return {
+        layout: undefined,
+        filterContext: undefined,
+        dateFilterConfig: undefined,
+        dateFilterConfigs: undefined,
+        attributeFilterConfigs: undefined,
+        measureValueFilterConfigs: undefined,
+        tabs: tabsResult.tabs,
+        tabFilterContexts: tabsResult.filterContexts,
+    };
+}
 /** @public */
 export function yamlDashboardToDeclarative(entities, input) {
-    // Process dashboard based on whether it has tabs
-    const { layout, filterContext, dateFilterConfig, dateFilterConfigs, attributeFilterConfigs, measureValueFilterConfigs, tabs, tabFilterContexts, } = input.tabs ? processDashboardWithTabs(entities, input) : processDashboardWithoutTabs(entities, input);
+    const hasTabs = Boolean(input.tabs && input.tabs.length > 0);
+    const hasRootContent = Boolean((input.sections && input.sections.length > 0) ||
+        (input.filters && Object.keys(input.filters).length > 0));
+    if (hasTabs && hasRootContent) {
+        throw newError(CoreErrorCode.TabsAndRootContentMutuallyExclusive, [input.id]);
+    }
+    const yamlVersion = input.version ?? "2";
+    // Process dashboard based on YAML version and whether it has tabs.
+    // V2 mirrors content into root for backward compat; V3 keeps content only inside tabs.
+    const { layout, filterContext, dateFilterConfig, dateFilterConfigs, attributeFilterConfigs, measureValueFilterConfigs, tabs, tabFilterContexts, } = yamlVersion === "3"
+        ? hasTabs
+            ? processDashboardWithTabsV3(entities, input)
+            : processDashboardWithoutTabsV3(entities, input)
+        : hasTabs
+            ? processDashboardWithTabsV2(entities, input)
+            : processDashboardWithoutTabsV2(entities, input);
     const plugins = yamlPluginsToDeclarative(input.plugins);
     const [, permissions] = toDeclarativePermissions(input.permissions);
-    const content = {
-        version: "2",
-        layout,
-        plugins,
-        attributeFilterConfigs,
-        measureValueFilterConfigs,
-        dateFilterConfig,
-        dateFilterConfigs,
-        ...(tabs ? { tabs } : {}),
-        ...(input.cross_filtering === false ? { disableCrossFiltering: true } : {}),
-        ...(input.user_filters_save === false ? { disableUserFilterSave: true } : {}),
-        ...(input.user_filters_reset === false ? { disableUserFilterReset: true } : {}),
-        ...(input.filter_views === false ? { disableFilterViews: true } : {}),
-        filterContextRef: createIdentifier(filterContext.id, { forceType: "filterContext" }),
-    };
+    const content = yamlVersion === "3"
+        ? {
+            version: "2",
+            plugins,
+            tabs,
+            ...(input.cross_filtering === false ? { disableCrossFiltering: true } : {}),
+            ...(input.user_filters_save === false ? { disableUserFilterSave: true } : {}),
+            ...(input.user_filters_reset === false ? { disableUserFilterReset: true } : {}),
+            ...(input.filter_views === false ? { disableFilterViews: true } : {}),
+        }
+        : {
+            version: "2",
+            layout,
+            plugins,
+            attributeFilterConfigs,
+            measureValueFilterConfigs,
+            dateFilterConfig,
+            dateFilterConfigs,
+            ...(tabs ? { tabs } : {}),
+            ...(input.cross_filtering === false ? { disableCrossFiltering: true } : {}),
+            ...(input.user_filters_save === false ? { disableUserFilterSave: true } : {}),
+            ...(input.user_filters_reset === false ? { disableUserFilterReset: true } : {}),
+            ...(input.filter_views === false ? { disableFilterViews: true } : {}),
+            filterContextRef: filterContext
+                ? createIdentifier(filterContext.id, { forceType: "filterContext" })
+                : undefined,
+        };
     const dashboard = {
         id: input.id,
         title: input.title ?? convertIdToTitle(input.id),
@@ -504,7 +575,7 @@ function yamlIgnoredFilterToDeclarative(input) {
     if (ref?.type === "metric") {
         return {
             type: "measureValueFilterReference",
-            measure: createIdentifier(input),
+            measure: createIdentifier(input, { forceMetric: true }),
         };
     }
     return null;

package/esm/types.d.ts

@@ -16,7 +16,8 @@ export type ExportEntities = Array<{
     data: Dataset | DateDataset | Metric | Visualisation | Dashboard | Plugin | AttributeHierarchy;
     declarative?: DeclarativeDataset | DeclarativeDateDataset | DeclarativeMetric | DeclarativeVisualizationObject | DeclarativeDashboardPlugin | DeclarativeAttributeHierarchy | {
         dashboard: DeclarativeAnalyticalDashboard;
-        filterContext: DeclarativeFilterContext;
+        filterContext?: DeclarativeFilterContext;
+        tabFilterContexts?: DeclarativeFilterContext[];
     };
 }>;
 /** @public */

package/esm/utils/errors.d.ts

@@ -13,7 +13,8 @@ export declare enum CoreErrorCode {
     OnlyOneAttributeItemAllowed = "core.onlyOneAttributeItemAllowed",
     MultipleCommonDateFilters = "core.multipleCommonDateFilters",
     DuplicateFilterLocalIdentifier = "core.duplicateFilterLocalIdentifier",
-    DuplicateTabIdentifier = "core.duplicateTabIdentifier"
+    DuplicateTabIdentifier = "core.duplicateTabIdentifier",
+    TabsAndRootContentMutuallyExclusive = "core.tabsAndRootContentMutuallyExclusive"
 }
 /**
  * @public

package/esm/utils/errors.js

@@ -18,6 +18,7 @@ var CoreErrorCode;
     CoreErrorCode["MultipleCommonDateFilters"] = "core.multipleCommonDateFilters";
     CoreErrorCode["DuplicateFilterLocalIdentifier"] = "core.duplicateFilterLocalIdentifier";
     CoreErrorCode["DuplicateTabIdentifier"] = "core.duplicateTabIdentifier";
+    CoreErrorCode["TabsAndRootContentMutuallyExclusive"] = "core.tabsAndRootContentMutuallyExclusive";
 })(CoreErrorCode || (CoreErrorCode = {}));
 /**
  * @public
@@ -35,6 +36,7 @@ export const CoreErrorMessages = {
     [CoreErrorCode.MultipleCommonDateFilters]: `Multiple usage of common date filters in dashboard. Define exactly one date filter that has no date dataset defined.`,
     [CoreErrorCode.DuplicateFilterLocalIdentifier]: `Duplicate filter local identifier "{0}". Each filter must have a unique local identifier across a dashboard tab, including filters in groups.`,
     [CoreErrorCode.DuplicateTabIdentifier]: `Duplicate tab identifier "{0}". Each tab must have a unique identifier within the dashboard.`,
+    [CoreErrorCode.TabsAndRootContentMutuallyExclusive]: `Dashboard "{0}" defines both "tabs" and root-level "sections" or "filters". These are mutually exclusive — keep all content inside tabs or at the root, not both.`,
 };
 /**
  * @public
@@ -52,6 +54,7 @@ export const CoreErrorTypes = {
     [CoreErrorCode.MultipleCommonDateFilters]: "MultipleCommonDateFilters",
     [CoreErrorCode.DuplicateFilterLocalIdentifier]: "DuplicateFilterLocalIdentifier",
     [CoreErrorCode.DuplicateTabIdentifier]: "DuplicateTabIdentifier",
+    [CoreErrorCode.TabsAndRootContentMutuallyExclusive]: "TabsAndRootContentMutuallyExclusive",
 };
 /**
  * Update error context with new values

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddata/sdk-code-convertors",
-  "version": "11.36.0-alpha.3",
+  "version": "11.36.0-alpha.6",
   "description": "GoodData AAC declarative converters",
   "license": "MIT",
   "author": "GoodData",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "uuid": "11.1.0",
-    "yaml": "^2.2.2",
-    "@gooddata/api-client-tiger": "11.36.0-alpha.3",
-    "@gooddata/sdk-code-schemas": "11.36.0-alpha.3",
-    "@gooddata/sdk-model": "11.36.0-alpha.3"
+    "yaml": "2.8.3",
+    "@gooddata/api-client-tiger": "11.36.0-alpha.6",
+    "@gooddata/sdk-model": "11.36.0-alpha.6",
+    "@gooddata/sdk-code-schemas": "11.36.0-alpha.6"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.55.2",
@@ -50,8 +50,8 @@
     "oxlint-tsgolint": "0.11.4",
     "typescript": "5.9.3",
     "vitest": "4.1.0",
-    "@gooddata/eslint-config": "11.36.0-alpha.3",
-    "@gooddata/oxlint-config": "11.36.0-alpha.3"
+    "@gooddata/oxlint-config": "11.36.0-alpha.6",
+    "@gooddata/eslint-config": "11.36.0-alpha.6"
   },
   "scripts": {
     "_phase:build": "npm run build",