@truedat/bg 4.36.7 → 4.37.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "4.36.7",
+  "version": "4.37.1",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -45,7 +45,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"
   },
@@ -81,8 +81,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.36.7",
-    "@truedat/df": "4.36.7",
+    "@truedat/core": "4.37.1",
+    "@truedat/df": "4.37.1",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -102,5 +102,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "f5b0b7da7d61e1e8fff39337fe411f4174055b73"
+  "gitHead": "36ffd7e86efe27f38c3ae1bb616eb9eb4d444d12"
 }

package/src/concepts/components/ConceptActions.js

@@ -75,7 +75,7 @@ const ModalDelete = ({
         )}
       </>
     }
-    handleSubmit={() => conceptAction({ action: "delete", ...deleteAction })}
+    onConfirm={() => conceptAction({ action: "delete", ...deleteAction })}
   />
 );
 
@@ -107,9 +107,7 @@ const ModalDeprecate = ({ conceptAction, deprecateAction, concept }) => (
         conceptVersion={_.prop("version")(concept)}
       />
     }
-    handleSubmit={() =>
-      conceptAction({ action: "deprecate", ...deprecateAction })
-    }
+    onConfirm={() => conceptAction({ action: "deprecate", ...deprecateAction })}
   />
 );
 

package/src/concepts/components/ConceptsBulkUpdate.js

@@ -178,7 +178,7 @@ export class ConceptsBulkUpdate extends React.Component {
                     values={{ concepts_count: conceptCount }}
                   />
                 }
-                handleSubmit={this.handleSubmit}
+                onConfirm={this.handleSubmit}
               />
               <HistoryBackButton
                 content={<FormattedMessage id="actions.cancel" />}

package/src/concepts/components/__tests__/__snapshots__/ConceptsBulkUpdate.spec.js.snap

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

package/src/concepts/relations/components/ConceptLinkActions.js

@@ -19,7 +19,7 @@ export const DeleteLink = ({ conceptLinkAction, action, loading }) =>
       content={
         <FormattedMessage id="relations.actions.data_field.delete.confirmation.content" />
       }
-      handleSubmit={() => conceptLinkAction(action)}
+      onConfirm={() => conceptLinkAction(action)}
       onOpen={(e) => e.stopPropagation()}
       onClose={(e) => e.stopPropagation()}
     />

package/src/taxonomy/components/DomainActions.js

@@ -2,24 +2,27 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Link } from "react-router-dom";
-import { Dropdown, Button, Modal, Grid } from "semantic-ui-react";
+import { Dropdown, Button } from "semantic-ui-react";
 import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
 import { deleteDomain } from "../routines";
 import { filterDomains } from "../routines";
 import { getPrimaryActions, getSecondaryActions } from "../selectors";
 
-const DomainAction = ({ action, icon, messageId, id, ...rest }) => (
-  <Dropdown.Item
-    text={<FormattedMessage id={messageId} />}
-    icon={icon}
-    as={Link}
-    to={action(id)}
-    {...rest}
-  />
-);
+const DomainAction = ({ action, icon, messageId, id, ...rest }) => {
+  const { formatMessage } = useIntl();
+  return (
+    <Dropdown.Item
+      text={formatMessage({ id: messageId })}
+      icon={icon}
+      as={Link}
+      to={action(id)}
+      {...rest}
+    />
+  );
+};
 
 DomainAction.propTypes = {
   action: PropTypes.func,
@@ -28,17 +31,20 @@ DomainAction.propTypes = {
   id: PropTypes.number,
 };
 
-const DomainActionButton = ({ action, icon, messageId, id, ...rest }) => (
-  <Button
-    floated="right"
-    primary
-    content={<FormattedMessage id={messageId} />}
-    icon={icon}
-    as={Link}
-    to={action(id)}
-    {...rest}
-  />
-);
+const DomainActionButton = ({ action, icon, messageId, id, ...rest }) => {
+  const { formatMessage } = useIntl();
+  return (
+    <Button
+      floated="right"
+      primary
+      content={formatMessage({ id: messageId })}
+      icon={icon}
+      as={Link}
+      to={action(id)}
+      {...rest}
+    />
+  );
+};
 
 DomainActionButton.propTypes = {
   action: PropTypes.func,
@@ -47,73 +53,37 @@ DomainActionButton.propTypes = {
   id: PropTypes.number,
 };
 
-const ModalConfirm = ({
-  open,
-  header,
-  subHeader,
-  content,
-  onCancel,
-  onConfirm,
-}) => (
-  <Modal open={open} onClose={onCancel} closeIcon size="small">
-    {header && (
-      <Modal.Header>
-        {header}
-        {subHeader && <div className="subheader">{subHeader}</div>}
-      </Modal.Header>
-    )}
-    <Modal.Content>{content}</Modal.Content>
-    <Modal.Actions>
-      <Grid columns="equal">
-        <Grid.Column>
-          <Button fluid secondary onClick={onCancel}>
-            <FormattedMessage id="actions.cancel" />
-          </Button>
-        </Grid.Column>
-        <Grid.Column>
-          <Button fluid negative onClick={onConfirm}>
-            <FormattedMessage id="actions.delete" />
-          </Button>
-        </Grid.Column>
-      </Grid>
-    </Modal.Actions>
-  </Modal>
-);
-
-ModalConfirm.propTypes = {
-  open: PropTypes.bool,
-  content: PropTypes.string,
-  onCancel: PropTypes.func,
-  onConfirm: PropTypes.func,
-  header: PropTypes.string,
-  subHeader: PropTypes.string,
+const ModalDelete = ({ onConfirm }) => {
+  const { formatMessage } = useIntl();
+  return (
+    <ConfirmModal
+      header={formatMessage({ id: "domain" })}
+      content={formatMessage({ id: "actions.confirm" })}
+      onConfirm={onConfirm}
+      trigger={
+        <Button
+          floated="right"
+          negative
+          content={formatMessage({ id: "actions.delete" })}
+          icon="trash"
+        />
+      }
+    />
+  );
 };
 
-const ModalDelete = ({ handleConfirm }) => (
-  <ConfirmModal
-    className="confirm-modal"
-    header={<FormattedMessage id="domain" />}
-    content={<FormattedMessage id="actions.confirm" />}
-    handleSubmit={handleConfirm}
-    trigger={
-      <Button
-        floated="right"
-        negative
-        content={<FormattedMessage id="actions.delete" />}
-        icon="trash"
-      />
-    }
-  />
-);
+ModalDelete.propTypes = {
+  onConfirm: PropTypes.func.isRequired,
+};
 
-const withDelete = (actions, handleConfirm) => [
+const withDelete = (actions, onConfirm) => [
   ...actions,
   {
     key: "delete",
     icon: "trash",
     value: "delete",
     as: ModalDelete,
-    handleConfirm,
+    onConfirm,
   },
 ];
 
@@ -130,12 +100,12 @@ const ActionButtons = ({
   secondaryActions,
   deleteAction,
   id,
-  handleConfirm,
+  onConfirm,
 }) => {
   const availableActions = _.flow(
     composeAvailableActions,
     _.map(({ action, ...rest }) => ({ ...rest, to: action(id) })),
-    (actions) => (deleteAction ? withDelete(actions, handleConfirm) : actions)
+    (actions) => (deleteAction ? withDelete(actions, onConfirm) : actions)
   )(secondaryActions);
 
   return (
@@ -152,7 +122,7 @@ const ActionButtons = ({
 
 ActionButtons.propTypes = {
   id: PropTypes.number,
-  handleConfirm: PropTypes.func,
+  onConfirm: PropTypes.func,
 };
 
 export class DomainActions extends React.Component {
@@ -184,7 +154,7 @@ export class DomainActions extends React.Component {
         deleteAction={deleteAction}
         show={this.show}
         id={id}
-        handleConfirm={this.handleConfirm}
+        onConfirm={this.handleConfirm}
       />
     );
   };

package/src/taxonomy/components/ModalOnRoleDeletion.js

@@ -53,7 +53,7 @@ export const ModalOnRoleDeletion = ({
               id: "domain.members.delete.question",
             })
       }
-      handleSubmit={handleSubmit}
+      onConfirm={handleSubmit}
       trigger={trigger}
     />
   );

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

@@ -8,7 +8,7 @@ exports[`<DomainActions /> matches the latest snapshot 1`] = `
       "delete": [MockFunction],
     }
   }
-  handleConfirm={[Function]}
   id={3}
+  onConfirm={[Function]}
 />
 `;