Merge pull request #162 from OpenLMIS-Angola/OAM-287

OAM-287: fixed scroll on requisition order create page and failing tests
OpenLMIS-Angola · Aug 1, 2024 · 95fab50 · 95fab50
2 parents 38a25bd + 07884c4
commit 95fab50
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/src/react-components/modals/modal.jsx b/src/react-components/modals/modal.jsx
@@ -13,18 +13,20 @@ const Modal = ({ isOpen, body, alertModal = false, sourceOfFundStyle = '' }) =>
 
     }, [isOpen]);
 
-    // When isOpen is false component should return nothing
-    // Added because if modal is unmounted document.body.style.overflow is not changing to 'auto'
-    // and scroll doesn't work
-    if (!isOpen) {
-        return null
-    }
     return (
-        <div className={`${showHideClassName} ${alertModalClassName}`}>
-            <section className={`modal-main ${sourceOfFundStyle ? 'source-of-fund-modal' : ''}`}>
-                {body}
-            </section>
-        </div>
+            <>
+            {
+                isOpen &&
+                (
+                    <div className={`${showHideClassName} ${alertModalClassName}`}>
+                        <section className={`modal-main ${sourceOfFundStyle ? 'source-of-fund-modal' : ''}`}>
+                            {body}
+                        </section>
+                    </div>
+                )
+            }
+        </>
+
     );
 }
 

diff --git a/src/referencedata-facilities-cache/referencedata-facilities-cache.run.spec.js b/src/referencedata-facilities-cache/referencedata-facilities-cache.run.spec.js
@@ -39,7 +39,9 @@ describe('referencedata-facilities-cache run', function() {
         this.postLogoutAction = this.getLastCall(loginServiceSpy.registerPostLogoutAction).args[0];
 
         spyOn(this.facilityService, 'cacheAllMinimal');
+        spyOn(this.facilityService, 'getFacilitiesWithoutWards');
         spyOn(this.facilityService, 'clearMinimalFacilitiesCache');
+        spyOn(this.facilityService, 'clearFacilitiesWithoutWardsCache');
     });
 
     describe('run block', function() {

diff --git a/src/requisition-order-create/order-create-table.jsx b/src/requisition-order-create/order-create-table.jsx
@@ -185,7 +185,10 @@ const OrderCreateTable = ({ isReadOnly }) => {
                     isOpen={isSummaryModalOpen}
                     orders={orders}
                     onSaveClick={sendOrders}
-                    onModalClose={() => setIsSummaryModalOpen(false)}
+                    onModalClose={() => {
+                        document.body.style.overflow = 'auto';
+                        setIsSummaryModalOpen(false)}
+                    }
                 />
             }
             <div className="page-header-responsive">

diff --git a/src/requisition-view/requisition-view.controller.spec.js b/src/requisition-view/requisition-view.controller.spec.js
@@ -251,7 +251,7 @@ describe('RequisitionViewController', function() {
 
             expect(this.vm.getPrintUrl())
             // Angola - changed requisition print URL
-                .toEqual(this.requisitionUrlFactory('/api/reports/requisitions/requisition-id-1/print'));
+                .toEqual(this.requisitionUrlFactory('/api/requisitions/requisition-id-1/print'));
             // ends here
         });
 
@@ -653,7 +653,7 @@ describe('RequisitionViewController', function() {
             this.$rootScope.$apply();
 
             expect(this.accessTokenFactory.addAccessToken)
-                .toHaveBeenCalledWith(this.requisitionUrlFactory('api/reports/requisitions/requisition-id-1/print'));
+                .toHaveBeenCalledWith(this.requisitionUrlFactory('api/requisitions/requisition-id-1/print'));
         });
 
         it('should not open report when sync failed', function() {