@truedat/bg 7.9.0 → 7.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "7.9.0",
+  "version": "7.10.0",
   "description": "Truedat Web Business Glossary",
   "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.9.0",
+    "@truedat/test": "7.10.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -81,5 +81,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "cde305c9a8ae5657b9302c6a3f668fa897de2de5"
+  "gitHead": "3686b363b2a2218fe3ddb5782df9fe51fabf75e1"
 }

package/src/concepts/api.js

@@ -10,8 +10,8 @@ const API_BUSINESS_CONCEPT_VERSIONS_SEARCH =
 const API_BUSINESS_CONCEPT_VERSIONS_UPLOAD =
   "/api/business_concept_versions/upload";
 const API_CONCEPT_ARCHIVE = "/api/business_concepts/:id/versions";
-const API_CONCEPT_LINKS_DOWNLOAD =
-  "/api/business_concept_versions/links/download";
+const API_CONCEPT_LINKS_DOWNLOAD = "/api/business_concept_versions/links/download";
+const API_CONCEPT_LINKS_UPLOAD = "/api/relations/links/upload";
 const API_CONCEPT_FILTERS = "/api/business_concept_filters/search";
 const API_CONCEPT_SHARED_DOMAINS = "/api/business_concepts/:id/shared_domains";
 const API_BUSINESS_CONCEPT_BULK_UPDATE =
@@ -30,6 +30,7 @@ export {
   API_BUSINESS_CONCEPT_VERSIONS_UPLOAD,
   API_CONCEPT_ARCHIVE,
   API_CONCEPT_LINKS_DOWNLOAD,
+  API_CONCEPT_LINKS_UPLOAD,
   API_CONCEPT_FILTERS,
   API_CONCEPT_SHARED_DOMAINS,
   API_BUSINESS_CONCEPT_BULK_UPDATE,

package/src/concepts/components/ConceptLinksUploadButton.js

@@ -0,0 +1,61 @@
+import { Button } from "semantic-ui-react";
+import { FormattedMessage, useIntl } from "react-intl";
+import { UploadModal } from "@truedat/core/components";
+import { useConceptLinksUpload } from "../hooks/useConcepts";
+import { useWebContext } from "@truedat/core/webContext";
+import { getUploadAlertMessage } from "../selectors/messages";
+
+export const ConceptLinksUploadButton = () => {
+  const { formatMessage } = useIntl();
+  const { trigger: triggerUpload, isMutating: loading } =
+    useConceptLinksUpload();
+  const { setAlertMessage } = useWebContext();
+
+  return (
+    <UploadModal
+      icon="upload"
+      trigger={
+        <Button
+          secondary
+          floated="right"
+          icon="upload"
+          loading={loading}
+          data-tooltip={formatMessage({
+            id: "concepts.actions.upload_links.tooltip",
+          })}
+        />
+      }
+      header={
+        <FormattedMessage id="concepts.actions.upload_links.confirmation.header" />
+      }
+      content={
+        <FormattedMessage id="concepts.actions.upload.confirmation.content" />
+      }
+      param="relations"
+      handleSubmit={(data) => {
+        data.append("source", "business_concept");
+        data.append("target", "data_structure");
+        triggerUpload(data)
+          .then(({ status, data }) => {
+            const alertMessage = getUploadAlertMessage({ status, data });
+            console.log("alertMessage --->", alertMessage);
+            setAlertMessage(alertMessage);
+          })
+          .catch((error) => {
+            console.log("error --->", error);
+            if (error.response) {
+              const { status, data } = error.response;
+              const alertMessage = getUploadAlertMessage({ status, data });
+              console.log("error response alertMessage --->", alertMessage);
+              setAlertMessage(alertMessage);
+            } else {
+              console.log("error.message --->", error.message);
+              setAlertMessage(error.message);
+            }
+          });
+      }}
+    />
+  );
+};
+
+export default ConceptLinksUploadButton;

package/src/concepts/components/ConceptsUploadEventsTable.js

@@ -16,18 +16,21 @@ const getColumnsWithData = (conceptsResults, columns) =>
   )(columns);
 
 const messagesImp = (data) => {
-  return _.has("errors")(data)
-    ? _.flow(
-        _.propOr([], "errors"),
-        _.map((error) => ({
-          id: error.body.message,
-          context: {
-            ...error.body.context,
-          },
-          defaultMessage: "concepts.upload.failed.success.errors",
-        }))
-      )(data)
-    : [];
+  const errors = data?.errors ?? [];
+  return _.map((error) => {
+    if (!error || !error.body)
+      return {
+        id: "unknown_error",
+        context: {},
+        defaultMessage: "concepts.upload.failed.success.errors",
+      };
+
+    return {
+      id: error.body.message ?? "unknown_error",
+      context: { ...error.body.context } ?? {},
+      defaultMessage: "concepts.upload.failed.success.errors",
+    };
+  }, errors);
 };
 
 const ConceptsUploadEventsTable = ({ getColumns }) => {
@@ -38,33 +41,51 @@ const ConceptsUploadEventsTable = ({ getColumns }) => {
   const events =
     data && !loading
       ? _.reduce(
-          (acc, event) => ({
-            ...acc,
-            [`${event.task_reference}_${event.status}`]: {
+          (acc, event) => {
+            const eventKey = `${event.task_reference}_${event.status}`;
+
+            const node = event.node ?? "";
+            const hasErrors =
+              event.response?.errors && !_.isEmpty(event.response.errors);
+
+            const messageId = _.startsWith("lm@", node)
+              ? hasErrors
+                ? "concepts.upload.success.header_with_errors_without_update"
+                : "concepts.upload.success.header"
+              : hasErrors
+                ? "concepts.upload.success.header_with_errors"
+                : "concepts.upload.success.header";
+
+            const translatedHeader = event.response
+              ? formatMessage(
+                  { id: messageId },
+                  {
+                    count_created: event.response.created?.length ?? 0,
+                    count_updated: event.response.updated?.length ?? 0,
+                    count_errors: event.response.errors?.length ?? 0,
+                  }
+                )
+              : "";
+
+            const translatedErrors = _.map((error) =>
+              formatMessage(
+                { id: error.id ?? "unknown_error" },
+                error.context ?? {}
+              )
+            )(messagesImp(event.response));
+
+            acc[eventKey] = {
               ...event,
               response: {
                 ...event.response,
-                translatedHeader: !event.response
-                  ? ""
-                  : formatMessage(
-                      {
-                        id: _.isEmpty(event.response.errors)
-                          ? "concepts.upload.success.header"
-                          : "concepts.upload.success.header_with_errors",
-                      },
-                      {
-                        count_created: event.response.created.length,
-                        count_updated: event.response.updated.length,
-                        count_errors: event.response.errors.length,
-                      }
-                    ),
-                translatedErrors: _.map((error) =>
-                  formatMessage({ id: error.id }, error.context)
-                )(messagesImp(event.response)),
+                translatedHeader,
+                translatedErrors,
               },
               expanded: false,
-            },
-          }),
+            };
+
+            return acc;
+          },
           {},
           data.data
         )

package/src/concepts/components/__tests__/ConceptLinksUploadButton.spec.js

@@ -0,0 +1,36 @@
+import { waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
+import { ConceptLinksUploadButton } from "../ConceptLinksUploadButton";
+
+jest.mock("react-dropzone", () => ({
+  useDropzone: jest.fn(() => ({
+    getRootProps: jest.fn(),
+    getInputProps: jest.fn(),
+    isDragActive: false,
+    open: jest.fn(),
+  })),
+}));
+
+jest.mock("@truedat/core/hooks", () => ({
+  useAuthorized: jest.fn(() => true),
+}));
+
+const props = {
+  loading: false,
+};
+
+describe("<ConceptLinksUploadButton />", () => {
+  it("matches the latest snapshot", async () => {
+    const user = userEvent.setup({ delay: null });
+    const rendered = render(<ConceptLinksUploadButton {...props} />);
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByRole("button"));
+    await waitFor(() =>
+      expect(rendered.getByRole("presentation")).toBeInTheDocument()
+    );
+
+    expect(rendered.container).toMatchSnapshot();
+  });
+});

package/src/concepts/components/__tests__/__snapshots__/ConceptLinksUploadButton.spec.js.snap

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ConceptLinksUploadButton /> matches the latest snapshot 1`] = `
+<div>
+  <button
+    class="ui icon secondary right floated button"
+    data-tooltip="concepts.actions.upload_links.tooltip"
+  >
+    <i
+      aria-hidden="true"
+      class="upload icon"
+    />
+  </button>
+</div>
+`;

package/src/concepts/hooks/useConcepts.js

@@ -9,6 +9,7 @@ import {
   API_BUSINESS_CONCEPT_VERSIONS_SEARCH,
   API_BUSINESS_CONCEPT_VERSIONS_ACTIONS,
   API_BUSINESS_CONCEPT_VERSIONS_UPLOAD,
+  API_CONCEPT_LINKS_UPLOAD,
 } from "../api";
 
 function saveFile({ data, headers }) {
@@ -60,3 +61,9 @@ export const useConceptsUpload = () => {
     apiJsonPost(url, arg)
   );
 };
+
+export const useConceptLinksUpload = () => {
+  return useSWRMutations(API_CONCEPT_LINKS_UPLOAD, (url, { arg }) =>
+    apiJsonPost(url, arg)
+  );
+};

package/src/concepts/relations/components/ConceptSelector.js

@@ -18,6 +18,7 @@ import {
 import ConceptsPagination from "../../components/ConceptsPagination";
 import { mapStatusColor } from "../../constants/mappings";
 import { translations } from "../../utils/filterOptions";
+import ConceptLinksUploadButton from "../../components/ConceptLinksUploadButton";
 
 import {
   useConceptLinksDownload,
@@ -103,7 +104,7 @@ export function ConceptSelectorContent({
         )(concept)
       : false;
   };
-
+ 
   return (
     <>
       {showTitle && (
@@ -112,7 +113,8 @@ export function ConceptSelectorContent({
         </label>
       )}
       <Segment>
-        {conceptsActions?.downloadLinks && (
+        {conceptsActions?.downloadLinks && ( 
+         <>
           <Button
             icon="download"
             floated="right"
@@ -122,7 +124,9 @@ export function ConceptSelectorContent({
             data-tooltip={formatMessage({
               id: "concepts.actions.downloadLinks.tooltip",
             })}
-          />
+          />        
+            <ConceptLinksUploadButton />
+         </>
         )}
         <SearchWidget />
         {!_.isEmpty(concepts) || selectedConcept ? (

package/src/concepts/relations/components/__tests__/__snapshots__/ConceptSelector.spec.js.snap

@@ -17,6 +17,15 @@ exports[`<ConceptSelector /> matches the latest snapshot 1`] = `
         class="download icon"
       />
     </button>
+    <button
+      class="ui icon secondary right floated button"
+      data-tooltip="concepts.actions.upload_links.tooltip"
+    >
+      <i
+        aria-hidden="true"
+        class="upload icon"
+      />
+    </button>
     <div
       class="ui action left icon input"
     >

package/src/concepts/routines.js

@@ -5,6 +5,7 @@ export const conceptAction = createRoutine("CONCEPT_ACTION");
 export const downloadConcepts = createRoutine("DOWNLOAD_CONCEPTS");
 export const fetchConcept = createRoutine("FETCH_CONCEPT");
 export const fetchConceptArchive = createRoutine("FETCH_CONCEPT_ARCHIVE");
+export const uploadConcepts = createRoutine("UPLOAD_CONCEPTS");
 
 export const bulkUpdate = createRoutine("BULK_UPDATE");
 export const bulkUpdateQuery = createRoutine("BULK_UPDATE_QUERY");

package/src/concepts/selectors/messages.js

@@ -2,31 +2,45 @@ import _ from "lodash/fp";
 import { CONCEPTS_BULK_UPLOAD_EVENTS } from "@truedat/core/routes";
 
 export const getUploadAlertMessage = ({ status, data }) => {
-    if (status === 202) {
-        return {
-            error: false,
-            header: "concepts.upload.success.accepted.header",
-            icon: "check",
-            color: "blue",
-            text: "",
-            anchor: {
-                reference: CONCEPTS_BULK_UPLOAD_EVENTS,
-                label: "sidemenu.concepts_upload_events",
-            },
-        };
-    }
+  if (status === 202) {
+    return {
+      error: false,
+      header: "concepts.upload.success.accepted.header",
+      icon: "check",
+      color: "blue",
+      text: "",
+      anchor: {
+        reference: CONCEPTS_BULK_UPLOAD_EVENTS,
+        label: "sidemenu.concepts_upload_events",
+      },
+    };
+  }
 
-    if (status != 500 && !_.prop("errors")(data)) {
-        return {
-            error: true,
-            header: "concepts.upload.failed.header",
-            content: `concepts.upload.failed.${_.path("error.error")(payload) || _.prop("error")(payload)
-                }`,
-            icon: "attention",
-            text: "",
-            fields: _.prop("error")(payload),
-        };
-    } else {
-        return null;
-    }
-}
+  if (status == 400 && !_.prop("errors")(data)) {
+    return {
+      error: true,
+      header: "concepts.upload.failed.header.default",
+      content: `concepts.upload.failed.${
+        _.path("error.error")(data) || _.prop("error")(data)
+      }`,
+      icon: "attention",
+      text: "",
+      fields: _.prop("error")(data),
+    };
+  }
+
+  if (status != 500 && !_.prop("errors")(data)) {
+    return {
+      error: true,
+      header: "concepts.upload.failed.header",
+      content: `concepts.upload.failed.${
+        _.path("error.error")(data) || _.prop("error")(data)
+      }`,
+      icon: "attention",
+      text: "",
+      fields: _.prop("error")(data),
+    };
+  } else {
+    return null;
+  }
+};

package/src/hooks/useDomains.js

@@ -8,7 +8,11 @@ import {
   apiJsonPatch,
   apiJsonDelete,
 } from "@truedat/core/services/api";
-import { API_DOMAINS, API_DOMAIN } from "../taxonomy/api";
+import {
+  API_DOMAINS,
+  API_DOMAIN,
+  API_DOMAIN_PARENTABLE_IDS,
+} from "../taxonomy/api";
 
 export const useDomains = () => {
   const toApiPath = compile(API_DOMAINS, "api");
@@ -34,6 +38,18 @@ export const useDomain = (id) => {
   };
 };
 
+export const useDomainParentableIds = (id) => {
+  const toApiPath = compile(API_DOMAIN_PARENTABLE_IDS, "api");
+  const url = toApiPath({ id: `${id}` });
+  const { data, error } = useSWR(url, apiJson);
+  return {
+    data: data?.data?.data,
+    actions: data?.data?._actions,
+    error,
+    loading: !error && !data,
+  };
+};
+
 export const useDomainCreate = () => {
   const toApiPath = compile(API_DOMAINS, "api");
   const url = toApiPath();

package/src/taxonomy/api.js

@@ -1,4 +1,5 @@
 const API_DOMAIN = "/api/domains/:id";
+const API_DOMAIN_PARENTABLE_IDS = "/api/domains/:id/parentable_ids";
 const API_DOMAINS = "/api/domains";
 
-export { API_DOMAIN, API_DOMAINS };
+export { API_DOMAIN, API_DOMAIN_PARENTABLE_IDS, API_DOMAINS };

package/src/taxonomy/components/DomainForm.js

@@ -46,7 +46,7 @@ const DEFAULTS = {
   domain_group: null,
 };
 
-export const DomainForm = ({ domain = {}, onSubmit }) => {
+export const DomainForm = ({ domain = {}, parentableIds = [], onSubmit }) => {
   const { data: domains } = useDomains();
   const { formatMessage } = useIntl();
   const { handleSubmit, control, formState, watch } = useForm({
@@ -67,7 +67,6 @@ export const DomainForm = ({ domain = {}, onSubmit }) => {
     domain?.domain_group?.status === "root" || !domain?.domain_group;
 
   const { errors, isDirty, isValid } = formState;
-  const parentableIds = domain.parentable_ids || [];
   const domainParentOptions =
     domain?.id && domains ? getDomainParentOptions(parentableIds)(domains) : [];
 
@@ -232,6 +231,7 @@ export const DomainForm = ({ domain = {}, onSubmit }) => {
 
 DomainForm.propTypes = {
   domain: PropTypes.object,
+  parentableIds: PropTypes.array,
   onSubmit: PropTypes.func.isRequired,
 };
 

package/src/taxonomy/components/EditDomain.js

@@ -8,11 +8,15 @@ import { linkTo } from "@truedat/core/routes";
 import { useQuery } from "@apollo/client";
 import { DOMAINS_QUERY } from "@truedat/core/api/queries";
 
-import { useDomainUpdate } from "../../hooks/useDomains";
+import {
+  useDomainUpdate,
+  useDomainParentableIds,
+} from "../../hooks/useDomains";
 import DomainForm from "./DomainForm";
 
 export const EditDomain = ({ domain }) => {
   const { trigger: updateDomain } = useDomainUpdate(domain.id);
+  const { data: parentableIds } = useDomainParentableIds(domain.id);
 
   const navigate = useNavigate();
   const { client } = useQuery(DOMAINS_QUERY, {
@@ -36,7 +40,11 @@ export const EditDomain = ({ domain }) => {
           <FormattedMessage id="domain.actions.edit.header" />
         </Header.Content>
       </Header>
-      <DomainForm onSubmit={handleUpdateDomain} domain={domain} />
+      <DomainForm
+        onSubmit={handleUpdateDomain}
+        domain={domain}
+        parentableIds={parentableIds}
+      />
     </Container>
   );
 };

package/src/taxonomy/components/__tests__/DomainForm.spec.js

@@ -174,10 +174,15 @@ describe("<DomainForm />", () => {
 
   it("should generate domain parent options", async () => {
     useDomains.mockImplementation(() => ({ data }));
-    const domain = { id: 2, parentable_ids: [1, 5, 6, 7] };
+    const domain = { id: 2 };
+    const parentableIds = [1, 5, 6, 7];
 
     const rendered = render(
-      <DomainForm domain={domain} onSubmit={jest.fn()} />
+      <DomainForm
+        domain={domain}
+        parentableIds={parentableIds}
+        onSubmit={jest.fn()}
+      />
     );
     await waitForLoad(rendered);
 

package/src/taxonomy/components/__tests__/EditDomain.spec.js

@@ -1,8 +1,12 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock } from "@truedat/test/mocks";
 import { EditDomain } from "../EditDomain";
+import { useDomainParentableIds } from "../../../hooks/useDomains";
 
-jest.mock("../../../hooks/useDomains");
+jest.mock("../../../hooks/useDomains", () => ({
+  ...jest.requireActual("../../../hooks/useDomains"),
+  useDomainParentableIds: jest.fn(() => {}),
+}));
 
 const renderOpts = {
   mocks: [
@@ -14,6 +18,9 @@ const renderOpts = {
 };
 
 describe("<EditDomain />", () => {
+  useDomainParentableIds.mockImplementation(() => ({
+    data: [],
+  }));
   const domain = { id: 1, name: "nn", description: "dd" };
 
   it("matches the latest snapshot", async () => {