@truedat/dd 4.28.3 → 4.28.7

package/src/components/StructureGrantCart.js

@@ -14,7 +14,7 @@ import {
   Divider,
   Button,
   Grid,
-  Form
+  Form,
 } from "semantic-ui-react";
 import { GRANTS_REQUESTS_CHECKOUT, STRUCTURES } from "@truedat/core/routes";
 import { FiltersGrid } from "@truedat/dq/components/ruleImplementationForm/FiltersGrid";
@@ -22,13 +22,13 @@ import { getRuleImplementationOperators } from "@truedat/dq/selectors/getRuleImp
 import {
   addGrantRequestToCart,
   removeGrantRequestFromCart,
-  updateGrantRequestFilter
+  updateGrantRequestFilter,
 } from "../routines";
 
 const getIcon = (formatMessage, type) =>
   formatMessage({
     id: `structure.type.${type}.icon`,
-    defaultMessage: "question circle outline"
+    defaultMessage: "question circle outline",
   });
 
 export const StructureGrantCart = ({
@@ -36,7 +36,7 @@ export const StructureGrantCart = ({
   grantRequestsCart,
   removeGrantRequestFromCart,
   updateGrantRequestFilter,
-  typeOperators
+  typeOperators,
 }) => {
   const { formatMessage } = useIntl();
   const history = useHistory();
@@ -48,14 +48,16 @@ export const StructureGrantCart = ({
     if (_.isEmpty(structures)) history.push(STRUCTURES);
   }, [history, structures]);
 
-  const removeRequest = structure => () =>
+  const removeRequest = (structure) => () =>
     removeGrantRequestFromCart(structure);
   const canHasFilters = _.pathOr(false, "hasDataFields");
   const hasFilters = _.flow(_.pathOr([], "filters"), _.negate(_.isEmpty));
 
-  const setRowValue = structure_id => ({ index, value }) => {
-    updateGrantRequestFilter({ index, value, structure_id });
-  };
+  const setRowValue =
+    (structure_id) =>
+    ({ index, value }) => {
+      updateGrantRequestFilter({ index, value, structure_id });
+    };
 
   return (
     <Segment>
@@ -64,7 +66,7 @@ export const StructureGrantCart = ({
       </Header>
       <Divider />
       <List.List>
-        {structures.map(s => (
+        {structures.map((s) => (
           <Popup
             key={`${s.id}`}
             content={s.external_id}
@@ -139,24 +141,24 @@ StructureGrantCart.propTypes = {
   typeOperators: PropTypes.array,
   addGrantRequestToCart: PropTypes.func,
   removeGrantRequestFromCart: PropTypes.func,
-  updateGrantRequestFilter: PropTypes.func
+  updateGrantRequestFilter: PropTypes.func,
 };
 
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
   const { structure, grantRequestsCart, userPermissions } = state;
   return {
     structure,
     grantRequestsCart,
     authorized: _.pathOr(false, "request_grant")(userPermissions),
-    typeOperators: getRuleImplementationOperators(state)
+    typeOperators: getRuleImplementationOperators(state),
   };
 };
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators(
     {
       addGrantRequestToCart,
       removeGrantRequestFromCart,
-      updateGrantRequestFilter
+      updateGrantRequestFilter,
     },
     dispatch
   );

package/src/components/StructureGrantCartCheckout.js

@@ -13,7 +13,7 @@ import StructureGrantCartTemplate from "./StructureGrantCartTemplate";
 
 export const StructureGrantCartCheckout = ({
   grantRequestsCart,
-  checkoutGrantRequest
+  checkoutGrantRequest,
 }) => {
   const { formatMessage } = useIntl();
 
@@ -27,20 +27,20 @@ export const StructureGrantCartCheckout = ({
 
   const checkout = () => {
     const metadata = applyTemplate(template)(content);
-    const requests = _.map(structure => {
+    const requests = _.map((structure) => {
       return {
         data_structure_id: structure.id,
         filters: {
-          rows: structure.filters
+          rows: structure.filters,
         },
-        metadata: metadata
+        metadata: metadata,
       };
     })(grantRequestsCart.structures);
     const payload = {
       grant_request_group: {
         requests,
-        type: template.name
-      }
+        type: template.name,
+      },
     };
     checkoutGrantRequest(payload);
   };
@@ -76,12 +76,12 @@ export const StructureGrantCartCheckout = ({
 
 StructureGrantCart.propTypes = {
   grantRequestsCart: PropTypes.object,
-  checkoutGrantRequest: PropTypes.func
+  checkoutGrantRequest: PropTypes.func,
 };
 const mapStateToProps = ({ grantRequestsCart }) => ({
-  grantRequestsCart
+  grantRequestsCart,
 });
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators({ checkoutGrantRequest }, dispatch);
 
 export default connect(

package/src/components/StructureSummary.js

@@ -80,18 +80,18 @@ export const StructureSummary = ({
               <Header as="h2">
                 <Header.Content>
                   {name}
-                  {grant ?
-                    (structureGrant ? (
+                  {grant ? (
+                    structureGrant ? (
                       structureGrant(grant)
                     ) : (
                       <Label color="green">
                         <Icon name="shield" />
                         {formatMessage({ id: "structure.grant.has_grant" })}
                       </Label>
-                    ))
-                    :
+                    )
+                  ) : (
                     <StructureGrantRequestButton />
-                  }
+                  )}
                   {type && (
                     <Header.Subheader>
                       {formatMessage({

package/src/components/StructureTabPane.js

@@ -5,7 +5,7 @@ import { Route, Switch } from "react-router-dom";
 import { ErrorBoundary } from "@truedat/core/components";
 import {
   STRUCTURE_LINKS_NEW,
-  STRUCTURE_NOTES_EDIT
+  STRUCTURE_NOTES_EDIT,
 } from "@truedat/core/routes";
 import { getActiveTab } from "../selectors/getActiveTab";
 import { getTabVisibility } from "../selectors/getTabVisibility";
@@ -77,7 +77,7 @@ export const StructureTabPane = ({ activeTab, tabVisibility }) => (
 
 StructureTabPane.propTypes = {
   activeTab: PropTypes.string,
-  tabVisibility: PropTypes.object
+  tabVisibility: PropTypes.object,
 };
 
 const mapStateToProps = (state, { match: { path } }) => {
@@ -85,7 +85,7 @@ const mapStateToProps = (state, { match: { path } }) => {
   const activeTab = getActiveTab(tabVisibility, path);
   return {
     tabVisibility,
-    activeTab
+    activeTab,
   };
 };
 

package/src/components/StructureView.js

@@ -12,7 +12,11 @@ import StructureSummary from "./StructureSummary";
 import StructureTabPaneRoutes from "./StructureTabPaneRoutes";
 import StructureTabRoutes from "./StructureTabRoutes";
 
-export const StructureView = ({ structureLoading, structure, hasItemsInCart }) => (
+export const StructureView = ({
+  structureLoading,
+  structure,
+  hasItemsInCart,
+}) => (
   <Segment loading={structureLoading} className="structures">
     {structure && structure.id && !structureLoading && (
       <Grid>
@@ -34,11 +38,11 @@ export const StructureView = ({ structureLoading, structure, hasItemsInCart }) =
               <StructureTabPaneRoutes />
             </Segment>
           </Grid.Column>
-          {hasItemsInCart &&
+          {hasItemsInCart && (
             <Grid.Column width={4}>
-              <StructureGrantCart/>
+              <StructureGrantCart />
             </Grid.Column>
-          }
+          )}
         </Grid.Row>
       </Grid>
     )}
@@ -48,10 +52,14 @@ export const StructureView = ({ structureLoading, structure, hasItemsInCart }) =
 StructureView.propTypes = {
   structureLoading: PropTypes.bool,
   structure: PropTypes.object,
-  hasItemsInCart: PropTypes.bool
+  hasItemsInCart: PropTypes.bool,
 };
 
-const mapStateToProps = ({ structureLoading, structure, grantRequestsCart }) => ({
+const mapStateToProps = ({
+  structureLoading,
+  structure,
+  grantRequestsCart,
+}) => ({
   structureLoading,
   structure,
   hasItemsInCart: _.flow(

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

@@ -0,0 +1,11 @@
+import React from "react";
+import { shallow } from "enzyme";
+import { GrantDateFilter } from "../GrantDateFilter";
+
+describe("<GrantDateFilter/>", () => {
+  it("matches the latest snapshot", () => {
+    const props = { active: true };
+    const wrapper = shallow(<GrantDateFilter {...props} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});

package/src/components/__tests__/GrantsLabelResults.js

@@ -0,0 +1,17 @@
+import React from "react";
+import { shallow } from "enzyme";
+import { intl } from "@truedat/test/intl-stub";
+import { GrantsLabelResults } from "../GrantsLabelResults";
+
+// workaround for enzyme issue with React.useContext
+// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
+jest.spyOn(React, "useContext").mockImplementation(() => intl);
+
+describe("<GrantsLabelResults />", () => {
+  const props = { grantCount: 22 };
+
+  it("matches the latest snapshot", () => {
+    const wrapper = shallow(<GrantsLabelResults {...props} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});

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

@@ -0,0 +1,41 @@
+import React from "react";
+import { mount } from "enzyme";
+import { GrantsLoader } from "../GrantsLoader";
+
+const getProps = () => ({
+  clearGrants: jest.fn(),
+  payload: {},
+  grantsLoading: false,
+  fetchGrants: jest.fn(),
+});
+
+describe("<GrantsLoader />", () => {
+  it("matches the latest snapshot", () => {
+    const props = getProps();
+    const wrapper = mount(<GrantsLoader {...props} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("calls fetchGrants when component mounts but not when it unmounts", () => {
+    const props = getProps();
+    const wrapper = mount(<GrantsLoader {...props} />);
+    expect(props.fetchGrants).toHaveBeenCalledTimes(1);
+    wrapper.unmount();
+    expect(props.fetchGrants).toHaveBeenCalledTimes(1);
+  });
+
+  it("calls clearGrants when component unmounts but not when it mounts", () => {
+    const props = getProps();
+    const wrapper = mount(<GrantsLoader {...props} />);
+    expect(props.clearGrants).toHaveBeenCalledTimes(0);
+    wrapper.unmount();
+    expect(props.clearGrants).toHaveBeenCalledTimes(1);
+  });
+
+  it("calls fetchGrants when payload is updated", () => {
+    const props = getProps();
+    const wrapper = mount(<GrantsLoader {...props} />);
+    wrapper.setProps({ payload: { "data_structure_version.name.raw": "XXX" } });
+    expect(props.fetchGrants).toHaveBeenCalledTimes(2);
+  });
+});

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

@@ -0,0 +1,185 @@
+import _ from "lodash/fp";
+import React from "react";
+import { shallow } from "enzyme";
+import { intl } from "@truedat/test/intl-stub";
+import { GrantsTable } from "../GrantsTable";
+import {
+  userDecorator,
+  GrantTableStructureDecorator,
+  StartDateDecorator,
+  EndDateDecorator,
+  GenericObjectDecorator,
+} from "../../selectors/getGrantsColumns";
+
+// workaround for enzyme issue with React.useContext
+// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
+jest.spyOn(React, "useContext").mockImplementation(() => intl);
+
+describe("<GrantsTable />", () => {
+  const defaultGrantsTableColumns = [
+    {
+      name: "user",
+      sort: { name: "user.user_name.raw" },
+      fieldSelector: _.pick(["user"]),
+      fieldDecorator: userDecorator,
+    },
+    {
+      name: "data_structure_version",
+      sort: { name: "data_structure_version.name.raw" },
+      fieldSelector: _.pick(["data_structure", "data_structure_version"]),
+      fieldDecorator: GrantTableStructureDecorator,
+    },
+    {
+      name: "start_date",
+      sort: { name: "start_date" },
+      fieldSelector: _.pick(["start_date"]),
+      fieldDecorator: StartDateDecorator,
+    },
+    {
+      name: "end_date",
+      sort: { name: "end_date" },
+      fieldSelector: _.pick(["end_date"]),
+      fieldDecorator: EndDateDecorator,
+    },
+    {
+      name: "metadata",
+      fieldSelector: _.pick(["data_structure_version.metadata"]),
+      fieldDecorator: GenericObjectDecorator,
+    },
+  ];
+
+  const grants = [
+    {
+      data_structure_version: {
+        data_structure_id: 22075,
+        description: "DEscripción",
+        domain: {
+          external_id: "Demo Truedat",
+          id: 3,
+          name: "Demo Truedat",
+          parent_ids: [],
+          updated_at: "2020-07-21 07:45:41.068703Z",
+        },
+        external_id: "sap:Clientes:KNA1",
+        metadata: {},
+        mutable_metadata: null,
+        name: "KNA1",
+      },
+      detail: {},
+      end_date: "2023-05-16",
+      id: 6,
+      start_date: "2020-05-17",
+      user: {
+        email: "user1@example.com",
+        full_name: "user_full_name_1",
+        user_name: "user1",
+      },
+      user_id: 23,
+    },
+    {
+      data_structure_version: {
+        data_structure_id: 4570466,
+        description: null,
+        domain: {
+          external_id: "Truedat",
+          id: 2,
+          name: "Truedat",
+          parent_ids: [],
+          updated_at: "2020-07-28 13:21:21.938189Z",
+        },
+        external_id: "postgres://postgres/td_metrics/public/concepts",
+        metadata: {
+          alias: "Truedat-PostgreSQL",
+          database: "td_metrics",
+          host: "postgres",
+          schema: "public",
+          type: "BASE TABLE",
+        },
+        mutable_metadata: null,
+        name: "concepts",
+      },
+      detail: {
+        access_type: "admin",
+      },
+      end_date: "2023-05-18",
+      id: 8,
+      start_date: "2011-05-17",
+      user: {
+        email: "user2@example.com",
+        full_name: "user_full_name_2",
+        user_name: "user2",
+      },
+      user_id: 171,
+    },
+  ];
+
+  const grantsSorting = [{ "data_structure_version.name.raw": "asc" }];
+  const sortGrants = jest.fn();
+  const grantsLoading = false;
+  const props = {
+    grants,
+    columns: defaultGrantsTableColumns,
+    grantsLoading,
+    sortGrants,
+    grantsSorting,
+  };
+
+  it("matches the latest snapshot", () => {
+    const wrapper = shallow(<GrantsTable {...props} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("sorts column in the direction specified", () => {
+    const wrapper = shallow(<GrantsTable {...props} />);
+
+    const tableHeaderCells = wrapper
+      .find("TableHeader")
+      .find("TableRow")
+      .dive()
+      .find("TableHeaderCell");
+
+    expect(tableHeaderCells.at(0).props().sorted).toEqual(null);
+    expect(tableHeaderCells.at(1).props().sorted).toEqual("ascending");
+    expect(tableHeaderCells.at(2).props().sorted).toEqual(null);
+    expect(tableHeaderCells.at(3).props().sorted).toEqual(null);
+  });
+
+  it("handles sort when column header is clicked", () => {
+    const wrapper = shallow(<GrantsTable {...props} />);
+
+    wrapper
+      .find("TableHeader")
+      .find("TableRow")
+      .dive()
+      .find("TableHeaderCell")
+      .at(0)
+      .simulate("click");
+
+    expect(
+      wrapper
+        .find("TableHeader")
+        .find("TableRow")
+        .dive()
+        .find("TableHeaderCell")
+        .at(0)
+        .props().sorted
+    ).toEqual("ascending");
+
+    wrapper
+      .find("TableHeader")
+      .find("TableRow")
+      .dive()
+      .find("TableHeaderCell")
+      .at(0)
+      .simulate("click");
+    expect(
+      wrapper
+        .find("TableHeader")
+        .find("TableRow")
+        .dive()
+        .find("TableHeaderCell")
+        .at(0)
+        .props().sorted
+    ).toEqual("descending");
+  });
+});

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

@@ -8,17 +8,19 @@ import { StructureGrantRequestButton } from "../StructureGrantRequestButton";
 import messages from "../../messages/en";
 
 const renderOpts = {
-  messages: { en: messages }
+  messages: { en: messages },
 };
 
 describe("<StructureGrantRequestButton />", () => {
-
   it("render a button", async () => {
     const props = {
       requested: false,
       authorized: true,
     };
-    const { getByText } = render(<StructureGrantRequestButton {...props} />, renderOpts);
+    const { getByText } = render(
+      <StructureGrantRequestButton {...props} />,
+      renderOpts
+    );
     expect(getByText("Request grant")).toMatchSnapshot();
   });
 
@@ -31,13 +33,16 @@ describe("<StructureGrantRequestButton />", () => {
       removeGrantRequestFromCart: removeRequest,
       authorized: true,
     };
-    const { findByText } = render(<StructureGrantRequestButton {...props} />, renderOpts);
+    const { findByText } = render(
+      <StructureGrantRequestButton {...props} />,
+      renderOpts
+    );
     userEvent.click(await findByText("Request grant"));
     await waitFor(() => {
       expect(addRequest.mock.calls.length).toBe(1);
       expect(removeRequest.mock.calls.length).toBe(0);
     });
-  })
+  });
 
   it("can be clickable", async () => {
     const addRequest = jest.fn();
@@ -48,13 +53,16 @@ describe("<StructureGrantRequestButton />", () => {
       removeGrantRequestFromCart: removeRequest,
       authorized: true,
     };
-    const { findByText } = render(<StructureGrantRequestButton {...props} />, renderOpts);
+    const { findByText } = render(
+      <StructureGrantRequestButton {...props} />,
+      renderOpts
+    );
     userEvent.click(await findByText("Pending request"));
     await waitFor(() => {
       expect(addRequest.mock.calls.length).toBe(0);
       expect(removeRequest.mock.calls.length).toBe(1);
     });
-  })
+  });
 
   it("renders nothing if does not have permissions", async () => {
     const addRequest = jest.fn();
@@ -65,10 +73,13 @@ describe("<StructureGrantRequestButton />", () => {
       removeGrantRequestFromCart: removeRequest,
       authorized: false,
     };
-    const component = render(<StructureGrantRequestButton {...props} />, renderOpts);
+    const component = render(
+      <StructureGrantRequestButton {...props} />,
+      renderOpts
+    );
     const { queryAllByText } = component;
     expect(queryAllByText("Request grant")).toHaveLength(0);
     expect(queryAllByText("Pending request")).toHaveLength(0);
     expect(component).toMatchSnapshot();
-  })
+  });
 });

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

@@ -22,7 +22,7 @@ describe("<StructureSummary />", () => {
     userPermissions: {
       update: true,
       confidential: true,
-      request_grant: true
+      request_grant: true,
     },
     class: "table",
     type: "foo",

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

@@ -17,6 +17,14 @@ exports[`<DictionaryRoutes /> matches the latest snapshot 1`] = `
     path="/grants_requests/checkout"
     render={[Function]}
   />
+  <Route
+    path="/grants"
+    render={[Function]}
+  />
+  <Route
+    path="/my_grants"
+    render={[Function]}
+  />
   <Route
     path="/structure_tags"
     render={[Function]}

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

@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<GrantDateFilter/> matches the latest snapshot 1`] = `
+<Fragment>
+  <DateRangeFilter
+    defaultValues={Object {}}
+    label={
+      <FormattedMessage
+        id="grant.start_date"
+        values={Object {}}
+      />
+    }
+    name="start_date,end_date"
+  />
+</Fragment>
+`;

package/src/components/__tests__/__snapshots__/GrantsLabelResults.js.snap

@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<GrantsLabelResults /> matches the latest snapshot 1`] = `
+<Label
+  className="grants-label-results"
+>
+  <FormattedMessage
+    id="grants.retrieved.results"
+    values={
+      Object {
+        "count": 22,
+      }
+    }
+  />
+</Label>
+`;

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

@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<GrantsLoader /> matches the latest snapshot 1`] = `
+<GrantsLoader
+  clearGrants={[MockFunction]}
+  fetchGrants={
+    [MockFunction] {
+      "calls": Array [
+        Array [
+          Object {
+            "onlyMyGrants": false,
+            "payload": Object {},
+          },
+        ],
+      ],
+      "results": Array [
+        Object {
+          "type": "return",
+          "value": undefined,
+        },
+      ],
+    }
+  }
+  grantsLoading={false}
+  payload={Object {}}
+/>
+`;