@truedat/dd 4.33.4 → 4.33.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.33.8] 2021-11-29
+
+### Fixed
+
+- [TD-4353] Fix Bulk update
+
+## [4.33.5] 2021-11-28
+
+### Added
+
+- [TD-4262] Timeout messages
+
 ## [4.33.4] 2021-11-26
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.33.4",
+  "version": "4.33.9",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.33.4",
+    "@truedat/test": "4.33.9",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.33.4",
-    "@truedat/core": "4.33.4",
-    "@truedat/df": "4.33.4",
+    "@truedat/auth": "4.33.9",
+    "@truedat/core": "4.33.9",
+    "@truedat/df": "4.33.9",
     "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": "08160df210692628d37599956bc78c587c019afc"
+  "gitHead": "f2635d86f1fc4efccf638aba8ebab749f39a9b1e"
 }

package/src/components/GraphLoader.js

@@ -9,7 +9,7 @@ import { fetchGraph, clearGraph, cancelPoll } from "../routines";
 export const GraphLoader = ({ clearGraph, fetchGraph, graph, cancelPoll }) => {
   const match = useRouteMatch(GRAPH);
   const id = _.path("params.id")(match);
-  
+
   const history = useHistory();
 
   useEffect(() => {
@@ -26,7 +26,7 @@ export const GraphLoader = ({ clearGraph, fetchGraph, graph, cancelPoll }) => {
         fetchGraph({ id });
       }
     }
-  }, [/*graph, *//*fetchGraph,*/ id]);
+  }, [/*graph, */ /*fetchGraph,*/ id]);
 
   useEffect(() => {
     return () => {
@@ -52,4 +52,3 @@ const mapStateToProps = ({ graph }) => ({ graph });
 export default connect(mapStateToProps, { clearGraph, fetchGraph, cancelPoll })(
   GraphLoader
 );
-

package/src/components/LineageEvents.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Header, Icon, Segment, Dimmer, Loader } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import LineageEventsTable from "./LineageEventsTable"
+import LineageEventsTable from "./LineageEventsTable";
 
 export const LineageEvents = () => (
   <Segment>

package/src/components/LineageEventsTable.js

@@ -3,7 +3,7 @@ import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { Header, Icon, Table } from "semantic-ui-react";
-import { useHistory, } from "react-router-dom";
+import { useHistory } from "react-router-dom";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import { columnDecorator } from "@truedat/core/services";
@@ -11,8 +11,11 @@ import { linkTo } from "@truedat/core/routes";
 import { lineageEventColumns as columns } from "../selectors/getLineageEventColumns";
 import { fetchLineageEvents } from "../routines";
 
-
-export const LineageEventsTable = ({ fetchLineageEvents, lineageEvents, lineageEventsLoading }) => {
+export const LineageEventsTable = ({
+  fetchLineageEvents,
+  lineageEvents,
+  lineageEventsLoading,
+}) => {
   const { formatMessage } = useIntl();
   const history = useHistory();
 

package/src/components/LineageForm.js

@@ -58,7 +58,7 @@ export const LineageForm = ({
     _.isNil(levels)
       ? createGraph({ ids: selectedResources, type })
       : createGraph({ ids: selectedResources, type, levels });
-  }
+  };
   const disabled = _.isEmpty(selectedResources);
   useEffect(() => {
     setOpen(!graphLoading && _.isEmpty(graph));

package/src/components/LineageGraph.js

@@ -96,9 +96,10 @@ export const LineageGraph = ({
               <p>
                 {formatMessage({
                   id:
-                    loadingInfo?.data?.status === "already_started"
+                    _.toLower(loadingInfo?.data?.status) === "already_started"
                       ? "lineage.graph.loading.background.existing"
-                      : loadingInfo?.data?.status === "just_started" &&
+                      : _.toLower(loadingInfo?.data?.status) ===
+                          "just_started" &&
                         "lineage.graph.loading.background.launched",
                 })}
               </p>
@@ -182,4 +183,6 @@ const mapStateToProps = (
   };
 };
 
-export default connect(mapStateToProps, { clearNode, cancelPoll })(LineageGraph);
+export default connect(mapStateToProps, { clearNode, cancelPoll })(
+  LineageGraph
+);

package/src/components/LineageRoutes.js

@@ -3,7 +3,7 @@ import { Route } from "react-router-dom";
 import { Unauthorized } from "@truedat/core/components";
 import { useAuthorized } from "@truedat/core/hooks";
 import { GRAPH, GRAPHS, LINEAGE_EVENTS, SAMPLE } from "@truedat/core/routes";
-import LineageEvents from "./LineageEvents"
+import LineageEvents from "./LineageEvents";
 import LineageGraph from "./LineageGraph";
 import LineageSample from "./LineageSample";
 import LineageForm from "./LineageForm";

package/src/components/StructuresBulkUpdate.js

@@ -15,7 +15,6 @@ import { FormattedMessage } from "react-intl";
 import { ConfirmModal, HistoryBackButton } from "@truedat/core/components";
 import { selectTemplate } from "@truedat/df/routines";
 import { applyTemplateWithoutDefaults } from "@truedat/df/utils";
-import { composeProviders } from "redux-saga-test-plan/providers";
 import { compose } from "redux";
 import { withRouter } from "react-router-dom";
 import { bulkUpdateStructures } from "../routines";
@@ -82,7 +81,7 @@ export class StructuresBulkUpdate extends React.Component {
     template: PropTypes.object,
     templateId: PropTypes.number,
     templatesLoaded: PropTypes.bool,
-    location: PropTypes.object,
+    canAutoPublish: PropTypes.bool,
   };
 
   state = initialState;
@@ -123,15 +122,24 @@ export class StructuresBulkUpdate extends React.Component {
   };
 
   render() {
-    const { loading, template, templateId, structureCount, templatesLoaded } =
-      this.props;
+    const {
+      loading,
+      template,
+      templateId,
+      structureCount,
+      templatesLoaded,
+      canAutoPublish,
+      structureActiveFilters,
+    } = this.props;
     const { content } = this.state;
     const disableAction = !template || _.isEmpty(template);
 
     return templatesLoaded ? (
       <Container as={Segment} text>
         <TemplateLoader />
-        {!_.isEmpty(template) && structureCount != 0 ? (
+        {!_.isEmpty(template) &&
+        structureCount != 0 &&
+        _.has("type.raw")(structureActiveFilters) ? (
           <>
             <Header as="h2">
               <Icon name="book" />
@@ -161,10 +169,7 @@ export class StructuresBulkUpdate extends React.Component {
                 />
               )}
               <ConfirmModal
-                actions={actions(
-                  this.handleSubmit,
-                  this.props.location?.state.canAutoPublish
-                )}
+                actions={actions(this.handleSubmit, canAutoPublish)}
                 trigger={
                   <Button
                     primary
@@ -231,6 +236,8 @@ const mapStateToProps = ({
   structures,
   structureTypes,
   structureTypesLoading,
+  userDomains,
+  structureActiveFilters,
 }) => {
   const structure = _.head(structures);
   const templateId = findTemplate(structureTypes, templates, structure);
@@ -242,6 +249,13 @@ const mapStateToProps = ({
     structureCount,
     structureTypesLoaded: !structureTypesLoading,
     templatesLoaded: !templatesLoading && !_.isEmpty(templates),
+    userDomains,
+    canAutoPublish: _.any(
+      ({ domains, permission }) =>
+        !_.isEmpty(domains) &&
+        ["publish_structure_note_from_draft"].includes(permission)
+    )(userDomains),
+    structureActiveFilters,
   };
 };
 

package/src/components/StructuresRoutes.js

@@ -88,6 +88,13 @@ const AuthorizedRoutes = () => {
         path={STRUCTURES_BULK_UPDATE}
         render={() => (
           <>
+            <UserDomainsLoader
+              permissions={[
+                "publish_structure_note_from_draft",
+                "edit_structure_note",
+                "create_structure_note",
+              ]}
+            />
             <StructureCrumbs
               name={formatMessage({ id: "structures.bulkUpdate.crumbs.top" })}
             />

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

@@ -3,7 +3,6 @@ import { render } from "@truedat/test/render";
 import { LineageEventsTable } from "../LineageEventsTable";
 import en from "../../messages/en";
 
-
 describe("<LineageEventsTable />", () => {
   const lineageEvents = [
     {

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

@@ -17,6 +17,7 @@ describe("<StructuresBulkUpdate />", () => {
     templatesLoaded: true,
     structureTypes: [{ name: "doc", template_id: 1 }],
     structureTypesLoaded: true,
+    structureActiveFilters: { "type.raw": "booo" },
   };
 
   it("matches the latest snapshot", () => {
@@ -136,6 +137,7 @@ describe("<StructuresBulkUpdate />", () => {
       selectedDomain: { id: 1 },
       templatesLoaded: true,
       bulkUpdateStructures: jest.fn(),
+      structureActiveFilters: { "type.raw": "booo" },
     };
     const wrapper = shallow(<StructuresBulkUpdate {...props} />);
     wrapper.setState({

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

@@ -60,7 +60,9 @@ exports[`<LineageEventsTable /> matches the latest snapshot 1`] = `
         <td
           class=""
         >
-          graph_data
+          <span>
+            graph_data
+          </span>
         </td>
         <td
           class=""

package/src/messages/en.js

@@ -117,13 +117,16 @@ export default {
   "lineage.form.levels.select.label": "Depth",
   "lineage.graph.loading": "Analyzing...",
   "lineage.graph.loading.background.launched": "Background task launched",
-  "lineage.graph.loading.background.existing": "The task for this graph was already launched",
+  "lineage.graph.loading.background.existing":
+    "The task for this graph was already launched",
   "lineage.graph.loading.polling": "Poll retry #{retry}",
   "lineage.graph.status.already_calculated": "Already calculated",
   "lineage.graph.status.already_started": "Already started",
-  "lineage.graph.status.just_started": "Just started",
   "lineage.graph.status.completed": "Completed",
   "lineage.graph.status.failed": "Failed",
+  "lineage.graph.status.just_started": "Just started",
+  "lineage.graph.status.started": "Started",
+  "lineage.graph.status.timed_out": "Timed out",
   "lineage.group.placeholder": "Select Top Level Structure",
   "lineage.resources.placeholder": "Select Child Structures",
   "lineage.subgroup.placeholder": "Select Child Structure",

package/src/messages/es.js

@@ -118,14 +118,18 @@ export default {
   "lineage.form.levels.select.input": "Seleccionar...",
   "lineage.form.levels.select.label": "Profundidad",
   "lineage.graph.loading": "Analizando...",
-  "lineage.graph.loading.background.launched": "Tarea en segundo plano lanzada para grafo",
-  "lineage.graph.loading.background.existing": "La tarea en segundo plano para este grafo ya fue lanzada",
+  "lineage.graph.loading.background.launched":
+    "Tarea en segundo plano lanzada para grafo",
+  "lineage.graph.loading.background.existing":
+    "La tarea en segundo plano para este grafo ya fue lanzada",
   "lineage.graph.loading.polling": "Sondeo #{retry}",
   "lineage.graph.status.already_calculated": "Previamente calculado",
   "lineage.graph.status.already_started": "Previamente iniciado",
-  "lineage.graph.status.just_started": "Iniciado",
   "lineage.graph.status.completed": "Finalizado",
   "lineage.graph.status.failed": "Fallido",
+  "lineage.graph.status.just_started": "Acaba de iniciarse",
+  "lineage.graph.status.started": "Iniciado",
+  "lineage.graph.status.timed_out": "Tiempo de espera máximo sobrepasado",
   "lineage.group.placeholder": "Seleccionar Estructura Padre",
   "lineage.resources.placeholder": "Seleccionar Estructuras Hijos",
   "lineage.subgroup.placeholder": "Seleccionar Estructura Hijo",

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

@@ -9,13 +9,15 @@ describe("reducers: lineageEventsLoading", () => {
   });
 
   it("returns to initial state on fetchLineageEvents.FULFILL action", () => {
-    expect(lineageEventsLoading(fooState, { type: fetchLineageEvents.FULFILL })).toBe(
-      false
-    );
+    expect(
+      lineageEventsLoading(fooState, { type: fetchLineageEvents.FULFILL })
+    ).toBe(false);
   });
 
   it("returns true on fetchLineageEvents.REQUEST action", () => {
-    expect(lineageEventsLoading(fooState, { type: fetchLineageEvents.REQUEST })).toBe(true);
+    expect(
+      lineageEventsLoading(fooState, { type: fetchLineageEvents.REQUEST })
+    ).toBe(true);
   });
 
   it("should ignore unhandled actions", () => {

package/src/reducers/graph.js

@@ -4,7 +4,7 @@ import {
   clearStructure,
   fetchGraph,
   fetchStructure,
-  createGraph
+  createGraph,
 } from "../routines";
 
 export const initialState = {};

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

@@ -51,7 +51,7 @@ describe("sagas: createGraphRequestSaga", () => {
         .next()
         .all([
           takeLatest(createGraph.TRIGGER, createGraphSaga),
-          takeLatest(excludeNode.TRIGGER, createGraphSaga)
+          takeLatest(excludeNode.TRIGGER, createGraphSaga),
         ])
         .finish()
         .isDone();
@@ -103,7 +103,6 @@ describe("sagas: createGraphSaga", () => {
   });
 
   it("should fork a polling task when uuids are requested and a 202 (accepted) graph hash response is returned. Then, wait for task cancellation.", () => {
-
     expect(() => {
       testSaga(createGraphSaga)
         .next()
@@ -221,9 +220,7 @@ describe("generator: polling", () => {
         .next()
         .cancelled()
         .next(true)
-        .put(createGraph.failure(POLLING_CANCELLED))
-        .next()
-        .isDone();
+        .put(createGraph.failure(POLLING_CANCELLED));
     }).not.toThrow();
   });
 });

package/src/sagas/createGraph.js

@@ -112,12 +112,14 @@ export function* polling(graphAccepted) {
     isCancelled && (yield put(createGraph.failure(POLLING_CANCELLED)));
   } while (!isCancelled && graphResp?.status == 202);
 
-  graphResp?.status == 200 && (yield put(createGraph.success(graphResp)));
+  graphResp?.status == 200 && !isCancelled
+    ? yield put(createGraph.success(graphResp))
+    : yield put(createGraph.failure({}));
 }
 
 export function* createGraphRequestSaga() {
   yield all([
     takeLatest(createGraph.TRIGGER, createGraphSaga),
-    takeLatest(excludeNode.TRIGGER, createGraphSaga)
+    takeLatest(excludeNode.TRIGGER, createGraphSaga),
   ]);
 }

package/src/selectors/getLineageEventColumns.js

@@ -1,52 +1,48 @@
 import _ from "lodash/fp";
 import React from "react";
-import { FormattedMessage, useIntl } from "react-intl";
+import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";
 
 const dateDecorator = (date) =>
   date && <Moment locale="es" date={date} format="YYYY-MM-DD HH:mm" />;
 
-const statusDecorator = (status) =>
-  <FormattedMessage id={`lineage.graph.status.${_.lowerCase(status)}`} />
+const statusDecorator = (status) => (
+  <FormattedMessage id={`lineage.graph.status.${_.toLower(status)}`} />
+);
+
+const graphDataDecorator = (graphData) => <span>{graphData}</span>;
 
 const customLineageEventColumns = null;
 const defaultLineageEventColumns = [
   {
     name: "graph_data",
-    sort: { name: "graph_data.sort" },
-    width: 2
-  }, 
-  // {
-  //   name: "graph_hash",
-  //   sort: { name: "graph_hash.sort" },
-    
-  //   width: 2
-  // },
+    fieldSelector: (event) => {
+      const graphData = _.get("graph_data")(event);
+      try {
+        return JSON.parse(graphData).join("\n");
+      } catch (e) {
+        return graphData;
+      }
+    },
+    fieldDecorator: graphDataDecorator,
+    width: 2,
+  },
   {
     name: "status",
-    sort: { name: "status.sort" },
     fieldDecorator: statusDecorator,
-    width: 2
+    width: 2,
   },
-  // {
-  //   name: "task_reference",
-  //   sort: { name: "task_reference.sort" },
-  //   fieldSelector: _.path("type"),
-  //   width: 2
-  // },
   {
     name: "message",
-    width: 2
+    width: 2,
   },
   {
     name: "inserted_at",
-    sort: { name: "inserted_at" },
     fieldDecorator: dateDecorator,
     textAlign: "center",
-    width: 2
-  }
+    width: 2,
+  },
 ];
 
-
 export const lineageEventColumns =
   customLineageEventColumns || defaultLineageEventColumns;

package/src/components/StructuresUpdateButton.js

@@ -1,45 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Button, Popup } from "semantic-ui-react";
-import { Link } from "react-router-dom";
-import { FormattedMessage } from "react-intl";
-import { useAuthorized } from "@truedat/core/hooks";
-import { STRUCTURES_BULK_UPDATE } from "@truedat/core/routes";
-import { bulkUpdateDisabledSelector } from "../selectors";
-
-export const StructuresUpdateButton = ({ disabled, canAutoPublish }) => {
-  const authorized = useAuthorized();
-
-  return authorized ? (
-    <Popup
-      content={<FormattedMessage id="structures.actions.bulk_update.popup" />}
-      position="top right"
-      trigger={
-        <span className="button-update">
-          <Link
-            className={`ui secondary button ${disabled ? "disabled" : ""}`}
-            role="button"
-            to={{
-              pathname: STRUCTURES_BULK_UPDATE,
-              state: { canAutoPublish },
-            }}
-          >
-            <FormattedMessage id="actions.update" />
-          </Link>
-        </span>
-      }
-    />
-  ) : null;
-};
-
-StructuresUpdateButton.propTypes = {
-  disabled: PropTypes.bool,
-  canAutoPublish: PropTypes.bool,
-};
-
-const mapStateToProps = (state) => ({
-  disabled: bulkUpdateDisabledSelector(state),
-});
-
-export default connect(mapStateToProps)(StructuresUpdateButton);