Merge branch 'malowe/dev/update' into 'dev'

Update address fields to generalize field names (#246)

See merge request !443

spec/openapi.yaml

@@ -1493,4 +1493,4 @@ components:
                description: list of relation codes that are active for the current user
                items:
                   type: string
-              
\ No newline at end of file
+              

src/main/resources/working_groups.json

@@ -673,6 +673,80 @@
 			},
 			"levels": []
 		},
+		"oniro": {
+			"alias": "oniro",
+			"title": "Oniro Working Group",
+			"status": "proposed",
+			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-oniro.png",
+			"description": "The Oniro Working Group will foster an ecosystem of organizations that supports the community in the production and evolution of the Oniro operating system and platform. Oniro is a new commercially oriented, modular, and multikernel open source software platform. Its ecosystem will be developed in an environment where collaboration is promoted via the core Eclipse Foundation principles of vendor-neutrality, transparency, and openness.",
+			"resources": {
+				"charter": "https://www.eclipse.org/org/workinggroups/oniro-charter.php",
+				"participation_agreements": {
+					"individual": null,
+					"organization": {
+						"document_id": "f348c2873ca8ed8e9eca",
+						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/oniro-working-group-participation-agreement.pdf"
+					}
+				},
+				"website": "https://oniroproject.org/",
+				"members": "",
+				"sponsorship": "",
+				"contact_form": "https://accounts.eclipse.org/contact/membership"
+			},
+			"levels": [
+				{
+					"relation": "WGSD",
+					"description": "Strategic Member"
+				},
+				{
+					"relation": "WGFVA",
+					"description": "Gold Member"
+				},
+				{
+					"relation": "WGHLP",
+					"description": "Silver Member"
+				},
+				{
+					"relation": "WGFHA",
+					"description": "Committer Member"
+				},
+				{
+					"relation": "WGSAP",
+					"description": "Guest Member"
+				}
+			]
+		},
+		"openhw-asia": {
+			"alias": "openhw-asia",
+			"title": "OpenHW Asia Working Group",
+			"status": "proposed",
+			"logo": "",
+			"description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to address Asia-focused initiatives complementing the work program of the OpenHW Group. Those initiatives may address strategic or market analysis, technical requirements, and digital sovereignty.",
+			"resources": {
+				"charter": "https://www.eclipse.org/org/workinggroups/openhw-asia-charter.php",
+				"participation_agreements": {
+					"individual": null,
+					"organization": {
+						"document_id": "a3f1857c324e91b7f05f",
+						"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-asia-working-group-participation-agreement.pdf"
+					}
+				},
+				"website": "",
+				"members": "",
+				"sponsorship": "",
+				"contact_form": "https://accounts.eclipse.org/contact/membership"
+			},
+			"levels": [
+				{
+					"relation": "WGAPS",
+					"description": "Participant Member"
+				},
+				{
+					"relation": "WGSAP",
+					"description": "Guest Member"
+				}
+			]
+		},
 		"openhw-europe":{
 			"alias": "openhw-europe",
 			"title": "OpenHW Europe Working Group",
@@ -704,6 +778,7 @@
 					"description": "Guest Member"
 				}
 			]
-		}
+		},
+		
 	}
 }

src/main/www/package.json

@@ -19,7 +19,7 @@
     "chart.js": "^3.5.0",
     "concurrently": "^6.1.0",
     "country-list": "^2.2.0",
-    "eclipsefdn-solstice-assets": "^0.0.162",
+    "eclipsefdn-solstice-assets": "^0.0.174",
     "formik": "^2.2.6",
     "less-watch-compiler": "^1.15.1",
     "material-ui-dropzone": "^3.5.0",