@truedat/dd 7.5.7 → 7.5.10

package/src/sagas/__tests__/fetchGrantRequest.spec.js

@@ -30,11 +30,11 @@ describe("sagas: fetchGrantRequestRequestSaga", () => {
 
 describe("sagas: fetchGrantRequestSaga", () => {
   const data = {
-    data_structure_id: 1,
+    data_structure_id: "1",
     medatada: { foo: "bar " },
     filters: { bar: "baz" },
   };
-  const payload = { id: 1 };
+  const payload = { id: "1" };
   const url = compile(API_GRANT_REQUEST)(payload);
   it("should put a success action when a response is returned", () => {
     expect(() => {

package/src/sagas/__tests__/fetchNodes.spec.js

@@ -28,8 +28,8 @@ describe("sagas: fetchNodesRequestSaga", () => {
 });
 
 describe("sagas: fetchNodesSaga", () => {
-  const id = 1;
-  const domain_id = 1;
+  const id = "1";
+  const domain_id = "1";
   const data = [
     { parent: null, groups: [{ external_id: "foo", name: "foo" }] },
   ];

package/src/sagas/__tests__/fetchProfileExecution.spec.js

@@ -29,13 +29,13 @@ describe("sagas: fetchProfileExecutionRequestSaga", () => {
 });
 
 describe("sagas: fetchProfileExecutionSaga", () => {
-  const id = 1;
+  const id = "1";
   const url = compile(API_PROFILE_EXECUTION)({ id });
   const payload = { id };
   const data = {
-    id: 2,
+    id: "2",
     _embedded: {
-      data_structure: { id: 1, external_id: "foo" },
+      data_structure: { id: "1", external_id: "foo" },
       profile: { value: { foo: "bar" } }
     }
   };

package/src/sagas/__tests__/fetchProfileGroup.spec.js

@@ -29,17 +29,17 @@ describe("sagas: fetchProfileGroupRequestSaga", () => {
 });
 
 describe("sagas: fetchProfileGroupSaga", () => {
-  const id = 1;
+  const id = "1";
   const url = compile(API_PROFILE_GROUP)({ id });
   const payload = { id };
   const data = {
-    id: 1,
+    id: "1",
     _embedded: {
       executions: [
         {
           id: 2,
           _embedded: {
-            data_structure: { id: 1, external_id: "foo" },
+            data_structure: { id: "1", external_id: "foo" },
             profile: { value: { foo: "bar" } }
           }
         }

package/src/sagas/__tests__/fetchStructureNotes.spec.js

@@ -31,11 +31,11 @@ describe("sagas: fetchStructureNotesRequestSaga", () => {
 describe("sagas: fetchStructureNotesSaga", () => {
   const data = {
     structureNotes: [
-      { id: 1, data_structure_id: 1 },
-      { id: 2, data_structure_id: 1 }
+      { id: "1", data_structure_id: "1" },
+      { id: "2", data_structure_id: "1" }
     ]
   };
-  const payload = { data_structure_id: 1 };
+  const payload = { data_structure_id: "1" };
   const url = compile(API_STRUCTURE_NOTES)(payload);
 
   it("should put a success action when a response is returned", () => {

package/src/sagas/__tests__/fetchStructureType.spec.js

@@ -30,13 +30,13 @@ describe("sagas: fetchStructureTypeRequestSaga", () => {
 
 describe("sagas: fetchStructureTypeSaga", () => {
   it("should put a success action when a response is returned", () => {
-    const id = 1;
+    const id = "1";
     const url = compile(API_STRUCTURE_TYPE)({ id });
     const payload = { id };
     const data = {
       name: "doc",
-      template_id: 1,
-      id: 1,
+      template_id: "1",
+      id: "1",
       translation: null,
       metadata_views: [{ name: "foo", fields: [] }],
     };
@@ -59,7 +59,7 @@ describe("sagas: fetchStructureTypeSaga", () => {
   it("should put a failure action when the call returns an error", () => {
     const message = "Request failed";
     const error = { message };
-    const id = 1;
+    const id = "1";
     const url = compile(API_STRUCTURE_TYPE)({ id });
     const payload = { id };
 

package/src/sagas/__tests__/fetchSystem.spec.js

@@ -26,7 +26,7 @@ describe("sagas: fetchSystemRequestSaga", () => {
 });
 
 describe("sagas: fetchSystemSaga", () => {
-  const id = 1;
+  const id = "1";
   const data = { id, name: "system1", external_id: "ext_id" };
   const url = compile(API_SYSTEM)({ id });
   const payload = { id };

package/src/sagas/__tests__/fetchSystemStructures.spec.js

@@ -29,13 +29,13 @@ describe("sagas: fetchSystemStructuresRequestSaga", () => {
 });
 
 describe("sagas: fetchSystemStructuresSaga", () => {
-  const id = 1;
+  const id = "1";
   const url = compile(API_SYSTEM_STRUCTURES)({ id });
   const payload = { id };
   const data = {
     collection: [
-      { id: 1, name: "Structure 1", description: "desc1" },
-      { id: 2, name: "Structure 2", description: "desc2" }
+      { id: "1", name: "Structure 1", description: "desc1" },
+      { id: "2", name: "Structure 2", description: "desc2" }
     ]
   };
   const headers = {

package/src/sagas/__tests__/updateStructure.spec.js

@@ -29,7 +29,7 @@ describe("sagas: updateStructureRequestSaga", () => {
 });
 
 describe("sagas: updateStructureSaga", () => {
-  const id = 1;
+  const id = "1";
   const description = "A new description";
   const lopd = "2";
   const url = compile(API_DATA_STRUCTURE)({ id });

package/src/sagas/__tests__/updateStructureType.spec.js

@@ -29,7 +29,7 @@ describe("sagas: updateStructureTypeRequestSaga", () => {
 });
 
 describe("sagas: updateStructureTypeSaga", () => {
-  const id = 1;
+  const id = "1";
   const url = compile(API_STRUCTURE_TYPE)({ id });
   const structureType = { id, translation: "b" };
   const payload = structureType;

package/src/sagas/createGrantRequestApproval.js

@@ -7,7 +7,9 @@ import { API_GRANT_REQUEST_APPROVALS } from "../api";
 export function* createGrantRequestApprovalSaga({ payload }) {
   try {
     const { grantRequestId, approval } = payload;
-    const url = compile(API_GRANT_REQUEST_APPROVALS)({ id: grantRequestId });
+    const url = compile(API_GRANT_REQUEST_APPROVALS)({
+      id: `${grantRequestId}`,
+    });
     yield put(createGrantRequestApproval.request({ approval }));
     const { data } = yield call(apiJsonPost, url, { approval }, JSON_OPTS);
     yield put(createGrantRequestApproval.success(data));

package/src/sagas/createGrantRequestStatus.js

@@ -17,7 +17,9 @@ export function* createGrantRequestStatusSaga({ payload }) {
       structureId,
       previousStructureQuery,
     } = payload;
-    const url = compile(API_GRANT_REQUEST_STATUS)({ id: grantRequest.id });
+    const url = compile(API_GRANT_REQUEST_STATUS)({
+      id: `${grantRequest.id}`,
+    });
     yield put(createGrantRequestStatus.request({ status }));
     const { data } = yield call(apiJsonPost, url, { status }, JSON_OPTS);
 

package/src/sagas/createSystem.js

@@ -1,7 +1,7 @@
 import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { createSystem } from "../routines";
-import { API_SYSTEMS } from "../api";
+import { API_SYSTEMS } from "@truedat/core/api";
 
 export function* createSystemSaga({ payload }) {
   try {

package/src/sagas/deleteStructure.js

@@ -9,7 +9,7 @@ const toApiPath = compile(API_DATA_STRUCTURE);
 export function* deleteStructureSaga({ payload }) {
   try {
     const { id } = payload;
-    const url = toApiPath({ id }) + `?logical=true`;
+    const url = toApiPath({ id: `${id}` }) + `?logical=true`;
     yield put(deleteStructure.request());
     yield call(apiJsonDelete, url, JSON_OPTS);
     yield put(deleteStructure.success({ id }));

package/src/sagas/downloadReferenceDataset.js

@@ -19,7 +19,7 @@ export function saveFile(name, data) {
 
 export function* downloadReferenceDatasetSaga({ payload: { id, name } = {} }) {
   try {
-    const url = compile(API_REFERENCE_DATA_DOWNLOAD)({ id });
+    const url = compile(API_REFERENCE_DATA_DOWNLOAD)({ id: `${id}` });
     yield put(downloadReferenceDataset.request(id));
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield call(saveFile, name, data);

package/src/sagas/fetchNodes.js

@@ -11,7 +11,7 @@ export function* fetchNodesSaga({ payload }) {
     const { id, domain_id } = payload;
     yield put(fetchNodes.request(payload));
     const url =
-      (id ? toApiPath({ id }) : API_NODES) +
+      (id ? toApiPath({ id: `${id}` }) : API_NODES) +
       (domain_id ? `?domain_id=${domain_id}` : "");
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchNodes.success(data));

package/src/sagas/fetchProfileExecution.js

@@ -9,7 +9,7 @@ const toApiPath = compile(API_PROFILE_EXECUTION);
 export function* fetchProfileExecutionSaga({ payload }) {
   try {
     const { id } = payload;
-    const url = toApiPath({ id });
+    const url = toApiPath({ id: `${id}` });
     yield put(fetchProfileExecution.request());
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchProfileExecution.success(data));

package/src/sagas/fetchProfileGroup.js

@@ -9,7 +9,7 @@ const toApiPath = compile(API_PROFILE_GROUP);
 export function* fetchProfileGroupSaga({ payload }) {
   try {
     const { id } = payload;
-    const url = toApiPath({ id });
+    const url = toApiPath({ id: `${id}` });
     yield put(fetchProfileGroup.request());
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchProfileGroup.success(data));

package/src/sagas/fetchStructureType.js

@@ -9,7 +9,7 @@ const structureTypePath = compile(API_STRUCTURE_TYPE);
 export function* fetchStructureTypeSaga({ payload }) {
   try {
     yield put(fetchStructureType.request());
-    const url = structureTypePath(payload);
+    const url = structureTypePath({ id: `${payload.id}` });
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchStructureType.success(data));
   } catch (error) {

package/src/sagas/fetchSystemStructures.js

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

package/src/sagas/index.js

@@ -39,7 +39,6 @@ import { fetchStructuresRequestSaga } from "./fetchStructures";
 import { fetchStructuresUploadEventsRequestSaga } from "./fetchStructuresUploadEvents";
 import { fetchSystemRequestSaga } from "./fetchSystem";
 import { fetchSystemStructuresRequestSaga } from "./fetchSystemStructures";
-import { fetchSystemsRequestSaga } from "./fetchSystems";
 import { fetchUserSearchFiltersRequestSaga } from "./fetchUserSearchFilters";
 import { linkStructureToStructureRequestSaga } from "./linkStructureToStructure";
 import { tagStructureRequestSaga } from "./tagStructure";
@@ -97,7 +96,6 @@ export {
   fetchStructuresUploadEventsRequestSaga,
   fetchSystemRequestSaga,
   fetchSystemStructuresRequestSaga,
-  fetchSystemsRequestSaga,
   fetchUserSearchFiltersRequestSaga,
   linkStructureToStructureRequestSaga,
   tagStructureRequestSaga,
@@ -156,7 +154,6 @@ export default [
   fetchStructuresUploadEventsRequestSaga(),
   fetchSystemRequestSaga(),
   fetchSystemStructuresRequestSaga(),
-  fetchSystemsRequestSaga(),
   fetchUserSearchFiltersRequestSaga(),
   linkStructureToStructureRequestSaga(),
   tagStructureRequestSaga(),

package/src/sagas/requestGrantRemoval.js

@@ -12,7 +12,7 @@ export function* requestGrantRemovalSaga({ payload }) {
   try {
     const { id, action, data_structure_id, version, previousStructureQuery } =
       payload;
-    const url = compile(API_GRANT)({ id });
+    const url = compile(API_GRANT)({ id: `${id}` });
     const requestData = { action };
     yield put(requestGrantRemoval.request());
     const { data } = yield call(apiJsonPatch, url, requestData, JSON_OPTS);

package/src/sagas/updateStructureType.js

@@ -9,7 +9,7 @@ const structureTypePath = compile(API_STRUCTURE_TYPE);
 export function* updateStructureTypeSaga({ payload }) {
   try {
     const structureType = payload;
-    const url = structureTypePath(structureType);
+    const url = structureTypePath({ id: `${structureType.id}` });
     const requestData = { data_structure_type: structureType };
     yield put(updateStructureType.request(structureType));
     const { data } = yield call(apiJsonPatch, url, requestData, JSON_OPTS);

package/src/sagas/updateSystem.js

@@ -8,7 +8,7 @@ export function* updateSystemSaga({ payload }) {
   try {
     const { system } = payload;
     const requestData = { system };
-    const url = compile(API_SYSTEM)(system);
+    const url = compile(API_SYSTEM)({ id: `${system.id}` });
     yield put(updateSystem.request(system));
     const { data } = yield call(apiJsonPatch, url, requestData, JSON_OPTS);
     yield put(updateSystem.success(data));

package/src/selectors/__tests__/__snapshots__/getGrantsColumns.spec.js.snap

@@ -11,7 +11,7 @@ exports[`EndDateDecorator matches the latest snapshot 1`] = `
       <time
         datetime="1589727661000"
       >
-        2 years ago
+        5 years ago
       </time>
     </div>
   </div>
@@ -35,6 +35,7 @@ exports[`GrantStructureDecorator matches the latest snapshot when structure is d
 exports[`GrantStructureDecorator matches the latest snapshot when structure is not direct 1`] = `
 <div>
   <a
+    data-discover="true"
     href="/structures/2"
   >
     bar › foo
@@ -45,6 +46,7 @@ exports[`GrantStructureDecorator matches the latest snapshot when structure is n
 exports[`GrantTableStructureDecorator matches the latest snapshot when structure is direct 1`] = `
 <div>
   <a
+    data-discover="true"
     href="/structures/1"
   >
     foo
@@ -85,7 +87,7 @@ exports[`StartDateDecorator matches the latest snapshot 1`] = `
       <time
         datetime="1589727661000"
       >
-        2 years ago
+        5 years ago
       </time>
     </div>
   </div>

package/src/selectors/__tests__/getGrantsColumns.spec.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { render } from "@truedat/test/render";
 import {
   defaultGrantsColumns,
@@ -13,10 +12,6 @@ import {
   EndDateDecorator,
 } from "..";
 
-jest
-  .spyOn(global.Date, "now")
-  .mockImplementation(() => new Date("2022-05-17T15:01:01.000Z").valueOf());
-
 const structure = {
   id: 1,
   name: "foo",

package/src/selectors/getBusinessConceptsLinksToStructuresColumnsSelector.js

@@ -1,6 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";

package/src/selectors/getGrantRequestsColumns.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import { Header, Icon, Popup } from "semantic-ui-react";
 import { createSelector } from "reselect";
 import { linkTo } from "@truedat/core/routes";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
@@ -12,7 +11,8 @@ export const UserDecorator = ({ user }) =>
   user ? (
     <Header as="h4">
       <Header.Content>
-        {user.full_name} <Header.Subheader>{user.email}</Header.Subheader>
+        {user.full_name}
+        <Header.Subheader>{user.email}</Header.Subheader>
       </Header.Content>
     </Header>
   ) : null;

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import { Header, Icon, Popup } from "semantic-ui-react";
 import { createSelector } from "reselect";
 import { linkTo } from "@truedat/core/routes";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
@@ -36,8 +35,8 @@ export const StructureDecorator = (grantRequest) => {
   const data_structure_version = grantRequest?.data_structure_version?.name
     ? grantRequest?.data_structure_version
     : grantRequest?.grant?.data_structure_version?.name
-    ? grantRequest?.grant?.data_structure_version
-    : null;
+      ? grantRequest?.grant?.data_structure_version
+      : null;
 
   return (
     <>

package/src/selectors/getGrantsColumns.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import { Header, Label, Popup } from "semantic-ui-react";
 import { createSelector } from "reselect";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
 import Moment from "react-moment";
@@ -191,8 +190,8 @@ export const getGrantsColumns = createSelector(
         return c.name === "data_structure"
           ? { ...c, fieldDecorator: c.fieldDecorator(structure) }
           : c.name === "user"
-          ? { ...c, fieldDecorator: c.fieldDecorator(authentication) }
-          : c;
+            ? { ...c, fieldDecorator: c.fieldDecorator(authentication) }
+            : c;
       })
     )(grantsColumns)
 );

package/src/selectors/getLineageEventColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";
 

package/src/selectors/getLineageLevels.js

@@ -3,9 +3,9 @@ import { createSelector } from "reselect";
 
 export const lineageLevels = createSelector(
   _.prop("lineageLevels"),
-  lineageLevels => lineageLevels
+  (lineageLevels) => lineageLevels
 );
 
-export const levelsSelection = createSelector(lineageLevels, lineageLevels =>
+export const levelsSelection = createSelector(lineageLevels, (lineageLevels) =>
   _.negate(_.isNil)(lineageLevels) ? "select" : "all"
 );

package/src/selectors/getLinkedImplementationsToStructuresColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import DateTime from "@truedat/core/components/DateTime";

package/src/selectors/getStructureDeletedAt.js

@@ -5,6 +5,6 @@ export const getStructureDeletedAt = createSelector(
   _.propOr([], "structureVersions"),
   _.flow(
     _.map("deleted_at"),
-    _.maxBy(d => (_.isEmpty(d) ? "9999" : d))
+    _.maxBy((d) => (_.isEmpty(d) ? "9999" : d))
   )
 );

package/src/selectors/getStructureFieldColumns.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import { Icon, List } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { createSelector } from "reselect";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";
 

package/src/selectors/getStructureFieldOptionValue.js

@@ -4,5 +4,5 @@ export const getStructureFieldOptionValue = (structure) =>
   _.isNil(_.prop("parent_index")(structure))
     ? _.prop("id")(structure)
     : structure?.type === "reference_dataset_field"
-    ? `${_.prop("name")(structure)}/${_.prop("parent_index")(structure)}`
-    : `${_.prop("id")(structure)}/${_.prop("parent_index")(structure)}`;
+      ? `${_.prop("name")(structure)}/${_.prop("parent_index")(structure)}`
+      : `${_.prop("id")(structure)}/${_.prop("parent_index")(structure)}`;

package/src/selectors/getStructureLinks.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import { createSelector } from "reselect";
 
-const getStructureLinks = state => state.structureLinks;
+const getStructureLinks = (state) => state.structureLinks;
 
 export const getStructureToConceptLinks = createSelector(
   getStructureLinks,

package/src/selectors/getStructureParent.js

@@ -25,7 +25,7 @@ export const getStructureParent = createSelector(
       ? !_.isEmpty(structure) && navFilter?.view === "BUCKET_VIEW"
         ? { type: "bucket" }
         : _.has("system")(structure)
-        ? rootNavItem(structure)
-        : {}
+          ? rootNavItem(structure)
+          : {}
       : structureNavItem(structureParents)
 );

package/src/selectors/getStructureProperties.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import { Label } from "semantic-ui-react";

package/src/selectors/getStructureRelations.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import { FormattedMessage } from "react-intl";
 import { createSelector } from "reselect";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 
 const translateDecoratorWithDefault = (text, default_text) => (

package/src/selectors/getStructuresUploadEventColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";

package/src/selectors/structureColumnsSelector.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import Moment from "react-moment";
 
 const StructureLink = (structure) =>
@@ -87,8 +86,9 @@ const rawName = {
   sort: { name: "name.sort" },
   width: 2,
 };
-export const defaultColumnsForStructureSelector = (state) =>
-  createSelector(
-    (state) => structureColumnsSelector(state, null, null),
-    _.map((item) => (item?.name === "name" ? rawName : item))
-  )(state);
+export const defaultColumnsForStructureSelector = createSelector(
+  (state) => structureColumnsSelector(state, null, null),
+  (columns) => {
+    return _.map((item) => (item?.name === "name" ? rawName : item))(columns);
+  }
+);

package/src/selectors/structureNotesColumnsSelector.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { createSelector } from "reselect";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { FormattedMessage } from "react-intl";