@truedat/df 7.0.5 → 7.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "7.0.5",
+  "version": "7.0.7",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "7.0.5",
+    "@truedat/test": "7.0.7",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,8 +87,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "7.0.5",
-    "@truedat/core": "7.0.5",
+    "@truedat/auth": "7.0.7",
+    "@truedat/core": "7.0.7",
     "decode-uri-component": "^0.2.2",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -109,5 +109,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "d76d7852ddb993ed53f0266ec17858119e731bbf"
+  "gitHead": "f780d02b3356b69c61023b14b61400ffb779e33d"
 }

package/src/components/hierarchies/HierarchyView.js

@@ -8,8 +8,8 @@ import { linkTo } from "@truedat/core/routes";
 import { CSVFileModal } from "@truedat/core/components";
 import { HistoryBackButton } from "@truedat/core/components";
 import { ConfirmModal } from "@truedat/core/components";
+import Hierarchy from "@truedat/core/components/Hierarchy";
 import HierarchyCrumbs from "./HierarchyCrumbs";
-import Hierarchy from "./Hierarchy";
 
 const getLastId = _.flow(
   _.pathOr([], "nodes"),

package/src/components/widgets/DropdownField.js

@@ -38,9 +38,7 @@ DropdownField.propTypes = {
 
 const makeMapStateToProps = () => {
   const mapStateToProps = (state, props) => ({
-    loading:
-      (_.path("field.type")(props) == "system" && state.systemsLoading) ||
-      (_.path("field.type")(props) == "domain" && state.domainsLoading),
+    loading: _.path("field.type")(props) == "system" && state.systemsLoading,
   });
   return mapStateToProps;
 };

package/src/components/hierarchies/Hierarchy.js

@@ -1,316 +0,0 @@
-import React, { useState } from "react";
-import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
-import { Icon, Grid, Label, Input, Form } from "semantic-ui-react";
-import { DescriptionInput } from "@truedat/core/components";
-
-const ListHierarchyItem = ({
-  node,
-  hierarchy,
-  onChange,
-  addNode,
-  removeNode,
-  isEditionMode,
-}) => {
-  const { formatMessage } = useIntl();
-  const { id, name, error, editionStatus, description } = node;
-  const [expanded, setExpanded] = useState(false);
-  const [mouseOver, setMouseOver] = useState(false);
-  const generation = hierarchy.nodes.filter((n) => n.parentId == id);
-  const hasChildren = !generation.length == 0;
-
-  return (
-    <li
-      key={id}
-      onMouseOver={() => setMouseOver(true)}
-      onMouseOut={() => setMouseOver(false)}
-    >
-      <Icon
-        className="li_trash"
-        size="large"
-        name="cut"
-        title={formatMessage({ id: "hierarchy.delete_node" })}
-        style={{
-          cursor: "pointer",
-          visibility:
-            isEditionMode && !hasChildren && mouseOver ? "visible" : "hidden",
-        }}
-        onClick={() => removeNode(id)}
-      />
-
-      <div
-        style={{
-          display: "flex",
-          flexDirection: "row",
-          alignItems: "self-start",
-        }}
-      >
-        <div>
-          <Input
-            labelPosition="left"
-            type="text"
-            placeholder={formatMessage({ id: "hierarchy.node" })}
-            value={name == null ? "" : name}
-            error={error}
-            {...(!isEditionMode && {
-              "data-tooltip": name == null ? "" : name,
-              "data-position": "top left",
-            })}
-            className={isEditionMode ? "" : "hierarchyNode"}
-            disabled={!isEditionMode}
-            onChange={(_e, { value }) =>
-              onChange(id, { name: value, description: description })
-            }
-          >
-            {!hasChildren ? (
-              isEditionMode && mouseOver && name && name != "" ? (
-                <Label
-                  basic
-                  title={formatMessage({ id: "hierarchy.add_child" })}
-                  onClick={() => {
-                    addNode(id, null);
-                    setExpanded(true);
-                  }}
-                >
-                  <Icon
-                    fitted
-                    name="times circle outline"
-                    style={{ transform: "rotate(45deg)", cursor: "pointer" }}
-                    color={
-                      editionStatus == "dirty"
-                        ? "orange"
-                        : editionStatus == "added"
-                        ? "green"
-                        : null
-                    }
-                  />
-                </Label>
-              ) : (
-                <Label basic>
-                  <Icon
-                    fitted
-                    name="circle outline"
-                    color={
-                      editionStatus == "dirty"
-                        ? "orange"
-                        : editionStatus == "added"
-                        ? "green"
-                        : null
-                    }
-                  />
-                </Label>
-              )
-            ) : (
-              <Label
-                basic
-                title={
-                  expanded
-                    ? formatMessage({ id: "hierarchy.collapse_node" })
-                    : formatMessage({ id: "hierarchy.expand_node" })
-                }
-              >
-                <Icon
-                  fitted
-                  onClick={() => setExpanded(!expanded)}
-                  style={{ cursor: "pointer" }}
-                  color={
-                    editionStatus == "dirty"
-                      ? "orange"
-                      : editionStatus == "added"
-                      ? "green"
-                      : null
-                  }
-                  name={expanded ? "dot circle outline" : "circle"}
-                />
-              </Label>
-            )}
-            <input />
-          </Input>
-        </div>
-
-        <div className="description_wrapper">
-          <DescriptionInput
-            disabled={!isEditionMode}
-            value={description}
-            onChange={(_e, { value }) =>
-              onChange(id, { name: name, description: value })
-            }
-          />
-        </div>
-      </div>
-      {generation.length == 0 || !expanded ? null : (
-        <ListHierarchy
-          hierarchy={hierarchy}
-          parentId={id}
-          onItemChange={onChange}
-          addNode={addNode}
-          removeNode={removeNode}
-          isEditionMode={isEditionMode}
-        />
-      )}
-    </li>
-  );
-};
-
-ListHierarchyItem.propTypes = {
-  node: PropTypes.object,
-  hierarchy: PropTypes.object,
-  onChange: PropTypes.func,
-  addNode: PropTypes.func,
-  removeNode: PropTypes.func,
-  isEditionMode: PropTypes.bool,
-};
-
-const ListHierarchy = ({
-  hierarchy,
-  parentId = null,
-  onItemChange,
-  addNode,
-  removeNode,
-  isEditionMode,
-}) => {
-  const { formatMessage } = useIntl();
-  const [newNodeName, setNewNodeName] = useState();
-  const generation = hierarchy.nodes.filter(
-    (node) => node.parentId == parentId
-  );
-  const addNodeTo = (id = null) => (
-    <Form
-      onSubmit={() => {
-        addNode(id, newNodeName);
-        setNewNodeName("");
-      }}
-    >
-      <Input
-        labelPosition={newNodeName && newNodeName !== "" ? "right" : null}
-        onChange={(_e, { value }) => setNewNodeName(value)}
-        placeholder={formatMessage({ id: "hierarchy.new_node" })}
-        value={newNodeName}
-      >
-        <input />
-
-        {!newNodeName || newNodeName == "" ? null : (
-          <Label
-            style={{ cursor: "pointer" }}
-            onClick={() => {
-              addNode(id, newNodeName);
-              setNewNodeName("");
-            }}
-          >
-            {formatMessage({ id: "hierarchy.add" })}
-          </Label>
-        )}
-      </Input>
-    </Form>
-  );
-
-  return generation.length == 0 ? (
-    isEditionMode ? (
-      <ul className="wtree expanded">
-        <li>{addNodeTo()}</li>
-      </ul>
-    ) : null
-  ) : (
-    <ul className="wtree expanded">
-      {generation.map((node) => {
-        return (
-          <ListHierarchyItem
-            key={node.id}
-            node={node}
-            hierarchy={hierarchy}
-            onChange={onItemChange}
-            addNode={addNode}
-            removeNode={removeNode}
-            isEditionMode={isEditionMode}
-          />
-        );
-      })}
-      {isEditionMode ? (
-        <li className="add_node" key={generation.length}>
-          <div>{addNodeTo(parentId)}</div>
-        </li>
-      ) : null}
-    </ul>
-  );
-};
-
-ListHierarchy.propTypes = {
-  hierarchy: PropTypes.object,
-  parentId: PropTypes.number,
-  onItemChange: PropTypes.func,
-  addNode: PropTypes.func,
-  removeNode: PropTypes.func,
-  isEditionMode: PropTypes.bool,
-};
-
-const Hierarchy = ({
-  addNode,
-  hierarchy,
-  parentId = null,
-  updateMetadata,
-  updateNode,
-  removeNode,
-  isEditionMode,
-}) => {
-  const { formatMessage } = useIntl();
-  return (
-    <Grid.Column>
-      <Grid.Row>
-        <div
-          style={{
-            display: "flex",
-            flexDirection: "row",
-            alignItems: "self-start",
-          }}
-        >
-          <Input
-            type="text"
-            placeholder={formatMessage({ id: "hierarchy.name" })}
-            disabled={!isEditionMode}
-            {...(!isEditionMode && {
-              "data-tooltip": hierarchy.name == null ? "" : hierarchy.name,
-              "data-position": "top left",
-            })}
-            style={isEditionMode ? {} : { opacity: 1 }}
-            value={hierarchy.name}
-            onChange={(_e, { value }) =>
-              updateMetadata({
-                name: value,
-                description: hierarchy.description,
-              })
-            }
-          />
-          <div className="description_wrapper">
-            <DescriptionInput
-              disabled={!isEditionMode}
-              value={hierarchy.description}
-              onChange={(_e, { value }) =>
-                updateMetadata({ name: hierarchy.name, description: value })
-              }
-            />
-          </div>
-        </div>
-      </Grid.Row>
-      <ListHierarchy
-        hierarchy={hierarchy}
-        parentId={parentId}
-        onItemChange={updateNode}
-        addNode={addNode}
-        removeNode={removeNode}
-        isEditionMode={isEditionMode}
-      />
-    </Grid.Column>
-  );
-};
-
-Hierarchy.propTypes = {
-  addNode: PropTypes.func,
-  hierarchy: PropTypes.object,
-  parentId: PropTypes.number,
-  updateMetadata: PropTypes.func,
-  updateNode: PropTypes.func,
-  removeNode: PropTypes.func,
-  isEditionMode: PropTypes.bool,
-};
-
-export default Hierarchy;

package/src/components/hierarchies/__tests__/Hierarchy.spec.js

@@ -1,42 +0,0 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import Hierarchy from "../Hierarchy";
-import en from "../../../messages/en";
-
-const hierarchy = {
-  id: 1,
-  name: "Baggins",
-  description: "bar",
-  nodes: [
-    {
-      id: 11,
-      name: "Fosco",
-      parentId: null,
-    },
-    {
-      id: 12,
-      name: "Fosco children",
-      parentId: 11,
-    },
-  ],
-};
-const props = { hierarchy: hierarchy, isEditionMode: false };
-
-const renderOpts = {
-  messages: { en: en },
-};
-
-describe("<Hierarchy />", () => {
-  it("matches the last snapshot with edition mode false", () => {
-    const { container } = render(<Hierarchy {...props} />, renderOpts);
-    expect(container).toMatchSnapshot();
-  });
-
-  it("matches snapshot with edition mode", () => {
-    const { container } = render(
-      <Hierarchy {...{ ...props, isEditionMode: true }} />,
-      renderOpts
-    );
-    expect(container).toMatchSnapshot();
-  });
-});

package/src/components/hierarchies/__tests__/__snapshots__/Hierarchy.spec.js.snap

@@ -1,189 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Hierarchy /> matches snapshot with edition mode 1`] = `
-<div>
-  <div
-    class="column"
-  >
-    <div
-      class="row"
-    >
-      <div
-        style="display: flex; flex-direction: row; align-items: self-start;"
-      >
-        <div
-          class="ui input"
-        >
-          <input
-            placeholder="Hierarchy name"
-            type="text"
-            value="Baggins"
-          />
-        </div>
-        <div
-          class="description_wrapper"
-        >
-          <div
-            class="description"
-          >
-            bar
-          </div>
-        </div>
-      </div>
-    </div>
-    <ul
-      class="wtree expanded"
-    >
-      <li>
-        <i
-          aria-hidden="true"
-          class="cut large icon li_trash"
-          style="cursor: pointer; visibility: hidden;"
-          title="Delete node"
-        />
-        <div
-          style="display: flex; flex-direction: row; align-items: self-start;"
-        >
-          <div>
-            <div
-              class="ui left labeled input"
-            >
-              <div
-                class="ui basic label"
-                title="Expand"
-              >
-                <i
-                  aria-hidden="true"
-                  class="circle fitted icon"
-                  style="cursor: pointer;"
-                />
-              </div>
-              <input
-                placeholder="Node"
-                type="text"
-                value="Fosco"
-              />
-            </div>
-          </div>
-          <div
-            class="description_wrapper"
-          >
-            <div
-              class="description"
-            >
-              Add description
-            </div>
-          </div>
-        </div>
-      </li>
-      <li
-        class="add_node"
-      >
-        <div>
-          <form
-            class="ui form"
-          >
-            <div
-              class="ui input"
-            >
-              <input
-                placeholder="New node"
-                type="text"
-                value=""
-              />
-            </div>
-          </form>
-        </div>
-      </li>
-    </ul>
-  </div>
-</div>
-`;
-
-exports[`<Hierarchy /> matches the last snapshot with edition mode false 1`] = `
-<div>
-  <div
-    class="column"
-  >
-    <div
-      class="row"
-    >
-      <div
-        style="display: flex; flex-direction: row; align-items: self-start;"
-      >
-        <div
-          class="ui disabled input"
-          data-position="top left"
-          data-tooltip="Baggins"
-          style="opacity: 1;"
-        >
-          <input
-            disabled=""
-            placeholder="Hierarchy name"
-            tabindex="-1"
-            type="text"
-            value="Baggins"
-          />
-        </div>
-        <div
-          class="description_wrapper"
-        >
-          <div
-            class="description disabled"
-          >
-            bar
-          </div>
-        </div>
-      </div>
-    </div>
-    <ul
-      class="wtree expanded"
-    >
-      <li>
-        <i
-          aria-hidden="true"
-          class="cut large icon li_trash"
-          style="cursor: pointer; visibility: hidden;"
-          title="Delete node"
-        />
-        <div
-          style="display: flex; flex-direction: row; align-items: self-start;"
-        >
-          <div>
-            <div
-              class="ui disabled left labeled input hierarchyNode"
-              data-position="top left"
-              data-tooltip="Fosco"
-            >
-              <div
-                class="ui basic label"
-                title="Expand"
-              >
-                <i
-                  aria-hidden="true"
-                  class="circle fitted icon"
-                  style="cursor: pointer;"
-                />
-              </div>
-              <input
-                disabled=""
-                placeholder="Node"
-                tabindex="-1"
-                type="text"
-                value="Fosco"
-              />
-            </div>
-          </div>
-          <div
-            class="description_wrapper"
-          >
-            <div
-              class="description disabled"
-            />
-          </div>
-        </div>
-      </li>
-    </ul>
-  </div>
-</div>
-`;