Merge branch 'zhoufang/dev/wgIssue' into 'dev'

Fixed working group updating issue for membership form

See merge request !459

src/main/resources/working_groups.json

@@ -45,7 +45,7 @@
 		},
 		"asciidoc": {
 			"alias": "asciidoc",
-			"title": " AsciiDoc® Working Group",
+			"title": "AsciiDoc® Working Group",
 			"status": "active",
 			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_asciidoc.svg",
 			"description": "The AsciiDoc® Working Group drives the standardization, adoption, and evolution of AsciiDoc. This group encourages and shapes the open, collaborative development of the AsciiDoc language and its processors.",

src/main/www/public/membership_data/form_1/working_groups.json

@@ -4,7 +4,7 @@
         "id": "402880987649273c0176492a6c6200fd",
         "form_id": "form_1",
         "participation_level": "AsciiDoc_level_a",
-        "working_group_id": "ascii_doc",
+        "working_group": "ascii_doc",
         "contact": {
             "id": "111",
             "form_id": "form_1",
@@ -20,7 +20,7 @@
         "id": "402880987649273c0176492a6c6300fe",
         "form_id": "form_1",
         "participation_level": "OpenGENESIS_level_c",
-        "working_group_id": "opengenesis",
+        "working_group": "opengenesis",
         "contact": {
             "id": "777",
             "form_id": "form_1",

src/main/www/src/Utils/formFunctionHelpers.js

@@ -168,7 +168,7 @@ export function matchWorkingGroupFields(existingworkingGroupData, workingGroupsO
   var res = [];
   // Array
   existingworkingGroupData.forEach((item) => {
-    let wg = workingGroupsOptions?.find((el) => el.label === item?.working_group_id);
+    let wg = workingGroupsOptions?.find((el) => el.label === item?.working_group);
     const basicRepInfo = {
       firstName: item?.contact?.first_name || '',
       lastName: item?.contact?.last_name || '',
@@ -180,7 +180,7 @@ export function matchWorkingGroupFields(existingworkingGroupData, workingGroupsO
       workingGroup:
         {
           label: wg?.label,
-          value: item?.working_group_id,
+          value: item?.working_group,
           participation_levels: wg?.participation_levels,
         } || '',
       participationLevel: item?.participation_level || '',
@@ -291,7 +291,7 @@ export function matchWGFieldsToBackend(eachWorkingGroupData, formId) {
 
   return {
     id: eachWorkingGroupData?.id,
-    working_group_id: eachWorkingGroupData?.workingGroup.value,
+    working_group: eachWorkingGroupData?.workingGroup.value,
     participation_level: eachWorkingGroupData?.participationLevel,
     effective_date: theDate.toISOString().replace(/.\d+Z$/g, 'Z'),
     contact: {