@truedat/bg 6.3.0 → 6.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "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": "6.2.3",
+    "@truedat/test": "6.3.2",
     "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": "6.3.0",
-    "@truedat/df": "6.3.0",
-    "@truedat/lm": "6.3.0",
+    "@truedat/core": "6.3.2",
+    "@truedat/df": "6.3.2",
+    "@truedat/lm": "6.3.2",
     "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": "fadb5776768bcbaeac2ed35e6fdbef23c0a8263a"
+  "gitHead": "b9ccce69ebb729f62d28972e31b2865d74e9a0d6"
 }

package/src/concepts/components/ConceptCreate.js

@@ -52,7 +52,7 @@ const ConceptCreate = ({ action, conceptActionLoading, conceptAction }) => {
       _.keyBy("lang")
     )(locales);
 
-    setI18nConcept(i18nConceptInit);
+    if (i18nConceptInit) setI18nConcept(i18nConceptInit);
   }
 
   const langs = formatLocales(locales);

package/src/taxonomy/api.js

@@ -1,18 +1,4 @@
-const API_ACL_ENTRY = "/api/acl_entries/:id";
 const API_DOMAIN = "/api/domains/:id";
-const API_DOMAIN_MEMBERS = "/api/acl_entries/domains/:id/";
-const API_DOMAIN_MEMBER = "/api/acl_entries/:id";
 const API_DOMAINS = "/api/domains";
-const API_DOMAIN_CONCEPT_CHILDREN =
-  "/api/domains/:domain_id/business_concepts/:user_name/count";
-const API_RESOURCE_ACL_ENTRIES = "/api/acl_entries/domains/:resource_id";
 
-export {
-  API_ACL_ENTRY,
-  API_DOMAIN_CONCEPT_CHILDREN,
-  API_DOMAIN_MEMBERS,
-  API_DOMAIN_MEMBER,
-  API_DOMAIN,
-  API_DOMAINS,
-  API_RESOURCE_ACL_ENTRIES,
-};
+export { API_DOMAIN, API_DOMAINS };

package/src/taxonomy/components/AddDomainMember.js

@@ -0,0 +1,24 @@
+import React from "react";
+import PropTypes from "prop-types";
+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} />
+    </>
+  );
+};
+
+AddDomainMember.propTypes = {
+  id: PropTypes.number,
+};
+
+export default AddDomainMember;

package/src/taxonomy/components/DomainMembers.js

@@ -1,107 +1,6 @@
-import _ from "lodash/fp";
-import React, { useState } from "react";
-import PropTypes from "prop-types";
-import { Card, Header, Input, Message, Grid } from "semantic-ui-react";
-import { connect } from "react-redux";
-import { useIntl } from "react-intl";
-import { accentInsensitivePathOrder } from "@truedat/core/services/sort";
-import { Loading } from "@truedat/core/components";
-import DomainMember from "./DomainMember";
-import DomainMembersActions from "./DomainMembersActions";
+import React from "react";
+import ResourceMembers from "@truedat/core/components/ResourceMembers";
 
-const toSearchable = _.flow(_.deburr, _.toLower, _.trim);
+export const DomainMembers = () => <ResourceMembers type="domain" />;
 
-const matchesFilter = filter =>
-  _.flow(
-    _.at([
-      "principal.user_name",
-      "principal.full_name",
-      "role_name",
-      "principal.name"
-    ]),
-    _.map(toSearchable),
-    _.some(_.includes(toSearchable(filter)))
-  );
-
-const filterData = (filter, data) => {
-  return _.filter(matchesFilter(filter))(data);
-};
-
-export const DomainMembers = ({
-  domain,
-  domainMembers,
-  domainMembersLoading
-}) => {
-  const { formatMessage } = useIntl();
-  const [searchFilter, setSearchFilter] = useState("");
-
-  const filteredDomainMembers = filterData(searchFilter, domainMembers);
-  const groupedDomainMembers = _.flow(
-    _.sortBy(accentInsensitivePathOrder("role_name")),
-    _.groupBy("role_name"),
-    _.toPairs
-  )(filteredDomainMembers);
-
-  const handleFilterUsers = (_e, { value }) => {
-    setSearchFilter(value);
-  };
-  return (
-    <>
-      {!domainMembersLoading && (
-        <Grid centered columns={1}>
-          <Grid.Column>
-            <Input
-              onChange={handleFilterUsers}
-              value={searchFilter}
-              icon={{ name: "search", link: true }}
-              placeholder={formatMessage({ id: "user.search.placeholder" })}
-            />
-            <DomainMembersActions />
-          </Grid.Column>
-        </Grid>
-      )}
-      {domainMembersLoading && <Loading inline="centered" />}
-      {_.isEmpty(filteredDomainMembers) && !domainMembersLoading && (
-        <Message
-          icon="warning"
-          header={formatMessage({ id: "domain.members.empty" })}
-        />
-      )}
-      {groupedDomainMembers.map(([groupName, members], groupIndex) => {
-        return (
-          <React.Fragment key={`fragment_${groupIndex}`}>
-            <Header as="h3" key={`group_${groupIndex}`} dividing>
-              {groupName}
-            </Header>
-            <Card.Group key={`card_group_${groupIndex}`}>
-              {_.sortBy(["principal.name", "principal.user_name"])(members).map(
-                (m, i) => (
-                  <DomainMember
-                    key={`group_${groupIndex}.${i}`}
-                    domain_id={domain.id}
-                    {...m}
-                  />
-                )
-              )}
-            </Card.Group>
-          </React.Fragment>
-        );
-      })}
-    </>
-  );
-};
-
-DomainMembers.propTypes = {
-  domain: PropTypes.object,
-  domainMembers: PropTypes.array,
-  domainMembersLoading: PropTypes.bool,
-  intl: PropTypes.object
-};
-
-const mapStateToProps = ({ domain, domainMembers, domainMembersLoading }) => ({
-  domain,
-  domainMembers,
-  domainMembersLoading
-});
-
-export default connect(mapStateToProps)(DomainMembers);
+export default DomainMembers;

package/src/taxonomy/components/DomainRoutes.js

@@ -15,7 +15,6 @@ import {
   DOMAIN_NEW,
   DOMAIN_STRUCTURES,
 } from "@truedat/core/routes";
-import AddDomainMember from "./AddMember";
 import Domain from "./Domain";
 import DomainLoader from "./DomainLoader";
 import DomainMembersLoader from "./DomainMembersLoader";
@@ -23,6 +22,7 @@ import Domains from "./Domains";
 import DomainsLoader from "./DomainsLoader";
 import EditDomain from "./EditDomain";
 import NewDomain from "./NewDomain";
+import AddDomainMember from "./AddDomainMember";
 
 const RolesLoader = React.lazy(() =>
   import("@truedat/auth/roles/components/RolesLoader")
@@ -41,10 +41,10 @@ const DomainRoutes = () => (
     <Route exact path={DOMAIN_NEW} component={NewDomain} />
     <Route
       path={DOMAIN_MEMBERS_NEW}
-      render={() => (
+      render={({ match }) => (
         <>
-          <Route component={RolesLoader} />
-          <Route path={DOMAIN_MEMBERS_NEW} component={AddDomainMember} exact />
+          <RolesLoader />
+          <AddDomainMember id={parseInt(match?.params?.id)} />
         </>
       )}
     />

package/src/taxonomy/components/__tests__/AddDomainMember.spec.js

@@ -0,0 +1,12 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import AddDomainMember from "../AddDomainMember";
+
+const props = { id: 1 };
+
+describe("<AddDomainMember />", () => {
+  it("matches the latest snapshot", () => {
+    const { container } = render(<AddDomainMember {...props} />);
+    expect(container).toMatchSnapshot();
+  });
+});

package/src/taxonomy/components/__tests__/DomainMembers.spec.js

@@ -1,106 +1,23 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render } from "@testing-library/react";
 import { intl } from "@truedat/test/intl-stub";
 import { DomainMembers } from "../DomainMembers";
 
 // workaround for enzyme issue with React.useContext
 // see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
 jest.spyOn(React, "useContext").mockImplementation(() => intl);
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useParams: jest.fn().mockReturnValue({ id: 1 }),
+}));
 
 describe("<DomainMembers />", () => {
-  const domainMembersLoading = false;
-  const domainMembers = [
-    {
-      principal_type: "group",
-      role_id: 2,
-      role_name: "data_owner",
-      principal: { description: "aaa bbb cc d", id: 2, name: "grupo1 " }
-    },
-    {
-      principal: {
-        email: "test@test.com",
-        full_name: "Data Owner 2",
-        id: 14,
-        user_name: "data_owner2"
-      },
-      principal_type: "user",
-      role_id: 2,
-      role_name: "data_owner"
-    },
-    {
-      principal: {
-        email: "test@test.com",
-        full_name: "Datos A",
-        id: 1,
-        user_name: "datos_a"
-      },
-      principal_type: "user",
-      role_id: 3,
-      role_name: "Datos A"
-    },
-    {
-      principal: {
-        email: "test@test.com",
-        full_name: "Last U",
-        id: 1,
-        user_name: "last_u"
-      },
-      principal_type: "user",
-      role_id: 6,
-      role_name: "Last R"
-    }
-  ];
-  const domain = { id: 1, name: "My Domain Name" };
-  const props = { domain, domainMembers, domainMembersLoading };
+  const props = {
+    type: "domain",
+  };
 
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<DomainMembers {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("filters users and groups according to search filter", () => {
-    const wrapper = shallow(<DomainMembers {...props} />);
-
-    wrapper.find("Input").simulate("change", {}, { value: "data" });
-    expect(wrapper.findWhere(n => n.prop("domain_id"))).toHaveLength(2);
-
-    wrapper.find("Input").simulate("change", {}, { value: "Data Owner 2" });
-    expect(wrapper.findWhere(n => n.prop("domain_id"))).toHaveLength(1);
-
-    wrapper.find("Input").simulate("change", {}, { value: "grupo" });
-    expect(wrapper.findWhere(n => n.prop("domain_id"))).toHaveLength(1);
-
-    wrapper.find("Input").simulate("change", {}, { value: "xx" });
-    expect(wrapper.findWhere(n => n.prop("domain_id"))).toHaveLength(0);
-  });
-
-  it("renders users and groups grouped by role name", () => {
-    const wrapper = shallow(<DomainMembers {...props} />);
-
-    expect(
-      wrapper
-        .find("Header")
-        .at(0)
-        .props().children
-    ).toEqual("data_owner");
-    expect(
-      wrapper
-        .find("CardGroup")
-        .at(0)
-        .findWhere(n => n.prop("domain_id"))
-    ).toHaveLength(2);
-
-    expect(
-      wrapper
-        .find("Header")
-        .at(2)
-        .props().children
-    ).toEqual("Last R");
-    expect(
-      wrapper
-        .find("CardGroup")
-        .at(2)
-        .findWhere(n => n.prop("domain_id"))
-    ).toHaveLength(1);
+    const { container } = render(<DomainMembers {...props} />);
+    expect(container).toMatchSnapshot();
   });
 });

package/src/taxonomy/components/__tests__/__snapshots__/AddDomainMember.spec.js.snap

@@ -0,0 +1,170 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<AddDomainMember /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="ui breadcrumb"
+  >
+    <a
+      class="active section"
+      href="/domains"
+    >
+      Taxonomy
+    </a>
+  </div>
+  <div
+    class="ui segment ui text container"
+  >
+    <h2
+      class="ui header"
+    >
+      <i
+        aria-hidden="true"
+        class="id card outline icon"
+      />
+      <div
+        class="content"
+      >
+        Add
+      </div>
+    </h2>
+    <form
+      class="ui form"
+    >
+      <div
+        class="required field"
+      >
+        <label
+          for="principal"
+        >
+          Member
+        </label>
+        <div
+          aria-expanded="false"
+          class="ui search selection dropdown"
+          required=""
+          role="combobox"
+        >
+          <input
+            aria-autocomplete="list"
+            autocomplete="off"
+            class="search"
+            tabindex="0"
+            type="text"
+            value=""
+          />
+          <div
+            aria-atomic="true"
+            aria-live="polite"
+            class="divider default text"
+            role="alert"
+          >
+            Member
+          </div>
+          <i
+            aria-hidden="true"
+            class="dropdown icon"
+          />
+          <div
+            class="menu transition"
+            role="listbox"
+          >
+            <div
+              class="message"
+            >
+              No results found.
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="required field"
+      >
+        <label
+          for="role"
+        >
+          Role
+        </label>
+        <div
+          aria-expanded="false"
+          class="ui basic search selection dropdown"
+          required=""
+          role="combobox"
+        >
+          <input
+            aria-autocomplete="list"
+            autocomplete="off"
+            class="search"
+            id="role"
+            tabindex="0"
+            type="text"
+            value=""
+          />
+          <div
+            aria-atomic="true"
+            aria-live="polite"
+            class="divider default text"
+            role="alert"
+          >
+            Role
+          </div>
+          <i
+            aria-hidden="true"
+            class="dropdown icon"
+          />
+          <div
+            class="menu transition"
+            role="listbox"
+          >
+            <div
+              class="message"
+            >
+              No results found.
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="field"
+      >
+        <label
+          for="description"
+        >
+          Description
+        </label>
+        <div
+          class="ui input"
+        >
+          <input
+            autocomplete="off"
+            id="description"
+            maxlength="120"
+            placeholder="Description"
+            type="text"
+            value=""
+          />
+        </div>
+      </div>
+      <div
+        class="actions"
+      >
+        <button
+          class="ui primary disabled right floated button"
+          disabled=""
+          tabindex="-1"
+          type="submit"
+        >
+          Add
+        </button>
+        <a
+          class="ui secondary button"
+          href="/"
+          role="button"
+        >
+          Cancel
+        </a>
+      </div>
+    </form>
+  </div>
+</div>
+`;

package/src/taxonomy/components/__tests__/__snapshots__/DomainMembers.spec.js.snap

@@ -1,118 +1,44 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<DomainMembers /> matches the latest snapshot 1`] = `
-<Fragment>
-  <Grid
-    centered={true}
-    columns={1}
+<div>
+  <div
+    class="ui centered one column grid"
   >
-    <GridColumn>
-      <Input
-        icon={
-          {
-            "link": true,
-            "name": "search",
-          }
-        }
-        onChange={[Function]}
-        placeholder="user.search.placeholder"
-        type="text"
-        value=""
-      />
-      <Connect(DomainMembersActions) />
-    </GridColumn>
-  </Grid>
-  <Header
-    as="h3"
-    dividing={true}
-    key="group_0"
+    <div
+      class="column"
+    >
+      <div
+        class="ui icon input"
+      >
+        <input
+          placeholder="user.search.placeholder"
+          type="text"
+          value=""
+        />
+        <i
+          aria-hidden="true"
+          class="search link icon"
+        />
+      </div>
+    </div>
+  </div>
+  <div
+    class="ui icon message"
   >
-    data_owner
-  </Header>
-  <CardGroup
-    key="card_group_0"
-  >
-    <Connect(DomainMember)
-      domain_id={1}
-      key="group_0.0"
-      principal={
-        {
-          "description": "aaa bbb cc d",
-          "id": 2,
-          "name": "grupo1 ",
-        }
-      }
-      principal_type="group"
-      role_id={2}
-      role_name="data_owner"
-    />
-    <Connect(DomainMember)
-      domain_id={1}
-      key="group_0.1"
-      principal={
-        {
-          "email": "test@test.com",
-          "full_name": "Data Owner 2",
-          "id": 14,
-          "user_name": "data_owner2",
-        }
-      }
-      principal_type="user"
-      role_id={2}
-      role_name="data_owner"
-    />
-  </CardGroup>
-  <Header
-    as="h3"
-    dividing={true}
-    key="group_1"
-  >
-    Datos A
-  </Header>
-  <CardGroup
-    key="card_group_1"
-  >
-    <Connect(DomainMember)
-      domain_id={1}
-      key="group_1.0"
-      principal={
-        {
-          "email": "test@test.com",
-          "full_name": "Datos A",
-          "id": 1,
-          "user_name": "datos_a",
-        }
-      }
-      principal_type="user"
-      role_id={3}
-      role_name="Datos A"
-    />
-  </CardGroup>
-  <Header
-    as="h3"
-    dividing={true}
-    key="group_2"
-  >
-    Last R
-  </Header>
-  <CardGroup
-    key="card_group_2"
-  >
-    <Connect(DomainMember)
-      domain_id={1}
-      key="group_2.0"
-      principal={
-        {
-          "email": "test@test.com",
-          "full_name": "Last U",
-          "id": 1,
-          "user_name": "last_u",
-        }
-      }
-      principal_type="user"
-      role_id={6}
-      role_name="Last R"
+    <i
+      aria-hidden="true"
+      class="warning icon"
     />
-  </CardGroup>
-</Fragment>
+    <div
+      class="content"
+    >
+      <div
+        class="header"
+      >
+        domain.members.empty
+      </div>
+    </div>
+  </div>
+</div>
 `;