@truedat/dd 5.6.4 → 5.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.6.4",
+  "version": "5.6.6",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.6.4",
+    "@truedat/test": "5.6.6",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,9 +87,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.6.4",
-    "@truedat/core": "5.6.4",
-    "@truedat/df": "5.6.4",
+    "@truedat/auth": "5.6.6",
+    "@truedat/core": "5.6.6",
+    "@truedat/df": "5.6.6",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "fbecd33735354811f674678337ae16aaa15b4794"
+  "gitHead": "2f9e356d743886f505c5e2406e2dd04569ad81f7"
 }

package/src/components/StructureEventRow.js

@@ -28,7 +28,7 @@ export const StructureEventRow = ({ user, user_name, ts, payload }) => {
             text
             content={formatMessage({ id: eventMessageId(value, action) }, [
               field,
-              value
+              value,
             ])}
           />
         ))}
@@ -41,7 +41,7 @@ StructureEventRow.propTypes = {
   user: PropTypes.object,
   user_name: PropTypes.string,
   ts: PropTypes.string,
-  payload: PropTypes.array
+  payload: PropTypes.array,
 };
 
 export default StructureEventRow;

package/src/components/StructureEvents.js

@@ -18,12 +18,12 @@ export const StructureEvents = ({ events, eventsLoading }) =>
 
 StructureEvents.propTypes = {
   events: PropTypes.array.isRequired,
-  eventsLoading: PropTypes.bool
+  eventsLoading: PropTypes.bool,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   events: getParsedEvents(state),
-  eventsLoading: state.eventsLoading
+  eventsLoading: state.eventsLoading,
 });
 
 export default connect(mapStateToProps)(StructureEvents);

package/src/messages/en.js

@@ -545,6 +545,11 @@ export default {
   "structures.events.field_tag_linked": "Tag {0} linked with description {1}",
   "structures.events.field_tag_linked_without_value": "Tag {0} linked",
   "structures.events.field_tag_updated": "Tag {0} updated with value {1}",
+  "structures.events.field_note_deleted": "Note deleted",
+  "structures.events.field_note_deprecated": "Note deprecated",
+  "structures.events.field_note_draft": "Note to draft",
+  "structures.events.field_note_rejected": "Note rejected",
+  "structures.events.field_note_pending_approval": "Note pending approval",
   "structures.events.field_note_published": "Note published",
   "structures.events.field_note_published_without_value": "Note published",
   "structures.events.field_note_versioned": "Note versioned",

package/src/messages/es.js

@@ -559,6 +559,12 @@ export default {
   "structures.events.field_tag_linked_without_value": "Etiqueta {0} vinculada",
   "structures.events.field_tag_updated":
     "Etiqueta {0} actualizada con valor {1}",
+  "structures.events.field_note_deleted": "Nota borrada",
+  "structures.events.field_note_deprecated": "Nota archivada",
+  "structures.events.field_note_draft": "Nota a borrador",
+  "structures.events.field_note_rejected": "Nota rechazada",
+  "structures.events.field_note_pending_approval":
+    "Nota pendiente de aprobación",
   "structures.events.field_note_published": "Nota publicada",
   "structures.events.field_note_published_without_value": "Nota publicada",
   "structures.events.field_note_versioned": "Nota versionada",

package/src/selectors/__tests__/getParsedEvents.spec.js

@@ -61,6 +61,132 @@ describe("selectors: getParsedEvents", () => {
     service: "My invented service 6",
   };
 
+  const r7 = {
+    event: "structure_note_deleted",
+    id: 7,
+    payload: [
+      {
+        action: "note_deleted",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 7,
+    service: "My invented service 7",
+  };
+
+  const r8 = {
+    event: "structure_note_deprecated",
+    id: 8,
+    payload: [
+      {
+        action: "note_deprecated",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 8,
+    service: "My invented service 8",
+  };
+
+  const r9 = {
+    event: "structure_note_versioned",
+    id: 9,
+    payload: [
+      {
+        action: "note_versioned",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 9,
+    service: "My invented service 9",
+  };
+
+  const r10 = {
+    event: "structure_note_pending_approval",
+    id: 10,
+    payload: [
+      {
+        action: "note_pending_approval",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 10,
+    service: "My invented service 10",
+  };
+
+  const r11 = {
+    event: "structure_note_rejected",
+    id: 11,
+    payload: [
+      {
+        action: "note_rejected",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 11,
+    service: "My invented service 11",
+  };
+
+  const r12 = {
+    event: "structure_note_draft",
+    id: 12,
+    payload: [
+      {
+        action: "note_draft",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 12,
+    service: "My invented service 12",
+  };
+
+  const r13 = {
+    event: "structure_note_updated",
+    id: 13,
+    payload: [
+      {
+        action: "note_updated",
+        field: "",
+        value: "(field_1)",
+      },
+    ],
+    resource_id: 13,
+    service: "My invented service 13",
+  };
+
+  const r14 = {
+    event: "structure_note_published",
+    id: 14,
+    payload: [
+      {
+        action: "note_published",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 14,
+    service: "My invented service 14",
+  };
+
+  const r15 = {
+    event: "structure_note_updated",
+    id: 15,
+    payload: [
+      {
+        action: "note_updated",
+        field: "",
+        value: "",
+      },
+    ],
+    resource_id: 15,
+    service: "My invented service 15",
+  };
+
   const events = [
     {
       id: 1,
@@ -102,12 +228,93 @@ describe("selectors: getParsedEvents", () => {
       resource_id: 6,
       payload: { tag: "foo", description: "bar" },
     },
+    {
+      id: 7,
+      service: "My invented service 7",
+      event: "structure_note_deleted",
+      resource_id: 7,
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 8,
+      service: "My invented service 8",
+      event: "structure_note_deprecated",
+      resource_id: 8,
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 9,
+      service: "My invented service 9",
+      event: "structure_note_versioned",
+      resource_id: 9,
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 10,
+      service: "My invented service 10",
+      event: "structure_note_pending_approval",
+      resource_id: 10,
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 11,
+      service: "My invented service 11",
+      event: "structure_note_rejected",
+      resource_id: 11,
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 12,
+      service: "My invented service 12",
+      event: "structure_note_draft",
+      resource_id: 12,
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 13,
+      service: "My invented service 13",
+      event: "structure_note_updated",
+      resource_id: 13,
+      payload: { content: { added: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 14,
+      service: "My invented service 14",
+      event: "structure_note_published",
+      resource_id: 14,
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
+    },
+    {
+      id: 15,
+      service: "My invented service 15",
+      event: "structure_note_updated",
+      resource_id: 15,
+      payload: {},
+    },
   ];
 
   it("should return all the events with the new payload", () => {
     const res = getParsedEvents({ events, templates, structure });
-    expect(res).toHaveLength(6);
-    expect(res).toEqual(expect.arrayContaining([r1, r2, r3, r4, r5, r6]));
+    expect(res).toHaveLength(15);
+    expect(res).toEqual(
+      expect.arrayContaining([
+        r1,
+        r2,
+        r3,
+        r4,
+        r5,
+        r6,
+        r7,
+        r8,
+        r9,
+        r10,
+        r11,
+        r12,
+        r13,
+        r14,
+        r15,
+      ])
+    );
   });
 
   it("should return empty array when we have no elements", () => {

package/src/selectors/getParsedEvents.js

@@ -12,7 +12,11 @@ const transformFieldFormat = (field) =>
   _.isBoolean(field) ? _.toString(field) : field;
 
 const transformNotesPayloadFormat = (payload) => {
-  const addedFields = payload.content.added;
+  if (_.isEmpty(payload.content)) return "";
+
+  const addedFields = payload.content.added
+    ? payload.content.added
+    : payload.content.changed;
 
   const fieldsArray = Object.keys(addedFields).reduce((acc, field) => {
     if (!_.isEmpty(addedFields[field])) acc.push(field);
@@ -165,6 +169,28 @@ const getParsedEvents = createSelector(
               },
             ],
           };
+        case "structure_note_deleted":
+          return {
+            ...d,
+            payload: [
+              {
+                field: "",
+                action: "note_deleted",
+                value: "",
+              },
+            ],
+          };
+        case "structure_note_deprecated":
+          return {
+            ...d,
+            payload: [
+              {
+                field: "",
+                action: "note_deprecated",
+                value: "",
+              },
+            ],
+          };
         case "structure_note_versioned":
           return {
             ...d,
@@ -176,6 +202,39 @@ const getParsedEvents = createSelector(
               },
             ],
           };
+        case "structure_note_pending_approval":
+          return {
+            ...d,
+            payload: [
+              {
+                field: "",
+                action: "note_pending_approval",
+                value: "",
+              },
+            ],
+          };
+        case "structure_note_rejected":
+          return {
+            ...d,
+            payload: [
+              {
+                field: "",
+                action: "note_rejected",
+                value: "",
+              },
+            ],
+          };
+        case "structure_note_draft":
+          return {
+            ...d,
+            payload: [
+              {
+                field: "",
+                action: "note_draft",
+                value: "",
+              },
+            ],
+          };
         case "structure_note_updated":
           return {
             ...d,