@truedat/dd 7.6.2 → 7.6.4

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

@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";
 import { render, waitForLoad } from "@truedat/test/render";
 import { GrantsTable } from "../GrantsTable";
 import { defaultGrantsTableColumns } from "../../selectors/getGrantsColumns";
+import SearchContext from "@truedat/core/search/SearchContext";
 
 describe("<GrantsTable />", () => {
   const renderOpts = {
@@ -75,25 +76,40 @@ describe("<GrantsTable />", () => {
     },
   ];
 
-  const grantsSorting = [{ "data_structure_version.name.raw": "asc" }];
   const sortGrants = jest.fn();
   const grantsLoading = false;
   const props = {
-    grants,
     columns: defaultGrantsTableColumns,
-    grantsLoading,
-    sortGrants,
-    grantsSorting,
+    setDownloading: jest.fn(),
+  };
+
+  const handleSortSelection = jest.fn();
+  const searchContext = {
+    searchData: { data: grants },
+    loading: grantsLoading,
+    sortColumn: "data_structure_version.name.raw",
+    sortDirection: "ascending",
+    handleSortSelection: handleSortSelection,
   };
 
   it("matches the latest snapshot", async () => {
-    const rendered = render(<GrantsTable {...props} />, renderOpts);
+    const rendered = render(
+      <SearchContext value={searchContext}>
+        <GrantsTable {...props} />
+      </SearchContext>,
+      renderOpts
+    );
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
 
   it("sorts column in the direction specified", async () => {
-    const rendered = render(<GrantsTable {...props} />, renderOpts);
+    const rendered = render(
+      <SearchContext value={searchContext}>
+        <GrantsTable {...props} />
+      </SearchContext>,
+      renderOpts
+    );
     await waitForLoad(rendered);
 
     const headers = rendered.container.querySelectorAll("th");
@@ -104,16 +120,21 @@ describe("<GrantsTable />", () => {
   });
 
   it("handles sort when column header is clicked", async () => {
-    const rendered = render(<GrantsTable {...props} />, renderOpts);
+    const rendered = render(
+      <SearchContext value={searchContext}>
+        <GrantsTable {...props} />
+      </SearchContext>,
+      renderOpts
+    );
     await waitForLoad(rendered);
 
     const user = userEvent.setup({ delay: null });
     const headers = rendered.container.querySelectorAll("th");
 
     await user.click(headers[0]);
-    expect(headers[0]).toHaveClass("ascending sorted");
+    expect(handleSortSelection).toHaveBeenCalled();
 
     await user.click(headers[0]);
-    expect(headers[0]).toHaveClass("descending sorted");
+    expect(handleSortSelection).toHaveBeenCalled();
   });
 });

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

@@ -77,12 +77,6 @@ exports[`<GrantRoutes /> renders correctly with GRANT_REQUESTS_APPROVALS_RESULT
 
 exports[`<GrantRoutes /> renders correctly with GRANTS route 1`] = `
 <div>
-  <div>
-    GrantsLoader
-  </div>
-  <div>
-    GrantFiltersLoader
-  </div>
   <div>
     Grants
   </div>
@@ -110,12 +104,6 @@ exports[`<GrantRoutes /> renders correctly with MY_GRANT_REQUESTS route 1`] = `
 
 exports[`<GrantRoutes /> renders correctly with MY_GRANTS route 1`] = `
 <div>
-  <div>
-    GrantsLoader
-  </div>
-  <div>
-    GrantFiltersLoader
-  </div>
   <div>
     Grants
   </div>
@@ -132,12 +120,6 @@ exports[`<GrantRoutes /> renders correctly with STRUCTURES_GRANT_REQUEST route 1
 
 exports[`<GrantRoutes /> renders unauthorized component when not authorized 1`] = `
 <div>
-  <div>
-    GrantsLoader
-  </div>
-  <div>
-    GrantFiltersLoader
-  </div>
   <div>
     Grants
   </div>

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

@@ -7,9 +7,7 @@ exports[`<GrantsDownloadButton /> matches the latest snapshot 1`] = `
       class="trigger-right"
     >
       <button
-        class="ui icon secondary disabled button"
-        disabled=""
-        tabindex="-1"
+        class="ui icon secondary button"
       >
         <i
           aria-hidden="true"

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

@@ -31,11 +31,6 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
         >
           end_date
         </th>
-        <th
-          class="disabled"
-        >
-          metadata
-        </th>
       </tr>
     </thead>
     <tbody
@@ -91,9 +86,6 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
             </div>
           </div>
         </td>
-        <td
-          class=""
-        />
       </tr>
       <tr
         class=""
@@ -145,35 +137,6 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
             </div>
           </div>
         </td>
-        <td
-          class=""
-        >
-          <div>
-            alias
-            : 
-            Truedat-PostgreSQL
-          </div>
-          <div>
-            database
-            : 
-            td_metrics
-          </div>
-          <div>
-            host
-            : 
-            postgres
-          </div>
-          <div>
-            schema
-            : 
-            public
-          </div>
-          <div>
-            type
-            : 
-            BASE TABLE
-          </div>
-        </td>
       </tr>
     </tbody>
   </table>

package/src/components/index.js

@@ -6,7 +6,6 @@ import GrantRoutes from "./GrantRoutes";
 import GrantRequestBulkActions from "./GrantRequestBulkActions";
 import GrantRequestsTable from "./GrantRequestsTable";
 import GrantRequestRow from "./GrantRequestRow";
-import GrantSelectedFilters from "./GrantSelectedFilters";
 import GrantsTable from "./GrantsTable";
 import LineageDefs from "./LineageDefs";
 import LineageDownloadButton from "./LineageDownloadButton";
@@ -60,7 +59,6 @@ export {
   GrantRequestsTable,
   GrantRequestRow,
   GrantRoutes,
-  GrantSelectedFilters,
   GrantsTable,
   LineageDefs,
   LineageDownloadButton,

package/src/hooks/useGrant.js

@@ -1,11 +1,34 @@
 import { compile } from "path-to-regexp";
 import useSWR from "swr";
 import useSWRMutations from "swr/mutation";
-import { apiJson, apiJsonPatch } from "@truedat/core/services/api";
-import { API_GRANT, API_DATA_STRUCTURE_VERSION } from "../api";
+import FileSaver from "file-saver";
+import {
+  apiJson,
+  apiJsonPost,
+  apiJsonPatch,
+  JSON_OPTS,
+} from "@truedat/core/services/api";
+import {
+  API_GRANT,
+  API_DATA_STRUCTURE_VERSION,
+  API_GRANT_FILTERS_SEARCH,
+  API_MY_GRANTS_SEARCH,
+  API_MY_GRANT_FILTERS_SEARCH,
+  API_GRANTS_DOWNLOAD,
+  API_GRANTS_SEARCH,
+} from "../api";
 
 const toApiPath = compile(API_GRANT);
 
+function saveFile({ data, headers }) {
+  const contentDisposition = headers["content-disposition"];
+  const regex = /filename=(.+)$/;
+  const match = regex.exec(contentDisposition);
+  const fileName = match ? match[1] : "grants.xlsx";
+
+  FileSaver.saveAs(data, fileName);
+}
+
 export const useGrant = (id) => {
   const url = toApiPath({ id: `${id}` });
   const { data, error, mutate } = useSWR(url, apiJson);
@@ -25,3 +48,27 @@ export const useStructure = (id) => {
   const { data, error } = useSWR(url, apiJson);
   return { data: data?.data, error, loading: !error && !data };
 };
+
+export const useGrantFilters = (onlyMyGrants) => () => {
+  const searchUrl = onlyMyGrants ? API_MY_GRANT_FILTERS_SEARCH : API_GRANT_FILTERS_SEARCH
+  return useSWRMutations(searchUrl, (url, { arg }) => {
+    return apiJsonPost(url, arg);
+  });
+};
+
+export const useGrantSearch = (onlyMyGrants) => () => {
+  const searchUrl = onlyMyGrants ? API_MY_GRANTS_SEARCH : API_GRANTS_SEARCH
+  return useSWRMutations(searchUrl, (url, { arg }) => {
+    return apiJsonPost(url, arg);
+  });
+};
+
+export const useGrantDownload = () => {
+  return useSWRMutations(API_GRANTS_DOWNLOAD, (url, { arg }) => {
+    return apiJsonPost(url, arg, { ...JSON_OPTS, responseType: "blob" }).then(
+      ({ data, headers }) => {
+        saveFile({ data, headers });
+      }
+    );
+  });
+};

package/src/messages/en.js

@@ -158,7 +158,7 @@ export default {
   "grantRequests.subheader.me": "Grant requests requested by me",
   "grantRequests.subheader": "Pending approval grant requests",
   "grants.actions.download.popup": "Select a grant",
-  "grants.actions.download.tooltip": "Download to CSV",
+  "grants.actions.download.tooltip": "Download to XLSX",
   "grants.header": "Grants",
   "grants.mine.header": "My grants",
   "grants.mine.subheader": "Structures granted to me",

package/src/messages/es.js

@@ -164,7 +164,7 @@ export default {
   "grantRequests.subheader.me": "Peticiones de acceso demandadas por mí",
   "grantRequests.subheader": "Peticiones de acceso pendientes de aprobación",
   "grants.actions.download.popup": "Seleccione un acceso",
-  "grants.actions.download.tooltip": "Descargar a CSV",
+  "grants.actions.download.tooltip": "Descargar a XLSX",
   "grants.header": "Accesos",
   "grants.mine.header": "Mis accesos",
   "grants.mine.subheader": "Estructuras a las que tengo acceso",

package/src/reducers/index.js

@@ -5,7 +5,6 @@ import { csvGraphDownloading } from "./csvGraphDownloading";
 import { ddMessage } from "./ddMessage";
 import { grantActiveFilters } from "./grantActiveFilters";
 import { grantCount } from "./grantCount";
-import { grantDateFilter } from "./grantDateFilter";
 import { grantFilters } from "./grantFilters";
 import { grantFiltersLoading } from "./grantFiltersLoading";
 import { grantLoading } from "./grantLoading";
@@ -87,7 +86,6 @@ export {
   ddMessage,
   grantActiveFilters,
   grantCount,
-  grantDateFilter,
   grantFilters,
   grantFiltersLoading,
   grantLoading,

package/src/routines.js

@@ -6,7 +6,6 @@ export const addGrantRequestToCart = createRoutine("ADD_GRANT_REQUEST_TO_CART");
 export const addStructureSelectedFilter = createRoutine(
   "ADD_STRUCTURE_SELECTED_FILTER"
 );
-export const applyGrantDateFilter = createRoutine("APPLY_GRANT_DATE_FILTER");
 export const applyUserSearchFilter = createRoutine("APPLY_USER_SEARCH_FILTER");
 export const bulkUpdateStructures = createRoutine("BULK_UPDATE_STRUCTURES");
 export const cancelPoll = createRoutine("CANCEL_POLL");
@@ -70,7 +69,6 @@ export const deleteUserSearchFilter = createRoutine(
 );
 export const doStructureNoteAction = createRoutine("DO_STRUCTURE_NOTE_ACTION");
 export const downloadCsvGraph = createRoutine("DOWNLOAD_CSV_GRAPH");
-export const downloadGrants = createRoutine("DOWNLOAD_GRANTS");
 export const downloadReferenceDataset = createRoutine(
   "DOWNLOAD_REFERENCE_DATASET"
 );
@@ -145,7 +143,6 @@ export const setGrantRequestsQuery = createRoutine("SET_GRANT_REQUESTS_QUERY");
 export const sortGrants = createRoutine("SORT_GRANTS");
 export const tagStructure = createRoutine("TAG_STRUCTURE");
 export const structureSearchQuery = createRoutine("STRUCTURES_SEARCH_QUERY");
-export const toggleGrantDateFilter = createRoutine("TOGGLE_GRANT_DATE_FILTER");
 export const toggleGrantFilterValue = createRoutine(
   "TOGGLE_GRANT_FILTER_VALUE"
 );

package/src/sagas/index.js

@@ -18,7 +18,6 @@ import { deleteTagRequestSaga } from "./deleteTag";
 import { deleteUserSearchFilterRequestSaga } from "./deleteUserSearchFilter";
 import { doStructureNoteActionRequestSaga } from "./doStructureNoteAction";
 import { downloadCsvGraphRequestSaga } from "./downloadCsvGraph";
-import { downloadGrantsRequestSaga } from "./downloadGrants";
 import { downloadReferenceDatasetRequestSaga } from "./downloadReferenceDataset";
 import { fetchGrantFiltersRequestSaga } from "./fetchGrantFilters";
 import { fetchGrantRequestsFiltersRequestSaga } from "./fetchGrantRequestsFilters";
@@ -75,7 +74,6 @@ export {
   deleteUserSearchFilterRequestSaga,
   doStructureNoteActionRequestSaga,
   downloadCsvGraphRequestSaga,
-  downloadGrantsRequestSaga,
   downloadReferenceDatasetRequestSaga,
   fetchGrantFiltersRequestSaga,
   fetchGrantRequestRequestSaga,
@@ -133,7 +131,6 @@ export default [
   deleteUserSearchFilterRequestSaga(),
   doStructureNoteActionRequestSaga(),
   downloadCsvGraphRequestSaga(),
-  downloadGrantsRequestSaga(),
   downloadReferenceDatasetRequestSaga(),
   fetchGrantFiltersRequestSaga(),
   fetchGrantRequestRequestSaga(),

package/src/selectors/getGrantsColumns.js

@@ -90,17 +90,16 @@ GrantTableStructureDecorator.propTypes = {
   data_structure_version: PropTypes.object,
 };
 
-export const GenericObjectDecorator = ({
-  data_structure_version: { metadata },
-}) =>
-  Object.entries(metadata).map(([k, v], i) => [
+export const ObjectDecorator = (object) => {
+  return Object.entries(object).map(([k, v], i) => [
     <div key={i}>
       {k}: {`${v}`}
     </div>,
   ]);
+};
 
-GenericObjectDecorator.propTypes = {
-  metadata: PropTypes.object,
+ObjectDecorator.propTypes = {
+  object: PropTypes.object,
 };
 
 export const StartDateDecorator = ({ start_date }) => {
@@ -199,7 +198,7 @@ export const getGrantsColumns = createSelector(
 export const defaultGrantsTableColumns = [
   {
     name: "user",
-    sort: { name: "user.user_name.raw" },
+    sort: { name: "user.full_name.raw" },
     fieldSelector: _.pick(["user"]),
     fieldDecorator: userDecorator,
   },
@@ -221,11 +220,6 @@ export const defaultGrantsTableColumns = [
     fieldSelector: _.pick(["end_date", "pending_removal"]),
     fieldDecorator: EndDateDecorator,
   },
-  {
-    name: "metadata",
-    fieldSelector: _.pick(["data_structure_version.metadata"]),
-    fieldDecorator: GenericObjectDecorator,
-  },
 ];
 
 export const getGrantsTableColumns = createSelector(

package/src/selectors/index.js

@@ -13,9 +13,6 @@ export {
 } from "./getGrantRequestsSearchColumns";
 export { getGrantAvailableFilters } from "./getGrantAvailableFilters";
 export { getGrantSelectedFilters } from "./getGrantSelectedFilters";
-export { getGrantFilterTypes } from "./getGrantFilterTypes";
-export { getGrantSelectedFilterValues } from "./getGrantSelectedFilterValues";
-export { getGrantSelectedFilterActiveValues } from "./getGrantSelectedFilterActiveValues";
 export {
   defaultStructureProperties,
   getStructureProperties,
@@ -26,7 +23,6 @@ export {
   defaultRelationColumns,
 } from "./getStructureRelations";
 export { getParsedEvents } from "./getParsedEvents";
-export { getPreviousGrantQuery } from "./getPreviousGrantQuery";
 export {
   getSortedChildrenRelations,
   getSortedParentRelations,

package/src/components/GrantDateFilter.js

@@ -1,27 +0,0 @@
-import { propOr } from "lodash/fp";
-import PropTypes from "prop-types";
-import { FormattedMessage } from "react-intl";
-import { connect } from "react-redux";
-import DateRangeFilter from "@truedat/core/components/DateRangeFilter";
-import { applyGrantDateFilter } from "../routines";
-
-export const GrantDateFilter = ({ active, applyGrantDateFilter, ...props }) =>
-  active ? (
-    <DateRangeFilter
-      label={<FormattedMessage id="grant.start_date" />}
-      name="start_date,end_date"
-      onChange={applyGrantDateFilter}
-      defaultValues={props}
-    />
-  ) : null;
-
-GrantDateFilter.propTypes = {
-  active: PropTypes.bool,
-  applyGrantDateFilter: PropTypes.func,
-};
-
-export const mapStateToProps = propOr({}, "grantDateFilter");
-
-export default connect(mapStateToProps, { applyGrantDateFilter })(
-  GrantDateFilter
-);

package/src/components/GrantSelectedFilters.js

@@ -1,59 +0,0 @@
-import _ from "lodash/fp";
-import { bindActionCreators } from "redux";
-import { connect } from "react-redux";
-import { makeOption } from "@truedat/core/services/i18n";
-import { SelectedFilters } from "@truedat/core/components";
-import {
-  closeGrantFilter,
-  openGrantFilter,
-  removeGrantFilter,
-  resetGrantFilters,
-  toggleGrantFilterValue,
-} from "../routines";
-import {
-  getGrantSelectedFilterActiveValues,
-  getGrantSelectedFilters,
-  getGrantSelectedFilterValues,
-  getGrantFilterTypes,
-} from "../selectors";
-
-const translations = (formatMessage) => ({
-  "active.raw": (v) =>
-    formatMessage({ id: `filters.active.raw.${v}`, defaultMessage: v }),
-  "execution_result_info.result_text": (v) =>
-    formatMessage({ id: v, defaultMessage: v }),
-});
-
-export const mapStateToProps = (state, ownProps) => {
-  const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const { grantFiltersLoading: loading, grantSelectedFilter: selectedFilter } =
-    state;
-
-  const i18nValues = _.flow(
-    getGrantSelectedFilterValues,
-    _.map(makeOption(translations(formatMessage), selectedFilter))
-  )(state);
-
-  return {
-    loading,
-    filterTypes: getGrantFilterTypes(state),
-    selectedFilter,
-    selectedFilters: getGrantSelectedFilters(state),
-    selectedFilterActiveValues: getGrantSelectedFilterActiveValues(state),
-    selectedFilterValues: i18nValues,
-  };
-};
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    {
-      closeFilter: closeGrantFilter,
-      openFilter: openGrantFilter,
-      removeFilter: removeGrantFilter,
-      resetFilters: resetGrantFilters,
-      toggleFilterValue: toggleGrantFilterValue,
-    },
-    dispatch
-  );
-
-export default connect(mapStateToProps, mapDispatchToProps)(SelectedFilters);

package/src/components/GrantsSearch.js

@@ -1,50 +0,0 @@
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { Button, Icon, Input } from "semantic-ui-react";
-import { useIntl } from "react-intl";
-import { searchGrants, toggleGrantDateFilter } from "../routines";
-import GrantFilters from "./GrantFilters";
-
-export const GrantsSearch = ({
-  query,
-  searchGrants,
-  grantDateFilter,
-  toggleGrantDateFilter,
-}) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <Input
-      value={query}
-      onChange={(_e, data) => searchGrants({ query: data.value })}
-      iconPosition="left"
-      action
-      placeholder={formatMessage({ id: "structures.search.placeholder" })}
-    >
-      <Icon name="search" link />
-      <input />
-      <Button
-        icon="calendar alternate outline"
-        active={grantDateFilter?.active}
-        onClick={() => toggleGrantDateFilter()}
-      />
-      <GrantFilters />
-    </Input>
-  );
-};
-
-GrantsSearch.propTypes = {
-  query: PropTypes.string,
-  searchGrants: PropTypes.func,
-  grantDateFilter: PropTypes.object,
-  toggleGrantDateFilter: PropTypes.func,
-};
-
-const mapStateToProps = ({ grantQuery }) => ({
-  query: grantQuery?.query,
-});
-
-export default connect(mapStateToProps, {
-  searchGrants,
-  toggleGrantDateFilter,
-})(GrantsSearch);

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

@@ -1,18 +0,0 @@
-import { render, waitForLoad } from "@truedat/test/render";
-import { GrantDateFilter } from "../GrantDateFilter";
-
-describe("<GrantDateFilter />", () => {
-  it("matches the latest snapshot", async () => {
-    const renderOpts = {
-      state: {
-        userPermissions: { update: true },
-      },
-    };
-    const rendered = render(
-      <GrantDateFilter active={true} applyGrantDateFilter={() => {}} />,
-      renderOpts
-    );
-    await waitForLoad(rendered);
-    expect(rendered.container).toMatchSnapshot();
-  });
-});

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

@@ -1,34 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<GrantDateFilter /> matches the latest snapshot 1`] = `
-<div>
-  <div
-    class="inline fields"
-  >
-    <div
-      class="field"
-    >
-      <div
-        class="ui input"
-      >
-        <input
-          type="date"
-          value=""
-        />
-      </div>
-    </div>
-    <div
-      class="field"
-    >
-      <div
-        class="ui input"
-      >
-        <input
-          type="date"
-          value=""
-        />
-      </div>
-    </div>
-  </div>
-</div>
-`;

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

@@ -1,54 +0,0 @@
-import {
-  applyGrantDateFilter,
-  clearGrantFilters,
-  toggleGrantDateFilter,
-} from "../../routines";
-import { initialState, grantDateFilter } from "../grantDateFilter";
-
-const fooState = { foo: "bar" };
-
-describe("reducers: grantDateFilter", () => {
-  it("should provide the initial state", () => {
-    expect(grantDateFilter(undefined, {})).toBe(initialState);
-  });
-
-  it("should handle the clearGrantFilters.TRIGGER action", () => {
-    expect(grantDateFilter(fooState, { type: clearGrantFilters.TRIGGER })).toBe(
-      initialState
-    );
-  });
-
-  it("should handle the toggleGrantDateFilter.TRIGGER action", () => {
-    expect(
-      grantDateFilter(
-        { active: false },
-        { type: toggleGrantDateFilter.TRIGGER }
-      )
-    ).toEqual({ active: true });
-
-    expect(
-      grantDateFilter({ active: true }, { type: toggleGrantDateFilter.TRIGGER })
-    ).toEqual({ active: false });
-  });
-
-  it("should handle the applyGrantDateFilter.TRIGGER action", () => {
-    const payload = {
-      name: "some_date",
-      type: "range",
-      value: "2020-01-01 - 2020-02-02",
-    };
-    expect(
-      grantDateFilter(
-        { active: true },
-        {
-          type: applyGrantDateFilter.TRIGGER,
-          payload,
-        }
-      )
-    ).toEqual({ ...payload, active: true });
-  });
-
-  it("should ignore unknown actions", () => {
-    expect(grantDateFilter(fooState, { type: "FOO" })).toBe(fooState);
-  });
-});