Improved WG fetch logic (#241)

src/main/www/src/components/Application/Application.js

@@ -164,18 +164,26 @@ export default function Application() {
       setUpdatedFormValues({ ...updatedFormValues, workingGroups });
       console.log('updated working groups: ', values);
 
-      const setFieldValueObj = {
-        fieldName: 'workingGroups',
-        method: formikWorkingGroups.setFieldValue,
-      };
-      executeSendDataByStep(
-        3,
-        values,
-        currentFormId,
-        currentUser.name,
-        goToNextStep,
-        setFieldValueObj
-      );
+      if (values.isJoiningWG){
+        // If the user is joining at least 1 wg, then make related API call
+        const setFieldValueObj = {
+          fieldName: 'workingGroups',
+          method: formikWorkingGroups.setFieldValue,
+        };
+
+        executeSendDataByStep(
+          3,
+          values,
+          currentFormId,
+          currentUser.name,
+          goToNextStep,
+          setFieldValueObj
+        );
+      } else {
+        // If the user is NOT joining any wg, then go to next page directly
+        goToNextStep(3, '/signing-authority')
+      }
+
     },
   });
 

src/main/www/src/components/Application/WorkingGroups/WorkingGroupsWrapper.js

@@ -120,8 +120,8 @@ const WorkingGroupsWrapper = ({ formik, isStartNewForm }) => {
         })
         .then((data) => {
           let options = data.map((item) => ({
-            label: item.title,
-            value: item.title,
+            label: item.title || item.name,
+            value: item.title || item.name,
             participation_levels: item.levels,
           }));
           setFullWorkingGroupList(options);