@truedat/audit 4.47.3 → 4.47.6

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.47.4] 2022-06-29
+
+- [TD-4921] Add implementation workflow events
+
 ## [4.45.6] 2022-06-06
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/audit",
-  "version": "4.47.3",
+  "version": "4.47.6",
   "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.3",
+    "@truedat/test": "4.47.6",
     "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.47.3",
-    "@truedat/core": "4.47.3",
+    "@truedat/auth": "4.47.6",
+    "@truedat/core": "4.47.6",
     "axios": "^0.19.2",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "f96f532d27f7104fbc50b6b0539593cec0d2039d"
+  "gitHead": "07210600d97244d32085d7166595ee030e6bb578"
 }

package/src/components/NotificationEvent.js

@@ -26,6 +26,7 @@ const TEMPLATES = {
   job_status_succeeded: "job_status",
   job_status_warning: "job_status",
   job_status_info: "job_status",
+  implementation_status_updated: "implementation_status",
 };
 
 export const NotificationEvent = ({
@@ -34,9 +35,7 @@ export const NotificationEvent = ({
   readMark,
   readNotification,
 }) => {
-  const template = TEMPLATES[event.event] || "default";
   const { locale } = useIntl();
-
   const ref = useRef();
   const [isRead, setIsRead] = useState(readMark);
   const [isVisibleUnreadLabel, setUnreadLabelVisibility] = useState(!readMark);
@@ -51,6 +50,8 @@ export const NotificationEvent = ({
     }
   }, [isVisible]);
 
+  const template = TEMPLATES[event.event] || "default";
+  const statusesEvents = ["implementation_status"];
   return (
     <div className="notification-item unread" ref={ref}>
       <h4>
@@ -63,10 +64,17 @@ export const NotificationEvent = ({
       </h4>
       <p>{event.name}</p>
       <Label>
-        <FormattedMessage
-          id={`subscriptions.events.${event.event}`}
-          defaultMessage={event.event}
-        />
+        {statusesEvents.includes(template) ? (
+          <FormattedMessage
+            id={`subscriptions.events.${template}.${event.payload.status}`}
+            defaultMessage={event.payload.status}
+          />
+        ) : (
+          <FormattedMessage
+            id={`subscriptions.events.${event.event}`}
+            defaultMessage={event.event}
+          />
+        )}
       </Label>
       <Moment locale={locale} fromNow>
         {date}

package/src/components/SubscriptionForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { Suspense, useState } from "react";
+import React, { Suspense, useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { useForm, useWatch, Controller } from "react-hook-form";
@@ -122,18 +122,23 @@ export const SubscriptionForm = ({
   });
 
   const isEditForm = !!subscription?.id;
-  const isEmptyEvents = _.isEmpty(events);
-  const isRuleEvent = _.isEqual(["rule_result_created"])(events);
-  const eventsForType = _.flow(
-    _.getOr([], resourceType),
-    _.filter(
-      (event) =>
-        isEmptyEvents ||
-        (isRuleEvent
-          ? event === "rule_result_created"
-          : event !== "rule_result_created")
-    )
-  )(EVENTS_BY_TYPE);
+
+  const [eventsForType, setEventsForType] = useState([]);
+
+  useEffect(() => {
+    const exclusiveEvents = [
+      "rule_result_created",
+      "implementation_status_updated",
+    ];
+    const eventsbytype = _.getOr([], resourceType)(EVENTS_BY_TYPE);
+    setEventsForType(
+      !_.isEmpty(_.intersection(exclusiveEvents)(events))
+        ? events
+        : !_.isEmpty(events)
+        ? _.difference(eventsbytype)(exclusiveEvents)
+        : eventsbytype
+    );
+  }, [resourceType, events]);
 
   const statuses = _.flow(
     _.pick(events),
@@ -469,10 +474,12 @@ export const SubscriptionForm = ({
                   value: name,
                   text: (
                     <label>
-                      <Icon
-                        name={name == "error" ? "warning circle" : "circle"}
-                        color={color}
-                      />
+                      {color ? (
+                        <Icon
+                          name={name == "error" ? "warning circle" : "circle"}
+                          color={color}
+                        />
+                      ) : null}
                       {formatMessage({ id: `subscriptions.status.${name}` })}
                     </label>
                   ),

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

@@ -3,7 +3,9 @@ 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/messages/en.js

@@ -10,6 +10,8 @@ export default {
     "👓 Alert: Data quality results detected",
   "notifications.events.comments": "🖋 Alert: New comments added",
   "notifications.events.job_status": "⚡ Alert: Job status updated",
+  "notifications.events.implementation_status":
+    "⚡ Implementation status updated",
   "notifications.events.default": "⚡ Alert: New notifications",
   "notifications.new": "New",
 
@@ -86,6 +88,15 @@ export default {
   "subscriptions.events.grant_created": "Access has been granted",
   "subscriptions.events.grant_deleted": "Access has been revoked",
   "subscriptions.events.implementation_created": "Implementation created",
+  "subscriptions.events.implementation_status_updated":
+    "Implementation status updated",
+  "subscriptions.events.implementation_status.draft": "Draft",
+  "subscriptions.events.implementation_status.pending_approval":
+    "Pending approval",
+  "subscriptions.events.implementation_status.rejected": "Rejected",
+  "subscriptions.events.implementation_status.published": "Published",
+  "subscriptions.events.implementation_status.versioned": "Versioned",
+  "subscriptions.events.implementation_status.deprecated": "Deleted",
   "subscriptions.events.relation_created": "Relation created",
   "subscriptions.events.relation_deleted": "Relation deleted",
   "subscriptions.events.relation_deprecated": "Relation deprecated",
@@ -114,6 +125,13 @@ export default {
   "subscriptions.events.job_status_warning": "Warned job",
   "subscriptions.events.job_status_info": "Informed job",
 
+  "subscriptions.status.draft": "Draft",
+  "subscriptions.status.pending_approval": "Pending approval",
+  "subscriptions.status.rejected": "Rejected",
+  "subscriptions.status.published": "Published",
+  "subscriptions.status.versioned": "Versioned",
+  "subscriptions.status.deprecated": "Deleted",
+
   "subscriptions.actions.create": "New Subscription",
   "subscriptions.actions.edit": "Edit Subscription",
   "subscriptions.selectFilters": "Filters to subscription",

package/src/messages/es.js

@@ -10,6 +10,8 @@ export default {
     "👓 Alerta: Resultados en la ejecución de calidad",
   "notifications.events.comments": "🖋 Alerta: Comentarios añadidos",
   "notifications.events.job_status": "⚡ Alerta: Estado de job modificado",
+  "notifications.events.implementation_status":
+    "⚡ Estado de implementación modificado",
   "notifications.events.default": "⚡ Alerta: Nuevas notificaciones",
   "notifications.new": "Nueva",
 
@@ -55,6 +57,13 @@ export default {
   "subscriptions.status.job_status_warning": "Avisos en jobs",
   "subscriptions.status.job_status_info": "Jobs con información",
 
+  "subscriptions.status.draft": "Borrador",
+  "subscriptions.status.pending_approval": "Pendiente de aprobación",
+  "subscriptions.status.rejected": "Rechazada",
+  "subscriptions.status.published": "Publicada",
+  "subscriptions.status.versioned": "Versionada",
+  "subscriptions.status.deprecated": "Eliminada",
+
   "subscriptions.resource": "Recurso",
   "subscriptions.resource.type.data_structure": "Estructura",
   "subscriptions.resource.type.domain": "Dominio",
@@ -89,6 +98,15 @@ export default {
   "subscriptions.events.grant_deleted":
     "Se ha eliminado el acceso a estructuras",
   "subscriptions.events.implementation_created": "Implementación creada",
+  "subscriptions.events.implementation_status_updated":
+    "Estado de implementación actualizada",
+  "subscriptions.events.implementation_status.draft": "Borrador",
+  "subscriptions.events.implementation_status.pending_approval":
+    "Pendiente de aprobación",
+  "subscriptions.events.implementation_status.rejected": "Rechazada",
+  "subscriptions.events.implementation_status.published": "Publicada",
+  "subscriptions.events.implementation_status.versioned": "Versionada",
+  "subscriptions.events.implementation_status.deprecated": "Eliminada",
   "subscriptions.events.relation_created": "Relación creada",
   "subscriptions.events.relation_deleted": "Relación borrada",
   "subscriptions.events.relation_deprecated": "Relación archivada",

package/src/subscriptionConstants.js

@@ -49,12 +49,17 @@ export const STRUCTURE_EVENTS = [
 
 export const RULE_EVENTS = ["rule_created", "rule_result_created"];
 
+export const IMPLEMENTATION_EVENTS = [
+  "implementation_created",
+  "implementation_status_updated",
+];
+
 export const SOURCE_EVENTS = ["status_changed"];
 
 export const DOMAIN_EVENTS = [
   ...CONCEPT_EVENTS,
   ...RULE_EVENTS,
-  "implementation_created",
+  ...IMPLEMENTATION_EVENTS,
   ...STRUCTURE_EVENTS,
   "grant_created",
   "grant_deleted",
@@ -67,6 +72,7 @@ export const EVENTS_BY_TYPE = {
   domains: DOMAIN_EVENTS,
   domain: DOMAIN_EVENTS,
   rule: RULE_EVENTS,
+  implementation: IMPLEMENTATION_EVENTS,
   source: SOURCE_EVENTS,
 };
 
@@ -85,6 +91,14 @@ export const STATUSES_BY_EVENT = {
     { name: "job_status_warning", color: "orange" },
     { name: "job_status_info", color: "grey" },
   ],
+  implementation_status_updated: [
+    { name: "draft" },
+    { name: "pending_approval" },
+    { name: "rejected" },
+    { name: "published" },
+    { name: "versioned" },
+    { name: "deprecated" },
+  ],
 };
 
 export const isSubset = (first, second) =>