Merge pull request #946 from riyaa14/improve-modal-msgs

fix: improve info messages for model and design import modals

Author: amitamrutiya

src/schemas/importDesign/schema.tsx

@@ -41,7 +41,8 @@ const importDesignSchema = {
           file: {
             type: 'string',
             format: 'file',
-            description: 'Browse the  file from your file system',
+            description:
+              'Supported formats: Kubernetes Manifests, Helm Charts, Docker Compose, and Meshery Designs. See [Import Designs Documentation](https://docs.meshery.io/guides/configuration-management/importing-designs#import-designs-using-meshery-ui) for details',
             'x-rjsf-grid-area': '12'
           }
         },
@@ -63,7 +64,7 @@ const importDesignSchema = {
             format: 'uri',
             title: 'URL',
             description:
-              'Provide the URL of the  file you want to import. This should be a direct URL to the file, for example: https://raw.github.com/your-design-file.yaml',
+              'Provide the URL of the file you want to import. This should be a direct URL to a single file, for example: https://raw.github.com/your-design-file.yaml. Also, ensure that design is in a supported format: Kubernetes Manifest, Helm Chart, Docker Compose, or Meshery Design. See [Import Designs Documentation](https://docs.meshery.io/guides/configuration-management/importing-designs#import-designs-using-meshery-ui) for details',
             'x-rjsf-grid-area': '12'
           }
         },

src/schemas/importModel/schema.tsx

@@ -0,0 +1,61 @@
+const importModelSchema = {
+  type: 'object',
+  properties: {
+    uploadType: {
+      title: 'Upload method',
+      enum: ['File Import', 'URL Import'],
+      default: 'Select the Upload Method',
+      'x-rjsf-grid-area': '12',
+      description:
+        "Choose the method you prefer to upload your model file. Select 'File Upload' if you have the file on your local system or 'URL Import' if you have the file hosted online."
+    }
+  },
+  allOf: [
+    {
+      if: {
+        properties: {
+          uploadType: {
+            const: 'File Import'
+          }
+        }
+      },
+      then: {
+        properties: {
+          file: {
+            type: 'string',
+            format: 'file',
+            description:
+              'Supported model file formats are: .tar, .tar.gz, and .tgz. See [Import Models Documentation](https://docs.meshery.io/guides/configuration-management/importing-models#import-models-using-meshery-ui) for details',
+            'x-rjsf-grid-area': '12'
+          }
+        },
+        required: ['file']
+      }
+    },
+    {
+      if: {
+        properties: {
+          uploadType: {
+            const: 'URL Import'
+          }
+        }
+      },
+      then: {
+        properties: {
+          url: {
+            type: 'string',
+            format: 'uri',
+            title: 'URL',
+            description:
+              'A direct URL to a single model file, for example: https://raw.github.com/your-model-file.tar. Supported model file formats are: .tar, .tar.gz, and .tgz. \n\nFor bulk import of your model use the GitHub connection or CSV files. See [Import Models Documentation](https://docs.meshery.io/guides/configuration-management/importing-models#import-models-using-meshery-ui) for details',
+            'x-rjsf-grid-area': '12',
+            disabled: true
+          }
+        }
+      }
+    }
+  ],
+  required: ['uploadType']
+};
+
+export default importModelSchema;

src/schemas/importModel/uiSchema.tsx

@@ -0,0 +1,8 @@
+const importModelUiSchema = {
+  uploadType: {
+    'ui:widget': 'radio'
+  },
+  'ui:order': ['uploadType', 'file', 'url']
+};
+
+export default importModelUiSchema;

src/schemas/index.tsx

@@ -16,6 +16,9 @@ import importDesignUiSchema from './importDesign/uiSchema';
 import importFilterSchema from './importFilter/schema';
 import importFilterUiSchema from './importFilter/uiSchema';
 
+import importModelSchema from './importModel/schema';
+import importModelUiSchema from './importModel/uiSchema';
+
 import publishCatalogItemSchema from './publishCatalogItem/schema';
 import publishCatalogItemUiSchema from './publishCatalogItem/uiSchema';
 
@@ -43,6 +46,8 @@ export {
   importDesignUiSchema,
   importFilterSchema,
   importFilterUiSchema,
+  importModelSchema,
+  importModelUiSchema,
   kubernetesCredentialSchema,
   kubernetesCredentialUiSchema,
   prometheusCredentialSchema,