@truedat/dd 6.7.1 → 6.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.7.1",
+  "version": "6.8.2",
   "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.7.1",
+    "@truedat/test": "6.8.2",
     "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.7.1",
-    "@truedat/core": "6.7.1",
-    "@truedat/df": "6.7.1",
+    "@truedat/auth": "6.8.2",
+    "@truedat/core": "6.8.2",
+    "@truedat/df": "6.8.2",
     "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": "58ccce26894edb2d7b703c8cf22d62a8d993858c"
+  "gitHead": "be2060255c20fe0ae577185fcc990a07a3644106"
 }

package/src/components/GrantRequest.js

@@ -21,7 +21,7 @@ const ConditionSummary = React.lazy(() =>
 
 export const GrantRequest = ({ grantRequest, template }) => {
   const { formatMessage } = useIntl();
-  const metadata = grantRequest?.metadata;
+  const dynamic_content = grantRequest?.dynamic_content;
   const data_structure = grantRequest?._embedded?.data_structure;
   const path = _.flow(
     _.map("name"),
@@ -101,8 +101,11 @@ export const GrantRequest = ({ grantRequest, template }) => {
                 </List.Description>
               </List.Item>
             </List>
-            {metadata && template && (
-              <DynamicFormViewer template={template} content={metadata} />
+            {dynamic_content && template && (
+              <DynamicFormViewer
+                template={template}
+                content={dynamic_content}
+              />
             )}
           </Segment>
         </Grid.Column>

package/src/components/StructureNotes.js

@@ -76,7 +76,7 @@ const StructureNote = ({ structureNote, template, structure, notesSize }) => {
       {!collapsed && (
         <DynamicFormViewer
           template={template}
-          content={structureNote.df_content}
+          content={structureNote.dynamic_content}
           diff={structureNote._diff}
         />
       )}

package/src/components/SystemCards.js

@@ -13,31 +13,33 @@ import { linkTo } from "@truedat/core/routes";
 export const SystemCards = ({ systems, structureTypes }) => {
   const groups = _.flow(
     _.map((system) =>
-      !system.df_content?.system_group?.value
+      !system.dynamic_content?.system_group?.value
         ? _.set(
-            "df_content.system_group",
+            "dynamic_content.system_group",
             { value: "default", origin: "default" },
             system
           )
         : system
     ),
-    _.groupBy("df_content.system_group.value")
+    _.groupBy("dynamic_content.system_group.value")
   )(systems);
 
   return Object.keys(groups).length > 1 ? (
     <CardGroupsAccordion groups={groups} cardComponent={SystemCard} />
   ) : (
     <Card.Group className="structures">
-      {_.map(({ id, name, structures_count: structures_count, df_content }) => (
-        <SystemCard
-          key={id}
-          id={id}
-          name={name}
-          structures_count={structures_count}
-          df_content={df_content}
-          structureTypes={structureTypes}
-        />
-      ))(systems)}
+      {_.map(
+        ({ id, name, structures_count: structures_count, dynamic_content }) => (
+          <SystemCard
+            key={id}
+            id={id}
+            name={name}
+            structures_count={structures_count}
+            dynamic_content={dynamic_content}
+            structureTypes={structureTypes}
+          />
+        )
+      )(systems)}
     </Card.Group>
   );
 };
@@ -51,7 +53,7 @@ export const SystemCard = ({
   id,
   name,
   structures_count,
-  df_content,
+  dynamic_content,
   structureTypes,
 }) => {
   return (
@@ -64,10 +66,10 @@ export const SystemCard = ({
             structureTypes={structureTypes}
           />
         )}
-        {!_.isEmpty(_.get("logo.value")(df_content)) &&
-          _.startsWith("data:image")(_.get("logo.value")(df_content)) && (
+        {!_.isEmpty(_.get("logo.value")(dynamic_content)) &&
+          _.startsWith("data:image")(_.get("logo.value")(dynamic_content)) && (
             <Image
-              src={_.get("logo.value")(df_content)}
+              src={_.get("logo.value")(dynamic_content)}
               className="system-image"
             />
           )}
@@ -80,7 +82,7 @@ SystemCard.propTypes = {
   id: PropTypes.number,
   name: PropTypes.string,
   structures_count: PropTypes.object,
-  df_content: PropTypes.object,
+  dynamic_content: PropTypes.object,
   structureTypes: PropTypes.array,
 };
 

package/src/components/SystemView.js

@@ -11,7 +11,7 @@ const DynamicFormViewer = React.lazy(() =>
 );
 
 export const SystemView = ({ system, systemTemplate }) => {
-  const { name, external_id, df_content } = system || {};
+  const { name, external_id, dynamic_content } = system || {};
   const SystemHeader = () => (
     <Header as="h2">
       <Header.Content>
@@ -24,7 +24,7 @@ export const SystemView = ({ system, systemTemplate }) => {
     <div
       style={{
         textAlign: "center",
-        paddingBottom: "100px"
+        paddingBottom: "100px",
       }}
     >
       <Image className="search" src={searchImage} />
@@ -38,11 +38,14 @@ export const SystemView = ({ system, systemTemplate }) => {
     <Segment>
       <SystemEditButton system={system} />
       <SystemHeader />
-      {_.isEmpty(df_content || {}) ? (
+      {_.isEmpty(dynamic_content || {}) ? (
         <EmptyImage />
       ) : (
         systemTemplate && (
-          <DynamicFormViewer template={systemTemplate} content={df_content} />
+          <DynamicFormViewer
+            template={systemTemplate}
+            content={dynamic_content}
+          />
         )
       )}
     </Segment>

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

@@ -22,7 +22,7 @@ describe("<GrantRequest />", () => {
     },
     inserted_at: "2021-10-04T07:25:01.041463Z",
     updated_at: "2021-10-04T07:25:01.044005Z",
-    metadata: { bar: { value: "baz", origin: "user" } },
+    dynamic_content: { bar: { value: "baz", origin: "user" } },
     status: "pending",
     _embedded: {
       data_structure: { id: 1, name: "baz", path: [{ name: "foo" }] },
@@ -109,7 +109,7 @@ describe("<GrantRequest />", () => {
       filters: {},
       inserted_at: "2021-10-04T07:25:01.041463Z",
       updated_at: "2021-10-04T07:25:01.044005Z",
-      metadata: { bar: { value: "baz", origin: "user" } },
+      dynamic_content: { bar: { value: "baz", origin: "user" } },
       status: "failed",
       status_reason: "there is always a reason",
       _embedded: {

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

@@ -42,7 +42,7 @@ describe("<SystemCards />", () => {
     const systems = [
       {
         ...system_with_structures,
-        df_content: {
+        dynamic_content: {
           system_group: { value: "foo-group", origin: "user" },
         },
       },
@@ -77,7 +77,7 @@ describe("<SystemCards />", () => {
     const systems = [
       {
         ...system_with_structures,
-        df_content: {
+        dynamic_content: {
           logo: { value: imageSrc, origin: "user" },
         },
       },
@@ -107,13 +107,13 @@ describe("<SystemCards />", () => {
     const systems = [
       {
         ...system_with_structures,
-        df_content: {
+        dynamic_content: {
           system_group: { value: "foo-group", origin: "user" },
         },
       },
       {
         ...system_without_structures,
-        df_content: {
+        dynamic_content: {
           system_group: { value: "foo-group", origin: "user" },
         },
       },
@@ -133,13 +133,13 @@ describe("<SystemCards />", () => {
     const systems = [
       {
         ...system_with_structures,
-        df_content: {
+        dynamic_content: {
           system_group: { value: "foo-group", origin: "user" },
         },
       },
       {
         ...system_without_structures,
-        df_content: {
+        dynamic_content: {
           system_group: { value: "", origin: "user" },
         },
       },

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

@@ -9,7 +9,7 @@ const sn1 = {
   data_structure_id: 1,
   version: 1,
   status: "versioned",
-  df_content: {
+  dynamic_content: {
     c1: { value: 1, origin: "user" },
     c2: { value: 2, origin: "user" },
   },
@@ -19,7 +19,7 @@ const sn2 = {
   data_structure_id: 1,
   version: 2,
   status: "published",
-  df_content: {
+  dynamic_content: {
     c1: { value: 2, origin: "user" },
     c2: { value: 4, origin: "user" },
   },
@@ -29,7 +29,7 @@ const sn3 = {
   data_structure_id: 1,
   version: 3,
   status: "draft",
-  df_content: {
+  dynamic_content: {
     c1: { value: 3, origin: "user" },
     c2: { value: 6, origin: "user" },
   },
@@ -44,7 +44,7 @@ describe("selectors: getSortedStructureNotes", () => {
 
   const activeStructureNotes = [sn3, sn2];
   const versionedStructureNotes = [sn1];
-  const latestDfContent = sn3.df_content;
+  const latestDfContent = sn3.dynamic_content;
 
   it("getActiveStructureNotes", () => {
     expect(getActiveStructureNotes(state)).toEqual(activeStructureNotes);

package/src/selectors/getSortedStructureNotes.js

@@ -15,5 +15,9 @@ export const getVersionedStructureNotes = createSelector(
 
 export const getLatestDfContent = createSelector(
   _.prop("structureNotes.structureNotes"),
-  _.flow(_.orderBy(["version"], ["desc"]), _.head, _.getOr({}, "df_content"))
+  _.flow(
+    _.orderBy(["version"], ["desc"]),
+    _.head,
+    _.getOr({}, "dynamic_content")
+  )
 );