Merge pull request #264 from MichaelChung123/submission-owner

Populating Recipient Email

Author: Naomi

app/frontend/src/components/forms/submission/MySubmissionsActions.vue

@@ -24,9 +24,9 @@
       </v-tooltip>
     </router-link>
 
-    <span v-if="submission.status === 'DRAFT'">
+    <span v-if="submission.status === 'DRAFT' || submission.status === 'REVISING'">
       <router-link
-        v-if="submission.status === 'DRAFT'"
+        v-if="submission.status === 'DRAFT' || submission.status === 'REVISING'"
         :to="{
           name: 'UserFormDraftEdit',
           query: {
@@ -50,6 +50,7 @@
         </v-tooltip>
       </router-link>
       <DeleteSubmission
+        v-if="submission.status !== 'REVISING'"
         @deleted="draftDeleted"
         :disabled="!hasDeletePerm()"
         isDraft

app/frontend/src/components/forms/submission/MySubmissionsTable.vue

@@ -155,13 +155,14 @@ export default {
 
     // Status columns in the table
     getCurrentStatus(record) {
-      if (record.draft) {
+      // Current status is most recent status (top in array, query returns in status created desc)
+      const status = record.submissionStatus && record.submissionStatus[0]
+        ? record.submissionStatus[0].code
+        : 'N/A';
+      if (record.draft && status !== 'REVISING') {
         return 'DRAFT';
       } else {
-        // Current status is most recent status (top in array, query returns in status created desc)
-        return record.submissionStatus && record.submissionStatus[0]
-          ? record.submissionStatus[0].code
-          : 'N/A';
+        return status;
       }
     },
     getStatusDate(record, statusCode) {

app/frontend/src/components/forms/submission/StatusPanel.vue

@@ -24,7 +24,7 @@
               item-value="code"
               v-model="statusToSet"
               :rules="[(v) => !!v || 'Status is required']"
-              @change="statusFields = true"
+              @change="onStatusChange(statusToSet)"
             />
 
             <div v-show="statusFields" v-if="showRevising">
@@ -212,6 +212,7 @@ export default {
   },
   computed: {
     ...mapGetters('auth', ['keycloakSubject']),
+    ...mapGetters('form', ['form', 'formSubmission', 'submissionUsers']),
     // State Machine
     showRevising() {
       return ['REVISING'].includes(this.statusToSet);
@@ -225,6 +226,25 @@ export default {
   },
   methods: {
     ...mapActions('notifications', ['addNotification']),
+    ...mapActions('form', ['fetchSubmissionUsers']),
+    async onStatusChange(status) {
+      this.statusFields = true;
+      if (status === 'REVISING') {
+        try {
+          await this.fetchSubmissionUsers(this.submissionId);
+          const submitterData = this.submissionUsers.data.find((data) => {
+            const username = data.user.idpCode ? `${data.user.username}@${data.user.idpCode}` : data.user.username;
+            return username === this.formSubmission.createdBy;
+          });
+          this.revisionEmail = submitterData.user.email;
+        } catch (error) {
+          this.addNotification({
+            message: 'An error occured while trying to fetch recipient emails for this submission.',
+            consoleError: `Error getting recipient emails for ${this.submissionId}: ${error}`,
+          });
+        }
+      }
+    },
     assignToCurrentUser() {
       this.assignee = this.formReviewers.find(
         (f) => f.keycloakId === this.keycloakSubject
@@ -277,8 +297,8 @@ export default {
             (sc) => sc.code === this.currentStatus.code
           ).statusCode;
           this.items = this.currentStatus.statusCodeDetail.nextCodes;
-
-          // Hiding REVISING status until backend can receive submitter's email.
+        }
+        if (!this.form.enableSubmitterDraft) {
           this.items = this.items.filter((item) => item !== 'REVISING');
         }
       } catch (error) {

app/frontend/src/store/modules/form.js

@@ -39,6 +39,7 @@ export default {
     },
     permissions: [],
     submissionList: [],
+    submissionUsers: [],
     userFormPreferences: {},
     version: {}
   },
@@ -52,6 +53,7 @@ export default {
     formSubmission: state => state.formSubmission,
     permissions: state => state.permissions,
     submissionList: state => state.submissionList,
+    submissionUsers: state => state.submissionUsers,
     userFormPreferences: state => state.userFormPreferences,
     version: state => state.version
   },
@@ -90,6 +92,9 @@ export default {
     SET_SUBMISSIONLIST(state, submissions) {
       state.submissionList = submissions;
     },
+    SET_SUBMISSIONUSERS(state, users) {
+      state.submissionUsers = users;
+    },
     SET_USER_FORM_PREFERENCES(state, userFormPreferences) {
       state.userFormPreferences = userFormPreferences;
     },
@@ -309,6 +314,18 @@ export default {
         }, { root: true });
       }
     },
+    async fetchSubmissionUsers({ commit, dispatch }, formSubmissionId) {
+      try {
+        // Get user list for this submission
+        const response = await rbacService.getSubmissionUsers({ formSubmissionId });
+        commit('SET_SUBMISSIONUSERS', response);
+      } catch (error) {
+        dispatch('notifications/addNotification', {
+          message: 'An error occurred while fetching the recipient email for this submission.',
+          consoleError: `Error getting recipient email for submission ${formSubmissionId}: ${error}`,
+        }, { root: true });
+      }
+    },
     async fetchSubmission({ commit, dispatch }, { submissionId }) {
       try {
         // Get this submission