@truedat/dd 6.3.1 → 6.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "description": "Truedat Web Data Dictionary",
   "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",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "6.3.1",
-    "@truedat/core": "6.3.1",
-    "@truedat/df": "6.3.1",
+    "@truedat/auth": "6.3.2",
+    "@truedat/core": "6.3.2",
+    "@truedat/df": "6.3.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "0c8183f86f4fe56211b82d2f2427c64f983f0b81"
+  "gitHead": "b9ccce69ebb729f62d28972e31b2865d74e9a0d6"
 }

package/src/api/queries.js

@@ -270,6 +270,7 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
         id
         inserted_at
         latest_note
+        roles
         source {
           external_id
           id
@@ -277,17 +278,6 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
         source_id
         system_id
         updated_at
-        id
-        alias
-        confidential
-        domain_ids
-        domains {
-          id
-          name
-        }
-        external_id
-        inserted_at
-        updated_at
       }
       parents {
         alias

package/src/components/AddStructureMember.js

@@ -0,0 +1,24 @@
+import React from "react";
+import PropTypes from "prop-types";
+
+import { useHistory } from "react-router-dom";
+import AddResourceMember from "@truedat/core/components/AddResourceMember";
+import { linkTo } from "@truedat/core/routes";
+import StructureCrumbs from "./StructureCrumbs";
+
+const AddStructureMember = ({ id }) => {
+  const history = useHistory();
+  const onSuccess = () => history.push(linkTo.STRUCTURE_MEMBERS({ id }));
+  return (
+    <>
+      <StructureCrumbs />
+      <AddResourceMember type="structure" id={`${id}`} onSuccess={onSuccess} />
+    </>
+  );
+};
+
+AddStructureMember.propTypes = {
+  id: PropTypes.number,
+};
+
+export default AddStructureMember;

package/src/components/StructureRoles.js

@@ -0,0 +1,6 @@
+import React from "react";
+import ResourceMembers from "@truedat/core/components/ResourceMembers";
+
+export const StructureRoles = () => <ResourceMembers type="structure" />;
+
+export default StructureRoles;

package/src/components/StructureTabPane.js

@@ -22,6 +22,7 @@ import StructureParentRelations from "./StructureParentRelations";
 import StructureVersions from "./StructureVersions";
 import StructureMetadata from "./StructureMetadata";
 import StructureNotesLoader from "./StructureNotesLoader";
+import StructureRoles from "./StructureRoles";
 import StructureStructureLinks from "./StructureStructureLinks";
 import StructureStructureForm from "./StructureStructureForm";
 
@@ -79,6 +80,7 @@ export const StructureTabPane = ({ activeTab, tabVisibility }) => {
       {activeTab === "children" && <StructureChildrenRelations />}
       {activeTab === "versions" && <StructureVersions />}
       {activeTab === "events" && <StructureEvents />}
+      {activeTab === "roles" && <StructureRoles />}
       {activeTab === "rules" && tabVisibility.rules && (
         <RuleImplementationsTable withoutColumns={["status"]} />
       )}

package/src/components/StructureTabPaneRoutes.js

@@ -13,6 +13,7 @@ import {
   STRUCTURE_NOTES,
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
+  STRUCTURE_MEMBERS,
   STRUCTURE_RULES,
   STRUCTURE_VERSION,
   STRUCTURE_VERSIONS,
@@ -32,6 +33,7 @@ export const StructureTabPaneRoutes = ({}) => (
     <Route path={STRUCTURE_NOTES} component={StructureTabPane} />
     <Route path={STRUCTURE_GRANTS} component={StructureTabPane} />
     <Route path={STRUCTURE_METADATA} component={StructureTabPane} />
+    <Route path={STRUCTURE_MEMBERS} component={StructureTabPane} />
     <Route path={STRUCTURE_RULES} component={StructureTabPane} />
     <Route path={STRUCTURE_CHILDREN} component={StructureTabPane} />
     <Route path={STRUCTURE_PARENTS} component={StructureTabPane} />

package/src/components/StructureTabRoutes.js

@@ -12,6 +12,7 @@ import {
   STRUCTURE_NOTES,
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
+  STRUCTURE_MEMBERS,
   STRUCTURE_RULES,
   STRUCTURE_VERSION,
   STRUCTURE_VERSIONS,
@@ -31,6 +32,7 @@ export const StructureTabRoutes = () => (
     <Route path={STRUCTURE_EVENTS} component={StructureTabs} />
     <Route path={STRUCTURE_METADATA} component={StructureTabs} />
     <Route path={STRUCTURE_NOTES} component={StructureTabs} />
+    <Route path={STRUCTURE_MEMBERS} component={StructureTabs} />
     <Route path={STRUCTURE_RULES} component={StructureTabs} />
     <Route path={STRUCTURE_LINEAGE} component={StructureTabs} />
     <Route path={STRUCTURE_CHILDREN} component={StructureTabs} />

package/src/components/StructureTabs.js

@@ -36,6 +36,7 @@ export const StructureTabs = ({
     parents,
     profile,
     rules,
+    roles,
     versions,
   } = {},
   structure,
@@ -144,6 +145,13 @@ export const StructureTabs = ({
           content: events ? formatMessage({ id: "tabs.dd.audit" }) : false,
           key: "events",
         },
+        {
+          active: activeTab === "roles",
+          as: Link,
+          to: linkTo.STRUCTURE_MEMBERS(structure),
+          content: roles ? formatMessage({ id: "tabs.dd.roles" }) : false,
+          key: "roles",
+        },
       ])
     : null;
   return (

package/src/components/StructuresRoutes.js

@@ -1,5 +1,6 @@
 import _ from "lodash/fp";
 import React from "react";
+
 import { useIntl } from "react-intl";
 import { Route, Switch, useRouteMatch } from "react-router-dom";
 import { Unauthorized } from "@truedat/core/components";
@@ -12,7 +13,9 @@ import {
   STRUCTURES_BULK_UPDATE,
   STRUCTURE_EVENTS,
   STRUCTURE_VERSION,
+  STRUCTURE_MEMBERS_NEW,
 } from "@truedat/core/routes";
+import AddStructureMember from "./AddStructureMember";
 import StructureCrumbs from "./StructureCrumbs";
 import StructureLoader from "./StructureLoader";
 import UserSearchFiltersLoader from "./UserSearchFiltersLoader";
@@ -32,6 +35,10 @@ const RuleImplementationsLoader = React.lazy(() =>
   import("@truedat/dq/components/RuleImplementationsLoader")
 );
 
+const RolesLoader = React.lazy(() =>
+  import("@truedat/auth/roles/components/RolesLoader")
+);
+
 const ConceptSelectorConceptsLoader = () => (
   <ConceptsLoader
     pageSize={7}
@@ -118,7 +125,18 @@ const AuthorizedRoutes = () => {
           );
         }}
       />
-      <Route path={[STRUCTURE]} component={StructureView} />
+      <Switch>
+        <Route
+          path={STRUCTURE_MEMBERS_NEW}
+          render={({ match }) => (
+            <>
+              <RolesLoader />
+              <AddStructureMember id={parseInt(match?.params?.id)} />
+            </>
+          )}
+        />
+        <Route path={STRUCTURE} component={StructureView} />
+      </Switch>
     </>
   );
 };

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

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

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

@@ -0,0 +1,23 @@
+import React from "react";
+import { render } from "@testing-library/react";
+import { intl } from "@truedat/test/intl-stub";
+import StructureRoles from "../StructureRoles";
+
+// 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("<StructureRoles />", () => {
+  const props = {
+    type: "domain",
+  };
+
+  it("matches the latest snapshot", () => {
+    const { container } = render(<StructureRoles {...props} />);
+    expect(container).toMatchSnapshot();
+  });
+});

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

@@ -16,6 +16,7 @@ describe("<StructureTabPane />", () => {
     "events",
     "foo",
     "metadata",
+    "roles",
     "grants",
   ].forEach((tab) =>
     it("matches the latest snapshot: " + tab, () => {

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

@@ -15,6 +15,7 @@ const renderOpts = {
       "tabs.dd.versions": "Versions",
       "tabs.dd.grants": "Grants",
       "tabs.dd.rules": "Rules",
+      "tabs.dd.roles": "Roles",
     },
   },
 };
@@ -32,6 +33,7 @@ describe("<StructureTabs />", () => {
     "grants",
     "notes",
     "rules",
+    "roles",
     "events",
   ];
   const structure = { id: 123 };

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

@@ -0,0 +1,160 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<AddStructureMember /> matches the latest snapshot 1`] = `
+<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/components/__tests__/__snapshots__/StructureRoles.spec.js.snap

@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructureRoles /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="ui centered one column grid"
+  >
+    <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"
+  >
+    <i
+      aria-hidden="true"
+      class="warning icon"
+    />
+    <div
+      class="content"
+    >
+      <div
+        class="header"
+      >
+        domain.members.empty
+      </div>
+    </div>
+  </div>
+</div>
+`;

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

@@ -59,6 +59,12 @@ exports[`<StructureTabPane /> matches the latest snapshot: profile 1`] = `
 </ErrorBoundary>
 `;
 
+exports[`<StructureTabPane /> matches the latest snapshot: roles 1`] = `
+<ErrorBoundary>
+  <StructureRoles />
+</ErrorBoundary>
+`;
+
 exports[`<StructureTabPane /> matches the latest snapshot: versions 1`] = `
 <ErrorBoundary>
   <Connect(StructureVersions) />

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

@@ -38,6 +38,10 @@ exports[`<StructureTabRoutes /> matches the latest snapshot 1`] = `
     component={[Function]}
     path="/structures/:id/notes"
   />
+  <Route
+    component={[Function]}
+    path="/structures/:id/members"
+  />
   <Route
     component={[Function]}
     path="/structures/:id/rules"

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

@@ -59,6 +59,12 @@ exports[`<StructureTabs /> matches the latest snapshot: metadata 1`] = `
     >
       Audit
     </a>
+    <a
+      class="item"
+      href="/structures/123/members"
+    >
+      Roles
+    </a>
   </div>
   <div
     class="ui hidden divider"

package/src/reducers/structure.js

@@ -13,6 +13,7 @@ const structureFields = (fn) =>
       "domains",
       "external_id",
       "id",
+      "roles",
       "inserted_at",
       "updated_at",
     ])

package/src/selectors/__tests__/getActiveTab.spec.js

@@ -11,6 +11,7 @@ import {
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
   STRUCTURE_RULES,
+  STRUCTURE_MEMBERS,
   STRUCTURE_VERSION,
   STRUCTURE_VERSIONS,
   STRUCTURE_VERSION_VERSIONS,
@@ -26,6 +27,7 @@ describe("selectors: defaultTab", () => {
   const parents = truthy;
   const profile = truthy;
   const rules = truthy;
+  const roles = truthy;
   const links = truthy;
   const versions = truthy;
   const grants = truthy;
@@ -38,6 +40,7 @@ describe("selectors: defaultTab", () => {
     expect(defaultTab({ parents, profile })).toBe("parents");
     expect(defaultTab({ profile, rules })).toBe("profile");
     expect(defaultTab({ links, rules })).toBe("rules");
+    expect(defaultTab({ links, roles })).toBe("roles");
     expect(defaultTab({ links, versions })).toBe("links");
     expect(defaultTab({ versions })).toBe("versions");
     expect(defaultTab({})).toBe(undefined);
@@ -56,6 +59,7 @@ describe("selectors: getActiveTab", () => {
     expect(getActiveTab(tabVisibility, STRUCTURE_PARENTS)).toBe("parents");
     expect(getActiveTab(tabVisibility, STRUCTURE_PROFILE)).toBe("profile");
     expect(getActiveTab(tabVisibility, STRUCTURE_RULES)).toBe("rules");
+    expect(getActiveTab(tabVisibility, STRUCTURE_MEMBERS)).toBe("roles");
     expect(getActiveTab(tabVisibility, STRUCTURE_LINKS)).toBe("links");
     expect(getActiveTab(tabVisibility, STRUCTURE_LINKS_NEW)).toBe("links");
     expect(getActiveTab(tabVisibility, STRUCTURE_VERSIONS)).toBe("versions");

package/src/selectors/__tests__/getTabVisibility.spec.js

@@ -196,4 +196,11 @@ describe("selectors: getTabVisibility", () => {
       grants: true,
     });
   });
+
+  it("should include roles if manage_structure_acl_entry action is present in structureActions", () => {
+    expect(getTabVisibility({})).toMatchObject({ roles: false });
+    expect(
+      getTabVisibility({ structureActions: { manage_structure_acl_entry: {} } })
+    ).toMatchObject({ roles: true });
+  });
 });

package/src/selectors/getActiveTab.js

@@ -9,6 +9,7 @@ import {
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
   STRUCTURE_STRUCTURE_LINKS,
+  STRUCTURE_MEMBERS,
   STRUCTURE_RULES,
   STRUCTURE_LINKS,
   STRUCTURE_LINKS_NEW,
@@ -29,6 +30,7 @@ export const defaultTab = _.cond([
   [_.conformsTo({ parents: _.identity }), _.constant("parents")],
   [_.conformsTo({ profile: _.identity }), _.constant("profile")],
   [_.conformsTo({ rules: _.identity }), _.constant("rules")],
+  [_.conformsTo({ roles: _.identity }), _.constant("roles")],
   [_.conformsTo({ links: _.identity }), _.constant("links")],
   [_.conformsTo({ versions: _.identity }), _.constant("versions")],
 ]);
@@ -45,6 +47,7 @@ export const getActiveTab = (tabVisibility, path) => {
     [_.eq(STRUCTURE_PARENTS), _.constant("parents")],
     [_.eq(STRUCTURE_PROFILE), _.constant("profile")],
     [_.eq(STRUCTURE_STRUCTURE_LINKS), _.constant("structureLinks")],
+    [_.eq(STRUCTURE_MEMBERS), _.constant("roles")],
     [_.eq(STRUCTURE_RULES), _.constant("rules")],
     [_.eq(STRUCTURE_LINKS), _.constant("links")],
     [_.eq(STRUCTURE_LINKS_NEW), _.constant("links")],

package/src/selectors/getTabVisibility.js

@@ -39,6 +39,9 @@ const versionsTabVisible = notEmptyPath("structureVersions");
 const structureLinksTabVisible = (state) =>
   _.has("create_struct_to_struct_link", state?.structureActions) ||
   state?.structure?.data_structure_link_count > 0;
+const rolesTabVisible = (state) =>
+  _.has("manage_structure_acl_entry", state?.structureActions) ||
+  !_.isEmpty(state?.structure?.roles);
 const rulesTabVisible = (state) => state?.structure?.implementation_count > 0;
 const lineageTabVisible = _.anyPass([_.path("structure.degree.in")]);
 const impactTabVisible = _.anyPass([_.path("structure.degree.out")]);
@@ -65,4 +68,5 @@ export const getTabVisibility = (state) => ({
   parents: parentsTabVisible(state),
   children: childrenTabVisible(state),
   grants: grantsTabVisible(state),
+  roles: rolesTabVisible(state),
 });