npm - @truedat/audit - Versions diffs - 4.36.7 → 4.36.8 - Mend

@truedat/audit 4.36.7 → 4.36.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/audit",
-  "version": "4.36.7",
+  "version": "4.36.8",
   "description": "Truedat Web Audit Module",
   "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,8 +84,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.36.7",
-    "@truedat/core": "4.36.7",
+    "@truedat/auth": "4.36.8",
+    "@truedat/core": "4.36.8",
     "axios": "^0.19.2",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -105,5 +105,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "f5b0b7da7d61e1e8fff39337fe411f4174055b73"
+  "gitHead": "b9b8ee80998b230697593b5d207d187971bc0724"
 }

package/src/components/SubscriptionActions.js CHANGED Viewed

@@ -1,70 +1,77 @@
-import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Link } from "react-router-dom";
-import { useSelector, useDispatch } from "react-redux";
+import { connect } from "react-redux";
 import { Button } from "semantic-ui-react";
-import { FormattedMessage } from "react-intl";
+import { useIntl } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
 import { SUBSCRIPTIONS, linkTo } from "@truedat/core/routes";
 import { deleteSubscription } from "@truedat/core/routines";
-export const ModalDelete = ({ dispatch, id }) => (
-  <ConfirmModal
-    icon="trash"
-    trigger={
-      <Button
-        icon="trash"
-        content={<FormattedMessage id="subscription.actions.remove" />}
-      />
-    }
-    header={
-      <FormattedMessage id="subscription.actions.delete.confirmation.header" />
-    }
-    size="small"
-    content={
-      <FormattedMessage id="subscription.actions.delete.confirmation.content" />
-    }
-    handleSubmit={() =>
-      dispatch(
+export const ModalDelete = ({ deleteSubscription, id }) => {
+  const { formatMessage } = useIntl();
+  return (
+    <ConfirmModal
+      icon="trash"
+      trigger={
+        <Button
+          icon="trash"
+          content={formatMessage({ id: "subscription.actions.remove" })}
+        />
+      }
+      header={formatMessage({
+        id: "subscription.actions.delete.confirmation.header",
+      })}
+      size="small"
+      content={formatMessage({
+        id: "subscription.actions.delete.confirmation.content",
+      })}
+      onConfirm={() =>
         deleteSubscription({ subscription: { id }, redirect: SUBSCRIPTIONS })
-      )
-    }
-  />
-);
-ModalDelete.propTypes = {
-  dispatch: PropTypes.func,
-  id: PropTypes.number
+      }
+    />
+  );
 };
-export const SubscriptionActions = () => {
-  const dispatch = useDispatch();
-  const { id } = useSelector(_.get("subscription"));
+ModalDelete.propTypes = {
+  deleteSubscription: PropTypes.func,
+  id: PropTypes.number,
+};
-  const actions = [
-    {
-      key: "edit",
-      icon: "edit",
-      text: <FormattedMessage id="subscription.actions.edit" />,
-      value: "edit",
-      as: Link,
-      to: linkTo.SUBSCRIPTION_EDIT({ id }),
-      selected: false,
-      active: false
-    },
-    {
-      key: "delete",
-      icon: "trash",
-      value: "delete",
-      as: ModalDelete,
-      dispatch,
-      id,
-      selected: false,
-      active: false
-    }
-  ];
+export const SubscriptionActions = ({ deleteSubscription, subscription }) => {
+  const { formatMessage } = useIntl();
+  const id = subscription?.id;
+  const actions = id
+    ? [
+        {
+          key: "edit",
+          icon: "edit",
+          text: formatMessage({ id: "subscription.actions.edit" }),
+          value: "edit",
+          as: Link,
+          to: linkTo.SUBSCRIPTION_EDIT({ id }),
+        },
+        {
+          key: "delete",
+          icon: "trash",
+          value: "delete",
+          as: ModalDelete,
+          deleteSubscription,
+          id,
+        },
+      ]
+    : [];
   return <GroupActions availableActions={actions} />;
 };
-export default SubscriptionActions;
+SubscriptionActions.propTypes = {
+  subscription: PropTypes.object,
+  deleteSubscription: PropTypes.func,
+};
+export const mapStateToProps = ({ subscription }) => ({ subscription });
+export default connect(mapStateToProps, { deleteSubscription })(
+  SubscriptionActions
+);

package/src/components/SubscriptionForm.js CHANGED Viewed

@@ -29,7 +29,7 @@ const StructureSelector = React.lazy(() =>
 );
 const SourceSelector = React.lazy(() =>
-  import("@truedat/cx/sources/components/SourcesSelector")
+  import("@truedat/cx/sources/components/SourceSelector")
 );
 const SUBSCRIBER_TYPES = ["role", "taxonomy_role", "email", "user"];

package/src/components/__tests__/SubscriptionActions.spec.js CHANGED Viewed

@@ -1,39 +1,40 @@
 import React from "react";
-import { intl } from "@truedat/test/intl-stub";
-import { shallow } from "enzyme";
+import { render } from "@truedat/test/render";
 import { SubscriptionActions, ModalDelete } from "../SubscriptionActions";
-jest.mock("react-redux", () => ({
-  ...jest.requireActual("react-redux"),
-  useDispatch: jest.fn(),
-  useSelector: jest.fn(selector =>
-    selector({
-      subscription: {
-        id: 2,
-        subscriber: { type: "user" },
-        scope: {
-          events: ["event1"],
-          status: ["status1"]
-        }
-      }
-    })
-  )
-}));
+const messages = {
+  en: {
+    "subscription.actions.delete.confirmation.content": "content",
+    "subscription.actions.delete.confirmation.header": "header",
+    "subscription.actions.remove": "remove",
+  },
+};
-// workaround for enzyme issue with React.useContext
-// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
+const subscription = {
+  id: 2,
+  subscriber: { type: "user" },
+  scope: {
+    events: ["event1"],
+    status: ["status1"],
+  },
+};
 describe("<SubscriptionActions />", () => {
+  const state = { subscription };
+  const renderOpts = { state, messages };
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<SubscriptionActions />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<SubscriptionActions />, renderOpts);
+    expect(container).toMatchSnapshot();
   });
 });
 describe("<ModalDelete />", () => {
+  const state = {};
+  const renderOpts = { state, messages };
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<ModalDelete />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<ModalDelete />, renderOpts);
+    expect(container).toMatchSnapshot();
   });
 });

package/src/components/__tests__/__snapshots__/Subscription.spec.js.snap CHANGED Viewed

@@ -84,7 +84,7 @@ exports[`<SubscriptionHeader /> matches the latest snapshot 1`] = `
     textAlign="right"
     width={4}
   >
-    <SubscriptionActions />
+    <Connect(SubscriptionActions) />
   </GridColumn>
 </Grid>
 `;

package/src/components/__tests__/__snapshots__/SubscriptionActions.spec.js.snap CHANGED Viewed

@@ -1,73 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 exports[`<ModalDelete /> matches the latest snapshot 1`] = `
-<ConfirmModal
-  content={
-    <Memo(MemoizedFormattedMessage)
-      id="subscription.actions.delete.confirmation.content"
+<div>
+  <button
+    class="ui button"
+  >
+    <i
+      aria-hidden="true"
+      class="trash icon"
     />
-  }
-  handleSubmit={[Function]}
-  header={
-    <Memo(MemoizedFormattedMessage)
-      id="subscription.actions.delete.confirmation.header"
-    />
-  }
-  icon="trash"
-  size="small"
-  trigger={
-    <Button
-      as="button"
-      content={
-        <Memo(MemoizedFormattedMessage)
-          id="subscription.actions.remove"
-        />
-      }
-      icon="trash"
-    />
-  }
-/>
+    remove
+  </button>
+</div>
 `;
 exports[`<SubscriptionActions /> matches the latest snapshot 1`] = `
-<GroupActions
-  availableActions={
-    Array [
-      Object {
-        "active": false,
-        "as": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "displayName": "Link",
-          "propTypes": Object {
-            "innerRef": [Function],
-            "onClick": [Function],
-            "replace": [Function],
-            "target": [Function],
-            "to": [Function],
-          },
-          "render": [Function],
-        },
-        "icon": "edit",
-        "key": "edit",
-        "selected": false,
-        "text": <Memo(MemoizedFormattedMessage)
-          id="subscription.actions.edit"
-        />,
-        "to": "/subscriptions/2/edit",
-        "value": "edit",
-      },
-      Object {
-        "active": false,
-        "as": [Function],
-        "dispatch": undefined,
-        "icon": "trash",
-        "id": 2,
-        "key": "delete",
-        "selected": false,
-        "value": "delete",
-      },
-    ]
-  }
-  direction="left"
-/>
+<div>
+  <div
+    aria-expanded="false"
+    class="ui floating dropdown button icon group-actions"
+    role="listbox"
+    tabindex="0"
+  >
+    <i
+      aria-hidden="true"
+      class="ellipsis vertical icon"
+    />
+    <div
+      class="left menu transition"
+    />
+  </div>
+</div>
 `;