@oneuptime/common 12.0.12 → 12.0.14

package/Tests/UI/Components/MasterPage.test.tsx

@@ -54,9 +54,44 @@ describe("MasterPage", () => {
   });
 
   it("should render correctly with makeTopSectionUnstick", () => {
-    render(<MasterPage {...defaultProps} makeTopSectionUnstick />);
+    render(
+      <MasterPage
+        {...defaultProps}
+        header={<div>Header</div>}
+        makeTopSectionUnstick
+      />,
+    );
 
     const topSection: HTMLElement = screen.getByRole("banner").parentElement!;
     expect(topSection).not.toHaveClass("sticky");
   });
+
+  it("should render the top section when it has a header or a navbar", () => {
+    const { rerender } = render(
+      <MasterPage {...defaultProps} header={<div>Header</div>} />,
+    );
+    expect(screen.getByRole("banner")).toBeInTheDocument();
+
+    rerender(<MasterPage {...defaultProps} navBar={<div>NavBar</div>} />);
+    expect(screen.getByRole("banner")).toBeInTheDocument();
+  });
+
+  /*
+   * The status page renders its own header and navbar inside children and
+   * passes neither prop. Rendering the top section anyway left an empty white
+   * bar with a drop shadow above the content.
+   */
+  it("should not render an empty top section when it has neither", () => {
+    render(<MasterPage {...defaultProps} />);
+
+    expect(screen.queryByRole("banner")).not.toBeInTheDocument();
+  });
+
+  it("should not render the top section when its only header is hidden", () => {
+    render(
+      <MasterPage {...defaultProps} header={<div>Header</div>} hideHeader />,
+    );
+
+    expect(screen.queryByRole("banner")).not.toBeInTheDocument();
+  });
 });

package/Tests/UI/Components/ModelTable/useCustomFieldColumns.test.tsx

@@ -50,6 +50,7 @@ jest.mock("../../../../UI/Utils/Project", () => {
 import useCustomFieldColumns, {
   CustomFieldColumnsResult,
 } from "../../../../UI/Components/ModelTable/useCustomFieldColumns";
+import ModelListCache from "../../../../UI/Utils/ModelListCache";
 import { CustomFieldDefinition } from "../../../../UI/Components/ModelTable/CustomFieldColumns";
 import BaseModel from "../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import IncidentCustomField from "../../../../Models/DatabaseModels/IncidentCustomField";
@@ -115,6 +116,13 @@ afterEach(() => {
   cleanup();
   getListMock.mockReset();
   getCurrentProjectIdMock.mockReset();
+  /*
+   * The hook now reads through ModelListCache, whose module-level cache and
+   * in-flight dedup survive between tests. Every test here uses the same
+   * model + project + shape (one key), so without a reset one test's request
+   * - resolved or deliberately never-resolving - would be served to the next.
+   */
+  ModelListCache.invalidateAll();
 });
 
 describe("useCustomFieldColumns — isLoading on the first render", () => {