Merge pull request #1583 from AOT-Technologies/Resubmit-fix

Application resubmit issue fixed
AOT-Technologies · Aug 22, 2023 · 039a05e · 039a05e
2 parents 029acd9 + 79a5420
commit 039a05e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/forms-flow-web/src/components/Application/table.js b/forms-flow-web/src/components/Application/table.js
@@ -57,7 +57,7 @@ const linkSubmission = (cell, row, redirectUrl) => {
   ) : (
     <Translation>{(t) => t("View")}</Translation>
   );
-  const icon = row.isClientEdit ? "fa fa-edit" : "fa fa-eye";
+  const icon =  row.isClientEdit || row.isResubmit ? "fa fa-edit" : "fa fa-eye";
   return (
     <div onClick={() => window.open(url, "_blank")}>
       <span style={{ color: "blue", cursor: "pointer" }}>

diff --git a/forms-flow-web/src/components/Form/Item/Submission/Item/Edit.js b/forms-flow-web/src/components/Form/Item/Submission/Item/Edit.js
@@ -78,7 +78,8 @@ const Edit = React.memo((props) => {
     if (applicationStatus && !onFormSubmit) {
       if (
         getUserRolePermission(userRoles, CLIENT) &&
-        !CLIENT_EDIT_STATUS.includes(applicationStatus)
+        !CLIENT_EDIT_STATUS.includes(applicationStatus) &&
+        !applicationDetail.isResubmit
       ) {
         // Redirect the user to the submission view page if not allowed to edit
         dispatch(push(`/form/${formId}/submission/${submissionId}`));