@truedat/dd 4.40.1 → 4.40.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.40.2] 2022-03-14
+
+### Added
+
+- [TD-4500] Support for data structures with multiple domain_ids
+
 ## [4.40.1] 2022-03-08
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.40.1",
+  "version": "4.40.2",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.40.1",
-    "@truedat/core": "4.40.1",
-    "@truedat/df": "4.40.1",
+    "@truedat/auth": "4.40.2",
+    "@truedat/core": "4.40.2",
+    "@truedat/df": "4.40.2",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "58b35b48833fbed1602d1070853e6c805bcc48f1"
+  "gitHead": "86aa7e6c6e49c8e3a975f8f4f744c44035324c7f"
 }

package/src/components/EditDomainForm.js

@@ -8,24 +8,25 @@ import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { updateStructure } from "../routines";
 
-export const EditDomainForm = ({ title, updateStructure, structure }) => {
+export const EditDomainForm = ({
+  saving,
+  title,
+  updateStructure,
+  structure,
+}) => {
   const { formatMessage } = useIntl();
-  const [domainId, setDomainId] = useState(null);
-  const [with_inheritance, set_with_inheritance] = useState(true);
+  const [domainIds, setDomainIds] = useState(structure?.domain_ids || []);
+  const [inherit, setInherit] = useState(true);
 
   const onSubmit = () => {
-    const data_structure = {
-      id: structure.id,
-      domain_id: domainId,
-      with_inheritance,
-    };
+    const data_structure = { id: structure.id, domain_ids: domainIds };
     const redirect = linkTo.STRUCTURE_NOTES(data_structure);
 
-    updateStructure({ data_structure, redirect });
+    updateStructure({ data_structure, inherit, redirect });
   };
 
   const handleDomainSelected = (e, { value }) => {
-    setDomainId(value);
+    setDomainIds(value);
   };
 
   return (
@@ -33,27 +34,33 @@ export const EditDomainForm = ({ title, updateStructure, structure }) => {
       <Header as="h2" content={title} />
       <DomainDropdownSelector
         clearable={false}
+        multiple={true}
         onChange={handleDomainSelected}
         name="domain"
-        value={domainId || structure?.domain_id}
+        value={domainIds}
       />
 
       <Checkbox
         label={formatMessage({
-          id: "structureDomain.actions.update.with_inheritance",
+          id: "structureDomain.actions.update.inherit",
         })}
-        checked={with_inheritance}
+        checked={inherit}
         onChange={(e) => {
-          set_with_inheritance(!with_inheritance);
+          setInherit(!inherit);
           e.preventDefault();
         }}
       />
 
-      <Form onSubmit={onSubmit}>
+      <Form onSubmit={saving ? null : onSubmit}>
         <div className="actions">
           <Button
             type="submit"
-            disabled={!Boolean(domainId) || domainId == structure?.domain_id}
+            loading={saving}
+            disabled={
+              saving ||
+              _.isEmpty(domainIds) ||
+              domainIds == [structure?.domain_ids]
+            }
             primary
             content={formatMessage({ id: "structureDomain.actions.update" })}
           />
@@ -67,10 +74,12 @@ EditDomainForm.propTypes = {
   structure: PropTypes.object,
   updateStructure: PropTypes.func,
   title: PropTypes.string,
+  saving: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({
-  structure: _.pick(["id", "domain_id"])(state.structure),
+  structure: _.pick(["id", "domain_ids"])(state.structure),
+  saving: state.structureUpdating,
 });
 
 export default connect(mapStateToProps, { updateStructure })(EditDomainForm);

package/src/components/EditDomainPopup.js

@@ -5,7 +5,7 @@ import { Button, Icon, Popup } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import EditDomainForm from "./EditDomainForm";
 
-export const EditDomainPopup = ({ userPermissions, saving }) => {
+export const EditDomainPopup = ({ userPermissions, saving, text }) => {
   const { formatMessage } = useIntl();
   const [open, setOpen] = useState(false);
 

package/src/components/StructureConfidentialButton.js

@@ -19,8 +19,11 @@ export class StructureConfidentialButton extends React.Component {
     const {
       structure: { id, confidential },
     } = this.props;
-    const data_structure = { id, confidential: !confidential };
-    this.props.updateStructure({ data_structure });
+    const data_structure = {
+      id,
+      confidential: !confidential,
+    };
+    this.props.updateStructure({ data_structure, inherit: true });
   };
 
   render() {

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

@@ -18,15 +18,15 @@ describe("<EditDomainForm />", () => {
 
   const props = {
     title: "title",
-    saving: true,
     updateStructure,
-    structure: structure,
+    structure,
   };
+
   const messages = {
     en: {
       "structure.edit_domain.title": "Edit domain",
       "structureDomain.actions.update": "Update",
-      "structureDomain.actions.update.with_inheritance": "Apply on children",
+      "structureDomain.actions.update.inherit": "Apply on children",
       "domain.selector.label": "Domain",
       "domain.selector.placeholder": "Select a domain...",
     },
@@ -82,7 +82,8 @@ describe("<EditDomainForm />", () => {
     });
     expect(updateStructure).toHaveBeenCalledWith(
       expect.objectContaining({
-        data_structure: { domain_id: 1, id: 42, with_inheritance: true },
+        data_structure: { domain_ids: [1], id: 42 },
+        inherit: true,
         redirect: "/structures/42/notes",
       })
     );
@@ -111,7 +112,39 @@ describe("<EditDomainForm />", () => {
     });
     expect(updateStructure).toHaveBeenCalledWith(
       expect.objectContaining({
-        data_structure: { domain_id: 1, id: 42, with_inheritance: false },
+        data_structure: { domain_ids: [1], id: 42 },
+        inherit: false,
+        redirect: "/structures/42/notes",
+      })
+    );
+  });
+
+  it("send selected multiple domain ids when button clicked", async () => {
+    const { getByRole } = render(<EditDomainForm {...props} />, {
+      state: { domains },
+      messages,
+    });
+
+    const button = getByRole("button", { name: /update/i });
+    const checkbox = getByRole("checkbox");
+    const optionOne = getByRole("option", { name: /Domain 1/i });
+    const optionTwo = getByRole("option", { name: /Domain 2/i });
+
+    expect(button).toBeDisabled();
+    expect(checkbox).toBeChecked();
+    userEvent.click(optionTwo);
+    userEvent.click(optionOne);
+    await waitFor(() => {
+      expect(button).not.toBeDisabled();
+    });
+    userEvent.click(button);
+    await waitFor(() => {
+      expect(updateStructure.mock.calls.length).toBe(1);
+    });
+    expect(updateStructure).toHaveBeenCalledWith(
+      expect.objectContaining({
+        data_structure: { domain_ids: [2, 1], id: 42 },
+        inherit: true,
         redirect: "/structures/42/notes",
       })
     );

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

@@ -22,7 +22,7 @@ exports[`<EditDomainForm /> matches the latest snapshot 1`] = `
       >
         <div
           aria-expanded="false"
-          class="ui fluid search selection dropdown"
+          class="ui fluid multiple search selection dropdown"
           name="domain"
           role="combobox"
         >
@@ -34,6 +34,9 @@ exports[`<EditDomainForm /> matches the latest snapshot 1`] = `
             type="text"
             value=""
           />
+          <span
+            class="sizer"
+          />
           <div
             aria-atomic="true"
             aria-live="polite"
@@ -47,6 +50,7 @@ exports[`<EditDomainForm /> matches the latest snapshot 1`] = `
             class="dropdown icon"
           />
           <div
+            aria-multiselectable="true"
             class="menu transition"
             role="listbox"
           >

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

@@ -162,6 +162,7 @@ exports[`<StructureSummary /> renders custom grant label when grant provided 1`]
             <div
               class="description"
             >
+              
               <button
                 class="ui basic icon button"
                 style="box-shadow: none;"
@@ -310,6 +311,7 @@ exports[`<StructureSummary /> renders label when grant provided 1`] = `
             <div
               class="description"
             >
+              
               <button
                 class="ui basic icon button"
                 style="box-shadow: none;"

package/src/messages/en.js

@@ -314,7 +314,7 @@ export default {
   "structure.version.inserted_at": "Imported {when}",
   "structure.version.version": "Version {version}",
   "structureDomain.actions.update": "Update",
-  "structureDomain.actions.update.with_inheritance": "Apply on children",
+  "structureDomain.actions.update.inherit": "Apply on children",
   "structureSelector.union.criteria": "Union criteria",
   "structureTagForm.props.name": "Name",
   "structureTags.actions.create": "Create Structure Tag",

package/src/messages/es.js

@@ -318,7 +318,7 @@ export default {
   "structure.version.inserted_at": "Importada {when}",
   "structure.version.version": "Versión {version}",
   "structureDomain.actions.update": "Actualizar",
-  "structureDomain.actions.update.with_inheritance": "Aplicar en hijos",
+  "structureDomain.actions.update.inherit": "Aplicar en hijos",
   "structureSelector.union.criteria": "Criterio de unión",
   "structureTagForm.props.name": "Nombre",
   "structureTags.actions.create": "Crear Etiqueta de Estructura",

package/src/reducers/__tests__/structure.spec.js

@@ -23,7 +23,7 @@ describe("reducers: structure", () => {
     const type = "table";
     const group = "kong";
     const system = { id: 1, name: "king" };
-    const domain = { id: 1, name: "Domain" };
+    const domains = [{ id: 1, name: "Domain" }];
     const metadata = { foo: "bar" };
     const grant = { id: 1, detail: { foo: "bar" } };
     const siblings = [{ id: 1, name: "foo" }];
@@ -32,7 +32,7 @@ describe("reducers: structure", () => {
       inserted_at: "foo",
       updated_at: "foo",
       confidential: false,
-      domain,
+      domains,
     };
     const data = {
       data_structure,

package/src/reducers/structure.js

@@ -9,8 +9,8 @@ const structureFields = (fn) =>
     _.pick([
       "confidential",
       "latest_note",
-      "domain_id",
-      "domain",
+      "domain_ids",
+      "domains",
       "external_id",
       "id",
       "inserted_at",

package/src/sagas/__tests__/updateStructure.spec.js

@@ -35,8 +35,9 @@ describe("sagas: updateStructureSaga", () => {
   const url = compile(API_DATA_STRUCTURE)({ id });
   const data_structure = { id, description, lopd };
   const redirect = "foo";
-  const payload = { data_structure, redirect };
-  const requestData = { data_structure: { description, lopd } };
+  const inherit = false;
+  const payload = { data_structure, redirect, inherit };
+  const requestData = { data_structure: { description, lopd }, inherit };
   const successData = { ...data_structure, redirect };
 
   it("should put a success action when a response is returned", () => {

package/src/sagas/updateStructure.js

@@ -7,9 +7,12 @@ import { API_DATA_STRUCTURE } from "../api";
 
 export function* updateStructureSaga({ payload }) {
   try {
-    const { data_structure, redirect } = payload;
+    const { data_structure, inherit, redirect } = payload;
     const url = compile(API_DATA_STRUCTURE)(data_structure);
-    const requestData = { data_structure: _.omit(["id"])(data_structure) };
+    const requestData = {
+      data_structure: _.omit(["id"])(data_structure),
+      inherit,
+    };
     yield put(updateStructure.request());
     const { data } = yield call(apiJsonPatch, url, requestData, JSON_OPTS);
     const successPayload = redirect ? { ...data, redirect } : data;

package/src/selectors/getStructureProperties.js

@@ -3,18 +3,17 @@ import React from "react";
 import { createSelector } from "reselect";
 import EditDomainPopup from "../components/EditDomainPopup";
 
-const domainDecorator = (domain) => (
+const domainDecorator = (domainNames) => (
   <>
-    {domain}
+    {domainNames}
     <EditDomainPopup />
   </>
 );
-false;
 
 export const defaultStructureProperties = [
   {
     name: "domain",
-    fieldSelector: _.path("domain.name"),
+    fieldSelector: _.flow(_.propOr([], "domains"), _.map("name"), _.join(", ")),
     fieldDecorator: domainDecorator,
   },
   { name: "group" },