@truedat/ie 7.5.7 → 7.5.10

package/src/ingests/components/__tests__/__snapshots__/IngestsActions.spec.js.snap

@@ -2,56 +2,23 @@
 
 exports[`<IngestsActions /> matches the latest snapshot 1`] = `
 <div>
-  <Button
-    as={
-      {
-        "$$typeof": Symbol(react.forward_ref),
-        "displayName": "Link",
-        "propTypes": {
-          "innerRef": [Function],
-          "onClick": [Function],
-          "replace": [Function],
-          "target": [Function],
-          "to": [Function],
-        },
-        "render": [Function],
-      }
-    }
-    content={
-      <Memo(MemoizedFormattedMessage)
-        id="ingests.actions.create"
+  <div>
+    <a
+      class="ui primary right floated button"
+      data-discover="true"
+      href="/url/to/create/ingest"
+      role="button"
+    >
+      ingests.actions.create
+    </a>
+    <button
+      class="ui icon secondary right floated button"
+    >
+      <i
+        aria-hidden="true"
+        class="download icon"
       />
-    }
-    floated="right"
-    primary={true}
-    to="/url/to/create/ingest"
-  />
-  <Popup
-    content={
-      <Memo(MemoizedFormattedMessage)
-        id="ingests.actions.download.tooltip"
-      />
-    }
-    disabled={false}
-    eventsEnabled={true}
-    on={
-      [
-        "click",
-        "hover",
-      ]
-    }
-    pinned={false}
-    popperModifiers={[]}
-    position="top left"
-    trigger={
-      <Button
-        as="button"
-        floated="right"
-        icon="download"
-        onClick={[Function]}
-        secondary={true}
-      />
-    }
-  />
+    </button>
+  </div>
 </div>
 `;

package/src/ingests/components/__tests__/__snapshots__/IngestsLoader.spec.js.snap

@@ -1,23 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<IngestsLoader /> matches the latest snapshot 1`] = `
-<IngestsLoader
-  clearIngests={[MockFunction]}
-  fetchIngests={
-    [MockFunction] {
-      "calls": [
-        [
-          undefined,
-        ],
-      ],
-      "results": [
-        {
-          "type": "return",
-          "value": undefined,
-        },
-      ],
-    }
-  }
-  loading={false}
-/>
-`;
+exports[`<IngestsLoader /> matches the latest snapshot 1`] = `<div />`;

package/src/ingests/components/__tests__/__snapshots__/IngestsTable.spec.js.snap

@@ -1,33 +1,24 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<IngestsTable /> matches the latest snapshot 1`] = `
-<Fragment>
-  <Table
-    as="table"
-    selectable={true}
-    sortable={true}
+<div>
+  <table
+    class="ui selectable sortable table"
   >
-    <TableHeader
-      as="thead"
+    <thead
+      class=""
     >
-      <TableRow
-        as="tr"
-        cellAs="td"
+      <tr
+        class=""
       />
-    </TableHeader>
-    <TableBody
-      as="tbody"
+    </thead>
+    <tbody
+      class=""
     >
-      <IngestRow
-        columns={[]}
-        ingest={
-          {
-            "id": 1,
-          }
-        }
-        key="0"
+      <tr
+        class=""
       />
-    </TableBody>
-  </Table>
-</Fragment>
+    </tbody>
+  </table>
+</div>
 `;

package/src/ingests/components/index.js

@@ -41,5 +41,5 @@ export {
   IngestSelectedFiltersPending,
   IngestSelectedFiltersPublished,
   IngestTabs,
-  FieldGroupTable
+  FieldGroupTable,
 };

package/src/ingests/constants/mappings.js

@@ -1,16 +1,16 @@
 export const mapActionProps = {
   publish: {
-    primary: true
+    primary: true,
   },
   version: {
-    primary: true
+    primary: true,
   },
   send_for_approval: {
-    primary: true
+    primary: true,
   },
   reject: {
-    negative: true
-  }
+    negative: true,
+  },
 };
 
 export const mapStatusColor = {
@@ -19,5 +19,5 @@ export const mapStatusColor = {
   pending_approval: "teal",
   published: "green",
   rejected: "red",
-  versioned: "yellow"
+  versioned: "yellow",
 };

package/src/ingests/relations/components/IngestLinkActions.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { connect } from "react-redux";
 import { Button, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";

package/src/ingests/relations/components/IngestLinksActions.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
 

package/src/ingests/relations/components/IngestRelationsRoutes.js

@@ -1,13 +1,13 @@
 import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { Route, Switch } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import { connect } from "react-redux";
 import {
   INGEST_RELATIONS_INGESTS,
   INGEST_RELATIONS_INGESTS_NEW,
   INGEST_RELATIONS_STRUCTURES,
-  INGEST_RELATIONS_STRUCTURES_NEW
+  INGEST_RELATIONS_STRUCTURES_NEW,
 } from "@truedat/core/routes";
 import IngestsLoader from "../../components/IngestsLoader";
 import IngestFiltersLoader from "../../components/IngestFiltersLoader";
@@ -16,84 +16,82 @@ import IngestToDataStructureRelations from "./IngestToDataStructureRelations";
 import IngestToStructureForm from "./IngestToStructureForm";
 import IngestToIngestForm from "./IngestToIngestForm";
 
-const RelationsLoader = React.lazy(() =>
-  import("@truedat/lm/components/RelationsLoader")
+const RelationsLoader = React.lazy(
+  () => import("@truedat/lm/components/RelationsLoader")
 );
 
-const StructureTypesLoader = React.lazy(() =>
-  import("@truedat/dd/components/StructureTypesLoader")
+const StructureTypesLoader = React.lazy(
+  () => import("@truedat/dd/components/StructureTypesLoader")
 );
 
-export const IngestRelationsRoutes = ({ ingestId, ingestLoaded }) => (
-  <Switch>
-    <Route
-      exact
-      path={INGEST_RELATIONS_STRUCTURES}
-      render={() =>
-        ingestLoaded && (
-          <>
-            <RelationsLoader
-              resource_id={ingestId}
-              resource_type="ingest"
-              target_type="data_structure"
-            />
-            <StructureTypesLoader />
-            <IngestToDataStructureRelations />
-          </>
-        )
-      }
-    />
-    <Route
-      exact
-      path={INGEST_RELATIONS_INGESTS}
-      render={() =>
-        ingestLoaded && (
-          <>
-            <RelationsLoader
-              resource_id={ingestId}
-              resource_type="ingest"
-              target_type="ingest"
-            />
-            <IngestToIngestRelations />
-          </>
-        )
-      }
-    />
-    <Route
-      exact
-      path={INGEST_RELATIONS_STRUCTURES_NEW}
-      render={() => ingestLoaded && <IngestToStructureForm />}
-    />
-    <Route
-      exact
-      path={INGEST_RELATIONS_INGESTS_NEW}
-      render={() =>
-        ingestLoaded && (
-          <>
-            <IngestsLoader
-              pageSize={7}
-              defaultFilters={{
-                current: [true],
-                status: ["pending_approval", "draft", "rejected", "published"]
-              }}
-            />
-            <IngestFiltersLoader />
-            <IngestToIngestForm targetType="ingest" />
-          </>
-        )
-      }
-    />
-  </Switch>
-);
+export const IngestRelationsRoutes = ({ ingestId, ingestLoaded }) =>
+  ingestLoaded ? (
+    <Routes>
+      <Route path={INGEST_RELATIONS_STRUCTURES}>
+        <Route
+          index
+          element={
+            <>
+              <RelationsLoader
+                resource_id={ingestId}
+                resource_type="ingest"
+                target_type="data_structure"
+              />
+              <StructureTypesLoader />
+              <IngestToDataStructureRelations />
+            </>
+          }
+        />
+        <Route path="new" element={<IngestToStructureForm />} />
+      </Route>
+
+      <Route path={INGEST_RELATIONS_INGESTS}>
+        <Route
+          index
+          element={
+            <>
+              <RelationsLoader
+                resource_id={ingestId}
+                resource_type="ingest"
+                target_type="ingest"
+              />
+              <IngestToIngestRelations />
+            </>
+          }
+        />
+        <Route
+          path="new"
+          element={
+            <>
+              <IngestsLoader
+                pageSize={7}
+                defaultFilters={{
+                  current: [true],
+                  status: [
+                    "pending_approval",
+                    "draft",
+                    "rejected",
+                    "published",
+                  ],
+                }}
+              />
+              <IngestFiltersLoader />
+              <IngestToIngestForm targetType="ingest" />
+            </>
+          }
+        />
+      </Route>
+    </Routes>
+  ) : null;
 
 IngestRelationsRoutes.propTypes = {
   ingestId: PropTypes.number,
-  ingestLoaded: PropTypes.bool
+  ingestLoaded: PropTypes.bool,
 };
 
 const mapStateToProps = ({ ingest }) => ({
   ingestLoaded: !_.isEmpty(ingest),
-  ingestId: _.prop("ingest_id")(ingest)
+  ingestId: _.prop("ingest_id")(ingest),
 });
 
 export default connect(mapStateToProps)(IngestRelationsRoutes);

package/src/ingests/relations/components/IngestToDataStructureRelations.js

@@ -1,12 +1,12 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Segment } from "semantic-ui-react";
 import { getIngestLinks } from "../selectors";
 import IngestLinksActions from "./IngestLinksActions";
 
-const LinksPane = React.lazy(() => import("@truedat/lm/components/LinksPane"));
+const LinksPane = lazy(() => import("@truedat/lm/components/LinksPane"));
 
 export const IngestStructureLinksPane = ({ groups }) => (
   <Segment attached="bottom">

package/src/ingests/relations/components/IngestToIngestForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy, Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Divider } from "semantic-ui-react";
@@ -13,11 +13,11 @@ import { makeTagOptionsSelector } from "@truedat/core/selectors";
 import { linkTo } from "@truedat/core/routes";
 import IngestsSelector from "../../components/IngestsSelector";
 
-const TagTypeSelector = React.lazy(() =>
-  import("@truedat/lm/components/TagTypeSelector")
+const TagTypeSelector = lazy(
+  () => import("@truedat/lm/components/TagTypeSelector")
 );
 
-export class IngestToIngestForm extends React.Component {
+export class IngestToIngestForm extends Component {
   state = {
     selectedIngest: null,
   };

package/src/ingests/relations/components/IngestToIngestRelations.js

@@ -1,12 +1,12 @@
-import React from "react";
+import { lazy } from "react";
 import { connect } from "react-redux";
 import { getIngestRelations } from "../selectors/getRelations";
 
-const Relations = React.lazy(() => import("@truedat/lm/components/Relations"));
+const Relations = lazy(() => import("@truedat/lm/components/Relations"));
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   relations: getIngestRelations(state),
-  relationsLoading: state.relationsLoading
+  relationsLoading: state.relationsLoading,
 });
 
 export default connect(mapStateToProps)(Relations);

package/src/ingests/relations/components/IngestToStructureForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy, Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Divider } from "semantic-ui-react";
@@ -12,14 +12,14 @@ import {
 } from "@truedat/core/routines";
 import { makeTagOptionsSelector } from "@truedat/core/selectors";
 
-const StructureSelector = React.lazy(() =>
-  import("@truedat/dd/components/StructureSelector")
+const StructureSelector = lazy(
+  () => import("@truedat/dd/components/StructureSelector")
 );
-const TagTypeSelector = React.lazy(() =>
-  import("@truedat/lm/components/TagTypeSelector")
+const TagTypeSelector = lazy(
+  () => import("@truedat/lm/components/TagTypeSelector")
 );
 
-export class IngestToStructureForm extends React.Component {
+export class IngestToStructureForm extends Component {
   state = { selectedStructure: null };
   handleStructureSelected = (selectedStructure) =>
     this.setState({ selectedStructure });

package/src/ingests/relations/components/__tests__/IngestRelationsRoutes.spec.js

@@ -1,10 +1,86 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render, waitForLoad } from "@truedat/test/render";
 import { IngestRelationsRoutes } from "../IngestRelationsRoutes";
+import {
+  INGEST_RELATIONS_INGESTS,
+  INGEST_RELATIONS_INGESTS_NEW,
+  INGEST_RELATIONS_STRUCTURES,
+  INGEST_RELATIONS_STRUCTURES_NEW,
+} from "@truedat/core/routes";
+
+// Mock all child components
+jest.mock("../../../components/IngestsLoader", () => () => (
+  <div>IngestsLoader</div>
+));
+jest.mock("../../../components/IngestFiltersLoader", () => () => (
+  <div>IngestFiltersLoader</div>
+));
+jest.mock("../IngestToIngestRelations", () => () => (
+  <div>IngestToIngestRelations</div>
+));
+jest.mock("../IngestToDataStructureRelations", () => () => (
+  <div>IngestToDataStructureRelations</div>
+));
+jest.mock("../IngestToStructureForm", () => () => (
+  <div>IngestToStructureForm</div>
+));
+jest.mock("../IngestToIngestForm", () => () => <div>IngestToIngestForm</div>);
+jest.mock("@truedat/lm/components/RelationsLoader", () => () => (
+  <div>RelationsLoader</div>
+));
+jest.mock("@truedat/dd/components/StructureTypesLoader", () => () => (
+  <div>StructureTypesLoader</div>
+));
 
 describe("<IngestRelationsRoutes />", () => {
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<IngestRelationsRoutes />);
-    expect(wrapper).toMatchSnapshot();
+  const props = {
+    ingestId: 123,
+    ingestLoaded: true,
+  };
+
+  it("renders correctly with default route", async () => {
+    const rendered = render(<IngestRelationsRoutes {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with structures route", async () => {
+    const rendered = render(<IngestRelationsRoutes {...props} />, {
+      routes: [INGEST_RELATIONS_STRUCTURES.replace(":id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with structures/new route", async () => {
+    const rendered = render(<IngestRelationsRoutes {...props} />, {
+      routes: [INGEST_RELATIONS_STRUCTURES_NEW.replace(":id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with ingests route", async () => {
+    const rendered = render(<IngestRelationsRoutes {...props} />, {
+      routes: [INGEST_RELATIONS_INGESTS.replace(":id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with ingests/new route", async () => {
+    const rendered = render(<IngestRelationsRoutes {...props} />, {
+      routes: [INGEST_RELATIONS_INGESTS_NEW.replace(":id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders nothing when ingest is not loaded", async () => {
+    const rendered = render(
+      <IngestRelationsRoutes ingestId={123} ingestLoaded={false} />
+    );
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/ingests/relations/components/__tests__/IngestToIngestForm.spec.js

@@ -1,37 +1,36 @@
-import React from "react";
-import { shallow } from "enzyme";
+import { render, waitForLoad } from "@truedat/test/render";
 import { IngestToIngestForm } from "../IngestToIngestForm";
 
 describe("<IngestToIngestForm />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const tagOptions = [];
     const ingest = {};
-    const props = { tagOptions, ingest };
-    const wrapper = shallow(<IngestToIngestForm {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const props = {
+      tagOptions,
+      ingest,
+      clearSelectedRelationTags: jest.fn(),
+      createRelation: jest.fn(),
+      selectedRelationTags: [],
+    };
+    const rendered = render(<IngestToIngestForm {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("render TagTypeSelector when tagOptions is not empty", () => {
+  it("renders TagTypeSelector when tagOptions is not empty", async () => {
     const tagOptions = [{ text: "some text", value: "some value" }];
     const ingest = {};
     const selectedRelationTags = [];
-    const props = { tagOptions, ingest, selectedRelationTags };
-    const wrapper = shallow(<IngestToIngestForm {...props} />);
-    expect(wrapper.findWhere(n => n.prop("selectedRelationTags")).length).toBe(
-      1
-    );
-  });
-
-  it("render TagTypeSelector when tagOptions is not empty", () => {
-    const tagOptions = [{ text: "some text", value: "some value" }];
-    const ingest = { name: "Ingest name", ingest_id: "2", id: 2, version: 3 };
-    const selectedIngest = { type: "ingest type", name: "my ingest" };
-    const selectedRelationTags = [];
-    const createRelation = jest.fn();
-    const props = { createRelation, tagOptions, ingest, selectedRelationTags };
-    const wrapper = shallow(<IngestToIngestForm {...props} />);
-    wrapper.setState({ selectedIngest });
-    wrapper.find({ primary: true }).simulate("click");
-    expect(createRelation.mock.calls.length).toEqual(1);
+    const props = {
+      tagOptions,
+      ingest,
+      selectedRelationTags,
+      clearSelectedRelationTags: jest.fn(),
+      createRelation: jest.fn(),
+      selectedRelationTags: [],
+    };
+    const rendered = render(<IngestToIngestForm {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.getByText("relations.relationType")).toBeInTheDocument();
   });
 });