npm - @truedat/dd - Versions diffs - 6.6.6 → 6.7.0 - Mend

@truedat/dd 6.6.6 → 6.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.6.6",
+  "version": "6.7.0",
   "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": "6.6.6",
+    "@truedat/test": "6.7.0",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "6.6.6",
-    "@truedat/core": "6.6.6",
-    "@truedat/df": "6.6.6",
+    "@truedat/auth": "6.7.0",
+    "@truedat/core": "6.7.0",
+    "@truedat/df": "6.7.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "87a359e52cc9df990110f9dcbb39a2f3d6b6eb80"
+  "gitHead": "6a4284b126a917e396160f1b36c03ca0faf6bac5"
 }

package/src/components/Grant.js CHANGED Viewed

@@ -233,7 +233,7 @@ export const Grant = ({ grant, actions, loading, onStatusChange }) => {
                               <DynamicFieldValue
                                 key={i}
                                 label={field}
-                                value={value}
+                                value={{ value, origin: "user" }}
                               />
                             )
                           )}

package/src/components/SystemCards.js CHANGED Viewed

@@ -13,11 +13,15 @@ import { linkTo } from "@truedat/core/routes";
 export const SystemCards = ({ systems, structureTypes }) => {
   const groups = _.flow(
     _.map((system) =>
-      !system.df_content?.system_group
-        ? _.set("df_content.system_group", "default", system)
+      !system.df_content?.system_group?.value
+        ? _.set(
+            "df_content.system_group",
+            { value: "default", origin: "default" },
+            system
+          )
         : system
     ),
-    _.groupBy("df_content.system_group")
+    _.groupBy("df_content.system_group.value")
   )(systems);
   return Object.keys(groups).length > 1 ? (
@@ -60,9 +64,12 @@ export const SystemCard = ({
             structureTypes={structureTypes}
           />
         )}
-        {!_.isEmpty(_.get("logo")(df_content)) &&
-          _.startsWith("data:image")(_.get("logo")(df_content)) && (
-            <Image src={_.get("logo")(df_content)} className="system-image" />
+        {!_.isEmpty(_.get("logo.value")(df_content)) &&
+          _.startsWith("data:image")(_.get("logo.value")(df_content)) && (
+            <Image
+              src={_.get("logo.value")(df_content)}
+              className="system-image"
+            />
           )}
       </Card.Content>
     </Card>

package/src/components/__tests__/GrantRequest.spec.js CHANGED Viewed

@@ -1,7 +1,6 @@
 import React, { Suspense } from "react";
 import { render } from "@truedat/test/render";
 import { GrantRequest } from "../GrantRequest";
-import en from "../../messages/en";
 describe("<GrantRequest />", () => {
   const grantRequest = {
@@ -23,7 +22,7 @@ describe("<GrantRequest />", () => {
     },
     inserted_at: "2021-10-04T07:25:01.041463Z",
     updated_at: "2021-10-04T07:25:01.044005Z",
-    metadata: { bar: "baz" },
+    metadata: { bar: { value: "baz", origin: "user" } },
     status: "pending",
     _embedded: {
       data_structure: { id: 1, name: "baz", path: [{ name: "foo" }] },
@@ -40,7 +39,7 @@ describe("<GrantRequest />", () => {
         fields: [
           {
             cardinality: "?",
-            default: "",
+            default: { value: "", origin: "default" },
             label: "bar",
             name: "bar",
             values: null,
@@ -110,7 +109,7 @@ describe("<GrantRequest />", () => {
       filters: {},
       inserted_at: "2021-10-04T07:25:01.041463Z",
       updated_at: "2021-10-04T07:25:01.044005Z",
-      metadata: { bar: "baz" },
+      metadata: { bar: { value: "baz", origin: "user" } },
       status: "failed",
       status_reason: "there is always a reason",
       _embedded: {

package/src/components/__tests__/StructureNotes.spec.js CHANGED Viewed

@@ -17,7 +17,7 @@ describe("<StructureNotes />", () => {
         {
           id: 2,
           status: "published",
-          df_content: { foo: "bar" },
+          df_content: { foo: { value: "bar", origin: "user" } },
           version: "2",
         },
       ],
@@ -25,7 +25,7 @@ describe("<StructureNotes />", () => {
         {
           id: 1,
           status: "versioned",
-          df_content: { foo: "bar1" },
+          df_content: { foo: { value: "bar1", origin: "user" } },
           version: "1",
         },
       ],
@@ -51,19 +51,22 @@ describe("<StructureNotes />", () => {
   it("matches the latest snapshot with draft structure note", async () => {
     const props = {
       structure: { id: 1 },
-      structureNotes: { _actions: { foo: "bar" }, loading: false },
+      structureNotes: {
+        _actions: { foo: { value: "bar", origin: "user" } },
+        loading: false,
+      },
       activeStructureNotes: [
         {
           id: 3,
           status: "draft",
-          df_content: { foo: "xyz" },
+          df_content: { foo: { value: "xyz", origin: "user" } },
           version: "3",
           _diff: ["foo"],
         },
         {
           id: 2,
           status: "published",
-          df_content: { foo: "bar" },
+          df_content: { foo: { value: "bar", origin: "user" } },
           version: "2",
         },
       ],
@@ -71,7 +74,7 @@ describe("<StructureNotes />", () => {
         {
           id: 1,
           status: "versioned",
-          df_content: { foo: "bar1" },
+          df_content: { foo: { value: "bar1", origin: "user" } },
           version: "1",
         },
       ],
@@ -82,7 +85,7 @@ describe("<StructureNotes />", () => {
             fields: [
               {
                 cardinality: "?",
-                default: "",
+                default: { value: "", origin: "default" },
                 label: "foo",
                 name: "foo",
                 type: "string",

package/src/components/__tests__/StructureNotesEdit.spec.js CHANGED Viewed

@@ -16,7 +16,7 @@ describe("<StructureNotesEdit />", () => {
       structureNotes: {
         structureNotes: [],
       },
-      latestDfContent: { foo: "bar" },
+      latestDfContent: { foo: { value: "bar", origin: "user" } },
       applyTemplate: applyTemplate({ id: 2 }),
       selectDomains: jest.fn(),
     };
@@ -41,7 +41,7 @@ describe("<StructureNotesEdit />", () => {
         },
         structureNotes: [],
       },
-      latestDfContent: { foo: "bar" },
+      latestDfContent: { foo: { value: "bar", origin: "user" } },
       applyTemplate: applyTemplate({ id: 2 }),
       selectDomains: jest.fn(),
     };
@@ -89,7 +89,7 @@ describe("<StructureNotesEdit />", () => {
       structureNotes: {
         structureNotes: [],
       },
-      latestDfContent: { foo: "bar" },
+      latestDfContent: { foo: { value: "bar", origin: "user" } },
       applyTemplate: applyTemplate(template),
       selectDomains: jest.fn(),
     };
@@ -108,7 +108,7 @@ describe("<StructureNotesEdit />", () => {
     expect(doStructureNoteAction).toHaveBeenCalledWith(
       expect.objectContaining({
         action: {
-          input: { df_content: { foo: "bar" } },
+          input: { df_content: { foo: { value: "bar", origin: "user" } } },
         },
         dataStructureId: 1,
         redirect: true,

package/src/components/__tests__/StructuresBulkUpdate.spec.js CHANGED Viewed

@@ -89,7 +89,7 @@ describe("<StructuresBulkUpdate />", () => {
         structureCount: 10,
         update_attributes: {
           df_content: {
-            field1: "bar",
+            field1: { value: "bar", origin: "user" },
           },
         },
       },
@@ -126,7 +126,7 @@ describe("<StructuresBulkUpdate />", () => {
         structureCount: 10,
         update_attributes: {
           df_content: {
-            field1: "bar",
+            field1: { value: "bar", origin: "user" },
           },
         },
       },

package/src/components/__tests__/SystemCards.spec.js CHANGED Viewed

@@ -43,7 +43,7 @@ describe("<SystemCards />", () => {
       {
         ...system_with_structures,
         df_content: {
-          system_group: "foo-group",
+          system_group: { value: "foo-group", origin: "user" },
         },
       },
       { ...system_without_structures },
@@ -78,7 +78,7 @@ describe("<SystemCards />", () => {
       {
         ...system_with_structures,
         df_content: {
-          logo: imageSrc,
+          logo: { value: imageSrc, origin: "user" },
         },
       },
       { ...system_without_structures },
@@ -108,13 +108,13 @@ describe("<SystemCards />", () => {
       {
         ...system_with_structures,
         df_content: {
-          system_group: "foo-group",
+          system_group: { value: "foo-group", origin: "user" },
         },
       },
       {
         ...system_without_structures,
         df_content: {
-          system_group: "foo-group",
+          system_group: { value: "foo-group", origin: "user" },
         },
       },
     ];
@@ -134,13 +134,13 @@ describe("<SystemCards />", () => {
       {
         ...system_with_structures,
         df_content: {
-          system_group: "foo-group",
+          system_group: { value: "foo-group", origin: "user" },
         },
       },
       {
         ...system_without_structures,
         df_content: {
-          system_group: "",
+          system_group: { value: "", origin: "user" },
         },
       },
     ];

package/src/reducers/__tests__/grantRequests.spec.js CHANGED Viewed

@@ -12,7 +12,7 @@ const data = [
   {
     user_id: 2,
     filters: { foo: "bar" },
-    metadata: { xyz: "baz" },
+    metadata: { xyz: { value: "baz", origin: "user" } },
     data_structure_id: 4570467,
   },
 ];

package/src/selectors/__tests__/getSortedStructureNotes.spec.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import {
   getActiveStructureNotes,
   getVersionedStructureNotes,
-  getLatestDfContent
+  getLatestDfContent,
 } from "..";
 const sn1 = {
@@ -9,28 +9,37 @@ const sn1 = {
   data_structure_id: 1,
   version: 1,
   status: "versioned",
-  df_content: { c1: 1, c2: 2 }
+  df_content: {
+    c1: { value: 1, origin: "user" },
+    c2: { value: 2, origin: "user" },
+  },
 };
 const sn2 = {
   id: 2,
   data_structure_id: 1,
   version: 2,
   status: "published",
-  df_content: { c1: 2, c2: 4 }
+  df_content: {
+    c1: { value: 2, origin: "user" },
+    c2: { value: 4, origin: "user" },
+  },
 };
 const sn3 = {
   id: 3,
   data_structure_id: 1,
   version: 3,
   status: "draft",
-  df_content: { c1: 3, c2: 6 }
+  df_content: {
+    c1: { value: 3, origin: "user" },
+    c2: { value: 6, origin: "user" },
+  },
 };
 describe("selectors: getSortedStructureNotes", () => {
   const state = {
     structureNotes: {
-      structureNotes: [sn1, sn2, sn3]
-    }
+      structureNotes: [sn1, sn2, sn3],
+    },
   };
   const activeStructureNotes = [sn3, sn2];