@truedat/ie 7.5.9 → 7.5.10

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

@@ -1,35 +1,54 @@
-import React from "react";
-import { shallow } from "enzyme";
+import { render, waitForLoad } from "@truedat/test/render";
 import { IngestToStructureForm } from "../IngestToStructureForm";
 
+// Mock StructureSelector component
+jest.mock("@truedat/dd/components/StructureSelector", () => {
+  const StructureSelector = ({ onSelect }) => (
+    <div data-testid="structure-selector">
+      <button
+        onClick={() =>
+          onSelect({ id: "123", name: "Test Structure", type: "table" })
+        }
+      >
+        Select Structure
+      </button>
+    </div>
+  );
+  return {
+    __esModule: true,
+    default: StructureSelector,
+  };
+});
+
 describe("<IngestToStructureForm />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const tagOptions = [];
     const ingest = {};
-    const props = { tagOptions, ingest };
-    const wrapper = shallow(<IngestToStructureForm {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const props = {
+      tagOptions,
+      ingest,
+      clearSelectedRelationTags: jest.fn(),
+      createRelation: jest.fn(),
+      selectedRelationTags: [],
+    };
+    const rendered = render(<IngestToStructureForm {...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(<IngestToStructureForm {...props} />);
-    expect(wrapper.findWhere(n => n.prop("options"))).toHaveLength(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 selectedStructure = { type: "str type", name: "my structure" };
-    const selectedRelationTags = [];
-    const createRelation = jest.fn();
-    const props = { createRelation, tagOptions, ingest, selectedRelationTags };
-    const wrapper = shallow(<IngestToStructureForm {...props} />);
-    wrapper.setState({ selectedStructure });
-    wrapper.find({ primary: true }).simulate("click");
-    expect(createRelation.mock.calls.length).toEqual(1);
+    const props = {
+      tagOptions,
+      ingest,
+      selectedRelationTags,
+      clearSelectedRelationTags: jest.fn(),
+      createRelation: jest.fn(),
+    };
+    const rendered = render(<IngestToStructureForm {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.getByText(/relations.relationType/i)).toBeInTheDocument();
   });
 });

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

@@ -1,26 +1,52 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<IngestRelationsRoutes /> matches the latest snapshot 1`] = `
-<Switch>
-  <Route
-    exact={true}
-    path="/ingests/:id/relations/structures"
-    render={[Function]}
-  />
-  <Route
-    exact={true}
-    path="/ingests/:id/relations/ingests"
-    render={[Function]}
-  />
-  <Route
-    exact={true}
-    path="/ingests/:id/relations/structures/new"
-    render={[Function]}
-  />
-  <Route
-    exact={true}
-    path="/ingests/:id/relations/ingests/new"
-    render={[Function]}
-  />
-</Switch>
+exports[`<IngestRelationsRoutes /> renders correctly with default route 1`] = `<div />`;
+
+exports[`<IngestRelationsRoutes /> renders correctly with ingests route 1`] = `
+<div>
+  <div>
+    RelationsLoader
+  </div>
+  <div>
+    IngestToIngestRelations
+  </div>
+</div>
+`;
+
+exports[`<IngestRelationsRoutes /> renders correctly with ingests/new route 1`] = `
+<div>
+  <div>
+    IngestsLoader
+  </div>
+  <div>
+    IngestFiltersLoader
+  </div>
+  <div>
+    IngestToIngestForm
+  </div>
+</div>
+`;
+
+exports[`<IngestRelationsRoutes /> renders correctly with structures route 1`] = `
+<div>
+  <div>
+    RelationsLoader
+  </div>
+  <div>
+    StructureTypesLoader
+  </div>
+  <div>
+    IngestToDataStructureRelations
+  </div>
+</div>
+`;
+
+exports[`<IngestRelationsRoutes /> renders correctly with structures/new route 1`] = `
+<div>
+  <div>
+    IngestToStructureForm
+  </div>
+</div>
 `;
+
+exports[`<IngestRelationsRoutes /> renders nothing when ingest is not loaded 1`] = `<div />`;

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

@@ -1,33 +1,91 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<IngestToIngestForm /> matches the latest snapshot 1`] = `
-<Fragment>
-  <Divider
-    hidden={true}
+<div>
+  <div
+    class="ui hidden divider"
   />
-  <Connect(IngestsSelector)
-    handleIngestSelected={[Function]}
-    selectedIngest={null}
-  />
-  <ButtonGroup>
-    <Button
-      as="button"
-      content={
-        <Memo(MemoizedFormattedMessage)
-          id="actions.create"
-        />
-      }
-      disabled={true}
-      onClick={[Function]}
-      primary={true}
-    />
-    <HistoryBackButton
-      content={
-        <Memo(MemoizedFormattedMessage)
-          id="actions.cancel"
+  <label>
+    ingestRelations.relatedDataIngest
+  </label>
+  <div
+    class="ui segment"
+  >
+    <div
+      class="ui action left icon input"
+    >
+      <input
+        placeholder="ingests.search.placeholder"
+        type="text"
+      />
+      <i
+        aria-hidden="true"
+        class="search link icon"
+      />
+      <div
+        aria-expanded="false"
+        class="ui button floating labeled scrolling dropdown icon"
+        role="listbox"
+        tabindex="0"
+      >
+        <div
+          aria-atomic="true"
+          aria-live="polite"
+          class="divider text"
+          role="alert"
+        >
+          Filters
+        </div>
+        <i
+          aria-hidden="true"
+          class="filter icon"
         />
-      }
-    />
-  </ButtonGroup>
-</Fragment>
+        <div
+          class="menu transition"
+        >
+          <div
+            class="item"
+            role="option"
+          >
+            <em>
+              (reset filters)
+            </em>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="ui message"
+    >
+      <div
+        class="content"
+      >
+        <div
+          class="header"
+        >
+          ingests.search.results.empty
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    class="ui buttons"
+  >
+    <button
+      class="ui primary disabled button"
+      disabled=""
+      tabindex="-1"
+    >
+      actions.create
+    </button>
+    <a
+      class="ui secondary button"
+      data-discover="true"
+      href="/"
+      role="button"
+    >
+      actions.cancel
+    </a>
+  </div>
+</div>
 `;

package/src/ingests/relations/components/__tests__/__snapshots__/IngestToStructureForm.spec.js.snap

@@ -1,40 +1,35 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<IngestToStructureForm /> matches the latest snapshot 1`] = `
-<Fragment>
-  <Divider
-    hidden={true}
+<div>
+  <div
+    class="ui hidden divider"
   />
-  <lazy
-    defaultFilters={
-      {
-        "class.raw": [
-          "",
-        ],
-      }
-    }
-    onSelect={[Function]}
-    selectedStructure={null}
-  />
-  <ButtonGroup>
-    <Button
-      as="button"
-      content={
-        <Memo(MemoizedFormattedMessage)
-          id="actions.create"
-        />
-      }
-      disabled={true}
-      onClick={[Function]}
-      primary={true}
-    />
-    <HistoryBackButton
-      content={
-        <Memo(MemoizedFormattedMessage)
-          id="actions.cancel"
-        />
-      }
-    />
-  </ButtonGroup>
-</Fragment>
+  <div
+    data-testid="structure-selector"
+  >
+    <button>
+      Select Structure
+    </button>
+  </div>
+  <div
+    class="ui buttons"
+  >
+    <button
+      class="ui primary disabled button"
+      disabled=""
+      tabindex="-1"
+    >
+      actions.create
+    </button>
+    <a
+      class="ui secondary button"
+      data-discover="true"
+      href="/"
+      role="button"
+    >
+      actions.cancel
+    </a>
+  </div>
+</div>
 `;

package/src/ingests/relations/selectors/__tests__/getIngestLinks.spec.js

@@ -13,7 +13,7 @@ const foo = {
   system: {
     external_id: "oracle",
     id: 11,
-    name: "oracle"
+    name: "oracle",
   },
   tags: [],
   updated_at: "2020-05-20 13:24:33Z",
@@ -21,14 +21,14 @@ const foo = {
     create_link: {
       href: "/api/ingest_versions/11/links",
       input: {},
-      method: "POST"
+      method: "POST",
     },
     delete: {
       href: "/api/ingest_versions/20/links/11",
       input: {},
-      method: "DELETE"
-    }
-  }
+      method: "DELETE",
+    },
+  },
 };
 
 const bar = {
@@ -43,7 +43,7 @@ const bar = {
   system: {
     external_id: "oracle",
     id: 11,
-    name: "oracle"
+    name: "oracle",
   },
   tags: [],
   type: "Column",
@@ -52,14 +52,14 @@ const bar = {
     create_link: {
       href: "/api/ingest_versions/12/links",
       input: {},
-      method: "POST"
+      method: "POST",
     },
     delete: {
       href: "/api/ingest_versions/20/links/12",
       input: {},
-      method: "DELETE"
-    }
-  }
+      method: "DELETE",
+    },
+  },
 };
 const baz = {
   ingest_version_id: 20,
@@ -73,7 +73,7 @@ const baz = {
   system: {
     external_id: "oracle",
     id: 11,
-    name: "oracle"
+    name: "oracle",
   },
   tags: ["ingest_to_field_master"],
   type: "Column",
@@ -82,28 +82,28 @@ const baz = {
     create_link: {
       href: "/api/ingest_versions/14/links",
       input: {},
-      method: "POST"
+      method: "POST",
     },
     delete: {
       href: "/api/ingest_versions/20/links/14",
       input: {},
-      method: "DELETE"
-    }
-  }
+      method: "DELETE",
+    },
+  },
 };
 const ingestLinks = [foo, bar, baz];
 const structuresColumns = [
   {
     name: "name",
     sort: {
-      name: "name.sort"
+      name: "name.sort",
     },
-    width: 2
+    width: 2,
   },
   {
     name: "type",
-    width: 1
-  }
+    width: 1,
+  },
 ];
 
 describe("selectors: getIngestLinks", () => {
@@ -114,7 +114,7 @@ describe("selectors: getIngestLinks", () => {
     expect(links).toEqual([
       ["ingest_to_field_master", [baz]],
       ["\uffee", [bar]],
-      ["deleted", [foo]]
+      ["deleted", [foo]],
     ]);
   });
   it("should return the keys of the ingest filters which are not currently active", () => {

package/src/ingests/relations/selectors/__tests__/getRelations.spec.js

@@ -8,13 +8,13 @@ describe("selectors: getRelations", () => {
         id: 1,
         ingest_id: 1,
         name: "Ingest",
-        version: 1
+        version: 1,
       },
       target: {
         id: 40,
         name: "Structure",
-        type: "Document"
-      }
+        type: "Document",
+      },
     },
     source_id: 1,
     source_type: "ingest",
@@ -26,10 +26,10 @@ describe("selectors: getRelations", () => {
         value: {
           label: "ingest.relatedTo.dataStructure",
           target_type: "data_structure",
-          type: "ingest_to_data_structure"
-        }
-      }
-    ]
+          type: "ingest_to_data_structure",
+        },
+      },
+    ],
   };
 
   const r2 = {
@@ -39,13 +39,13 @@ describe("selectors: getRelations", () => {
         id: 1,
         ingest_id: 1,
         name: "Ingest",
-        version: 1
+        version: 1,
       },
       target: {
         id: 41,
         name: "Structure",
-        type: "Document"
-      }
+        type: "Document",
+      },
     },
     source_id: 1,
     source_type: "ingest",
@@ -57,10 +57,10 @@ describe("selectors: getRelations", () => {
         value: {
           label: "ingest.relatedTo.ingest",
           target_type: "ingest",
-          type: "ingest_to_ingest"
-        }
-      }
-    ]
+          type: "ingest_to_ingest",
+        },
+      },
+    ],
   };
 
   const relations_structures = [r1];
@@ -71,11 +71,11 @@ describe("selectors: getRelations", () => {
   it("should return all the relations with data_structure target", () => {
     const res = getDataStructureRelations({
       relations: relations_structures,
-      ingest
+      ingest,
     });
     expect(res).toHaveLength(1);
     expect(res).toEqual([
-      { ...r1, relationPath: `/structures/${r1["target_id"]}` }
+      { ...r1, relationPath: `/structures/${r1["target_id"]}` },
     ]);
   });
 
@@ -83,7 +83,7 @@ describe("selectors: getRelations", () => {
     const res = getIngestRelations({ relations: relations_ingests, ingest });
     expect(res).toHaveLength(1);
     expect(res).toEqual([
-      { ...r2, relationPath: `/ingests/${r2["target_id"]}` }
+      { ...r2, relationPath: `/ingests/${r2["target_id"]}` },
     ]);
   });
 

package/src/ingests/relations/selectors/getIngestLinks.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Icon, Label } from "semantic-ui-react";
 import { createSelector } from "reselect";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";

package/src/ingests/relations/selectors/getRelations.js

@@ -13,16 +13,16 @@ export const getDataStructureRelations = createSelector(
     return _.flow(
       _.sortBy([
         _.negate(_.propEq("source_id", ingest_id)),
-        _.pathOr("", "tags[0].value.type")
+        _.pathOr("", "tags[0].value.type"),
       ]),
-      _.map(relation => {
+      _.map((relation) => {
         const linkedId =
           relation.target_id == ingest_id
             ? relation.source_id
             : relation.target_id;
         return {
           ...relation,
-          relationPath: linkTo.STRUCTURE({ id: linkedId })
+          relationPath: linkTo.STRUCTURE({ id: linkedId }),
         };
       })
     )(relations);
@@ -36,14 +36,14 @@ export const getIngestRelations = createSelector(
     return _.flow(
       _.sortBy([
         _.negate(_.propEq("source_id", ingest_id)),
-        _.pathOr("", "tags[0].value.type")
+        _.pathOr("", "tags[0].value.type"),
       ]),
-      _.map(relation => {
+      _.map((relation) => {
         const { target, source } = relation.context;
         const linkedId = target.ingest_id == ingest_id ? source.id : target.id;
         return {
           ...relation,
-          relationPath: linkTo.INGEST({ id: linkedId })
+          relationPath: linkTo.INGEST({ id: linkedId }),
         };
       })
     )(relations);

package/src/ingests/sagas/fetchIngest.js

@@ -7,7 +7,7 @@ import { API_INGEST_VERSION } from "../api";
 export function* fetchIngestSaga({ payload }) {
   try {
     const { id } = payload;
-    const url = compile(API_INGEST_VERSION)({ id });
+    const url = compile(API_INGEST_VERSION)({ id: `${id}` });
     yield put(fetchIngest.request());
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchIngest.success(data));

package/src/ingests/sagas/fetchIngestArchive.js

@@ -7,7 +7,7 @@ import { API_INGEST_ARCHIVE } from "../api";
 export function* fetchIngestArchiveSaga({ payload }) {
   try {
     const { id } = payload;
-    const url = compile(API_INGEST_ARCHIVE)({ id });
+    const url = compile(API_INGEST_ARCHIVE)({ id: `${id}` });
     yield put(fetchIngestArchive.request());
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchIngestArchive.success(data));

package/src/ingests/sagas/fetchIngestExecutions.js

@@ -7,7 +7,7 @@ import { API_INGEST_EXECUTIONS } from "../api";
 export function* fetchIngestExecutionsSaga({ payload }) {
   try {
     const { id } = payload;
-    const url = compile(API_INGEST_EXECUTIONS)({ id });
+    const url = compile(API_INGEST_EXECUTIONS)({ id: `${id}` });
     yield put(fetchIngestExecutions.request());
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchIngestExecutions.success({ data }));

package/src/ingests/selectors/getIngestColumns.js

@@ -1,10 +1,9 @@
 import _ from "lodash/fp";
-import React from "react";
 import { FormattedMessage } from "react-intl";
 import { createSelector } from "reselect";
 import Moment from "react-moment";
 
-const dateDecorator = date =>
+const dateDecorator = (date) =>
   date && <Moment locale="es" date={date} format="YYYY-MM-DD HH:mm" />;
 
 export const defaultIngestColumns = [
@@ -12,39 +11,39 @@ export const defaultIngestColumns = [
   {
     name: "status",
     sort: { name: "status" },
-    fieldDecorator: field => translateDecorator(`ingests.status.${field}`),
-    width: 2
+    fieldDecorator: (field) => translateDecorator(`ingests.status.${field}`),
+    width: 2,
   },
   {
     name: "domain",
     fieldSelector: _.path("domain.name"),
-    sort: { name: "domain.name.sort" }
+    sort: { name: "domain.name.sort" },
   },
   {
     name: "last_change_at",
     sort: { name: "last_change_at" },
     fieldDecorator: dateDecorator,
     textAlign: "center",
-    width: 2
+    width: 2,
   },
   {
     name: "execution_status",
-    sort: { name: "execution_status.sort" }
+    sort: { name: "execution_status.sort" },
   },
   {
     name: "last_execution",
     sort: { name: "last_execution" },
     fieldDecorator: dateDecorator,
     textAlign: "center",
-    width: 2
-  }
+    width: 2,
+  },
 ];
 
-const translateDecorator = text => <FormattedMessage id={text} />;
-const getIngests = state => state.ingests;
-const getColumns = state => state.ingestsColumns;
+const translateDecorator = (text) => <FormattedMessage id={text} />;
+const getIngests = (state) => state.ingests;
+const getColumns = (state) => state.ingestsColumns;
 
-export const getIngestColumns = createSelector(getColumns, ingestsColumns =>
+export const getIngestColumns = createSelector(getColumns, (ingestsColumns) =>
   _.defaultTo(defaultIngestColumns)(ingestsColumns)
 );