fix: merge default user preferences with stored (#2912)

* fix: merge default user preferences with stored * fix: merging, add test
CDCgov · Nov 15, 2024 · 39be57b · 39be57b
1 parent 4beb6db
commit 39be57b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/containers/ecr-viewer/src/app/components/EcrPaginationWrapper.tsx b/containers/ecr-viewer/src/app/components/EcrPaginationWrapper.tsx
@@ -42,7 +42,8 @@ const EcrPaginationWrapper = ({
   useEffect(() => {
     const userPreferencesString = localStorage.getItem("userPreferences");
     if (userPreferencesString) {
-      setUserPreferences(JSON.parse(userPreferencesString));
+      const storedPrefs = JSON.parse(userPreferencesString);
+      setUserPreferences({ ...defaultPreferences, ...storedPrefs });
     }
   }, []);
 

diff --git a/containers/ecr-viewer/src/app/tests/components/EcrPaginationWrapper.test.tsx b/containers/ecr-viewer/src/app/tests/components/EcrPaginationWrapper.test.tsx
@@ -112,6 +112,21 @@ describe("Pagination for EcrPaginationWrapper", () => {
     expect(mockPush).toHaveBeenLastCalledWith("?itemsPerPage=50&page=1");
   });
 
+  it("should load 50 items per page if 50 was previously set and pages wasn't", () => {
+    const spyLocalStorage = jest.spyOn(Storage.prototype, "getItem");
+    spyLocalStorage.mockImplementationOnce(() =>
+      JSON.stringify({ itemsPerPage: 50 }),
+    );
+    render(
+      <EcrPaginationWrapper totalCount={100}>
+        <br />
+      </EcrPaginationWrapper>,
+    );
+
+    expect(screen.getByText("Showing 1-50 of 100 eCRs")).toBeInTheDocument();
+    expect(mockPush).toHaveBeenLastCalledWith("?itemsPerPage=50&page=1");
+  });
+
   it("should display 51-51 on third page", async () => {
     mockSearchParams.set("page", "3");
     render(