test: Fix admin e2e tests

SteveGT96 · Jan 9, 2025 · 62484ce · 62484ce
1 parent 470e2fb
commit 62484ce
Show file tree

Hide file tree

Showing 53 changed files with 55 additions and 55 deletions.
diff --git a/cypress/integrations/admin_activities/diseases_activities/add_disease_activity.cy.ts b/cypress/integrations/admin_activities/diseases_activities/add_disease_activity.cy.ts
@@ -46,7 +46,7 @@ describe("Add Disease Activity specs", () => {
 
   it("should cancel the disease creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Diseases");
   });

diff --git a/cypress/integrations/admin_activities/diseases_activities/edit_disease_activity.cy.ts b/cypress/integrations/admin_activities/diseases_activities/edit_disease_activity.cy.ts
@@ -45,7 +45,7 @@ describe("Diseases Edit Activity specs", () => {
 
   it("should cancel the disease update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Diseases");
   });

diff --git a/cypress/integrations/admin_activities/exams_activities/add_exam_activity.cy.ts b/cypress/integrations/admin_activities/exams_activities/add_exam_activity.cy.ts
@@ -45,7 +45,7 @@ describe("Add exam Activity specs", () => {
 
   it("should cancel the exam creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Exams");
   });

diff --git a/cypress/integrations/admin_activities/exams_activities/edit_exam_activity.cy.ts b/cypress/integrations/admin_activities/exams_activities/edit_exam_activity.cy.ts
@@ -42,7 +42,7 @@ describe("Exams edit activity specs", () => {
 
   it("should cancel the exam update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Exams");
   });

diff --git a/cypress/integrations/admin_activities/hospital/edit_hospital.cy.ts b/cypress/integrations/admin_activities/hospital/edit_hospital.cy.ts
@@ -42,7 +42,7 @@ describe("Edit Hospital Activity specs", () => {
   it("should cancel the update of the hospital infos", () => {
     cy.dataCy("cancel-form").click();
     cy.dataCy("dialog-info").contains("lost");
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("activity-title").contains("Wards");
   });
 });
diff --git a/cypress/integrations/admin_activities/operations_activities/add_operation_activity.cy.ts b/cypress/integrations/admin_activities/operations_activities/add_operation_activity.cy.ts
@@ -46,7 +46,7 @@ describe("Add Operation Activity specs", () => {
 
   it("should cancel the operation creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Operations");
   });

diff --git a/cypress/integrations/admin_activities/operations_activities/edit_operation_activity.cy.ts b/cypress/integrations/admin_activities/operations_activities/edit_operation_activity.cy.ts
@@ -45,7 +45,7 @@ describe("Operations Edit Activity specs", () => {
 
   it("should cancel the operation update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Operations");
   });

diff --git a/...ions/admin_activities/types_activities/admissions_activities/add_admission_activity.cy.ts b/...ions/admin_activities/types_activities/admissions_activities/add_admission_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add admission type Activity specs", () => {
 
   it("should cancel the admission type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage admission types");
   });

diff --git a/...ons/admin_activities/types_activities/admissions_activities/edit_admission_activity.cy.ts b/...ons/admin_activities/types_activities/admissions_activities/edit_admission_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Admission types Edit Activity specs", () => {
 
   it("should cancel the admission type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage admission types");
   });

diff --git a/...s/integrations/admin_activities/types_activities/ages_activities/edit_ages_activity.cy.ts b/...s/integrations/admin_activities/types_activities/ages_activities/edit_ages_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Admission types Edit Activity specs", () => {
 
   it("should cancel the age types update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage age types");
   });

diff --git a/...tions/admin_activities/types_activities/deliveries_activities/add_delivery_activity.cy.ts b/...tions/admin_activities/types_activities/deliveries_activities/add_delivery_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Add delivery type Activity specs", () => {
 
   it("should cancel the delivery type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-delivery-title").contains("Manage delivery types");
   });

diff --git a/...ions/admin_activities/types_activities/deliveries_activities/edit_delivery_activity.cy.ts b/...ions/admin_activities/types_activities/deliveries_activities/edit_delivery_activity.cy.ts
@@ -39,7 +39,7 @@ describe("Delivery types Edit Activity specs", () => {
 
   it("should cancel the delivery type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-delivery-title").contains("Manage delivery types");
   });

diff --git a/...ies/types_activities/deliveryresulttypes_activities/add_deliveryresulttype_activity.cy.ts b/...ies/types_activities/deliveryresulttypes_activities/add_deliveryresulttype_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add delivery result type Activity specs", () => {
 
   it("should cancel the delivery result type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage delivery result types");
   });

diff --git a/...es/types_activities/deliveryresulttypes_activities/edit_deliveryresulttype_activity.cy.ts b/...es/types_activities/deliveryresulttypes_activities/edit_deliveryresulttype_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Delivery result types Edit Activity specs", () => {
 
   it("should cancel the delivery result type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage delivery result types");
   });

diff --git a/...ations/admin_activities/types_activities/dischages_activities/add_dischage_activity.cy.ts b/...ations/admin_activities/types_activities/dischages_activities/add_dischage_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add discharge type Activity specs", () => {
 
   it("should cancel the discharge type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-discharge-title").contains("Manage discharge types");
   });

diff --git a/...ions/admin_activities/types_activities/dischages_activities/edit_dischages_activity.cy.ts b/...ions/admin_activities/types_activities/dischages_activities/edit_dischages_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Discharge types Edit Activity specs", () => {
 
   it("should cancel the discharge type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-discharge-title").contains("Manage discharge types");
   });

diff --git a/...grations/admin_activities/types_activities/diseases_activities/add_disease_activity.cy.ts b/...grations/admin_activities/types_activities/diseases_activities/add_disease_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add disease type Activity specs", () => {
 
   it("should cancel the disease type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage disease types");
   });

diff --git a/...rations/admin_activities/types_activities/diseases_activities/edit_disease_activity.cy.ts b/...rations/admin_activities/types_activities/diseases_activities/edit_disease_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Disease types Edit Activity specs", () => {
 
   it("should cancel the disease type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage disease types");
   });

diff --git a/...s/integrations/admin_activities/types_activities/exams_activities/add_exam_activity.cy.ts b/...s/integrations/admin_activities/types_activities/exams_activities/add_exam_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add exam type Activity specs", () => {
 
   it("should cancel the exam type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage exam types");
   });

diff --git a/.../integrations/admin_activities/types_activities/exams_activities/edit_exam_activity.cy.ts b/.../integrations/admin_activities/types_activities/exams_activities/edit_exam_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Exam types Edit Activity specs", () => {
 
   it("should cancel the exam type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage exam types");
   });

diff --git a/...grations/admin_activities/types_activities/medicals_activities/add_medical_activity.cy.ts b/...grations/admin_activities/types_activities/medicals_activities/add_medical_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add medical type Activity specs", () => {
 
   it("should cancel the medical type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-medical-title").contains("Manage medical types");
   });

diff --git a/...rations/admin_activities/types_activities/medicals_activities/edit_medical_activity.cy.ts b/...rations/admin_activities/types_activities/medicals_activities/edit_medical_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Medical types Edit Activity specs", () => {
 
   it("should cancel the medical type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-medical-title").contains("Manage medical types");
   });

diff --git a/...ions/admin_activities/types_activities/operations_activities/add_operation_activity.cy.ts b/...ions/admin_activities/types_activities/operations_activities/add_operation_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add operation type Activity specs", () => {
 
   it("should cancel the operation type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-operation-title").contains("Manage operation types");
   });

diff --git a/...ons/admin_activities/types_activities/operations_activities/edit_operation_activity.cy.ts b/...ons/admin_activities/types_activities/operations_activities/edit_operation_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Operation types Edit Activity specs", () => {
 
   it("should cancel the operation type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-operation-title").contains("Manage operation types");
   });

diff --git a/...ities/types_activities/pregnanttreatments_activities/add_pregnanttreatment_activity.cy.ts b/...ities/types_activities/pregnanttreatments_activities/add_pregnanttreatment_activity.cy.ts
@@ -44,7 +44,7 @@ describe("Add pregnant treatment type Activity specs", () => {
 
   it("should cancel the pregnant treatment type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage pregnant treatment types");
   });

diff --git a/...ties/types_activities/pregnanttreatments_activities/edit_pregnanttreatment_activity.cy.ts b/...ties/types_activities/pregnanttreatments_activities/edit_pregnanttreatment_activity.cy.ts
@@ -41,7 +41,7 @@ describe("Pregnant treatment types Edit Activity specs", () => {
 
   it("should cancel the pregnant treatment type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage pregnant treatment types");
   });

diff --git a/...grations/admin_activities/types_activities/vaccines_activities/add_vaccine_activity.cy.ts b/...grations/admin_activities/types_activities/vaccines_activities/add_vaccine_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add vaccine type Activity specs", () => {
 
   it("should cancel the vaccine type creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage vaccine types");
   });

diff --git a/...rations/admin_activities/types_activities/vaccines_activities/edit_vaccine_activity.cy.ts b/...rations/admin_activities/types_activities/vaccines_activities/edit_vaccine_activity.cy.ts
@@ -41,7 +41,7 @@ describe("vaccine types Edit Activity specs", () => {
 
   it("should cancel the vaccine type update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("sub-activity-title").contains("Manage vaccine types");
   });

diff --git a/cypress/integrations/admin_activities/vaccines_activities/add_vaccine_activity.cy.ts b/cypress/integrations/admin_activities/vaccines_activities/add_vaccine_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Add Vaccine Activity specs", () => {
 
   it("should cancel the vaccine creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Vaccines");
   });

diff --git a/cypress/integrations/admin_activities/vaccines_activities/edit_vaccine_activity.cy.ts b/cypress/integrations/admin_activities/vaccines_activities/edit_vaccine_activity.cy.ts
@@ -42,7 +42,7 @@ describe("Vaccines Edit Activity specs", () => {
 
   it("should cancel the vaccine update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Vaccines");
   });

diff --git a/cypress/integrations/admin_activities/wards_activities/add_ward_activity.cy.ts b/cypress/integrations/admin_activities/wards_activities/add_ward_activity.cy.ts
@@ -46,7 +46,7 @@ describe("Add Ward Activity specs", () => {
 
   it("should cancel the ward creation", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Wards");
   });

diff --git a/cypress/integrations/admin_activities/wards_activities/edit_ward_activity.cy.ts b/cypress/integrations/admin_activities/wards_activities/edit_ward_activity.cy.ts
@@ -43,7 +43,7 @@ describe("Edit Ward Activity specs", () => {
 
   it("should cancel the ward update", () => {
     cy.dataCy("cancel-form").click();
-    cy.dataCy("approve-dialog").click();
+    cy.dataCy("approve-dialog").click().click();
     cy.dataCy("dialog-info").should("not.exist");
     cy.dataCy("activity-title").contains("Wards");
   });

diff --git a/cypress/integrations/admin_activities/wards_activities/manage_wards_activity.cy.ts b/cypress/integrations/admin_activities/wards_activities/manage_wards_activity.cy.ts
@@ -26,7 +26,7 @@ describe("Wards Activity specs", () => {
   });
 
   it("should cancel the ward deletion", () => {
-    cy.dataCy("close-dialog").click();
+    cy.dataCy("close-dialog").click().click();
     cy.dataCy("dialog-info").should("not.be.visible");
     cy.dataCy("wards-table")
       .find("table")

diff --git a/src/components/accessories/admin/diseases/diseaseForm/DiseaseForm.tsx b/src/components/accessories/admin/diseases/diseaseForm/DiseaseForm.tsx
@@ -311,7 +311,7 @@ const DiseaseForm: FC<IDiseaseProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_diseases);
+            navigate(PATHS.admin_diseases, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/src/components/accessories/admin/exams/examForm/ExamForm.tsx b/src/components/accessories/admin/exams/examForm/ExamForm.tsx
@@ -428,7 +428,7 @@ const ExamForm: FC<IExamProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_exams);
+            navigate(PATHS.admin_exams, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/src/components/accessories/admin/hospital/hospitalForm/HospitalForm.tsx b/src/components/accessories/admin/hospital/hospitalForm/HospitalForm.tsx
@@ -267,7 +267,7 @@ const HospitalForm: FC<IHospitalFormProps> = ({
           info={t("hospital.updateSuccess")}
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin);
+            navigate(PATHS.admin, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/src/components/accessories/admin/operations/operationForm/OperationForm.tsx b/src/components/accessories/admin/operations/operationForm/OperationForm.tsx
@@ -318,7 +318,7 @@ const OperationForm: FC<IOperationProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_operations);
+            navigate(PATHS.admin_operations, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/src/components/accessories/admin/suppliers/supplierForm/SupplierForm.tsx b/src/components/accessories/admin/suppliers/supplierForm/SupplierForm.tsx
@@ -314,7 +314,7 @@ const SupplierForm: FC<ISupplierFormProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_suppliers);
+            navigate(PATHS.admin_suppliers, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/...ts/accessories/admin/types/components/admissions/admissionTypesForm/AdmissionTypeForm.tsx b/...ts/accessories/admin/types/components/admissions/admissionTypesForm/AdmissionTypeForm.tsx
@@ -233,7 +233,7 @@ const AdmissionTypeForm: FC<IAdmissionTypeFormProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_admissions_types);
+            navigate(PATHS.admin_admissions_types, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/src/components/accessories/admin/types/components/agetypes/ageTypesForm/AgeTypesForm.tsx b/src/components/accessories/admin/types/components/agetypes/ageTypesForm/AgeTypesForm.tsx
@@ -228,7 +228,7 @@ const AgeTypesForm: FC<IAgeTypesFormProps> = ({
           info={t("ageTypes.updateSuccess")}
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_age_types);
+            navigate(PATHS.admin_age_types, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/...ents/accessories/admin/types/components/deliveries/deliveryTypesForm/DeliveryTypeForm.tsx b/...ents/accessories/admin/types/components/deliveries/deliveryTypesForm/DeliveryTypeForm.tsx
@@ -233,7 +233,7 @@ const DeliveryTypeForm: FC<IDeliveryTypeFormProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_deliveries_types);
+            navigate(PATHS.admin_deliveries_types, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/...in/types/components/deliveryresulttypes/deliveryResultTypeForm/DeliveryResultTypeForm.tsx b/...in/types/components/deliveryresulttypes/deliveryResultTypeForm/DeliveryResultTypeForm.tsx
@@ -240,7 +240,7 @@ const DeliveryResultTypeForm: FC<IDeliveryResultTypeFormProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_delivery_result_types);
+            navigate(PATHS.admin_delivery_result_types, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/...ts/accessories/admin/types/components/discharges/dischargeTypesForm/DischargeTypeForm.tsx b/...ts/accessories/admin/types/components/discharges/dischargeTypesForm/DischargeTypeForm.tsx
@@ -233,7 +233,7 @@ const DischargeTypeForm: FC<IDischargeTypeFormProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_discharges_types);
+            navigate(PATHS.admin_discharges_types, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />

diff --git a/...mponents/accessories/admin/types/components/diseases/diseaseTypesForm/DiseaseTypeForm.tsx b/...mponents/accessories/admin/types/components/diseases/diseaseTypesForm/DiseaseTypeForm.tsx
@@ -231,7 +231,7 @@ const DiseaseTypeForm: FC<IDiseaseTypeFormProps> = ({
           }
           primaryButtonLabel="Ok"
           handlePrimaryButtonClick={() => {
-            navigate(PATHS.admin_diseases_types);
+            navigate(PATHS.admin_diseases_types, { replace: true });
           }}
           handleSecondaryButtonClick={() => ({})}
         />