From d36f9f605d4b65caff30cecc09b985d21fb474b2 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 19 Feb 2024 00:00:14 +0000 Subject: [PATCH 1/3] Update model schema with status property Signed-off-by: Ubuntu --- schemas/meshmodel/schemas/model.json | 1 + 1 file changed, 1 insertion(+) diff --git a/schemas/meshmodel/schemas/model.json b/schemas/meshmodel/schemas/model.json index cc612c869a..db1a6ac005 100644 --- a/schemas/meshmodel/schemas/model.json +++ b/schemas/meshmodel/schemas/model.json @@ -4,6 +4,7 @@ "description": "Model is a construct used for namespacing MeshModel entities.", "additionalProperties": false, "type": "object", + "status": "Status of model, e.g. Registered, Ignored, Enabled ...", "required": [ "name", "version", From d7ea4fa82773fa4584cdadc0d94df0d63d0e142b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 19 Feb 2024 00:03:08 +0000 Subject: [PATCH 2/3] Remove RJSF schemas Signed-off-by: Ubuntu --- .../ui/catalog/applicationImport.json | 124 ------------------ schemas/external/ui/catalog/designImport.json | 68 ---------- schemas/external/ui/catalog/filterImport.json | 78 ----------- .../ui/catalog/publishCatalogItem.json | 57 -------- .../ui/catalog/uiSchemaApplication.json | 6 - .../ui/catalog/uiSchemaDesignImport.json | 6 - .../external/ui/catalog/uiSchemaFilter.json | 3 - .../catalog/uiSchemaPublishCatalogItem.json | 3 - schemas/external/ui/connections/grafana.js | 30 ----- schemas/external/ui/connections/kubernetes.js | 69 ---------- schemas/external/ui/connections/prometheus.js | 25 ---- .../ui/environment/environment-ui-schema.json | 10 -- .../external/ui/environment/environment.json | 27 ---- .../support-form/support-form-ui-schema.json | 11 -- .../ui/support-form/support-form.json | 35 ----- 15 files changed, 552 deletions(-) delete mode 100644 schemas/external/ui/catalog/applicationImport.json delete mode 100644 schemas/external/ui/catalog/designImport.json delete mode 100644 schemas/external/ui/catalog/filterImport.json delete mode 100644 schemas/external/ui/catalog/publishCatalogItem.json delete mode 100644 schemas/external/ui/catalog/uiSchemaApplication.json delete mode 100644 schemas/external/ui/catalog/uiSchemaDesignImport.json delete mode 100644 schemas/external/ui/catalog/uiSchemaFilter.json delete mode 100644 schemas/external/ui/catalog/uiSchemaPublishCatalogItem.json delete mode 100644 schemas/external/ui/connections/grafana.js delete mode 100644 schemas/external/ui/connections/kubernetes.js delete mode 100644 schemas/external/ui/connections/prometheus.js delete mode 100644 schemas/external/ui/environment/environment-ui-schema.json delete mode 100644 schemas/external/ui/environment/environment.json delete mode 100644 schemas/external/ui/support-form/support-form-ui-schema.json delete mode 100644 schemas/external/ui/support-form/support-form.json diff --git a/schemas/external/ui/catalog/applicationImport.json b/schemas/external/ui/catalog/applicationImport.json deleted file mode 100644 index 33d9d7a3de..0000000000 --- a/schemas/external/ui/catalog/applicationImport.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "//playground": "https://rjsf-team.github.io/react-jsonschema-form/#eyJmb3JtRGF0YSI6eyJhcHBsaWNhdGlvblR5cGUiOiJIZWxtIENoYXJ0In0sInNjaGVtYSI6eyJ0aXRsZSI6IlVwbG9hZCBBcHBsaWNhdGlvbiBGaWxlIiwicHJvcGVydGllcyI6eyJuYW1lIjp7InR5cGUiOiJzdHJpbmciLCJ0aXRsZSI6IkdpdmUgeW91ciBhcHBsaWNhdGlvbiBmaWxlIGEgbmFtZSIsIngtcmpzZi1ncmlkLWFyZWEiOiI2In0sImFwcGxpY2F0aW9uVHlwZSI6eyJ0aXRsZSI6IlNlbGVjdCBhcHBsaWNhdGlvbiB0eXBlIiwiZW51bSI6WyJIZWxtIENoYXJ0IiwiS3ViZXJuZXRlcyBNYW5pZmVzdCIsIkRvY2tlciBDb21wb3NlIl0sImRlZmF1bHQiOiJIZWxtIENoYXJ0IiwieC1yanNmLWdyaWQtYXJlYSI6IjYifX0sImRlcGVuZGVuY2llcyI6eyJhcHBsaWNhdGlvblR5cGUiOnsib25lT2YiOlt7InByb3BlcnRpZXMiOnsiYXBwbGljYXRpb25UeXBlIjp7ImNvbnN0IjoiSGVsbSBDaGFydCJ9LCJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsicHJvcGVydGllcyI6eyJhcHBsaWNhdGlvblR5cGUiOnsiY29uc3QiOiJLdWJlcm5ldGVzIE1hbmlmZXN0In19LCJvbmVPZiI6W3sidGl0bGUiOiJVUkwgVXBsb2FkIiwicHJvcGVydGllcyI6eyJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsidGl0bGUiOiJGaWxlIFVwbG9hZCIsInByb3BlcnRpZXMiOnsiZmlsZSI6eyJ0eXBlIjoic3RyaW5nIiwiZm9ybWF0IjoiZGF0YS11cmwiLCJ0aXRsZSI6IkZpbGUgVXBsb2FkIiwiZGVzY3JpcHRpb24iOiJCcm93c2UgdGhlIGFwcGxpY2F0aW9uIGZpbGUgZnJvbSB5b3VyIGZpbGUgc3lzdGVtIiwieC1yanNmLWdyaWQtYXJlYSI6IjEyIn19LCJyZXF1aXJlZCI6WyJmaWxlIl19XX0seyJwcm9wZXJ0aWVzIjp7ImFwcGxpY2F0aW9uVHlwZSI6eyJjb25zdCI6IkRvY2tlciBDb21wb3NlIn19LCJvbmVPZiI6W3sicHJvcGVydGllcyI6eyJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsicHJvcGVydGllcyI6eyJmaWxlIjp7InR5cGUiOiJzdHJpbmciLCJmb3JtYXQiOiJkYXRhLXVybCIsInRpdGxlIjoiRmlsZSBVcGxvYWQiLCJkZXNjcmlwdGlvbiI6IkJyb3dzZSB0aGUgYXBwbGljYXRpb24gZmlsZSBmcm9tIHlvdXIgZmlsZSBzeXN0ZW0iLCJ4LXJqc2YtZ3JpZC1hcmVhIjoiMTIifX0sInJlcXVpcmVkIjpbImZpbGUiXX1dfV19fX0sInVpU2NoZW1hIjp7ImFwcGxpY2F0aW9uVHlwZSI6eyJ1aTp3aWRnZXQiOiJyYWRpbyJ9fSwidGhlbWUiOiJtYXRlcmlhbC11aS01IiwibGl2ZVNldHRpbmdzIjp7fX0=", - "title": "Upload Application File", - "properties": { - "name": { - "type": "string", - "title": "Application Name", - "x-rjsf-grid-area": "6", - "description": "The name of Application" - }, - "applicationType": { - "title": "Application Type", - "description": "Choose the type of application you want to upload", - "enum": [ - "Helm Chart", - "Kubernetes Manifest", - "Docker Compose" - ], - "default": "Helm Chart", - "x-rjsf-grid-area": "6" - } - }, - "dependencies": { - "applicationType": { - "oneOf": [ - { - "properties": { - "applicationType": { - "const": "Helm Chart" - }, - "url": { - "type": "string", - "format": "uri", - "title": "URL", - "description": "raw URL of the application file, example: https://raw.github.com/...", - "x-rjsf-grid-area": "12" - } - }, - "required": [ - "url" - ] - }, - { - "properties": { - "applicationType": { - "const": "Kubernetes Manifest" - } - }, - "oneOf": [ - { - "title": "URL Upload", - "properties": { - "url": { - "type": "string", - "format": "uri", - "title": "URL", - "description": "raw URL of the application file, example: https://raw.github.com/...", - "x-rjsf-grid-area": "12" - } - }, - "required": [ - "url" - ] - }, - { - "title": "File Upload", - "properties": { - "file": { - "type": "string", - "format": "data-url", - "title": "File Upload", - "description": "Browse the application file from your file system", - "x-rjsf-grid-area": "12" - } - }, - "required": [ - "file" - ] - } - ] - }, - { - "properties": { - "applicationType": { - "const": "Docker Compose" - } - }, - "oneOf": [ - { - "title": "URL Upload", - "properties": { - "url": { - "type": "string", - "format": "uri", - "title": "URL", - "description": "raw URL of the application file, example: https://raw.github.com/...", - "x-rjsf-grid-area": "12" - } - }, - "required": [ - "url" - ] - }, - { - "title": "File Upload", - "properties": { - "file": { - "type": "string", - "format": "data-url", - "title": "File Upload", - "description": "Browse the application file from your file system", - "x-rjsf-grid-area": "12" - } - }, - "required": [ - "file" - ] - } - ] - } - ] - } - } -} \ No newline at end of file diff --git a/schemas/external/ui/catalog/designImport.json b/schemas/external/ui/catalog/designImport.json deleted file mode 100644 index 96449defe4..0000000000 --- a/schemas/external/ui/catalog/designImport.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "title": "Upload Design File", - "properties": { - "name": { - "type": "string", - "title": "Give your design file a name", - "default": "Untitled Design", - "x-rjsf-grid-area" : "12" - }, - "uploadType": { - "title": "Select the Upload Method", - "enum": [ - "File Upload", - "URL Upload" - ], - "default": "File Upload", - "x-rjsf-grid-area" : "12" - } - }, - "allOf": [ - { - "if": { - "properties": { - "uploadType": { - "const": "File Upload" - } - } - }, - "then": { - "title": "via URL", - "properties": { - "file": { - "type": "string", - "format": "file", - "description": "Browse the design file from your file system", - "x-rjsf-grid-area" : "12" - } - }, - "required": [ - "file" - ] - } - }, - { - "if": { - "properties": { - "uploadType": { - "const": "URL Upload" - } - } - }, - "then": { - "title": "via URL", - "properties": { - "url": { - "type": "string", - "title": "URL", - "description": "raw url of the design file, example: https://raw.github.com/...", - "x-rjsf-grid-area" : "12" - } - }, - "required": [ - "url" - ] - } - } - ] -} \ No newline at end of file diff --git a/schemas/external/ui/catalog/filterImport.json b/schemas/external/ui/catalog/filterImport.json deleted file mode 100644 index 8a5bb3270c..0000000000 --- a/schemas/external/ui/catalog/filterImport.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "type": "object", - "properties": { - "name": { - "type": "string", - "title": "Name", - "description": "The name of Filter", - "default": "Unitled Filter File", - "x-rjsf-grid-area" : "6" - }, - "config": { - "type": "string", - "title": "WASM Filter Config", - "format": "textarea", - "description": "Enter the configuration details. The configuration detail is the yaml string with running details", - "default": "This is an Exmaple config, config could be Yaml or JSON\ntyped_config:\r\n \"@type\": type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm\r\n config:\r\n name: example-filter\r\n rootId: my_root_id\r\n vmConfig:\r\n code:\r\n local:\r\n filename: /var/local/lib/wasm-filters/example-filter.wasm\r\n runtime: envoy.wasm.runtime.v8\r\n vmId: example-filter\r\n allow_precompiled: true\r\nname: envoy.filters.http.wasm", - "x-rjsf-grid-area" : "12" - }, - "uploadType": { - "title": "Select the Upload Method", - "enum": [ - "File Upload", - "URL Upload" - ], - "default": "File Upload", - "x-rjsf-grid-area" : "6" - } - }, - "allOf": [ - { - "if": { - "properties": { - "uploadType": { - "const": "File Upload" - } - } - }, - "then": { - "title": "via File", - "properties": { - "file": { - "type": "string", - "format": "file", - "description": "Browse the filter file from your file system", - "x-rjsf-grid-area" : "12" - } - }, - "required": [ - "file" - ] - } - }, - { - "if": { - "properties": { - "uploadType": { - "const": "URL Upload" - } - } - }, - "then": { - "title": "via URL", - "properties": { - "url": { - "type": "string", - "title": "URL", - "format": "uri", - "description": "raw url of the filter file, example: https://raw.github.com/...", - "x-rjsf-grid-area" : "12" - } - }, - "required": [ - "url" - ] - } - } - ] -} \ No newline at end of file diff --git a/schemas/external/ui/catalog/publishCatalogItem.json b/schemas/external/ui/catalog/publishCatalogItem.json deleted file mode 100644 index 91a2f5a211..0000000000 --- a/schemas/external/ui/catalog/publishCatalogItem.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "//playground": "https://rjsf-team.github.io/react-jsonschema-form/#eyJmb3JtRGF0YSI6eyJjb21wYXRpYmlsaXR5IjpbImlzdGlvIl0sInR5cGUiOiJkZXBsb3ltZW50IiwiZmlyc3ROYW1lIjoiQ2h1Y2siLCJsYXN0TmFtZSI6Ik5vcnJpcyIsImFnZSI6NzUsImJpbyI6IlJvdW5kaG91c2Uga2lja2luZyBhc3NlcyBzaW5jZSAxOTQwIiwicGFzc3dvcmQiOiJub25lZWQiLCJ0ZWxlcGhvbmUiOiIxLTgwMC1LSUNLQVNTIn0sInNjaGVtYSI6eyJ0eXBlIjoib2JqZWN0IiwicHJvcGVydGllcyI6eyJjb21wYXRpYmlsaXR5Ijp7InR5cGUiOiJhcnJheSIsInRpdGxlIjoiVGVjaG5vbG9neSIsIml0ZW1zIjp7ImVudW0iOlsiaXN0aW8iLCJsaW5rZXJkIl0sInR5cGUiOiJzdHJpbmcifSwidW5pcXVlSXRlbXMiOnRydWUsIm1pbkl0ZW1zIjoxLCJkZXNjcmlwdGlvbiI6IlRoZSBsaXN0IG9mIGNvbXBhdGlibGUgdGVjaG5vbG9naWVzLiIsIngtcmpzZi1ncmlkLWFyZWEiOjZ9LCJwYXR0ZXJuX2NhdmVhdHMiOnsidHlwZSI6InN0cmluZyIsInRpdGxlIjoiQ2F2ZWF0cyBhbmQgQ29uc2lkZXJhdGlvbnMiLCJkZXNjcmlwdGlvbiI6IkNhdmVhdHMgcmVsYXRlZCB0byB0aGUgZGVzaWduLiIsImZvcm1hdCI6InRleHRhcmVhIiwieC1yanNmLWdyaWQtYXJlYSI6MTJ9LCJwYXR0ZXJuX2luZm8iOnsidHlwZSI6InN0cmluZyIsInRpdGxlIjoiRGVzY3JpcHRpb24iLCJkZXNjcmlwdGlvbiI6IkFkZGl0aW9uYWwgaW5mb3JtYXRpb24gYWJvdXQgdGhlIGRlc2lnbi4iLCJmb3JtYXQiOiJ0ZXh0YXJlYSIsIngtcmpzZi1ncmlkLWFyZWEiOjEyfSwidHlwZSI6eyJ0eXBlIjoic3RyaW5nIiwidGl0bGUiOiJUeXBlIiwiZW51bSI6WyJkZXBsb3ltZW50Iiwib2JzZXJ2YWJpbGl0eSIsInJlc2lsaWVuY3kiLCJzY2FsaW5nIiwic2VjdXJpdHkiLCJ0cmFmZmljLW1hbmFnZW1lbnQiLCJ0cm91Ymxlc2hvb3RpbmciLCJ3b3JrbG9hZHMiXSwiZGVmYXVsdCI6ImRlcGxveW1lbnQiLCJkZXNjcmlwdGlvbiI6IlRoZSBjYXRlZ29yeSBvZiB0aGUgcGF0dGVybi4iLCJ4LXJqc2YtZ3JpZC1hcmVhIjo2fX0sInJlcXVpcmVkIjpbImNvbXBhdGliaWxpdHkiLCJwYXR0ZXJuX2NhdmVhdHMiLCJwYXR0ZXJuX2luZm8iLCJ0eXBlIl19LCJ1aVNjaGVtYSI6eyJ1aTpvcmRlciI6WyJ0eXBlIiwiY29tcGF0aWJpbGl0eSIsInBhdHRlcm5fY2F2ZWF0cyIsInBhdHRlcm5faW5mbyJdfSwidGhlbWUiOiJkZWZhdWx0IiwibGl2ZVNldHRpbmdzIjp7InNob3dFcnJvckxpc3QiOiJ0b3AiLCJ2YWxpZGF0ZSI6ZmFsc2UsImRpc2FibGVkIjpmYWxzZSwibm9IdG1sNVZhbGlkYXRlIjpmYWxzZSwicmVhZG9ubHkiOmZhbHNlLCJvbWl0RXh0cmFEYXRhIjpmYWxzZSwibGl2ZU9taXQiOmZhbHNlLCJleHBlcmltZW50YWxfZGVmYXVsdEZvcm1TdGF0ZUJlaGF2aW9yIjp7ImFycmF5TWluSXRlbXMiOiJwb3B1bGF0ZSIsImVtcHR5T2JqZWN0RmllbGRzIjoicG9wdWxhdGVBbGxEZWZhdWx0cyJ9fX0=", - "type": "object", - "properties": { - "compatibility": { - "type": "array", - "title": "Technology", - "items": { - "enum": [ - "kubernetes" - ], - "type": "string" - }, - "uniqueItems": true, - "minItems": 1, - "description": "A list of technologies included in or implicated by this design; a list of relevant technology tags.", - "x-rjsf-grid-area": 6 - }, - "pattern_caveats": { - "type": "string", - "title": "Caveats and Considerations", - "description": "Specific stipulations to consider and known behaviors to be aware of when using this design.", - "format": "textarea", - "x-rjsf-grid-area": 12 - }, - "pattern_info": { - "type": "string", - "title": "Description", - "description": "Purpose of the design along with its intended and unintended uses.", - "format": "textarea", - "x-rjsf-grid-area": 12 - }, - "type": { - "type": "string", - "title": "Type", - "enum": [ - "Deployment", - "Observability", - "Resiliency", - "Scaling", - "Security", - "Traffic-management", - "Troubleshooting", - "Workloads" - ], - "default": "Deployment", - "description": "Categorization of the type of design or operational flow depicted in this design.", - "x-rjsf-grid-area": 6 - } - }, - "required": [ - "compatibility", - "pattern_caveats", - "pattern_info", - "type" - ] -} \ No newline at end of file diff --git a/schemas/external/ui/catalog/uiSchemaApplication.json b/schemas/external/ui/catalog/uiSchemaApplication.json deleted file mode 100644 index 5168503960..0000000000 --- a/schemas/external/ui/catalog/uiSchemaApplication.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "applicationType": { - "ui:widget": "radio" - }, - "ui:order" : ["name", "applicationType", "file", "url"] -} \ No newline at end of file diff --git a/schemas/external/ui/catalog/uiSchemaDesignImport.json b/schemas/external/ui/catalog/uiSchemaDesignImport.json deleted file mode 100644 index f7480cdf4b..0000000000 --- a/schemas/external/ui/catalog/uiSchemaDesignImport.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uploadType": { - "ui:widget": "radio" - }, - "ui:order" : ["name", "uploadType", "file", "url"] -} \ No newline at end of file diff --git a/schemas/external/ui/catalog/uiSchemaFilter.json b/schemas/external/ui/catalog/uiSchemaFilter.json deleted file mode 100644 index e49166b02f..0000000000 --- a/schemas/external/ui/catalog/uiSchemaFilter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ui:order" : ["name", "uploadType", "config", "file", "url"] -} \ No newline at end of file diff --git a/schemas/external/ui/catalog/uiSchemaPublishCatalogItem.json b/schemas/external/ui/catalog/uiSchemaPublishCatalogItem.json deleted file mode 100644 index 58676ab8c7..0000000000 --- a/schemas/external/ui/catalog/uiSchemaPublishCatalogItem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ui:order" : ["type", "compatibility", "pattern_caveats", "pattern_info"] -} \ No newline at end of file diff --git a/schemas/external/ui/connections/grafana.js b/schemas/external/ui/connections/grafana.js deleted file mode 100644 index 7858b0d60e..0000000000 --- a/schemas/external/ui/connections/grafana.js +++ /dev/null @@ -1,30 +0,0 @@ -export const grafanaSchema = { - type: 'object', - title: 'Grafana', - properties: { - credentialName: { - title: 'Credential Name', - type: 'string', - description: 'Name of your credential', - }, - secret: { - type: 'object', - title: 'Credential Secret', - description: 'Credential secret for the Grafana instance', - properties: { - grafanaURL: { - type: 'string', - title: 'URL', - description: 'URL of the Grafana instance', - }, - grafanaAPIKey: { - type: 'string', - title: 'API Key', - description: 'API Key for the Grafana instance', - }, - }, - required: ['grafanaURL', 'grafanaAPIKey'], - }, - }, - required: ['credentialName'], -}; diff --git a/schemas/external/ui/connections/kubernetes.js b/schemas/external/ui/connections/kubernetes.js deleted file mode 100644 index 424cda2d9f..0000000000 --- a/schemas/external/ui/connections/kubernetes.js +++ /dev/null @@ -1,69 +0,0 @@ -export const kubernetesSchema = { - type: 'object', - title: 'Kubernetes', - properties: { - credentialName: { - title: 'Credential Name', - type: 'string', - description: 'Name of your credential', - }, - secret: { - type: 'object', - title: 'Credential Secret', - description: 'Credential secret for the Kubernetes cluster', - properties: { - clusterName: { - type: 'string', - title: 'Cluster Name', - description: 'Name of the Kubernetes cluster', - }, - clusterServerURL: { - type: 'string', - title: 'Server URL', - description: 'URL of the Kubernetes cluster', - }, - auth: { - type: 'object', - title: 'Auth', - description: 'Kubernetes cluster authentication', - properties: { - clusterUserName: { - type: 'string', - title: 'User Name', - description: 'Name of the Kubernetes cluster user', - }, - clusterToken: { - type: 'string', - title: 'Token', - description: 'Token of the Kubernetes cluster user', - }, - clusterClientCertificateData: { - type: 'string', - title: 'Client Certificate Data', - description: 'Certificate data of the Kubernetes cluster', - }, - clusterClientKeyData: { - type: 'string', - title: 'Client Key Data', - description: 'Client Key data of the Kubernetes cluster', - }, - clusterCertificateAuthorityData: { - type: 'string', - title: 'Certificate Authority Data', - description: 'Certificate Authority data of the Kubernetes cluster', - }, - }, - required: [ - 'clusterUserName', - 'clusterToken', - 'clusterClientCertificateData', - 'clusterClientKeyData', - 'clusterCertificateAuthorityData', - ], - }, - }, - required: ['clusterName', 'clusterServerURL'], - }, - }, - required: ['credentialName'], -}; diff --git a/schemas/external/ui/connections/prometheus.js b/schemas/external/ui/connections/prometheus.js deleted file mode 100644 index e4d487f3f1..0000000000 --- a/schemas/external/ui/connections/prometheus.js +++ /dev/null @@ -1,25 +0,0 @@ -export const prometheusSchema = { - type: 'object', - title: 'Prometheus', - properties: { - credentialName: { - title: 'Credential Name', - type: 'string', - description: 'Name of your credential', - }, - secret: { - type: 'object', - title: 'Credential Secret', - description: 'Credential secret for the Prometheus instance', - properties: { - prometheusURL: { - type: 'string', - title: 'URL', - description: 'URL of the Prometheus instance', - }, - }, - required: ['prometheusURL'], - }, - }, - required: ['credentialName'], -}; diff --git a/schemas/external/ui/environment/environment-ui-schema.json b/schemas/external/ui/environment/environment-ui-schema.json deleted file mode 100644 index e53f8c7ae7..0000000000 --- a/schemas/external/ui/environment/environment-ui-schema.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "organization": { - "ui:disabled": false - }, - "ui:order": [ - "organization", - "name", - "description" - ] -} \ No newline at end of file diff --git a/schemas/external/ui/environment/environment.json b/schemas/external/ui/environment/environment.json deleted file mode 100644 index d5d99a2d69..0000000000 --- a/schemas/external/ui/environment/environment.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "//playground": "https://rjsf-team.github.io/react-jsonschema-form/#eyJmb3JtRGF0YSI6eyJhcHBsaWNhdGlvblR5cGUiOiJIZWxtIENoYXJ0In0sInNjaGVtYSI6eyJ0aXRsZSI6IlVwbG9hZCBBcHBsaWNhdGlvbiBGaWxlIiwicHJvcGVydGllcyI6eyJuYW1lIjp7InR5cGUiOiJzdHJpbmciLCJ0aXRsZSI6IkdpdmUgeW91ciBhcHBsaWNhdGlvbiBmaWxlIGEgbmFtZSIsIngtcmpzZi1ncmlkLWFyZWEiOiI2In0sImFwcGxpY2F0aW9uVHlwZSI6eyJ0aXRsZSI6IlNlbGVjdCBhcHBsaWNhdGlvbiB0eXBlIiwiZW51bSI6WyJIZWxtIENoYXJ0IiwiS3ViZXJuZXRlcyBNYW5pZmVzdCIsIkRvY2tlciBDb21wb3NlIl0sImRlZmF1bHQiOiJIZWxtIENoYXJ0IiwieC1yanNmLWdyaWQtYXJlYSI6IjYifX0sImRlcGVuZGVuY2llcyI6eyJhcHBsaWNhdGlvblR5cGUiOnsib25lT2YiOlt7InByb3BlcnRpZXMiOnsiYXBwbGljYXRpb25UeXBlIjp7ImNvbnN0IjoiSGVsbSBDaGFydCJ9LCJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsicHJvcGVydGllcyI6eyJhcHBsaWNhdGlvblR5cGUiOnsiY29uc3QiOiJLdWJlcm5ldGVzIE1hbmlmZXN0In19LCJvbmVPZiI6W3sidGl0bGUiOiJVUkwgVXBsb2FkIiwicHJvcGVydGllcyI6eyJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsidGl0bGUiOiJGaWxlIFVwbG9hZCIsInByb3BlcnRpZXMiOnsiZmlsZSI6eyJ0eXBlIjoic3RyaW5nIiwiZm9ybWF0IjoiZGF0YS11cmwiLCJ0aXRsZSI6IkZpbGUgVXBsb2FkIiwiZGVzY3JpcHRpb24iOiJCcm93c2UgdGhlIGFwcGxpY2F0aW9uIGZpbGUgZnJvbSB5b3VyIGZpbGUgc3lzdGVtIiwieC1yanNmLWdyaWQtYXJlYSI6IjEyIn19LCJyZXF1aXJlZCI6WyJmaWxlIl19XX0seyJwcm9wZXJ0aWVzIjp7ImFwcGxpY2F0aW9uVHlwZSI6eyJjb25zdCI6IkRvY2tlciBDb21wb3NlIn19LCJvbmVPZiI6W3sicHJvcGVydGllcyI6eyJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsicHJvcGVydGllcyI6eyJmaWxlIjp7InR5cGUiOiJzdHJpbmciLCJmb3JtYXQiOiJkYXRhLXVybCIsInRpdGxlIjoiRmlsZSBVcGxvYWQiLCJkZXNjcmlwdGlvbiI6IkJyb3dzZSB0aGUgYXBwbGljYXRpb24gZmlsZSBmcm9tIHlvdXIgZmlsZSBzeXN0ZW0iLCJ4LXJqc2YtZ3JpZC1hcmVhIjoiMTIifX0sInJlcXVpcmVkIjpbImZpbGUiXX1dfV19fX0sInVpU2NoZW1hIjp7ImFwcGxpY2F0aW9uVHlwZSI6eyJ1aTp3aWRnZXQiOiJyYWRpbyJ9fSwidGhlbWUiOiJtYXRlcmlhbC11aS01IiwibGl2ZVNldHRpbmdzIjp7fX0=", - "title": "Environment", - "properties": { - "description": { - "description": "Description of the Environment", - "format": "textarea", - "title": "Description", - "type": "string", - "x-rjsf-grid-area": "12" - }, - "name": { - "description": "The name of Environment", - "title": "Name", - "type": "string", - "x-rjsf-grid-area": "12" - }, - "organization": { - "type": "string", - "title": "Organization", - "enum": [], - "enumNames": [], - "x-rjsf-grid-area": "12" - } - }, - "type": "object" -} \ No newline at end of file diff --git a/schemas/external/ui/support-form/support-form-ui-schema.json b/schemas/external/ui/support-form/support-form-ui-schema.json deleted file mode 100644 index 74f072d604..0000000000 --- a/schemas/external/ui/support-form/support-form-ui-schema.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "subject": { - "ui:placeholder": "Summary or title for your support request" - }, - "description": { - "ui:placeholder": "Detailed description of your support request" - }, - "scope": { - "ui:widget": "radio" - } -} \ No newline at end of file diff --git a/schemas/external/ui/support-form/support-form.json b/schemas/external/ui/support-form/support-form.json deleted file mode 100644 index f760aa914e..0000000000 --- a/schemas/external/ui/support-form/support-form.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "title": "Support Form", - "properties": { - "subject": { - "type": "string", - "title": "Subject", - "minLength": 1, - "x-rjsf-grid-area": "12", - "description": "A title for your support request." - }, - "description": { - "type": "string", - "title": "Description", - "minLength": 10, - "x-rjsf-grid-area": "12", - "description": "Provide detailed information about your issue or question. Include any relevant details that will help us assist you better." - }, - "scope": { - "type": "string", - "enum": [ - "Support", - "Community", - "Account", - "Sales" - ], - "title": "Scope of Questions", - "default": "Technical", - "description": "Select the category that best represents the nature of your inquiry." - } - }, - "required": [ - "subject", - "description" - ] -} From a723d6e86a487ea3ecdf6668112ad395f1f9ea18 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 19 Feb 2024 13:06:35 +0000 Subject: [PATCH 3/3] Updated open api schema for models Signed-off-by: Ubuntu --- openapi/parameters.yml | 9 ++++++++- openapi/schemas/meshmodels.yml | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openapi/parameters.yml b/openapi/parameters.yml index 82159d14b2..874b5d49ac 100644 --- a/openapi/parameters.yml +++ b/openapi/parameters.yml @@ -226,4 +226,11 @@ resultID: description: Performance Result Id schema: type: string - required: true \ No newline at end of file + required: true + +status: + name: status + in: path + description: Get models based on status, e.g 'ignored', 'registered' + schema: + type: string \ No newline at end of file diff --git a/openapi/schemas/meshmodels.yml b/openapi/schemas/meshmodels.yml index f691026ceb..856be4612e 100644 --- a/openapi/schemas/meshmodels.yml +++ b/openapi/schemas/meshmodels.yml @@ -34,6 +34,8 @@ components: $ref: ../common.yml#/text display_name: $ref: ../common.yml#/text + status: + $ref: ../common.yml#/text category_id: $ref: ../common.yml#/id metadata: @@ -91,6 +93,7 @@ paths: - $ref: ../parameters.yml#/page_size - $ref: ../parameters.yml#/search - $ref: ../parameters.yml#/order + - $ref: ../parameters.yml#/status responses: '200': description: MeshModel Model