Merge pull request #263 from jadmsaadaot/SUBMIT-task#251

Fix - save and exit disabled
bcgov · Jan 28, 2025 · 607cf68 · 607cf68
2 parents 7c10d13 + 3a29601
commit 607cf68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...omponents/SubmissionItem/ConsultationRecord/ConsultationRecordStaffView/ActionButtons.tsx b/...omponents/SubmissionItem/ConsultationRecord/ConsultationRecordStaffView/ActionButtons.tsx
@@ -66,7 +66,7 @@ export default function ActionButtons() {
   const navigate = useNavigate();
 
   const handleSaveAndClose = async () => {
-    if (!isDirty) {
+    if (!isDirty || isSaveDisabled) {
       navigate({
         to: `/staff/projects/${projectId}/submission-packages/${submissionPackageId}`,
       });
@@ -202,7 +202,7 @@ export default function ActionButtons() {
           <LoadingButton
             color="secondary"
             onClick={handleSaveAndClose}
-            disabled={isLoading || isSaveDisabled}
+            disabled={isLoading}
             loading={isSavingAndClosing}
           >
             Save & Exit

diff --git a/...ponents/SubmissionItem/ManagementPlanSubmission/ManagementPlanStaffView/ActionButtons.tsx b/...ponents/SubmissionItem/ManagementPlanSubmission/ManagementPlanStaffView/ActionButtons.tsx
@@ -65,7 +65,7 @@ export default function ActionButtons() {
   const navigate = useNavigate();
 
   const handleSaveAndClose = async () => {
-    if (!isDirty) {
+    if (!isDirty || isSaveDisabled) {
       navigate({
         to: `/staff/projects/${projectId}/submission-packages/${submissionPackageId}`,
       });
@@ -184,7 +184,7 @@ export default function ActionButtons() {
           <LoadingButton
             color="secondary"
             onClick={handleSaveAndClose}
-            disabled={isLoading || isSaveDisabled}
+            disabled={isLoading}
             loading={isSavingAndClosing}
           >
             Save & Exit