@truedat/dd 7.8.1 → 7.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.8.1",
+  "version": "7.8.2",
   "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.7.2",
+    "@truedat/test": "7.8.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": "c5687bea50fd81f4899bdadb4a25e459dacd58ec"
+  "gitHead": "666bad523fceed945598849935266d7c46a46432"
 }

package/src/components/StructuresUploadOption.js

@@ -1,16 +1,16 @@
 import PropTypes from "prop-types";
-import { useDispatch } from "react-redux";
+import { useWebContext } from "@truedat/core/webContext";
 import { Dropdown } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { UploadModal } from "@truedat/core/components";
-import { uploadStructures } from "../routines";
 import { useDataStructureUpload } from "../hooks/useStructures";
+import { getUploadAlertMessage } from "../selectors/messages";
 
 export const StructuresUploadOption = ({ canAutoPublish }) => {
   const { formatMessage, locale } = useIntl();
   const { trigger: triggerUpload, isMutating: structuresUploading } =
     useDataStructureUpload();
-  const dispatch = useDispatch();
+  const { setAlertMessage } = useWebContext();
   const extraAction = {
     key: "yesWithAutoPublish",
     primary: true,
@@ -19,7 +19,8 @@ export const StructuresUploadOption = ({ canAutoPublish }) => {
       data.append("auto_publish", canAutoPublish);
       data.append("lang", locale);
       triggerUpload(data).then(({ status, data }) => {
-        dispatch(uploadStructures.success({ status, data }));
+        const alertMessate = getUploadAlertMessage({ status, data });
+        setAlertMessage(alertMessate);
       });
     },
   };
@@ -45,7 +46,8 @@ export const StructuresUploadOption = ({ canAutoPublish }) => {
       handleSubmit={(data) => {
         data.append("lang", locale);
         triggerUpload(data).then(({ status, data }) => {
-          dispatch(uploadStructures.success({ status, data }));
+          const alertMessate = getUploadAlertMessage({ status, data });
+          setAlertMessage(alertMessate);
         });
       }}
     />

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

@@ -5,7 +5,6 @@ import {
   updateReferenceDataset,
   updateStructureType,
   updateStructure,
-  uploadStructures,
 } from "../../routines";
 import { structureRedirect, initialState } from "../structureRedirect";
 
@@ -47,14 +46,6 @@ describe("reducers: structureRedirect", () => {
     ).toBe(fooState);
   });
 
-  it("should be /structures after receiving uploadStructures.SUCCESS", () => {
-    expect(
-      structureRedirect(fooState, {
-        type: uploadStructures.SUCCESS,
-      })
-    ).toBe("/structures");
-  });
-
   it("should be /referenceDatasets/42 after receiving createReferenceDataset.SUCCESS", () => {
     expect(
       structureRedirect(

package/src/reducers/ddMessage.js

@@ -1,98 +1,43 @@
 import _ from "lodash/fp";
 import { dismissAlert } from "@truedat/core/routines";
-import { STRUCTURES_UPLOAD_EVENTS } from "@truedat/core/routes";
+import { getUploadAlertMessage } from "../selectors/messages";
 import {
   bulkUpdateStructures,
   createReferenceDataset,
   deleteReferenceDataset,
   updateReferenceDataset,
-  uploadStructures,
   updateStructureType,
   uploadStructuresDomains,
 } from "../routines";
 
 export const initialState = null;
 
-const bulkUpdateErrors = (payload) => {
-  const messagesImp = _.has("errors")(payload.data)
-    ? _.flow(
-        _.propOr([], "errors"),
-        _.map((error) => ({
-          id: `structures.bulkUpdateStructures.failed.note.${error.message}`,
-          fields: {
-            row: error.row,
-            id: error.id,
-            field: error.field,
-            externalId: error.external_id,
-            message: error.message,
-          },
-          defaultMessage: "structures.bulkUploadStructures.success.errors",
-        }))
-      )(payload.data)
-    : "";
-  return {
-    error: false,
-    header: "structures.bulkUpdateStructures.success.header",
-    icon: "check",
-    color: payload.data.errors.length >= 1 ? "orange" : "green",
-    text: "",
-    messages: messagesImp,
-    fields: {
-      count_ids: payload.data.ids.length,
-      count_errors: payload.data.errors.length,
-    },
-    downloadable: true,
-    initialMaxListItems: 5,
-  };
-};
-
-const bulkUpdateAccepted = () => {
-  return {
-    error: false,
-    header: "structures.bulkUpdateStructures.success.accepted.header",
-    icon: "check",
-    color: "blue",
-    text: "",
-    anchor: {
-      reference: STRUCTURES_UPLOAD_EVENTS,
-      label: "sidemenu.structures_upload_events",
-    },
-  };
-};
-
 const ddMessage = (state = initialState, { type, payload }) => {
   switch (type) {
     case dismissAlert.TRIGGER:
       return initialState;
-    case uploadStructures.SUCCESS:
-    case bulkUpdateStructures.SUCCESS: {
-      if (payload.status === 202) {
-        return bulkUpdateAccepted(payload.data);
-      } else if (payload.status === 200) {
-        return bulkUpdateErrors(payload);
-      }
-    }
-
+    case bulkUpdateStructures.SUCCESS:
+      return getUploadAlertMessage(payload);
     case uploadStructuresDomains.SUCCESS: {
       const messagesImp = _.has("errors")(payload.data)
         ? _.flow(
-            _.propOr([], "errors"),
-            _.map((error) => {
-              const errorMessage = Object.entries(error.message)
-                .map(([field, messages]) => `${field}: ${messages.join(", ")}`)
-                .join(" | ");
-              return {
-                id: `structures.bulkUploadStructuresDomains.success.errors.${errorMessage}`,
-                fields: {
-                  row: error.row,
-                  id: error.id,
-                  field: error.field,
-                  externalId: error.external_id,
-                  message: errorMessage,
-                },
-              };
-            })
-          )(payload.data)
+          _.propOr([], "errors"),
+          _.map((error) => {
+            const errorMessage = Object.entries(error.message)
+              .map(([field, messages]) => `${field}: ${messages.join(", ")}`)
+              .join(" | ");
+            return {
+              id: `structures.bulkUploadStructuresDomains.success.errors.${errorMessage}`,
+              fields: {
+                row: error.row,
+                id: error.id,
+                field: error.field,
+                externalId: error.external_id,
+                message: errorMessage,
+              },
+            };
+          })
+        )(payload.data)
         : "";
       return {
         error: false,
@@ -114,12 +59,12 @@ const ddMessage = (state = initialState, { type, payload }) => {
       return payload.status !== 422
         ? state
         : {
-            error: true,
-            header: "structures.uploadStructuresDomains.failed.header",
-            icon: "attention",
-            content: payload?.data?.error?.message,
-            initialMaxListItems: 5,
-          };
+          error: true,
+          header: "structures.uploadStructuresDomains.failed.header",
+          icon: "attention",
+          content: payload?.data?.error?.message,
+          initialMaxListItems: 5,
+        };
 
     case updateStructureType.SUCCESS:
       return {
@@ -128,43 +73,6 @@ const ddMessage = (state = initialState, { type, payload }) => {
         icon: "check",
         color: "green",
       };
-
-    case uploadStructures.FAILURE:
-      if (payload.status != 500) {
-        const { data } = payload;
-
-        const row = _.path("errors.row")(data);
-        const field = _.path("errors.field")(data);
-        const messages = _.has("errors")(data)
-          ? _.flow(
-              _.propOr([], "errors"),
-              _.toPairs,
-              _.filter(([k, _v]) => k !== "row" && k !== "field"),
-              _.map(([k, v]) =>
-                _.map((e) => ({
-                  id: `structures.uploadStructures.failed.${k}.${e}`,
-                  fields: { row, field },
-                  defaultMessage: "structures.uploadStructures.failed.default",
-                }))(v)
-              ),
-              _.flatten
-            )(data)
-          : _.flow(_.path("error.message"), (m) => [
-              {
-                id: `structures.uploadStructures.failed.${m}`,
-                defaultMessage: "structures.uploadStructures.failed.default",
-              },
-            ])(data);
-        return {
-          error: true,
-          header: "structures.uploadStructures.failed.header",
-          icon: "attention",
-          text: "",
-          messages,
-        };
-      } else {
-        return state;
-      }
     case createReferenceDataset.SUCCESS:
       return {
         error: false,

package/src/reducers/structureRedirect.js

@@ -33,7 +33,6 @@ import {
   updateStructureType,
   updateSystem,
   updateTag,
-  uploadStructures,
 } from "../routines";
 
 export const initialState = "";
@@ -67,9 +66,6 @@ export const structureRedirect = (
         ? linkTo.GRANT_REQUEST({ id: requests[0].id })
         : MY_GRANT_REQUESTS;
     }
-    case uploadStructures.SUCCESS: {
-      return STRUCTURES;
-    }
     case doStructureNoteAction.SUCCESS: {
       return meta?.redirect
         ? linkTo.STRUCTURE_NOTES({ id: meta?.data_structure_id })

package/src/routines.js

@@ -170,7 +170,6 @@ export const updateStructure = createRoutine("UPDATE_STRUCTURE");
 export const updateStructureType = createRoutine("UPDATE_STRUCTURE_TYPE");
 export const updateSystem = createRoutine("UPDATE_SYSTEM");
 export const updateTag = createRoutine("UPDATE_TAG");
-export const uploadStructures = createRoutine("UPLOAD_STRUCTURES");
 export const uploadStructuresDomains = createRoutine(
   "UPLOAD_STRUCTURES_DOMAINS"
 );

package/src/selectors/messages.js

@@ -0,0 +1,58 @@
+
+import { STRUCTURES_UPLOAD_EVENTS } from "@truedat/core/routes";
+
+const uploadWithErrors = (data) => {
+    const messagesImp = _.has("errors")(data)
+        ? _.flow(
+            _.propOr([], "errors"),
+            _.map((error) => ({
+                id: `structures.bulkUpdateStructures.failed.note.${error.message}`,
+                fields: {
+                    row: error.row,
+                    id: error.id,
+                    field: error.field,
+                    externalId: error.external_id,
+                    message: error.message,
+                },
+                defaultMessage: "structures.bulkUploadStructures.success.errors",
+            }))
+        )(data)
+        : "";
+    return {
+        error: false,
+        header: "structures.bulkUpdateStructures.success.header",
+        icon: "check",
+        color: data.errors.length >= 1 ? "orange" : "green",
+        text: "",
+        messages: messagesImp,
+        fields: {
+            count_ids: data.ids.length,
+            count_errors: data.errors.length,
+        },
+        downloadable: true,
+        initialMaxListItems: 5,
+    };
+};
+
+const uploadAccepted = () => {
+    return {
+        error: false,
+        header: "structures.bulkUpdateStructures.success.accepted.header",
+        icon: "check",
+        color: "blue",
+        text: "",
+        anchor: {
+            reference: STRUCTURES_UPLOAD_EVENTS,
+            label: "sidemenu.structures_upload_events",
+        },
+    };
+};
+
+export const getUploadAlertMessage = ({ status, data }) => {
+    if (status === 202) {
+        return uploadAccepted();
+    }
+    if (status === 200) {
+        return uploadWithErrors(data);
+    }
+};