@truedat/dd 4.43.4 → 4.44.0

package/src/components/StructureTagsCrumbs.js

@@ -16,7 +16,7 @@ export const StructureTagsCrumbs = ({ structureTag, action }) => {
       <Breadcrumb.Section as={Link} to={STRUCTURE_TAGS} active={false}>
         <FormattedMessage id="structureTags.crumbs.root" />
       </Breadcrumb.Section>
-      {!_.isEmpty(structureTag) && (
+      {_.isEmpty(structureTag) ? null : (
         <>
           <Breadcrumb.Divider icon="right angle" />
           <Breadcrumb.Section {...rootBreadcrumb}>
@@ -24,21 +24,21 @@ export const StructureTagsCrumbs = ({ structureTag, action }) => {
           </Breadcrumb.Section>
         </>
       )}
-      {action && (
+      {action ? (
         <>
           <Breadcrumb.Divider icon="right angle" />
           <Breadcrumb.Section active>
             <FormattedMessage id={action} />
           </Breadcrumb.Section>
         </>
-      )}
+      ) : null}
     </Breadcrumb>
   );
 };
 
 StructureTagsCrumbs.propTypes = {
   structureTag: PropTypes.object,
-  action: PropTypes.string
+  action: PropTypes.string,
 };
 
 export default StructureTagsCrumbs;

package/src/components/StructureTagsRoutes.js

@@ -1,70 +1,46 @@
 import _ from "lodash/fp";
 import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Route, Switch } from "react-router-dom";
+import { Route, Switch, useParams } from "react-router-dom";
+import { useQuery } from "@apollo/client";
+import { Unauthorized } from "@truedat/core/components";
+import { useAuthorized } from "@truedat/core/hooks";
 import {
   STRUCTURE_TAGS,
   STRUCTURE_TAGS_EDIT,
-  STRUCTURE_TAGS_NEW
+  STRUCTURE_TAGS_NEW,
 } from "@truedat/core/routes";
-import StructureTagsCrumbs from "./StructureTagsCrumbs";
-import StructureTagLoader from "./StructureTagLoader";
-import StructureTags from "./StructureTags";
-import StructureTagsLoader from "./StructureTagsLoader";
+import { STRUCTURE_TAG_QUERY } from "../api/queries";
 import StructureTag from "./StructureTag";
+import StructureTags from "./StructureTags";
 
-export const StructureTagsRoutes = ({
-  structureTagLoading,
-  structureTagsLoading
-}) => {
-  return (
-    <Switch>
-      <Route
-        path={STRUCTURE_TAGS}
-        exact
-        render={() => (
-          <>
-            <StructureTagsLoader />
-            {!structureTagsLoading && <StructureTags />}
-          </>
-        )}
-      />
+export const StructureTagLoader = () => {
+  const { id } = useParams();
+  const { loading, error, data } = useQuery(STRUCTURE_TAG_QUERY, {
+    variables: { id },
+  });
+  if (error) return null;
+  const structureTag = data?.structureTag;
+  return <StructureTag id={id} structureTag={structureTag} loading={loading} />;
+};
 
-      <Route
-        path={STRUCTURE_TAGS_NEW}
-        exact
-        render={() => (
-          <>
-            <StructureTagsCrumbs action="structureTags.actions.create" />
-            <StructureTag isCreate />
-          </>
-        )}
-      />
+export const AuthorizedStructureTagsRoutes = () => (
+  <Switch>
+    <Route exact path={STRUCTURE_TAGS_NEW} render={() => <StructureTag />} />
+    <Route exact path={STRUCTURE_TAGS} render={() => <StructureTags />} />
+    <Route path={STRUCTURE_TAGS_EDIT} render={() => <StructureTagLoader />} />
+  </Switch>
+);
 
-      <Route
-        path={STRUCTURE_TAGS_EDIT}
-        exact
-        render={() => (
-          <>
-            <StructureTagLoader />
-            <StructureTagsCrumbs action="structureTags.actions.edit" />
-            {!structureTagLoading && <StructureTag />}
-          </>
-        )}
-      />
-    </Switch>
+export const StructureTagsRoutes = () => {
+  const authorized = useAuthorized();
+  return (
+    <Route
+      path={STRUCTURE_TAGS}
+      render={() =>
+        authorized ? <AuthorizedStructureTagsRoutes /> : <Unauthorized />
+      }
+    />
   );
 };
 
-StructureTagsRoutes.propTypes = {
-  structureTagLoading: PropTypes.bool,
-  structureTagsLoading: PropTypes.bool
-};
-
-const mapStateToProps = ({ structureTagLoading, structureTagsLoading }) => ({
-  structureTagLoading,
-  structureTagsLoading
-});
-
-export default connect(mapStateToProps)(StructureTagsRoutes);
+export default StructureTagsRoutes;

package/src/components/StructuresRoutes.js

@@ -15,7 +15,6 @@ import DomainsLoader from "@truedat/bg/taxonomy/components/DomainsLoader";
 import StructureCrumbs from "./StructureCrumbs";
 import StructureLoader from "./StructureLoader";
 import UserSearchFiltersLoader from "./UserSearchFiltersLoader";
-import StructureTagsLoader from "./StructureTagsLoader";
 import StructureView from "./StructureView";
 import StructuresBulkUpdate from "./StructuresBulkUpdate";
 import StructuresView from "./StructuresView";
@@ -93,7 +92,6 @@ const AuthorizedRoutes = () => {
                 path={STRUCTURE_VERSION}
                 render={() => (
                   <>
-                    <StructureTagsLoader />
                     <StructureLoader />
                     <StructureImplementationsLoader />
                   </>
@@ -103,7 +101,6 @@ const AuthorizedRoutes = () => {
                 path={STRUCTURE}
                 render={() => (
                   <>
-                    <StructureTagsLoader />
                     <StructureLoader />
                     <StructureImplementationsLoader />
                   </>

package/src/components/TagsHeader.js

@@ -5,35 +5,28 @@ import PropTypes from "prop-types";
 import LinkedStructureTag from "./LinkedStructureTag";
 import StructureLinkTagButton from "./StructureLinkTagButton";
 
-export const TagsHeader = ({
-  linkedStructureTags,
-  manageTags,
-  structureTags,
-}) => (
+export const TagsHeader = ({ linkedStructureTags, editable }) => (
   <>
-    {_.negate(_.isEmpty)(linkedStructureTags) &&
-      _.flow(
-        _.sortBy("inserted_at"),
-        _.map.convert({ cap: false })((link, i) => (
-          <LinkedStructureTag key={i} {...link} />
-        ))
-      )(linkedStructureTags)}
-    {_.negate(_.isEmpty)(structureTags) && manageTags && (
-      <StructureLinkTagButton />
-    )}
+    {_.isEmpty(linkedStructureTags)
+      ? null
+      : _.flow(
+          _.sortBy("inserted_at"),
+          _.map.convert({ cap: false })((link, i) => (
+            <LinkedStructureTag key={i} editable={editable} {...link} />
+          ))
+        )(linkedStructureTags)}
+    <StructureLinkTagButton />
   </>
 );
 
 TagsHeader.propTypes = {
+  editable: PropTypes.bool,
   linkedStructureTags: PropTypes.array,
-  manageTags: PropTypes.bool,
-  structureTags: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
-  linkedStructureTags: state.linkedStructureTags,
-  manageTags: state.userPermissions.manage_tags,
-  structureTags: state.structureTags,
+const mapStateToProps = ({ linkedStructureTags, editableStructureTags }) => ({
+  linkedStructureTags,
+  editable: !!editableStructureTags,
 });
 
 export default connect(mapStateToProps)(TagsHeader);

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

@@ -36,7 +36,11 @@ const props = {
 describe("<PendingStructureNoteRow />", () => {
   it("matches the latest snapshot", async () => {
     const { container, queryByText } = render(
-      <PendingStructureNoteRow {...props} />,
+      <table>
+        <tbody>
+          <PendingStructureNoteRow {...props} />
+        </tbody>
+      </table>,
       renderOpts
     );
     expect(container).toMatchSnapshot();

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

@@ -70,13 +70,13 @@ const structureNotes = {
   ],
 };
 
-const StructureNotesMock = {
+const structureNotesMock = {
   request: { query: STRUCTURE_NOTES },
   result: { data: { structureNotes } },
 };
 
 const renderOpts = {
-  mocks: [StructureNotesMock],
+  mocks: [structureNotesMock],
   messages,
   state: { domains },
 };

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

@@ -4,7 +4,10 @@ import { StructureTag } from "../StructureTag";
 
 describe("<StructureTag />", () => {
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<StructureTag />);
+    const createStructureTag = jest.fn();
+    const wrapper = shallow(
+      <StructureTag createStructureTag={createStructureTag} />
+    );
     expect(wrapper).toMatchSnapshot();
   });
 });

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

@@ -1,111 +1,69 @@
 import React from "react";
-import { MemoryRouter } from "react-router-dom";
-import { intl } from "@truedat/test/intl-stub";
-import { render, waitFor } from "@testing-library/react";
+import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { StructureTagForm } from "../StructureTagForm";
-
-// workaround for enzyme issue with React.useContext
-// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
+import { render } from "@truedat/test/render";
+import { DOMAINS_QUERY } from "@truedat/core/api/queries";
+import coreEn from "@truedat/core/messages/en";
+import StructureTagForm from "../StructureTagForm";
+import en from "../../messages/en";
+
+const domainsMock = {
+  request: { query: DOMAINS_QUERY },
+  result: { data: { domains: [{ id: "123", name: "foo" }] } },
+};
+const renderOpts = {
+  messages: { en: { ...coreEn, ...en } },
+  mocks: [domainsMock],
+};
 
 describe("<StructureTagForm />", () => {
-  const createStructureTag = jest.fn();
-  const updateStructureTag = jest.fn();
+  const onSubmit = jest.fn();
   const structureTag = {
     id: 1,
-    name: "tag1"
-  };
-  const isSubmitting = false;
-  const propsCreate = {
-    createStructureTag,
-    updateStructureTag,
-    structureTag: {},
-    isSubmitting
+    name: "foo",
+    domainIds: [],
   };
-  const propsUpdate = {
-    createStructureTag,
-    updateStructureTag,
+  const saving = false;
+  const props = {
+    onSubmit,
     structureTag,
-    isSubmitting
+    saving,
   };
 
-  it("matches the latest snapshot create", async () => {
-    const { container, findByRole } = render(
-      <MemoryRouter>
-        <StructureTagForm {...propsCreate} />
-      </MemoryRouter>
-    );
-    await findByRole("button", { name: /submit/ });
-    expect(container).toMatchSnapshot();
-  });
-
-  it("matches the latest snapshot edit", async () => {
+  it("matches the latest snapshot", async () => {
     const { container, findByRole } = render(
-      <MemoryRouter>
-        <StructureTagForm {...propsUpdate} />
-      </MemoryRouter>
+      <StructureTagForm {...props} />,
+      renderOpts
     );
-    await findByRole("button", { name: /submit/ });
+    await findByRole("button", { name: /save/i });
     expect(container).toMatchSnapshot();
   });
 
-  it("calls createStructureTag with data on submit", async () => {
-    const { findByRole, getByRole } = render(
-      <MemoryRouter>
-        <StructureTagForm {...propsCreate} />
-      </MemoryRouter>
-    );
+  it("calls onSubmit with data on submit", async () => {
+    const { getByRole } = render(<StructureTagForm {...props} />, renderOpts);
 
     // Submit button should initially be disabled
     await waitFor(() =>
-      expect(getByRole("button", { name: /submit/ })).toBeDisabled()
+      expect(getByRole("button", { name: /save/i })).toBeDisabled()
     );
 
     // Description
-    userEvent.type(await findByRole("textbox", { name: /name/ }), "foo");
+    userEvent.type(getByRole("textbox", { name: /name/i }), "foo");
 
     // Submit button should now be enabled
     await waitFor(() =>
-      expect(getByRole("button", { name: /submit/ })).not.toBeDisabled()
+      expect(getByRole("button", { name: /save/i })).not.toBeDisabled()
     );
 
     // Submit
-    userEvent.click(await findByRole("button", { name: /submit/ }));
-
-    await waitFor(() =>
-      expect(createStructureTag).toHaveBeenCalledWith({ name: "foo" })
-    );
-  });
-
-  it("calls updateStructureTag if is updating with data on submit", async () => {
-    const { findByRole, getByRole } = render(
-      <MemoryRouter>
-        <StructureTagForm {...propsUpdate} />
-      </MemoryRouter>
-    );
-
-    // Submit button should initially be disabled
-    await waitFor(() =>
-      expect(getByRole("button", { name: /submit/ })).toBeDisabled()
-    );
-
-    // Description
-    userEvent.type(await findByRole("textbox", { name: /name/ }), " updated");
-
-    // Submit button should now be enabled
-    await waitFor(() =>
-      expect(getByRole("button", { name: /submit/ })).not.toBeDisabled()
-    );
-
-    // Submit
-    userEvent.click(await findByRole("button", { name: /submit/ }));
-
-    await waitFor(() =>
-      expect(updateStructureTag).toHaveBeenCalledWith({
-        id: 1,
-        name: "tag1 updated"
-      })
-    );
+    userEvent.click(getByRole("button", { name: /save/i }));
+
+    await waitFor(() => {
+      expect(onSubmit.mock.calls.length).toBe(1);
+    });
+    expect(onSubmit.mock.calls[0][0]).toMatchObject({
+      name: "foofoo",
+      domainIds: [],
+    });
   });
 });

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

@@ -1,14 +1,14 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { StructureTags } from "../StructureTags";
+import { render } from "@truedat/test/render";
+import StructureTags from "../StructureTags";
+import en from "../../messages/en";
 
-jest.mock("@truedat/core/hooks", () => ({
-  useAuthorized: jest.fn(() => true)
-}));
+const messages = { en };
+const renderOpts = { messages };
 
 describe("<StructureTags />", () => {
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<StructureTags />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<StructureTags />, renderOpts);
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,42 +1,44 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { StructureTagsCards } from "../StructureTagsCards";
+import { waitFor } from "@testing-library/react";
+import { render } from "@truedat/test/render";
+import { STRUCTURE_TAGS_QUERY } from "../../api/queries";
+import StructureTagsCards from "../StructureTagsCards";
+import en from "../../messages/en";
 
-describe("<StructureTagsCards />", () => {
-  const deleteStructureTag = jest.fn();
-  const structureTags = [
-    { id: 1, name: "tag1", structure_count: 0 },
-    { id: 2, name: "tag2", structure_count: 5 }
-  ];
-  const structureTagsLoading = false;
+const structureTagsMock = {
+  request: { query: STRUCTURE_TAGS_QUERY },
+  result: {
+    data: {
+      structureTags: [
+        {
+          __typename: "StructureTag",
+          id: "1",
+          name: "tag1",
+          domainIds: [],
+          structureCount: 1,
+        },
+        {
+          __typename: "StructureTag",
+          id: "2",
+          name: "tag2",
+          domainIds: ["1"],
+          structureCount: 1,
+        },
+      ],
+    },
+  },
+};
+const messages = { en };
 
-  it("matches the latest snapshot", () => {
-    const props = {
-      deleteStructureTag,
-      structureTags,
-      structureTagsLoading
-    };
-    const wrapper = shallow(<StructureTagsCards {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
+const renderOpts = { mocks: [structureTagsMock], messages };
 
-  it("matches the latest snapshot for empty", () => {
-    const props = {
-      deleteStructureTag,
-      structureTags: [],
-      structureTagsLoading
-    };
-    const wrapper = shallow(<StructureTagsCards {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("renders one card per structure tag", () => {
-    const props = {
-      deleteStructureTag,
-      structureTags,
-      structureTagsLoading
-    };
-    const wrapper = shallow(<StructureTagsCards {...props} />);
-    expect(wrapper.find("Card")).toHaveLength(2);
+describe("<StructureTagsCards />", () => {
+  it("matches the latest snapshot, renders a link for each tag", async () => {
+    const { container, getByRole } = render(<StructureTagsCards />, renderOpts);
+    await waitFor(() => {
+      expect(getByRole("link", { name: /tag1/i })).toBeInTheDocument();
+      expect(getByRole("link", { name: /tag2/i })).toBeInTheDocument();
+    });
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -5,56 +5,53 @@ import { render } from "@truedat/test/render";
 import en from "../../messages/en";
 import StructuresUploadEventsTable from "../StructuresUploadEventsTable";
 
-
-
 const events = [
   {
-    "csv_hash": "99E400B91D164F8F0A39F400CA323C8F",
-    "inserted_at": "2022-04-23T15:53:24.638484Z",
-    "message": null,
-    "response": {
-      "errors": [],
-      "ids": [
-        4825521,
-        4825561,
-        4825593
-      ]
+    csv_hash: "99E400B91D164F8F0A39F400CA323C8F",
+    inserted_at: "2022-04-23T15:53:24.638484Z",
+    message: null,
+    response: {
+      errors: [],
+      ids: [4825521, 4825561, 4825593],
     },
-    "status": "COMPLETED",
-    "task_reference": "0.3225053307.1609564164.100549",
-    "user_id": 467
+    status: "COMPLETED",
+    task_reference: "0.3225053307.1609564164.100549",
+    user_id: 467,
   },
   {
-    "csv_hash": "47D90FDF1AD967BD7DBBDAE28664278E",
-    "inserted_at": "2022-04-23T15:14:48.770275Z",
-    "message": null,
-    "response": {
-      "errors": [
+    csv_hash: "47D90FDF1AD967BD7DBBDAE28664278E",
+    inserted_at: "2022-04-23T15:14:48.770275Z",
+    message: null,
+    response: {
+      errors: [
         {
-          "external_id": "file://corporate-landing-s3/cep-pro-ld-cor/batch/SAP/FSCM/vendor_issue/SAP_FSCM_CM_VENDOR_ISUE/ZFSCM_AC",
-          "field": "gdpr",
-          "message": "df_content.inclusion",
-          "row": 4
+          external_id:
+            "file://corporate-landing-s3/cep-pro-ld-cor/batch/SAP/FSCM/vendor_issue/SAP_FSCM_CM_VENDOR_ISUE/ZFSCM_AC",
+          field: "gdpr",
+          message: "df_content.inclusion",
+          row: 4,
         },
         {
-          "external_id": "file://corporate-landing-s3/cep-pro-ld-cor/batch/SAP/FSCM/vendor_issue/SAP_FSCM_CM_VENDOR_ISUE/ZFSCM_FN",
-          "field": "business_description",
-          "message": "df_content.required",
-          "row": 2
+          external_id:
+            "file://corporate-landing-s3/cep-pro-ld-cor/batch/SAP/FSCM/vendor_issue/SAP_FSCM_CM_VENDOR_ISUE/ZFSCM_FN",
+          field: "business_description",
+          message: "df_content.required",
+          row: 2,
         },
         {
-          "external_id": "file://corporate-landing-s3/cep-pro-ld-cor/batch/SAP/FSCM/vendor_issue/SAP_FSCM_CM_VENDOR_ISUE/ZFSCM_PC",
-          "field": "business_description",
-          "message": "df_content.required",
-          "row": 3
-        }
+          external_id:
+            "file://corporate-landing-s3/cep-pro-ld-cor/batch/SAP/FSCM/vendor_issue/SAP_FSCM_CM_VENDOR_ISUE/ZFSCM_PC",
+          field: "business_description",
+          message: "df_content.required",
+          row: 3,
+        },
       ],
-      "ids": []
+      ids: [],
     },
-    "status": "COMPLETED",
-    "task_reference": "0.3225053307.1609564162.101463",
-    "user_id": 467
-  }
+    status: "COMPLETED",
+    task_reference: "0.3225053307.1609564162.101463",
+    user_id: 467,
+  },
 ];
 
 const renderOpts = {
@@ -62,7 +59,6 @@ const renderOpts = {
   state: { structuresUploadEvents: events },
 };
 
-
 describe("<StructuresUploadEventsTable />", () => {
   it("matches the latest snapshot", () => {
     const { container } = render(<StructuresUploadEventsTable />, renderOpts);
@@ -79,6 +75,4 @@ describe("<StructuresUploadEventsTable />", () => {
     userEvent.click(dataRow);
     expect(dataRow).toHaveClass("expanded");
   });
-
-
-});
+});

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

@@ -14,11 +14,11 @@ exports[`<DictionaryRoutes /> matches the latest snapshot 1`] = `
     render={[Function]}
   />
   <Route
-    path="/structure_tags"
+    path="/structureTags"
     render={[Function]}
   />
   <Route
-    path="/structure_types"
+    path="/structureTypes"
     render={[Function]}
   />
   <Route
@@ -26,7 +26,7 @@ exports[`<DictionaryRoutes /> matches the latest snapshot 1`] = `
     render={[Function]}
   />
   <Route
-    path="/structure_notes"
+    path="/structureNotes"
     render={[Function]}
   />
   <Route