@truedat/dd 4.39.1 → 4.40.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.40.1] 2022-03-08
+
+### Changed
+
+- [TD-4604] Use actions from `/api/data_structures/search` instead of fetching
+  permissions
+
 ## [4.39.1] 2022-03-04
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.39.1",
+  "version": "4.40.1",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.39.0",
-    "@truedat/core": "4.39.0",
-    "@truedat/df": "4.39.0",
+    "@truedat/auth": "4.40.1",
+    "@truedat/core": "4.40.1",
+    "@truedat/df": "4.40.1",
     "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": "834628cb0737cb7c874fce2bce891d23fe80e1d7"
+  "gitHead": "58b35b48833fbed1602d1070853e6c805bcc48f1"
 }

package/src/components/StructuresBulkUpdate.js

@@ -35,7 +35,7 @@ const isValid = _.conforms({
   domain_id: _.isFinite,
 });
 
-const actions = (handleSubmit, canAutoPublish) => {
+const actions = (handleSubmit, autoPublish) => {
   const standardActions = [
     {
       key: "no",
@@ -52,7 +52,7 @@ const actions = (handleSubmit, canAutoPublish) => {
     },
   ];
 
-  return canAutoPublish
+  return autoPublish
     ? [
         ...standardActions,
         {
@@ -74,6 +74,7 @@ const isEmptyNumberOrObject = (value) =>
 export class StructuresBulkUpdate extends React.Component {
   static propTypes = {
     applyTemplate: PropTypes.func,
+    autoPublish: PropTypes.object,
     bulkUpdateStructures: PropTypes.func,
     loading: PropTypes.bool,
     selectTemplate: PropTypes.func,
@@ -81,7 +82,7 @@ export class StructuresBulkUpdate extends React.Component {
     template: PropTypes.object,
     templateId: PropTypes.number,
     templatesLoaded: PropTypes.bool,
-    canAutoPublish: PropTypes.bool,
+    enabled: PropTypes.bool,
   };
 
   state = initialState;
@@ -123,13 +124,13 @@ export class StructuresBulkUpdate extends React.Component {
 
   render() {
     const {
+      autoPublish,
+      enabled,
       loading,
+      structureCount,
       template,
       templateId,
-      structureCount,
       templatesLoaded,
-      canAutoPublish,
-      structureActiveFilters,
     } = this.props;
     const { content } = this.state;
     const disableAction = !template || _.isEmpty(template);
@@ -137,9 +138,7 @@ export class StructuresBulkUpdate extends React.Component {
     return templatesLoaded ? (
       <Container as={Segment} text>
         <TemplateLoader />
-        {!_.isEmpty(template) &&
-        structureCount != 0 &&
-        _.has("type.raw")(structureActiveFilters) ? (
+        {enabled ? (
           <>
             <Header as="h2">
               <Icon name="book" />
@@ -169,7 +168,7 @@ export class StructuresBulkUpdate extends React.Component {
                 />
               )}
               <ConfirmModal
-                actions={actions(this.handleSubmit, canAutoPublish)}
+                actions={actions(this.handleSubmit, autoPublish)}
                 trigger={
                   <Button
                     primary
@@ -236,8 +235,7 @@ const mapStateToProps = ({
   structures,
   structureTypes,
   structureTypesLoading,
-  userDomains,
-  structureActiveFilters,
+  structuresActions,
 }) => {
   const structure = _.head(structures);
   const templateId = findTemplate(structureTypes, templates, structure);
@@ -249,20 +247,12 @@ const mapStateToProps = ({
     structureCount,
     structureTypesLoaded: !structureTypesLoading,
     templatesLoaded: !templatesLoading && !_.isEmpty(templates),
-    userDomains,
-    canAutoPublish: _.any(
-      ({ domains, permission }) =>
-        !_.isEmpty(domains) &&
-        ["publish_structure_note_from_draft"].includes(permission)
-    )(userDomains),
-    structureActiveFilters,
+    autoPublish: structuresActions?.autoPublish,
+    enabled: !!templateId && !!structuresActions?.bulkUpdate,
   };
 };
 
 export default compose(
   withRouter,
-  connect(mapStateToProps, {
-    bulkUpdateStructures,
-    selectTemplate,
-  })
+  connect(mapStateToProps, { bulkUpdateStructures, selectTemplate })
 )(StructuresBulkUpdate);

package/src/components/StructuresOptions.js

@@ -8,9 +8,9 @@ import StructuresUpdateOption from "./StructuresUpdateOption";
 import StructuresUploadOption from "./StructuresUploadOption";
 
 export const StructuresOptions = ({
+  autoPublish,
+  bulkUpload,
   hasFilterApplied,
-  canBulkUpload,
-  canAutoPublish,
 }) => (
   <Dropdown
     icon="ellipsis vertical"
@@ -23,9 +23,9 @@ export const StructuresOptions = ({
       <Dropdown.Divider />
       <StructuresDownloadOption hasFilterApplied={hasFilterApplied} />
       <StructuresEditableDownloadOption hasFilterApplied={hasFilterApplied} />
-      {canBulkUpload && (
-        <StructuresUploadOption canAutoPublish={canAutoPublish} />
-      )}
+      {bulkUpload ? (
+        <StructuresUploadOption canAutoPublish={!!autoPublish} />
+      ) : null}
       <Dropdown.Divider />
       <StructuresUpdateOption />
     </Dropdown.Menu>
@@ -33,9 +33,9 @@ export const StructuresOptions = ({
 );
 
 StructuresOptions.propTypes = {
+  autoPublish: PropTypes.object,
+  bulkUpload: PropTypes.object,
   hasFilterApplied: PropTypes.bool,
-  canBulkUpload: PropTypes.bool,
-  canAutoPublish: PropTypes.bool,
 };
 
 export default StructuresOptions;

package/src/components/StructuresRoutes.js

@@ -31,10 +31,6 @@ const RuleImplementationsLoader = React.lazy(() =>
   import("@truedat/dq/components/RuleImplementationsLoader")
 );
 
-const UserDomainsLoader = React.lazy(() =>
-  import("@truedat/auth/users/components/UserDomainsLoader")
-);
-
 const ConceptSelectorConceptsLoader = () => (
   <ConceptsLoader
     pageSize={7}
@@ -72,13 +68,6 @@ const AuthorizedRoutes = () => {
         render={() => (
           <>
             <UserSearchFiltersLoader scope="data_structure" />
-            <UserDomainsLoader
-              permissions={[
-                "publish_structure_note_from_draft",
-                "edit_structure_note",
-                "create_structure_note",
-              ]}
-            />
             <StructuresView />
           </>
         )}
@@ -88,13 +77,6 @@ const AuthorizedRoutes = () => {
         path={STRUCTURES_BULK_UPDATE}
         render={() => (
           <>
-            <UserDomainsLoader
-              permissions={[
-                "publish_structure_note_from_draft",
-                "edit_structure_note",
-                "create_structure_note",
-              ]}
-            />
             <StructureCrumbs
               name={formatMessage({ id: "structures.bulkUpdate.crumbs.top" })}
             />

package/src/components/StructuresView.js

@@ -27,32 +27,18 @@ export const StructuresHeader = () => (
 );
 
 export const StructuresView = ({
+  actions = {},
   loading,
   structures,
   hasFilterApplied,
   systemsLoading,
-  userDomains,
 }) => {
   const history = useHistory();
-  const canBulkUpload = _.any(
-    ({ domains, permission }) =>
-      !_.isEmpty(domains) &&
-      ["edit_structure_note", "create_structure_note"].includes(permission)
-  )(userDomains);
-  const canAutoPublish = _.any(
-    ({ domains, permission }) =>
-      !_.isEmpty(domains) &&
-      ["publish_structure_note_from_draft"].includes(permission)
-  )(userDomains);
   return (
     <Segment loading={systemsLoading}>
       <StructuresHeader />
       <Divider hidden />
-      <StructuresOptions
-        hasFilterApplied={hasFilterApplied}
-        canBulkUpload={canBulkUpload}
-        canAutoPublish={canAutoPublish}
-      />
+      <StructuresOptions hasFilterApplied={hasFilterApplied} {...actions} />
       <StructuresSearch />
       <StructureSelectedFilters />
       <StructureDateFilter />
@@ -70,11 +56,11 @@ export const StructuresView = ({
 };
 
 StructuresView.propTypes = {
+  actions: PropTypes.object,
   structures: PropTypes.array,
   loading: PropTypes.bool,
   systemsLoading: PropTypes.bool,
   hasFilterApplied: PropTypes.bool,
-  userDomains: PropTypes.array,
 };
 
 const selectedFilters = ({ structureActiveFilters, structureDateFilter }) =>
@@ -87,11 +73,11 @@ const isEmptyPath = (state, path) => _.flow(_.path(path), _.isEmpty)(state);
 
 const mapStateToProps = (state) => ({
   structures: structureRowsSelector(state),
+  actions: state.structuresActions,
   loading: state.structuresLoading,
   systemsLoading: state.systemsLoading,
   hasFilterApplied:
     !isEmptyPath(state, "structureQuery.query") || selectedFilters(state),
-  userDomains: state.userDomains,
 });
 
 export default connect(mapStateToProps)(StructuresView);

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

@@ -17,7 +17,7 @@ describe("<StructuresBulkUpdate />", () => {
     templatesLoaded: true,
     structureTypes: [{ name: "doc", template_id: 1 }],
     structureTypesLoaded: true,
-    structureActiveFilters: { "type.raw": "booo" },
+    enabled: true,
   };
 
   it("matches the latest snapshot", () => {
@@ -137,7 +137,7 @@ describe("<StructuresBulkUpdate />", () => {
       selectedDomain: { id: 1 },
       templatesLoaded: true,
       bulkUpdateStructures: jest.fn(),
-      structureActiveFilters: { "type.raw": "booo" },
+      enabled: true,
     };
     const wrapper = shallow(<StructuresBulkUpdate {...props} />);
     wrapper.setState({

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

@@ -0,0 +1,19 @@
+import React from "react";
+import { waitFor } from "@testing-library/react";
+import { render } from "@truedat/test/render";
+import coreEn from "@truedat/core/messages/en";
+import StructuresOptions from "../StructuresOptions";
+import en from "../../messages/en";
+
+const renderOpts = {
+  messages: { en: { ...coreEn, ...en } },
+};
+
+describe("<StructuresOptions />", () => {
+  const props = { bulkUpload: {}, bulkUpdate: {}, autoPublish: {} };
+
+  it("matches the latest snapshot", async () => {
+    const { container } = render(<StructuresOptions {...props} />, renderOpts);
+    await waitFor(() => expect(container).toMatchSnapshot());
+  });
+});

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

@@ -31,13 +31,11 @@ describe("<StructuresView />", () => {
       { name: "group" },
     ];
 
-    const userDomains = [
-      {
-        domains: [1, 2],
-        permission: "edit_structure_note",
-      },
-    ];
-    const props = { structures, columns, userDomains };
+    const actions = {
+      bulkUpdate: {},
+    };
+
+    const props = { structures, columns, actions };
     const wrapper = shallow(<StructuresView {...props} />);
     expect(wrapper).toMatchSnapshot();
 

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

@@ -0,0 +1,77 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructuresOptions /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    aria-expanded="false"
+    class="ui floating dropdown button icon group-actions button-update"
+    role="listbox"
+    tabindex="0"
+  >
+    <i
+      aria-hidden="true"
+      class="ellipsis vertical icon"
+    />
+    <div
+      class="menu transition left"
+    >
+      <div
+        class="divider"
+      />
+      <div
+        aria-disabled="true"
+        class="disabled item"
+        role="option"
+      >
+        <i
+          aria-hidden="true"
+          class="download icon"
+        />
+        <span>
+          Download structures metadata
+        </span>
+        <p
+          class="menu-item-description"
+        >
+          You must search or filter to download structures
+        </p>
+      </div>
+      <div
+        aria-disabled="true"
+        class="disabled item"
+        role="option"
+      >
+        <i
+          aria-hidden="true"
+          class="download icon"
+        />
+        <span>
+          Download editable structures metadata
+        </span>
+        <p
+          class="menu-item-description"
+        >
+          You must search or filter to download structures
+        </p>
+      </div>
+      <div
+        class="item"
+        role="option"
+      >
+        <i
+          aria-hidden="true"
+          class="upload icon"
+        />
+        <span
+          class="text"
+        >
+          Upload structure notes
+        </span>
+      </div>
+      <div
+        class="divider"
+      />
+    </div>
+  </div>
+</div>
+`;

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

@@ -7,8 +7,7 @@ exports[`<StructuresView /> matches the latest snapshot 1`] = `
     hidden={true}
   />
   <StructuresOptions
-    canAutoPublish={false}
-    canBulkUpload={true}
+    bulkUpdate={Object {}}
   />
   <Connect(StructuresSearch) />
   <injectIntl(Connect(SelectedFilters)) />

package/src/messages/en.js

@@ -353,7 +353,7 @@ export default {
   "structures.actions.editableDownload.tooltip":
     "Download editable structures metadata",
   "structures.actions.download.popup":
-    "You should select some filter or doing a search",
+    "You must search or filter to download structures",
   "structures.actions.download.tooltip": "Download structures metadata",
   "structures.actions.edit_system": "Edit system",
   "structures.actions.new_system": "New system",

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

@@ -0,0 +1,38 @@
+import { clearStructures, fetchStructures } from "../../routines";
+import { structuresActions, initialState } from "../structuresActions";
+
+const fooState = { foo: "bar" };
+
+describe("reducers: structuresActions", () => {
+  it("should provide the initial state", () => {
+    expect(structuresActions(undefined, {})).toBe(initialState);
+  });
+
+  it("should handle the clearStructures.TRIGGER action", () => {
+    expect(structuresActions(fooState, { type: clearStructures.TRIGGER })).toBe(
+      initialState
+    );
+  });
+
+  it("should handle the fetchStructures.TRIGGER action", () => {
+    expect(structuresActions(fooState, { type: fetchStructures.TRIGGER })).toBe(
+      initialState
+    );
+  });
+
+  it("should handle the fetchStructures.SUCCESS action", () => {
+    const _actions = { bulkUpdate: {} };
+    const data = { _actions };
+
+    expect(
+      structuresActions(fooState, {
+        type: fetchStructures.SUCCESS,
+        payload: { data },
+      })
+    ).toMatchObject(_actions);
+  });
+
+  it("should ignore unknown actions", () => {
+    expect(structuresActions(fooState, { type: "FOO" })).toBe(fooState);
+  });
+});

package/src/reducers/index.js

@@ -13,9 +13,11 @@ import { grantLoading } from "./grantLoading";
 import { grantQuery } from "./grantQuery";
 import { grantRequest } from "./grantRequest";
 import { grantRequests } from "./grantRequests";
+import { grantRequestsCart } from "./grantRequestsCart";
 import { grantRequestsLoading } from "./grantRequestsLoading";
-import { grants } from "./grants";
+import { grantRequestsQuery } from "./grantRequestsQuery";
 import { grantSelectedFilter } from "./grantSelectedFilter";
+import { grants } from "./grants";
 import { grantsPageSize } from "./grantsPageSize";
 import { graph } from "./graph";
 import { graphLoading } from "./graphLoading";
@@ -37,6 +39,7 @@ import { profileGroupLoading } from "./profileGroupLoading";
 import { selectedGroups } from "./selectedGroups";
 import { selectedNode } from "./selectedNode";
 import { selectedResources } from "./selectedResources";
+import { selectedUserSearchFilter } from "./selectedUserSearchFilter";
 import { structure } from "./structure";
 import { structureActions } from "./structureActions";
 import { structureActiveFilters } from "./structureActiveFilters";
@@ -60,9 +63,7 @@ import { structureProfile } from "./structureProfile";
 import { structureQuery } from "./structureQuery";
 import { structureRedirect } from "./structureRedirect";
 import { structureSelectedFilter } from "./structureSelectedFilter";
-import { selectedUserSearchFilter } from "./selectedUserSearchFilter";
 import { structureSiblings } from "./structureSiblings";
-import { structuresSiblings } from "./structureSiblings";
 import { structureSystem } from "./structureSystem";
 import { structureTagCreating, structureTag } from "./structureTag";
 import { structureTagLoading } from "./structureTagLoading";
@@ -73,25 +74,25 @@ import { structureTypeLoading } from "./structureTypeLoading";
 import { structureTypes } from "./structureTypes";
 import { structureTypesLoading } from "./structureTypesLoading";
 import { structureUpdating } from "./structureUpdating";
-import { userSearchFilters } from "./userSearchFilters";
 import { structureVersion } from "./structureVersion";
 import { structureVersions } from "./structureVersions";
 import { structures } from "./structures";
-import { structuresEditableDownloading } from "./structuresEditableDownloading";
+import { structuresActions } from "./structuresActions";
 import { structuresDownloading } from "./structuresDownloading";
+import { structuresEditableDownloading } from "./structuresEditableDownloading";
 import { structuresLoading } from "./structuresLoading";
 import { structuresPageSize } from "./structuresPageSize";
+import { structuresSiblings } from "./structureSiblings";
 import { system } from "./system";
 import { systemId } from "./systemId";
 import { systemStructures } from "./systemStructures";
 import { systemStructuresLoading } from "./systemStructuresLoading";
 import { systems } from "./systems";
 import { systemsLoading } from "./systemsLoading";
-import { uploadingStructuresFile } from "./uploadingStructuresFile";
 import { unitDomains } from "./unitDomains";
+import { uploadingStructuresFile } from "./uploadingStructuresFile";
 import { userPermissions } from "./userPermissions";
-import { grantRequestsCart } from "./grantRequestsCart";
-import { grantRequestsQuery } from "./grantRequestsQuery";
+import { userSearchFilters } from "./userSearchFilters";
 
 export {
   bulkUpdateStructuresLoading,
@@ -107,11 +108,13 @@ export {
   grantFiltersLoading,
   grantLoading,
   grantQuery,
-  grants,
   grantRequest,
   grantRequests,
+  grantRequestsCart,
   grantRequestsLoading,
+  grantRequestsQuery,
   grantSelectedFilter,
+  grants,
   grantsPageSize,
   graph,
   graphLoading,
@@ -134,6 +137,7 @@ export {
   selectedGroups,
   selectedNode,
   selectedResources,
+  selectedUserSearchFilter,
   structure,
   structureActions,
   structureActiveFilters,
@@ -157,10 +161,8 @@ export {
   structureQuery,
   structureRedirect,
   structureSelectedFilter,
-  selectedUserSearchFilter,
   structureSiblings,
   structureSystem,
-  structuresSiblings,
   structureTag,
   structureTagCreating,
   structureTagLoading,
@@ -171,24 +173,24 @@ export {
   structureTypes,
   structureTypesLoading,
   structureUpdating,
-  userSearchFilters,
   structureVersion,
   structureVersions,
   structures,
-  structuresEditableDownloading,
+  structuresActions,
   structuresDownloading,
+  structuresEditableDownloading,
   structuresFields,
   structuresLoading,
   structuresPageSize,
+  structuresSiblings,
   system,
   systemId,
   systemStructures,
   systemStructuresLoading,
   systems,
   systemsLoading,
-  uploadingStructuresFile,
   unitDomains,
+  uploadingStructuresFile,
   userPermissions,
-  grantRequestsCart,
-  grantRequestsQuery,
+  userSearchFilters,
 };

package/src/reducers/structuresActions.js

@@ -0,0 +1,18 @@
+import { clearStructures, fetchStructures } from "../routines";
+
+export const initialState = null;
+
+const structuresActions = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case clearStructures.TRIGGER:
+      return initialState;
+    case fetchStructures.TRIGGER:
+      return initialState;
+    case fetchStructures.SUCCESS:
+      return payload?.data?._actions || initialState;
+    default:
+      return state;
+  }
+};
+
+export { structuresActions };

package/src/selectors/structureColumnsSelector.js

@@ -34,7 +34,6 @@ export const defaultStructureColumns = [
     name: "updated_at",
     sort: { name: "updated_at" },
     fieldDecorator: dateDecorator,
-    textAlign: "center",
     width: 1,
   },
 ];