@truedat/audit 4.51.2 → 4.51.3

package/CHANGELOG.md

@@ -1,10 +1,16 @@
 # Changelog
 
+## [4.51.3] 2022-09-16
+
+### Changed
+
+- [TD-4794] Use `DomainSelector` in `SubscriptionForm`
+
 ## [4.49.8] 2022-08-11
 
 ### Added
 
-- [TD-5035] Get external notification body from envent payload
+- [TD-5035] Get external notification body from event payload
 
 ## [4.48.11] 2022-21-07
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/audit",
-  "version": "4.51.2",
+  "version": "4.51.3",
   "description": "Truedat Web Audit Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.47.9",
+    "@truedat/test": "4.51.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -85,8 +85,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.51.2",
-    "@truedat/core": "4.51.2",
+    "@truedat/auth": "4.51.3",
+    "@truedat/core": "4.51.3",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
     "react-color": "^2.17.3",
@@ -106,5 +106,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "9bdc76f3ee59a6e28fb2312e26d0cba2807f069b"
+  "gitHead": "69d6cf8f7379eb2ef5744a4fdd357a7dd662b115"
 }

package/src/components/SubscriptionForm.js

@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 import { useIntl, FormattedMessage } from "react-intl";
 import { useForm, useWatch, Controller } from "react-hook-form";
 import { Button, Form, Radio, Icon } from "semantic-ui-react";
-import { HistoryBackButton } from "@truedat/core/components";
+import { DomainSelector, HistoryBackButton } from "@truedat/core/components";
 import {
   CONCEPT_EVENTS,
   DEFAULT_ICON,
@@ -20,10 +20,6 @@ const ConceptSelector = React.lazy(() =>
   import("@truedat/bg/concepts/relations/components/ConceptSelector")
 );
 
-const DomainDropdownSelector = React.lazy(() =>
-  import("@truedat/bg/taxonomy/components/DomainDropdownSelector")
-);
-
 const UserSelector = React.lazy(() =>
   import("@truedat/auth/users/components/UserSelector")
 );
@@ -338,11 +334,14 @@ export const SubscriptionForm = ({
             name="scope.resource_id"
             rules={{ required: true }}
             render={({ field: { onChange, value } }) => (
-              <DomainDropdownSelector
+              <DomainSelector
+                action="manageSubscriptions"
                 disabled={isEditForm}
+                label={formatMessage({ id: "domain.selector.label" })}
+                required
+                labels
                 value={value}
                 onChange={(_e, { value }) => onChange(value)}
-                hideLabel
               />
             )}
           />

package/src/components/SubscriptionRoutes.js

@@ -4,7 +4,7 @@ import {
   SUBSCRIPTION,
   SUBSCRIPTIONS,
   SUBSCRIPTION_NEW,
-  SUBSCRIPTION_EDIT
+  SUBSCRIPTION_EDIT,
 } from "@truedat/core/routes";
 import Subscription from "./Subscription";
 import Subscriptions from "./Subscriptions";
@@ -21,10 +21,6 @@ const RolesLoader = React.lazy(() =>
   import("@truedat/auth/roles/components/RolesLoader")
 );
 
-const DomainsLoader = React.lazy(() =>
-  import("@truedat/bg/taxonomy/components/DomainsLoader")
-);
-
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
@@ -50,7 +46,6 @@ export const SubscriptionRoutes = () => (
           <TemplatesLoader scope="bg" />
           <UsersLoader />
           <RolesLoader />
-          <DomainsLoader />
           <SubscriptionNew />
         </>
       )}
@@ -61,7 +56,6 @@ export const SubscriptionRoutes = () => (
       render={() => (
         <>
           <TemplatesLoader scope="bg" />
-          <DomainsLoader />
           <UsersLoader />
           <SubscriptionLoader />
           <SubscriptionEdit />

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

@@ -2,14 +2,11 @@ import React from "react";
 import { waitFor } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import userEvent from "@testing-library/user-event";
+import { domainsMock } from "@truedat/test/mocks";
 import SubscriptionForm from "../SubscriptionForm";
 
 const conceptActiveFilters = {};
 const structureActiveFilters = {};
-const domains = [
-  { name: "domain1", id: 11 },
-  { name: "domain2", id: 22 },
-];
 const roles = [{ name: "role1" }, { name: "role2" }];
 const templates = [
   {
@@ -39,11 +36,13 @@ const state = {
   roles,
   templates,
   users,
-  domains,
   conceptActiveFilters,
   structureActiveFilters,
 };
-const renderOpts = { state };
+
+const variables = { action: "manageSubscriptions" };
+const mocks = [domainsMock(variables), domainsMock(variables)];
+const renderOpts = { state, mocks };
 
 describe("<SubscriptionForm />", () => {
   it("matches the latest snapshot", async () => {
@@ -66,26 +65,26 @@ describe("<SubscriptionForm />", () => {
     // Select role
     userEvent.click(await findByText("Role"));
     await waitFor(() => {
-      expect(queryByText(/Search Roles/)).toBeTruthy();
+      expect(queryByText(/Search Roles/)).toBeInTheDocument();
     });
     userEvent.click(await findByText("role2"));
 
     // Select email
     userEvent.click(await findByText("Email"));
     await waitFor(() => {
-      expect(queryByTestId("email-input")).toBeTruthy();
+      expect(queryByTestId("email-input")).toBeInTheDocument();
     });
     userEvent.type(queryByTestId("email-input"), "foo");
 
     // Select concept and taxonomy_role
     userEvent.click(await findByText("Concept"));
     await waitFor(() => {
-      expect(queryByText("No concepts found")).toBeTruthy();
+      expect(queryByText("No concepts found")).toBeInTheDocument();
     });
 
     userEvent.click(await findByText("Role in taxonomy"));
     await waitFor(() => {
-      expect(queryByText(/Search Roles/)).toBeTruthy();
+      expect(queryByText(/Search Roles/)).toBeInTheDocument();
     });
     await waitFor(() => {
       expect(queryByText("No concepts found")).toBeFalsy();
@@ -95,14 +94,14 @@ describe("<SubscriptionForm />", () => {
     // Select user
     userEvent.click(await findByText("User"));
     await waitFor(() => {
-      expect(queryByText(/Search users/)).toBeTruthy();
+      expect(queryByText(/Search users/)).toBeInTheDocument();
     });
     userEvent.click(await findByText("user2"));
 
     // Test concepts
     userEvent.click(await findByText("Concept"));
     await waitFor(() => {
-      expect(queryByText("No concepts found")).toBeTruthy();
+      expect(queryByText("No concepts found")).toBeInTheDocument();
     });
 
     // Test structures
@@ -110,16 +109,16 @@ describe("<SubscriptionForm />", () => {
     await waitFor(() => {
       expect(
         queryByText("No structures have been found matching these filters.")
-      ).toBeTruthy();
+      ).toBeInTheDocument();
     });
 
     // Select domains
     userEvent.click(await findByText("Domain and children"));
     await waitFor(() => {
-      expect(queryByText(/Select a domain/)).toBeTruthy();
+      expect(queryByText(/Select a domain/)).toBeInTheDocument();
     });
 
-    userEvent.click(await findByText("domain1"));
+    userEvent.click(await findByText("fooDomain"));
     userEvent.click(await findByText("Daily"));
     userEvent.click(await findByText("Rule result created"));
     userEvent.click(await findByText("Goal"));
@@ -139,7 +138,7 @@ describe("<SubscriptionForm />", () => {
         scope: {
           resource_type: "domains",
           events: ["rule_result_created"],
-          resource_id: 11,
+          resource_id: "1",
           status: ["success"],
           filters: null,
         },
@@ -152,7 +151,7 @@ describe("<SubscriptionForm />", () => {
     const onSubmit = jest.fn();
     const props = { onSubmit };
 
-    const { getByRole, findByText, queryByTestId, queryByText } = render(
+    const { getByRole, findByText, queryByText } = render(
       <SubscriptionForm {...props} />,
       renderOpts
     );
@@ -161,41 +160,20 @@ describe("<SubscriptionForm />", () => {
       expect(getByRole("button", { name: "Save" })).toBeDisabled();
     });
 
-    // Select role
-    userEvent.click(await findByText("Role"));
-    await waitFor(() => {
-      expect(queryByText(/Search Roles/)).toBeTruthy();
-    });
-    userEvent.click(await findByText("role2"));
-
-    // Select email
-    userEvent.click(await findByText("Email"));
-    await waitFor(() => {
-      expect(queryByTestId("email-input")).toBeTruthy();
-    });
-    userEvent.type(queryByTestId("email-input"), "foo");
-
     // Select user
     userEvent.click(await findByText("User"));
     await waitFor(() => {
-      expect(queryByText(/Search users/)).toBeTruthy();
+      expect(queryByText(/Search users/)).toBeInTheDocument();
     });
     userEvent.click(await findByText("user2"));
 
-    // Test concepts
-    userEvent.click(await findByText("Concept"));
-    await waitFor(() => {
-      expect(queryByText("No concepts found")).toBeTruthy();
-    });
-
     // Select domains
     userEvent.click(await findByText("Domain and children"));
     await waitFor(() => {
-      expect(queryByText(/Select a domain/)).toBeTruthy();
+      expect(queryByText(/Select a domain/)).toBeInTheDocument();
     });
 
-    userEvent.click(await findByText("domain1"));
-
+    userEvent.click(await findByText("fooDomain"));
     userEvent.click(await findByText("Daily"));
     userEvent.click(await findByText("Comment created"));
     userEvent.click(await queryByText("Filters to subscription"));
@@ -218,7 +196,7 @@ describe("<SubscriptionForm />", () => {
         scope: {
           resource_type: "domains",
           events: ["comment_created"],
-          resource_id: 11,
+          resource_id: "1",
           status: [],
           filters: {
             template: { id: 1 },