Wizard Hierarchy fix

Author: Serge Pavlyuk

src/shared/schema/mix/actions/wizard.ts

@@ -2,9 +2,32 @@ import z from 'zod/v4';
 
 import {USProvider} from '../../../../server/components/charts-engine/components/storage/united-storage/provider';
 import {v12ChartsConfigSchema} from '../../../sdk/zod-shemas/wizard-chart-api.schema';
+import {EntryScope, WizardType} from '../../../types';
 import {createTypedAction} from '../../gateway-utils';
 import {getTypedApi} from '../../simple-schema';
 
+const wizardUsSchema = z.object({
+    data: z.object({
+        shared: v12ChartsConfigSchema,
+    }),
+    entryId: z.string(),
+    scope: z.literal(EntryScope.Widget),
+    type: z.enum(WizardType),
+    public: z.boolean(),
+    isFavorite: z.boolean(),
+    createdAt: z.string(),
+    createdBy: z.string(),
+    updatedAt: z.string(),
+    updatedBy: z.string(),
+    revId: z.string(),
+    savedId: z.string(),
+    publishedId: z.string(),
+    meta: z.record(z.string(), z.string()),
+    links: z.record(z.string(), z.string()).optional(),
+    key: z.union([z.null(), z.string()]),
+    workbookId: z.union([z.null(), z.string()]),
+});
+
 export const wizardActions = {
     getWizardChartApi: createTypedAction({
         argsSchema: z.object({
@@ -14,7 +37,7 @@ export const wizardActions = {
             includePermissions: z.boolean().default(false).optional(),
             includeLinks: z.boolean().default(false).optional(),
         }),
-        bodySchema: v12ChartsConfigSchema,
+        bodySchema: wizardUsSchema,
     }).withValidationSchema(async (_, args, {ctx, headers}) => {
         const {includePermissions, includeLinks, unreleased, revId, chardId} = args;
 

src/shared/sdk/zod-shemas/wizard-chart-api.schema.ts

@@ -256,30 +256,31 @@ const v12PlaceholderSettingsSchema = z.object({
 });
 
 // Forward declaration for recursive types
-const v12FieldSchema: z.ZodType<any> = z.lazy(() =>
-    z
-        .object({
-            data_type: z.string(),
-            fields: z.array(v12FieldSchema).optional(),
-            type: z.string(),
-            title: z.string(),
-            guid: z.string(),
-            formatting: v12FormattingSchema.optional(),
-            format: z.string().optional(),
-            datasetId: z.string(),
-            source: z.string().optional(),
-            datasetName: z.string().optional(),
-            hideLabelMode: z.string().optional(),
-            calc_mode: datasetFieldCalcModeSchema,
-            default_value: parameterDefaultValueSchema.optional(),
-            barsSettings: z.any().optional(), // TableBarsSettings
-            subTotalsSettings: z.any().optional(), // TableSubTotalsSettings
-            backgroundSettings: z.any().optional(), // TableFieldBackgroundSettings
-            columnSettings: z.any().optional(), // ColumnSettings
-            hintSettings: z.any().optional(), // HintSettings
-        })
-        .merge(v12ClientOnlyFieldsSchema),
-);
+const v12FieldSchemaInner = z.object({
+    ...v12ClientOnlyFieldsSchema.shape,
+    data_type: z.string(),
+    type: z.string(),
+    title: z.string(),
+    guid: z.string(),
+    formatting: v12FormattingSchema.optional(),
+    format: z.string().optional(),
+    datasetId: z.string(),
+    source: z.string().optional(),
+    datasetName: z.string().optional(),
+    hideLabelMode: z.string().optional(),
+    calc_mode: datasetFieldCalcModeSchema,
+    default_value: parameterDefaultValueSchema.optional(),
+    barsSettings: z.any().optional(), // TableBarsSettings
+    subTotalsSettings: z.any().optional(), // TableSubTotalsSettings
+    backgroundSettings: z.any().optional(), // TableFieldBackgroundSettings
+    columnSettings: z.any().optional(), // ColumnSettings
+    hintSettings: z.any().optional(), // HintSettings
+});
+
+const v12FieldSchema = z.object({
+    ...v12FieldSchemaInner.shape,
+    fields: z.array(v12FieldSchemaInner).optional(),
+});
 
 // V12Placeholder schema
 const v12PlaceholderSchema = z.object({