@truedat/dd 4.35.6 → 4.35.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [4.35.7] 2021-01-07
+
+### Fixed
+
+- [TD-4413]:
+  - Fix impact tab not displaying data, affecting lineage tab
+  - Fix LineageContextMenu inside impact and lineage tabs not redirecting to /graphs
+
 ## [4.35.4] 2021-12-20
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.35.6",
+  "version": "4.35.7",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.35.6",
-    "@truedat/core": "4.35.6",
-    "@truedat/df": "4.35.6",
+    "@truedat/auth": "4.35.7",
+    "@truedat/core": "4.35.7",
+    "@truedat/df": "4.35.7",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "f1ef56cbd38f392369f0a1d2c83c0d8bc6b58e60"
+  "gitHead": "99812619b928d7802bb2f33df3f3321c9c36995e"
 }

package/src/components/GraphLoader.js

@@ -26,7 +26,7 @@ export const GraphLoader = ({ clearGraph, fetchGraph, graph, cancelPoll }) => {
         fetchGraph({ id });
       }
     }
-  }, [/*graph, */ /*fetchGraph,*/ id]);
+  }, [graph, fetchGraph, id]);
 
   useEffect(() => {
     return () => {

package/src/components/GraphRedirector.js

@@ -5,23 +5,31 @@ import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
 import { clearRedirect } from "@truedat/core/routines";
 
-export const GraphRedirector = ({ graphRedirect, clearRedirect }) => {
+export const GraphRedirector = ({ graph, graphRedirect, clearRedirect }) => {
   const { pathname } = useLocation();
   const history = useHistory();
   useEffect(() => {
-    if (graphRedirect && !_.isEqual(pathname, graphRedirect)) {
+    if (
+      graphRedirect &&
+      graph?.fromLineageContextMenu &&
+      !_.isEqual(pathname, graphRedirect)
+    ) {
       history.push(graphRedirect);
       clearRedirect();
     }
-  }, [pathname, graphRedirect]);
+  }, [history, pathname, graphRedirect, graph, clearRedirect]);
   return null;
 };
 
 GraphRedirector.propTypes = {
+  graph: PropTypes.object,
   clearRedirect: PropTypes.func.isRequired,
   graphRedirect: PropTypes.string,
 };
 
-const mapStateToProps = ({ graphRedirect }) => ({ graphRedirect });
+const mapStateToProps = ({ graph, graphRedirect }) => ({
+  graph,
+  graphRedirect,
+});
 
 export default connect(mapStateToProps, { clearRedirect })(GraphRedirector);

package/src/components/LineageContextMenu.js

@@ -23,7 +23,12 @@ export const LineageContextMenu = ({
       <>
         <Menu.Item
           onClick={() =>
-            createGraph({ ids: [id], levels: levels, type: "lineage" })
+            createGraph({
+              ids: [id],
+              levels: levels,
+              type: "lineage",
+              fromLineageContextMenu: true,
+            })
           }
         >
           <Icon name="random" flipped="horizontally" />
@@ -34,7 +39,12 @@ export const LineageContextMenu = ({
         </Menu.Item>
         <Menu.Item
           onClick={() =>
-            createGraph({ ids: [id], levels: levels, type: "impact" })
+            createGraph({
+              ids: [id],
+              levels: levels,
+              type: "impact",
+              fromLineageContextMenu: true,
+            })
           }
         >
           <Icon name="random" />
@@ -43,7 +53,9 @@ export const LineageContextMenu = ({
             defaultMessage="Impact"
           />
         </Menu.Item>
-        <Menu.Item onClick={() => excludeNode({ id })}>
+        <Menu.Item
+          onClick={() => excludeNode({ id, fromLineageContextMenu: true })}
+        >
           <Icon name="eye slash outline" />
           <FormattedMessage
             id="navigation.lineage.exclude"

package/src/components/LineageSample.js

@@ -7,7 +7,7 @@ import GraphRedirector from "./GraphRedirector";
 export const LineageSample = ({ createGraph }) => {
   useEffect(() => {
     createGraph({ type: "sample" });
-  }, []);
+  }, [createGraph]);
   return <GraphRedirector />;
 };
 

package/src/components/StructureGraph.js

@@ -3,6 +3,7 @@ import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { createGraph, fetchStructureGraph } from "../routines";
+import GraphRedirector from "./GraphRedirector";
 import LineageGraph from "./LineageGraph";
 
 export const StructureGraph = ({
@@ -16,11 +17,16 @@ export const StructureGraph = ({
 }) => {
   useEffect(() => {
     degree && _.isEmpty(graph) && createGraph({ ids: [id], type: type });
-  }, [type]);
+  }, [degree, graph, id, type, createGraph]);
   useEffect(() => {
     graphId && _.isEmpty(graph) && fetchStructureGraph({ id: graphId });
-  }, [graphId]);
-  return degree ? <LineageGraph height="50vh" graph={graph} /> : null;
+  }, [graph, graphId, fetchStructureGraph]);
+  return degree ? (
+    <>
+      <GraphRedirector />
+      <LineageGraph height="50vh" graph={graph} />
+    </>
+  ) : null;
 };
 
 StructureGraph.propTypes = {

package/src/components/StructureLineage.js

@@ -18,7 +18,10 @@ export const StructureLineage = (props) => (
   </>
 );
 
-const mapStateToProps = ({ structureLineageId: graphId, graph: graph }) => ({
+const mapStateToProps = ({
+  structureLineageId: graphId,
+  structureLineageGraph: graph,
+}) => ({
   graph,
   graphId,
   type: "lineage",

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

@@ -17,12 +17,6 @@ describe("reducers: graph", () => {
     expect(graph(fooState, { type: clearGraph.TRIGGER })).toEqual(initialState);
   });
 
-  it("should be the initial state after receiving the clearStructure.TRIGGER action", () => {
-    expect(graph(fooState, { type: clearStructure.TRIGGER })).toEqual(
-      initialState
-    );
-  });
-
   it("should be the initial state after receiving the fetchStructure.TRIGGER action", () => {
     expect(graph(fooState, { type: fetchStructure.TRIGGER })).toEqual(
       initialState

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

@@ -3,7 +3,7 @@ import {
   createGraph,
   excludeNode,
   fetchGraph,
-  selectGroup
+  selectGroup,
 } from "../../routines";
 
 const fooState = { foo: "bar" };
@@ -21,6 +21,17 @@ describe("reducers: lineageQuery", () => {
     ).toMatchObject({ excludes: ["bar", "foo"] });
   });
 
+  it("should append a default {fromLineageContextMenu: false} it it was not specified in the excludeNode.TRIGGER action payload", () => {
+    const state = { excludes: ["foo"] };
+    const payload = { id: "bar" };
+    expect(
+      lineageQuery(state, { type: excludeNode.TRIGGER, payload })
+    ).toMatchObject({
+      excludes: ["bar", "foo"],
+      fromLineageContextMenu: false,
+    });
+  });
+
   it("should reset the exclusions after receiving the selectGroup.TRIGGER action", () => {
     const payload = {};
     expect(
@@ -39,6 +50,23 @@ describe("reducers: lineageQuery", () => {
     ).toMatchObject({ excludes: [], ids, type, levels });
   });
 
+  it("should append a default {fromLineageContextMenu: false} it it was not specified in the createGraph.TRIGGER action payload", () => {
+    const ids = ["foo", "bar"];
+    const type = "type";
+    const levels = 3;
+    const state = { excludes: ["foo"] };
+    const payload = { ids, type, levels };
+    expect(
+      lineageQuery(state, { type: createGraph.TRIGGER, payload })
+    ).toMatchObject({
+      excludes: [],
+      ids,
+      type,
+      levels,
+      fromLineageContextMenu: false,
+    });
+  });
+
   it("should extract the data from the payload of the fetchGraph.SUCCESS action", () => {
     const ids = ["foo", "bar"];
     const type = "type";

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

@@ -2,7 +2,8 @@ import { initialState, structureImpactGraph } from "../structureImpactGraph";
 import {
   clearStructure,
   fetchStructure,
-  fetchStructureGraph
+  fetchStructureGraph,
+  createGraph
 } from "../../routines";
 
 const fooState = { foo: "bar" };
@@ -35,6 +36,28 @@ describe("reducers: structureImpactGraph", () => {
     ).toBe(data);
   });
 
+  it("should extract the data from the payload after receiving the createGraph.SUCCESS action", () => {
+    const data = { opts: { type: "impact" } };
+    const payload = { data };
+    expect(
+      structureImpactGraph(fooState, {
+        type: createGraph.SUCCESS,
+        payload
+      })
+    ).toBe(data);
+  });
+
+  it("should leave the state unchanged if createGraph succeeds and was called from LineageContextMenu", () => {
+    const data = { opts: { type: "impact" }, fromLineageContextMenu: true };
+    const payload = { data };
+    expect(
+      structureImpactGraph(fooState, {
+        type: createGraph.SUCCESS,
+        payload
+      })
+    ).toBe(fooState);
+  });
+
   it("should leave thes tate unchanged if the type of the fetchStructureGraph.SUCCESS action is not impact", () => {
     const data = { opts: { type: "foo" } };
     const payload = { data };

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

@@ -2,7 +2,8 @@ import { initialState, structureLineageGraph } from "../structureLineageGraph";
 import {
   clearStructure,
   fetchStructure,
-  fetchStructureGraph
+  fetchStructureGraph,
+  createGraph,
 } from "../../routines";
 
 const fooState = { foo: "bar" };
@@ -35,6 +36,39 @@ describe("reducers: structureLineageGraph", () => {
     ).toBe(data);
   });
 
+  it("should extract the data from the payload after receiving the createGraph.SUCCESS action", () => {
+    const data = { opts: { type: "lineage" } };
+    const payload = { data };
+    expect(
+      structureLineageGraph(fooState, {
+        type: createGraph.SUCCESS,
+        payload
+      })
+    ).toBe(data);
+  });
+
+  it("should leave the state unchanged if the type of the fetchStructureGraph.SUCCESS action is not lineage", () => {
+    const data = { opts: { type: "foo" } };
+    const payload = { data };
+    expect(
+      structureLineageGraph(fooState, {
+        type: fetchStructureGraph.SUCCESS,
+        payload
+      })
+    ).toBe(fooState);
+  });
+
+  it("should leave the state unchanged if createGraph succeeds and was called from LineageContextMenu", () => {
+    const data = { opts: { type: "impact" }, fromLineageContextMenu: true };
+    const payload = { data };
+    expect(
+      structureLineageGraph(fooState, {
+        type: createGraph.SUCCESS,
+        payload
+      })
+    ).toBe(fooState);
+  });
+
   it("should leave thes tate unchanged if the type of the fetchStructureGraph.SUCCESS action is not lineage", () => {
     const data = { opts: { type: "foo" } };
     const payload = { data };

package/src/reducers/graph.js

@@ -11,8 +11,6 @@ export const initialState = {};
 
 export const graph = (state = initialState, { type, payload }) => {
   switch (type) {
-    case clearStructure.TRIGGER:
-      return initialState;
     case fetchStructure.TRIGGER:
       return initialState;
     case clearGraph.TRIGGER:

package/src/reducers/lineageQuery.js

@@ -6,21 +6,37 @@ export const initialState = { ids: [], type: "lineage", excludes: [] };
 export const lineageQuery = (state = initialState, { type, payload }) => {
   switch (type) {
     case excludeNode.TRIGGER: {
-      const { id } = payload;
+      const { id, fromLineageContextMenu } = payload;
       const { excludes } = state;
-      return { ...state, excludes: _.concat([id])(excludes) };
+      return {
+        ...state,
+        excludes: _.concat([id])(excludes),
+        fromLineageContextMenu: fromLineageContextMenu || false,
+      };
     }
     case createGraph.TRIGGER: {
-      const { ids = [], type = "lineage", levels } = payload;
-      return { ...state, ids, type, excludes: [], levels };
+      const {
+        ids = [],
+        type = "lineage",
+        levels,
+        fromLineageContextMenu,
+      } = payload;
+      return {
+        ...state,
+        ids,
+        type,
+        excludes: [],
+        levels,
+        fromLineageContextMenu: fromLineageContextMenu || false,
+      };
     }
     case fetchGraph.SUCCESS: {
       const {
         data: {
           ids,
           opts: { type: type },
-          excludes: excludes
-        }
+          excludes: excludes,
+        },
       } = payload;
       return { ids, type, excludes, levels: state.levels };
     }

package/src/reducers/structureImpactGraph.js

@@ -2,7 +2,8 @@ import _ from "lodash/fp";
 import {
   clearStructure,
   fetchStructure,
-  fetchStructureGraph
+  fetchStructureGraph,
+  createGraph,
 } from "../routines";
 
 export const initialState = {};
@@ -16,8 +17,10 @@ export const structureImpactGraph = (
       return initialState;
     case fetchStructure.TRIGGER:
       return initialState;
+    case createGraph.SUCCESS:
     case fetchStructureGraph.SUCCESS:
-      return _.pathEq("data.opts.type", "impact")(payload)
+      return !payload?.data?.fromLineageContextMenu &&
+        _.pathEq("data.opts.type", "impact")(payload)
         ? _.prop("data")(payload)
         : state;
     default:

package/src/reducers/structureLineageGraph.js

@@ -2,7 +2,8 @@ import _ from "lodash/fp";
 import {
   clearStructure,
   fetchStructure,
-  fetchStructureGraph
+  fetchStructureGraph,
+  createGraph,
 } from "../routines";
 
 export const initialState = {};
@@ -16,8 +17,10 @@ export const structureLineageGraph = (
       return initialState;
     case fetchStructure.TRIGGER:
       return initialState;
+    case createGraph.SUCCESS:
     case fetchStructureGraph.SUCCESS:
-      return _.pathEq("data.opts.type", "lineage")(payload)
+      return !payload?.data?.fromLineageContextMenu &&
+        _.pathEq("data.opts.type", "lineage")(payload)
         ? _.prop("data")(payload)
         : state;
     default:

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

@@ -68,10 +68,13 @@ describe("sagas: createGraphRequestSaga", () => {
 });
 
 describe("sagas: createGraphSaga", () => {
+  const fromLineageContextMenu = false;
+
   const query = {
     ids: ["BASILEAII_HIST_PROA_MOROSIDAD [ 2 ] [ 1 ].SOBREGIROCAPITAL"],
     type: "lineage",
     exclude: [],
+    fromLineageContextMenu,
   };
 
   const graphAccepted = {
@@ -80,7 +83,7 @@ describe("sagas: createGraphSaga", () => {
   };
 
   const graphCreated = {
-    data: graphData,
+    data: { ...graphData, fromLineageContextMenu },
     status: 201,
   };
 
@@ -114,7 +117,7 @@ describe("sagas: createGraphSaga", () => {
         .next(graphAccepted)
         .put(fetchGraph.request(graphAccepted))
         .next()
-        .fork(polling, graphAccepted)
+        .fork(polling, graphAccepted, fromLineageContextMenu)
         .next()
         .take(cancelPoll.TRIGGER)
         .next()
@@ -149,6 +152,8 @@ describe("sagas: createGraphSaga", () => {
 });
 
 describe("generator: polling", () => {
+  const fromLineageContextMenu = false;
+
   const graphAccepted = {
     data: graphAcceptedData,
     status: 202,
@@ -160,13 +165,13 @@ describe("generator: polling", () => {
   };
 
   const graphCompleted = {
-    data: graphData,
+    data: { ...graphData, fromLineageContextMenu },
     status: 200,
   };
 
   it("polling should keep requesting by graph hash until graph is received", () => {
     expect(() => {
-      testSaga(polling, graphAccepted)
+      testSaga(polling, graphAccepted, fromLineageContextMenu)
         .next()
         .delay(1000)
         .next()
@@ -202,7 +207,7 @@ describe("generator: polling", () => {
 
   it("cancel should stop polling and return createGraph failure", () => {
     expect(() => {
-      testSaga(polling, graphAccepted)
+      testSaga(polling, graphAccepted, fromLineageContextMenu)
         .next()
         .delay(1000)
         .next()

package/src/sagas/createGraph.js

@@ -48,7 +48,11 @@ export function* createGraphSaga() {
     if (graphAcceptedOrCreated.status == 202) {
       yield put(fetchGraph.request(graphAcceptedOrCreated));
       // starts the task in the background
-      const pollingTask = yield fork(polling, graphAcceptedOrCreated);
+      const pollingTask = yield fork(
+        polling,
+        graphAcceptedOrCreated,
+        body.fromLineageContextMenu
+      );
 
       // wait for the user stop action
       yield take(cancelPoll.TRIGGER);
@@ -56,7 +60,15 @@ export function* createGraphSaga() {
       // this will cause the forked bgSync task to jump into its finally block
       yield cancel(pollingTask);
     } else if (graphAcceptedOrCreated.status == 201) {
-      yield put(createGraph.success(graphAcceptedOrCreated));
+      yield put(
+        createGraph.success({
+          ...graphAcceptedOrCreated,
+          data: {
+            ...graphAcceptedOrCreated.data,
+            fromLineageContextMenu: body.fromLineageContextMenu,
+          },
+        })
+      );
     }
   } catch (error) {
     if (error.response) {
@@ -70,7 +82,7 @@ export function* createGraphSaga() {
   }
 }
 
-export function* polling(graphAccepted) {
+export function* polling(graphAccepted, fromLineageContextMenu) {
   const backoff = exponentialBackoff(1.2, 0);
   let backoffTime,
     retry = 0,
@@ -113,7 +125,12 @@ export function* polling(graphAccepted) {
   } while (!isCancelled && graphResp?.status == 202);
 
   graphResp?.status == 200 && !isCancelled
-    ? yield put(createGraph.success(graphResp))
+    ? yield put(
+        createGraph.success({
+          ...graphResp,
+          data: { ...graphResp.data, fromLineageContextMenu },
+        })
+      )
     : yield put(createGraph.failure({}));
 }