@truedat/dd 4.32.1 → 4.33.3

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

@@ -0,0 +1,41 @@
+// only admin user
+import React from "react";
+import { render } from "@truedat/test/render";
+import { StructuresUploadOption } from "../StructuresUploadOption";
+
+describe("<StructuresUploadOption />", () => {
+  const renderOpts = {
+    messages: {
+      en: {
+        "uploadModal.accept.publish": "publish",
+        "structures.actions.upload.tooltip": "tooltip",
+        "structures.actions.upload.confirmation.header": "header",
+        "structures.actions.upload.confirmation.content": "content",
+        "uploadModal.accept.publish": "publish",
+      },
+    },
+  };
+
+  it("matches the latest snapshot", () => {
+    const props = {
+      uploadStructures: jest.fn(),
+    };
+    const { container } = render(
+      <StructuresUploadOption {...props} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+  });
+
+  it("matches the latest snapshot with auto publish", () => {
+    const props = {
+      uploadStructures: jest.fn(),
+      canAutoPublish: true,
+    };
+    const { container } = render(
+      <StructuresUploadOption {...props} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+  });
+});

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

@@ -0,0 +1,22 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import { SystemCreateOption } from "../SystemCreateOption";
+
+jest.mock("@truedat/core/hooks", () => ({
+  useAuthorized: jest.fn(() => true),
+}));
+
+describe("<SystemCreateOption />", () => {
+  const renderOpts = {
+    messages: {
+      en: {
+        "structures.actions.new_system": "new system",
+      },
+    },
+  };
+
+  it("matches the latest snapshot", () => {
+    const { container } = render(<SystemCreateOption />, renderOpts);
+    expect(container).toMatchSnapshot();
+  });
+});

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

@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructuresDownloadOption /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    aria-disabled="true"
+    class="disabled item"
+    role="option"
+  >
+    <i
+      aria-hidden="true"
+      class="download icon"
+    />
+    <span>
+      tooltip
+    </span>
+    <p
+      class="menu-item-description"
+    >
+      popup
+    </p>
+  </div>
+</div>
+`;

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

@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructuresEditableDownloadOption /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    aria-disabled="true"
+    class="disabled item"
+    role="option"
+  >
+    <i
+      aria-hidden="true"
+      class="download icon"
+    />
+    <span>
+      tooltip
+    </span>
+    <p
+      class="menu-item-description"
+    >
+      popup
+    </p>
+  </div>
+</div>
+`;

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

@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructuresUpdateOption /> matches the latest snapshot 1`] = `
+<div>
+  <a
+    class="item"
+    href="/structures/bulk_update"
+    role="option"
+  >
+    <i
+      aria-hidden="true"
+      class="refresh icon"
+    />
+    <span>
+      update
+    </span>
+  </a>
+</div>
+`;

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

@@ -0,0 +1,39 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructuresUploadOption /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="item"
+    role="option"
+  >
+    <i
+      aria-hidden="true"
+      class="upload icon"
+    />
+    <span
+      class="text"
+    >
+      tooltip
+    </span>
+  </div>
+</div>
+`;
+
+exports[`<StructuresUploadOption /> matches the latest snapshot with auto publish 1`] = `
+<div>
+  <div
+    class="item"
+    role="option"
+  >
+    <i
+      aria-hidden="true"
+      class="upload icon"
+    />
+    <span
+      class="text"
+    >
+      tooltip
+    </span>
+  </div>
+</div>
+`;

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

@@ -6,13 +6,9 @@ exports[`<StructuresView /> matches the latest snapshot 1`] = `
   <Divider
     hidden={true}
   />
-  <SystemCreateButton />
-  <Connect(StructuresUpdateButton)
-    canAutoPublish={false}
-  />
-  <Connect(StructuresDownloadButton) />
-  <Connect(StructuresUploadButton)
+  <StructuresOptions
     canAutoPublish={false}
+    canBulkUpload={true}
   />
   <Connect(StructuresSearch) />
   <injectIntl(Connect(SelectedFilters)) />

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

@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<SystemCreateOption /> matches the latest snapshot 1`] = `
+<div>
+  <a
+    class="item"
+    href="/systems/new"
+    role="option"
+  >
+    <i
+      aria-hidden="true"
+      class="plus square outline icon"
+    />
+    <span
+      class="text"
+    >
+      new system
+    </span>
+  </a>
+</div>
+`;

package/src/components/index.js

@@ -45,7 +45,6 @@ import StructuresRoutes from "./StructuresRoutes";
 import StructuresSearch from "./StructuresSearch";
 import StructuresSearchResults from "./StructuresSearchResults";
 import StructuresTable from "./StructuresTable";
-import StructuresUpdateButton from "./StructuresUpdateButton";
 import StructuresView from "./StructuresView";
 import SystemForm from "./SystemForm";
 import SystemStructures from "./SystemStructures";
@@ -103,7 +102,6 @@ export {
   StructuresSearch,
   StructuresSearchResults,
   StructuresTable,
-  StructuresUpdateButton,
   StructuresView,
   SystemForm,
   SystemStructures,

package/src/messages/en.js

@@ -329,15 +329,18 @@ export default {
   "structures.actions.bulk_update": "Update",
   "structures.actions.bulk_update.popup":
     "You should select only one type in filters",
+  "structures.actions.editableDownload.tooltip":
+    "Download editable structures metadata",
   "structures.actions.download.popup":
     "You should select some filter or doing a search",
   "structures.actions.download.tooltip": "Download structures metadata",
   "structures.actions.edit_system": "Edit system",
   "structures.actions.new_system": "New system",
   "structures.actions.upload": "Upload file",
+  "structures.actions.upload.confirmation.content": "Notes",
   "structures.actions.upload.confirmation.header":
-    "Upload extra info file of structures",
-  "structures.actions.upload.tooltip": "Upload Extra info",
+    "Upload notes file of structures",
+  "structures.actions.upload.tooltip": "Upload structure notes",
   "structures.bulkUpdate.crumbs.top": "Bulk update",
   "structures.bulkUpdate.success.content":
     "Updated {count} structures successfully",
@@ -395,6 +398,8 @@ export default {
   "structures.uploadStructures.failed.default": "Error in row {row}",
   "structures.uploadStructures.failed.df_content.invalid_content":
     "Invalid content in row {row}",
+  "structures.uploadStructures.failed.external_id_not_exist":
+    "Invalid External Id",
   "structures.uploadStructures.failed.header": "Upload Failed!",
   "structures.uploadStructures.failed.invalid_file_format":
     "Invalid file format",

package/src/messages/es.js

@@ -328,18 +328,21 @@ export default {
   "structureVersion.inserted_at.header": "Insertada",
   "structureVersion.updated_at.header": "Actualizada",
   "structureVersion.version.header": "Versión",
-  "structures.actions.bulk_update": "Actualizar",
+  "structures.actions.bulk_update": "Actualizar masivamente",
   "structures.actions.bulk_update.popup":
     "Seleccione un único tipo existente en los filtros",
+  "structures.actions.editableDownload.tooltip":
+    "Descarga de metadata editable de estructuras",
   "structures.actions.download.popup":
     "Seleccione algún filtro o realice una búsqueda",
   "structures.actions.download.tooltip": "Descarga de metadata de estructuras",
   "structures.actions.edit_system": "Editar sistema",
   "structures.actions.new_system": "Nuevo sistema",
   "structures.actions.upload": "Subir fichero",
+  "structures.actions.upload.confirmation.content": "Notas",
   "structures.actions.upload.confirmation.header":
-    "Subir fichero de información adicional de estructuras",
-  "structures.actions.upload.tooltip": "Subir información extra",
+    "Subir fichero de notas de estructuras",
+  "structures.actions.upload.tooltip": "Subir notas de estructuras",
   "structures.bulkUpdate.crumbs.top": "Actualización masiva",
   "structures.bulkUpdate.success.content":
     "Se han actualizado {count} estructuras",
@@ -401,6 +404,8 @@ export default {
   "structures.uploadStructures.failed.default": "Error en fila {row}",
   "structures.uploadStructures.failed.df_content.invalid_content":
     "Contenido inválido en fila {row}",
+  "structures.uploadStructures.failed.external_id_not_exist":
+    "External Id Inválido",
   "structures.uploadStructures.failed.header":
     "Error al subir el fichero. El contenido no se ha actualizado",
   "structures.uploadStructures.failed.invalid_file_format":

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

@@ -0,0 +1,32 @@
+import { downloadEditableStructures } from "../../routines";
+import { structuresEditableDownloading } from "..";
+
+const fooState = { foo: "bar" };
+
+describe("reducers: structuresEditableDownloading", () => {
+  it("should provide the initial state", () => {
+    expect(structuresEditableDownloading(undefined, {})).toBe(false);
+  });
+
+  it("should be true after receiving the downloadEditableStructures.TRIGGER action", () => {
+    expect(
+      structuresEditableDownloading(fooState, {
+        type: downloadEditableStructures.TRIGGER,
+      })
+    ).toBe(true);
+  });
+
+  it("should be false after receiving the downloadEditableStructures.FULFILL action", () => {
+    expect(
+      structuresEditableDownloading(fooState, {
+        type: downloadEditableStructures.FULFILL,
+      })
+    ).toBe(false);
+  });
+
+  it("should ignore unhandled actions", () => {
+    expect(structuresEditableDownloading(fooState, { type: "FOO" })).toBe(
+      fooState
+    );
+  });
+});

package/src/reducers/index.js

@@ -74,6 +74,7 @@ import { structureUserFilters } from "./structureUserFilters";
 import { structureVersion } from "./structureVersion";
 import { structureVersions } from "./structureVersions";
 import { structures } from "./structures";
+import { structuresEditableDownloading } from "./structuresEditableDownloading";
 import { structuresDownloading } from "./structuresDownloading";
 import { structuresLoading } from "./structuresLoading";
 import { structuresPageSize } from "./structuresPageSize";
@@ -168,6 +169,7 @@ export {
   structureVersion,
   structureVersions,
   structures,
+  structuresEditableDownloading,
   structuresDownloading,
   structuresFields,
   structuresLoading,

package/src/reducers/structuresEditableDownloading.js

@@ -0,0 +1,14 @@
+import { downloadEditableStructures } from "../routines";
+
+const structuresEditableDownloading = (state = false, { type }) => {
+  switch (type) {
+    case downloadEditableStructures.TRIGGER:
+      return true;
+    case downloadEditableStructures.FULFILL:
+      return false;
+    default:
+      return state;
+  }
+};
+
+export { structuresEditableDownloading };

package/src/routines.js

@@ -57,6 +57,9 @@ export const deleteStructureUserFilter = createRoutine(
 );
 export const doStructureNoteAction = createRoutine("DO_STRUCTURE_NOTE_ACTION");
 export const downloadCsvGraph = createRoutine("DOWNLOAD_CSV_GRAPH");
+export const downloadEditableStructures = createRoutine(
+  "DOWNLOAD_EDITABLE_STRUCTURES"
+);
 export const downloadGrants = createRoutine("DOWNLOAD_GRANTS");
 export const downloadStructures = createRoutine("DOWNLOAD_STRUCTURES");
 export const excludeNode = createRoutine("EXCLUDE_NODE");

package/src/sagas/__tests__/downloadEditableStructures.spec.js

@@ -0,0 +1,80 @@
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  downloadEditableStructuresRequestSaga,
+  downloadEditableStructuresSaga,
+  saveFile,
+} from "../downloadEditableStructures";
+import { downloadEditableStructures } from "../../routines";
+import { API_DATA_STRUCTURES_EDITABLE_CSV } from "../../api";
+import { getPreviousStructureQuery } from "../../selectors";
+
+describe("sagas: downloadEditableStructuresRequestSaga", () => {
+  it("should invoke downloadEditableStructuresSaga on downloadEditableStructures.TRIGGER", () => {
+    expect(() => {
+      testSaga(downloadEditableStructuresRequestSaga)
+        .next()
+        .takeLatest(
+          downloadEditableStructures.TRIGGER,
+          downloadEditableStructuresSaga
+        )
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(downloadEditableStructuresRequestSaga)
+        .next()
+        .takeLatest("FOO", downloadEditableStructuresRequestSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: downloadEditableStructuresSaga", () => {
+  const query = { filters: {} };
+  const body = query;
+  const data = "SOME CSV DATA";
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(downloadEditableStructuresSaga)
+        .next()
+        .select(getPreviousStructureQuery)
+        .next(query)
+        .put(downloadEditableStructures.request(body))
+        .next()
+        .call(apiJsonPost, API_DATA_STRUCTURES_EDITABLE_CSV, body, JSON_OPTS)
+        .next({ data })
+        .call(saveFile, data)
+        .next()
+        .put(downloadEditableStructures.success(data))
+        .next()
+        .put(downloadEditableStructures.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(downloadEditableStructuresSaga)
+        .next()
+        .select(getPreviousStructureQuery)
+        .next(query)
+        .put(downloadEditableStructures.request(body))
+        .next()
+        .call(apiJsonPost, API_DATA_STRUCTURES_EDITABLE_CSV, body, JSON_OPTS)
+        .throw(error)
+        .put(downloadEditableStructures.failure(message))
+        .next()
+        .put(downloadEditableStructures.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/downloadEditableStructures.js

@@ -0,0 +1,43 @@
+import _ from "lodash/fp";
+import FileSaver from "file-saver";
+import { call, put, select, takeLatest } from "redux-saga/effects";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { downloadEditableStructures } from "../routines";
+import { getPreviousStructureQuery } from "../selectors";
+import { API_DATA_STRUCTURES_EDITABLE_CSV } from "../api";
+
+export function saveFile(data) {
+  if (!_.isEmpty(data)) {
+    const blob = new Blob([String.fromCharCode(0xfeff), data], {
+      type: "text/csv;charset=utf-8",
+    });
+    FileSaver.saveAs(blob, "structures.csv");
+  }
+}
+
+export function* downloadEditableStructuresSaga() {
+  try {
+    const body = yield select(getPreviousStructureQuery);
+    const url = API_DATA_STRUCTURES_EDITABLE_CSV;
+    yield put(downloadEditableStructures.request(body));
+    const { data } = yield call(apiJsonPost, url, body, JSON_OPTS);
+    yield call(saveFile, data);
+    yield put(downloadEditableStructures.success(data));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(downloadEditableStructures.failure({ status, data }));
+    } else {
+      yield put(downloadEditableStructures.failure(error.message));
+    }
+  } finally {
+    yield put(downloadEditableStructures.fulfill());
+  }
+}
+
+export function* downloadEditableStructuresRequestSaga() {
+  yield takeLatest(
+    downloadEditableStructures.TRIGGER,
+    downloadEditableStructuresSaga
+  );
+}

package/src/sagas/fetchStructureTypes.js

@@ -1,12 +1,14 @@
 import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
 import { fetchStructureTypes } from "../routines";
-import { API_STRUCTURE_TYPES } from "../api";
+import { API_STRUCTURE_TYPES, API_STRUCTURE_TYPES_LITE } from "../api";
 
-export function* fetchStructureTypesSaga() {
+export function* fetchStructureTypesSaga({ payload }) {
   try {
+    const { liteRequest } = payload;
     yield put(fetchStructureTypes.request());
-    const { data } = yield call(apiJson, API_STRUCTURE_TYPES, JSON_OPTS);
+    const url = liteRequest ? API_STRUCTURE_TYPES_LITE : API_STRUCTURE_TYPES;
+    const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchStructureTypes.success(data));
   } catch (error) {
     if (error.response) {

package/src/sagas/index.js

@@ -12,6 +12,7 @@ import { deleteStructureUserFilterRequestSaga } from "./deleteStructureUserFilte
 import { doStructureNoteActionRequestSaga } from "./doStructureNoteAction";
 import { downloadCsvGraphRequestSaga } from "./downloadCsvGraph";
 import { downloadGrantsRequestSaga } from "./downloadGrants";
+import { downloadEditableStructuresRequestSaga } from "./downloadEditableStructures";
 import { downloadStructuresRequestSaga } from "./downloadStructures";
 import { fetchGrantFiltersRequestSaga } from "./fetchGrantFilters";
 import { fetchGrantsRequestSaga } from "./fetchGrants";
@@ -60,6 +61,7 @@ export {
   doStructureNoteActionRequestSaga,
   downloadCsvGraphRequestSaga,
   downloadGrantsRequestSaga,
+  downloadEditableStructuresRequestSaga,
   downloadStructuresRequestSaga,
   fetchGrantFiltersRequestSaga,
   fetchGrantsRequestSaga,
@@ -109,6 +111,7 @@ export default [
   doStructureNoteActionRequestSaga(),
   downloadCsvGraphRequestSaga(),
   downloadGrantsRequestSaga(),
+  downloadEditableStructuresRequestSaga(),
   downloadStructuresRequestSaga(),
   fetchGrantFiltersRequestSaga(),
   fetchGrantsRequestSaga(),

package/src/selectors/__tests__/__snapshots__/getGrantsColumns.spec.js.snap

@@ -11,7 +11,7 @@ exports[`EndDateDecorator matches the latest snapshot 1`] = `
       <time
         datetime="1589727661000"
       >
-        a year ago
+        2 years ago
       </time>
     </div>
   </div>
@@ -85,7 +85,7 @@ exports[`StartDateDecorator matches the latest snapshot 1`] = `
       <time
         datetime="1589727661000"
       >
-        a year ago
+        2 years ago
       </time>
     </div>
   </div>

package/src/selectors/__tests__/getTabVisibility.spec.js

@@ -83,10 +83,9 @@ describe("selectors: getTabVisibility", () => {
     });
   });
 
-  it("should include notes if templates are not loading and a template matches the valid structure type", () => {
-    const structure = { type: "foo" };
-    const templates = [{ name: "foo" }];
-    const structureTypes = [{ name: "foo", template: { id: 1, name: "n" } }];
+  it("should include notes if template_id is in structure_note", () => {
+    const structure = { type: "foo", data_structure_type: { template_id: 1 } };
+    const templates = [{ name: "foo", id: 1 }];
     expect(getTabVisibility({ templatesLoading: true })).toMatchObject({
       notes: false,
     });
@@ -94,8 +93,6 @@ describe("selectors: getTabVisibility", () => {
       getTabVisibility({
         structure,
         templates,
-        structureTypes,
-        structureTypesLoading: false,
       })
     ).toMatchObject({
       notes: true,

package/src/selectors/getTabVisibility.js

@@ -24,25 +24,16 @@ const linksTabVisible = (state) => {
   return conceptCount > 0 || !_.isEmpty(structureLinks);
 };
 
-const notesTabVisible = ({
-  templatesLoading,
-  templates,
-  structure,
-  structureTypes,
-  structureTypesLoading,
-}) =>
+const notesTabVisible = ({ templatesLoading, templates, structure }) =>
   !templatesLoading &&
   notEmpty(templates) &&
   _.has("type")(structure) &&
-  !structureTypesLoading &&
-  notEmpty(structureTypes) &&
   _.flow(
     _.find({
-      name: _.prop("type")(structure),
+      id: _.propOr(null, "data_structure_type.template_id")(structure),
     }),
-    _.get("template"),
     _.negate(_.isNil)
-  )(structureTypes);
+  )(templates);
 
 const versionsTabVisible = notEmptyPath("structureVersions");
 const rulesTabVisible = notEmptyPath("ruleImplementations");

package/src/components/SystemCreateButton.js

@@ -1,27 +0,0 @@
-import React from "react";
-import { Button } from "semantic-ui-react";
-import { Link } from "react-router-dom";
-import { FormattedMessage } from "react-intl";
-import { useAuthorized } from "@truedat/core/hooks";
-import { SYSTEM_NEW } from "@truedat/core/routes";
-
-export const SystemCreateButton = () => {
-  const authorized = useAuthorized();
-  return authorized ? (
-    <span className="button-update">
-      <Button
-        secondary
-        as={Link}
-        to={SYSTEM_NEW}
-        content={
-          <FormattedMessage
-            id="structures.actions.new_system"
-            defaultMessage="new_system"
-          />
-        }
-      />
-    </span>
-  ) : null;
-};
-
-export default SystemCreateButton;

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

@@ -1,26 +0,0 @@
-import React from "react";
-import { shallow } from "enzyme";
-import { intl } from "@truedat/test/intl-stub";
-import { StructuresDownloadButton } from "../StructuresDownloadButton";
-
-// workaround for enzyme issue with React.useContext
-// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
-
-describe("<StructuresDownloadButton />", () => {
-  const downloadStructures = jest.fn();
-  const structuresLoading = false;
-
-  it("matches the latest snapshot", () => {
-    const props = { downloadStructures, structuresLoading };
-    const wrapper = shallow(<StructuresDownloadButton {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("is disabled if there are no structures to be downloaded", () => {
-    const props = { downloadStructures, structuresLoading, structures: [] };
-    const wrapper = shallow(<StructuresDownloadButton {...props} />);
-    wrapper.find("Popup").props().content;
-    expect(wrapper.find({ disabled: false }).length).toBe(1);
-  });
-});