@truedat/dd 7.5.9 → 7.5.10

package/src/selectors/utils/decorators.js

@@ -1,19 +1,14 @@
 import _ from "lodash/fp";
-import React from "react";
 import { Header, Icon, Popup } from "semantic-ui-react";
 import { linkTo } from "@truedat/core/routes";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
 
 export const UserDecorator = ({ user }) =>
   user ? (
-    <Header as="h4">
-      <Header.Content>
-        {user.full_name} <Header.Subheader>{user.email}</Header.Subheader>
-      </Header.Content>
-    </Header>
+    <Header as="h4"><Header.Content>{user.full_name}<Header.Subheader>{user.email}</Header.Subheader></Header.Content></Header>
   ) : null;
 
 UserDecorator.propTypes = {
@@ -22,32 +17,25 @@ UserDecorator.propTypes = {
 
 export const GrantRequestStructureDecorator = (grantRequest) => {
   const { formatMessage } = useIntl();
-  return (
-    <>
-      {grantRequest?.modification_grant_id ? (
-        <Popup
-          content={formatMessage({ id: "grantRequest.isModification" })}
-          trigger={<Icon name="edit" />}
-        />
-      ) : grantRequest?.request_type === "grant_removal" ? (
-        <Popup
-          content={formatMessage({ id: "grantRequest.isModification" })}
-          trigger={
-            <Link to={linkTo.GRANT({ id: grantRequest?.grant?.id || 0 })}>
-              <Icon
-                name={formatMessage({
-                  id: "grant.header.icon",
-                  defaultMessage: "key",
-                })}
-              />
-            </Link>
-          }
-        />
-      ) : null}
-      {grantRequest?.data_structure_version?.name ||
-        grantRequest?.grant?.data_structure_version?.name}
-    </>
-  );
+  return (<>{grantRequest?.modification_grant_id ? (
+      <Popup
+        content={formatMessage({ id: "grantRequest.isModification" })}
+        trigger={<Icon name="edit" />}
+      />
+    ) : grantRequest?.request_type === "grant_removal" ? (
+      <Popup
+        content={formatMessage({ id: "grantRequest.isModification" })}
+        trigger={
+          <Link to={linkTo.GRANT({ id: grantRequest?.grant?.id || 0 })}><Icon
+              name={formatMessage({
+                id: "grant.header.icon",
+                defaultMessage: "key",
+              })}
+            /></Link>
+        }
+      />
+    ) : null}{grantRequest?.data_structure_version?.name ||
+      grantRequest?.grant?.data_structure_version?.name}</>);
 };
 
 export const DateDecorator = ({ date }) => {

package/src/components/SystemsLoader.js

@@ -1,27 +0,0 @@
-import { useEffect } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { clearSystems, fetchSystems } from "../routines";
-
-export const SystemsLoader = ({ clearSystems, fetchSystems }) => {
-  useEffect(() => {
-    return () => {
-      clearSystems();
-    };
-  }, [clearSystems]);
-  useEffect(() => {
-    fetchSystems();
-  }, [fetchSystems]);
-  return null;
-};
-
-SystemsLoader.propTypes = {
-  clearSystems: PropTypes.func,
-  fetchSystems: PropTypes.func,
-};
-
-const mapStateToProps = ({ systemsLoading }) => ({ systemsLoading });
-
-export default connect(mapStateToProps, { clearSystems, fetchSystems })(
-  SystemsLoader
-);

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

@@ -1,34 +0,0 @@
-import React from "react";
-import { shallow, mount } from "enzyme";
-import { SystemsLoader } from "../SystemsLoader";
-
-describe("<SystemsLoader />", () => {
-  it("matches the latest snapshot", () => {
-    const fetchSystems = jest.fn();
-    const systemsLoading = true;
-    const props = { fetchSystems, systemsLoading };
-    const wrapper = shallow(<SystemsLoader {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("renders null if systemsLoading is false", () => {
-    const fetchSystems = jest.fn();
-    const systemsLoading = false;
-    const props = { fetchSystems, systemsLoading };
-    const wrapper = shallow(<SystemsLoader {...props} />);
-    expect(wrapper.getElement()).toBeNull();
-  });
-
-  it("calls fetchSystems when component mounts, clearSystems when component unmounts", () => {
-    const fetchSystems = jest.fn();
-    const clearSystems = jest.fn();
-    const systemsLoading = false;
-    const props = { fetchSystems, systemsLoading, clearSystems };
-    const wrapper = mount(<SystemsLoader {...props} />);
-    expect(clearSystems.mock.calls.length).toBe(0);
-    expect(fetchSystems.mock.calls.length).toBe(1);
-    wrapper.unmount();
-    expect(clearSystems.mock.calls.length).toBe(1);
-    expect(fetchSystems.mock.calls.length).toBe(1);
-  });
-});

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

@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<SystemStructuresLoader /> matches the latest snapshot 1`] = `""`;

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

@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<SystemsLoader /> matches the latest snapshot 1`] = `""`;

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

@@ -1,32 +0,0 @@
-import { fetchSystemStructures } from "../../routines";
-import { systemStructures } from "..";
-
-const fooState = { foo: "bar" };
-
-describe("reducers: systemStructures", () => {
-  const initialState = [];
-
-  it("should provide the initial state", () => {
-    expect(systemStructures(undefined, {})).toEqual(initialState);
-  });
-
-  it("should handle the fetchSystemStructures.SUCCESS action", () => {
-    const someStructures = [
-      { id: 1, name: "Structure 1", description: "Desc 1" },
-      { id: 2, name: "Structure 2", description: "Desc 2" }
-    ];
-
-    const data = { data: someStructures };
-
-    expect(
-      systemStructures(fooState, {
-        type: fetchSystemStructures.SUCCESS,
-        payload: { data }
-      })
-    ).toMatchObject(someStructures);
-  });
-
-  it("should ignore unknown actions", () => {
-    expect(systemStructures(fooState, { type: "FOO" })).toBe(fooState);
-  });
-});

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

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

package/src/reducers/systems.js

@@ -1,19 +0,0 @@
-import _ from "lodash/fp";
-import { fetchSystems, clearSystems } from "../routines";
-
-const initialState = [];
-
-const systems = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case fetchSystems.TRIGGER:
-      return initialState;
-    case clearSystems.TRIGGER:
-      return initialState;
-    case fetchSystems.SUCCESS:
-      return _.propOr([], "data")(payload);
-    default:
-      return state;
-  }
-};
-
-export { systems };

package/src/reducers/systemsLoading.js

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

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

@@ -1,69 +0,0 @@
-import { testSaga } from "redux-saga-test-plan";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import { fetchSystemsRequestSaga, fetchSystemsSaga } from "../fetchSystems";
-import { fetchSystems } from "../../routines";
-import { API_SYSTEMS } from "../../api";
-
-describe("sagas: fetchSystemsRequestSaga", () => {
-  it("should invoke fetchSystemsSaga on trigger", () => {
-    expect(() => {
-      testSaga(fetchSystemsRequestSaga)
-        .next()
-        .takeLatest(fetchSystems.TRIGGER, fetchSystemsSaga)
-        .finish()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should throw exception if an unhandled action is received", () => {
-    expect(() => {
-      testSaga(fetchSystemsRequestSaga)
-        .next()
-        .takeLatest("FOO", fetchSystemsSaga);
-    }).toThrow();
-  });
-});
-
-describe("sagas: fetchSystemsSaga", () => {
-  const data = {
-    collection: [
-      { id: 1, name: "Structure 1" },
-      { id: 2, name: "Structure 2" },
-    ],
-  };
-
-  it("should put a success action when a response is returned", () => {
-    expect(() => {
-      testSaga(fetchSystemsSaga)
-        .next()
-        .put(fetchSystems.request())
-        .next()
-        .call(apiJson, API_SYSTEMS, JSON_OPTS)
-        .next({ data })
-        .put(fetchSystems.success(data))
-        .next()
-        .put(fetchSystems.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(fetchSystemsSaga)
-        .next()
-        .put(fetchSystems.request())
-        .next()
-        .call(apiJson, API_SYSTEMS, JSON_OPTS)
-        .throw(error)
-        .put(fetchSystems.failure(message))
-        .next()
-        .put(fetchSystems.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-});

package/src/sagas/fetchSystems.js

@@ -1,25 +0,0 @@
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import { fetchSystems } from "../routines";
-import { API_SYSTEMS } from "../api";
-
-export function* fetchSystemsSaga() {
-  try {
-    yield put(fetchSystems.request());
-    const { data } = yield call(apiJson, API_SYSTEMS, JSON_OPTS);
-    yield put(fetchSystems.success(data));
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(fetchSystems.failure({ status, data }));
-    } else {
-      yield put(fetchSystems.failure(error.message));
-    }
-  } finally {
-    yield put(fetchSystems.fulfill());
-  }
-}
-
-export function* fetchSystemsRequestSaga() {
-  yield takeLatest(fetchSystems.TRIGGER, fetchSystemsSaga);
-}