@truedat/audit 8.5.3 → 8.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/audit",
-  "version": "8.5.3",
+  "version": "8.5.5",
   "description": "Truedat Web Audit Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -51,7 +51,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.5.3",
+    "@truedat/test": "8.5.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -83,5 +83,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "9d67766fe0910fe519b6f1f2042b4a5dcc28fad5"
+  "gitHead": "8fb280f11b1f8ce7b1081e0654621de191ad8f80"
 }

package/src/components/Subscription.js

@@ -11,6 +11,7 @@ import {
 } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { connect } from "react-redux";
+import { visibleEvents } from "../subscriptionConstants";
 import SubscriptionCrumbs from "./SubscriptionCrumbs";
 import SubscriptionActions from "./SubscriptionActions";
 
@@ -75,7 +76,7 @@ export const Subscription = ({
       : identifier;
   const resourceName = subscription.resource?.name;
   const periodicity = subscription.periodicity;
-  const events = subscription.scope?.events;
+  const events = visibleEvents(subscription.scope?.events);
   const status = subscription.scope?.status;
   const filters = subscription.scope?.filters;
   const template = _.find({ id: filters?.template?.id })(templates);

package/src/components/SubscriptionForm.js

@@ -9,11 +9,14 @@ import {
   CONCEPT_EVENTS,
   DEFAULT_ICON,
   EVENTS_BY_TYPE,
+  expandPairedEvents,
+  isHiddenPairedEvent,
   isQualityControlSubscriptionsEnabled,
   RESOURCE_TYPES,
   RESOURCE_TYPE_ICONS,
   STATUSES_BY_EVENT,
   SUBSCRIBER_TYPE_ICONS,
+  visibleEvents,
   isSubset,
 } from "../subscriptionConstants";
 import ContentFilters from "./ContentFilters";
@@ -483,18 +486,20 @@ export const SubscriptionForm = ({
             disabled={_.isEmpty(eventsForType)}
             label={formatMessage({ id: "subscriptions.events" })}
             onBlur={onBlur}
-            onChange={(_e, { value }) => onChange(value)}
+            onChange={(_e, { value }) => onChange(expandPairedEvents(value))}
             placeholder={formatMessage({ id: "subscriptions.events" })}
-            value={value}
+            value={visibleEvents(value)}
             required
-            options={eventsForType.map((event, key) => ({
-              key,
-              value: event,
-              text: formatMessage({
-                id: `subscriptions.events.${event}`,
-                defaultMessage: event,
-              }),
-            }))}
+            options={eventsForType
+              .filter((event) => !isHiddenPairedEvent(event))
+              .map((event, key) => ({
+                key,
+                value: event,
+                text: formatMessage({
+                  id: `subscriptions.events.${event}`,
+                  defaultMessage: event,
+                }),
+              }))}
           />
         )}
       />

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

@@ -0,0 +1,303 @@
+import userEvent from "@testing-library/user-event";
+import { waitFor, within } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { domainsMock } from "@truedat/test/mocks";
+import SubscriptionForm from "../SubscriptionForm";
+
+jest.mock("@truedat/bg/concepts/relations/components/ConceptSelector", () => ({
+  __esModule: true,
+  default: ({ handleConceptSelected }) => (
+    <button
+      data-testid="mock-concept-selector"
+      onClick={() =>
+        handleConceptSelected({
+          business_concept_id: "42",
+          type: "foo",
+        })
+      }
+      type="button"
+    >
+      MockConceptSelector
+    </button>
+  ),
+}));
+
+jest.mock("@truedat/dd/components/StructureSelector", () => ({
+  __esModule: true,
+  default: ({ onSelect }) => (
+    <button
+      data-testid="mock-structure-selector"
+      onClick={() =>
+        onSelect({ id: "7", name: "MyStructure", domain_id: "99" })
+      }
+      type="button"
+    >
+      MockStructureSelector
+    </button>
+  ),
+}));
+
+jest.mock("@truedat/cx/sources/components/SourceSelector", () => ({
+  __esModule: true,
+  default: ({ onChange }) => (
+    <button
+      data-testid="mock-source-selector"
+      onClick={() =>
+        onChange(null, {
+          value: "5",
+          options: [{ key: "5", text: "MySource" }],
+        })
+      }
+      type="button"
+    >
+      MockSourceSelector
+    </button>
+  ),
+}));
+
+jest.mock(
+  "@truedat/qx/components/qualityControls/QualityControlSelector",
+  () => ({
+    __esModule: true,
+    default: ({ onSelect }) => (
+      <button
+        data-testid="mock-qc-selector"
+        onClick={() => onSelect({ quality_control_id: "11", name: "MyQC" })}
+        type="button"
+      >
+        MockQCSelector
+      </button>
+    ),
+  })
+);
+
+jest.mock("@truedat/auth/users/components/UserSelector", () => ({
+  __esModule: true,
+  default: ({ onChange, value }) => (
+    <button
+      data-testid="mock-user-selector"
+      onClick={() => onChange(null, { value: "2" })}
+      type="button"
+    >
+      MockUserSelector:{value}
+    </button>
+  ),
+}));
+
+jest.mock("@truedat/core/hooks/useUserFilters");
+
+const variables = { action: "manageSubscriptions" };
+const mocks = [domainsMock(variables)];
+const state = {
+  roles: [{ name: "role1" }, { name: "role2" }],
+  templates: [],
+  users: [
+    { full_name: "user1", id: 1 },
+    { full_name: "user2", id: 2 },
+  ],
+};
+const renderOpts = { state, mocks };
+
+describe("<SubscriptionForm /> lazy selectors and email", () => {
+  it("submits with concept resource selected via ConceptSelector", async () => {
+    const onSubmit = jest.fn();
+    const user = userEvent.setup({ delay: null });
+
+    const rendered = render(
+      <SubscriptionForm onSubmit={onSubmit} />,
+      renderOpts
+    );
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByText(/^user$/i));
+    await user.click(await rendered.findByTestId("mock-user-selector"));
+
+    await user.click(rendered.getByText("concept"));
+    await user.click(await rendered.findByTestId("mock-concept-selector"));
+
+    await user.click(rendered.getByText(/daily/i));
+    await user.click(await rendered.findByText(/concept_published/i));
+
+    const saveButton = rendered.getByRole("button", { name: "actions.save" });
+    await waitFor(() => expect(saveButton).toBeEnabled());
+
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(onSubmit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          subscriber: { type: "user", identifier: "2" },
+          scope: expect.objectContaining({
+            resource_type: "concept",
+            resource_id: "42",
+          }),
+          periodicity: "daily",
+        })
+      );
+    });
+  });
+
+  it("submits with data_structure resource selected via StructureSelector", async () => {
+    const onSubmit = jest.fn();
+    const user = userEvent.setup({ delay: null });
+
+    const rendered = render(
+      <SubscriptionForm onSubmit={onSubmit} />,
+      renderOpts
+    );
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByText(/^user$/i));
+    await user.click(await rendered.findByTestId("mock-user-selector"));
+
+    await user.click(rendered.getByText(/data_structure/i));
+    await user.click(await rendered.findByTestId("mock-structure-selector"));
+
+    await user.click(rendered.getByText(/daily/i));
+    await user.click(await rendered.findByText(/structure_note_published/i));
+
+    const saveButton = rendered.getByRole("button", { name: "actions.save" });
+    await waitFor(() => expect(saveButton).toBeEnabled());
+
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(onSubmit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          subscriber: { type: "user", identifier: "2" },
+          scope: expect.objectContaining({
+            resource_type: "data_structure",
+            resource_id: "7",
+            resource_name: "MyStructure",
+            domain_id: "99",
+          }),
+          periodicity: "daily",
+        })
+      );
+    });
+  });
+
+  it("submits with source resource selected via SourceSelector", async () => {
+    const onSubmit = jest.fn();
+    const user = userEvent.setup({ delay: null });
+
+    const rendered = render(
+      <SubscriptionForm onSubmit={onSubmit} />,
+      renderOpts
+    );
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByText(/^user$/i));
+    await user.click(await rendered.findByTestId("mock-user-selector"));
+
+    await user.click(rendered.getByText(/^source$/i));
+    await user.click(await rendered.findByTestId("mock-source-selector"));
+
+    await user.click(rendered.getByText(/daily/i));
+    await user.click(await rendered.findByText(/status_changed/i));
+    await user.click(await rendered.findByText(/job_status_started/i));
+
+    const saveButton = rendered.getByRole("button", { name: "actions.save" });
+    await waitFor(() => expect(saveButton).toBeEnabled());
+
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(onSubmit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          subscriber: { type: "user", identifier: "2" },
+          scope: expect.objectContaining({
+            resource_type: "source",
+            resource_id: "5",
+            resource_name: "MySource",
+          }),
+          periodicity: "daily",
+        })
+      );
+    });
+  });
+
+  it("submits with quality_control resource selected via QualityControlSelector", async () => {
+    const onSubmit = jest.fn();
+    const user = userEvent.setup({ delay: null });
+
+    const rendered = render(
+      <SubscriptionForm onSubmit={onSubmit} />,
+      renderOpts
+    );
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByText(/^user$/i));
+    await user.click(await rendered.findByTestId("mock-user-selector"));
+
+    await user.click(rendered.getByText(/quality_control/i));
+    await user.click(await rendered.findByTestId("mock-qc-selector"));
+
+    await user.click(rendered.getByText(/daily/i));
+    await user.click(
+      await rendered.findByText(/quality_control_version_draft_created/i)
+    );
+
+    const saveButton = rendered.getByRole("button", { name: "actions.save" });
+    await waitFor(() => expect(saveButton).toBeEnabled());
+
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(onSubmit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          subscriber: { type: "user", identifier: "2" },
+          scope: expect.objectContaining({
+            resource_type: "quality_control",
+            resource_id: "11",
+            resource_name: "MyQC",
+          }),
+          periodicity: "daily",
+        })
+      );
+    });
+  });
+
+  it("updates email subscriber identifier when typing into email input", async () => {
+    const onSubmit = jest.fn();
+    const user = userEvent.setup({ delay: null });
+
+    const rendered = render(
+      <SubscriptionForm onSubmit={onSubmit} />,
+      renderOpts
+    );
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByText(/email/i));
+
+    await waitFor(() =>
+      expect(rendered.getByTestId("email-input")).toBeInTheDocument()
+    );
+
+    const emailInput = within(rendered.getByTestId("email-input")).getByRole(
+      "textbox"
+    );
+    await user.type(emailInput, "test@example.com");
+
+    expect(emailInput).toHaveValue("test@example.com");
+
+    await user.click(rendered.getByText(/data_structure/i));
+    await user.click(await rendered.findByTestId("mock-structure-selector"));
+
+    await user.click(rendered.getByText(/daily/i));
+    await user.click(await rendered.findByText(/structure_note_published/i));
+
+    const saveButton = rendered.getByRole("button", { name: "actions.save" });
+    await waitFor(() => expect(saveButton).toBeEnabled());
+
+    await user.click(saveButton);
+
+    await waitFor(() => {
+      expect(onSubmit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          subscriber: { type: "email", identifier: "test@example.com" },
+        })
+      );
+    });
+  });
+});

package/src/subscriptionConstants.js

@@ -33,7 +33,9 @@ export const CONCEPT_EVENTS = [
   "concept_rejected",
   "concept_rejection_canceled",
   "new_concept_draft",
+  "create_concept_draft",
   "update_concept_draft",
+  "update_concept",
   "delete_concept_draft",
   "comment_created",
   "relation_created",
@@ -41,6 +43,26 @@ export const CONCEPT_EVENTS = [
   "relation_deleted",
 ];
 
+export const PAIRED_EVENTS = {
+  new_concept_draft: "create_concept_draft",
+  update_concept_draft: "update_concept",
+};
+
+export const HIDDEN_PAIRED_EVENTS = _.values(PAIRED_EVENTS);
+
+export const isHiddenPairedEvent = (event) =>
+  _.includes(event)(HIDDEN_PAIRED_EVENTS);
+
+export const expandPairedEvents = (events = []) =>
+  _.uniq(
+    _.flatMap((event) =>
+      PAIRED_EVENTS[event] ? [event, PAIRED_EVENTS[event]] : [event]
+    )(events)
+  );
+
+export const visibleEvents = (events = []) =>
+  _.filter((event) => !isHiddenPairedEvent(event))(events);
+
 export const STRUCTURE_EVENTS = [
   "structure_note_published",
   "structure_note_pending_approval",