@truedat/audit 8.2.3 → 8.2.4

package/package.json

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

package/src/components/SubscriptionForm.js

@@ -9,6 +9,8 @@ import {
   CONCEPT_EVENTS,
   DEFAULT_ICON,
   EVENTS_BY_TYPE,
+  isQualityControlSubscriptionsEnabled,
+  RESOURCE_TYPES,
   RESOURCE_TYPE_ICONS,
   STATUSES_BY_EVENT,
   SUBSCRIBER_TYPE_ICONS,
@@ -42,15 +44,6 @@ const QualityControlSelector = lazy(
 
 const SUBSCRIBER_TYPES = ["role", "taxonomy_role", "email", "user"];
 const PERIODICITIES = ["daily", "minutely", "hourly"];
-const RESOURCE_TYPES = [
-  "domain",
-  "domains",
-  "concept",
-  "data_structure",
-  "source",
-  "rule",
-  "quality_control",
-];
 const DEFAULT_VALUES = {
   periodicity: null,
   subscriber: {
@@ -422,24 +415,26 @@ export const SubscriptionForm = ({
           )}
         />
       )}
-      {resourceType === "quality_control" && !isEditForm && (
-        <Controller
-          control={control}
-          name="scope.resource_id"
-          rules={{ required: true }}
-          render={({ field: { onChange } }) => (
-            <QualityControlSelector
-              disabled={isEditForm}
-              defaultFilters={{ latest: [true] }}
-              pageSize={7}
-              onSelect={({ quality_control_id, name }) => {
-                onChange(quality_control_id);
-                setResource({ id: quality_control_id, name });
-              }}
-            />
-          )}
-        />
-      )}
+      {resourceType === "quality_control" &&
+        isQualityControlSubscriptionsEnabled() &&
+        !isEditForm && (
+          <Controller
+            control={control}
+            name="scope.resource_id"
+            rules={{ required: true }}
+            render={({ field: { onChange } }) => (
+              <QualityControlSelector
+                disabled={isEditForm}
+                defaultFilters={{ latest: [true] }}
+                pageSize={7}
+                onSelect={({ quality_control_id, name }) => {
+                  onChange(quality_control_id);
+                  setResource({ id: quality_control_id, name });
+                }}
+              />
+            )}
+          />
+        )}
       <Controller
         control={control}
         name="periodicity"

package/src/components/Subscriptions.js

@@ -18,21 +18,12 @@ import {
 } from "semantic-ui-react";
 import {
   DEFAULT_ICON,
+  RESOURCE_TYPES,
   RESOURCE_TYPE_ICONS,
   SUBSCRIBER_TYPE_ICONS,
 } from "../subscriptionConstants";
 
 const SUBSCRIBER_TYPES = ["role", "email", "user", "taxonomy_role"];
-const RESOURCE_TYPES = [
-  "data_structure",
-  "domain",
-  "domains",
-  "concept",
-  "rule",
-  "implementation",
-  "source",
-  "quality_control",
-];
 
 export const SubscriptionsHeader = () => {
   const { formatMessage } = useIntl();

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

@@ -184,6 +184,25 @@ exports[`<SubscriptionEdit /> matches the latest snapshot 1`] = `
         <label>
           subscriptions.resource
         </label>
+        <div
+          class="ui radio checkbox"
+        >
+          <input
+            class="hidden"
+            readonly=""
+            role="radio"
+            tabindex="0"
+            type="radio"
+            value="data_structure"
+          />
+          <label>
+            <i
+              aria-hidden="true"
+              class="block layout icon"
+            />
+            data_structure
+          </label>
+        </div>
         <div
           class="ui radio checkbox"
         >
@@ -242,22 +261,23 @@ exports[`<SubscriptionEdit /> matches the latest snapshot 1`] = `
           </label>
         </div>
         <div
-          class="ui radio checkbox"
+          class="ui disabled radio checkbox"
         >
           <input
             class="hidden"
+            disabled=""
             readonly=""
             role="radio"
-            tabindex="0"
+            tabindex="-1"
             type="radio"
-            value="data_structure"
+            value="rule"
           />
           <label>
             <i
               aria-hidden="true"
-              class="block layout icon"
+              class="clipboard check icon"
             />
-            data_structure
+            rule
           </label>
         </div>
         <div
@@ -269,34 +289,33 @@ exports[`<SubscriptionEdit /> matches the latest snapshot 1`] = `
             role="radio"
             tabindex="0"
             type="radio"
-            value="source"
+            value="implementation"
           />
           <label>
             <i
               aria-hidden="true"
-              class="plug icon"
+              class="tags icon"
             />
-            source
+            implementation
           </label>
         </div>
         <div
-          class="ui disabled radio checkbox"
+          class="ui radio checkbox"
         >
           <input
             class="hidden"
-            disabled=""
             readonly=""
             role="radio"
-            tabindex="-1"
+            tabindex="0"
             type="radio"
-            value="rule"
+            value="source"
           />
           <label>
             <i
               aria-hidden="true"
-              class="clipboard check icon"
+              class="plug icon"
             />
-            rule
+            source
           </label>
         </div>
         <div

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

@@ -158,6 +158,25 @@ exports[`<SubscriptionForm /> matches the latest snapshot 1`] = `
       <label>
         subscriptions.resource
       </label>
+      <div
+        class="ui radio checkbox"
+      >
+        <input
+          class="hidden"
+          readonly=""
+          role="radio"
+          tabindex="0"
+          type="radio"
+          value="data_structure"
+        />
+        <label>
+          <i
+            aria-hidden="true"
+            class="block layout icon"
+          />
+          data_structure
+        </label>
+      </div>
       <div
         class="ui radio checkbox"
       >
@@ -216,42 +235,42 @@ exports[`<SubscriptionForm /> matches the latest snapshot 1`] = `
         </label>
       </div>
       <div
-        class="ui radio checkbox"
+        class="ui disabled radio checkbox"
       >
         <input
           class="hidden"
+          disabled=""
           readonly=""
           role="radio"
-          tabindex="0"
+          tabindex="-1"
           type="radio"
-          value="data_structure"
+          value="rule"
         />
         <label>
           <i
             aria-hidden="true"
-            class="block layout icon"
+            class="clipboard check icon"
           />
-          data_structure
+          rule
         </label>
       </div>
       <div
-        class="ui disabled radio checkbox"
+        class="ui radio checkbox"
       >
         <input
           class="hidden"
-          disabled=""
           readonly=""
           role="radio"
-          tabindex="-1"
+          tabindex="0"
           type="radio"
-          value="source"
+          value="implementation"
         />
         <label>
           <i
             aria-hidden="true"
-            class="plug icon"
+            class="tags icon"
           />
-          source
+          implementation
         </label>
       </div>
       <div
@@ -264,14 +283,14 @@ exports[`<SubscriptionForm /> matches the latest snapshot 1`] = `
           role="radio"
           tabindex="-1"
           type="radio"
-          value="rule"
+          value="source"
         />
         <label>
           <i
             aria-hidden="true"
-            class="clipboard check icon"
+            class="plug icon"
           />
-          rule
+          source
         </label>
       </div>
       <div

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

@@ -173,6 +173,25 @@ exports[`<SubscriptionNew /> matches the latest snapshot 1`] = `
         <label>
           subscriptions.resource
         </label>
+        <div
+          class="ui radio checkbox"
+        >
+          <input
+            class="hidden"
+            readonly=""
+            role="radio"
+            tabindex="0"
+            type="radio"
+            value="data_structure"
+          />
+          <label>
+            <i
+              aria-hidden="true"
+              class="block layout icon"
+            />
+            data_structure
+          </label>
+        </div>
         <div
           class="ui radio checkbox"
         >
@@ -231,42 +250,42 @@ exports[`<SubscriptionNew /> matches the latest snapshot 1`] = `
           </label>
         </div>
         <div
-          class="ui radio checkbox"
+          class="ui disabled radio checkbox"
         >
           <input
             class="hidden"
+            disabled=""
             readonly=""
             role="radio"
-            tabindex="0"
+            tabindex="-1"
             type="radio"
-            value="data_structure"
+            value="rule"
           />
           <label>
             <i
               aria-hidden="true"
-              class="block layout icon"
+              class="clipboard check icon"
             />
-            data_structure
+            rule
           </label>
         </div>
         <div
-          class="ui disabled radio checkbox"
+          class="ui radio checkbox"
         >
           <input
             class="hidden"
-            disabled=""
             readonly=""
             role="radio"
-            tabindex="-1"
+            tabindex="0"
             type="radio"
-            value="source"
+            value="implementation"
           />
           <label>
             <i
               aria-hidden="true"
-              class="plug icon"
+              class="tags icon"
             />
-            source
+            implementation
           </label>
         </div>
         <div
@@ -279,14 +298,14 @@ exports[`<SubscriptionNew /> matches the latest snapshot 1`] = `
             role="radio"
             tabindex="-1"
             type="radio"
-            value="rule"
+            value="source"
           />
           <label>
             <i
               aria-hidden="true"
-              class="clipboard check icon"
+              class="plug icon"
             />
-            rule
+            source
           </label>
         </div>
         <div

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

@@ -177,6 +177,25 @@ exports[`<SubscriptionRoutes /> matches the latest snapshot for route SUBSCRIPTI
         <label>
           subscriptions.resource
         </label>
+        <div
+          class="ui radio checkbox"
+        >
+          <input
+            class="hidden"
+            readonly=""
+            role="radio"
+            tabindex="0"
+            type="radio"
+            value="data_structure"
+          />
+          <label>
+            <i
+              aria-hidden="true"
+              class="block layout icon"
+            />
+            data_structure
+          </label>
+        </div>
         <div
           class="ui radio checkbox"
         >
@@ -235,42 +254,42 @@ exports[`<SubscriptionRoutes /> matches the latest snapshot for route SUBSCRIPTI
           </label>
         </div>
         <div
-          class="ui radio checkbox"
+          class="ui disabled radio checkbox"
         >
           <input
             class="hidden"
+            disabled=""
             readonly=""
             role="radio"
-            tabindex="0"
+            tabindex="-1"
             type="radio"
-            value="data_structure"
+            value="rule"
           />
           <label>
             <i
               aria-hidden="true"
-              class="block layout icon"
+              class="clipboard check icon"
             />
-            data_structure
+            rule
           </label>
         </div>
         <div
-          class="ui disabled radio checkbox"
+          class="ui radio checkbox"
         >
           <input
             class="hidden"
-            disabled=""
             readonly=""
             role="radio"
-            tabindex="-1"
+            tabindex="0"
             type="radio"
-            value="source"
+            value="implementation"
           />
           <label>
             <i
               aria-hidden="true"
-              class="plug icon"
+              class="tags icon"
             />
-            source
+            implementation
           </label>
         </div>
         <div
@@ -283,14 +302,14 @@ exports[`<SubscriptionRoutes /> matches the latest snapshot for route SUBSCRIPTI
             role="radio"
             tabindex="-1"
             type="radio"
-            value="rule"
+            value="source"
           />
           <label>
             <i
               aria-hidden="true"
-              class="clipboard check icon"
+              class="plug icon"
             />
-            rule
+            source
           </label>
         </div>
         <div

package/src/subscriptionConstants.js

@@ -1,5 +1,11 @@
 import _ from "lodash/fp";
 
+const HIDE_QUALITY_CONTROL_SUBSCRIPTIONS =
+  process.env.REACT_APP_HIDE_QUALITY_CONTROLS === "true";
+
+export const isQualityControlSubscriptionsEnabled = () =>
+  !HIDE_QUALITY_CONTROL_SUBSCRIPTIONS;
+
 export const SUBSCRIBER_TYPE_ICONS = {
   user: "user",
   email: "envelope",
@@ -67,9 +73,10 @@ export const QUALITY_CONTROL_EVENTS = [
   "quality_control_version_status_updated",
   "quality_control_version_draft_created",
   "quality_control_version_deleted",
+  "quality_control_created",
 ];
 
-export const DOMAIN_EVENTS = [
+const DOMAIN_EVENTS_WITHOUT_QC = [
   ...CONCEPT_EVENTS,
   ...RULE_EVENTS,
   ...IMPLEMENTATION_EVENTS,
@@ -85,11 +92,13 @@ export const DOMAIN_EVENTS = [
   "grant_request_status_cancellation",
   "grant_request_status_failure",
   "ingest_sent_for_approval",
-  "quality_control_created",
-  ...QUALITY_CONTROL_EVENTS,
 ];
 
-export const EVENTS_BY_TYPE = {
+export const DOMAIN_EVENTS = HIDE_QUALITY_CONTROL_SUBSCRIPTIONS
+  ? DOMAIN_EVENTS_WITHOUT_QC
+  : [...DOMAIN_EVENTS_WITHOUT_QC, ...QUALITY_CONTROL_EVENTS];
+
+const EVENTS_BY_TYPE_BASE = {
   concept: CONCEPT_EVENTS,
   data_structure: STRUCTURE_EVENTS,
   domains: DOMAIN_EVENTS,
@@ -97,7 +106,28 @@ export const EVENTS_BY_TYPE = {
   rule: RULE_EVENTS,
   implementation: IMPLEMENTATION_EVENTS,
   source: SOURCE_EVENTS,
-  quality_control: QUALITY_CONTROL_EVENTS,
+};
+
+export const EVENTS_BY_TYPE = HIDE_QUALITY_CONTROL_SUBSCRIPTIONS
+  ? EVENTS_BY_TYPE_BASE
+  : { ...EVENTS_BY_TYPE_BASE, quality_control: QUALITY_CONTROL_EVENTS };
+
+const STATUSES_BY_EVENT_QC = {
+  quality_control_version_status_updated: [
+    { name: "deprecated" },
+    { name: "draft" },
+    { name: "pending_approval" },
+    { name: "published" },
+    { name: "rejected" },
+    { name: "versioned" },
+  ],
+  score_status_updated: [
+    { name: "no_results", color: "grey" },
+    { name: "meets_goal", color: "green" },
+    { name: "under_goal", color: "yellow" },
+    { name: "under_threshold", color: "yellow" },
+    { name: "failed", color: "red" },
+  ],
 };
 
 export const STATUSES_BY_EVENT = {
@@ -124,22 +154,22 @@ export const STATUSES_BY_EVENT = {
     { name: "versioned" },
     { name: "deprecated" },
   ],
-  quality_control_version_status_updated: [
-    { name: "deprecated" },
-    { name: "draft" },
-    { name: "pending_approval" },
-    { name: "published" },
-    { name: "rejected" },
-    { name: "versioned" },
-  ],
-  score_status_updated: [
-    { name: "no_results", color: "grey" },
-    { name: "meets_goal", color: "green" },
-    { name: "under_goal", color: "yellow" },
-    { name: "under_threshold", color: "yellow" },
-    { name: "failed", color: "red" },
-  ],
+  ...(HIDE_QUALITY_CONTROL_SUBSCRIPTIONS ? {} : STATUSES_BY_EVENT_QC),
 };
 
+const BASE_RESOURCE_TYPES = [
+  "data_structure",
+  "domain",
+  "domains",
+  "concept",
+  "rule",
+  "implementation",
+  "source",
+];
+
+export const RESOURCE_TYPES = HIDE_QUALITY_CONTROL_SUBSCRIPTIONS
+  ? BASE_RESOURCE_TYPES
+  : [...BASE_RESOURCE_TYPES, "quality_control"];
+
 export const isSubset = (first, second) =>
   !_.isEmpty(first) && _.difference(first, second).length === 0;