@truedat/dd 8.4.8 → 8.4.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.4.8",
+  "version": "8.4.10",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -51,22 +51,22 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.4.8",
+    "@truedat/test": "8.4.10",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
   },
   "dependencies": {
     "@apollo/client": "^3.13.8",
-    "axios": "^1.15.0",
+    "axios": "^1.15.2",
     "file-saver": "^2.0.5",
     "graphql": "^16.11.0",
     "is-hotkey": "^0.2.0",
     "is-url": "^1.2.4",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "match-sorter": "^8.0.1",
     "moment": "^2.30.1",
-    "path-to-regexp": "^8.2.0",
+    "path-to-regexp": "^8.4.0",
     "prop-types": "^15.8.1",
     "query-string": "^7.1.3",
     "react": "^19.1.0",
@@ -86,5 +86,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "7829e377f78c3cfc66e449f5dc31a8b03c0f5f00"
+  "gitHead": "f04300ddda49a4cf5da0bcba783ff56d192faaf4"
 }

package/src/api/queries.js

@@ -243,6 +243,7 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
     $dataStructureId: ID!
     $version: String!
     $note_fields: [String]
+    $withoutGrants: Boolean!
   ) {
     dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
       id
@@ -324,7 +325,7 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
       }
       ancestry
 
-      grants {
+      grants @skip(if: $withoutGrants) {
         data_structure {
           external_id
           id
@@ -355,7 +356,7 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
         }
         user_id
       }
-      grant {
+      grant @skip(if: $withoutGrants) {
         data_structure {
           external_id
           id

package/src/components/ImplementationStructuresLoader.js

@@ -14,7 +14,7 @@ export const ImplementationStructuresLoader = ({
   const structures = _.flow(
     _.concat(structuresFields),
     _.map(_.toInteger),
-    _.uniq
+    _.uniq,
   )(structuresSiblings);
   const [structureIndex, setStructureIndex] = useState(0);
   const [requestedStructures, setRequestedStructures] = useState([]);
@@ -23,7 +23,7 @@ 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)) {
-        legacyFetchStructure({ id: structure_id });
+        legacyFetchStructure({ id: structure_id, withoutGrants: true });
         setRequestedStructures([...requestedStructures, structure_id]);
       }
     } else if (structureIndex + 1 < _.size(structureIds)) {
@@ -57,6 +57,7 @@ export const mapStateToProps = ({ structuresFields, structuresSiblings }) => ({
   structuresSiblings: _.keys(structuresSiblings),
 });
 
-export default connect(mapStateToProps, { legacyFetchStructure, clearStructure })(
-  ImplementationStructuresLoader
-);
+export default connect(mapStateToProps, {
+  legacyFetchStructure,
+  clearStructure,
+})(ImplementationStructuresLoader);

package/src/components/StructureSelectorInputField.js

@@ -25,7 +25,8 @@ export const StructureSelectorInputField = ({
 }) => {
   const { formatMessage } = useIntl();
   const handleSelectStructure = (value) => {
-    value && legacyFetchStructure({ id: _.prop("id")(value) });
+    value &&
+      legacyFetchStructure({ id: _.prop("id")(value), withoutGrants: true });
     value && onChange(value);
   };
 
@@ -40,7 +41,7 @@ export const StructureSelectorInputField = ({
   const aliasIsNeeded =
     _.flow(
       _.map(_.path("structure.id")),
-      _.filter((s) => s === selectedStructure?.structure?.id)
+      _.filter((s) => s === selectedStructure?.structure?.id),
     )(structures).length > 1;
 
   return (
@@ -140,5 +141,5 @@ StructureSelectorInputField.propTypes = {
 };
 
 export default connect(null, { legacyFetchStructure })(
-  StructureSelectorInputField
+  StructureSelectorInputField,
 );

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

@@ -28,6 +28,8 @@ jest.mock("@truedat/core/components/SystemsLoader", () => () => (
 jest.mock("@truedat/core/components/TemplatesLoader", () => () => (
   <div>TemplatesLoader</div>
 ));
+jest.mock("@truedat/core/components/UploadJobs", () => () => <div>UploadJobs</div>);
+jest.mock("@truedat/core/components/UploadJob", () => () => <div>UploadJob</div>);
 
 jest.mock("../CatalogViewConfigs", () => () => <div>CatalogViewConfigs</div>);
 jest.mock("../CatalogViewConfigForm", () => ({

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

@@ -11,7 +11,10 @@ describe("<ImplementationStructuresLoader/>", () => {
     const { unmount } = render(<ImplementationStructuresLoader {...props} />);
     expect(props.clearStructure).toHaveBeenCalledTimes(0);
     expect(props.legacyFetchStructure).toHaveBeenCalledTimes(1);
-    expect(props.legacyFetchStructure).toHaveBeenCalledWith({ id: 42 });
+    expect(props.legacyFetchStructure).toHaveBeenCalledWith({
+      id: 42,
+      withoutGrants: true,
+    });
 
     unmount();
     expect(props.clearStructure).toHaveBeenCalledTimes(1);

package/src/components/__tests__/__snapshots__/DictionaryRoutes.spec.js.snap

@@ -120,45 +120,8 @@ exports[`<DictionaryRoutes /> renders correctly with structures route 1`] = `
 
 exports[`<DictionaryRoutes /> renders correctly with structures upload events route 1`] = `
 <div>
-  <div
-    class="ui breadcrumb"
-  >
-    <a
-      class="section"
-      data-discover="true"
-      href="/structureNotes/uploadJobs"
-    >
-      uploadJobs.notes.header
-    </a>
-  </div>
-  <div
-    class="ui segment"
-  >
-    <h2
-      class="ui header"
-    >
-      <i
-        aria-hidden="true"
-        class="cogs circular icon"
-      />
-      <div
-        class="content"
-      >
-        uploadJobs.notes.header
-        <div
-          class="sub header"
-        >
-          uploadJobs.subheader
-        </div>
-      </div>
-    </h2>
-    <div
-      class="dimmable"
-    >
-      <div
-        class="ui bottom attached segment"
-      />
-    </div>
+  <div>
+    UploadJobs
   </div>
 </div>
 `;

package/src/messages/en.js

@@ -397,7 +397,11 @@ export default {
   "structure.rule.props.name": "Name",
   "structure.rule_implementation.props.key": "Implementation",
   "structure.rule_implementation.props.result": "Quality",
+  "structure.reason": "Reason",
   "structure.search.placeholder": "Enter a search...",
+  "structure.similarity": "Similarity",
+  "suggestions.similarity.cosine.popup":
+    "Similarity score (cosine). Higher values indicate a closer match.",
   "structure.share.title": "Share structure",
   "structure.system": "System",
   "structure.system.create": "Create system",

package/src/messages/es.js

@@ -407,7 +407,11 @@ export default {
   "structure.rule.props.name": "Nombre",
   "structure.rule_implementation.props.key": "Implementación",
   "structure.rule_implementation.props.result": "Calidad",
+  "structure.reason": "Motivo",
   "structure.search.placeholder": "Introduce una busqueda...",
+  "structure.similarity": "Similitud",
+  "suggestions.similarity.cosine.popup":
+    "Puntuación de similitud (coseno). Valores más altos indican mayor coincidencia.",
   "structure.share.title": "Compartir estructura",
   "structure.system": "Sistema",
   "structure.system.create": "Crear sistema",

package/src/sagas/__tests__/legacyFetchStructure.spec.js

@@ -37,6 +37,7 @@ describe("sagas: legacyFetchStructureSaga", () => {
     dataStructureId: id,
     version,
     note_fields: ["note_field"],
+    withoutGrants: false,
   };
 
   const structureFieldColumns = [{ name: "id" }, { name: "note.note_field" }];
@@ -94,6 +95,41 @@ describe("sagas: legacyFetchStructureSaga", () => {
       dataStructureId: id,
       version,
       note_fields: ["note_field"],
+      withoutGrants: false,
+    };
+
+    expect(() => {
+      testSaga(legacyFetchStructureSaga, { payload })
+        .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
+        .put(legacyFetchStructure.request())
+        .next()
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: LEGACY_DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
+        .next({ data: { dataStructureVersion } })
+        .put({ meta, ...legacyFetchStructure.success(data) })
+        .next()
+        .put(legacyFetchStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should forward withoutGrants when set in payload", () => {
+    const payload = { id, withoutGrants: true };
+    const meta = { version };
+
+    const variables = {
+      dataStructureId: id,
+      version,
+      note_fields: ["note_field"],
+      withoutGrants: true,
     };
 
     expect(() => {

package/src/sagas/legacyFetchStructure.js

@@ -9,14 +9,14 @@ export function* legacyFetchStructureSaga({ payload }) {
     const structureFieldColumns = yield select(getStructureFieldColumns);
     const note_fields = _.flow(
       _.filter(({ name }) => name.startsWith("note.")),
-      _.map(({ name }) => name.split(".")[1])
+      _.map(({ name }) => name.split(".")[1]),
     )(structureFieldColumns);
 
     const client = yield getContext("client");
 
     yield put(legacyFetchStructure.request());
 
-    const { id, version = "latest" } = payload;
+    const { id, version = "latest", withoutGrants = false } = payload;
     const {
       data: { dataStructureVersion },
     } = yield call(client.query, {
@@ -26,6 +26,7 @@ export function* legacyFetchStructureSaga({ payload }) {
         dataStructureId: id,
         version,
         note_fields,
+        withoutGrants,
       },
     });
 

package/src/components/StructureSuggestions.js

@@ -1,88 +0,0 @@
-import _ from "lodash/fp";
-import React, { useEffect } from "react";
-import { Popup } from "semantic-ui-react";
-import { useIntl } from "react-intl";
-import { useParams } from "react-router";
-import { useSelector } from "react-redux";
-import PropTypes from "prop-types";
-import { useDataStructureSuggestions } from "../hooks/useStructures";
-import { defaultColumnsForStructureSelector } from "../selectors";
-import StructuresSearchResults from "./StructuresSearchResults";
-
-const SimilarityColumn = (similarity) => {
-  const { formatMessage } = useIntl();
-  return (
-    <Popup
-      content={formatMessage({ id: "suggestions.similarity.cosine.popup" })}
-      trigger={<span>{similarity.toFixed(3)}</span>}
-    />
-  );
-};
-
-const similarityColumnDefinition = {
-  name: "similarity",
-  fieldSelector: _.prop("similarity"),
-  fieldDecorator: SimilarityColumn,
-  width: 1,
-};
-const suggestionColumns = (state) =>
-  _.concat(defaultColumnsForStructureSelector(state))([
-    similarityColumnDefinition,
-  ]);
-
-export const StructureSuggestions = ({
-  selectedStructure,
-  handleSelectedStructure,
-  selectable,
-}) => {
-  const { business_concept_id: id, id: version } = useParams();
-  const { conceptLinks, columns } = useSelector((state) => ({
-    conceptLinks: state.conceptLinks,
-    columns: suggestionColumns(state),
-  }));
-
-  const {
-    trigger: fetchSuggestions,
-    data,
-    isMutating,
-  } = useDataStructureSuggestions();
-
-  useEffect(() => {
-    if (id && version && conceptLinks) {
-      fetchSuggestions({
-        resource: {
-          id,
-          version,
-          type: "concepts",
-          links: _.filter(
-            ({ resource_type }) => resource_type == "data_structure"
-          )(conceptLinks),
-        },
-      });
-    }
-  }, [id, version, conceptLinks]);
-
-  const structures = data?.data?.data || [];
-
-  return (
-    <StructuresSearchResults
-      loading={isMutating}
-      columns={columns}
-      size="small"
-      structures={structures}
-      selectedStructure={selectedStructure}
-      onSelect={handleSelectedStructure}
-      labelResults={false}
-      pagination={false}
-      selectable={selectable}
-    />
-  );
-};
-
-StructureSuggestions.propTypes = {
-  handleSelectedStructure: PropTypes.func,
-  selectedStructure: PropTypes.object,
-  selectable: PropTypes.bool,
-};
-
-export default StructureSuggestions;

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

@@ -1,93 +0,0 @@
-import React from "react";
-import { render, screen } from "@testing-library/react";
-import { useSelector } from "react-redux";
-import { useParams } from "react-router";
-import { useDataStructureSuggestions } from "../../hooks/useStructures";
-import StructureSuggestions from "../StructureSuggestions";
-import StructuresSearchResults from "../StructuresSearchResults";
-import * as selectors from "../../selectors";
-
-jest.mock("react-router", () => ({
-    useParams: jest.fn(),
-}));
-
-jest.mock("react-redux", () => ({
-    useSelector: jest.fn(),
-}));
-
-jest.mock("../../hooks/useStructures", () => ({
-    useDataStructureSuggestions: jest.fn(),
-}));
-
-jest.mock("../StructuresSearchResults", () => jest.fn(() => <div>MockSearchResults</div>));
-
-jest.mock("../../selectors", () => ({
-    defaultColumnsForStructureSelector: jest.fn(),
-}));
-
-describe("StructureSuggestions", () => {
-    const mockFetchSuggestions = jest.fn();
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-
-        selectors.defaultColumnsForStructureSelector.mockReturnValue([
-            { name: "name", fieldSelector: (x) => x.name },
-        ]);
-
-        useParams.mockReturnValue({ business_concept_id: "123", id: "456" });
-
-        useSelector.mockImplementation((selectorFn) =>
-            selectorFn({
-                conceptLinks: [
-                    { resource_type: "data_structure", id: "ds1" },
-                    { resource_type: "other", id: "not-ds" },
-                ],
-                // mock of defaultColumnsForStructureSelector + similarity column
-                columns: [
-                    { name: "name", fieldSelector: (x) => x.name },
-                    { name: "similarity", fieldSelector: (x) => x.similarity },
-                ],
-            })
-        );
-
-        useDataStructureSuggestions.mockReturnValue({
-            trigger: mockFetchSuggestions,
-            data: {
-                data: {
-                    data: [
-                        { id: "structure1", similarity: 0.89 },
-                        { id: "structure2", similarity: 0.77 },
-                    ],
-                },
-            },
-            isMutating: false,
-        });
-    });
-
-    it("calls fetchSuggestions on mount with correct parameters", () => {
-        render(<StructureSuggestions selectedStructure={null} handleSelectedStructure={jest.fn()} selectable={true} />);
-
-        expect(mockFetchSuggestions).toHaveBeenCalledWith({
-            resource: {
-                id: "123",
-                version: "456",
-                type: "concepts",
-                links: [{ resource_type: "data_structure", id: "ds1" }],
-            },
-        });
-    });
-
-    it("renders StructuresSearchResults with props", () => {
-        render(<StructureSuggestions selectedStructure={{}} handleSelectedStructure={jest.fn()} selectable={false} />);
-
-        expect(screen.getByText("MockSearchResults")).toBeInTheDocument();
-        const props = StructuresSearchResults.mock.calls[0][0];
-        expect(props.structures).toEqual([
-            { id: "structure1", similarity: 0.89 },
-            { id: "structure2", similarity: 0.77 },
-        ]);
-        expect(props.loading).toBe(false);
-        expect(props.selectable).toBe(false);
-    });
-});