@truedat/audit 7.5.7 → 7.5.10

package/src/components/SubscriptionLoader.js

@@ -1,7 +1,7 @@
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import { Dimmer, Loader } from "semantic-ui-react";
 import { clearSubscription, fetchSubscription } from "../routines";
 

package/src/components/SubscriptionNew.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";

package/src/components/SubscriptionRoutes.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { Route, Switch } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import {
   SUBSCRIPTION,
   SUBSCRIPTIONS,
@@ -13,68 +13,70 @@ import SubscriptionEdit from "./SubscriptionEdit";
 import SubscriptionLoader from "./SubscriptionLoader";
 import SubscriptionsLoader from "./SubscriptionsLoader";
 
-const UsersLoader = React.lazy(() =>
-  import("@truedat/auth/users/components/UsersLoader")
+const UsersLoader = React.lazy(
+  () => import("@truedat/auth/users/components/UsersLoader")
 );
 
-const RolesLoader = React.lazy(() =>
-  import("@truedat/auth/roles/components/RolesLoader")
+const RolesLoader = React.lazy(
+  () => import("@truedat/auth/roles/components/RolesLoader")
 );
 
-const TemplatesLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplatesLoader")
+const TemplatesLoader = React.lazy(
+  () => import("@truedat/core/components/TemplatesLoader")
 );
 
 export const SubscriptionRoutes = () => (
-  <Switch>
-    <Route
-      exact
-      path={SUBSCRIPTIONS}
-      render={() => (
-        <>
-          <UsersLoader />
-          <SubscriptionsLoader />
-          <Subscriptions />
-        </>
-      )}
-    />
-    <Route
-      exact
-      path={SUBSCRIPTION_NEW}
-      render={() => (
-        <>
-          <TemplatesLoader scope="bg" />
-          <UsersLoader />
-          <RolesLoader />
-          <SubscriptionNew />
-        </>
-      )}
-    />
-    <Route
-      exact
-      path={SUBSCRIPTION_EDIT}
-      render={() => (
-        <>
-          <TemplatesLoader scope="bg" />
-          <UsersLoader />
-          <SubscriptionLoader />
-          <SubscriptionEdit />
-        </>
-      )}
-    />
-    <Route
-      exact
-      path={SUBSCRIPTION}
-      render={() => (
-        <>
-          <TemplatesLoader scope="bg" />
-          <UsersLoader />
-          <SubscriptionLoader />
-          <Subscription />
-        </>
-      )}
-    />
-  </Switch>
+  <Routes>
+    <Route path="subscriptions">
+      <Route
+        index
+        element={
+          <>
+            <UsersLoader />
+            <SubscriptionsLoader />
+            <Subscriptions />
+          </>
+        }
+      />
+      <Route
+        path="new"
+        element={
+          <>
+            <TemplatesLoader scope="bg" />
+            <UsersLoader />
+            <RolesLoader />
+            <SubscriptionNew />
+          </>
+        }
+      />
+      <Route path=":id">
+        <Route
+          index
+          element={
+            <>
+              <TemplatesLoader scope="bg" />
+              <UsersLoader />
+              <SubscriptionLoader />
+              <Subscription />
+            </>
+          }
+        />
+        <Route
+          path="edit"
+          element={
+            <>
+              <TemplatesLoader scope="bg" />
+              <UsersLoader />
+              <SubscriptionLoader />
+              <SubscriptionEdit />
+            </>
+          }
+        />
+      </Route>
+    </Route>
+
+    <Route path="*" element={null} />
+  </Routes>
 );
 
 export default SubscriptionRoutes;

package/src/components/SubscriptionWatchForm.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { Form, Radio, Button, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import PropTypes from "prop-types";

package/src/components/Subscriptions.js

@@ -1,9 +1,9 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useForm, Controller } from "react-hook-form";
-import { useHistory, Link } from "react-router-dom";
+import { Link } from "react-router";
+import { useNavigate } from "react-router";
 import { FormattedMessage, useIntl } from "react-intl";
 import { SUBSCRIPTION_NEW, linkTo } from "@truedat/core/routes";
 import {
@@ -65,7 +65,7 @@ export const Subscriptions = ({
   subscriptionsLoading: loading,
   users,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const { control, watch } = useForm({
     mode: "all",
     defaultValues: {
@@ -99,7 +99,6 @@ export const Subscriptions = ({
   return (
     <Segment>
       <SubscriptionsHeader />
-
       <Form>
         <Header
           as="h5"
@@ -174,14 +173,12 @@ export const Subscriptions = ({
           )}
         />
       </Form>
-
       <Label className="rules-label-results">
         <FormattedMessage
           id="subscriptions.retrieved.results"
           values={{ count: orderedSubscriptions.length }}
         />
       </Label>
-
       <Table className="subscription-table" selectable>
         <Table.Header>
           <Table.Row>
@@ -201,7 +198,7 @@ export const Subscriptions = ({
             ({ periodicity, scope, subscriber, resource, id }, key) => (
               <Table.Row
                 key={key}
-                onClick={() => history.push(linkTo.SUBSCRIPTION({ id }))}
+                onClick={() => navigate(linkTo.SUBSCRIPTION({ id }))}
               >
                 <Table.Cell>
                   <Icon name={subscriberIcon(subscriber)} />

package/src/components/SubscriptionsLoader.js

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Dimmer, Loader } from "semantic-ui-react";

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

@@ -1,11 +1,8 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import NotificationEvent from "../NotificationEvent";
 
 jest.mock("@truedat/core/hooks", () => ({ useOnScreen: jest.fn() }));
-jest
-  .spyOn(global.Date, "now")
-  .mockImplementation(() => new Date("2022-01-01T11:01:58.135Z").valueOf());
+
 describe("<NotificationEvent />", () => {
   it("matches the latest snapshot", () => {
     const event = {

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

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import { NotificationsMenu } from "../NotificationsMenu";
 

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

@@ -1,7 +1,6 @@
-import React from "react";
-import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { render } from "@truedat/test/render";
+import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { ShareLinkForm } from "../ShareLinkForm";
 
 describe("<ShareLinkForm />", () => {
@@ -33,32 +32,39 @@ describe("<ShareLinkForm />", () => {
     options,
   };
 
-  it("matches the latest snapshot", () => {
-    const { container } = render(<ShareLinkForm {...props} />);
-    expect(container).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<ShareLinkForm {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("enables send button when selecting recipient", async () => {
-    const { findByText, queryByRole } = render(<ShareLinkForm {...props} />);
+    const rendered = render(<ShareLinkForm {...props} />);
+    await waitForLoad(rendered);
 
-    expect(queryByRole("button", { name: /Share/ })).toBeDisabled();
-    userEvent.click(await findByText(/john/));
+    const user = userEvent.setup({ delay: null });
+    expect(rendered.queryByRole("button", { name: /share/i })).toBeDisabled();
+    await user.click(await rendered.findByText(/john/i));
     await waitFor(() => {
-      expect(queryByRole("button", { name: /Share/ })).not.toBeDisabled();
+      expect(
+        rendered.queryByRole("button", { name: /share/i })
+      ).not.toBeDisabled();
     });
   });
 
   it("invokes function when send button clicked", async () => {
-    const { findByRole, findByText, queryByRole } = render(
-      <ShareLinkForm {...props} />
-    );
+    const rendered = render(<ShareLinkForm {...props} />);
+    await waitForLoad(rendered);
 
-    expect(queryByRole("button", { name: /Share/ })).toBeDisabled();
-    userEvent.click(await findByText(/john/));
+    const user = userEvent.setup({ delay: null });
+    expect(rendered.queryByRole("button", { name: /share/i })).toBeDisabled();
+    await user.click(await rendered.findByText(/john/i));
     await waitFor(() => {
-      expect(queryByRole("button", { name: /Share/ })).not.toBeDisabled();
+      expect(
+        rendered.queryByRole("button", { name: /share/i })
+      ).not.toBeDisabled();
     });
-    userEvent.click(await findByRole("button", { name: /Share/ }));
+    await user.click(await rendered.findByRole("button", { name: /share/i }));
     await waitFor(() => {
       expect(createNotification.mock.calls.length).toBe(1);
     });

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

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import { ShareLinkPopup } from "../ShareLinkPopup";
 

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

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import Subscription, { SubscriptionHeader } from "../Subscription";
 

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

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import { SubscriptionActions, ModalDelete } from "../SubscriptionActions";
 

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

@@ -1,10 +1,10 @@
-import React from "react";
-import { shallow } from "enzyme";
+import { render, waitForLoad } from "@truedat/test/render";
 import SubscriptionCrumbs from "../SubscriptionCrumbs";
 
 describe("<SubscriptionCrumbs />", () => {
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<SubscriptionCrumbs title="CrumbTitle" />);
-    expect(wrapper).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<SubscriptionCrumbs title="CrumbTitle" />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

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

@@ -1,20 +1,21 @@
-import React from "react";
-import { render } from "@truedat/test/render";
+import { render, waitForLoad } from "@truedat/test/render";
 import SubscriptionEdit from "../SubscriptionEdit";
 
 const renderOpts = {
   state: {
-    creatingSubscription: false,
+    subscriptionLoading: false,
     subscription: {
-      subscriber: { type: "user" },
+      subscriber: { type: "user", identifier: "1" },
+      resource: { name: "foo" },
     },
-    templates: [],
+    users: [{ id: 1, full_name: "John Doe" }],
   },
 };
 
 describe("<SubscriptionEdit />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(<SubscriptionEdit />, renderOpts);
-    expect(container).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<SubscriptionEdit />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });