@truedat/core 6.0.5 → 6.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "6.0.5",
+  "version": "6.1.1",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.0.5",
+    "@truedat/test": "6.1.1",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -117,5 +117,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "abbaf37328ae24646d2a2c2851f77a611e5476d8"
+  "gitHead": "8ba2e1d68380956d654d6927a6117734f1c50076"
 }

package/src/components/CatalogMenu.js

@@ -53,7 +53,6 @@ export const CatalogMenu = ({ catalogViewConfigs }) => {
     "data_dictionary_structure_notes"
   );
   const { formatMessage } = useIntl();
-
   const submenuItems = [
     { name: "structures", routes: [STRUCTURES, SYSTEMS] },
     ...catalogViewConfigItems(formatMessage)(catalogViewConfigs),
@@ -73,10 +72,8 @@ CatalogMenu.propTypes = {
 };
 
 export const CatalogMenuLoader = (props) => {
-  const adminAuthorized = useAuthorized();
   const { loading, error, data } = useQuery(CATALOG_VIEW_CONFIGS_QUERY, {
     fetchPolicy: "cache-and-network",
-    skip: !adminAuthorized,
   });
 
   if (error) return null;

package/src/components/Pagination.js

@@ -28,7 +28,7 @@ Pagination.propTypes = {
   activePage: PropTypes.number,
   selectPage: PropTypes.func,
   size: PropTypes.string,
-  totalPages: PropTypes.number
+  totalPages: PropTypes.number,
 };
 
 export default Pagination;

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

@@ -3,71 +3,95 @@ import React from "react";
 import { render } from "@truedat/test/render";
 import { within } from "@testing-library/react";
 import { MemoryRouter } from "react-router-dom";
+import { waitForElementToBeRemoved } from "@testing-library/react";
+
 import { linkTo } from "@truedat/core/routes";
-import { CatalogMenu } from "../CatalogMenu";
+import { CATALOG_VIEW_CONFIGS_QUERY } from "@truedat/dd/api/queries";
+import CatalogMenu from "../CatalogMenu";
 
 jest.mock("../../hooks", () => ({
   ...jest.requireActual("../../hooks"),
   useAuthorized: jest.fn(() => true),
+  useAuthorizedItems: jest.fn((items) => items),
 }));
 
-const commonRenderOpts = {
-  messages: {
-    en: {
-      "metadata.region": "metadata.region",
-      "note.layer": "note.layer",
+const mocks = [
+  {
+    request: { query: CATALOG_VIEW_CONFIGS_QUERY },
+    result: {
+      data: {
+        catalogViewConfigs: [
+          {
+            id: "1",
+            fieldType: "metadata",
+            fieldName: "region",
+          },
+          {
+            id: "2",
+            fieldType: "note",
+            fieldName: "layer",
+          },
+        ],
+      },
     },
   },
+];
+
+const commonRenderOpts = {
+  mocks,
+  state: { sidebarVisible: true },
 };
 
 describe("<CatalogMenu />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(<CatalogMenu />, commonRenderOpts);
+  it("matches the latest snapshot", async () => {
+    const { container } = render(
+      <MemoryRouter initialEntries={[linkTo.STRUCTURE({ id: 1234 })]}>
+        <CatalogMenu />
+      </MemoryRouter>,
+      commonRenderOpts
+    );
+    const loader = container.querySelector(".loader");
+    await waitForElementToBeRemoved(loader);
     expect(container).toMatchSnapshot();
   });
 
-  it("Path active route", () => {
+  it("Path active route", async () => {
     const { container } = render(
       <MemoryRouter initialEntries={[linkTo.STRUCTURE({ id: 1234 })]}>
         <CatalogMenu />
       </MemoryRouter>,
       commonRenderOpts
     );
+    const loader = container.querySelector(".loader");
+    await waitForElementToBeRemoved(loader);
 
-    const activeMenus = container.querySelectorAll('a[aria-checked="true"]');
+    const activeMenus = container.querySelectorAll("a.active");
     expect(activeMenus.length).toBe(1);
-    expect(within(activeMenus[0]).getByText("structures")).toBeInTheDocument();
+    expect(within(activeMenus[0]).getByText("Structures")).toBeInTheDocument();
   });
 
-  it("Navigation filter has priority over path for active menu and submenu", () => {
-    const renderOpts = {
-      ...commonRenderOpts,
+  it("Navigation filter has priority over path for active menu and submenu", async () => {
+    const renderOpts = _.merge(commonRenderOpts, {
       state: {
         navFilter: { "metadata.region": "eu-west-1" },
       },
-    };
-
-    const catalogViewConfigs = [
-      {
-        id: "1",
-        fieldType: "metadata",
-        fieldName: "region",
-      },
-      {
-        id: "2",
-        fieldType: "note",
-        fieldName: "layer",
-      },
-    ];
+    });
 
     const { getByText, container } = render(
-      <MemoryRouter initialEntries={[linkTo.STRUCTURE({ id: 1234 })]}>
-        <CatalogMenu catalogViewConfigs={catalogViewConfigs} />
+      <MemoryRouter
+        initialEntries={[
+          linkTo.BUCKETS_VIEW({ propertyPath: `metadata.region` }),
+        ]}
+      >
+        <CatalogMenu />
       </MemoryRouter>,
       renderOpts
     );
 
-    const structuresMenu = getByText("structures").closest("a");
+    const loader = container.querySelector(".loader");
+    await waitForElementToBeRemoved(loader);
+
+    const structuresMenu = getByText("Structures").closest("a");
     const metadataBucketMenu = getByText("metadata.region").closest("a");
     const noteBucketMenu = getByText("note.layer").closest("a");
 
@@ -75,7 +99,7 @@ describe("<CatalogMenu />", () => {
     expect(metadataBucketMenu).toBeInTheDocument();
     expect(noteBucketMenu).toBeInTheDocument();
 
-    const activeMenus = container.querySelectorAll('a[aria-checked="true"]');
+    const activeMenus = container.querySelectorAll("a.active");
     expect(activeMenus.length).toBe(1);
     expect(
       within(activeMenus[0]).getByText("metadata.region")

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

@@ -1,17 +1,52 @@
 import React from "react";
 import { render } from "@truedat/test/render";
+import { waitForElementToBeRemoved } from "@testing-library/react";
+import { CATALOG_VIEW_CONFIGS_QUERY } from "@truedat/dd/api/queries";
 import SideMenu from "../SideMenu";
 
-const renderOpts = { state: { sidebarVisible: true } };
+jest.mock("@truedat/core/hooks", () => ({
+  useActiveRoutes: jest.fn(() => true),
+  useAuthorized: jest.fn(() => true),
+  useAuthorizedItems: jest.fn((items) => items),
+}));
+
+const mocks = [
+  {
+    request: { query: CATALOG_VIEW_CONFIGS_QUERY },
+    result: {
+      data: {
+        catalogViewConfigs: [
+          {
+            id: "1",
+            fieldType: "metadata",
+            fieldName: "region",
+          },
+          {
+            id: "2",
+            fieldType: "note",
+            fieldName: "layer",
+          },
+        ],
+      },
+    },
+  },
+];
+
+const renderOpts = {
+  mocks,
+  state: { sidebarVisible: true },
+};
 
 describe("<SideMenu />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const { container } = render(
       <SideMenu>
         <p>Hello</p>
       </SideMenu>,
       renderOpts
     );
+    const loader = container.querySelector(".loader");
+    await waitForElementToBeRemoved(loader);
     expect(container).toMatchSnapshot();
   });
 });

package/src/components/__tests__/__snapshots__/CatalogMenu.spec.js.snap

@@ -2,125 +2,75 @@
 
 exports[`<CatalogMenu /> matches the latest snapshot 1`] = `
 <div>
-  <div>
+  <div
+    class="active item selectable"
+  >
+    <a
+      href="/structures"
+    >
+      <i
+        aria-hidden="true"
+        class="block layout large icon"
+      />
+      Catalog
+    </a>
     <div
-      aria-expanded="false"
-      class="ui item dropdown"
-      role="listbox"
-      tabindex="0"
+      class="menu"
     >
       <a
-        class="ui"
+        class="active link item"
         href="/structures"
       >
-        <i
-          aria-hidden="true"
-          class="block layout large icon"
-        />
+        Structures
+      </a>
+      <a
+        class="link item"
+        href="/buckets/metadata.region"
+      >
+        metadata.region
+      </a>
+      <a
+        class="link item"
+        href="/buckets/note.layer"
+      >
+        note.layer
+      </a>
+      <a
+        class="link item"
+        href="/referenceDatasets"
+      >
+        Reference Data
+      </a>
+      <a
+        class="link item"
+        href="/structureNotes"
+      >
+        Pending notes
+      </a>
+      <a
+        class="link item"
+        href="/bulkUpdateTemplateContentEvents"
+      >
+        My loads
+      </a>
+      <a
+        class="link item"
+        href="/bucketViewConfigs"
+      >
+        Catalog views
+      </a>
+      <a
+        class="link item"
+        href="/structureTypes"
+      >
+        Structure Types
       </a>
-      <div
-        class="menu transition"
+      <a
+        class="link item"
+        href="/structureTags"
       >
-        <div
-          class="header selectable"
-        >
-          catalog
-        </div>
-        <div
-          class="divider"
-        />
-        <a
-          aria-checked="false"
-          class="item"
-          href="/structures"
-          name="structures"
-          role="option"
-        >
-          <span
-            class="text"
-          >
-            structures
-          </span>
-        </a>
-        <a
-          aria-checked="false"
-          class="item"
-          href="/referenceDatasets"
-          name="referenceData"
-          role="option"
-        >
-          <span
-            class="text"
-          >
-            referenceData
-          </span>
-        </a>
-        <a
-          aria-checked="false"
-          class="item"
-          href="/structureNotes"
-          name="pending_structure_notes"
-          role="option"
-        >
-          <span
-            class="text"
-          >
-            pending_structure_notes
-          </span>
-        </a>
-        <a
-          aria-checked="false"
-          class="item"
-          href="/bulkUpdateTemplateContentEvents"
-          name="structures_upload_events"
-          role="option"
-        >
-          <span
-            class="text"
-          >
-            structures_upload_events
-          </span>
-        </a>
-        <a
-          aria-checked="false"
-          class="item"
-          href="/bucketViewConfigs"
-          name="catalogViewConfigs"
-          role="option"
-        >
-          <span
-            class="text"
-          >
-            catalogViewConfigs
-          </span>
-        </a>
-        <a
-          aria-checked="false"
-          class="item"
-          href="/structureTypes"
-          name="structureTypes"
-          role="option"
-        >
-          <span
-            class="text"
-          >
-            structureTypes
-          </span>
-        </a>
-        <a
-          aria-checked="false"
-          class="item"
-          href="/structureTags"
-          name="structureTags"
-          role="option"
-        >
-          <span
-            class="text"
-          >
-            structureTags
-          </span>
-        </a>
-      </div>
+        Structure Tags
+      </a>
     </div>
   </div>
 </div>