@truedat/dd 4.36.7 → 4.37.1

package/CHANGELOG.md

@@ -1,12 +1,18 @@
 # Changelog
 
+## [4.37.0] 2022-01-25
+
+### Changed
+
+- [TD-2564] `StructureSelectorInputField` now accepts `defaultFilters` prop,
+  removed `options` prop
+
 ## [4.36.5] 2022-01-20
 
 ### Added
 
 - [TD-4100] Long Alert error message CSV download link
 
-
 ## [4.36.3] 2022-01-18
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.36.7",
+  "version": "4.37.1",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -47,7 +47,7 @@
     "jest": "^27.0.6",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
-    "redux-saga-test-plan": "^4.0.1",
+    "redux-saga-test-plan": "^4.0.4",
     "rimraf": "^3.0.2",
     "semantic-ui-react": "^2.0.3"
   },
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.36.7",
-    "@truedat/core": "4.36.7",
-    "@truedat/df": "4.36.7",
+    "@truedat/auth": "4.37.1",
+    "@truedat/core": "4.37.1",
+    "@truedat/df": "4.37.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": "f5b0b7da7d61e1e8fff39337fe411f4174055b73"
+  "gitHead": "36ffd7e86efe27f38c3ae1bb616eb9eb4d444d12"
 }

package/src/components/StructureDeleteButton.js

@@ -1,6 +1,5 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import { Button, Icon } from "semantic-ui-react";
@@ -24,11 +23,7 @@ export const StructureDeleteButton = ({ structure, deleteStructure }) => {
       content={formatMessage({
         id: "structure.actions.delete.confirmation.content",
       })}
-      handleSubmit={() =>
-        deleteStructure({
-          id: structure.id,
-        })
-      }
+      onConfirm={() => deleteStructure({ id: structure.id })}
       onOpen={(e) => e.stopPropagation()}
       onClone={(e) => e.stopPropagation()}
     />
@@ -39,14 +34,11 @@ StructureDeleteButton.propTypes = {
   structure: PropTypes.object,
   deleteStructure: PropTypes.func,
 };
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators({ deleteStructure }, dispatch);
 
 const mapStateToProps = ({ structure }) => ({
   structure,
 });
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(StructureDeleteButton);
+export default connect(mapStateToProps, { deleteStructure })(
+  StructureDeleteButton
+);

package/src/components/StructureNoteActions.js

@@ -9,7 +9,7 @@ import { ConfirmModal, GroupActions } from "@truedat/core/components";
 import { linkTo } from "@truedat/core/routes";
 import { doStructureNoteAction } from "../routines";
 
-export const ModalDelete = ({ modalOnClick, modalAction, modalIcon }) => (
+export const ModalDelete = ({ modalOnConfirm, modalAction, modalIcon }) => (
   <ConfirmModal
     icon="trash"
     trigger={
@@ -34,11 +34,12 @@ export const ModalDelete = ({ modalOnClick, modalAction, modalIcon }) => (
         id={`structure.notes.actions.${modalAction}.confirmation.content`}
       />
     }
-    handleSubmit={modalOnClick}
+    onConfirm={modalOnConfirm}
   />
 );
+
 ModalDelete.propTypes = {
-  modalOnClick: PropTypes.func,
+  modalOnConfirm: PropTypes.func,
   modalText: PropTypes.object,
   modalAction: PropTypes.string,
 };
@@ -89,7 +90,7 @@ export const StructureNoteActions = ({
       return withModal(action)
         ? {
             ...baseAction,
-            modalOnClick: () =>
+            modalOnConfirm: () =>
               doStructureNoteAction({
                 action: data,
                 dataStructureId: structure?.id,

package/src/components/StructureSelectorInputField.js

@@ -15,7 +15,7 @@ export const StructureSelectorInputField = ({
   onDelete,
   onClick,
   joined,
-  options: { defaultFilters },
+  defaultFilters,
   structures,
   selectedStructure,
   selectedSystem,
@@ -132,7 +132,7 @@ StructureSelectorInputField.propTypes = {
   onChangeField: PropTypes.func,
   onClick: PropTypes.func,
   onDelete: PropTypes.func,
-  options: PropTypes.object.isRequired,
+  defaultFilters: PropTypes.object,
   structures: PropTypes.array,
   selectedStructure: PropTypes.object,
   selectedSystem: PropTypes.string,

package/src/components/StructureTagsCards.js

@@ -65,9 +65,7 @@ export const StructureTagsCards = ({
                       />
                     )
                   }
-                  handleSubmit={() =>
-                    deleteStructureTag({ id: structureTag.id })
-                  }
+                  onConfirm={() => deleteStructureTag({ id: structureTag.id })}
                 />
               </div>
             </Card.Content>

package/src/components/StructuresBulkUpdate.js

@@ -186,7 +186,7 @@ export class StructuresBulkUpdate extends React.Component {
                     values={{ structures_count: structureCount }}
                   />
                 }
-                handleSubmit={this.handleSubmit}
+                onConfirm={this.handleSubmit}
               />
               <HistoryBackButton
                 content={<FormattedMessage id="actions.cancel" />}

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

@@ -11,12 +11,12 @@ describe("<StructureSelectorInputField />", () => {
   it("matches the latest snapshot", () => {
     const props = {
       selectedStructure: { id: "value" },
-      options: { defaultFilters: {} },
+      defaultFilters: {},
       active: true,
       onClick: jest.fn(),
       onChange: jest.fn(),
       systems: [],
-      systemRequired: true
+      systemRequired: true,
     };
     const wrapper = shallow(<StructureSelectorInputField {...props} />);
     expect(wrapper).toMatchSnapshot();
@@ -24,9 +24,9 @@ describe("<StructureSelectorInputField />", () => {
 
   it("clicking on input will call onClick with the input name", () => {
     const props = {
-      options: { defaultFilters: {} },
+      defaultFilters: {},
       active: false,
-      onClick: jest.fn()
+      onClick: jest.fn(),
     };
     const wrapper = shallow(<StructureSelectorInputField {...props} />);
 
@@ -37,9 +37,9 @@ describe("<StructureSelectorInputField />", () => {
 
   it("clicking on input will call onClick with empty string wehn active is true", () => {
     const props = {
-      options: { defaultFilters: {} },
+      defaultFilters: {},
       active: true,
-      onClick: jest.fn()
+      onClick: jest.fn(),
     };
     const wrapper = shallow(<StructureSelectorInputField {...props} />);
     expect(props.onClick.mock.calls.length).toBe(0);
@@ -52,28 +52,25 @@ describe("<StructureSelectorInputField />", () => {
     const fetchStructure = jest.fn();
     const props = {
       selectedStructure: { id: "value" },
-      options: { defaultFilters: {} },
+      defaultFilters: {},
       active: true,
       onChange,
-      fetchStructure
+      fetchStructure,
     };
     const wrapper = shallow(<StructureSelectorInputField {...props} />);
 
     const structure = { id: "test" };
 
-    wrapper
-      .find("Connect(StructureSelector)")
-      .props()
-      .onSelect(structure);
+    wrapper.find("Connect(StructureSelector)").props().onSelect(structure);
     expect(onChange.mock.calls.length).toBe(1);
     expect(onChange.mock.calls[0][0]).toEqual(structure);
   });
 
   it("if selectedSystem is empty the embedded FormInput is disabled", () => {
     const props = {
-      options: { defaultFilters: {} },
+      defaultFilters: {},
       selectedSystem: "",
-      systemRequired: true
+      systemRequired: true,
     };
     const wrapper = shallow(<StructureSelectorInputField {...props} />);
     expect(wrapper.find("FormInput").props().disabled).toBe(true);

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

@@ -46,13 +46,13 @@ exports[`<StructureTagsCards /> matches the latest snapshot 1`] = `
                 }
               />
             }
-            handleSubmit={[Function]}
             header={
               <Memo(MemoizedFormattedMessage)
                 id="structureTags.actions.delete.confirmation.header"
               />
             }
             icon="trash"
+            onConfirm={[Function]}
             trigger={
               <Button
                 as="button"
@@ -109,13 +109,13 @@ exports[`<StructureTagsCards /> matches the latest snapshot 1`] = `
                 }
               />
             }
-            handleSubmit={[Function]}
             header={
               <Memo(MemoizedFormattedMessage)
                 id="structureTags.actions.delete.confirmation.header"
               />
             }
             icon="trash"
+            onConfirm={[Function]}
             trigger={
               <Button
                 as="button"

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

@@ -81,12 +81,12 @@ exports[`<StructuresBulkUpdate /> matches the latest snapshot 1`] = `
           }
         />
       }
-      handleSubmit={[Function]}
       header={
         <Memo(MemoizedFormattedMessage)
           id="structures.edit.bulk.confirmation.header"
         />
       }
+      onConfirm={[Function]}
       trigger={
         <Button
           as="button"

package/src/reducers/ddMessage.js

@@ -66,24 +66,24 @@ const ddMessage = (state = initialState, { type, payload }) => {
         const field = _.path("errors.field")(data);
         const messages = _.has("errors")(data)
           ? _.flow(
-            _.propOr([], "errors"),
-            _.toPairs,
-            _.filter(([k, _v]) => k !== "row" && k !== "field"),
-            _.map(([k, v]) =>
-              _.map((e) => ({
-                id: `structures.uploadStructures.failed.${k}.${e}`,
-                fields: { row, field },
-                defaultMessage: "structures.uploadStructures.failed.default",
-              }))(v)
-            ),
-            _.flatten
-          )(data)
+              _.propOr([], "errors"),
+              _.toPairs,
+              _.filter(([k, _v]) => k !== "row" && k !== "field"),
+              _.map(([k, v]) =>
+                _.map((e) => ({
+                  id: `structures.uploadStructures.failed.${k}.${e}`,
+                  fields: { row, field },
+                  defaultMessage: "structures.uploadStructures.failed.default",
+                }))(v)
+              ),
+              _.flatten
+            )(data)
           : _.flow(_.path("error.message"), (m) => [
-            {
-              id: `structures.uploadStructures.failed.${m}`,
-              defaultMessage: "structures.uploadStructures.failed.default",
-            },
-          ])(data);
+              {
+                id: `structures.uploadStructures.failed.${m}`,
+                defaultMessage: "structures.uploadStructures.failed.default",
+              },
+            ])(data);
         return {
           error: true,
           header: "structures.uploadStructures.failed.header",