Merge pull request #1434 from layer5io/fix/import-design-schema-oneof

fix(schemas): align importDesign with oneOf[File|URL] shape (0.19.1)

Author: leecalcote

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@sistent/sistent",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "description": "Reusable React Components and SVG Icons library",
   "repository": {
     "type": "git",

package.json

@@ -3,23 +3,40 @@ import { DesignDefinitionV1Beta1OpenApiSchema } from '@meshery/schemas';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const DesignSchema = (DesignDefinitionV1Beta1OpenApiSchema as any).components.schemas;
 
+// In @meshery/schemas >= 1.1.0, MesheryPatternImportRequestBody is a
+// `oneOf` union of a File-import variant and a URL-import variant rather than
+// a flat properties object. Resolve the individual field shapes from the
+// dedicated payload components so the form schema remains driven by the
+// upstream API contract.
+// See meshery/schemas commit b08a4f62 "fix(design): tighten
+// MesheryPatternImportRequestBody to oneOf[File|URL]".
+const ImportBody = DesignSchema.MesheryPatternImportRequestBody;
+const FilePayload = DesignSchema.MesheryPatternImportFilePayload;
+const URLPayload = DesignSchema.MesheryPatternImportURLPayload;
+
+// `name` is a common field present on both variants; File is used as the
+// canonical source.
+const nameField = FilePayload.properties.name;
+const fileField = FilePayload.properties.file;
+const urlField = URLPayload.properties.url;
+
 const importDesignSchema = {
   type: 'object',
   properties: {
     name: {
-      type: DesignSchema.MesheryPatternImportRequestBody.properties.name.type,
+      type: nameField.type,
       title: 'Design file name',
-      default: DesignSchema.MesheryPatternImportRequestBody.properties.name.default,
+      default: nameField.default,
       'x-rjsf-grid-area': '12',
-      description: DesignSchema.MesheryPatternImportRequestBody.properties.name.description
+      description: nameField.description
     },
 
     uploadType: {
       title: 'Upload method',
       enum: ['File Upload', 'URL Import'],
       default: 'URL Import',
       'x-rjsf-grid-area': '12',
-      description: DesignSchema.MesheryPatternImportRequestBody.description
+      description: ImportBody.description
     }
   },
 
@@ -35,9 +52,9 @@ const importDesignSchema = {
       then: {
         properties: {
           file: {
-            type: DesignSchema.MesheryPatternImportRequestBody.properties.file.type,
-            format: DesignSchema.MesheryPatternImportRequestBody.properties.file.format,
-            description: DesignSchema.MesheryPatternImportRequestBody.properties.file.description,
+            type: fileField.type,
+            format: fileField.format,
+            description: fileField.description,
             'x-rjsf-grid-area': '12'
           }
         },
@@ -55,10 +72,10 @@ const importDesignSchema = {
       then: {
         properties: {
           url: {
-            type: DesignSchema.MesheryPatternImportRequestBody.properties.url.type,
-            format: DesignSchema.MesheryPatternImportRequestBody.properties.url.format,
+            type: urlField.type,
+            format: urlField.format,
             title: 'URL',
-            description: DesignSchema.MesheryPatternImportRequestBody.properties.url.description,
+            description: urlField.description,
             'x-rjsf-grid-area': '12'
           }
         },