@truedat/bg 7.8.1 → 7.8.2

package/package.json

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

package/src/concepts/components/ConceptsActions.js

@@ -6,7 +6,7 @@ import { connect } from "react-redux";
 import { Link } from "react-router";
 import { Button } from "semantic-ui-react";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
-import { downloadConcepts, uploadConcepts } from "../routines";
+import { downloadConcepts } from "../routines";
 import ConceptsUpdateButton from "./ConceptsUpdateButton";
 import ConceptsUploadButton from "./ConceptsUploadButton";
 
@@ -71,6 +71,6 @@ const mapStateToProps = ({ conceptsDownloading }) => ({
   conceptsDownloading: conceptsDownloading,
 });
 
-export default connect(mapStateToProps, { downloadConcepts, uploadConcepts })(
+export default connect(mapStateToProps, { downloadConcepts })(
   ConceptsActions
 );

package/src/concepts/components/ConceptsUploadButton.js

@@ -1,32 +1,34 @@
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
 import { Button } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { UploadModal } from "@truedat/core/components";
-import { API_BUSINESS_CONCEPT_VERSIONS_UPLOAD } from "../api";
-import { uploadConcepts } from "../routines";
+import { useConceptsUpload } from "../hooks/useConcepts";
+import { useWebContext } from "@truedat/core/webContext";
+import { getUploadAlertMessage } from "../selectors/messages";
 
-const uploadAction = {
-  method: "POST",
-  href: API_BUSINESS_CONCEPT_VERSIONS_UPLOAD,
-};
-export const ConceptsUploadButton = ({
-  uploadConcepts,
-  loading,
-  canAutoPublish,
-}) => {
+export const ConceptsUploadButton = ({ canAutoPublish }) => {
   const { formatMessage, locale } = useIntl();
+  const { trigger: triggerUpload, isMutating: conceptsLoading } = useConceptsUpload();
+  const { setAlertMessage } = useWebContext();
+
   const extraAction = {
     key: "yesWithAutoPublish",
     primary: true,
     content: formatMessage({ id: "uploadModal.accept.publish" }),
     onClick: (data) => {
       data.append("auto_publish", canAutoPublish);
-      return uploadConcepts({
-        action: "upload",
-        data,
-        lang: locale,
-        ...uploadAction,
+      data.append("lang", locale);
+      triggerUpload(data).then(({ status, data }) => {
+        const alertMessage = getUploadAlertMessage({ status, data });
+        setAlertMessage(alertMessage);
+      }).catch((error) => {
+        if (error.response) {
+          const { status, data } = error.response;
+          const alertMessage = getUploadAlertMessage({ status, data });
+          setAlertMessage(alertMessage);
+        } else {
+          setAlertMessage({ error: true, content: error.message });
+        }
       });
     },
   };
@@ -39,7 +41,7 @@ export const ConceptsUploadButton = ({
           secondary
           floated="right"
           icon="upload"
-          loading={loading}
+          loading={conceptsLoading}
           data-tooltip={formatMessage({
             id: "concepts.actions.upload.tooltip",
           })}
@@ -52,28 +54,24 @@ export const ConceptsUploadButton = ({
         <FormattedMessage id="concepts.actions.upload.confirmation.content" />
       }
       param="business_concepts"
-      handleSubmit={(data) =>
-        uploadConcepts({
-          action: "upload",
-          data,
-          lang: locale,
-          ...uploadAction,
-        })
-      }
+      handleSubmit={(data) => {
+        triggerUpload(data).then(({ status, data }) => {
+          const alertMessage = getUploadAlertMessage({ status, data });
+          setAlertMessage(alertMessage);
+        }).catch((error) => {
+          if (error.response) {
+            const { status, data } = error.response;
+            const alertMessage = getUploadAlertMessage({ status, data });
+            setAlertMessage(alertMessage);
+          } else {
+            setAlertMessage(error.message);
+          }
+        });
+      }}
     />
   );
 };
 
-ConceptsUploadButton.propTypes = {
-  uploadConcepts: PropTypes.func,
-  loading: PropTypes.bool,
-  canAutoPublish: PropTypes.bool,
-};
-
-const mapStateToProps = ({ uploadConceptsFile: { loading } }) => ({
-  loading,
-});
+ConceptsUploadButton.propTypes = { canAutoPublish: PropTypes.bool };
 
-export default connect(mapStateToProps, { uploadConcepts })(
-  ConceptsUploadButton
-);
+export default ConceptsUploadButton;

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

@@ -55,11 +55,6 @@ describe("<ConceptsActions />", () => {
         "uploadModal.accept.publish": "Upload and publish",
       },
     },
-    state: {
-      uploadConceptsFile: {
-        loading: false,
-      },
-    },
   };
 
   it("matches the latest snapshot", async () => {

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

@@ -17,7 +17,6 @@ jest.mock("@truedat/core/hooks", () => ({
 }));
 
 const props = {
-  uploadConcepts: jest.fn(),
   loading: false,
   canAutoPublish: false,
 };

package/src/concepts/hooks/useConcepts.js

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

package/src/concepts/reducers/__tests__/conceptRedirect.spec.js

@@ -47,14 +47,6 @@ describe("reducers: conceptRedirect", () => {
     ).toBe(redirectUrl);
   });
 
-  it("should be redirectUrl on uploadConcepts.SUCCESS", () => {
-    expect(
-      conceptRedirect(fooState, {
-        type: bulkUpdate.SUCCESS,
-        meta: { redirectUrl }
-      })
-    ).toBe(redirectUrl);
-  });
 
   it("should be link to concept on updateSubscription.SUCCESS state otherwise", () => {
     expect(

package/src/concepts/reducers/conceptRedirect.js

@@ -10,7 +10,6 @@ import {
   bulkUpdate,
   conceptAction,
   linkConcept,
-  uploadConcepts,
 } from "../routines";
 
 const initialState = "";
@@ -37,10 +36,6 @@ export const conceptRedirect = (
       const { redirectUrl } = meta;
       return redirectUrl;
     }
-    case uploadConcepts.SUCCESS: {
-      const { redirectUrl } = meta;
-      return redirectUrl;
-    }
     case updateSubscription.SUCCESS: {
       const { concept } = payload;
       return _.isNil(concept) ? state : linkTo.CONCEPT_VERSION(concept);

package/src/concepts/reducers/index.js

@@ -10,7 +10,6 @@ import { conceptLoading } from "./conceptLoading";
 import { conceptPermissions } from "./conceptPermissions";
 import { conceptRedirect } from "./conceptRedirect";
 import { conceptsDownloading } from "./conceptsDownloading";
-import { uploadConceptsFile } from "./uploadConceptsFile";
 import { bulkUpdateLoading } from "./bulkUpdateLoading";
 import { conceptUpdating } from "./conceptUpdating";
 import { sharedToDomains } from "./sharedToDomains";
@@ -31,7 +30,6 @@ export {
   conceptPermissions,
   conceptRedirect,
   conceptsDownloading,
-  uploadConceptsFile,
   conceptUpdating,
   sharedToDomains,
   savingSharedTo,

package/src/concepts/routines.js

@@ -5,7 +5,6 @@ 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/sagas/index.js

@@ -3,7 +3,6 @@ import { conceptActionRequestSaga } from "./conceptAction";
 import { downloadConceptsRequestSaga } from "./downloadConcepts";
 import { fetchConceptArchiveRequestSaga } from "./fetchConceptArchive";
 import { fetchConceptRequestSaga } from "./fetchConcept";
-import { uploadConceptsRequestsSaga } from "./uploadConcepts";
 import { bulkUpdateRequestsSaga } from "./bulkUpdate";
 import { saveSharedToRequestSaga } from "./saveSharedTo";
 import { setConfidentialConceptRequestSaga } from "./setConfidentialConcept";
@@ -13,7 +12,6 @@ export {
   downloadConceptsRequestSaga,
   fetchConceptArchiveRequestSaga,
   fetchConceptRequestSaga,
-  uploadConceptsRequestsSaga,
   bulkUpdateRequestsSaga,
   saveSharedToRequestSaga,
   setConfidentialConceptRequestSaga,
@@ -24,7 +22,6 @@ export default [
   downloadConceptsRequestSaga(),
   fetchConceptArchiveRequestSaga(),
   fetchConceptRequestSaga(),
-  uploadConceptsRequestsSaga(),
   bulkUpdateRequestsSaga(),
   saveSharedToRequestSaga(),
   setConfidentialConceptRequestSaga(),

package/src/concepts/selectors/messages.js

@@ -0,0 +1,32 @@
+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 != 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;
+    }
+}

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

@@ -1,53 +1,9 @@
-import { CONCEPTS_BULK_UPLOAD_EVENTS } from "@truedat/core/routes";
-import { uploadConcepts } from "../../routines";
 import { bgMessage } from "..";
 
-const fooState = { foo: "bar" };
-
 describe("reducers: bgMessage", () => {
   const initialState = {};
 
   it("should provide the initial state", () => {
     expect(bgMessage(undefined, {})).toEqual(initialState);
   });
-
-  it("should handle the uploadConcepts.SUCCESS action", () => {
-    expect(
-      bgMessage(fooState, {
-        type: uploadConcepts.SUCCESS,
-        payload: { data: { message: { length: 5 } } },
-      })
-    ).toEqual({
-      error: false,
-      header: "concepts.upload.success.accepted.header",
-      icon: "check",
-      color: "blue",
-      text: "",
-      anchor: {
-        reference: CONCEPTS_BULK_UPLOAD_EVENTS,
-        label: "sidemenu.concepts_upload_events",
-      },
-    });
-  });
-
-  it("should handle the uploadConcepts.FAILURE action", () => {
-    expect(
-      bgMessage(fooState, {
-        type: uploadConcepts.FAILURE,
-        payload: {
-          data: {
-            error: { error: "unprocessable_entity", field: "What a field!!" },
-          },
-          status: 422,
-        },
-      })
-    ).toEqual({
-      error: true,
-      header: "concepts.upload.failed.header",
-      content: `concepts.upload.failed.unprocessable_entity`,
-      icon: "attention",
-      text: "",
-      fields: { error: "unprocessable_entity", field: "What a field!!" },
-    });
-  });
 });

package/src/reducers/bgMessage.js

@@ -1,7 +1,5 @@
 import _ from "lodash/fp";
 import { dismissAlert } from "@truedat/core/routines";
-import { CONCEPTS_BULK_UPLOAD_EVENTS } from "@truedat/core/routes";
-import { uploadConcepts } from "../routines";
 import { bulkUpdate } from "../concepts/routines";
 
 const initialState = {};
@@ -10,33 +8,6 @@ const bgMessage = (state = initialState, { type, payload }) => {
   switch (type) {
     case dismissAlert.TRIGGER:
       return initialState;
-    case uploadConcepts.SUCCESS:
-      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",
-        },
-      };
-    case uploadConcepts.FAILURE:
-      if (payload.status != 500 && !_.path("data.errors")(payload)) {
-        return {
-          error: true,
-          header: "concepts.upload.failed.header",
-          content: `concepts.upload.failed.${
-            _.path("data.error.error")(payload) || _.path("data.error")(payload)
-          }`,
-          icon: "attention",
-          text: "",
-          fields: _.path("data.error")(payload),
-        };
-      } else {
-        return null;
-      }
     case bulkUpdate.SUCCESS:
       return {
         error: false,

package/src/concepts/reducers/uploadConceptsFile.js

@@ -1,24 +0,0 @@
-import { uploadConcepts } from "../routines";
-
-const initialState = {
-  loading: false,
-};
-
-export const uploadConceptsFile = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case uploadConcepts.TRIGGER:
-      return state;
-    case uploadConcepts.REQUEST:
-      return { ...state, loading: true };
-    case uploadConcepts.SUCCESS:
-      return state;
-    case uploadConcepts.FAILURE:
-      return { ...state, error: payload };
-    case uploadConcepts.FULFILL:
-      return { ...state, loading: false };
-    default:
-      return state;
-  }
-};
-
-export default uploadConceptsFile;

package/src/concepts/sagas/uploadConcepts.js

@@ -1,30 +0,0 @@
-import { call, put, takeLatest } from "redux-saga/effects";
-import { CONCEPTS } from "@truedat/core/routes";
-import { apiJsonPost, UPLOAD_JSON_OPTS } from "@truedat/core/services/api";
-import { uploadConcepts } from "../routines";
-
-export function* uploadConceptsSaga({ payload }) {
-  try {
-    const { action, method, href, lang, ...rest } = payload;
-    const meta = { action, method, href, redirectUrl: CONCEPTS };
-    yield put(uploadConcepts.request({ method, href, ...rest }));
-    const { data: body } = rest || {};
-    body.append("lang", lang);
-    const { data } = yield call(apiJsonPost, href, body, UPLOAD_JSON_OPTS);
-
-    yield put({ meta, ...uploadConcepts.success(data) });
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(uploadConcepts.failure({ status, data }));
-    } else {
-      yield put(uploadConcepts.failure(error.message));
-    }
-  } finally {
-    yield put(uploadConcepts.fulfill());
-  }
-}
-
-export function* uploadConceptsRequestsSaga() {
-  yield takeLatest(uploadConcepts.TRIGGER, uploadConceptsSaga);
-}