Update metadata editor to use JupyterLab's new form editor (#2464)

elyra-ai · Jun 1, 2022 · 78cc89d · 78cc89d
1 parent 6bc4fb3
commit 78cc89d
Show file tree

Hide file tree

Showing 39 changed files with 1,590 additions and 1,794 deletions.
diff --git a/docs/source/user_guide/command-line-interface.md b/docs/source/user_guide/command-line-interface.md
@@ -94,16 +94,19 @@ Application-level properties within a schema reside as top-level properties with
         "title": "Tags",
         "description": "Tags for categorizing snippets",
         "type": "array",
+        "items": {
+          "type": "string"
+        },
         "uihints": {
-          "field_type": "tags"
+          "ui:field": "tags"
         }
       },
       "language": {
         "title": "Language",
         "description": "Code snippet implementation language",
         "type": "string",
         "uihints": {
-          "field_type": "dropdown",
+          "ui:field": "dropdown",
           "default_choices": [
             "Python",
             "Java",
@@ -120,7 +123,7 @@ Application-level properties within a schema reside as top-level properties with
         "description": "Code snippet code lines",
         "type": "array",
         "uihints": {
-          "field_type": "code",
+          "ui:field": "code",
           "category": "Source"
         }
       }

diff --git a/elyra/metadata/schemas/airflow.json b/elyra/metadata/schemas/airflow.json
@@ -71,7 +71,6 @@
           "enum": ["{GIT_TYPES_PLACEHOLDER}"],
           "default": "{GIT_DEFAULT_TYPE_PLACEHOLDER}",
           "uihints": {
-            "field_type": "dropdown",
             "category": "Apache Airflow"
           }
         },
@@ -108,7 +107,7 @@
           "description": "Token that has permission to push to the DAG repository",
           "type": "string",
           "uihints": {
-            "secure": true,
+            "ui:field": "password",
             "category": "Apache Airflow"
           }
         },
@@ -144,7 +143,6 @@
           ],
           "default": "USER_CREDENTIALS",
           "uihints": {
-            "field_type": "dropdown",
             "category": "Cloud Object Storage"
           }
         },
@@ -153,7 +151,7 @@
           "description": "Kubernetes secret that's defined in the specified user namespace, containing the Cloud Object Storage username and password. This property is required for authentication type KUBERNETES_SECRET.",
           "type": "string",
           "uihints": {
-            "secure": true,
+            "ui:field": "password",
             "category": "Cloud Object Storage"
           }
         },
@@ -171,7 +169,7 @@
           "type": "string",
           "minLength": 8,
           "uihints": {
-            "secure": true,
+            "ui:field": "password",
             "category": "Cloud Object Storage"
           }
         },
@@ -181,14 +179,11 @@
           "uniqueItems": true,
           "type": "array",
           "items": {
-            "allOf": [
-              { "minLength": 1 },
-              { "pattern": "^[^ \t]+" },
-              { "pattern": "[^ \t]+$" }
-            ]
+            "minLength": 1,
+            "pattern": "^[^ \t]+([ \t]+[^ \t]+)*$"
           },
           "uihints": {
-            "field_type": "tags"
+            "ui:field": "tags"
           }
         }
       },

diff --git a/elyra/metadata/schemas/code-snippet.json b/elyra/metadata/schemas/code-snippet.json
@@ -38,22 +38,19 @@
           "type": "array",
           "uniqueItems": true,
           "items": {
-            "allOf": [
-              { "minLength": 1 },
-              { "pattern": "^[^ \t]+" },
-              { "pattern": "[^ \t]+$" }
-            ]
+            "minLength": 1,
+            "pattern": "^[^ \t]+([ \t]+[^ \t]+)*$"
           },
           "uihints": {
-            "field_type": "tags"
+            "ui:field": "tags"
           }
         },
         "language": {
           "title": "Language",
           "description": "Code snippet implementation language",
           "type": "string",
           "uihints": {
-            "field_type": "dropdown",
+            "ui:field": "dropdown",
             "default_choices": ["Python", "Java", "R", "Scala", "Markdown"],
             "category": "Source"
           },
@@ -63,8 +60,11 @@
           "title": "Code",
           "description": "Code snippet code lines",
           "type": "array",
+          "items": {
+            "type": "string"
+          },
           "uihints": {
-            "field_type": "code",
+            "ui:field": "code",
             "category": "Source"
           }
         }

diff --git a/elyra/metadata/schemas/kfp.json b/elyra/metadata/schemas/kfp.json
@@ -80,7 +80,6 @@
           "enum": ["Argo", "Tekton"],
           "default": "Argo",
           "uihints": {
-            "field_type": "dropdown",
             "category": "Kubeflow Pipelines"
           }
         },
@@ -91,7 +90,6 @@
           "enum": ["{AUTH_PROVIDER_PLACEHOLDERS}"],
           "default": "{DEFAULT_AUTH_PROVIDER_PLACEHOLDER}",
           "uihints": {
-            "field_type": "dropdown",
             "category": "Kubeflow Pipelines"
           }
         },
@@ -108,7 +106,7 @@
           "description": "Password for the specified username. This property is required for all authentication types, except NO_AUTHENTICATION and KUBERNETES_SERVICE_ACCOUNT_TOKEN.",
           "type": "string",
           "uihints": {
-            "secure": true,
+            "ui:field": "password",
             "category": "Kubeflow Pipelines"
           }
         },
@@ -144,7 +142,6 @@
           ],
           "default": "USER_CREDENTIALS",
           "uihints": {
-            "field_type": "dropdown",
             "category": "Cloud Object Storage"
           }
         },
@@ -153,7 +150,7 @@
           "description": "Kubernetes secret that's defined in the specified user namespace, containing the Cloud Object Storage username and password. This property is required for authentication type KUBERNETES_SECRET.",
           "type": "string",
           "uihints": {
-            "secure": true,
+            "ui:field": "password",
             "category": "Cloud Object Storage"
           }
         },
@@ -171,7 +168,7 @@
           "type": "string",
           "minLength": 8,
           "uihints": {
-            "secure": true,
+            "ui:field": "password",
             "category": "Cloud Object Storage"
           }
         },
@@ -181,14 +178,11 @@
           "uniqueItems": true,
           "type": "array",
           "items": {
-            "allOf": [
-              { "minLength": 1 },
-              { "pattern": "^[^ \t]+" },
-              { "pattern": "[^ \t]+$" }
-            ]
+            "minLength": 1,
+            "pattern": "^[^ \t]+([ \t]+[^ \t]+)*$"
           },
           "uihints": {
-            "field_type": "tags"
+            "ui:field": "tags"
           }
         }
       },

diff --git a/elyra/metadata/schemas/local-directory-catalog.json b/elyra/metadata/schemas/local-directory-catalog.json
@@ -39,7 +39,6 @@
           "type": "string",
           "enum": ["KUBEFLOW_PIPELINES", "APACHE_AIRFLOW"],
           "uihints": {
-            "field_type": "dropdown",
             "category": "Runtime"
           }
         },
@@ -52,7 +51,6 @@
             "maxLength": 18
           },
           "uihints": {
-            "field_type": "array",
             "category": "Component Categories"
           }
         },
@@ -64,7 +62,6 @@
             "type": "string"
           },
           "uihints": {
-            "field_type": "array",
             "category": "Configuration"
           }
         },
@@ -73,8 +70,6 @@
           "description": "Indicates whether a recursive search for component specification files should be performed on subdirectories",
           "type": "boolean",
           "uihints": {
-            "field_type": "boolean",
-            "placeholder": "false",
             "category": "Configuration"
           }
         }

diff --git a/elyra/metadata/schemas/local-file-catalog.json b/elyra/metadata/schemas/local-file-catalog.json
@@ -39,7 +39,6 @@
           "type": "string",
           "enum": ["KUBEFLOW_PIPELINES", "APACHE_AIRFLOW"],
           "uihints": {
-            "field_type": "dropdown",
             "category": "Runtime"
           }
         },
@@ -52,7 +51,6 @@
             "maxLength": 18
           },
           "uihints": {
-            "field_type": "array",
             "category": "Component Categories"
           }
         },
@@ -72,7 +70,6 @@
             "type": "string"
           },
           "uihints": {
-            "field_type": "array",
             "category": "Configuration"
           }
         }

diff --git a/elyra/metadata/schemas/metadata-test.json b/elyra/metadata/schemas/metadata-test.json
@@ -96,7 +96,7 @@
           "type": "string",
           "enum": ["elyra", "rocks"],
           "uihints": {
-            "field_type": "dropdown",
+            "ui:field": "dropdown",
             "default_choices": ["elyra"]
           }
         },
@@ -108,7 +108,7 @@
           "maxItems": 10,
           "uniqueItems": true,
           "uihints": {
-            "field_type": "code"
+            "ui:field": "code"
           }
         },
         "object_test": {

diff --git a/elyra/metadata/schemas/metadata-test2.json b/elyra/metadata/schemas/metadata-test2.json
@@ -86,7 +86,7 @@
           "type": "string",
           "enum": ["elyra", "rocks"],
           "uihints": {
-            "field_type": "dropdown",
+            "ui:field": "dropdown",
             "default_choices": ["elyra"]
           }
         },
@@ -98,7 +98,7 @@
           "maxItems": 10,
           "uniqueItems": true,
           "uihints": {
-            "field_type": "code"
+            "ui:field": "code"
           }
         },
         "object_test": {

diff --git a/elyra/metadata/schemas/runtime-image.json b/elyra/metadata/schemas/runtime-image.json
@@ -38,14 +38,11 @@
           "uniqueItems": true,
           "type": "array",
           "items": {
-            "allOf": [
-              { "minLength": 1 },
-              { "pattern": "^[^ \t]+" },
-              { "pattern": "[^ \t]+$" }
-            ]
+            "minLength": 1,
+            "pattern": "^[^ \t]+([ \t]+[^ \t]+)*$"
           },
           "uihints": {
-            "field_type": "tags"
+            "ui:field": "tags"
           }
         },
         "image_name": {
@@ -64,7 +61,6 @@
           "type": "string",
           "enum": ["Always", "IfNotPresent", "Never"],
           "uihints": {
-            "field_type": "dropdown",
             "category": "Source"
           }
         },
@@ -76,7 +72,7 @@
           "maxLength": 253,
           "uihints": {
             "category": "Source",
-            "secure": true
+            "ui:field": "password"
           }
         }
       },

diff --git a/elyra/metadata/schemas/url-catalog.json b/elyra/metadata/schemas/url-catalog.json
@@ -39,7 +39,6 @@
           "type": "string",
           "enum": ["KUBEFLOW_PIPELINES", "APACHE_AIRFLOW"],
           "uihints": {
-            "field_type": "dropdown",
             "category": "Runtime"
           }
         },
@@ -52,7 +51,6 @@
             "maxLength": 18
           },
           "uihints": {
-            "field_type": "array",
             "category": "Component Categories"
           }
         },
@@ -65,7 +63,6 @@
             "format": "uri"
           },
           "uihints": {
-            "field_type": "array",
             "category": "Configuration"
           }
         }

diff --git a/elyra/pipeline/airflow/package_catalog_connector/airflow-package-catalog.json b/elyra/pipeline/airflow/package_catalog_connector/airflow-package-catalog.json
@@ -39,10 +39,7 @@
           "description": "List of runtime types this catalog supports",
           "type": "string",
           "enum": ["APACHE_AIRFLOW"],
-          "default": "APACHE_AIRFLOW",
-          "uihints": {
-            "field_type": "dropdown"
-          }
+          "default": "APACHE_AIRFLOW"
         },
         "categories": {
           "title": "Category Names",
@@ -54,7 +51,6 @@
           },
           "default": ["Core packages"],
           "uihints": {
-            "field_type": "array",
             "category": "Component Categories"
           }
         },

diff --git a/...pipeline/airflow/provider_package_catalog_connector/airflow-provider-package-catalog.json b/...pipeline/airflow/provider_package_catalog_connector/airflow-provider-package-catalog.json
@@ -39,10 +39,7 @@
           "description": "List of runtime types this catalog supports",
           "type": "string",
           "enum": ["APACHE_AIRFLOW"],
-          "default": "APACHE_AIRFLOW",
-          "uihints": {
-            "field_type": "dropdown"
-          }
+          "default": "APACHE_AIRFLOW"
         },
         "categories": {
           "title": "Category Names",
@@ -54,7 +51,6 @@
           },
           "default": ["provider packages"],
           "uihints": {
-            "field_type": "array",
             "category": "Component Categories"
           }
         },