@truedat/dd 5.3.0 → 5.3.1

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

@@ -1,22 +1,27 @@
 import React from "react";
 import { render } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
-import { useParams } from "react-router-dom";
+import userEvent from "@testing-library/user-event";
 import { STRUCTURE_STRUCTURE_LINKS_QUERY } from "../../api/queries";
+import { deleteStructureStructureLink } from "../../routines";
 import StructureStructureLinks from "../StructureStructureLinks";
 
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
-  useParams: jest.fn(),
+  useParams: () => ({ id: 60217 }),
 }));
 
 const dataStructureWithLinks = {
   currentVersion: {
     id: "212416",
-    name: "CMESANO",
+    name: "STRUCTURE_1",
   },
   dataStructureLinks: [
     {
+      _actions: {
+        delete_struct_to_struct_link: true,
+      },
+      id: "1",
       labels: [
         {
           name: "copy",
@@ -24,54 +29,58 @@ const dataStructureWithLinks = {
       ],
       source: {
         currentVersion: {
-          name: "CMESANO",
+          name: "STRUCTURE_1",
           pathWithIds: [
             {
               data_structure_id: "114207",
-              name: "SRV_DS2P.PRO.SANTALUCIA.ES",
+              name: "UNO",
             },
             {
               data_structure_id: "58050",
-              name: "SIISDS2",
+              name: "DOS",
             },
             {
               data_structure_id: "58045",
-              name: "INPAHEM_SINIEPAGO",
+              name: "TRES",
             },
           ],
         },
         id: "60217",
         system: {
           id: "2",
-          name: "Oracle producción solvencia",
+          name: "SYSTEM_1",
         },
       },
       target: {
         currentVersion: {
-          name: "NIDSINIE",
+          name: "STRUCTURE_2",
           pathWithIds: [
             {
               data_structure_id: "114207",
-              name: "SRV_DS2P.PRO.SANTALUCIA.ES",
+              name: "UNO",
             },
             {
               data_structure_id: "58050",
-              name: "SIISDS2",
+              name: "DOS",
             },
             {
               data_structure_id: "58045",
-              name: "INPAHEM_SINIEPAGO",
+              name: "TRES",
             },
           ],
         },
         id: "60218",
         system: {
           id: "2",
-          name: "Oracle producción solvencia",
+          name: "SYSTEM_1",
         },
       },
     },
     {
+      _actions: {
+        delete_struct_to_struct_link: true,
+      },
+      id: "2",
       labels: [
         {
           name: "label_1_1",
@@ -82,46 +91,46 @@ const dataStructureWithLinks = {
       ],
       source: {
         currentVersion: {
-          name: "ivalindm",
+          name: "STRUCTURE_3",
           pathWithIds: [
             {
               data_structure_id: "147587",
-              name: "bdrs",
+              name: "UNO",
             },
             {
               data_structure_id: "151648",
-              name: "inpahem_siniepago",
+              name: "DOS",
             },
           ],
         },
         id: "151674",
         system: {
           id: "11",
-          name: "Azure Databricks",
+          name: "SYSTEM_2",
         },
       },
       target: {
         currentVersion: {
-          name: "CMESANO",
+          name: "STRUCTURE_1",
           pathWithIds: [
             {
               data_structure_id: "114207",
-              name: "SRV_DS2P.PRO.SANTALUCIA.ES",
+              name: "UNO",
             },
             {
               data_structure_id: "58050",
-              name: "SIISDS2",
+              name: "DOS",
             },
             {
               data_structure_id: "58045",
-              name: "INPAHEM_SINIEPAGO",
+              name: "TRES",
             },
           ],
         },
         id: "60217",
         system: {
           id: "2",
-          name: "Oracle producción solvencia",
+          name: "SYSTEM_1",
         },
       },
     },
@@ -138,24 +147,89 @@ const linksMock = {
 };
 
 describe("<StructureStructureLinks />", () => {
-  const props = { dataStructureWithLinks };
+  const props = {
+    dataStructureWithLinks,
+  };
+
+  const structureActions = {
+    create_struct_to_struct_link: {
+      href: "/some/url",
+      method: "POST",
+    },
+  };
+
+  const renderOpts = {
+    routes: ["/structures/60217/structureLinks"],
+    mocks: [linksMock],
+  };
+
+  it("shows structure to structure links", async () => {
+    const { getByRole } = render(<StructureStructureLinks {...props} />, {
+      ...renderOpts,
+      state: { structureActions },
+    });
+    await waitFor(() => {
+      expect(getByRole("link", { name: /STRUCTURE_2/i })).toBeInTheDocument();
+      expect(getByRole("link", { name: /STRUCTURE_3/i })).toBeInTheDocument();
+    });
+    await waitFor(() => {
+      expect(getByRole("button", { name: /Add link/i })).toBeInTheDocument();
+    });
+    expect(
+      document.getElementById("delete-link-60217-60218")
+    ).toBeInTheDocument();
+    expect(
+      document.getElementById("delete-link-151674-60217")
+    ).toBeInTheDocument();
+  });
 
-  it("matches the latest snapshot", async () => {
-    const renderOpts = {
-      routes: ["/structures/60217/structureLinks"],
-      mocks: [linksMock],
-    };
-    useParams.mockImplementation(() => ({
-      id: 60217,
-    }));
-    const { container, findByText, getByRole, queryByText, debug } = render(
+  it("hides the 'add link' and delete link buttons if there are no permissions", async () => {
+    const { getByRole, queryByRole } = render(
       <StructureStructureLinks {...props} />,
       renderOpts
     );
     await waitFor(() => {
-      expect(getByRole("link", { name: /NIDSINIE/i })).toBeInTheDocument();
-      expect(getByRole("link", { name: /ivalindm/i })).toBeInTheDocument();
+      expect(getByRole("link", { name: /STRUCTURE_2/i })).toBeInTheDocument();
+      expect(getByRole("link", { name: /STRUCTURE_3/i })).toBeInTheDocument();
+    });
+    expect(
+      queryByRole("button", { name: /Add link/i })
+    ).not.toBeInTheDocument();
+    expect(document.getElementById("delete-link-60217-60218")).toBeNull();
+    expect(document.getElementById("delete-link-151674-60217")).toBeNull();
+  });
+
+  it("deletes link", async () => {
+    const dispatch = jest.fn();
+    const { getByText, getByRole } = render(
+      <StructureStructureLinks {...props} />,
+      {
+        ...renderOpts,
+        state: { structureActions },
+        dispatch,
+      }
+    );
+    await waitFor(() => {
+      expect(getByRole("link", { name: /STRUCTURE_2/i })).toBeInTheDocument();
+      expect(getByRole("link", { name: /STRUCTURE_3/i })).toBeInTheDocument();
+    });
+    await waitFor(() => {
+      expect(getByRole("button", { name: /Add link/i })).toBeInTheDocument();
+    });
+
+    const deleteButton = document.getElementById("delete-link-60217-60218");
+    userEvent.click(deleteButton);
+    expect(getByText("Delete link")).toBeInTheDocument();
+    const yesButton = getByRole("button", { name: /Yes/i });
+    userEvent.click(yesButton);
+
+    expect(dispatch).toHaveBeenCalledWith({
+      ...deleteStructureStructureLink(),
+      payload: {
+        dataStructureLinkId: "1",
+        sourceStructureId: "60217",
+        targetStructureId: "60218",
+      },
     });
-    expect(container).toMatchSnapshot();
   });
 });

package/src/messages/en.js

@@ -424,6 +424,8 @@ export default {
   "structureLink.currentStructure": "Current structure",
   "structureLink.label": "Relation label",
   "structureLink.relatedStructure": "Related structure",
+  "structureLink.selector.label": "Relation label",
+  "structureLink.selector.placeholder": "Select a relation label...",
   "structureSelector.union.criteria": "Union criteria",
   "structureSelector.union.type": "Union type",
   "structureTag.comment": "Comments",

package/src/messages/es.js

@@ -433,6 +433,9 @@ export default {
   "structureLink.currentStructure": "Estructura actual",
   "structureLink.label": "Etiqueta de relación",
   "structureLink.relatedStructure": "Estructura relacionada",
+  "structureLink.selector.label": "Etiqueta de relación",
+  "structureLink.selector.placeholder":
+    "Seleccione una etiqueta de relación...",
   "structureSelector.union.criteria": "Criterio de unión",
   "structureSelector.union.type": "Tipo de unión",
   "structureTag.comment": "Comentario",

package/src/reducers/structureRedirect.js

@@ -8,6 +8,7 @@ import {
   STRUCTURE_TAGS,
   STRUCTURE_TYPES,
   STRUCTURES,
+  STRUCTURE_STRUCTURE_LINKS,
   linkTo,
 } from "@truedat/core/routes";
 import {
@@ -24,6 +25,7 @@ import {
   deleteStructure,
   deleteTag,
   doStructureNoteAction,
+  linkStructureToStructure,
   updateGrantApprovalRule,
   updateReferenceDataset,
   updateStructure,
@@ -50,6 +52,10 @@ export const structureRedirect = (
       const id = _.path("data.id")(payload);
       return linkTo.SYSTEM_STRUCTURES({ id });
     }
+    case linkStructureToStructure.SUCCESS:
+      return linkTo.STRUCTURE_STRUCTURE_LINKS({
+        id: payload.sourceStructureId,
+      });
     case updateSystem.SUCCESS: {
       const id = _.path("data.id")(payload);
       return linkTo.SYSTEM_STRUCTURES({ id });

package/src/routines.js

@@ -51,6 +51,7 @@ export const deleteGrantApprovalRule = createRoutine("DELETE_GRANT_APPROVAL_RULE
 export const deleteReferenceDataset = createRoutine("DELETE_REFERENCE_DATASET");
 export const deleteStructureTag = createRoutine("DELETE_STRUCTURE_TAG");
 export const deleteStructure = createRoutine("DELETE_STRUCTURE");
+export const deleteStructureStructureLink = createRoutine("DELETE_STRUCTURE_STRUCTURE_LINK");
 export const deleteTag = createRoutine("DELETE_TAG");
 export const deleteUserSearchFilter = createRoutine("DELETE_USER_SEARCH_FILTER");
 export const doStructureNoteAction = createRoutine("DO_STRUCTURE_NOTE_ACTION");
@@ -86,7 +87,7 @@ export const fetchUserSearchFilters = createRoutine("FETCH_USER_SEARCH_FILTERS")
 export const filterStructures = createRoutine("FILTER_STRUCTURES");
 export const hoverNode = createRoutine("HOVER_NODE");
 export const initSvg = createRoutine("INIT_SVG");
-export const tagStructure = createRoutine("TAG_STRUCTURE");
+export const linkStructureToStructure = createRoutine("LINK_STRUCTURE_TO_STRUCTURE");
 export const loadLineageEvents = createRoutine("LOAD_LINEAGE_EVENTS");
 export const openGrantFilter = createRoutine("OPEN_GRANT_FILTER");
 export const openStructureFilter = createRoutine("OPEN_STRUCTURE_FILTER");
@@ -113,6 +114,7 @@ export const setGrantChangeRequestCart = createRoutine("SET_GRANT_CHANGE_REQUEST
 export const setGrantRequestsQuery = createRoutine("SET_GRANT_REQUESTS_QUERY");
 export const sortGrants = createRoutine("SORT_GRANTS");
 export const sortStructures = createRoutine("SORT_STRUCTURES");
+export const tagStructure = createRoutine("TAG_STRUCTURE");
 export const toggleGrantDateFilter = createRoutine("TOGGLE_GRANT_DATE_FILTER");
 export const toggleGrantFilterValue = createRoutine("TOGGLE_GRANT_FILTER_VALUE");
 export const toggleStructureDateFilter = createRoutine("TOGGLE_STRUCTURE_DATE_FILTER");

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

@@ -0,0 +1,101 @@
+import _ from "lodash/fp";
+import { compile } from "path-to-regexp";
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  deleteStructureStructureLinkSaga,
+  deleteStructureStructureLinkRequestSaga,
+} from "../deleteStructureStructureLink";
+import { deleteStructureStructureLink } from "../../routines";
+import { API_STRUCTURE_TO_STRUCTURE_LINK } from "../../api";
+
+describe("sagas: deleteStructureStructureRequestSaga", () => {
+  it("should invoke deleteStructureStructureSaga on deleteStructureStructureLink.TRIGGER", () => {
+    expect(() => {
+      testSaga(deleteStructureStructureLinkRequestSaga)
+        .next()
+        .takeLatest(
+          deleteStructureStructureLink.TRIGGER,
+          deleteStructureStructureLinkSaga
+        )
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(deleteStructureStructureLinkRequestSaga)
+        .next()
+        .takeLatest("FOO", deleteStructureStructureLinkSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: deleteStructureStructureLinkSaga", () => {
+  const sourceStructureId = 1;
+  const targetStructureId = 2;
+  const dataStructureLinkId = 1;
+  const receivedPayload = {
+    sourceStructureId,
+    targetStructureId,
+    dataStructureLinkId,
+  };
+
+  const deletePayload = {
+    sourceStructureId,
+    targetStructureId,
+  };
+
+  const url = compile(API_STRUCTURE_TO_STRUCTURE_LINK)({
+    sourceStructureId,
+    targetStructureId,
+  });
+
+  const client = {
+    cache: {
+      identify: jest.fn(),
+      evict: jest.fn(),
+      gc: jest.fn(),
+    },
+  };
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(deleteStructureStructureLinkSaga, { payload: receivedPayload })
+        .next()
+        .getContext("client")
+        .next(client)
+        .put(deleteStructureStructureLink.request(deletePayload))
+        .next(client)
+        .call(apiJsonDelete, url, JSON_OPTS)
+        .next({ data: deletePayload })
+        .put(deleteStructureStructureLink.success(deletePayload))
+        .next()
+        .put(deleteStructureStructureLink.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when a call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(deleteStructureStructureLinkSaga, { payload: receivedPayload })
+        .next()
+        .getContext("client")
+        .next(client)
+        .put(deleteStructureStructureLink.request(deletePayload))
+        .next(client)
+        .call(apiJsonDelete, url, JSON_OPTS)
+        .throw(error)
+        .put(deleteStructureStructureLink.failure(message))
+        .next()
+        .put(deleteStructureStructureLink.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/deleteStructureStructureLink.js

@@ -0,0 +1,45 @@
+import { compile } from "path-to-regexp";
+import { call, put, takeLatest, getContext } from "redux-saga/effects";
+import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
+import { API_STRUCTURE_TO_STRUCTURE_LINK } from "../api";
+import { deleteStructureStructureLink } from "../routines";
+
+export const evictDataStructureLink = (cache, dataStructureLinkId) => {
+  const cachedDataStructureLink = cache.identify({
+    __typename: "DataStructureLink",
+    id: dataStructureLinkId,
+  });
+  cache.evict(cachedDataStructureLink);
+  cache.gc();
+};
+
+export function* deleteStructureStructureLinkSaga({
+  payload: { sourceStructureId, targetStructureId, dataStructureLinkId },
+}) {
+  const client = yield getContext("client");
+  const cache = client.cache;
+  try {
+    const payload = { sourceStructureId, targetStructureId };
+    const url = compile(API_STRUCTURE_TO_STRUCTURE_LINK)(payload);
+    yield put(deleteStructureStructureLink.request(payload));
+    yield call(apiJsonDelete, url, JSON_OPTS);
+    evictDataStructureLink(cache, dataStructureLinkId);
+    yield put(deleteStructureStructureLink.success(payload));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(deleteStructureStructureLink.failure({ status, data }));
+    } else {
+      yield put(deleteStructureStructureLink.failure(error.message));
+    }
+  } finally {
+    yield put(deleteStructureStructureLink.fulfill());
+  }
+}
+
+export function* deleteStructureStructureLinkRequestSaga() {
+  yield takeLatest(
+    deleteStructureStructureLink.TRIGGER,
+    deleteStructureStructureLinkSaga
+  );
+}

package/src/sagas/index.js

@@ -12,6 +12,7 @@ import { deleteGrantApprovalRuleRequestSaga } from "./deleteGrantApprovalRule";
 import { deleteStructureTagRequestSaga } from "./deleteStructureTag";
 import { deleteReferenceDatasetRequestSaga } from "./deleteReferenceDataset";
 import { deleteStructureRequestSaga } from "./deleteStructure";
+import { deleteStructureStructureLinkRequestSaga } from "./deleteStructureStructureLink";
 import { deleteTagRequestSaga } from "./deleteTag";
 import { deleteUserSearchFilterRequestSaga } from "./deleteUserSearchFilter";
 import { doStructureNoteActionRequestSaga } from "./doStructureNoteAction";
@@ -41,6 +42,7 @@ import { fetchSystemRequestSaga } from "./fetchSystem";
 import { fetchSystemStructuresRequestSaga } from "./fetchSystemStructures";
 import { fetchSystemsRequestSaga } from "./fetchSystems";
 import { fetchUserSearchFiltersRequestSaga } from "./fetchUserSearchFilters";
+import { linkStructureToStructureRequestSaga } from "./linkStructureToStructure";
 import { tagStructureRequestSaga } from "./tagStructure";
 import { operateGrantRequestToCartRequestSaga } from "./operateGrantRequestCart";
 import { requestGrantRemovalRequestSaga } from "./requestGrantRemoval";
@@ -69,6 +71,7 @@ export {
   deleteStructureTagRequestSaga,
   deleteReferenceDatasetRequestSaga,
   deleteStructureRequestSaga,
+  deleteStructureStructureLinkRequestSaga,
   deleteTagRequestSaga,
   deleteUserSearchFilterRequestSaga,
   doStructureNoteActionRequestSaga,
@@ -98,6 +101,7 @@ export {
   fetchSystemStructuresRequestSaga,
   fetchSystemsRequestSaga,
   fetchUserSearchFiltersRequestSaga,
+  linkStructureToStructureRequestSaga,
   tagStructureRequestSaga,
   operateGrantRequestToCartRequestSaga,
   requestGrantRemovalRequestSaga,
@@ -127,6 +131,7 @@ export default [
   deleteStructureTagRequestSaga(),
   deleteReferenceDatasetRequestSaga(),
   deleteStructureRequestSaga(),
+  deleteStructureStructureLinkRequestSaga(),
   deleteTagRequestSaga(),
   deleteUserSearchFilterRequestSaga(),
   doStructureNoteActionRequestSaga(),
@@ -156,6 +161,7 @@ export default [
   fetchSystemStructuresRequestSaga(),
   fetchSystemsRequestSaga(),
   fetchUserSearchFiltersRequestSaga(),
+  linkStructureToStructureRequestSaga(),
   tagStructureRequestSaga(),
   operateGrantRequestToCartRequestSaga(),
   requestGrantRemovalRequestSaga(),

package/src/sagas/linkStructureToStructure.js

@@ -0,0 +1,46 @@
+import _ from "lodash/fp";
+import { call, put, takeLatest } from "redux-saga/effects";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { linkStructureToStructure } from "../routines";
+import { API_STRUCTURE_TO_STRUCTURE_LINKS } from "../api";
+
+export function* linkStructureToStructureSaga({ payload }) {
+  try {
+    const {
+      sourceStructureId: source_id,
+      targetStructureId: target_id,
+      labelIds: label_ids,
+    } = payload;
+
+    const payloadSnakeCase = {
+      source_id,
+      target_id,
+      label_ids,
+    };
+
+    yield put(linkStructureToStructure.request(payloadSnakeCase));
+    const { data } = yield call(
+      apiJsonPost,
+      API_STRUCTURE_TO_STRUCTURE_LINKS,
+      { data_structure_link: payloadSnakeCase },
+      JSON_OPTS
+    );
+    yield put(linkStructureToStructure.success({ ...data, ...payload }));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(linkStructureToStructure.failure({ status, data }));
+    } else {
+      yield put(linkStructureToStructure.failure(error.message));
+    }
+  } finally {
+    yield put(linkStructureToStructure.fulfill());
+  }
+}
+
+export function* linkStructureToStructureRequestSaga() {
+  yield takeLatest(
+    linkStructureToStructure.TRIGGER,
+    linkStructureToStructureSaga
+  );
+}

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

@@ -12,7 +12,7 @@ describe("selectors: getStructuresFields", () => {
           external_id: null,
           inserted_at: "2019-10-22T10:37:54Z",
           links: [],
-          name: "CMESANO",
+          name: "STRUCTURE_1",
           nullable: true,
           precision: "8.0",
           type: "num",
@@ -73,7 +73,7 @@ describe("selectors: getStructuresFields", () => {
         external_id: null,
         inserted_at: "2019-10-22T10:37:54Z",
         links: [],
-        name: "CMESANO",
+        name: "STRUCTURE_1",
         nullable: true,
         precision: "8.0",
         type: "num",

package/src/selectors/getActiveTab.js

@@ -8,7 +8,7 @@ import {
   STRUCTURE_NOTES_EDIT,
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
-  STRUCTURE_LINKED_STRUCTURES,
+  STRUCTURE_STRUCTURE_LINKS,
   STRUCTURE_RULES,
   STRUCTURE_LINKS,
   STRUCTURE_LINKS_NEW,
@@ -44,7 +44,7 @@ export const getActiveTab = (tabVisibility, path) => {
     [_.eq(STRUCTURE_METADATA), _.constant("metadata")],
     [_.eq(STRUCTURE_PARENTS), _.constant("parents")],
     [_.eq(STRUCTURE_PROFILE), _.constant("profile")],
-    [_.eq(STRUCTURE_LINKED_STRUCTURES), _.constant("structureLinks")],
+    [_.eq(STRUCTURE_STRUCTURE_LINKS), _.constant("structureLinks")],
     [_.eq(STRUCTURE_RULES), _.constant("rules")],
     [_.eq(STRUCTURE_LINKS), _.constant("links")],
     [_.eq(STRUCTURE_LINKS_NEW), _.constant("links")],

package/src/selectors/getTabVisibility.js

@@ -37,6 +37,7 @@ const notesTabVisible = ({ templatesLoading, templates, structure }) =>
 
 const versionsTabVisible = notEmptyPath("structureVersions");
 const structureLinksTabVisible = (state) =>
+  _.has("manage_structure_to_structure_link", state?.structureActions) ||
   state?.structure?.data_structure_link_count > 0;
 const rulesTabVisible = (state) => state?.structure?.implementation_count > 0;
 const lineageTabVisible = _.anyPass([_.path("structure.degree.in")]);