@truedat/dd 7.13.4 → 7.13.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.13.4",
+  "version": "7.13.5",
   "description": "Truedat Web Data Dictionary",
   "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": "7.13.4",
+    "@truedat/test": "7.13.5",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -83,5 +83,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "6040831e5a3ad34db35c7233cb3b630a1ad81c4e"
+  "gitHead": "a82fdfd07c75632206f6639dd7c3b3072a3a9379"
 }

package/src/components/StructureCrumbs.js

@@ -169,11 +169,11 @@ const mapStateToProps = ({
   structure,
   structureAncestry: ancestry,
   structureVersion: version,
-  structureSystem: system,
+  structureSystem,
 }) => ({
   ...structure,
   ancestry,
-  system,
+  system: structureSystem || structure?.system,
   version,
 });
 

package/src/components/StructureSummary.js

@@ -5,7 +5,6 @@ import Moment from "react-moment";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import ShareLinkPopup from "@truedat/audit/components/ShareLinkPopup";
-import { getStructureUpdatedAt } from "../selectors";
 import StructureProperties from "./StructureProperties";
 import StructureConfidentialButton from "./StructureConfidentialButton";
 import StructureDeleteButton from "./StructureDeleteButton";
@@ -35,7 +34,7 @@ Date.propTypes = {
   label: PropTypes.string,
 };
 
-const dateProperties = (deleted_at, updatedAt) =>
+const dateProperties = (deleted_at, updated_at) =>
   deleted_at
     ? {
         label: "deleted_at",
@@ -47,7 +46,7 @@ const dateProperties = (deleted_at, updatedAt) =>
         label: "updated_at",
         className: "basic",
         icon: <Icon name="sync alternate" />,
-        date: updatedAt,
+        date: updated_at,
       };
 
 export const StructureSummary = ({
@@ -58,14 +57,14 @@ export const StructureSummary = ({
   alias,
   description,
   userPermissions,
-  updatedAt,
+  updated_at,
   deleted_at,
   isAdmin,
 }) => {
   const { formatMessage } = useIntl();
   const shareUrl = window.location.href;
   const shareTitle = formatMessage({ id: "structure.share.title" });
- 
+
   return (
     <>
       <Grid>
@@ -81,8 +80,8 @@ export const StructureSummary = ({
             </Header>
           </Grid.Column>
           <Grid.Column width={6} textAlign="right">
-            {(deleted_at || updatedAt) && (
-              <Date {...dateProperties(deleted_at, updatedAt)} />
+            {(deleted_at || updated_at) && (
+              <Date {...dateProperties(deleted_at, updated_at)} />
             )}
             <Divider hidden fitted />
             {structureClasses?._grantable ? (
@@ -122,14 +121,13 @@ StructureSummary.propTypes = {
   alias: PropTypes.string,
   description: PropTypes.string,
   userPermissions: PropTypes.object,
-  updatedAt: PropTypes.string,
+  updated_at: PropTypes.string,
   deleted_at: PropTypes.string,
   isAdmin: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({
   userPermissions: state.userPermissions,
-  updatedAt: getStructureUpdatedAt(state),
   ...state.structure,
   isAdmin: state.authentication.role === "admin",
 });

package/src/components/StructureTabs.js

@@ -24,11 +24,16 @@ const versionsLink = ({ id }, version) =>
 export const StructureTabs = ({ path }) => {
   const { formatMessage } = useIntl();
   const customTabs = useStructureCustomTabs();
-  const version = useSelector(state => state.structureVersion);
-  const structure = useSelector(state => state.structure);
-  const structureTabsOrder = useSelector(state => state.structureTabsOrder);
+  const version = useSelector((state) => state.structureVersion);
+  const structure = useSelector((state) => state.structure);
+  const structureTabsOrder = useSelector((state) => state.structureTabsOrder);
   const tabVisibility = useSelector(getTabVisibility);
-  const activeTab = getActiveTab({ tabVisibility, path, structureTabsOrder, customTabs });
+  const activeTab = getActiveTab({
+    tabVisibility,
+    path,
+    structureTabsOrder,
+    customTabs,
+  });
 
   const customTabsItems = _.map((tab) => ({
     active: activeTab === tab.name,
@@ -40,132 +45,160 @@ export const StructureTabs = ({ path }) => {
 
   const items = !_.isEmpty(structure)
     ? _.filter("content")([
-      {
-        active: activeTab === "fields",
-        as: Link,
-        to: structureFields(structure, version),
-        content: tabVisibility?.fields ? formatMessage({ id: "tabs.dd.fields" }) : false,
-        key: "fields",
-      },
-      {
-        active: activeTab === "children",
-        as: Link,
-        to: linkTo.STRUCTURE_CHILDREN(structure),
-        content: tabVisibility?.children ? formatMessage({ id: "tabs.dd.children" }) : false,
-        key: "children",
-      },
-      {
-        active: activeTab === "notes",
-        as: Link,
-        to: linkTo.STRUCTURE_NOTES(structure),
-        content: tabVisibility?.notes ? formatMessage({ id: "tabs.dd.notes" }) : false,
-        key: "notes",
-      },
-      {
-        active: activeTab === "parents",
-        as: Link,
-        to: linkTo.STRUCTURE_PARENTS(structure),
-        content: tabVisibility?.parents ? formatMessage({ id: "tabs.dd.parents" }) : false,
-        key: "parents",
-      },
-      {
-        active: activeTab === "grants",
-        as: Link,
-        to: linkTo.STRUCTURE_GRANTS(structure),
-        content: tabVisibility?.grants ? formatMessage({ id: "tabs.dd.grants" }) : false,
-        key: "grants",
-      },
-      {
-        active: activeTab === "metadata",
-        as: Link,
-        to: linkTo.STRUCTURE_METADATA(structure),
-        content: tabVisibility?.metadata ? formatMessage({ id: "tabs.dd.metadata" }) : false,
-        key: "metadata",
-      },
-      {
-        active: activeTab === "profile",
-        as: Link,
-        to: linkTo.STRUCTURE_PROFILE(structure),
-        content: tabVisibility?.profile ? formatMessage({ id: "tabs.dd.profile" }) : false,
-        key: "profile",
-      },
-      {
-        active: activeTab === "rules",
-        as: Link,
-        to: linkTo.STRUCTURE_RULES(structure),
-        content: tabVisibility?.rules ? formatMessage({ id: "tabs.dd.rules" }) : false,
-        key: "rules",
-      },
-      {
-        active: activeTab === "links",
-        as: Link,
-        to: linkTo.STRUCTURE_LINKS(structure),
-        content: tabVisibility?.links ? formatMessage({ id: "tabs.dd.links" }) : false,
-        key: "links",
-      },
-      {
-        active: activeTab === "structureLinks",
-        as: Link,
-        to: linkTo.STRUCTURE_STRUCTURE_LINKS(structure),
-        content: tabVisibility?.structureLinks
-          ? formatMessage({ id: "tabs.dd.structureLinks" })
-          : false,
-        key: "structureLinks",
-      },
-      {
-        active: activeTab === "lineage",
-        as: Link,
-        to: linkTo.STRUCTURE_LINEAGE(structure),
-        content: tabVisibility?.lineage ? formatMessage({ id: "tabs.dd.lineage" }) : false,
-        key: "lineage",
-      },
-      {
-        active: activeTab === "impact",
-        as: Link,
-        to: linkTo.STRUCTURE_IMPACT(structure),
-        content: tabVisibility?.impact ? formatMessage({ id: "tabs.dd.impact" }) : false,
-        key: "impact",
-      },
-      {
-        active: activeTab === "versions",
-        as: Link,
-        to: versionsLink(structure, version),
-        content: tabVisibility?.versions ? formatMessage({ id: "tabs.dd.versions" }) : false,
-        key: "versions",
-      },
-      {
-        active: activeTab === "events",
-        as: Link,
-        to: linkTo.STRUCTURE_EVENTS(structure),
-        content: tabVisibility?.events ? formatMessage({ id: "tabs.dd.audit" }) : false,
-        key: "events",
-      },
-      {
-        active: activeTab === "roles",
-        as: Link,
-        to: linkTo.STRUCTURE_MEMBERS(structure),
-        content: tabVisibility?.roles ? formatMessage({ id: "tabs.dd.roles" }) : false,
-        key: "roles",
-      },
-      ...customTabsItems,
-    ])
+        {
+          active: activeTab === "fields",
+          as: Link,
+          to: structureFields(structure, version),
+          content: tabVisibility?.fields
+            ? formatMessage({ id: "tabs.dd.fields" })
+            : false,
+          key: "fields",
+        },
+        {
+          active: activeTab === "children",
+          as: Link,
+          to: linkTo.STRUCTURE_CHILDREN(structure),
+          content: tabVisibility?.children
+            ? formatMessage({ id: "tabs.dd.children" })
+            : false,
+          key: "children",
+        },
+        {
+          active: activeTab === "notes",
+          as: Link,
+          to: linkTo.STRUCTURE_NOTES(structure),
+          content: tabVisibility?.notes
+            ? formatMessage({ id: "tabs.dd.notes" })
+            : false,
+          key: "notes",
+        },
+        {
+          active: activeTab === "parents",
+          as: Link,
+          to: linkTo.STRUCTURE_PARENTS(structure),
+          content: tabVisibility?.parents
+            ? formatMessage({ id: "tabs.dd.parents" })
+            : false,
+          key: "parents",
+        },
+        {
+          active: activeTab === "grants",
+          as: Link,
+          to: linkTo.STRUCTURE_GRANTS(structure),
+          content: tabVisibility?.grants
+            ? formatMessage({ id: "tabs.dd.grants" })
+            : false,
+          key: "grants",
+        },
+        {
+          active: activeTab === "metadata",
+          as: Link,
+          to: linkTo.STRUCTURE_METADATA(structure),
+          content: tabVisibility?.metadata
+            ? formatMessage({ id: "tabs.dd.metadata" })
+            : false,
+          key: "metadata",
+        },
+        {
+          active: activeTab === "profile",
+          as: Link,
+          to: linkTo.STRUCTURE_PROFILE(structure),
+          content: tabVisibility?.profile
+            ? formatMessage({ id: "tabs.dd.profile" })
+            : false,
+          key: "profile",
+        },
+        {
+          active: activeTab === "rules",
+          as: Link,
+          to: linkTo.STRUCTURE_RULES(structure),
+          content: tabVisibility?.rules
+            ? formatMessage({ id: "tabs.dd.rules" })
+            : false,
+          key: "rules",
+        },
+        {
+          active: activeTab === "links",
+          as: Link,
+          to: linkTo.STRUCTURE_LINKS(structure),
+          content: tabVisibility?.links
+            ? formatMessage({ id: "tabs.dd.links" })
+            : false,
+          key: "links",
+        },
+        {
+          active: activeTab === "structureLinks",
+          as: Link,
+          to: linkTo.STRUCTURE_STRUCTURE_LINKS(structure),
+          content: tabVisibility?.structureLinks
+            ? formatMessage({ id: "tabs.dd.structureLinks" })
+            : false,
+          key: "structureLinks",
+        },
+        {
+          active: activeTab === "lineage",
+          as: Link,
+          to: linkTo.STRUCTURE_LINEAGE(structure),
+          content: tabVisibility?.lineage
+            ? formatMessage({ id: "tabs.dd.lineage" })
+            : false,
+          key: "lineage",
+        },
+        {
+          active: activeTab === "impact",
+          as: Link,
+          to: linkTo.STRUCTURE_IMPACT(structure),
+          content: tabVisibility?.impact
+            ? formatMessage({ id: "tabs.dd.impact" })
+            : false,
+          key: "impact",
+        },
+        {
+          active: activeTab === "versions",
+          as: Link,
+          to: versionsLink(structure, version),
+          content: tabVisibility?.versions
+            ? formatMessage({ id: "tabs.dd.versions" })
+            : false,
+          key: "versions",
+        },
+        {
+          active: activeTab === "events",
+          as: Link,
+          to: linkTo.STRUCTURE_EVENTS(structure),
+          content: tabVisibility?.events
+            ? formatMessage({ id: "tabs.dd.audit" })
+            : false,
+          key: "events",
+        },
+        {
+          active: activeTab === "roles",
+          as: Link,
+          to: linkTo.STRUCTURE_MEMBERS(structure),
+          content: tabVisibility?.roles
+            ? formatMessage({ id: "tabs.dd.roles" })
+            : false,
+          key: "roles",
+        },
+        ...customTabsItems,
+      ])
     : null;
 
   structureTabsOrder
     ? items.sort((a, b) => {
-      const aIndex = _.indexOf(a.key)(structureTabsOrder);
-      const bIndex = _.indexOf(b.key)(structureTabsOrder);
-      if (aIndex !== -1 && bIndex !== -1) {
-        return aIndex - bIndex;
-      }
-      if (aIndex !== -1) {
-        return -1;
-      }
-      if (bIndex !== -1) {
-        return 1;
-      }
-      return 0;
-    })
+        const aIndex = _.indexOf(a.key)(structureTabsOrder);
+        const bIndex = _.indexOf(b.key)(structureTabsOrder);
+        if (aIndex !== -1 && bIndex !== -1) {
+          return aIndex - bIndex;
+        }
+        if (aIndex !== -1) {
+          return -1;
+        }
+        if (bIndex !== -1) {
+          return 1;
+        }
+        return 0;
+      })
     : items;
 
   return (
@@ -183,6 +216,6 @@ export const StructureTabs = ({ path }) => {
   );
 };
 
-StructureTabs.propTypes = { path: PropTypes.string, };
+StructureTabs.propTypes = { path: PropTypes.string };
 
 export default StructureTabs;

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

@@ -28,6 +28,7 @@ describe("<StructureSummary />", () => {
     classes: {
       _grantable: true,
     },
+    updated_at: "2019-01-02T03:04:05Z",
   };
 
   const renderOpts = {

package/src/reducers/__tests__/structureRelations.spec.js

@@ -1,4 +1,4 @@
-import { clearStructure, fetchStructureChildrens, fetchStructureParents } from "../../routines";
+import { clearStructure, fetchStructure } from "../../routines";
 import { childrenRelations, parentRelations } from "..";
 
 const fooState = { foo: "bar" };
@@ -6,36 +6,36 @@ const fooState = { foo: "bar" };
 const relation_type = {
   description: "relation type 1",
   id: 1,
-  name: "used_by"
+  name: "used_by",
 };
 const children = [
   {
     id: 1,
     relation_type,
-    structure: { id: 1, name: "Structure 1", type: "Some Type 1" }
+    structure: { id: 1, name: "Structure 1", type: "Some Type 1" },
   },
   {
     id: 2,
     relation_type,
-    structure: { id: 1, name: "Structure 2", type: "Some Type 2" }
-  }
+    structure: { id: 1, name: "Structure 2", type: "Some Type 2" },
+  },
 ];
 
 const parents = [
   {
     id: 1,
     relation_type,
-    structure: { id: 1, name: "Structure 3", type: "Some Type 3" }
+    structure: { id: 1, name: "Structure 3", type: "Some Type 3" },
   },
   {
     id: 2,
     relation_type,
-    structure: { id: 1, name: "Structure 4", type: "Some Type 4" }
-  }
+    structure: { id: 1, name: "Structure 4", type: "Some Type 4" },
+  },
 ];
 
 const data = {
-  relations: { children, parents }
+  relations: { children, parents },
 };
 
 describe("reducers: childrenRelations", () => {
@@ -48,8 +48,8 @@ describe("reducers: childrenRelations", () => {
   it("should handle the fetchStructures.SUCCESS action", () => {
     expect(
       childrenRelations(fooState, {
-        type: fetchStructureChildrens.SUCCESS,
-        payload: { data }
+        type: fetchStructure.SUCCESS,
+        payload: { data },
       })
     ).toMatchObject(children);
   });
@@ -57,7 +57,7 @@ describe("reducers: childrenRelations", () => {
   it("should handle the clearStructure.TRIGGER action", () => {
     expect(
       childrenRelations(fooState, {
-        type: clearStructure.TRIGGER
+        type: clearStructure.TRIGGER,
       })
     ).toMatchObject([]);
   });
@@ -77,8 +77,8 @@ describe("reducers: parentRelations", () => {
   it("should handle the fetchStructures.SUCCESS action", () => {
     expect(
       parentRelations(fooState, {
-        type: fetchStructureParents.SUCCESS,
-        payload: { data }
+        type: fetchStructure.SUCCESS,
+        payload: { data },
       })
     ).toMatchObject(parents);
   });
@@ -86,7 +86,7 @@ describe("reducers: parentRelations", () => {
   it("should handle the clearStructure.TRIGGER action", () => {
     expect(
       childrenRelations(fooState, {
-        type: clearStructure.TRIGGER
+        type: clearStructure.TRIGGER,
       })
     ).toMatchObject([]);
   });

package/src/reducers/structure.js

@@ -42,6 +42,7 @@ const structureVersionFields = _.pick([
   "source",
   "system",
   "type",
+  "relations",
   "_actions",
   "version_count",
 ]);

package/src/reducers/structureRelations.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { clearStructure, fetchStructureChildrens, fetchStructureParents } from "../routines";
+import { clearStructure, fetchStructure } from "../routines";
 
 export const initialState = [];
 
@@ -7,9 +7,9 @@ export const childrenRelations = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructureChildrens.TRIGGER:
+    case fetchStructure.TRIGGER:
       return initialState;
-    case fetchStructureChildrens.SUCCESS:
+    case fetchStructure.SUCCESS:
       return _.pathOr([], "data.relations.children")(payload);
     default:
       return state;
@@ -20,7 +20,7 @@ export const parentRelations = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructure.TRIGGER:
       return initialState;
-    case fetchStructureParents.SUCCESS:
+    case fetchStructure.SUCCESS:
       return _.pathOr([], "data.relations.parents")(payload);
     default:
       return state;

package/src/routines.js

@@ -90,8 +90,6 @@ export const fetchProfileExecution = createRoutine("FETCH_EXECUTION_PROFILE");
 export const fetchProfileGroup = createRoutine("FETCH_PROFILE_GROUP");
 export const fetchStructure = createRoutine("FETCH_STRUCTURE");
 export const legacyFetchStructure = createRoutine("LEGACY_FETCH_STRUCTURE");
-export const fetchStructureParents = createRoutine("FETCH_STRUCTURE_PARENTS");
-export const fetchStructureChildrens = createRoutine("FETCH_STRUCTURE_CHILDREN");
 export const fetchStructureVersions = createRoutine("FETCH_STRUCTURE_VERSIONS");
 export const fetchStructureGraph = createRoutine("FETCH_STRUCTURE_GRAPH");
 export const fetchStructureNotes = createRoutine("FETCH_STRUCTURE_NOTES");

package/src/sagas/fetchStructureChildrens.js

@@ -1,48 +0,0 @@
-import _ from "lodash/fp";
-import { call, put, takeLatest, select, getContext } from "redux-saga/effects";
-import { fetchStructureChildrens } from "../routines";
-import { DATA_STRUCTURE_CHILDREN_QUERY } from "../api/queries";
-import { getStructureFieldColumns } from "../selectors";
-
-export function* fetchStructureChildrenSaga({ payload }) {
-  try {
-    const client = yield getContext("client");
-
-    yield put(fetchStructureChildrens.request());
-
-    const { id, version = "latest" } = payload;
-    const {
-      data: { dataStructureVersion },
-    } = yield call(client.query, {
-      fetchPolicy: "network-only",
-      query: DATA_STRUCTURE_CHILDREN_QUERY,
-      variables: {
-        dataStructureId: id,
-        version,
-      },
-    });
-
-    const data = {
-      data: dataStructureVersion,
-      _actions: dataStructureVersion._actions,
-      user_permissions: dataStructureVersion.user_permissions,
-    };
-
-    const meta = { version };
-
-    yield put({ meta, ...fetchStructureChildrens.success(data) });
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(fetchStructureChildrens.failure({ status, data }));
-    } else {
-      yield put(fetchStructureChildrens.failure(error.message));
-    }
-  } finally {
-    yield put(fetchStructureChildrens.fulfill());
-  }
-}
-
-export function* fetchStructureChildrensRequestSaga() {
-  yield takeLatest(fetchStructureChildrens.TRIGGER, fetchStructureChildrensSaga);
-}

package/src/sagas/fetchStructureParents.js

@@ -1,48 +0,0 @@
-import _ from "lodash/fp";
-import { call, put, takeLatest, select, getContext } from "redux-saga/effects";
-import { fetchStructureParents } from "../routines";
-import { DATA_STRUCTURE_PARENTS_QUERY } from "../api/queries";
-import { getStructureFieldColumns } from "../selectors";
-
-export function* fetchStructureParentsSaga({ payload }) {
-  try {
-    const client = yield getContext("client");
-
-    yield put(fetchStructureParents.request());
-
-    const { id, version = "latest" } = payload;
-    const {
-      data: { dataStructureVersion },
-    } = yield call(client.query, {
-      fetchPolicy: "network-only",
-      query: DATA_STRUCTURE_PARENTS_QUERY,
-      variables: {
-        dataStructureId: id,
-        version, 
-      },
-    });
-
-    const data = {
-      data: dataStructureVersion,
-      _actions: dataStructureVersion._actions,
-      user_permissions: dataStructureVersion.user_permissions,
-    };
-
-    const meta = { version };
-
-    yield put({ meta, ...fetchStructureParents.success(data) });
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(fetchStructureParents.failure({ status, data }));
-    } else {
-      yield put(fetchStructureParents.failure(error.message));
-    }
-  } finally {
-    yield put(fetchStructureParents.fulfill());
-  }
-}
-
-export function* fetchStructureParentsRequestSaga() {
-  yield takeLatest(fetchStructureParents.TRIGGER, fetchStructureParentsSaga);
-}