@truedat/dd 4.35.4 → 4.35.8

package/CHANGELOG.md

@@ -1,10 +1,24 @@
 # Changelog
 
+## [4.35.8] 2022-01-07
+
+### Added
+
+- [TD-4390] Support for alias on Implementation
+
+## [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
 
-- # [TD-4356] Improve structure types view performance by doing optional the metadata fields column
+- [TD-4356] Improve structure types view performance by doing optional the metadata fields column
 
 ## [4.35.3] 2021-12-20
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.35.4",
+  "version": "4.35.8",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.35.4",
-    "@truedat/core": "4.35.4",
-    "@truedat/df": "4.35.4",
+    "@truedat/auth": "4.35.8",
+    "@truedat/core": "4.35.8",
+    "@truedat/df": "4.35.8",
     "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": "b03fba26635e365bbab64a6de1dd9a155925b5d1"
+  "gitHead": "35a51ffb36f357fe814258d51420d5ace5b3cd63"
 }

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/StructureFieldsDropdown.js

@@ -8,6 +8,7 @@ import { getStructuresFields } from "../selectors/getStructuresFields";
 
 export const StructureFieldsDropdown = ({
   label,
+  fluid,
   inline,
   onSelectField,
   structureFields,
@@ -17,22 +18,33 @@ export const StructureFieldsDropdown = ({
 }) => {
   const { formatMessage } = useIntl();
   const onClick = ({ value, modifier }) => {
-    const field = _.find(_.propEq("data_structure_id", value))(structureFields);
+    const [data_structure_id, parent_index] = _.isString(value)
+      ? value.split("/").map(Number)
+      : [value, undefined];
+    const field = _.isNil(parent_index)
+      ? _.find({ data_structure_id: data_structure_id })(structureFields)
+      : _.find({
+          data_structure_id: data_structure_id,
+          parent_index: parent_index,
+        })(structureFields);
     onSelectField(field, modifier);
   };
 
   const formatOption = (field) => {
+    const value = _.isNil(field?.parent_index)
+      ? field.data_structure_id
+      : `${field.data_structure_id}/${field.parent_index}`;
     const modifier = _.find({ sourceType: field.field_type })(
       typeCastModifiers
     );
     if (modifier) {
       return {
-        key: field.data_structure_id,
+        key: value,
         text: `${field.name} (${formatMessage({
           id: `filtersGrid.field.modifier.${modifier.name}`,
         })})`,
         modifier,
-        value: field.data_structure_id,
+        value: value,
         icon: formatMessage({
           id: `field_type.icon.${field.field_type}`,
           defaultMessage: "hashtag",
@@ -41,9 +53,9 @@ export const StructureFieldsDropdown = ({
     }
 
     return {
-      key: field.data_structure_id,
+      key: value,
       text: field.name,
-      value: field.data_structure_id,
+      value: value,
       icon: formatMessage({
         id: `field_type.icon.${field.field_type}`,
         defaultMessage: "hashtag",
@@ -88,6 +100,7 @@ export const StructureFieldsDropdown = ({
 
   return (
     <OptionGroup
+      fluid={fluid}
       inline={inline}
       label={label}
       value={value}
@@ -102,6 +115,7 @@ export const StructureFieldsDropdown = ({
 
 StructureFieldsDropdown.propTypes = {
   label: PropTypes.string,
+  fluid: PropTypes.bool,
   inline: PropTypes.bool,
   value: PropTypes.number,
   structureFields: PropTypes.array,

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/components/StructureSelectorInputField.js

@@ -34,6 +34,12 @@ export const StructureSelectorInputField = ({
     onChangeField({ ...selectedStructure, clauses });
   };
 
+  const aliasIsNeeded =
+    _.flow(
+      _.map(_.path("structure.id")),
+      _.filter((s) => s === selectedStructure?.structure?.id)
+    )(structures).length > 1;
+
   return (
     <>
       <Form.Field>
@@ -74,6 +80,30 @@ export const StructureSelectorInputField = ({
           />
         )}
       </Form.Field>
+      {aliasIsNeeded && (
+        <Container style={{ paddingLeft: "8em" }}>
+          <Form.Field>
+            <label>
+              {formatMessage({
+                id: `ruleImplementation.props.structure.alias`,
+              })}
+            </label>
+            <Form.Input
+              width={fieldWidth ? fieldWidth : 7}
+              value={selectedStructure?.alias?.text || ""}
+              onChange={(e) =>
+                onChangeField({
+                  ...selectedStructure,
+                  alias: {
+                    ...(selectedStructure?.alias || {}),
+                    text: e.target.value,
+                  },
+                })
+              }
+            />
+          </Form.Field>
+        </Container>
+      )}
       {joined && _.prop("structure")(selectedStructure) && (
         <Container style={{ paddingLeft: "8em" }}>
           <Form.Field>

package/src/components/StructureSelectorInputFieldJoin.js

@@ -2,10 +2,10 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
-import { Form, Icon, Popup } from "semantic-ui-react";
+import { Grid, Icon, Popup } from "semantic-ui-react";
 import StructureFieldsDropdown from "./StructureFieldsDropdown";
 
-const getClauses = selectedStructure => {
+const getClauses = (selectedStructure) => {
   const clauses = _.getOr([], "clauses")(selectedStructure);
   return _.isEmpty(clauses) ? [{}] : clauses;
 };
@@ -14,15 +14,21 @@ const getParentStructures = (structures, selectedStructure) => {
   return structures && selectedStructure
     ? _.flow(
         _.filter(
-          s =>
-            _.path("structure.id")(s) !==
-            _.path("structure.id")(selectedStructure)
+          (s) =>
+            _.path("alias.index")(s) !==
+            _.path("alias.index")(selectedStructure)
         ),
         _.defaultTo([])
       )(structures)
     : [];
 };
 
+const structureToFieldDropdown = (structures) =>
+  _.map((s) => ({
+    ..._.prop("structure")(s),
+    alias: _.prop("alias")(s),
+  }))(structures);
+
 const JoinClause = ({
   createClause,
   deleteClause,
@@ -31,33 +37,43 @@ const JoinClause = ({
   left,
   parentStructures,
   right,
-  selectedStructure
+  selectedStructure,
 }) => {
   const addActionDisabled = _.isEmpty(left) || _.isEmpty(right);
   const { formatMessage } = useIntl();
   return (
-    <Form.Group inline>
-      <Form.Field width={4}>
+    <Grid>
+      <Grid.Column width={4}>
         <StructureFieldsDropdown
-          parentStructures={[_.prop("structure")(selectedStructure)]}
+          fluid
+          parentStructures={structureToFieldDropdown([selectedStructure])}
           onSelectField={handleChange("left", idx)}
-          value={_.prop("id")(left)}
+          value={
+            _.isNil(_.prop("parent_index")(left))
+              ? _.prop("id")(left)
+              : `${_.prop("id")(left)}/${_.prop("parent_index")(left)}`
+          }
         />
-      </Form.Field>
-      <Form.Field width={1}>{"="}</Form.Field>
-      <Form.Field width={4}>
+      </Grid.Column>
+      <Grid.Column width={1}>{"="}</Grid.Column>
+      <Grid.Column width={4}>
         <StructureFieldsDropdown
-          parentStructures={_.map(_.prop("structure"))(parentStructures)}
+          fluid
+          parentStructures={structureToFieldDropdown(parentStructures)}
           onSelectField={handleChange("right", idx)}
-          value={_.prop("id")(right)}
+          value={
+            _.isNil(_.prop("parent_index")(right))
+              ? _.prop("id")(right)
+              : `${_.prop("id")(right)}/${_.prop("parent_index")(right)}`
+          }
         />
-      </Form.Field>
-      <Form.Field width={1}>
+      </Grid.Column>
+      <Grid.Column width={1}>
         {
           <Popup
             disabled={!addActionDisabled}
             content={formatMessage({
-              id: "dataset.form.button.add_join.popup"
+              id: "dataset.form.button.add_join.popup",
             })}
             trigger={
               <Icon
@@ -69,8 +85,8 @@ const JoinClause = ({
             }
           />
         }
-      </Form.Field>
-      <Form.Field width={1}>
+      </Grid.Column>
+      <Grid.Column width={1}>
         {idx > 0 && (
           <Icon
             name="trash"
@@ -78,8 +94,8 @@ const JoinClause = ({
             onClick={() => deleteClause(idx)}
           />
         )}
-      </Form.Field>
-    </Form.Group>
+      </Grid.Column>
+    </Grid>
   );
 };
 
@@ -91,24 +107,27 @@ JoinClause.propTypes = {
   selectedStructure: PropTypes.object,
   createClause: PropTypes.func,
   deleteClause: PropTypes.func,
-  handleChange: PropTypes.func
+  handleChange: PropTypes.func,
 };
 
 export const StructureSelectorInputFieldJoin = ({
   structures,
   selectedStructure,
-  handleSelectField
+  handleSelectField,
 }) => {
   const clauses = getClauses(selectedStructure);
   const parentStructures = getParentStructures(structures, selectedStructure);
   const createClause = () => handleSelectField([...clauses, {}]);
   const removeAt = (arr, idx) => [
     ..._.slice(0, idx)(arr),
-    ..._.slice(idx + 1, arr.length)(arr)
+    ..._.slice(idx + 1, arr.length)(arr),
   ];
-  const deleteClause = idx => handleSelectField(removeAt(clauses, idx));
-  const handleChange = (prop, idx) => ({ data_structure_id: id }) => {
-    const newClause = { ...clauses[idx], [prop]: { id } };
+  const deleteClause = (idx) => handleSelectField(removeAt(clauses, idx));
+  const handleChange = (prop, idx) => (data) => {
+    const { data_structure_id: id, parent_index: parent_index } = data;
+    const newClause = _.isNil(parent_index)
+      ? { ...clauses[idx], [prop]: { id } }
+      : { ...clauses[idx], [prop]: { id, parent_index } };
     const newClauses = _.set(`[${idx}]`, newClause)(clauses);
     handleSelectField(newClauses);
   };
@@ -134,7 +153,7 @@ export const StructureSelectorInputFieldJoin = ({
 StructureSelectorInputFieldJoin.propTypes = {
   structures: PropTypes.array,
   selectedStructure: PropTypes.object,
-  handleSelectField: PropTypes.func
+  handleSelectField: PropTypes.func,
 };
 
 export default StructureSelectorInputFieldJoin;

package/src/components/__tests__/__snapshots__/GrantRequest.spec.js.snap

@@ -378,7 +378,7 @@ exports[`<GrantRequest /> matches the latest snapshot with approve actions 1`] =
             role="listitem"
           >
             <div
-              class="header"
+              class="header dynamic-field-header"
             >
               bar
             </div>
@@ -386,7 +386,7 @@ exports[`<GrantRequest /> matches the latest snapshot with approve actions 1`] =
               class="description"
             >
               <div
-                style="white-space: pre-wrap;"
+                class="default-value"
               >
                 baz
               </div>
@@ -644,7 +644,7 @@ exports[`<GrantRequest /> matches the latest snapshot with failed status 1`] = `
             role="listitem"
           >
             <div
-              class="header"
+              class="header dynamic-field-header"
             >
               bar
             </div>
@@ -652,7 +652,7 @@ exports[`<GrantRequest /> matches the latest snapshot with failed status 1`] = `
               class="description"
             >
               <div
-                style="white-space: pre-wrap;"
+                class="default-value"
               >
                 baz
               </div>

package/src/components/__tests__/__snapshots__/StructureSelectorInputFieldJoin.spec.js.snap

@@ -1,37 +1,39 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snapshot 1`] = `
-<FormGroup
-  inline={true}
->
-  <FormField
+<Grid>
+  <GridColumn
     width={4}
   >
     <Connect(StructureFieldsDropdown)
+      fluid={true}
       onSelectField={[Function]}
       parentStructures={
         Array [
-          undefined,
+          Object {
+            "alias": undefined,
+          },
         ]
       }
       value="7"
     />
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={1}
   >
     =
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={4}
   >
     <Connect(StructureFieldsDropdown)
+      fluid={true}
       onSelectField={[Function]}
       parentStructures={Array []}
       value="8"
     />
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={1}
   >
     <Popup
@@ -57,8 +59,8 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snaps
         />
       }
     />
-  </FormField>
-  <FormField
+  </GridColumn>
+  <GridColumn
     width={1}
   >
     <Icon
@@ -67,8 +69,8 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snaps
       name="trash"
       onClick={[Function]}
     />
-  </FormField>
-</FormGroup>
+  </GridColumn>
+</Grid>
 `;
 
 exports[`<StructureSelectorInputFieldJoin /> matches the latest snapshot 1`] = `

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({}));
 }
 

package/src/selectors/getStructuresFields.js

@@ -12,7 +12,8 @@ const getFields = (parent, structuresFields) =>
     _.propOr([], _.path("id")(parent)),
     _.map((sf) => ({
       ...sf,
-      label: _.prop("name")(parent),
+      label: _.prop("alias.text")(parent) || _.prop("name")(parent),
+      parent_index: _.prop("alias.index")(parent),
     }))
   )(structuresFields);
 
@@ -20,7 +21,7 @@ const getFieldsFromStructures = (structuresFields, parentStructures) =>
   _.flow(
     _.map((parent) => getFields(parent, structuresFields)),
     _.flatten,
-    _.uniqBy("data_structure_id"),
+    _.uniqBy((s) => `${s.data_structure_id}/${s.parent_index}`),
     _.map(withFieldType)
   )(parentStructures);