Skip to content

Commit 29cadeb

Browse files
Abhishek-kumar09Abhishek-kumar09
authored
Merge pull request #330 from Yashsharma1911/yashChangeSchema/to/Abhi/cfgSchema
changed schema of application Import and added x-rjsf-grid-area in schema
2 parents e767372 + 8b06532 commit 29cadeb

File tree

3 files changed

+121
-118
lines changed

3 files changed

+121
-118
lines changed

‎schemas/configuration/applicationImport.json‎

Lines changed: 103 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,124 @@
11
{
2+
"//playground": "https://rjsf-team.github.io/react-jsonschema-form/#eyJmb3JtRGF0YSI6eyJhcHBsaWNhdGlvblR5cGUiOiJIZWxtIENoYXJ0In0sInNjaGVtYSI6eyJ0aXRsZSI6IlVwbG9hZCBBcHBsaWNhdGlvbiBGaWxlIiwicHJvcGVydGllcyI6eyJuYW1lIjp7InR5cGUiOiJzdHJpbmciLCJ0aXRsZSI6IkdpdmUgeW91ciBhcHBsaWNhdGlvbiBmaWxlIGEgbmFtZSIsIngtcmpzZi1ncmlkLWFyZWEiOiI2In0sImFwcGxpY2F0aW9uVHlwZSI6eyJ0aXRsZSI6IlNlbGVjdCBhcHBsaWNhdGlvbiB0eXBlIiwiZW51bSI6WyJIZWxtIENoYXJ0IiwiS3ViZXJuZXRlcyBNYW5pZmVzdCIsIkRvY2tlciBDb21wb3NlIl0sImRlZmF1bHQiOiJIZWxtIENoYXJ0IiwieC1yanNmLWdyaWQtYXJlYSI6IjYifX0sImRlcGVuZGVuY2llcyI6eyJhcHBsaWNhdGlvblR5cGUiOnsib25lT2YiOlt7InByb3BlcnRpZXMiOnsiYXBwbGljYXRpb25UeXBlIjp7ImNvbnN0IjoiSGVsbSBDaGFydCJ9LCJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsicHJvcGVydGllcyI6eyJhcHBsaWNhdGlvblR5cGUiOnsiY29uc3QiOiJLdWJlcm5ldGVzIE1hbmlmZXN0In19LCJvbmVPZiI6W3sidGl0bGUiOiJVUkwgVXBsb2FkIiwicHJvcGVydGllcyI6eyJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsidGl0bGUiOiJGaWxlIFVwbG9hZCIsInByb3BlcnRpZXMiOnsiZmlsZSI6eyJ0eXBlIjoic3RyaW5nIiwiZm9ybWF0IjoiZGF0YS11cmwiLCJ0aXRsZSI6IkZpbGUgVXBsb2FkIiwiZGVzY3JpcHRpb24iOiJCcm93c2UgdGhlIGFwcGxpY2F0aW9uIGZpbGUgZnJvbSB5b3VyIGZpbGUgc3lzdGVtIiwieC1yanNmLWdyaWQtYXJlYSI6IjEyIn19LCJyZXF1aXJlZCI6WyJmaWxlIl19XX0seyJwcm9wZXJ0aWVzIjp7ImFwcGxpY2F0aW9uVHlwZSI6eyJjb25zdCI6IkRvY2tlciBDb21wb3NlIn19LCJvbmVPZiI6W3sicHJvcGVydGllcyI6eyJ1cmwiOnsidHlwZSI6InN0cmluZyIsImZvcm1hdCI6InVyaSIsInRpdGxlIjoiVVJMIiwiZGVzY3JpcHRpb24iOiJyYXcgVVJMIG9mIHRoZSBhcHBsaWNhdGlvbiBmaWxlLCBleGFtcGxlOiBodHRwczovL3Jhdy5naXRodWIuY29tLy4uLiIsIngtcmpzZi1ncmlkLWFyZWEiOiIxMiJ9fSwicmVxdWlyZWQiOlsidXJsIl19LHsicHJvcGVydGllcyI6eyJmaWxlIjp7InR5cGUiOiJzdHJpbmciLCJmb3JtYXQiOiJkYXRhLXVybCIsInRpdGxlIjoiRmlsZSBVcGxvYWQiLCJkZXNjcmlwdGlvbiI6IkJyb3dzZSB0aGUgYXBwbGljYXRpb24gZmlsZSBmcm9tIHlvdXIgZmlsZSBzeXN0ZW0iLCJ4LXJqc2YtZ3JpZC1hcmVhIjoiMTIifX0sInJlcXVpcmVkIjpbImZpbGUiXX1dfV19fX0sInVpU2NoZW1hIjp7ImFwcGxpY2F0aW9uVHlwZSI6eyJ1aTp3aWRnZXQiOiJyYWRpbyJ9fSwidGhlbWUiOiJtYXRlcmlhbC11aS01IiwibGl2ZVNldHRpbmdzIjp7fX0=",
23
"title": "Upload Application File",
34
"properties": {
45
"name": {
56
"type": "string",
6-
"title": "Give your application file a name"
7+
"title": "Application Name",
8+
"x-rjsf-grid-area": "6",
9+
"description": "The name of Application"
710
},
811
"applicationType": {
9-
"title": "Select application type ",
12+
"title": "Application Type",
13+
"description": "Choose the type of application you want to upload",
1014
"enum": [
1115
"Helm Chart",
1216
"Kubernetes Manifest",
1317
"Docker Compose"
1418
],
15-
"default": "Helm Chart"
19+
"default": "Helm Chart",
20+
"x-rjsf-grid-area": "6"
1621
}
1722
},
18-
"allOf": [
19-
{
20-
"if": {
21-
"properties": {
22-
"applicationType": {
23-
"const": "Helm Chart"
24-
}
25-
}
26-
},
27-
"then": {
28-
"title": "",
29-
"properties": {
30-
"url": {
31-
"type": "string",
32-
"title": "URL",
33-
"format": "uri",
34-
"description": "raw url of the application file, example: https://raw.github.com/..."
35-
}
36-
},
37-
"required": [
38-
"url"
39-
]
40-
}
41-
},
42-
{
43-
"if": {
44-
"properties": {
45-
"applicationType": {
46-
"const": "Kubernetes Manifest"
47-
}
48-
}
49-
},
50-
"then": {
51-
"oneOf": [
52-
{
53-
"title": "URL upload",
54-
"properties": {
55-
"url": {
56-
"type": "string",
57-
"title": "URL",
58-
"format": "uri",
59-
"description": "raw url of the application file, example: https://raw.github.com/..."
60-
}
23+
"dependencies": {
24+
"applicationType": {
25+
"oneOf": [
26+
{
27+
"properties": {
28+
"applicationType": {
29+
"const": "Helm Chart"
6130
},
62-
"required": [
63-
"url"
64-
]
31+
"url": {
32+
"type": "string",
33+
"format": "uri",
34+
"title": "URL",
35+
"description": "raw URL of the application file, example: https://raw.github.com/...",
36+
"x-rjsf-grid-area": "12"
37+
}
6538
},
66-
{
67-
"title": "File Upload",
68-
"properties": {
69-
"file": {
70-
"type": "string",
71-
"format": "file",
72-
"description": "Browse the application file from your file system"
73-
}
74-
},
75-
"required": [
76-
"file"
77-
]
78-
}
79-
],
80-
"required": [
81-
"url"
82-
]
83-
}
84-
},
85-
{
86-
"if": {
87-
"properties": {
88-
"applicationType": {
89-
"const": "Docker Compose"
90-
}
91-
}
92-
},
93-
"then": {
94-
"oneOf": [
95-
{
96-
"title": "URL upload",
97-
"properties": {
98-
"url": {
99-
"type": "string",
100-
"title": "URL",
101-
"format": "uri",
102-
"description": "raw url of the application file, example: https://raw.github.com/..."
103-
}
39+
"required": [
40+
"url"
41+
]
42+
},
43+
{
44+
"properties": {
45+
"applicationType": {
46+
"const": "Kubernetes Manifest"
47+
}
48+
},
49+
"oneOf": [
50+
{
51+
"title": "URL Upload",
52+
"properties": {
53+
"url": {
54+
"type": "string",
55+
"format": "uri",
56+
"title": "URL",
57+
"description": "raw URL of the application file, example: https://raw.github.com/...",
58+
"x-rjsf-grid-area": "12"
59+
}
60+
},
61+
"required": [
62+
"url"
63+
]
10464
},
105-
"required": [
106-
"url"
107-
]
65+
{
66+
"title": "File Upload",
67+
"properties": {
68+
"file": {
69+
"type": "string",
70+
"format": "data-url",
71+
"title": "File Upload",
72+
"description": "Browse the application file from your file system",
73+
"x-rjsf-grid-area": "12"
74+
}
75+
},
76+
"required": [
77+
"file"
78+
]
79+
}
80+
]
81+
},
82+
{
83+
"properties": {
84+
"applicationType": {
85+
"const": "Docker Compose"
86+
}
10887
},
109-
{
110-
"title": "File Upload",
111-
"properties": {
112-
"file": {
113-
"type": "string",
114-
"format": "file",
115-
"description": "Browse the application file from your file system"
116-
}
88+
"oneOf": [
89+
{
90+
"title": "URL Upload",
91+
"properties": {
92+
"url": {
93+
"type": "string",
94+
"format": "uri",
95+
"title": "URL",
96+
"description": "raw URL of the application file, example: https://raw.github.com/...",
97+
"x-rjsf-grid-area": "12"
98+
}
99+
},
100+
"required": [
101+
"url"
102+
]
117103
},
118-
"required": [
119-
"file"
120-
]
121-
}
122-
],
123-
"required": [
124-
"url"
125-
]
126-
}
104+
{
105+
"title": "File Upload",
106+
"properties": {
107+
"file": {
108+
"type": "string",
109+
"format": "data-url",
110+
"title": "File Upload",
111+
"description": "Browse the application file from your file system",
112+
"x-rjsf-grid-area": "12"
113+
}
114+
},
115+
"required": [
116+
"file"
117+
]
118+
}
119+
]
120+
}
121+
]
127122
}
128-
]
123+
}
129124
}

‎schemas/configuration/designImport.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
"name": {
55
"type": "string",
66
"title": "Give your design file a name",
7-
"default": "Untitled Design"
7+
"default": "Untitled Design",
8+
"x-rjsf-grid-area" : "12"
89
},
910
"uploadType": {
1011
"title": "Select the Upload Method",
1112
"enum": [
1213
"File Upload",
1314
"URL Upload"
1415
],
15-
"default": "File Upload"
16+
"default": "File Upload",
17+
"x-rjsf-grid-area" : "12"
1618
}
1719
},
1820
"allOf": [
@@ -30,7 +32,8 @@
3032
"file": {
3133
"type": "string",
3234
"format": "file",
33-
"description": "Browse the design file from your file system"
35+
"description": "Browse the design file from your file system",
36+
"x-rjsf-grid-area" : "12"
3437
}
3538
},
3639
"required": [
@@ -52,8 +55,8 @@
5255
"url": {
5356
"type": "string",
5457
"title": "URL",
55-
"format": "uri",
56-
"description": "raw url of the design file, example: https://raw.github.com/..."
58+
"description": "raw url of the design file, example: https://raw.github.com/...",
59+
"x-rjsf-grid-area" : "12"
5760
}
5861
},
5962
"required": [

‎schemas/configuration/filterImport.json‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,25 @@
55
"type": "string",
66
"title": "Name",
77
"description": "The name of Filter",
8-
"default": "Unitled Filter File"
8+
"default": "Unitled Filter File",
9+
"x-rjsf-grid-area" : "6"
910
},
1011
"config": {
1112
"type": "string",
1213
"title": "WASM Filter Config",
1314
"format": "textarea",
1415
"description": "Enter the configuration details. The configuration detail is the yaml string with running details",
15-
"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"
16+
"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",
17+
"x-rjsf-grid-area" : "12"
1618
},
1719
"uploadType": {
1820
"title": "Select the Upload Method",
1921
"enum": [
2022
"File Upload",
2123
"URL Upload"
2224
],
23-
"default": "File Upload"
25+
"default": "File Upload",
26+
"x-rjsf-grid-area" : "6"
2427
}
2528
},
2629
"allOf": [
@@ -38,7 +41,8 @@
3841
"file": {
3942
"type": "string",
4043
"format": "file",
41-
"description": "Browse the filter file from your file system"
44+
"description": "Browse the filter file from your file system",
45+
"x-rjsf-grid-area" : "12"
4246
}
4347
},
4448
"required": [
@@ -61,7 +65,8 @@
6165
"type": "string",
6266
"title": "URL",
6367
"format": "uri",
64-
"description": "raw url of the filter file, example: https://raw.github.com/..."
68+
"description": "raw url of the filter file, example: https://raw.github.com/...",
69+
"x-rjsf-grid-area" : "12"
6570
}
6671
},
6772
"required": [

0 commit comments

Comments
 (0)