@truedat/dd 4.53.8 → 4.53.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.53.9] 2022-10-17
+
+### [Fixed]
+
+- [TD-4542] Avoid fetching old graph after createGraph.SUCCESS
+
 ## [4.53.5] 2022-10-07
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.53.8",
+  "version": "4.53.10",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.53.8",
+    "@truedat/test": "4.53.10",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,10 +87,10 @@
     ]
   },
   "dependencies": {
-    "@apollo/client": "^3.6.4",
-    "@truedat/auth": "4.53.8",
-    "@truedat/core": "4.53.8",
-    "@truedat/df": "4.53.8",
+    "@apollo/client": "^3.7.0",
+    "@truedat/auth": "4.53.10",
+    "@truedat/core": "4.53.10",
+    "@truedat/df": "4.53.10",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "56190c74eddc249134cb973cc21470c36a4701d0"
+  "gitHead": "66304ff9ac3d25820b3bec2d0147f21cb0a2c579"
 }

package/src/components/GrantSelectedFilters.js

@@ -19,7 +19,8 @@ import {
 const translations = (formatMessage) => ({
   "active.raw": (v) =>
     formatMessage({ id: `filters.active.raw.${v}`, defaultMessage: v }),
-  "execution_result_info.result_text": (v) => formatMessage({ id: v }),
+  "execution_result_info.result_text": (v) =>
+    formatMessage({ id: v, defaultMessage: v }),
 });
 
 export const mapStateToProps = (state, ownProps) => {

package/src/components/GraphLoader.js

@@ -6,7 +6,13 @@ import { useRouteMatch, useHistory } from "react-router-dom";
 import { GRAPH } from "@truedat/core/routes";
 import { fetchGraph, clearGraph, cancelPoll } from "../routines";
 
-export const GraphLoader = ({ clearGraph, fetchGraph, graph, cancelPoll }) => {
+export const GraphLoader = ({
+  clearGraph,
+  fetchGraph,
+  graph,
+  cancelPoll,
+  graphRedirect,
+}) => {
   const match = useRouteMatch(GRAPH);
   const id = _.path("params.id")(match);
 
@@ -22,11 +28,15 @@ export const GraphLoader = ({ clearGraph, fetchGraph, graph, cancelPoll }) => {
     if (id) {
       if (_.isEmpty(graph)) {
         fetchGraph({ id });
-      } else if (id != graph.id) {
+        /* If graphRedirect is present, a new graph has already been loaded, so
+         * there is no need to fetchGraph. The URL is being changed by
+         * GraphLoader history.push to the new graph id.
+         */
+      } else if (!graphRedirect && id != graph.id) {
         fetchGraph({ id });
       }
     }
-  }, [graph, fetchGraph, id]);
+  }, [graph, graphRedirect, fetchGraph, id]);
 
   useEffect(() => {
     return () => {
@@ -45,9 +55,13 @@ GraphLoader.propTypes = {
   fetchGraph: PropTypes.func.isRequired,
   graph: PropTypes.object,
   cancelPoll: PropTypes.func,
+  graphRedirect: PropTypes.string,
 };
 
-const mapStateToProps = ({ graph }) => ({ graph });
+const mapStateToProps = ({ graph, graphRedirect }) => ({
+  graph,
+  graphRedirect,
+});
 
 export default connect(mapStateToProps, { clearGraph, fetchGraph, cancelPoll })(
   GraphLoader

package/src/components/GraphRedirector.js

@@ -9,15 +9,11 @@ export const GraphRedirector = ({ graph, graphRedirect, clearRedirect }) => {
   const { pathname } = useLocation();
   const history = useHistory();
   useEffect(() => {
-    if (
-      graphRedirect &&
-      graph?.fromLineageContextMenu &&
-      !_.isEqual(pathname, graphRedirect)
-    ) {
+    if (graphRedirect && !_.isEqual(pathname, graphRedirect)) {
       history.push(graphRedirect);
       clearRedirect();
     }
-  }, [history, pathname, graphRedirect, graph, clearRedirect]);
+  }, [history, pathname, graphRedirect, clearRedirect]);
   return null;
 };
 

package/src/components/LineageContextMenu.js

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

package/src/components/LineageForm.js

@@ -49,8 +49,17 @@ export const LineageForm = ({
   const [levels, setLevels] = useState(lineageLevels);
   const handleSubmit = (type) => () => {
     _.isNil(levels)
-      ? createGraph({ ids: selectedResources, type })
-      : createGraph({ ids: selectedResources, type, levels });
+      ? createGraph({
+          ids: selectedResources,
+          type,
+          isRedirected: true,
+        })
+      : createGraph({
+          ids: selectedResources,
+          type,
+          levels,
+          isRedirected: true,
+        });
   };
   const disabled = _.isEmpty(selectedResources);
   useEffect(() => {

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

@@ -92,7 +92,7 @@ describe("<LineageForm />", () => {
 
     expect(createGraph.mock.calls.length).toBe(1);
     expect(createGraph.mock.calls[0]).toEqual([
-      { ids: ["id1", "id2"], type: "lineage", levels: 4 },
+      { ids: ["id1", "id2"], type: "lineage", levels: 4, isRedirected: true },
     ]);
   });
 

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

@@ -28,7 +28,7 @@ describe("reducers: graphRedirect", () => {
   });
 
   it("should be the graph url  after receiving the createGraph.SUCCESS action", () => {
-    const data = { id: 42 };
+    const data = { id: 42, isRedirected: true };
     const payload = { data };
     expect(
       graphRedirect(fooState, { type: createGraph.SUCCESS, payload })

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

@@ -21,14 +21,14 @@ 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", () => {
+  it("should append a default {isRedirected: 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,
+      isRedirected: false,
     });
   });
 
@@ -50,7 +50,7 @@ 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", () => {
+  it("should append a default {isRedirected: false} it it was not specified in the createGraph.TRIGGER action payload", () => {
     const ids = ["foo", "bar"];
     const type = "type";
     const levels = 3;
@@ -63,7 +63,7 @@ describe("reducers: lineageQuery", () => {
       ids,
       type,
       levels,
-      fromLineageContextMenu: false,
+      isRedirected: false,
     });
   });
 

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

@@ -48,7 +48,7 @@ describe("reducers: structureImpactGraph", () => {
   });
 
   it("should leave the state unchanged if createGraph succeeds and was called from LineageContextMenu", () => {
-    const data = { opts: { type: "impact" }, fromLineageContextMenu: true };
+    const data = { opts: { type: "impact" }, isRedirected: true };
     const payload = { data };
     expect(
       structureImpactGraph(fooState, {

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

@@ -59,7 +59,7 @@ describe("reducers: structureLineageGraph", () => {
   });
 
   it("should leave the state unchanged if createGraph succeeds and was called from LineageContextMenu", () => {
-    const data = { opts: { type: "impact" }, fromLineageContextMenu: true };
+    const data = { opts: { type: "impact" }, isRedirected: true };
     const payload = { data };
     expect(
       structureLineageGraph(fooState, {

package/src/reducers/graphRedirect.js

@@ -13,7 +13,9 @@ export const graphRedirect = (state = initialState, { type, payload }) => {
     case clearRedirect.TRIGGER:
       return initialState;
     case createGraph.SUCCESS:
-      return payload.data.id ? linkTo.GRAPH(payload.data) : initialState;
+      return payload.data.id && payload.data?.isRedirected
+        ? linkTo.GRAPH(payload.data)
+        : initialState;
     default:
       return state;
   }

package/src/reducers/lineageQuery.js

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

package/src/reducers/structureImpactGraph.js

@@ -19,7 +19,7 @@ export const structureImpactGraph = (
       return initialState;
     case createGraph.SUCCESS:
     case fetchStructureGraph.SUCCESS:
-      return !payload?.data?.fromLineageContextMenu &&
+      return !payload?.data?.isRedirected &&
         _.pathEq("data.opts.type", "impact")(payload)
         ? _.prop("data")(payload)
         : state;

package/src/reducers/structureLineageGraph.js

@@ -19,7 +19,7 @@ export const structureLineageGraph = (
       return initialState;
     case createGraph.SUCCESS:
     case fetchStructureGraph.SUCCESS:
-      return !payload?.data?.fromLineageContextMenu &&
+      return !payload?.data?.isRedirected &&
         _.pathEq("data.opts.type", "lineage")(payload)
         ? _.prop("data")(payload)
         : state;

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

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

package/src/sagas/createGraph.js

@@ -51,7 +51,7 @@ export function* createGraphSaga() {
       const pollingTask = yield fork(
         polling,
         graphAcceptedOrCreated,
-        body.fromLineageContextMenu
+        body.isRedirected
       );
 
       // wait for the user stop action
@@ -65,7 +65,7 @@ export function* createGraphSaga() {
           ...graphAcceptedOrCreated,
           data: {
             ...graphAcceptedOrCreated.data,
-            fromLineageContextMenu: body.fromLineageContextMenu,
+            isRedirected: body.isRedirected,
           },
         })
       );
@@ -82,7 +82,7 @@ export function* createGraphSaga() {
   }
 }
 
-export function* polling(graphAccepted, fromLineageContextMenu) {
+export function* polling(graphAccepted, isRedirected) {
   const backoff = exponentialBackoff(1.2, 0);
   let backoffTime,
     retry = 0,
@@ -128,7 +128,7 @@ export function* polling(graphAccepted, fromLineageContextMenu) {
     ? yield put(
         createGraph.success({
           ...graphResp,
-          data: { ...graphResp.data, fromLineageContextMenu },
+          data: { ...graphResp.data, isRedirected },
         })
       )
     : yield put(createGraph.failure({}));