@truedat/dd 7.11.1 → 7.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.11.1",
+  "version": "7.11.3",
   "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.11.1",
+    "@truedat/test": "7.11.2",
     "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": "efc0969708811b5e4fc2ea39e628a1b2691e4042"
+  "gitHead": "59064d786ac330fd0b9f1d613a7d56f26842caf7"
 }

package/src/api/queries.js

@@ -238,7 +238,7 @@ export const STRUCTURE_STRUCTURE_LINKS_QUERY = gql`
   }
 `;
 
-export const DATA_STRUCTURE_VERSION_QUERY = gql`
+export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
   query DataStructureVersion(
     $dataStructureId: ID!
     $version: String!
@@ -253,6 +253,7 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
       type
       group
       deleted_at
+      metadata
       data_structure {
         alias
         confidential
@@ -419,6 +420,7 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
         in
         out
       }
+
       data_fields {
         alias
         classes
@@ -483,16 +485,284 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
   }
 `;
 
+export const DATA_STRUCTURE_VERSION_QUERY = gql`
+  query DataStructureVersion($dataStructureId: ID!, $version: String!) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      id
+      version
+      class
+      description
+      name
+      type
+      group
+      deleted_at
+      data_structure {
+        alias
+        confidential
+        domain_ids
+        domains {
+          external_id
+          id
+          name
+          parent_id
+          parents {
+            external_id
+            id
+            name
+          }
+        }
+        external_id
+        id
+        inserted_at
+        latest_note
+        roles
+        source {
+          external_id
+          id
+        }
+        source_id
+        system_id
+        updated_at
+      }
+      parents {
+        alias
+        classes
+        data_structure_id
+        id
+        name
+        type
+        note
+      }
+      children {
+        alias
+        classes
+        data_structure_id
+        id
+        name
+        type
+        note
+      }
+      siblings {
+        alias
+        classes
+        data_structure_id
+        id
+        name
+        type
+      }
+      version_count
+
+      ancestry
+
+      grants_count
+
+      grant {
+        data_structure {
+          external_id
+          id
+          system_id
+        }
+        data_structure_version {
+          ancestry
+          name
+        }
+        detail
+        end_date
+        external_ref
+        id
+        inserted_at
+        pending_removal
+        source_user_name
+        start_date
+        system {
+          external_id
+          id
+          name
+        }
+        updated_at
+        user {
+          email
+          full_name
+          user_name
+        }
+        user_id
+      }
+
+      classes
+      implementation_count
+      data_structure_link_count
+
+      has_note
+      note
+      profile {
+        max
+        min
+        null_count
+        most_frequent
+        total_count
+      }
+      source {
+        id
+        external_id
+      }
+      system {
+        id
+        name
+      }
+      structure_type {
+        metadata_views {
+          name
+          fields
+        }
+        template_id
+        translation
+      }
+      degree {
+        in
+        out
+      }
+      data_fields_count
+      relations {
+        parents {
+          id
+          structure {
+            id
+            data_structure_id
+            name
+            type
+          }
+          relation_type {
+            name
+            description
+          }
+        }
+        children {
+          id
+          structure {
+            id
+            data_structure_id
+            name
+            type
+          }
+          relation_type {
+            name
+            description
+          }
+          links
+        }
+      }
+
+      _actions
+      user_permissions
+    }
+  }
+`;
+
 export const DATA_STRUCTURE_VERSION_METADATA_QUERY = gql`
-query DataStructureVersion(
-  $dataStructureId: ID!
-  $version: String!
-) {
-  dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
-    metadata
+  query DataStructureVersion($dataStructureId: ID!, $version: String!) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      metadata
+    }
+  }
+`;
+
+export const DATA_STRUCTURE_VERSION_LINKS_QUERY = gql`
+  query DataStructureVersion($dataStructureId: ID!, $version: String!) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      links
+    }
+  }
+`;
+
+export const DATA_STRUCTURE_VERSION_VERSIONS_QUERY = gql`
+  query DataStructureVersion($dataStructureId: ID!, $version: String!) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      versions {
+        deleted_at
+        inserted_at
+        updated_at
+        version
+      }
+    }
+  }
+`;
+
+export const DATA_STRUCTURE_VERSION_GRANTS_QUERY = gql`
+  query DataStructureVersion($dataStructureId: ID!, $version: String!) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      grants {
+        data_structure {
+          external_id
+          id
+          system_id
+        }
+        data_structure_version {
+          ancestry
+          name
+        }
+        detail
+        end_date
+        external_ref
+        id
+        inserted_at
+        pending_removal
+        source_user_name
+        start_date
+        system {
+          external_id
+          id
+          name
+        }
+        updated_at
+        user {
+          email
+          full_name
+          user_name
+        }
+        user_id
+      }
+    }
   }
-}
 `;
+
+export const DATA_STRUCTURE_PARENTS_QUERY = gql`
+  query DataStructureVersion($dataStructureId: ID!, $version: String!) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      parents {
+        alias
+        classes
+        data_structure_id
+        deleted_at
+        id
+        metadata
+        name
+        type
+        has_note
+        note
+      }
+    }
+  }
+`;
+
+export const DATA_STRUCTURE_CHILDREN_QUERY = gql`
+  query DataStructureVersion($dataStructureId: ID!, $version: String!) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      children {
+        alias
+        classes
+        data_structure_id
+        deleted_at
+        id
+        metadata
+        name
+        type
+        has_note
+        note
+      }
+    }
+  }
+`;
+
 export const TASKS_QUERY = gql`
   query Tasks {
     tasks {

package/src/components/ImplementationStructuresLoader.js

@@ -2,11 +2,11 @@ import _ from "lodash/fp";
 import { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { fetchStructure, clearStructure } from "../routines";
+import { legacyFetchStructure, clearStructure } from "../routines";
 
 export const ImplementationStructuresLoader = ({
   clearStructure,
-  fetchStructure,
+  legacyFetchStructure,
   structureIds,
   structuresFields,
   structuresSiblings,
@@ -23,14 +23,14 @@ export const ImplementationStructuresLoader = ({
     // check structure_ids, will be undefined if structureIds is an empty Array
     if (structure_id && !_.includes(structure_id)(structures)) {
       if (!_.includes(structure_id)(requestedStructures)) {
-        fetchStructure({ id: structure_id });
+        legacyFetchStructure({ id: structure_id });
         setRequestedStructures([...requestedStructures, structure_id]);
       }
     } else if (structureIndex + 1 < _.size(structureIds)) {
       setStructureIndex(structureIndex + 1);
     }
   }, [
-    fetchStructure,
+    legacyFetchStructure,
     structureIds,
     structures,
     structureIndex,
@@ -46,7 +46,7 @@ export const ImplementationStructuresLoader = ({
 
 ImplementationStructuresLoader.propTypes = {
   clearStructure: PropTypes.func,
-  fetchStructure: PropTypes.func,
+  legacyFetchStructure: PropTypes.func,
   structuresFields: PropTypes.array,
   structuresSiblings: PropTypes.array,
   structureIds: PropTypes.array,
@@ -57,6 +57,6 @@ export const mapStateToProps = ({ structuresFields, structuresSiblings }) => ({
   structuresSiblings: _.keys(structuresSiblings),
 });
 
-export default connect(mapStateToProps, { fetchStructure, clearStructure })(
+export default connect(mapStateToProps, { legacyFetchStructure, clearStructure })(
   ImplementationStructuresLoader
 );

package/src/components/StructureGrants.js

@@ -8,23 +8,23 @@ import { columnDecorator } from "@truedat/core/services";
 import { linkTo } from "@truedat/core/routes";
 import { getGrantsColumns } from "../selectors";
 import GrantRemoval from "./GrantRemoval";
+import { useQuery } from "@apollo/client";
+import { DATA_STRUCTURE_VERSION_GRANTS_QUERY } from "../api/queries";
 
 const matchesStructure = ({ id }) => _.pathEq("data_structure.id", id);
 
-export const StructureGrants = ({
+const StructureGrantsContent = ({
   columns,
-  grants,
   grantsActions,
   structure,
   userPermissions,
+  grants,
+  canUpdateRemoval,
 }) => {
   const { formatMessage } = useIntl();
   const navigate = useNavigate();
-  const canUpdateRemoval =
-    userPermissions?.update_grant_removal &&
-    _.any(matchesStructure(structure))(grants);
 
-  return grants ? (
+  return (
     <Table basic="very">
       <Table.Header>
         <Table.Row>
@@ -76,7 +76,50 @@ export const StructureGrants = ({
         ))}
       </Table.Body>
     </Table>
-  ) : null;
+  );
+};
+
+StructureGrantsContent.propTypes = {
+  columns: PropTypes.array,
+  grantsActions: PropTypes.object,
+  structure: PropTypes.object,
+  userPermissions: PropTypes.object,
+  grants: PropTypes.array,
+  canUpdateRemoval: PropTypes.bool,
+};
+
+export const StructureGrants = ({
+  columns,
+  grantsActions,
+  structure,
+  userPermissions,
+}) => {
+  const { data } = useQuery(DATA_STRUCTURE_VERSION_GRANTS_QUERY, {
+    fetchPolicy: "network-only",
+    variables: { dataStructureId: structure.id, version: "latest" },
+    skip: !structure?.id,
+  });
+  const grants = data?.dataStructureVersion.grants;
+
+  const canUpdateRemoval =
+    userPermissions?.update_grant_removal &&
+    grants &&
+    _.any(matchesStructure(structure))(grants);
+
+  if (!grants) {
+    return null;
+  }
+
+  return (
+    <StructureGrantsContent
+      columns={columns}
+      grantsActions={grantsActions}
+      structure={structure}
+      userPermissions={userPermissions}
+      grants={grants}
+      canUpdateRemoval={canUpdateRemoval}
+    />
+  );
 };
 
 StructureGrants.propTypes = {

package/src/components/StructureSelectorInputField.js

@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import { Container, Form, Icon } from "semantic-ui-react";
-import { fetchStructure } from "../routines";
+import { legacyFetchStructure } from "../routines";
 import StructureSelector from "./StructureSelector";
 import StructureSelectorInputFieldJoin from "./StructureSelectorInputFieldJoin";
 
@@ -19,13 +19,13 @@ export const StructureSelectorInputField = ({
   selectedStructure,
   selectedSystem,
   systemRequired,
-  fetchStructure,
+  legacyFetchStructure,
   structureSelectorOverwriteColumns,
   fieldWidth,
 }) => {
   const { formatMessage } = useIntl();
   const handleSelectStructure = (value) => {
-    value && fetchStructure({ id: _.prop("id")(value) });
+    value && legacyFetchStructure({ id: _.prop("id")(value) });
     value && onChange(value);
   };
 
@@ -124,7 +124,7 @@ export const StructureSelectorInputField = ({
 
 StructureSelectorInputField.propTypes = {
   active: PropTypes.bool,
-  fetchStructure: PropTypes.func,
+  legacyFetchStructure: PropTypes.func,
   joined: PropTypes.bool,
   onChange: PropTypes.func,
   onChangeField: PropTypes.func,
@@ -139,4 +139,6 @@ StructureSelectorInputField.propTypes = {
   fieldWidth: PropTypes.number,
 };
 
-export default connect(null, { fetchStructure })(StructureSelectorInputField);
+export default connect(null, { legacyFetchStructure })(
+  StructureSelectorInputField
+);

package/src/components/StructureVersions.js

@@ -1,17 +1,30 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
+import { useParams } from "react-router";
 import { List } from "semantic-ui-react";
 import StructureVersionListItem from "./StructureVersionListItem";
+import { useQuery } from "@apollo/client";
+import { DATA_STRUCTURE_VERSION_VERSIONS_QUERY } from "../api/queries";
 
-export const StructureVersions = ({ id, versions }) =>
+export const StructureVersions = () =>{
+  const { id } = useParams();
+  
+  const { data } = useQuery(DATA_STRUCTURE_VERSION_VERSIONS_QUERY, {
+    fetchPolicy: "network-only", 
+    variables: { dataStructureId: id, version: "latest" },
+  });
+
+  const versions = data?.dataStructureVersion.versions;
+  return (
   !_.isEmpty(versions) && (
     <List selection>
       {versions.map((v, i) => (
         <StructureVersionListItem key={i} id={id} {...v} />
       ))}
     </List>
-  );
+  ));
+}
 
 StructureVersions.propTypes = {
   id: PropTypes.number,

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

@@ -2,19 +2,19 @@ import { render } from "@truedat/test/render";
 import { ImplementationStructuresLoader } from "../ImplementationStructuresLoader";
 
 describe("<ImplementationStructuresLoader/>", () => {
-  it("calls fetchStructure on mount and clearStructure on unmount", () => {
+  it("calls legacyFetchStructure on mount and clearStructure on unmount", () => {
     const props = {
       clearStructure: jest.fn(),
-      fetchStructure: jest.fn(),
+      legacyFetchStructure: jest.fn(),
       structureIds: [42],
     };
     const { unmount } = render(<ImplementationStructuresLoader {...props} />);
     expect(props.clearStructure).toHaveBeenCalledTimes(0);
-    expect(props.fetchStructure).toHaveBeenCalledTimes(1);
-    expect(props.fetchStructure).toHaveBeenCalledWith({ id: 42 });
+    expect(props.legacyFetchStructure).toHaveBeenCalledTimes(1);
+    expect(props.legacyFetchStructure).toHaveBeenCalledWith({ id: 42 });
 
     unmount();
     expect(props.clearStructure).toHaveBeenCalledTimes(1);
-    expect(props.fetchStructure).toHaveBeenCalledTimes(1);
+    expect(props.legacyFetchStructure).toHaveBeenCalledTimes(1);
   });
 });

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

@@ -16,7 +16,7 @@ describe("<ProfileExecutionLoader />", () => {
     expect(rendered.container).toMatchSnapshot();
   });
 
-  it("calls fetchStructure when component mounts but not when it unmounts", async () => {
+  it("calls fetchProfileExecution when component mounts but not when it unmounts", async () => {
     const clearProfileExecution = jest.fn();
     const fetchProfileExecution = jest.fn();
     const props = { clearProfileExecution, fetchProfileExecution };

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

@@ -16,7 +16,7 @@ describe("<ProfileGroupLoader />", () => {
     expect(rendered.container).toMatchSnapshot();
   });
 
-  it("calls fetchStructure when component mounts but not when it unmounts", async () => {
+  it("calls fetchProfileGroup when component mounts but not when it unmounts", async () => {
     const clearProfileGroup = jest.fn();
     const fetchProfileGroup = jest.fn();
     const props = { clearProfileGroup, fetchProfileGroup };

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

@@ -2,6 +2,32 @@ import _ from "lodash/fp";
 import { render } from "@truedat/test/render";
 import { StructureGrants } from "../StructureGrants";
 
+jest.mock("@apollo/client", () => ({
+  gql: jest.fn((query) => query),
+  useQuery: jest.fn(() => ({
+    data: {
+      dataStructureVersion: {
+        grants: [
+          {
+            id: 1,
+            user: { id: 1, full_name: "foo user" },
+            data_structure: { id: 99, external_id: "foo_strucutre" },
+            end_date: "2021/08/02",
+            pending_removal: false,
+          },
+          {
+            id: 2,
+            user: { id: 2, full_name: "bar user" },
+            data_structure: { name: "bar structure" },
+            end_date: "2021/09/02",
+            pending_removal: false,
+          },
+        ],
+      },
+    },
+  })),
+}));
+
 describe("<StructureGrants />", () => {
   const idDecorator = ({ id }) => <p>{id}</p>;
   const userDecorator = ({ user }) => <p>{user.full_name}</p>;

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

@@ -1,6 +1,32 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { StructureVersions } from "../StructureVersions";
 
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
+  useParams: jest.fn(() => ({ id: "1" })),
+}));
+
+jest.mock("@apollo/client", () => ({
+  gql: jest.fn((query) => query),
+  useQuery: jest.fn(() => ({
+    data: {
+      dataStructureVersion: {
+        versions: [
+          {
+            version: "0",
+            inserted_at: "2018-01-01T01:01:01.123456Z",
+          },
+          {
+            version: "1",
+            inserted_at: "2018-02-01T01:01:01.123456Z",
+          },
+        ],
+      },
+    },
+  })),
+}));
+
+
 describe("<StructureVersions />", () => {
   it("matches the latest snapshot", async () => {
     const versions = [

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

@@ -1,5 +1,5 @@
 import { graph, initialState } from "../graph";
-import { clearGraph, fetchGraph, fetchStructure } from "../../routines";
+import { clearGraph, fetchGraph, legacyFetchStructure } from "../../routines";
 
 const fooState = { foo: "bar" };
 
@@ -12,8 +12,8 @@ describe("reducers: graph", () => {
     expect(graph(fooState, { type: clearGraph.TRIGGER })).toEqual(initialState);
   });
 
-  it("should be the initial state after receiving the fetchStructure.TRIGGER action", () => {
-    expect(graph(fooState, { type: fetchStructure.TRIGGER })).toEqual(
+  it("should be the initial state after receiving the legacyFetchStructure.TRIGGER action", () => {
+    expect(graph(fooState, { type: legacyFetchStructure.TRIGGER })).toEqual(
       initialState
     );
   });

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

@@ -4,7 +4,7 @@ import {
   createGraph,
   createStructureGraph,
   fetchGraph,
-  fetchStructure,
+  legacyFetchStructure,
   fetchStructureGraph,
 } from "../../routines";
 import { graphLoading } from "..";
@@ -56,8 +56,8 @@ describe("reducers: graphLoading", () => {
     expect(graphLoading(true, { type: fetchGraph.FULFILL })).toBe(false);
   });
 
-  it("should be false after receiving the fetchStructure.TRIGGER action", () => {
-    expect(graphLoading(true, { type: fetchStructure.TRIGGER })).toBe(false);
+  it("should be false after receiving the legacyFetchStructure.TRIGGER action", () => {
+    expect(graphLoading(true, { type: legacyFetchStructure.TRIGGER })).toBe(false);
   });
 
   it("should be false after receiving the fetchStructureGraph.FULFILL action", () => {