@truedat/dd 7.10.2 → 7.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.10.2",
+  "version": "7.10.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.10.2",
+    "@truedat/test": "7.10.3",
     "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": "913c4f16345d35e38b0ed09c58d73b88955356f0"
+  "gitHead": "1233e6ea0f6fa0c7d7483ae79df7e79a2733bc53"
 }

package/src/api/queries.js

@@ -253,7 +253,6 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
       type
       group
       deleted_at
-      metadata
       data_structure {
         alias
         confidential
@@ -420,7 +419,6 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
         in
         out
       }
-
       data_fields {
         alias
         classes
@@ -485,6 +483,16 @@ export const DATA_STRUCTURE_VERSION_QUERY = gql`
   }
 `;
 
+export const DATA_STRUCTURE_VERSION_METADATA_QUERY = gql`
+query DataStructureVersion(
+  $dataStructureId: ID!
+  $version: String!
+) {
+  dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+    metadata
+  }
+}
+`;
 export const TASKS_QUERY = gql`
   query Tasks {
     tasks {

package/src/components/StructureMetadata.js

@@ -1,14 +1,24 @@
 import _ from "lodash/fp";
 import { useEffect, useState } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Accordion, Menu } from "semantic-ui-react";
+import { useParams } from "react-router";
+import { useSelector } from "react-redux";
+import { Accordion, Loader, Menu, Message } from "semantic-ui-react";
 import { useIntl } from "react-intl";
+import { useQuery } from "@apollo/client";
 import { metadataViewsSelector } from "../selectors/metadataViewsSelector";
+import { DATA_STRUCTURE_VERSION_METADATA_QUERY } from "../api/queries";
 
-export const StructureMetadata = ({ options }) => {
+export const StructureMetadata = () => {
   const [selectedOption, setSelectedOption] = useState(null);
   const { formatMessage } = useIntl();
+  const { id } = useParams();
+
+  const { loading, data } = useQuery(DATA_STRUCTURE_VERSION_METADATA_QUERY, {
+    fetchPolicy: "network-only",
+    variables: { dataStructureId: id, version: "latest" },
+  });
+  const metadata = data?.dataStructureVersion?.metadata;
+  const options = useSelector((state) => metadataViewsSelector({ structure: state.structure, structureMetadata: metadata }))
 
   useEffect(() => {
     if (!selectedOption && !_.isEmpty(options)) {
@@ -19,16 +29,16 @@ export const StructureMetadata = ({ options }) => {
   const formatContent = (value) =>
     _.isObject(value)
       ? {
-          content: (
-            <div>
-              <Accordion.Accordion
-                exclusive={false}
-                defaultActiveIndex={_.range(0, _.size(value))}
-                panels={toPanels(value)}
-              />
-            </div>
-          ),
-        }
+        content: (
+          <div>
+            <Accordion.Accordion
+              exclusive={false}
+              defaultActiveIndex={_.range(0, _.size(value))}
+              panels={toPanels(value)}
+            />
+          </div>
+        ),
+      }
       : _.toString(value);
 
   const toPanels = _.flow(
@@ -54,7 +64,7 @@ export const StructureMetadata = ({ options }) => {
   const fields = selectedOption?.fields;
   const defaultActiveIndex = _.range(0, _.size(fields));
 
-  return selectedOption ? (
+  return loading ? <Loader active={loading} /> : !_.isEmpty(fields) ? (
     <>
       {items?.length > 1 ? (
         <Menu pointing attached="top" secondary items={items} />
@@ -67,15 +77,10 @@ export const StructureMetadata = ({ options }) => {
         styled
       />
     </>
-  ) : null;
-};
-
-StructureMetadata.propTypes = {
-  options: PropTypes.array,
+  ) : <Message
+    warning
+    header={formatMessage({ id: "structure.notes.empty" })}
+  />;
 };
 
-const mapStateToProps = (state) => ({
-  options: metadataViewsSelector(state),
-});
-
-export default connect(mapStateToProps)(StructureMetadata);
+export default StructureMetadata;

package/src/components/TagsRoutes.js

@@ -1,12 +1,6 @@
 import React from "react";
 import { Route, useParams, Routes } from "react-router";
 import { useQuery } from "@apollo/client";
-import { ProtectedRoute } from "@truedat/core/router";
-import {
-  STRUCTURE_TAGS,
-  STRUCTURE_TAG_EDIT,
-  STRUCTURE_TAGS_NEW,
-} from "@truedat/core/routes";
 import { TAG_QUERY } from "../api/queries";
 import Tag from "./Tag";
 import Tags from "./Tags";

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

@@ -1,6 +1,12 @@
 import { render } from "@truedat/test/render";
+import { useQuery } from "@apollo/client";
 import StructureMetadata from "../StructureMetadata";
 
+jest.mock("@apollo/client", () => ({
+  ...jest.requireActual("@apollo/client"),
+  useQuery: jest.fn(),
+}));
+
 const structureMetadata = {
   foo: "foo",
   bar: "bar",
@@ -23,15 +29,27 @@ const renderOpts = {
     en: {},
   },
   state: {
-    structureMetadata,
     structure,
   },
 };
 
+
+
 describe("<StructureMetadata />", () => {
+  beforeEach(() => {
+    useQuery.mockReturnValue({
+      loading: false,
+      error: null,
+      data: {
+        dataStructureVersion: {
+          metadata: structureMetadata
+        }
+      },
+    });
+  });
+
   it("matches the latest snapshot", () => {
-    const props = { metadata: { foo: { bar: "baz" } } };
-    const { container } = render(<StructureMetadata {...props} />, renderOpts);
+    const { container } = render(<StructureMetadata />, renderOpts);
     expect(container).toMatchSnapshot();
   });
 });

package/src/reducers/index.js

@@ -49,7 +49,6 @@ import { structureLineageGraph } from "./structureLineageGraph";
 import { structureLineageId } from "./structureLineageId";
 import { structureLinks } from "./structureLinks";
 import { structureLoading } from "./structureLoading";
-import { structureMetadata } from "./structureMetadata";
 import { structureNotes } from "./structureNotes";
 import { structureParents } from "./structureParents";
 import { structureProfile } from "./structureProfile";
@@ -130,7 +129,6 @@ export {
   structureLineageId,
   structureLinks,
   structureLoading,
-  structureMetadata,
   structureNotes,
   structureParents,
   structureProfile,

package/src/selectors/getTabVisibility.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
 import { createSelector } from "reselect";
 import { getStructureToConceptLinks } from "./getStructureLinks";
-import { metadataViewsSelector } from "./metadataViewsSelector";
 
 const notEmpty = _.negate(_.isEmpty);
 const notEmptyPath = (path) => _.flow(_.path(path), notEmpty);
@@ -58,6 +57,7 @@ const eventsTabVisible = _.flow(
   _.isEqual("latest")
 );
 const grantsTabVisible = _.flow(_.path("structure.grants"), notEmpty);
+const metatadaVisible = (state) => !_.isEmpty(_.path(["structure", "structure_type", "metadata_views"])(state))
 
 export const getTabVisibility = createSelector([state => state], (state) => ({
   fields: fieldsTabVisible(state),
@@ -65,7 +65,7 @@ export const getTabVisibility = createSelector([state => state], (state) => ({
   links: linksTabVisible(state),
   structureLinks: structureLinksTabVisible(state),
   notes: notesTabVisible(state),
-  metadata: !_.isEmpty(metadataViewsSelector(state)),
+  metadata: metatadaVisible(state),
   versions: versionsTabVisible(state),
   events: eventsTabVisible(state),
   rules: rulesTabVisible(state),

package/src/selectors/metadataViewsSelector.js

@@ -11,10 +11,10 @@ export const metadataViewsSelector = createSelector(
     _.isEmpty(metadataViews) || _.isEmpty(structureMetadata)
       ? []
       : _.flow(
-          _.map(({ fields, name }) => ({
-            name,
-            fields: pickFields(fields)(structureMetadata),
-          })),
-          _.reject(({ fields }) => _.isEmpty(fields))
-        )(metadataViews)
+        _.map(({ fields, name }) => ({
+          name,
+          fields: pickFields(fields)(structureMetadata),
+        })),
+        _.reject(({ fields }) => _.isEmpty(fields))
+      )(metadataViews)
 );

package/src/reducers/structureMetadata.js

@@ -1,18 +0,0 @@
-import { clearStructure, fetchStructure, updateStructure } from "../routines";
-
-export const initialState = {};
-
-export const structureMetadata = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case clearStructure.TRIGGER:
-      return initialState;
-    case fetchStructure.TRIGGER:
-      return initialState;
-    case fetchStructure.SUCCESS:
-      return payload?.data?.metadata || initialState;
-    case updateStructure.SUCCESS:
-      return payload?.data?.metadata || initialState;
-    default:
-      return state;
-  }
-};