cabloy 5.1.120 → 5.1.122

package/zova/src/suite-vendor/a-zova/modules/a-form/src/lib/formLayout.ts

@@ -1,6 +1,7 @@
 import type {
   IFormLayout,
   IFormLayoutField,
+  IFormLayoutLeaf,
   IFormLayoutNode,
   IFormLayoutTab,
   IFormLayoutTabs,
@@ -11,6 +12,7 @@ import type {
   IFormLayoutDiagnostic,
   IResolvedFormLayout,
   IResolvedFormLayoutField,
+  IResolvedFormLayoutLeaf,
   IResolvedFormLayoutGroup,
   IResolvedFormLayoutNode,
   IResolvedFormLayoutSection,
@@ -68,6 +70,9 @@ function resolveNode(
   if (node.type === 'field') {
     return resolveField(node, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths);
   }
+  if (node.type === 'block') {
+    return node;
+  }
   if (node.type === 'tabs') {
     return resolveTabs(
       node,
@@ -84,9 +89,9 @@ function resolveNode(
   if (node.type === 'section') {
     const children = node.children
       .map(item =>
-        resolveField(item, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths),
+        resolveLeaf(item, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths),
       )
-      .filter(Boolean) as IResolvedFormLayoutField[];
+      .filter(Boolean) as IResolvedFormLayoutLeaf[];
     return children.length ? { ...node, id, children } : undefined;
   }
   const children = node.children
@@ -103,11 +108,23 @@ function resolveNode(
       ),
     )
     .filter(Boolean) as Array<
-    IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection
+    IResolvedFormLayoutLeaf | IResolvedFormLayoutGroup | IResolvedFormLayoutSection
   >;
   return children.length ? { ...node, id, children } : undefined;
 }
 
+function resolveLeaf(
+  node: IFormLayoutLeaf,
+  tabPath: IResolvedFormLayout['fieldTabPaths'][string],
+  propertyNames: Set<string>,
+  fieldNames: Set<string>,
+  diagnostics: IFormLayoutDiagnostic[],
+  fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
+): IResolvedFormLayoutLeaf | undefined {
+  if (node.type === 'block') return node;
+  return resolveField(node, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths);
+}
+
 function resolveTabs(
   node: IFormLayoutTabs,
   indexPath: number[],
@@ -163,7 +180,7 @@ function resolveTab(
       ),
     )
     .filter(Boolean) as Array<
-    IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection
+    IResolvedFormLayoutLeaf | IResolvedFormLayoutGroup | IResolvedFormLayoutSection
   >;
   return children.length ? { ...node, id, children } : undefined;
 }

package/zova/src/suite-vendor/a-zova/modules/a-form/src/types/formLayout.ts

@@ -1,5 +1,6 @@
 import type {
   IFormLayoutResponsiveColumns,
+  IResourceRenderBlockOptionsBlock,
   TypeFormLayoutSectionLayout,
 } from 'zova-module-a-openapi';
 
@@ -15,12 +16,20 @@ export interface IResolvedFormLayoutField {
   span?: IFormLayoutResponsiveColumns;
 }
 
+export interface IResolvedFormLayoutBlock {
+  type: 'block';
+  block: IResourceRenderBlockOptionsBlock;
+  span?: IFormLayoutResponsiveColumns;
+}
+
+export type IResolvedFormLayoutLeaf = IResolvedFormLayoutField | IResolvedFormLayoutBlock;
+
 export interface IResolvedFormLayoutGroup {
   type: 'group';
   id: string;
   title?: string;
   description?: string;
-  children: Array<IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection>;
+  children: Array<IResolvedFormLayoutLeaf | IResolvedFormLayoutGroup | IResolvedFormLayoutSection>;
 }
 
 export interface IResolvedFormLayoutSection {
@@ -30,7 +39,7 @@ export interface IResolvedFormLayoutSection {
   description?: string;
   layout?: TypeFormLayoutSectionLayout;
   columns?: IFormLayoutResponsiveColumns;
-  children: IResolvedFormLayoutField[];
+  children: IResolvedFormLayoutLeaf[];
 }
 
 export interface IResolvedFormLayoutTabs {
@@ -43,7 +52,7 @@ export interface IResolvedFormLayoutTab {
   type: 'tab';
   id: string;
   title: string;
-  children: Array<IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection>;
+  children: Array<IResolvedFormLayoutLeaf | IResolvedFormLayoutGroup | IResolvedFormLayoutSection>;
 }
 
 export interface IResolvedFormLayoutTabRef {
@@ -52,7 +61,7 @@ export interface IResolvedFormLayoutTabRef {
 }
 
 export type IResolvedFormLayoutNode =
-  | IResolvedFormLayoutField
+  | IResolvedFormLayoutLeaf
   | IResolvedFormLayoutGroup
   | IResolvedFormLayoutSection
   | IResolvedFormLayoutTabs;

package/zova/src/suite-vendor/a-zova/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.46",
+  "version": "5.1.47",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/resource/formLayout.ts

@@ -1,3 +1,5 @@
+import type { IResourceRenderBlockOptionsBlock } from './block.js';
+
 export interface IFormLayout {
   children: IFormLayoutNode[];
 }
@@ -18,12 +20,20 @@ export interface IFormLayoutField {
   span?: IFormLayoutResponsiveColumns;
 }
 
+export interface IFormLayoutBlock {
+  type: 'block';
+  block: IResourceRenderBlockOptionsBlock;
+  span?: IFormLayoutResponsiveColumns;
+}
+
+export type IFormLayoutLeaf = IFormLayoutField | IFormLayoutBlock;
+
 export interface IFormLayoutGroup {
   type: 'group';
   id?: string;
   title?: string;
   description?: string;
-  children: Array<IFormLayoutField | IFormLayoutGroup | IFormLayoutSection>;
+  children: Array<IFormLayoutLeaf | IFormLayoutGroup | IFormLayoutSection>;
 }
 
 export interface IFormLayoutSection {
@@ -33,7 +43,7 @@ export interface IFormLayoutSection {
   description?: string;
   layout?: TypeFormLayoutSectionLayout;
   columns?: IFormLayoutResponsiveColumns;
-  children: IFormLayoutField[];
+  children: IFormLayoutLeaf[];
 }
 
 export interface IFormLayoutTabs {
@@ -46,11 +56,11 @@ export interface IFormLayoutTab {
   type: 'tab';
   id?: string;
   title: string;
-  children: Array<IFormLayoutField | IFormLayoutGroup | IFormLayoutSection>;
+  children: Array<IFormLayoutLeaf | IFormLayoutGroup | IFormLayoutSection>;
 }
 
 export type IFormLayoutNode =
-  | IFormLayoutField
+  | IFormLayoutLeaf
   | IFormLayoutGroup
   | IFormLayoutSection
   | IFormLayoutTabs;

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.140",
+  "version": "5.1.141",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -16,13 +16,13 @@
     "zova-module-a-boundary": "^5.1.21",
     "zova-module-a-command": "^5.1.33",
     "zova-module-a-fetch": "^5.1.24",
-    "zova-module-a-form": "^5.1.45",
+    "zova-module-a-form": "^5.1.46",
     "zova-module-a-icon": "^5.1.26",
     "zova-module-a-interceptor": "^5.1.29",
     "zova-module-a-logger": "^5.1.26",
     "zova-module-a-meta": "^5.1.21",
     "zova-module-a-model": "^5.1.33",
-    "zova-module-a-openapi": "^5.1.46",
+    "zova-module-a-openapi": "^5.1.47",
     "zova-module-a-router": "^5.1.31",
     "zova-module-a-routerstack": "^5.1.26",
     "zova-module-a-routertabs": "^5.1.33",