@truedat/dd 4.44.4 → 4.44.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.44.4",
+  "version": "4.44.5",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -22,20 +22,20 @@
     "eslint:fix": "eslint --fix src/**"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+    "@babel/cli": "^7.17.10",
+    "@babel/core": "^7.18.0",
+    "@babel/plugin-proposal-class-properties": "^7.17.12",
+    "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.17.12",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-react": "^7.14.5",
-    "@testing-library/jest-dom": "^5.14.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.18.0",
+    "@babel/preset-env": "^7.18.0",
+    "@babel/preset-react": "^7.17.12",
+    "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.44.4",
-    "babel-jest": "^27.0.6",
+    "@truedat/test": "4.44.5",
+    "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-react-intl": "^5.1.18",
@@ -44,7 +44,8 @@
     "enzyme-adapter-react-16": "^1.15.6",
     "enzyme-to-json": "^3.6.2",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^27.0.6",
+    "jest": "^28.1.0",
+    "jest-environment-jsdom": "^28.1.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "redux-saga-test-plan": "^4.0.4",
@@ -52,6 +53,8 @@
     "semantic-ui-react": "^2.0.3"
   },
   "jest": {
+    "maxWorkers": "50%",
+    "testTimeout": 10000,
     "moduleDirectories": [
       "<rootDir>/src",
       "../../node_modules"
@@ -84,15 +87,16 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.44.4",
-    "@truedat/core": "4.44.4",
-    "@truedat/df": "4.44.4",
+    "@apollo/client": "^3.6.4",
+    "@truedat/auth": "4.44.5",
+    "@truedat/core": "4.44.5",
+    "@truedat/df": "4.44.5",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.8.1",
     "react-hook-form": "^7.30.0",
     "react-intl": "^5.20.10",
-    "react-moment": "^0.9.7",
+    "react-moment": "^1.1.2",
     "react-redux": "^7.2.4",
     "react-router-dom": "^5.2.0",
     "react-vis": "^1.11.7",
@@ -107,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "36fb183e1d22181e6a15b3bac2c01b39214eacdb"
+  "gitHead": "5a339468198c803592b285eddd0dd0c0b0eced93"
 }

package/src/components/EditDomainPopup.js

@@ -15,7 +15,7 @@ export const EditDomainPopup = ({ userPermissions, saving, text }) => {
     }
   }, [saving]);
 
-  return userPermissions.update && userPermissions.update_domain ? (
+  return userPermissions?.update && userPermissions?.update_domain ? (
     <Popup
       on="click"
       basic

package/src/components/GrantFilters.js

@@ -1,13 +1,9 @@
-import React from "react";
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
+import { AvailableFilters } from "@truedat/core/components";
 import { addGrantFilter, resetGrantFilters } from "../routines";
 import { getGrantAvailableFilters } from "../selectors";
 
-const AvailableFilters = React.lazy(() =>
-  import("@truedat/core/components/AvailableFilters")
-);
-
 const mapStateToProps = (state) => {
   return {
     filters: getGrantAvailableFilters(state),

package/src/components/PendingStructureNotes.js

@@ -45,7 +45,7 @@ export const PendingStructureNotes = ({ systems }) => {
   });
   const { loading, error, data } = useQuery(STRUCTURE_NOTES, {
     variables: { filter },
-    fetchPolicy: "network-only",
+    fetchPolicy: "cache-and-network",
   });
   const items = loading || error ? [] : data?.structure_notes;
   const { control } = useForm({

package/src/components/StructureConfidentialButton.js

@@ -34,7 +34,7 @@ export class StructureConfidentialButton extends React.Component {
       userPermissions,
     } = this.props;
 
-    if (!userPermissions.confidential || !userPermissions.update) return null;
+    if (!userPermissions?.confidential || !userPermissions?.update) return null;
 
     const buttonText = structure.confidential
       ? formatMessage({ id: "structure.mark_as_public" })

package/src/components/StructureFilters.js

@@ -1,13 +1,9 @@
-import React from "react";
 import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
+import { AvailableFilters } from "@truedat/core/components";
 import { addStructureFilter, resetStructureFilters } from "../routines";
 import { getStructureAvailableFilters } from "../selectors";
 
-const AvailableFilters = React.lazy(() =>
-  import("@truedat/core/components/AvailableFilters")
-);
-
 const mapStateToProps = (state) => ({
   filters: getStructureAvailableFilters(state),
   disabled: state.structureFiltersLoading,

package/src/components/StructureNotesEdit.js

@@ -5,7 +5,7 @@ import { connect } from "react-redux";
 import { Button, Form, Segment } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { HistoryBackButton } from "@truedat/core/components";
-import { selectTemplate, selectDomain } from "@truedat/df/routines";
+import { selectTemplate, selectDomains } from "@truedat/df/routines";
 import { applyTemplate, validateContent } from "@truedat/df/utils";
 import { doStructureNoteAction } from "../routines";
 import { getLatestDfContent } from "../selectors/getSortedStructureNotes";
@@ -24,16 +24,16 @@ export const StructureNotesEdit = ({
   template,
   doStructureNoteAction,
   selectTemplate,
-  selectDomain,
+  selectDomains,
   structureNotes,
   latestDfContent,
 }) => {
   const [content, setContent] = useState(latestDfContent);
 
   useEffect(() => {
-    selectDomain({ id: structure.domain_id });
+    selectDomains(structure.domain_ids);
     if (template) selectTemplate(template);
-  }, [template, structure, selectTemplate, selectDomain]);
+  }, [template, structure, selectTemplate, selectDomains]);
 
   useEffect(() => {
     if (template && latestDfContent) {
@@ -90,7 +90,7 @@ StructureNotesEdit.propTypes = {
   template: PropTypes.object,
   doStructureNoteAction: PropTypes.func,
   selectTemplate: PropTypes.func,
-  selectDomain: PropTypes.func,
+  selectDomains: PropTypes.func,
   structureNotes: PropTypes.object,
   latestDfContent: PropTypes.object,
 };
@@ -118,6 +118,6 @@ const mapStateToProps = (state) => {
 
 export default connect(mapStateToProps, {
   selectTemplate,
-  selectDomain,
+  selectDomains,
   doStructureNoteAction,
 })(StructureNotesEdit);

package/src/components/StructureProperties.js

@@ -21,7 +21,10 @@ export const StructureProperties = ({ properties, structure }) => {
                 <Item>
                   <Item.Content>
                     <Item.Header as="h5">
-                      <FormattedMessage id={`structure.${property.name}`} />
+                      <FormattedMessage
+                        id={`structure.${property.name}`}
+                        defaultMessage={property.name}
+                      />
                     </Item.Header>
                     <Item.Description>
                       {columnDecorator(property)(structure)}

package/src/components/StructureVersionListItem.js

@@ -6,7 +6,7 @@ import { List } from "semantic-ui-react";
 import Moment from "react-moment";
 import { linkTo } from "@truedat/core/routes";
 
-const dateDecorator = date => (
+const dateDecorator = (date) => (
   <Moment locale="es" date={date} format="YYYY-MM-DD HH:mm" />
 );
 
@@ -30,7 +30,7 @@ export const StructureVersionListItem = ({ id, version, inserted_at }) => (
 StructureVersionListItem.propTypes = {
   id: PropTypes.number,
   version: PropTypes.number,
-  inserted_at: PropTypes.string
+  inserted_at: PropTypes.string,
 };
 
 export default StructureVersionListItem;

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

@@ -1,14 +1,14 @@
 import React from "react";
-import { shallowWithIntl } from "@truedat/test/intl-stub";
+import { render } from "@truedat/test/render";
 import { LineageRoutes } from "../LineageRoutes";
 
 jest.mock("@truedat/core/hooks", () => ({
-  useAuthorized: jest.fn(() => true)
+  useAuthorized: jest.fn(() => true),
 }));
 
 describe("<LineageRoutes />", () => {
   it("matches the latest snapshot", () => {
-    const wrapper = shallowWithIntl(<LineageRoutes />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<LineageRoutes />);
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,45 +1,41 @@
 import React from "react";
-import { shallowWithIntl } from "@truedat/test/intl-stub";
-import { StructureConfidentialButton } from "../StructureConfidentialButton";
+import { render } from "@truedat/test/render";
+import StructureConfidentialButton from "../StructureConfidentialButton";
 
 describe("<StructureConfidentialButton />", () => {
-  const updateStructure = jest.fn();
-  const props = {
+  const state = {
     structure: { id: 1, confidential: false },
     structureUpdating: false,
-    updateStructure: updateStructure,
     userPermissions: {
       update: true,
-      confidential: true
-    }
+      confidential: true,
+    },
   };
+
   it("matches the latest snapshot", () => {
-    const wrapper = shallowWithIntl(<StructureConfidentialButton {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<StructureConfidentialButton />, { state });
+    expect(container).toMatchSnapshot();
   });
-  it("matches snapshot without permission", () => {
-    const props_no_update = {
-      ...props,
-      userPermissions: {
-        update: false,
-        confidential: true
-      }
+
+  it("matches snapshot without update permission", () => {
+    const userPermissions = {
+      update: false,
+      confidential: true,
     };
-    const wrapper_update = shallowWithIntl(
-      <StructureConfidentialButton {...props_no_update} />
-    );
-    expect(wrapper_update).toMatchSnapshot();
+    const { container } = render(<StructureConfidentialButton />, {
+      state: { ...state, userPermissions },
+    });
+    expect(container).toMatchSnapshot();
+  });
 
-    const props_no_confidential = {
-      ...props,
-      userPermissions: {
-        update: true,
-        confidential: false
-      }
+  it("matches snapshot without confidential permission", () => {
+    const userPermissions = {
+      update: true,
+      confidential: false,
     };
-    const wrapper_confidential = shallowWithIntl(
-      <StructureConfidentialButton {...props_no_confidential} />
-    );
-    expect(wrapper_confidential).toMatchSnapshot();
+    const { container } = render(<StructureConfidentialButton />, {
+      state: { ...state, userPermissions },
+    });
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -5,15 +5,6 @@ import { render } from "@truedat/test/render";
 import { applyTemplate } from "@truedat/df/utils";
 import { StructureNotesEdit } from "../StructureNotesEdit";
 
-const DynamicForm = () => <div>DynamicForm</div>;
-const TemplateLoader = () => <div>TemplateLoader</div>;
-
-jest.mock("@truedat/df/components/DynamicForm", () => DynamicForm);
-jest.mock(
-  "@truedat/df/templates/components/TemplateLoader",
-  () => TemplateLoader
-);
-
 describe("<StructureNotesEdit />", () => {
   it("matches the latest snapshot", () => {
     const props = {
@@ -27,6 +18,7 @@ describe("<StructureNotesEdit />", () => {
       },
       latestDfContent: { foo: "bar" },
       applyTemplate: applyTemplate({ id: 2 }),
+      selectDomains: jest.fn(),
     };
     const { container } = render(
       <Suspense fallback={null}>
@@ -65,6 +57,7 @@ describe("<StructureNotesEdit />", () => {
       },
       latestDfContent: { foo: "bar" },
       applyTemplate: applyTemplate(template),
+      selectDomains: jest.fn(),
     };
 
     const { findByText } = render(

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

@@ -1,22 +1,20 @@
 import React from "react";
-import { shallowWithIntl } from "@truedat/test/intl-stub";
-import { StructureProperties, mapStateToProps } from "../StructureProperties";
+import { render } from "@truedat/test/render";
+import StructureProperties from "../StructureProperties";
 
 describe("<StructureProperties />", () => {
   it("matches the latest snapshot", () => {
     const structure = { description: "dd", group: "gp" };
     const state = { structure };
-    const props = mapStateToProps(state);
-    const wrapper = shallowWithIntl(<StructureProperties {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<StructureProperties />, { state });
+    expect(container).toMatchSnapshot();
   });
 
   it("matches the latest snapshot (custom structureProperties)", () => {
     const structure = { metadata: { foo: "bar" } };
     const structureProperties = [{ name: "metadata.foo" }];
     const state = { structure, structureProperties };
-    const props = mapStateToProps(state);
-    const wrapper = shallowWithIntl(<StructureProperties {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<StructureProperties />, { state });
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,6 +1,6 @@
 import React from "react";
-import { shallowWithIntl } from "@truedat/test/intl-stub";
-import { StructureVersionListItem } from "../StructureVersionListItem";
+import { render } from "@truedat/test/render";
+import StructureVersionListItem from "../StructureVersionListItem";
 
 describe("<StructureVersionListItem />", () => {
   it("matches the latest snapshot", () => {
@@ -11,7 +11,7 @@ describe("<StructureVersionListItem />", () => {
     const inserted_at = "2018-01-01T01:01:01.123456Z";
     const props = { id, version, inserted_at, history };
 
-    const wrapper = shallowWithIntl(<StructureVersionListItem {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<StructureVersionListItem {...props} />);
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,22 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<LineageRoutes /> matches the latest snapshot 1`] = `
-<Fragment>
-  <Route
-    path="/graphs"
-    render={[Function]}
-  />
-  <Route
-    path="/graphs/:id"
-    render={[Function]}
-  />
-  <Route
-    path="/lineage_events"
-    render={[Function]}
-  />
-  <Route
-    path="/sample"
-    render={[Function]}
-  />
-</Fragment>
-`;
+exports[`<LineageRoutes /> matches the latest snapshot 1`] = `<div />`;

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

@@ -12,7 +12,7 @@ exports[`<Event /> matches the latest snapshot 1`] = `
   />
   <FeedContent
     date={
-      <t
+      <n
         ago={false}
         calendar={false}
         date="2019-09-20 17:01:00"
@@ -27,6 +27,7 @@ exports[`<Event /> matches the latest snapshot 1`] = `
         onChange={[Function]}
         titleFormat=""
         toNow={false}
+        trim={false}
         unit={null}
         unix={false}
         utc={false}

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

@@ -1,40 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<StructureConfidentialButton /> matches snapshot without permission 1`] = `""`;
+exports[`<StructureConfidentialButton /> matches snapshot without confidential permission 1`] = `<div />`;
 
-exports[`<StructureConfidentialButton /> matches snapshot without permission 2`] = `""`;
+exports[`<StructureConfidentialButton /> matches snapshot without update permission 1`] = `<div />`;
 
 exports[`<StructureConfidentialButton /> matches the latest snapshot 1`] = `
-<Popup
-  content="structure.mark_as_confidential"
-  disabled={false}
-  eventsEnabled={true}
-  on={
-    Array [
-      "click",
-      "hover",
-    ]
-  }
-  pinned={false}
-  popperModifiers={Array []}
-  position="top center"
-  trigger={
-    <span>
-      <Button
-        as="button"
-        basic={true}
-        className="structureButton"
-        icon={
-          <Icon
-            as="i"
-            className=""
-            name="lock open"
-          />
-        }
-        loading={false}
-        onClick={[Function]}
+<div>
+  <span>
+    <button
+      class="ui basic icon button structureButton"
+    >
+      <i
+        aria-hidden="true"
+        class="lock open icon"
       />
-    </span>
-  }
-/>
+    </button>
+  </span>
+</div>
 `;

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

@@ -1,96 +1,101 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<StructureProperties /> matches the latest snapshot (custom structureProperties) 1`] = `
-<Fragment>
+<div>
   <p
-    className="item-description"
+    class="item-description"
   />
-  <Grid
-    className="structure-properties"
-    columns={5}
-    divided={true}
+  <div
+    class="ui divided five column grid structure-properties"
   >
-    <GridRow
-      key="0"
+    <div
+      class="row"
     >
-      <GridColumn
-        key="0"
-        width={3}
+      <div
+        class="three wide column"
       >
-        <Item>
-          <ItemContent>
-            <ItemHeader
-              as="h5"
+        <div
+          class="item"
+        >
+          <div
+            class="content"
+          >
+            <h5
+              class="header"
+            >
+              metadata.foo
+            </h5>
+            <div
+              class="description"
             >
-              <MemoizedFormattedMessage
-                id="structure.metadata.foo"
-              />
-            </ItemHeader>
-            <ItemDescription>
               bar
-            </ItemDescription>
-          </ItemContent>
-        </Item>
-      </GridColumn>
-    </GridRow>
-  </Grid>
-</Fragment>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 `;
 
 exports[`<StructureProperties /> matches the latest snapshot 1`] = `
-<Fragment>
+<div>
   <p
-    className="item-description"
+    class="item-description"
   >
     dd
   </p>
-  <Grid
-    className="structure-properties"
-    columns={5}
-    divided={true}
+  <div
+    class="ui divided five column grid structure-properties"
   >
-    <GridRow
-      key="0"
+    <div
+      class="row"
     >
-      <GridColumn
-        key="0"
-        width={3}
+      <div
+        class="three wide column"
       >
-        <Item>
-          <ItemContent>
-            <ItemHeader
-              as="h5"
+        <div
+          class="item"
+        >
+          <div
+            class="content"
+          >
+            <h5
+              class="header"
+            >
+              Domain
+            </h5>
+            <div
+              class="description"
             >
-              <MemoizedFormattedMessage
-                id="structure.domain"
-              />
-            </ItemHeader>
-            <ItemDescription>
-              <Connect(EditDomainPopup) />
-            </ItemDescription>
-          </ItemContent>
-        </Item>
-      </GridColumn>
-      <GridColumn
-        key="1"
-        width={3}
+              
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="three wide column"
       >
-        <Item>
-          <ItemContent>
-            <ItemHeader
-              as="h5"
+        <div
+          class="item"
+        >
+          <div
+            class="content"
+          >
+            <h5
+              class="header"
+            >
+              Group
+            </h5>
+            <div
+              class="description"
             >
-              <MemoizedFormattedMessage
-                id="structure.group"
-              />
-            </ItemHeader>
-            <ItemDescription>
               gp
-            </ItemDescription>
-          </ItemContent>
-        </Item>
-      </GridColumn>
-    </GridRow>
-  </Grid>
-</Fragment>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 `;

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

@@ -1,68 +1,35 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<StructureVersionListItem /> matches the latest snapshot 1`] = `
-<ListItem
-  as={
-    Object {
-      "$$typeof": Symbol(react.forward_ref),
-      "displayName": "Link",
-      "propTypes": Object {
-        "innerRef": [Function],
-        "onClick": [Function],
-        "replace": [Function],
-        "target": [Function],
-        "to": [Function],
-      },
-      "render": [Function],
-    }
-  }
-  to="/structures/123/versions/42"
->
-  <ListIcon
-    name="history"
-    size="large"
-    verticalAlign="middle"
-  />
-  <ListContent>
-    <ListHeader>
-      <MemoizedFormattedMessage
-        id="structure.version.version"
-        values={
-          Object {
-            "version": 42,
-          }
-        }
-      />
-    </ListHeader>
-    <ListDescription>
-      <MemoizedFormattedMessage
-        id="structure.version.inserted_at"
-        values={
-          Object {
-            "when": <t
-              ago={false}
-              calendar={false}
-              date="2018-01-01T01:01:01.123456Z"
-              decimal={false}
-              element={null}
-              filter={[Function]}
-              format="YYYY-MM-DD HH:mm"
-              fromNow={false}
-              interval={60000}
-              local={false}
-              locale="es"
-              onChange={[Function]}
-              titleFormat=""
-              toNow={false}
-              unit={null}
-              unix={false}
-              utc={false}
-              withTitle={false}
-            />,
-          }
-        }
-      />
-    </ListDescription>
-  </ListContent>
-</ListItem>
+<div>
+  <a
+    class="item"
+    href="/structures/123/versions/42"
+    role="listitem"
+  >
+    <i
+      aria-hidden="true"
+      class="history large icon middle aligned"
+    />
+    <div
+      class="content"
+    >
+      <div
+        class="header"
+      >
+        Version 42
+      </div>
+      <div
+        class="description"
+      >
+        Imported 
+        <time
+          datetime="1514768461123"
+        >
+          2018-01-01 01:01
+        </time>
+      </div>
+    </div>
+  </a>
+</div>
 `;

package/src/selectors/getTabVisibility.js

@@ -42,10 +42,7 @@ const impactTabVisible = _.anyPass([_.path("structure.degree.out")]);
 const parentsTabVisible = _.conformsTo({ parentRelations: notEmpty });
 const childrenTabVisible = _.conformsTo({ childrenRelations: notEmpty });
 const eventsTabVisible = _.flow(_.prop("structureVersion"), _.isEmpty);
-const grantsTabVisible = _.flow(
-  _.path("structure.grants"),
-  _.negate(_.isEmpty)
-);
+const grantsTabVisible = _.flow(_.path("structure.grants"), notEmpty);
 
 export const getTabVisibility = (state) => ({
   fields: fieldsTabVisible(state),