Merge branch 'develop' into issue#5364

ohcnetwork · Oct 3, 2023 · ffb5975 · ffb5975
2 parents 129fa01 + b7fc53c
commit ffb5975
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 182 deletions.
diff --git a/cypress/e2e/facility_spec/locations.cy.ts b/cypress/e2e/facility_spec/locations.cy.ts
@@ -13,6 +13,7 @@ describe("Location Management Section", () => {
     cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
     cy.get("[id='facility-details']").first().click();
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
+    cy.get("h1.text-3xl.font-bold", { timeout: 10000 }).should("be.visible");
     cy.get("#manage-facility-dropdown button").should("be.visible");
     cy.get("[id='manage-facility-dropdown']").scrollIntoView().click();
     cy.get("[id=location-management]").click();

diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -106,6 +106,7 @@ class FacilityPage {
   }
 
   clickManageFacilityDropdown() {
+    cy.get("h1.text-3xl.font-bold", { timeout: 20000 }).should("be.visible");
     cy.get("#manage-facility-dropdown button").scrollIntoView();
     cy.get("#manage-facility-dropdown button")
       .contains("Manage Facility")
@@ -198,8 +199,6 @@ class FacilityPage {
     cy.intercept("GET", "**/api/v1/facility/**").as("getManagePage");
     cy.go("back");
     cy.wait("@getManagePage").its("response.statusCode").should("eq", 200);
-    cy.get("#manage-facility-dropdown").scrollIntoView();
-    cy.get("#manage-facility-dropdown").should("exist");
   }
 
   verifyfacilityviewassetredirection() {

diff --git a/src/Common/hooks/useRangePagination.ts b/src/Common/hooks/useRangePagination.ts
@@ -9,18 +9,17 @@ interface Props {
   bounds: DateRange;
   perPage: number;
   slots?: number;
-  snapToLatest?: boolean;
-  reverse?: boolean;
+  defaultEnd?: boolean;
 }
 
 const useRangePagination = ({ bounds, perPage, ...props }: Props) => {
   const [currentRange, setCurrentRange] = useState(
-    getInitialBounds(bounds, perPage, props.snapToLatest)
+    getInitialBounds(bounds, perPage, props.defaultEnd)
   );
 
   useEffect(() => {
-    setCurrentRange(getInitialBounds(bounds, perPage, props.snapToLatest));
-  }, [bounds, perPage, props.snapToLatest]);
+    setCurrentRange(getInitialBounds(bounds, perPage, props.defaultEnd));
+  }, [bounds, perPage, props.defaultEnd]);
 
   const next = () => {
     const { end } = currentRange;
@@ -63,24 +62,17 @@ const useRangePagination = ({ bounds, perPage, ...props }: Props) => {
     }
 
     const slots: DateRange[] = [];
-    const { start, end } = currentRange;
+    const { start } = currentRange;
     const delta = perPage / props.slots;
 
     for (let i = 0; i < props.slots; i++) {
-      if (props.snapToLatest) {
-        slots.push({
-          start: new Date(end.valueOf() - delta * (i - 1)),
-          end: new Date(end.valueOf() - delta * i),
-        });
-      } else {
-        slots.push({
-          start: new Date(start.valueOf() + delta * i),
-          end: new Date(start.valueOf() + delta * (i + 1)),
-        });
-      }
+      slots.push({
+        start: new Date(start.valueOf() + delta * i),
+        end: new Date(start.valueOf() + delta * (i + 1)),
+      });
     }
 
-    return props.reverse ? slots.reverse() : slots;
+    return slots;
   }, [currentRange, props.slots, perPage]);
 
   return {
@@ -98,15 +90,15 @@ export default useRangePagination;
 const getInitialBounds = (
   bounds: DateRange,
   perPage: number,
-  snapToLatest?: boolean
+  defaultEnd?: boolean
 ) => {
   const deltaBounds = bounds.end.valueOf() - bounds.start.valueOf();
 
   if (deltaBounds < perPage) {
     return bounds;
   }
 
-  if (snapToLatest) {
+  if (defaultEnd) {
     return {
       start: new Date(bounds.end.valueOf() - perPage),
       end: bounds.end,