Merge branch 'master' into meshmodel

Mohd Uzair · web-flow · commit d7025b98f8d8 · 2023-08-04T22:36:56.000+05:30
diff --git a/schemas/configuration/publishSchema.json b/schemas/configuration/publishSchema.json
@@ -30,7 +30,7 @@
         "type": {
             "type": "string",
             "title": "Type",
-            "examples": [
+            "enum": [
                 "deployment",
                 "observability",
                 "resiliency",
@@ -40,6 +40,7 @@
                 "troubleshooting",
                 "workloads"
             ],
+            "default": "deployment",
             "description": "The category of the pattern.",
             "x-rjsf-grid-area": 6
         }
diff --git a/schemas/configuration/uiSchemaApplication.json b/schemas/configuration/uiSchemaApplication.json
@@ -1,5 +1,6 @@
 {
   "applicationType": {
     "ui:widget": "radio"
-  }
+  },
+  "ui:order" : ["name", "applicationType", "*"]
 }
diff --git a/schemas/configuration/uiSchemaDesignImport.json b/schemas/configuration/uiSchemaDesignImport.json
@@ -1,5 +1,6 @@
 {
   "uploadType": {
     "ui:widget": "radio"
-  }
+  },
+  "ui:order" : ["name", "uploadType", "*"]
 }
diff --git a/schemas/configuration/uiSchemaFilter.json b/schemas/configuration/uiSchemaFilter.json
@@ -0,0 +1,3 @@
+{
+    "ui:order" : ["name", "uploadType", "config", "*"]
+}
diff --git a/schemas/publish/publishModal.json b/schemas/publish/publishModal.json
diff --git a/schemas/publish/uiSchemaPublishSchema.json b/schemas/publish/uiSchemaPublishSchema.json
diff --git a/schemas/schemaProvider.go b/schemas/schemaProvider.go
@@ -9,13 +9,16 @@ func getSchemaMap() map[string]string {
 		"application": "configuration/applicationImport.json",
 		"filter":      "configuration/filterImport.json",
 		"design":      "configuration/designImport.json",
+		"publish":      "publish/publishModal.json",
 	}
 }
 
 func getUiSchemaMap() map[string]string {
 	return map[string]string{
 		"application": "configuration/uiSchemaApplication.json",
 		"design":      "configuration/uiSchemaDesignImport.json",
+		"filter":      "configuration/uiSchemaFilter.json",
+		"publish":      "publish/uiSchemaPublishSchema.json",
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"applicationType": {`
`3`	`3`	`"ui:widget": "radio"`
`4`		`- }`
	`4`	`+ },`
	`5`	`+ "ui:order" : ["name", "applicationType", "*"]`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"uploadType": {`
`3`	`3`	`"ui:widget": "radio"`
`4`		`- }`
	`4`	`+ },`
	`5`	`+ "ui:order" : ["name", "uploadType", "*"]`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "ui:order" : ["name", "uploadType", "config", "*"]`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,16 @@ func getSchemaMap() map[string]string {`
`9`	`9`	`"application": "configuration/applicationImport.json",`
`10`	`10`	`"filter": "configuration/filterImport.json",`
`11`	`11`	`"design": "configuration/designImport.json",`
	`12`	`+ "publish": "publish/publishModal.json",`
`12`	`13`	`}`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`func getUiSchemaMap() map[string]string {`
`16`	`17`	`return map[string]string{`
`17`	`18`	`"application": "configuration/uiSchemaApplication.json",`
`18`	`19`	`"design": "configuration/uiSchemaDesignImport.json",`
	`20`	`+ "filter": "configuration/uiSchemaFilter.json",`
	`21`	`+ "publish": "publish/uiSchemaPublishSchema.json",`
`19`	`22`	`}`
`20`	`23`	`}`
`21`	`24`