@truedat/core 8.11.0 → 8.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "8.11.0",
+  "version": "8.11.2",
   "description": "Truedat Web Core",
   "sideEffects": [
     "**/*.css",
@@ -57,7 +57,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.11.0",
+    "@truedat/test": "8.11.2",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -98,5 +98,5 @@
     "swr": "^2.3.3",
     "turndown": "^7.2.2"
   },
-  "gitHead": "89b12f5fa7ff2d0fb790d88830938ccff9cb3d91"
+  "gitHead": "5c0ce3c555de4c9e89021b4d0ab785ed27a87305"
 }

package/src/components/GlossaryMenu.js

@@ -8,7 +8,6 @@ import { linkTo } from "@truedat/core/routes";
 import { makeGetSubscopes } from "@truedat/core/selectors/subscopedTemplates";
 import { getConceptSubscope } from "@truedat/core/selectors/getConceptSubscope";
 import { getSidemenuGlossarySubscopes } from "@truedat/core/selectors/getSidemenuGlossarySubscopes";
-import TemplatesLoader from "@truedat/core/components/TemplatesLoader";
 import { useAuthorized } from "../hooks";
 import {
   CONCEPTS,
@@ -270,7 +269,6 @@ export const GlossaryMenu = ({ bgSubscopes, rootSubscopes }) => {
 
   return (
     <>
-      <TemplatesLoader />
       <Submenu
         icon={defaultIcon}
         name="glossary"

package/src/components/SideMenu.js

@@ -14,6 +14,7 @@ import SidebarToggle from "./SidebarToggle";
 import TaxonomyMenu from "./TaxonomyMenu";
 import GrantMenu from "./GrantMenu";
 import MembersMenu from "./MembersMenu";
+import TemplatesLoader from "./TemplatesLoader";
 
 export const SideMenu = ({
   animation = "push",
@@ -35,6 +36,7 @@ export const SideMenu = ({
         animation={animation}
       >
         <SearchMenu />
+        <TemplatesLoader />
         <GlossaryMenu />
         <CatalogMenu />
         <GrantMenu />

package/src/components/__tests__/GlossaryMenu.spec.js

@@ -1,4 +1,5 @@
 import { render } from "@truedat/test/render";
+import { fetchTemplates } from "@truedat/core/routines";
 import GlossaryMenu from "../GlossaryMenu";
 
 jest.mock("../../hooks", () => ({
@@ -77,4 +78,20 @@ describe("<GlossaryMenu />", () => {
     expect(queryByRole("option", { name: "subscope1" })).toBeInTheDocument();
     expect(queryByRole("option", { name: "subscope2" })).toBeInTheDocument();
   });
+
+  it("does not dispatch fetchTemplates on mount (templates preload moved to SideMenu)", () => {
+    const dispatched = [];
+    render(<GlossaryMenu />, {
+      ...renderOpts,
+      dispatch: jest.fn((action) => {
+        dispatched.push(action);
+        return action;
+      }),
+    });
+
+    const fetchTemplatesCalls = dispatched.filter(
+      (action) => action && action.type === fetchTemplates.TRIGGER,
+    );
+    expect(fetchTemplatesCalls).toHaveLength(0);
+  });
 });

package/src/components/__tests__/SideMenu.spec.js

@@ -1,5 +1,6 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { CATALOG_VIEW_CONFIGS_QUERY } from "@truedat/core/api/queries";
+import { fetchTemplates } from "@truedat/core/routines";
 import SideMenu from "../SideMenu";
 
 jest.mock("@truedat/core/hooks", () => ({
@@ -46,4 +47,63 @@ describe("<SideMenu />", () => {
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
+
+  describe("global templates preload", () => {
+    let dispatched;
+    let useAuthorizedMock;
+
+    beforeEach(() => {
+      dispatched = [];
+      useAuthorizedMock = require("@truedat/core/hooks").useAuthorized;
+      useAuthorizedMock.mockReturnValue(true);
+    });
+
+    const renderWithDispatch = () =>
+      render(
+        <SideMenu>
+          <p>Hello</p>
+        </SideMenu>,
+        {
+          ...renderOpts,
+          dispatch: jest.fn((action) => {
+            dispatched.push(action);
+            return action;
+          }),
+        },
+      );
+
+    it("dispatches fetchTemplates with no scope on mount", async () => {
+      const rendered = renderWithDispatch();
+      await waitForLoad(rendered);
+      expect(dispatched).toContainEqual(
+        expect.objectContaining({
+          type: fetchTemplates.TRIGGER,
+          payload: { scope: undefined },
+        }),
+      );
+    });
+
+    it("dispatches fetchTemplates even when user lacks business_glossary_view", async () => {
+      useAuthorizedMock.mockImplementation((allowedRoles) => {
+        const roles = Array.isArray(allowedRoles)
+          ? allowedRoles
+          : [allowedRoles];
+        // Deny business_glossary_view/management but allow everything else.
+        const blocked = new Set([
+          "business_glossary_view",
+          "business_glossary_management",
+        ]);
+        return roles.some((r) => r && !blocked.has(r));
+      });
+
+      const rendered = renderWithDispatch();
+      await waitForLoad(rendered);
+      expect(dispatched).toContainEqual(
+        expect.objectContaining({
+          type: fetchTemplates.TRIGGER,
+          payload: { scope: undefined },
+        }),
+      );
+    });
+  });
 });

package/src/search/SearchContext.js

@@ -64,6 +64,9 @@ export const SearchContextProvider = (props) => {
   const [count, setCount] = useState(0);
 
   const [onSearchChange, setOnSearchChange] = useState();
+  const [refreshCounter, refreshToken] = useState(0);
+
+  const refreshSearch = useCallback(() => refreshToken((c) => c + 1), []);
 
   const debouncedTriggerSearch = useCallback(
     _.debounce(debounceQueryTime)((filterParam) => {
@@ -270,6 +273,7 @@ export const SearchContextProvider = (props) => {
     page,
     size,
     enrichSearchPayload,
+    refreshCounter,
   ]);
 
   const mapDomainFilterKey = (key) => {
@@ -410,6 +414,7 @@ export const SearchContextProvider = (props) => {
     searchFiltersPropsMapping,
 
     setOnSearchChange,
+    refreshSearch,
   };
 
   return <SearchContext value={context}>{children}</SearchContext>;

package/src/search/__tests__/SearchContext.spec.js

@@ -508,4 +508,52 @@ describe("<SearchContextProvider />", () => {
 
     jest.useRealTimers();
   });
+
+  it("re-executes the search when refreshSearch is called", async () => {
+    jest.useFakeTimers();
+    const user = userEvent.setup({
+      delay: null,
+      advanceTimers: jest.advanceTimersByTime,
+    });
+    const triggerSearchSpy = jest.fn().mockReturnValue({
+      then: (callback) =>
+        callback({
+          data,
+          headers: {},
+        }),
+    });
+    const useSearchLocal = () => ({ trigger: triggerSearchSpy });
+
+    const RefreshConsumer = () => {
+      const { refreshSearch } = useSearchContext();
+      return <button onClick={() => refreshSearch()}>refresh</button>;
+    };
+
+    const rendered = render(
+      <SearchContextProvider {...searchProps} useSearch={useSearchLocal}>
+        <RefreshConsumer />
+      </SearchContextProvider>,
+      renderOpts,
+    );
+
+    jest.runAllTimers();
+
+    expect(triggerSearchSpy).toHaveBeenCalledTimes(1);
+    const firstCallArgs = triggerSearchSpy.mock.calls[0][0];
+
+    await user.click(rendered.getByText(/refresh/i));
+
+    jest.runAllTimers();
+
+    expect(triggerSearchSpy).toHaveBeenCalledTimes(2);
+    expect(triggerSearchSpy).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        must: firstCallArgs.must,
+        page: firstCallArgs.page,
+        size: firstCallArgs.size,
+      }),
+    );
+
+    jest.useRealTimers();
+  });
 });