@truedat/dd 8.1.1 → 8.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.1.1",
+  "version": "8.1.4",
   "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": "8.1.1",
+    "@truedat/test": "8.1.4",
     "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": "26ff4767ae2a60605d4958208ca73d91cfe7f81a"
+  "gitHead": "49d0d43e081d0f631f221d8f5992e390098b3630"
 }

package/src/components/DictionaryRoutes.js

@@ -11,7 +11,6 @@ import {
   PROFILE_GROUP,
   REFERENCE_DATASETS,
   STRUCTURES,
-  STRUCTURES_UPLOAD_EVENTS,
   STRUCTURE_TAGS,
   STRUCTURE_TYPES,
   SYSTEMS,
@@ -40,6 +39,8 @@ import {
 } from "./CatalogViewConfigForm";
 import StructuresView from "./StructuresView";
 import BucketView from "./BucketView";
+import UploadJobs from "@truedat/core/components/UploadJobs";
+import UploadJob from "@truedat/core/components/UploadJob";
 
 const TemplatesLoader = React.lazy(
   () => import("@truedat/core/components/TemplatesLoader")
@@ -99,19 +100,25 @@ export default function DictionaryRoutes() {
           </ProtectedRoute>
         }
       />
-      <Route
-        path="/structureNotes"
-        element={
-          <>
-            <SystemsLoader />
-            <PendingStructureNotes
-              defaultFilters={{
-                note_status: ["rejected", "draft", "pending_approval"],
-              }}
-            />
-          </>
-        }
-      />
+      <Route path="/structureNotes/*">
+        <Route
+          index
+          element={
+            <>
+              <SystemsLoader />
+              <PendingStructureNotes
+                defaultFilters={{
+                  note_status: ["rejected", "draft", "pending_approval"],
+                }}
+              />
+            </>
+          }
+        />
+        <Route path="uploadJobs">
+          <Route index element={<UploadJobs scope="notes" />} />
+          <Route path=":id" element={<UploadJob scope="notes" />} />
+        </Route>
+      </Route>
 
       <Route path="/bucketViewConfigs">
         <Route index element={<CatalogViewConfigs />} />

package/src/components/StructureNoteLink.js

@@ -0,0 +1,19 @@
+import PropTypes from "prop-types";
+import { Link } from "react-router";
+import { linkTo } from "@truedat/core/routes";
+
+export const StructureNoteLink = ({ data_structure_id, external_id }) =>
+  data_structure_id ? (
+    <Link to={linkTo.STRUCTURE_NOTES({ id: data_structure_id })}>
+      {external_id}
+    </Link>
+  ) : (
+    external_id
+  );
+
+StructureNoteLink.propTypes = {
+  data_structure_id: PropTypes.number,
+  external_id: PropTypes.string,
+};
+
+export default StructureNoteLink;

package/src/components/StructuresUploadOption.js

@@ -4,13 +4,30 @@ import { Dropdown } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { UploadModal } from "@truedat/core/components";
 import { useDataStructureUpload } from "../hooks/useStructures";
-import { getUploadAlertMessage } from "../selectors/messages";
+import { linkTo } from "@truedat/core/routes";
+
+const buildAlertResult =
+  (setAlertMessage) =>
+    ({ data }) => {
+      setAlertMessage({
+        error: false,
+        header: "structures.bulkUpload.alert.success.header",
+        icon: "check",
+        color: "blue",
+        text: "",
+        anchor: {
+          reference: linkTo.STRUCTURE_NOTES_UPLOAD_JOB({ id: data.job_id }),
+          label: "structures.bulkUpload.job.header",
+        },
+      });
+    };
 
 export const StructuresUploadOption = ({ canAutoPublish }) => {
   const { formatMessage, locale } = useIntl();
   const { trigger: triggerUpload, isMutating: structuresUploading } =
     useDataStructureUpload();
   const { setAlertMessage } = useWebContext();
+  const alertResult = buildAlertResult(setAlertMessage);
   const extraAction = {
     key: "yesWithAutoPublish",
     primary: true,
@@ -18,10 +35,7 @@ export const StructuresUploadOption = ({ canAutoPublish }) => {
     onClick: (data) => {
       data.append("auto_publish", canAutoPublish);
       data.append("lang", locale);
-      triggerUpload(data).then(({ status, data }) => {
-        const alertMessate = getUploadAlertMessage({ status, data });
-        setAlertMessage(alertMessate);
-      });
+      triggerUpload(data).then(alertResult);
     },
   };
 
@@ -45,10 +59,7 @@ export const StructuresUploadOption = ({ canAutoPublish }) => {
       param="structures"
       handleSubmit={(data) => {
         data.append("lang", locale);
-        triggerUpload(data).then(({ status, data }) => {
-          const alertMessate = getUploadAlertMessage({ status, data });
-          setAlertMessage(alertMessate);
-        });
+        triggerUpload(data).then(alertResult);
       }}
     />
   );

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

@@ -10,7 +10,7 @@ import {
   SYSTEMS,
   STRUCTURE_TAGS,
   STRUCTURE_TYPES,
-  STRUCTURES_UPLOAD_EVENTS,
+  STRUCTURE_NOTES_UPLOAD_JOBS,
   PENDING_STRUCTURE_NOTES,
   REFERENCE_DATASETS,
   PROFILE_GROUP,
@@ -156,7 +156,7 @@ describe("<DictionaryRoutes />", () => {
 
   it("renders correctly with structures upload events route", async () => {
     const rendered = render(<DictionaryRoutes />, {
-      routes: [STRUCTURES_UPLOAD_EVENTS],
+      routes: [STRUCTURE_NOTES_UPLOAD_JOBS],
     });
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();

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

@@ -0,0 +1,45 @@
+import { render } from "@truedat/test/render";
+import { StructureNoteLink } from "../StructureNoteLink";
+
+describe("<StructureNoteLink />", () => {
+  it("renders a link to structure notes when data_structure_id is provided", () => {
+    const rendered = render(
+      <StructureNoteLink
+        data_structure_id={42}
+        external_id="my-structure-id"
+      />
+    );
+    const link = rendered.container.querySelector('a[href="/structures/42/notes"]');
+    expect(link).toBeInTheDocument();
+    expect(rendered.getByText(/my-structure-id/i)).toBeInTheDocument();
+  });
+
+  it("renders only external_id as text when data_structure_id is not provided", () => {
+    const rendered = render(
+      <StructureNoteLink external_id="some-external-id" />
+    );
+    expect(rendered.getByText(/some-external-id/i)).toBeInTheDocument();
+    expect(rendered.container.querySelector("a")).not.toBeInTheDocument();
+  });
+
+  it("renders only external_id when data_structure_id is zero", () => {
+    const rendered = render(
+      <StructureNoteLink data_structure_id={0} external_id="zero-id" />
+    );
+    expect(rendered.getByText(/zero-id/i)).toBeInTheDocument();
+    expect(rendered.container.querySelector("a")).not.toBeInTheDocument();
+  });
+
+  it("renders link with correct href for different structure id", () => {
+    const rendered = render(
+      <StructureNoteLink
+        data_structure_id={100}
+        external_id="structure-100"
+      />
+    );
+    expect(
+      rendered.container.querySelector('a[href="/structures/100/notes"]')
+    ).toBeInTheDocument();
+    expect(rendered.getByText(/structure-100/i)).toBeInTheDocument();
+  });
+});

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

@@ -120,8 +120,45 @@ exports[`<DictionaryRoutes /> renders correctly with structures route 1`] = `
 
 exports[`<DictionaryRoutes /> renders correctly with structures upload events route 1`] = `
 <div>
-  <div>
-    StructuresUploadEvents
+  <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>
 </div>
 `;

package/src/components/index.js

@@ -22,6 +22,7 @@ import StructureItemRoot from "./StructureItemRoot";
 import StructureStructureLinks from "./StructureStructureLinks";
 import StructureLoader from "./StructureLoader";
 import StructureNav from "./StructureNav";
+import StructureNoteLink from "./StructureNoteLink";
 import StructureNotes from "./StructureNotes";
 import StructureNotesEdit from "./StructureNotesEdit";
 import StructureProperties from "./StructureProperties";
@@ -75,6 +76,7 @@ export {
   StructureStructureLinks,
   StructureLoader,
   StructureNav,
+  StructureNoteLink,
   StructureNotes,
   StructureNotesEdit,
   StructureProperties,

package/src/selectors/messages.js

@@ -1,5 +1,5 @@
 
-import { STRUCTURES_UPLOAD_EVENTS } from "@truedat/core/routes";
+import { STRUCTURE_NOTES_UPLOAD_JOBS } from "@truedat/core/routes";
 
 const uploadWithErrors = (data) => {
     const messagesImp = _.has("errors")(data)
@@ -42,7 +42,7 @@ const uploadAccepted = () => {
         color: "blue",
         text: "",
         anchor: {
-            reference: STRUCTURES_UPLOAD_EVENTS,
+            reference: STRUCTURE_NOTES_UPLOAD_JOBS,
             label: "sidemenu.structures_upload_events",
         },
     };