Merge pull request #507 from ertush/hotfix

Updated the redirect urls after approving, validating facilties and f…
ertush · Oct 15, 2024 · 888a07f · 888a07f
2 parents baf5b1e + 3a40808
commit 888a07f
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/controllers/facility/approveRejectFacility.js b/controllers/facility/approveRejectFacility.js
@@ -23,12 +23,21 @@ function validateRejectFacility (facility_id, reject, comment, alert, token, set
 
                 if (resp.ok) {
                     setSubmitting(false)
+
                     if (!reject) {
                         alert.success("Facility validated successfully")
                     } else {
                         alert.success("Facility rejected successfully")
                     }
-                    router.push('/facilities?qf=new_pending_validation&pending_approval=true&has_edits=false&is_complete=true') // redirect to New Facilties Pending Validation
+
+                    router.push({
+                        pathname: '/facilities',
+                        filter:'pending_validation_facilities',
+                        pending_approval: true,
+                        has_edits: false
+
+                    }) // redirect to New Facilties Pending Validation
+
                 } else {
                     setSubmitting(false)
                     setRejecting(false)
@@ -80,14 +89,21 @@ function approveRejectFacility (facility_id, comment, alert, reject, token, setS
             .then(resp => {
 
                 if (resp.ok) {
+
                     setSubmitting(false)
+
                     if (reject) {
                         alert.success(`Facility Approved successfully`)
                     } else {
                         alert.success(`Facility Rejected successfully`)
                     }
 
-                    router.push('/facilities?qf=approved&approved=true&approved_national_level=true&rejected=false') // redirect Facilties Pending Approval
+                    router.push({
+                        pathname: '/facilities',
+                        to_publish: true,
+                        closed: false
+                    }) 
+
                 } else {
                     setSubmitting(false)
                     setRejecting(false)
@@ -151,9 +167,10 @@ function approveRejectFacilityUpdates (reject, alert, update_id, token, setSubmi
                         pathname: '/facilities',
                         query: {
                             filter: 'updated_pending_validation_facilities',
-                            have_updates: true
+                            have_updates: true,
+                            closed: false
                         }
-                    }) // redirect to New Facilties Pending Validation
+                    }) // redirect to Updated Facilties Pending Validation
 
                 } else {
                     setSubmitting(false)