@truedat/dd 7.11.2 → 7.11.3

package/src/reducers/__tests__/structureLineageId.spec.js

@@ -1,5 +1,5 @@
 import { initialState, structureLineageId } from "../structureLineageId";
-import { fetchStructure, createStructureGraph } from "../../routines";
+import { legacyFetchStructure, createStructureGraph } from "../../routines";
 
 const fooState = { foo: "bar" };
 
@@ -8,8 +8,8 @@ describe("reducers: structureLineageId", () => {
     expect(structureLineageId(undefined, {})).toBe(initialState);
   });
 
-  it("should return the initial state after receiving the fetchStructure.TRIGGER action", () => {
-    expect(structureLineageId(fooState, { type: fetchStructure.TRIGGER })).toBe(
+  it("should return the initial state after receiving the legacyFetchStructure.TRIGGER action", () => {
+    expect(structureLineageId(fooState, { type: legacyFetchStructure.TRIGGER })).toBe(
       initialState
     );
   });

package/src/reducers/__tests__/structureLinks.spec.js

@@ -1,4 +1,4 @@
-import { clearStructure, fetchStructure } from "../../routines";
+import { clearStructure, legacyFetchStructure } from "../../routines";
 import { structureLinks } from "..";
 
 const fooState = { foo: "bar" };
@@ -16,19 +16,19 @@ describe("reducers: structureLinks", () => {
     );
   });
 
-  it("should handle the fetchStructure.TRIGGER action", () => {
-    expect(structureLinks(fooState, { type: fetchStructure.TRIGGER })).toEqual(
+  it("should handle the legacyFetchStructure.TRIGGER action", () => {
+    expect(structureLinks(fooState, { type: legacyFetchStructure.TRIGGER })).toEqual(
       initialState
     );
   });
 
-  it("should handle the fetchStructure.SUCCESS action", () => {
+  it("should handle the legacyFetchStructure.SUCCESS action", () => {
     const links = [{ id: 1, name: "Field 1" }];
     const data = { links };
 
     expect(
       structureLinks(fooState, {
-        type: fetchStructure.SUCCESS,
+        type: legacyFetchStructure.SUCCESS,
         payload: { data }
       })
     ).toMatchObject(links);

package/src/reducers/__tests__/structureRedirect.spec.js

@@ -16,7 +16,7 @@ describe("reducers: structureRedirect", () => {
     expect(structureRedirect(undefined, {})).toBe(initialState);
   });
 
-  it("should be initial state after receiving the fetchStructure.TRIGGER action", () => {
+  it("should be initial state after receiving the clearRedirect.TRIGGER action", () => {
     expect(structureRedirect(fooState, { type: clearRedirect.TRIGGER })).toBe(
       initialState
     );

package/src/reducers/__tests__/structureRelations.spec.js

@@ -1,4 +1,4 @@
-import { clearStructure, fetchStructure, fetchStructureChildrens, fetchStructureParents } from "../../routines";
+import { clearStructure, fetchStructureChildrens, fetchStructureParents } from "../../routines";
 import { childrenRelations, parentRelations } from "..";
 
 const fooState = { foo: "bar" };

package/src/reducers/__tests__/structureSystem.spec.js

@@ -1,4 +1,4 @@
-import { clearStructure, fetchStructure } from "../../routines";
+import { clearStructure, legacyFetchStructure } from "../../routines";
 import { structureSystem } from "..";
 
 const fooState = { foo: "bar" };
@@ -16,13 +16,13 @@ describe("reducers: structureSystem", () => {
     );
   });
 
-  it("should handle the fetchStructure.SUCCESS action", () => {
+  it("should handle the legacyFetchStructure.SUCCESS action", () => {
     const system = "foo";
     const data = { system };
 
     expect(
       structureSystem(fooState, {
-        type: fetchStructure.SUCCESS,
+        type: legacyFetchStructure.SUCCESS,
         payload: { data }
       })
     ).toEqual(system);

package/src/reducers/graph.js

@@ -2,7 +2,7 @@ import _ from "lodash/fp";
 import {
   clearGraph,
   fetchGraph,
-  fetchStructure,
+  legacyFetchStructure,
   createGraph,
 } from "../routines";
 
@@ -10,7 +10,7 @@ export const initialState = {};
 
 export const graph = (state = initialState, { type, payload }) => {
   switch (type) {
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
     case clearGraph.TRIGGER:
       return initialState;

package/src/reducers/graphLoading.js

@@ -4,7 +4,7 @@ import {
   createGraph,
   createStructureGraph,
   fetchGraph,
-  fetchStructure,
+  legacyFetchStructure,
   fetchStructureGraph,
 } from "../routines";
 
@@ -30,7 +30,7 @@ export const graphLoading = (state = false, { type, payload }) => {
       return payload || true;
     case fetchGraph.FAILURE:
       return payload;
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return false;
     case fetchStructureGraph.FULFILL:
       return false;

package/src/reducers/graphRedirect.js

@@ -1,6 +1,6 @@
 import { clearRedirect } from "@truedat/core/routines";
 import { linkTo } from "@truedat/core/routes";
-import { createGraph, clearStructure, fetchStructure } from "../routines";
+import { createGraph, clearStructure, legacyFetchStructure } from "../routines";
 
 export const initialState = "";
 
@@ -8,7 +8,7 @@ export const graphRedirect = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
     case clearRedirect.TRIGGER:
       return initialState;

package/src/reducers/structureFields.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { clearStructure, fetchStructure } from "../routines";
+import { clearStructure, legacyFetchStructure } from "../routines";
 
 const initialState = [];
 
@@ -7,9 +7,9 @@ const structureFields = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
-    case fetchStructure.SUCCESS:
+    case legacyFetchStructure.SUCCESS:
       return _.pathOr([], "data.data_fields")(payload);
     default:
       return state;
@@ -22,7 +22,7 @@ const structuresFields = (state = structures, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return structures;
-    case fetchStructure.SUCCESS:
+    case legacyFetchStructure.SUCCESS:
       const id = _.path("data.data_structure.id")(payload);
       const data_fields = _.pathOr([], "data.data_fields")(payload);
       return _.set(id, data_fields)(state);

package/src/reducers/structureImpactGraph.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import {
   clearStructure,
-  fetchStructure,
+  legacyFetchStructure,
   fetchStructureGraph,
   createGraph,
 } from "../routines";
@@ -15,7 +15,7 @@ export const structureImpactGraph = (
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
     case createGraph.SUCCESS:
     case fetchStructureGraph.SUCCESS:

package/src/reducers/structureImpactId.js

@@ -1,12 +1,12 @@
 import _ from "lodash/fp";
 import { createStructureGraph } from "../routines";
-import { fetchStructure } from "../../../dd/src/routines";
+import { legacyFetchStructure } from "../../../dd/src/routines";
 
 export const initialState = null;
 
 export const structureImpactId = (state = initialState, { type, payload }) => {
   switch (type) {
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
     case createStructureGraph.SUCCESS:
       return _.pathEq("data.type", "impact")(payload)

package/src/reducers/structureLineageGraph.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import {
   clearStructure,
-  fetchStructure,
+  legacyFetchStructure,
   fetchStructureGraph,
   createGraph,
 } from "../routines";
@@ -15,7 +15,7 @@ export const structureLineageGraph = (
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
     case createGraph.SUCCESS:
     case fetchStructureGraph.SUCCESS:

package/src/reducers/structureLineageId.js

@@ -1,12 +1,12 @@
 import _ from "lodash/fp";
 import { createStructureGraph } from "../routines";
-import { fetchStructure } from "../../../dd/src/routines";
+import { legacyFetchStructure } from "../../../dd/src/routines";
 
 export const initialState = null;
 
 export const structureLineageId = (state = initialState, { type, payload }) => {
   switch (type) {
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
     case createStructureGraph.SUCCESS:
       return _.pathEq("data.type", "lineage")(payload)

package/src/reducers/structureLinks.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { clearStructure, fetchStructure } from "../routines";
+import { clearStructure, legacyFetchStructure } from "../routines";
 
 const initialState = [];
 
@@ -7,9 +7,9 @@ const structureLinks = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructure.TRIGGER:
+    case legacyFetchStructure.TRIGGER:
       return initialState;
-    case fetchStructure.SUCCESS:
+    case legacyFetchStructure.SUCCESS:
       return _.pathOr([], "data.links")(payload);
     default:
       return state;

package/src/reducers/structureSiblings.js

@@ -1,5 +1,9 @@
 import _ from "lodash/fp";
-import { clearStructure, fetchStructure } from "../routines";
+import {
+  clearStructure,
+  fetchStructure,
+  legacyFetchStructure,
+} from "../routines";
 
 const initialState = [];
 
@@ -8,6 +12,7 @@ const structureSiblings = (state = initialState, { type, payload }) => {
     case clearStructure.TRIGGER:
       return initialState;
     case fetchStructure.SUCCESS:
+    case legacyFetchStructure.SUCCESS:
       return _.pathOr([], "data.siblings")(payload);
     default:
       return state;
@@ -19,6 +24,7 @@ const structuresSiblings = (state = {}, { type, payload }) => {
     case clearStructure.TRIGGER:
       return {};
     case fetchStructure.SUCCESS:
+    case legacyFetchStructure.SUCCESS:
       const id = _.path("data.data_structure.id")(payload);
       const siblings = _.pathOr([], "data.siblings")(payload);
       return _.set(id, siblings)(state);

package/src/reducers/structureSystem.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { clearStructure, fetchStructure } from "../routines";
+import { clearStructure, legacyFetchStructure } from "../routines";
 
 const initialState = null;
 
@@ -7,7 +7,7 @@ const structureSystem = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructure.SUCCESS:
+    case legacyFetchStructure.SUCCESS:
       return _.propOr(initialState, "system")(payload.data);
     default:
       return state;

package/src/reducers/structureVersions.js

@@ -3,18 +3,17 @@ import { clearStructure, fetchStructureVersions } from "../routines";
 
 const initialState = [];
 
-const structureVersions  = (state = initialState, { type, payload }) => {
+const structureVersions = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
     case fetchStructureVersions.TRIGGER:
       return initialState;
     case fetchStructureVersions.SUCCESS:
-      console.log("payload", payload);
       return _.pathOr([], "data.versions")(payload);
     default:
       return state;
   }
 };
 
-export { structureVersions  };
+export { structureVersions };

package/src/routines.js

@@ -89,6 +89,7 @@ export const fetchNodes = createRoutine("FETCH_NODES");
 export const fetchProfileExecution = createRoutine("FETCH_EXECUTION_PROFILE");
 export const fetchProfileGroup = createRoutine("FETCH_PROFILE_GROUP");
 export const fetchStructure = createRoutine("FETCH_STRUCTURE");
+export const legacyFetchStructure = createRoutine("LEGACY_FETCH_STRUCTURE");
 export const fetchStructureParents = createRoutine("FETCH_STRUCTURE_PARENTS");
 export const fetchStructureChildrens = createRoutine("FETCH_STRUCTURE_CHILDREN");
 export const fetchStructureVersions = createRoutine("FETCH_STRUCTURE_VERSIONS");

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

@@ -0,0 +1,148 @@
+import { testSaga } from "redux-saga-test-plan";
+import {
+  legacyFetchStructureRequestSaga,
+  legacyFetchStructureSaga,
+} from "../legacyFetchStructure";
+
+import { legacyFetchStructure } from "../../routines";
+import { LEGACY_DATA_STRUCTURE_VERSION_QUERY } from "../../api/queries";
+import { getStructureFieldColumns } from "../../selectors";
+
+describe("sagas: fetchStructureRequestSaga", () => {
+  it("should invoke fetchStructureSaga on trigger", () => {
+    expect(() => {
+      testSaga(legacyFetchStructureRequestSaga)
+        .next()
+        .takeLatest(legacyFetchStructure.TRIGGER, legacyFetchStructureSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(legacyFetchStructureRequestSaga)
+        .next()
+        .takeLatest("FOO", legacyFetchStructureSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: legacyFetchStructureSaga", () => {
+  const client = { query: jest.fn() };
+  const id = 1;
+  const version = "latest";
+  const payload = { id };
+  const variables = {
+    dataStructureId: id,
+    version,
+    note_fields: ["note_field"],
+  };
+
+  const structureFieldColumns = [{ name: "id" }, { name: "note.note_field" }];
+
+  const _actions = { test: true };
+  const user_permissions = { permission1: true };
+
+  const dataStructureVersion = {
+    id,
+    name: "Structure 1",
+    description: "desc1",
+    _actions,
+    user_permissions,
+  };
+
+  const data = {
+    data: dataStructureVersion,
+    _actions,
+    user_permissions,
+  };
+
+  it("should put a success action when a response is returned", () => {
+    const meta = { version };
+
+    expect(() => {
+      testSaga(legacyFetchStructureSaga, { payload })
+        .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
+        .put(legacyFetchStructure.request())
+        .next()
+
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: LEGACY_DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
+        .next({ data: { dataStructureVersion } })
+        .put({ meta, ...legacyFetchStructure.success(data) })
+        .next()
+        .put(legacyFetchStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a success action when a response is returned - with version", () => {
+    const version = 23;
+    const payload = { id, version };
+    const meta = { version };
+
+    const variables = {
+      dataStructureId: id,
+      version,
+      note_fields: ["note_field"],
+    };
+
+    expect(() => {
+      testSaga(legacyFetchStructureSaga, { payload })
+        .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
+        .put(legacyFetchStructure.request())
+        .next()
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: LEGACY_DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
+        .next({ data: { dataStructureVersion } })
+        .put({ meta, ...legacyFetchStructure.success(data) })
+        .next()
+        .put(legacyFetchStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(legacyFetchStructureSaga, { payload })
+        .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
+        .put(legacyFetchStructure.request())
+        .next()
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: LEGACY_DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
+        .throw(error)
+        .put(legacyFetchStructure.failure(message))
+        .next()
+        .put(legacyFetchStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

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

@@ -0,0 +1,132 @@
+import { testSaga } from "redux-saga-test-plan";
+import { compile } from "path-to-regexp";
+import {
+  requestGrantRemovalSaga,
+  requestGrantRemovalRequestSaga,
+} from "../requestGrantRemoval";
+import {
+  requestGrantRemoval,
+  legacyFetchStructure,
+  fetchStructures,
+} from "../../routines";
+import { API_GRANT } from "../../api";
+import { apiJsonPatch, JSON_OPTS } from "@truedat/core/services/api";
+
+describe("sagas: requestGrantRemovalRequestSaga", () => {
+  it("should invoke requestGrantRemovalSaga on requestGrantRemoval.TRIGGER", () => {
+    expect(() => {
+      testSaga(requestGrantRemovalRequestSaga)
+        .next()
+        .takeLatest(requestGrantRemoval.TRIGGER, requestGrantRemovalSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(requestGrantRemovalRequestSaga)
+        .next()
+        .takeLatest("FOO", requestGrantRemovalSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: requestGrantRemovalSaga", () => {
+  const id = "1";
+  const action = "REMOVE";
+  const data_structure_id = 2;
+  const version = "v3";
+  const previousStructureQuery = { foo: "bar" };
+  const payloadWithPrevQuery = {
+    id,
+    action,
+    data_structure_id,
+    version,
+    previousStructureQuery,
+  };
+  const payloadWithoutPrevQuery = {
+    id,
+    action,
+    data_structure_id,
+    version,
+    previousStructureQuery: undefined,
+  };
+  const requestData = { action };
+  const url = compile(API_GRANT)({ id: `${id}` });
+
+  it("should put a success action and fetchStructures.trigger when previousStructureQuery is provided", () => {
+    expect(() => {
+      testSaga(requestGrantRemovalSaga, { payload: payloadWithPrevQuery })
+        .next()
+        .put(requestGrantRemoval.request())
+        .next()
+        .call(apiJsonPatch, url, requestData, JSON_OPTS)
+        .next({ data: "result" })
+        .put(requestGrantRemoval.success("result"))
+        .next()
+        .put(fetchStructures.trigger(previousStructureQuery))
+        .next()
+        .put(requestGrantRemoval.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a success action and legacyFetchStructure.trigger when previousStructureQuery is not provided", () => {
+    expect(() => {
+      testSaga(requestGrantRemovalSaga, { payload: payloadWithoutPrevQuery })
+        .next()
+        .put(requestGrantRemoval.request())
+        .next()
+        .call(apiJsonPatch, url, requestData, JSON_OPTS)
+        .next({ data: "result" })
+        .put(requestGrantRemoval.success("result"))
+        .next()
+        .put(
+          legacyFetchStructure.trigger({
+            id: data_structure_id,
+            version,
+          })
+        )
+        .next()
+        .put(requestGrantRemoval.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action with response when error.response exists", () => {
+    const error = { response: { status: 403, data: { err: "bad" } } };
+    expect(() => {
+      testSaga(requestGrantRemovalSaga, { payload: payloadWithPrevQuery })
+        .next()
+        .put(requestGrantRemoval.request())
+        .next()
+        .call(apiJsonPatch, url, requestData, JSON_OPTS)
+        .throw(error)
+        .put(requestGrantRemoval.failure({ status: 403, data: { err: "bad" } }))
+        .next()
+        .put(requestGrantRemoval.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action with error.message when error.response does not exist", () => {
+    const error = { message: "Some other error" };
+    expect(() => {
+      testSaga(requestGrantRemovalSaga, { payload: payloadWithoutPrevQuery })
+        .next()
+        .put(requestGrantRemoval.request())
+        .next()
+        .call(apiJsonPatch, url, requestData, JSON_OPTS)
+        .throw(error)
+        .put(requestGrantRemoval.failure("Some other error"))
+        .next()
+        .put(requestGrantRemoval.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/createGrantRequestStatus.js

@@ -17,6 +17,7 @@ export function* createGrantRequestStatusSaga({ payload }) {
       structureId,
       previousStructureQuery,
     } = payload;
+
     const url = compile(API_GRANT_REQUEST_STATUS)({
       id: `${grantRequest.id}`,
     });

package/src/sagas/index.js

@@ -32,8 +32,7 @@ import { fetchProfileGroupRequestSaga } from "./fetchProfileGroup";
 import { fetchStructureGraphRequestSaga } from "./fetchStructureGraph";
 import { fetchStructureNotesRequestSaga } from "./fetchStructureNotes";
 import { fetchStructureRequestSaga } from "./fetchStructure";
-import { fetchStructureParentsRequestSaga } from "./fetchStructureParents";
-import { fetchStructureChildrensRequestSaga } from "./fetchStructureChildrens";
+import { legacyFetchStructureRequestSaga } from "./legacyFetchStructure";
 import { fetchStructureTypeRequestSaga } from "./fetchStructureType";
 import { fetchStructureTypesRequestSaga } from "./fetchStructureTypes";
 import { fetchStructuresRequestSaga } from "./fetchStructures";
@@ -98,6 +97,7 @@ export {
   fetchSystemStructuresRequestSaga,
   fetchUserSearchFiltersRequestSaga,
   linkStructureToStructureRequestSaga,
+  legacyFetchStructureRequestSaga,
   tagStructureRequestSaga,
   operateGrantRequestToCartRequestSaga,
   requestGrantRemovalRequestSaga,
@@ -155,6 +155,7 @@ export default [
   fetchSystemStructuresRequestSaga(),
   fetchUserSearchFiltersRequestSaga(),
   linkStructureToStructureRequestSaga(),
+  legacyFetchStructureRequestSaga(),
   tagStructureRequestSaga(),
   operateGrantRequestToCartRequestSaga(),
   requestGrantRemovalRequestSaga(),