@truedat/audit 4.28.5 → 4.29.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.28.7] 2021-09-20
+
+### Added
+
+- [TD-3780] Support for `taxonomy_role` subscriptor type
+
 ## [4.27.7] 2021-09-06
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/audit",
-  "version": "4.28.5",
+  "version": "4.29.0",
   "description": "Truedat Web Audit Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.28.5",
+    "@truedat/test": "4.29.0",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -84,8 +84,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.28.5",
-    "@truedat/core": "4.28.5",
+    "@truedat/auth": "4.29.0",
+    "@truedat/core": "4.29.0",
     "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": "e004c6a673d6824a4807e4378b6e5c83e947c992"
+  "gitHead": "42028609748cd7f1686ea783264a9cdfa7b0ca8f"
 }

package/src/components/SubscriptionForm.js

@@ -28,7 +28,7 @@ const StructureSelector = React.lazy(() =>
   import("@truedat/dd/components/StructureSelector")
 );
 
-const SUBSCRIBER_TYPES = ["role", "email", "user"];
+const SUBSCRIBER_TYPES = ["role", "taxonomy_role", "email", "user"];
 const PERIODICITIES = ["daily", "minutely", "hourly"];
 const RESOURCE_TYPES = [
   "domain",
@@ -66,7 +66,9 @@ export const SubscriptionForm = ({
   const { formatMessage } = useIntl();
   const [selectedConceptType, setSelectedConceptType] = useState();
   const [resource, setResource] = useState();
+
   const { SUBSCRIBER_TYPE_ICONS, DEFAULT_ICON, RESOURCE_TYPE_ICONS } = icons;
+
   const { handleSubmit, control, formState, setValue, watch } = useForm({
     mode: "all",
     defaultValues: {
@@ -169,13 +171,21 @@ export const SubscriptionForm = ({
                   name={type}
                   value={type}
                   checked={value == type}
-                  onChange={(_e, { value }) => onChange(value)}
+                  onChange={(_e, { value }) => {
+                    if (value === "taxonomy_role" && resourceType !== "domains")
+                      setValue("scope.resource_type", "domains", {
+                        shouldValidate: true,
+                        shouldDirty: true,
+                      });
+
+                    onChange(value);
+                  }}
                 />
               ))}
             </Form.Field>
           )}
         />
-        {subscriberType === "role" && (
+        {_.includes(subscriberType)(["role", "taxonomy_role"]) && (
           <Controller
             control={control}
             name="subscriber.identifier"
@@ -237,7 +247,11 @@ export const SubscriptionForm = ({
               {RESOURCE_TYPES.map((type, idx) => (
                 <Radio
                   role="radio"
-                  disabled={isEditForm || type == "rule"}
+                  disabled={
+                    isEditForm ||
+                    type == "rule" ||
+                    (subscriberType === "taxonomy_role" && type !== "domains")
+                  }
                   onBlur={onBlur}
                   key={idx}
                   label={

package/src/components/Subscriptions.js

@@ -13,17 +13,17 @@ import {
   Segment,
   Button,
   Label,
-  Checkbox
+  Checkbox,
 } from "semantic-ui-react";
 import { icons } from "../subscriptionConstants";
 
-const SUBSCRIBER_TYPES = ["role", "email", "user"];
+const SUBSCRIBER_TYPES = ["role", "email", "user", "taxonomy_role"];
 const RESOURCE_TYPES = [
   "data_structure",
   "domain",
   "domains",
   "concept",
-  "rule"
+  "rule",
 ];
 
 export const SubscriptionsHeader = () => (
@@ -50,8 +50,8 @@ export const Subscriptions = () => {
     mode: "all",
     defaultValues: {
       resourceTypes: RESOURCE_TYPES,
-      subscriberTypes: SUBSCRIBER_TYPES
-    }
+      subscriberTypes: SUBSCRIBER_TYPES,
+    },
   });
 
   const { subscriptions, subscriptionsLoading, users } = useSelector(
@@ -66,7 +66,8 @@ export const Subscriptions = () => {
   const subscriberIdentifier = ({ type, identifier }) =>
     type === "user" ? _.get(`${identifier}.full_name`)(usersById) : identifier;
 
-  const resourceIcon = type => _.getOr(DEFAULT_ICON, type)(RESOURCE_TYPE_ICONS);
+  const resourceIcon = (type) =>
+    _.getOr(DEFAULT_ICON, type)(RESOURCE_TYPE_ICONS);
 
   const subscriberTypes = watch("subscriberTypes");
   const resourceTypes = watch("resourceTypes");
@@ -111,7 +112,7 @@ export const Subscriptions = () => {
                   onChange={() => {
                     onChange(
                       _.includes(type)(value)
-                        ? _.filter(t => t !== type)(value)
+                        ? _.filter((t) => t !== type)(value)
                         : [...value, type]
                     );
                   }}
@@ -144,7 +145,7 @@ export const Subscriptions = () => {
                   onChange={() => {
                     onChange(
                       _.includes(type)(value)
-                        ? _.filter(t => t !== type)(value)
+                        ? _.filter((t) => t !== type)(value)
                         : [...value, type]
                     );
                   }}

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

@@ -22,6 +22,8 @@ const renderOpts = {
         "subscription.subscriber_type.email",
       "subscription.subscriber_type.role": "subscription.subscriber_type.role",
       "subscription.subscriber_type.user": "subscription.subscriber_type.user",
+      "subscription.subscriber_type.taxonomy_role":
+        "subscription.subscriber_type.taxonomy_role",
       "subscriptions.events": "subscriptions.events",
       "subscriptions.events.comment_created":
         "subscriptions.events.comment_created",
@@ -182,6 +184,21 @@ describe("<SubscriptionForm />", () => {
     });
     userEvent.type(queryByTestId("email-input"), "foo");
 
+    // Select concept and taxonomy_role
+    userEvent.click(await findByText(/resource\.type\.concept/));
+    await waitFor(() => {
+      expect(queryByText("concepts.search.results.empty")).toBeTruthy();
+    });
+
+    userEvent.click(await findByText(/subscriber_type\.taxonomy_role/));
+    await waitFor(() => {
+      expect(queryByText("role.search.placeholder")).toBeTruthy();
+    });
+    await waitFor(() => {
+      expect(queryByText("concepts.search.results.empty")).toBeFalsy();
+    });
+    userEvent.click(await findByText(/role2/));
+
     // Select user
     userEvent.click(await findByText(/subscriber_type\.user/));
     await waitFor(() => {

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

@@ -4,7 +4,7 @@ import { Subscriptions, SubscriptionsHeader } from "../Subscriptions";
 
 jest.mock("react-redux", () => ({
   ...jest.requireActual("react-redux"),
-  useSelector: jest.fn(selector =>
+  useSelector: jest.fn((selector) =>
     selector({
       users: [{ full_name: "test1", id: 1 }],
       subscriptions: [
@@ -13,27 +13,27 @@ jest.mock("react-redux", () => ({
           scope: { resource_type: "domain" },
           periodicity: "hourly",
           subscriber: { id: 3, type: "user" },
-          resource: { id: 2, name: "resource" }
+          resource: { id: 2, name: "resource" },
         },
         {
           id: 2,
           scope: { resource_type: "data_structure" },
           periodicity: "minutely",
           subscriber: { id: 4, type: "user" },
-          resource: { id: 3, name: "bar" }
-        }
-      ]
+          resource: { id: 3, name: "bar" },
+        },
+      ],
     })
-  )
+  ),
 }));
 
 const mockHistory = {
-  goBack: jest.fn()
+  goBack: jest.fn(),
 };
 
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
-  useHistory: () => mockHistory
+  useHistory: () => mockHistory,
 }));
 
 describe("<Subscriptions />", () => {

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

@@ -33,6 +33,26 @@ exports[`<SubscriptionForm /> matches the latest snapshot 1`] = `
           subscription.subscriber_type.role
         </label>
       </div>
+      <div
+        class="ui radio checkbox"
+      >
+        <input
+          class="hidden"
+          name="taxonomy_role"
+          readonly=""
+          role="radio"
+          tabindex="0"
+          type="radio"
+          value="taxonomy_role"
+        />
+        <label>
+          <i
+            aria-hidden="true"
+            class="student icon"
+          />
+          subscription.subscriber_type.taxonomy_role
+        </label>
+      </div>
       <div
         class="ui radio checkbox"
       >

package/src/components/__tests__/__snapshots__/Subscriptions.spec.js.snap

@@ -31,6 +31,7 @@ exports[`<Subscriptions /> matches the latest snapshot 1`] = `
                 "role",
                 "email",
                 "user",
+                "taxonomy_role",
               ],
             },
           },
@@ -149,6 +150,7 @@ exports[`<Subscriptions /> matches the latest snapshot 1`] = `
                 "role",
                 "email",
                 "user",
+                "taxonomy_role",
               ],
             },
           },

package/src/messages/en.js

@@ -104,6 +104,7 @@ export default {
 
   "subscription.subscriber_type.user": "User",
   "subscription.subscriber_type.role": "Role",
+  "subscription.subscriber_type.taxonomy_role": "Role in taxonomy",
   "subscription.subscriber_type.email": "Email",
 
   "alert.createSubscription.failed.header": "Error saving subscription",

package/src/messages/es.js

@@ -117,6 +117,7 @@ export default {
 
   "subscription.subscriber_type.user": "Usuario",
   "subscription.subscriber_type.role": "Rol",
+  "subscription.subscriber_type.taxonomy_role": "Rol en taxonomía",
   "subscription.subscriber_type.email": "Correo Electrónico",
 
   "alert.createSubscription.failed.header": "Error guardando suscripción",

package/src/subscriptionConstants.js

@@ -112,6 +112,7 @@ export const icons = {
     user: "user",
     email: "envelope",
     role: "student",
+    taxonomy_role: "student",
   },
   DEFAULT_ICON: "question",
   RESOURCE_TYPE_ICONS: {