@truedat/bg 5.19.0 → 5.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "5.19.0",
+  "version": "5.19.1",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "df3fcd6655456c3468259d79762800c3c417147d"
+  "gitHead": "4bee2c4335315835fa62f4c8115036439eb86fb5"
 }

package/src/concepts/api.js

@@ -1,6 +1,8 @@
 const API_BUSINESS_CONCEPT_VERSION =
   "/api/business_concepts/:business_concept_id/versions/:id";
 const API_BUSINESS_CONCEPT_VERSIONS_CSV = "/api/business_concept_versions/csv";
+const API_BUSINESS_CONCEPT_VERSIONS_XLSX =
+  "/api/business_concept_versions/xlsx";
 const API_BUSINESS_CONCEPT_VERSIONS_SEARCH =
   "/api/business_concept_versions/search";
 const API_BUSINESS_CONCEPT_VERSIONS_UPLOAD =
@@ -20,6 +22,7 @@ const API_BUSINESS_CONCEPT_SET_CONFIDENTIAL =
 export {
   API_BUSINESS_CONCEPT_VERSION,
   API_BUSINESS_CONCEPT_VERSIONS_CSV,
+  API_BUSINESS_CONCEPT_VERSIONS_XLSX,
   API_BUSINESS_CONCEPT_VERSIONS_SEARCH,
   API_BUSINESS_CONCEPT_VERSIONS_UPLOAD,
   API_CONCEPT_ARCHIVE,
@@ -29,5 +32,5 @@ export {
   API_CONCEPT_USER_FILTERS,
   API_GET_CONCEPT_USER_FILTERS,
   API_BUSINESS_CONCEPT_BULK_UPDATE,
-  API_BUSINESS_CONCEPT_SET_CONFIDENTIAL
+  API_BUSINESS_CONCEPT_SET_CONFIDENTIAL,
 };

package/src/concepts/components/ConceptsActions.js

@@ -10,18 +10,6 @@ import { downloadConcepts, uploadConcepts } from "../routines";
 import ConceptsUpdateButton from "./ConceptsUpdateButton";
 import ConceptsUploadButton from "./ConceptsUploadButton";
 
-const staticLabels = [
-  "template",
-  "name",
-  "domain",
-  "status",
-  "description",
-  "link_to_concept",
-  "completeness",
-  "inserted_at",
-  "last_change_at",
-];
-
 export const ConceptsActions = ({
   create,
   createUrl,
@@ -32,10 +20,7 @@ export const ConceptsActions = ({
   update,
 }) => {
   const { formatMessage, locale } = useIntl();
-  const headerLabels = _.flow(
-    _.map((l) => [l, formatMessage({ id: `concepts.props.${l}` })]),
-    _.fromPairs
-  )(staticLabels);
+
   return hidden ? null : (
     <div>
       {create && createUrl ? (
@@ -51,7 +36,7 @@ export const ConceptsActions = ({
         floated="right"
         secondary
         icon="download"
-        onClick={() => downloadConcepts({ headerLabels, lang: locale })}
+        onClick={() => downloadConcepts({ lang: locale })}
         loading={conceptsDownloading}
         data-tooltip={formatMessage({
           id: "concepts.actions.download.tooltip",

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

@@ -1,23 +1,32 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { intl } from "@truedat/test/intl-stub";
+import { render } from "@truedat/test/render";
 import { ConceptsActions } from "../ConceptsActions";
 
-// workaround for enzyme issue with React.useContext
-// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
-
 describe("<ConceptsActions />", () => {
   const props = {
     createUrl: "/url/to/create/concept",
     conceptActionsLoaded: true,
     conceptsDownloading: true,
     create: true,
-    upload: true
+    upload: true,
+  };
+
+  const renderOpts = {
+    messages: {
+      en: {
+        "concepts.actions.create": "Create",
+        "concepts.actions.download.tooltip": "Download",
+      },
+    },
+    state: {
+      uploadConceptsFile: {
+        loading: false,
+      },
+    },
   };
 
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<ConceptsActions {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<ConceptsActions {...props} />, renderOpts);
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -2,36 +2,32 @@
 
 exports[`<ConceptsActions /> matches the latest snapshot 1`] = `
 <div>
-  <Button
-    as={
-      {
-        "$$typeof": Symbol(react.forward_ref),
-        "displayName": "Link",
-        "propTypes": {
-          "innerRef": [Function],
-          "onClick": [Function],
-          "replace": [Function],
-          "target": [Function],
-          "to": [Function],
-        },
-        "render": [Function],
-      }
-    }
-    content="concepts.actions.create"
-    floated="right"
-    primary={true}
-    to="/url/to/create/concept"
-  />
-  <Button
-    as="button"
-    data-tooltip="concepts.actions.download.tooltip"
-    floated="right"
-    icon="download"
-    loading={true}
-    onClick={[Function]}
-    secondary={true}
-  />
-  <Connect(ConceptsUploadButton) />
-  <Connect(ConceptsUpdateButton) />
+  <div>
+    <a
+      class="ui primary right floated button"
+      href="/url/to/create/concept"
+      role="button"
+    >
+      Create
+    </a>
+    <button
+      class="ui icon loading secondary right floated button"
+      data-tooltip="Download"
+    >
+      <i
+        aria-hidden="true"
+        class="download icon"
+      />
+    </button>
+    <button
+      class="ui icon secondary right floated button"
+      data-tooltip="concepts.actions.upload.tooltip"
+    >
+      <i
+        aria-hidden="true"
+        class="upload icon"
+      />
+    </button>
+  </div>
 </div>
 `;

package/src/concepts/sagas/__tests__/downloadConcepts.spec.js

@@ -6,7 +6,7 @@ import {
   saveFile,
 } from "../downloadConcepts";
 import { downloadConcepts } from "../../routines";
-import { API_BUSINESS_CONCEPT_VERSIONS_CSV } from "../../api";
+import { API_BUSINESS_CONCEPT_VERSIONS_XLSX } from "../../api";
 import { getPreviousConceptQuery } from "../../selectors";
 
 describe("sagas: downloadConceptsRequestSaga", () => {
@@ -30,15 +30,16 @@ describe("sagas: downloadConceptsRequestSaga", () => {
 });
 
 describe("sagas: downloadConceptsSaga", () => {
-  const headerLabels = { name: "Name" };
   const lang = "es";
-  const payload = { headerLabels, lang: lang };
+  const payload = { lang: lang };
 
   const conceptQuery = { filters: {} };
-  const data = "SOME CSV DATA";
+  const data = new Blob(["SOME XLS DATA BINARY"]);
+  const headers = {
+    "content-disposition": "attachment; filename=test.xlsx",
+  };
 
   const body = {
-    header_labels: headerLabels,
     lang: lang,
     concept_url_schema:
       "http://localhost/concepts/:business_concept_id/versions/:id",
@@ -53,9 +54,12 @@ describe("sagas: downloadConceptsSaga", () => {
         .next(conceptQuery)
         .put(downloadConcepts.request(body))
         .next()
-        .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_CSV, body, JSON_OPTS)
-        .next({ data })
-        .call(saveFile, data)
+        .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_XLSX, body, {
+          ...JSON_OPTS,
+          responseType: "blob",
+        })
+        .next({ data, headers })
+        .call(saveFile, { data, headers })
         .next()
         .put(downloadConcepts.success(data))
         .next()
@@ -76,7 +80,10 @@ describe("sagas: downloadConceptsSaga", () => {
         .next(conceptQuery)
         .put(downloadConcepts.request(body))
         .next()
-        .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_CSV, body, JSON_OPTS)
+        .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_XLSX, body, {
+          ...JSON_OPTS,
+          responseType: "blob",
+        })
         .throw(error)
         .put(downloadConcepts.failure(message))
         .next()

package/src/concepts/sagas/downloadConcepts.js

@@ -5,31 +5,34 @@ import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { CONCEPT_VERSION } from "@truedat/core/routes";
 import { downloadConcepts } from "../routines";
 import { getPreviousConceptQuery } from "../selectors";
-import { API_BUSINESS_CONCEPT_VERSIONS_CSV } from "../api";
+import { API_BUSINESS_CONCEPT_VERSIONS_XLSX } from "../api";
 
-export function saveFile(data) {
-  const blob = new Blob([String.fromCharCode(0xfeff), data], {
-    type: "text/csv;charset=utf-8",
-  });
-  FileSaver.saveAs(blob, "concepts.csv");
+export function saveFile({ data, headers }) {
+  const contentDisposition = headers["content-disposition"];
+  const regex = /filename=(.+)$/;
+  const match = regex.exec(contentDisposition);
+  const fileName = match ? match[1] : "concepts.xlsx";
+
+  FileSaver.saveAs(data, fileName);
 }
 
 export function* downloadConceptsSaga({ payload }) {
   try {
-    const headerLabels = _.propOr({}, "headerLabels")(payload);
     const lang = _.propOr("es", "lang")(payload);
     const query = yield select(getPreviousConceptQuery);
     const conceptUrlSchema = window.location.origin + CONCEPT_VERSION;
     const body = {
-      header_labels: headerLabels,
       concept_url_schema: conceptUrlSchema,
       lang,
       ...query,
     };
-    const url = API_BUSINESS_CONCEPT_VERSIONS_CSV;
+    const url = API_BUSINESS_CONCEPT_VERSIONS_XLSX;
     yield put(downloadConcepts.request(body));
-    const { data } = yield call(apiJsonPost, url, body, JSON_OPTS);
-    yield call(saveFile, data);
+    const { data, headers } = yield call(apiJsonPost, url, body, {
+      ...JSON_OPTS,
+      responseType: "blob",
+    });
+    yield call(saveFile, { data, headers });
     yield put(downloadConcepts.success(data));
   } catch (error) {
     if (error.response) {