@truedat/bg 7.0.4 → 7.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "7.0.4",
+  "version": "7.0.6",
   "description": "Truedat Web Business Glossary",
   "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.4",
+    "@truedat/test": "7.0.6",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,9 +86,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "7.0.4",
-    "@truedat/df": "7.0.4",
-    "@truedat/lm": "7.0.4",
+    "@truedat/core": "7.0.6",
+    "@truedat/df": "7.0.6",
+    "@truedat/lm": "7.0.6",
     "decode-uri-component": "^0.2.2",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "b2c0938fa6ea458e3009c82e4e91b7bc79c8ffed"
+  "gitHead": "00bc7f5ff0c4a073987b4ed538f9547a12d2d0ad"
 }

package/src/concepts/components/DomainConcepts.js

@@ -1,6 +1,5 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
 import ConceptsPanel from "./ConceptsPanel";
 
 export const DomainConcepts = ({ domain = {} }) => {
@@ -17,6 +16,4 @@ DomainConcepts.propTypes = {
   domain: PropTypes.object.isRequired,
 };
 
-export const mapStateToProps = ({ domain }) => ({ domain });
-
-export default connect(mapStateToProps)(DomainConcepts);
+export default DomainConcepts;

package/src/concepts/components/__tests__/__snapshots__/ConceptForm.spec.js.snap

@@ -7,7 +7,7 @@ exports[`<ConceptForm /> with multiple templates matches the latest snapshot 1`]
     style=""
   >
     <div
-      class="disabled required field fix-dropdown-selector"
+      class="disabled required field fix-dropdown-selector "
     >
       <label>
         Domain
@@ -34,7 +34,7 @@ exports[`<ConceptForm /> with multiple templates matches the latest snapshot 1`]
           class="menu transition"
         >
           <div
-            class="ui left icon input search"
+            class="ui fluid left icon input search "
           >
             <input
               type="text"

package/src/concepts/components/__tests__/__snapshots__/ConceptsBulkUpdate.spec.js.snap

@@ -40,7 +40,7 @@ exports[`<ConceptsBulkUpdate /> matches the latest snapshot 1`] = `
       class="ui form"
     >
       <div
-        class="required field fix-dropdown-selector"
+        class="required field fix-dropdown-selector "
       >
         <div
           aria-disabled="false"
@@ -62,7 +62,7 @@ exports[`<ConceptsBulkUpdate /> matches the latest snapshot 1`] = `
             class="menu transition"
           >
             <div
-              class="ui left icon input search"
+              class="ui fluid left icon input search "
             >
               <input
                 type="text"

package/src/concepts/components/__tests__/__snapshots__/SharedToForm.spec.js.snap

@@ -15,7 +15,7 @@ exports[`<SharedToForm /> matches the latest snapshot 1`] = `
       class="ui form"
     >
       <div
-        class="field fix-dropdown-selector"
+        class="field fix-dropdown-selector "
       >
         <div
           aria-disabled="false"
@@ -42,7 +42,7 @@ exports[`<SharedToForm /> matches the latest snapshot 1`] = `
             class="menu transition"
           >
             <div
-              class="ui left icon input search"
+              class="ui fluid left icon input search "
             >
               <input
                 type="text"

package/src/hooks/useDomains.js

@@ -0,0 +1,77 @@
+import _ from "lodash/fp";
+import { compile } from "path-to-regexp";
+import useSWR, { useSWRConfig } from "swr";
+import useSWRMutations from "swr/mutation";
+import {
+  apiJson,
+  apiJsonPost,
+  apiJsonPatch,
+  apiJsonDelete,
+} from "@truedat/core/services/api";
+import { API_DOMAINS, API_DOMAIN } from "../taxonomy/api";
+
+export const useDomains = () => {
+  const toApiPath = compile(API_DOMAINS, "api");
+  const url = toApiPath();
+  const { data, error } = useSWR(url, apiJson);
+  return {
+    data: data?.data?.data,
+    actions: data?.data?._actions,
+    error,
+    loading: !error && !data,
+  };
+};
+
+export const useDomain = (id) => {
+  const toApiPath = compile(API_DOMAIN, "api");
+  const url = toApiPath({ id });
+  const { data, error } = useSWR(url, apiJson);
+  return {
+    data: data?.data?.data,
+    actions: data?.data?._actions,
+    error,
+    loading: !error && !data,
+  };
+};
+
+export const useDomainCreate = () => {
+  const toApiPath = compile(API_DOMAINS, "api");
+  const url = toApiPath();
+  return useSWRMutations(url, (url, { arg }) => apiJsonPost(url, arg));
+};
+
+export const useDomainUpdate = (id) => {
+  const { mutate } = useSWRConfig();
+  const url = compile(API_DOMAIN)({ id });
+  const mutator = useSWRMutations(url, (url, { arg }) =>
+    apiJsonPatch(url, arg)
+  );
+  return {
+    ...mutator,
+    trigger: async (arg, options) => {
+      const response = await mutator.trigger(arg, options);
+      const toApiPath = compile(API_DOMAINS, "api");
+      const url = toApiPath();
+      mutate(url);
+      return response;
+    },
+  };
+};
+
+export const useDomainDelete = (id) => {
+  const { mutate } = useSWRConfig();
+  const url = compile(API_DOMAIN)({ id });
+  const mutator = useSWRMutations(url, (url, { arg }) =>
+    apiJsonDelete(url, arg)
+  );
+  return {
+    ...mutator,
+    trigger: async (arg, options) => {
+      const response = await mutator.trigger(arg, options);
+      const toApiPath = compile(API_DOMAINS, "api");
+      const url = toApiPath();
+      mutate(url);
+      return response;
+    },
+  };
+};

package/src/messages/en.js

@@ -250,6 +250,9 @@ export default {
   domain: "Domain",
   "domain.actions.add_member": "Add",
   "domain.actions.create": "New Subdomain",
+  "domain.actions.delete": "Delete domain",
+  "domain.actions.delete.question":
+    "Are you sure you want to delete this domain?",
   "domain.actions.edit": "Edit",
   "domain.actions.edit.header": "Edit Domain",
   "domain.children.empty": "This domain has no subdomains",
@@ -284,9 +287,12 @@ export default {
   "domain.selector.placeholder": "Select a domain...",
   "domains.actions.create": "New Domain",
   "domains.search.placeholder": "Search domains...",
+  "domains.search.error.fields": "Search fields not valid",
   "domains.search.results.count": "{count} domains found:",
   "domains.search.results.empty": "No domains found",
   "domains.subheader": "Manage governance structure and data domains",
+  "domains.general.message":
+    "Please, select a domain on the left pane to see the detail.",
   "events.text": "{field} changed to {value}",
   "fields.dropdown.placeholder": "Select one...",
   "fields.pairlist.url.name.placeholder": "Url name",

package/src/messages/es.js

@@ -254,6 +254,8 @@ export default {
   domain: "Dominio",
   "domain.actions.add_member": "Añadir",
   "domain.actions.create": "Nuevo subdominio",
+  "domain.actions.delete": "Eliminar dominio",
+  "domain.actions.delete.question": "¿Quieres eliminar este dominio?",
   "domain.actions.edit": "Editar",
   "domain.actions.edit.header": "Editar dominio",
   "domain.children.empty": "Este dominio no tiene subdominios",
@@ -287,10 +289,13 @@ export default {
   "domain.selector.placeholder": "Selecciona un dominio...",
   "domains.actions.create": "Nuevo dominio",
   "domains.search.placeholder": "Buscar dominios...",
+  "domains.search.error.fields": "Campos de búsqueda no válidos",
   "domains.search.results.count": "{count} dominios encontrados:",
   "domains.search.results.empty": "Ningún dominio encontrado",
   "domains.subheader":
     "Gestionar los dominios de negocio y los dominios de gobierno de datos",
+  "domains.general.message":
+    "Por favor, selecciona un dominio en el panel de la izquierda para ver el detalle.",
   "events.text": "{field} actualizado a {value}",
   "fields.dropdown.placeholder": "Selecciona...",
   "fields.pairlist.url.name.placeholder": "Nombre de la url",

package/src/reducers/index.js

@@ -1,3 +1,2 @@
 export * from "../concepts/reducers";
-export * from "../taxonomy/reducers";
 export * from "./bgMessage";

package/src/taxonomy/components/AddDomainMember.js

@@ -4,17 +4,11 @@ import { useHistory } from "react-router-dom";
 
 import { linkTo } from "@truedat/core/routes";
 import AddResourceMember from "@truedat/core/components/AddResourceMember";
-import DomainCrumbs from "./DomainCrumbs";
 
 const AddDomainMember = ({ id }) => {
   const history = useHistory();
   const onSuccess = () => history.push(linkTo.DOMAIN_MEMBERS({ id }));
-  return (
-    <>
-      <DomainCrumbs />
-      <AddResourceMember type="domain" id={`${id}`} onSuccess={onSuccess} />
-    </>
-  );
+  return <AddResourceMember type="domain" id={`${id}`} onSuccess={onSuccess} />;
 };
 
 AddDomainMember.propTypes = {

package/src/taxonomy/components/Domain.js

@@ -1,115 +1,111 @@
-import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
 import { Route, Switch } from "react-router-dom";
 import { Segment } from "semantic-ui-react";
 import { Unauthorized } from "@truedat/core/components";
 import { useAuthorized } from "@truedat/core/hooks";
 import {
-  DOMAIN,
   DOMAIN_CONCEPTS,
   DOMAIN_IMPLEMENTATIONS,
   DOMAIN_MEMBERS,
+  DOMAIN_MEMBERS_NEW,
   DOMAIN_STRUCTURES,
-  linkTo,
+  DOMAIN_NEW,
+  DOMAIN_EDIT,
 } from "@truedat/core/routes";
 import UserSearchFiltersLoader from "@truedat/dd/components/UserSearchFiltersLoader";
 import DomainConcepts from "../../concepts/components/DomainConcepts";
-import DomainActions from "./DomainActions";
-import DomainCards from "./DomainCards";
-import DomainCrumbs from "./DomainCrumbs";
+import { useDomain } from "../../hooks/useDomains";
 import DomainDetail from "./DomainDetail";
 import DomainImplementations from "./DomainImplementations";
 import DomainMembers from "./DomainMembers";
-import DomainSearch from "./DomainSearch";
 import DomainStructures from "./DomainStructures";
 import DomainTabs from "./DomainTabs";
+import EditDomain from "./EditDomain";
+import NewDomain from "./NewDomain";
+import AddDomainMember from "./AddDomainMember";
 
-export const Domain = ({ hasChildren, domain, domainLoading }) => {
+const RolesLoader = React.lazy(() =>
+  import("@truedat/auth/roles/components/RolesLoader")
+);
+
+export const Domain = ({ domainId }) => {
+  const { data: domain } = useDomain(domainId);
   const ddAuthorized = useAuthorized("data_dictionary");
   const dqAuthorized = useAuthorized("quality");
 
-  const actions = {
-    create: {
-      order: 1,
-      icon: "cube",
-      messageId: "domain.actions.create",
-      action: (id) => linkTo.DOMAIN_NEW({ id }),
-    },
-  };
-
-  return domainLoading ? null : domain && domain.id ? (
-    <>
-      <DomainCrumbs />
-      <Segment>
-        <DomainDetail />
-        <DomainTabs />
-        <Segment attached="bottom">
-          <Switch>
-            <Route
-              exact
-              path={DOMAIN}
-              render={() => (
-                <>
-                  {hasChildren && <DomainSearch />}
-                  <DomainActions availableActions={actions} />
-                  <DomainCards />
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={DOMAIN_MEMBERS}
-              render={() => <DomainMembers />}
-            />
-            <Route
-              exact
-              path={DOMAIN_CONCEPTS}
-              render={() => <DomainConcepts />}
-            />
-            <Route
-              exact
-              path={DOMAIN_STRUCTURES}
-              render={() =>
-                ddAuthorized ? <DomainStructures /> : <Unauthorized />
-              }
-            />
-            <Route
-              exact
-              path={DOMAIN_IMPLEMENTATIONS}
-              render={() =>
-                dqAuthorized ? (
+  return domain ? (
+    <Segment>
+      <Switch>
+        <Route
+          exact
+          path={DOMAIN_EDIT}
+          render={() => <EditDomain domain={domain} />}
+        />
+        <Route
+          exact
+          path={DOMAIN_NEW}
+          render={() => <NewDomain domain={domain} />}
+        />
+        <>
+          <DomainDetail id={domain.id} />
+          <DomainTabs domain={domain} />
+          <Segment attached="bottom">
+            <Switch>
+              <Route
+                exact
+                path={DOMAIN_CONCEPTS}
+                render={() => <DomainConcepts domain={domain} />}
+              />
+              <Route
+                exact
+                path={DOMAIN_STRUCTURES}
+                render={() =>
+                  ddAuthorized ? (
+                    <DomainStructures domain={domain} />
+                  ) : (
+                    <Unauthorized />
+                  )
+                }
+              />
+              <Route
+                exact
+                path={DOMAIN_IMPLEMENTATIONS}
+                render={() =>
+                  dqAuthorized ? (
+                    <>
+                      <UserSearchFiltersLoader scope="rule_implementation" />
+                      <DomainImplementations domain={domain} />
+                    </>
+                  ) : (
+                    <Unauthorized />
+                  )
+                }
+              />
+              <Route
+                exact
+                path={DOMAIN_MEMBERS}
+                render={() => <DomainMembers domainId={domain.id} />}
+              />
+              <Route
+                path={DOMAIN_MEMBERS_NEW}
+                render={({ match }) => (
                   <>
-                    <UserSearchFiltersLoader scope="rule_implementation" />
-                    <DomainImplementations />
+                    <RolesLoader />
+                    <AddDomainMember id={parseInt(match?.params?.id)} />
                   </>
-                ) : (
-                  <Unauthorized />
-                )
-              }
-            />
-          </Switch>
-        </Segment>
-      </Segment>
-    </>
+                )}
+              />
+            </Switch>
+          </Segment>
+        </>
+      </Switch>
+    </Segment>
   ) : null;
 };
 
 Domain.propTypes = {
-  hasChildren: PropTypes.bool,
-  domain: PropTypes.object,
-  domainLoading: PropTypes.bool,
+  domainId: PropTypes.number,
 };
 
-const mapStateToProps = ({ domain, domainLoading, domains }) => ({
-  domain,
-  domainLoading,
-  hasChildren: _.flow(
-    _.filter(_.prop("parent_id")),
-    _.filter(_.propEq("parent_id", _.prop("id")(domain))),
-    _.negate(_.isEmpty)
-  )(domains),
-});
-
-export default connect(mapStateToProps)(Domain);
+export default Domain;

package/src/taxonomy/components/DomainActions.js

@@ -2,39 +2,14 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Link } from "react-router-dom";
-import { Dropdown, Button } from "semantic-ui-react";
-import { bindActionCreators } from "redux";
-import { connect } from "react-redux";
+import { Button } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
-import { deleteDomain, filterDomains } from "../routines";
-import { getPrimaryActions, getSecondaryActions } from "../selectors";
-
-const DomainAction = ({ action, icon, messageId, id, ...rest }) => {
-  const { formatMessage } = useIntl();
-  return (
-    <Dropdown.Item
-      text={formatMessage({ id: messageId })}
-      icon={icon}
-      as={Link}
-      to={action(id)}
-      {...rest}
-    />
-  );
-};
-
-DomainAction.propTypes = {
-  action: PropTypes.func,
-  icon: PropTypes.string,
-  messageId: PropTypes.string,
-  id: PropTypes.number,
-};
 
 const DomainActionButton = ({ action, icon, messageId, id, ...rest }) => {
   const { formatMessage } = useIntl();
   return (
     <Button
-      floated="right"
       primary
       content={formatMessage({ id: messageId })}
       icon={icon}
@@ -56,12 +31,11 @@ const ModalDelete = ({ onConfirm }) => {
   const { formatMessage } = useIntl();
   return (
     <ConfirmModal
-      header={formatMessage({ id: "domain" })}
-      content={formatMessage({ id: "actions.confirm" })}
+      header={formatMessage({ id: "domain.actions.delete" })}
+      content={formatMessage({ id: "domain.actions.delete.question" })}
       onConfirm={onConfirm}
       trigger={
         <Button
-          floated="right"
           negative
           content={formatMessage({ id: "actions.delete" })}
           icon="trash"
@@ -103,7 +77,10 @@ const ActionButtons = ({
 }) => {
   const availableActions = _.flow(
     composeAvailableActions,
-    _.map(({ action, ...rest }) => ({ ...rest, to: action(id) })),
+    _.map(({ action, ...rest }) => ({
+      ...rest,
+      to: action(id),
+    })),
     (actions) => (deleteAction ? withDelete(actions, onConfirm) : actions)
   )(secondaryActions);
 
@@ -121,61 +98,57 @@ const ActionButtons = ({
 
 ActionButtons.propTypes = {
   id: PropTypes.number,
+  primaryActions: PropTypes.array,
+  secondaryActions: PropTypes.array,
+  deleteAction: PropTypes.bool,
   onConfirm: PropTypes.func,
 };
 
-export class DomainActions extends React.Component {
-  static propTypes = {
-    domain: PropTypes.object,
-    deleteDomain: PropTypes.func,
-    domainActions: PropTypes.object,
-  };
-
-  handleConfirm = () => {
-    this.setState({ open: false });
-    this.props.deleteDomain(this.props.domain);
-  };
-
-  render = () => {
-    const {
-      domain,
-      domainActions,
-      primaryActions,
-      secondaryActions,
-      deleteAction,
-    } = this.props;
-    const { id } = domain;
-    return _.isEmpty(domainActions) ? null : (
-      <ActionButtons
-        domainActions={domainActions}
-        primaryActions={primaryActions}
-        secondaryActions={secondaryActions}
-        deleteAction={deleteAction}
-        show={this.show}
-        id={id}
-        onConfirm={this.handleConfirm}
-      />
-    );
-  };
-}
-
-const hiddenActions = ["show", "index"];
-
-const mapDispatchToProps = (dispatch) => ({
-  ...bindActionCreators({ deleteDomain }, dispatch),
-  handleFilterDomains: (event) => {
-    const query = event.target.value;
-    return dispatch(filterDomains({ query }));
-  },
-});
-
-const mapStateToProps = ({ domain, domainActions }, { availableActions }) => ({
+const DomainActions = ({
+  availableActions,
   domain,
-  domainActions: _.omit(hiddenActions)(domainActions),
-  primaryActions: getPrimaryActions({ domainActions, availableActions }),
-  secondaryActions: getSecondaryActions({ domainActions, availableActions }),
-  deleteAction:
-    _.has("delete")(domainActions) && _.has("deleteOption")(availableActions),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(DomainActions);
+  domainAllActions,
+  onDeleteDomain,
+}) => {
+  const hiddenActions = ["show", "index"];
+  const secondaryActionsKeys = ["delete", "update"];
+
+  const notHiddenActions = _.flow(
+    _.omit(hiddenActions),
+    _.toPairs,
+    _.map(([key, actionProps]) => ({ key, ...actionProps })),
+    _.filter(({ key }) => _.has(key)(availableActions)),
+    _.map((a) => ({ ...a, ..._.prop(_.prop("key")(a))(availableActions) }))
+  )(domainAllActions);
+
+  const primaryActions = _.filter(
+    ({ key }) => !_.includes(key)(secondaryActionsKeys)
+  )(notHiddenActions);
+
+  const secondaryActions = _.filter(({ key }) =>
+    _.includes(key)(secondaryActionsKeys)
+  )(notHiddenActions);
+
+  const deleteAction =
+    _.has("delete")(domainAllActions) &&
+    _.has("deleteOption")(availableActions);
+
+  return _.isEmpty(domainAllActions) ? null : (
+    <ActionButtons
+      primaryActions={primaryActions}
+      secondaryActions={secondaryActions}
+      deleteAction={deleteAction}
+      id={domain.id}
+      onConfirm={onDeleteDomain}
+    />
+  );
+};
+
+DomainActions.propTypes = {
+  availableActions: PropTypes.object,
+  domain: PropTypes.object,
+  domainAllActions: PropTypes.object,
+  onDeleteDomain: PropTypes.func,
+};
+
+export default DomainActions;