@truedat/dd 4.28.4 → 4.28.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.28.8] 2021-09-20
+
+### Added
+
+- [TD-3970] `StructureFieldsDropdown` support for cast type and modifier
+
+## [4.28.6] 2021-09-20
+
+### Added
+
+- [TD-3950] My grants table
+
 ## [4.28.4] 2021-09-15
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.28.4",
+  "version": "4.28.8",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -16,8 +16,8 @@
   "scripts": {
     "clean": "rimraf yarn-error.log",
     "debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test": "jest --coverage",
-    "test:watch": "jest --watch",
+    "test": "TZ=UTC jest --coverage",
+    "test:watch": "TZ=UTC jest --watch",
     "eslint": "eslint src/**",
     "eslint:fix": "eslint --fix src/**"
   },
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.28.4",
+    "@truedat/test": "4.28.8",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.28.4",
-    "@truedat/core": "4.28.4",
-    "@truedat/df": "4.28.4",
+    "@truedat/auth": "4.28.8",
+    "@truedat/core": "4.28.8",
+    "@truedat/df": "4.28.8",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "c00da6ddc499bca47a5a0e108c8ec94988293907"
+  "gitHead": "33a7f73dd4ffbd31d1df270c8453c3a876412990"
 }

package/src/api.js

@@ -11,6 +11,8 @@ const API_GRANTS_SEARCH = "/api/grants/search";
 const API_GRAPH = "/api/graphs/:id";
 const API_GRAPHS = "/api/graphs";
 const API_GRAPH_CSV = "/api/graphs/csv";
+const API_MY_GRANT_FILTERS_SEARCH = "/api/grant_filters/search/mine";
+const API_MY_GRANTS_SEARCH = "/api/grants/search/mine";
 const API_NODE = "/api/nodes/:id";
 const API_NODES = "/api/nodes";
 const API_PROFILE_GROUP = "/api/profile_execution_groups/:id";
@@ -48,6 +50,8 @@ export {
   API_GRAPH,
   API_GRAPHS,
   API_GRAPH_CSV,
+  API_MY_GRANTS_SEARCH,
+  API_MY_GRANT_FILTERS_SEARCH,
   API_NODE,
   API_NODES,
   API_PROFILE_GROUP,

package/src/components/DictionaryRoutes.js

@@ -9,6 +9,8 @@ import {
   STRUCTURE_TYPES,
   SYSTEMS,
   GRANTS_REQUESTS_CHECKOUT,
+  GRANTS,
+  MY_GRANTS,
 } from "@truedat/core/routes";
 import ProfileExecution from "./ProfileExecution";
 import ProfileExecutionBreadcrumbs from "./ProfileExecutionBreadcrumbs";
@@ -24,6 +26,9 @@ import StructureTypesRoutes from "./StructureTypesRoutes";
 import SystemsRoutes from "./SystemsRoutes";
 import SystemsLoader from "./SystemsLoader";
 import StructureGrantCartCheckout from "./StructureGrantCartCheckout";
+import GrantFiltersLoader from "./GrantFiltersLoader";
+import GrantsLoader from "./GrantsLoader";
+import Grants from "./Grants";
 
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
@@ -69,6 +74,28 @@ export const DictionaryRoutes = () => {
         path={GRANTS_REQUESTS_CHECKOUT}
         render={() => <StructureGrantCartCheckout />}
       />
+      <Route
+        path={GRANTS}
+        render={() => (
+          <>
+            <GrantsLoader />
+            <GrantFiltersLoader />
+            <Grants />
+          </>
+        )}
+      />
+      <Route
+        path={MY_GRANTS}
+        render={() => {
+          return (
+            <>
+              <GrantsLoader onlyMyGrants />
+              <GrantFiltersLoader onlyMyGrants />
+              <Grants onlyMyGrants />
+            </>
+          );
+        }}
+      />
       <Route path={STRUCTURE_TAGS} render={() => <StructureTagsRoutes />} />
       <Route path={STRUCTURE_TYPES} render={() => <StructureTypesRoutes />} />
       <Route

package/src/components/EditDomainForm.js

@@ -27,6 +27,7 @@ export const EditDomainForm = ({ title, updateStructure, structure }) => {
     <Container style={{ width: "400px" }}>
       <Header as="h2" content={title} />
       <DomainDropdownSelector
+        clearable={false}
         onChange={handleDomainSelected}
         name="domain"
         value={domainId || structure?.domain_id}

package/src/components/GrantFiltersLoader.js

@@ -4,13 +4,18 @@ import { FiltersLoader } from "@truedat/core/components";
 import { makeActiveFiltersSelector } from "@truedat/core/selectors";
 import { clearGrantFilters, fetchGrantFilters } from "../routines";
 
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators(
-    { clearFilters: clearGrantFilters, fetchFilters: fetchGrantFilters },
+const mapDispatchToProps = (dispatch, props) => {
+  const { onlyMyGrants } = props;
+  const fetchMyGrantsFilters = (payload) => {
+    return fetchGrantFilters({ payload, onlyMyGrants });
+  };
+  return bindActionCreators(
+    { clearFilters: clearGrantFilters, fetchFilters: fetchMyGrantsFilters },
     dispatch
   );
+};
 
-const makeMapStateToProps = () => {
+const makeMapStateToProps = ({}) => {
   const activeFiltersSelector = makeActiveFiltersSelector("grantActiveFilters");
   const mapStateToProps = (state, props) => {
     return {

package/src/components/Grants.js

@@ -13,14 +13,18 @@ import GrantsLabelResults from "./GrantsLabelResults";
 import GrantSelectedFilters from "./GrantSelectedFilters";
 import GrantsPagination from "./GrantsPagination";
 
-export const Grants = ({ grantsLoading }) => (
+export const Grants = ({ grantsLoading, onlyMyGrants }) => (
   <Segment>
     <Header as="h2">
       <Icon circular name="cogs" />
       <Header.Content>
-        <FormattedMessage id="grants.header" />
+        <FormattedMessage
+          id={onlyMyGrants ? "grants.mine.header" : "grants.header"}
+        />
         <Header.Subheader>
-          <FormattedMessage id="grants.subheader" />
+          <FormattedMessage
+            id={onlyMyGrants ? "grants.mine.subheader" : "grants.subheader"}
+          />
         </Header.Subheader>
       </Header.Content>
     </Header>
@@ -34,7 +38,7 @@ export const Grants = ({ grantsLoading }) => (
         </Dimmer>
       </Dimmer.Dimmable>
       <GrantsLabelResults />
-      <GrantsTable />
+      <GrantsTable onlyMyGrants={onlyMyGrants} />
       <GrantsPagination />
     </Segment>
   </Segment>
@@ -42,6 +46,7 @@ export const Grants = ({ grantsLoading }) => (
 
 Grants.propTypes = {
   grantsLoading: PropTypes.bool,
+  onlyMyGrants: PropTypes.bool,
 };
 
 const mapStateToProps = ({ grantsLoading }) => ({ grantsLoading });

package/src/components/GrantsLoader.js

@@ -4,15 +4,20 @@ import { connect } from "react-redux";
 import { makeSearchQuerySelector } from "@truedat/core/selectors";
 import { clearGrants, fetchGrants } from "../routines";
 
-export const GrantsLoader = ({ clearGrants, fetchGrants, payload }) => {
+export const GrantsLoader = ({
+  clearGrants,
+  fetchGrants,
+  payload,
+  onlyMyGrants = false,
+}) => {
   useEffect(() => {
     return () => {
       clearGrants();
     };
   }, [clearGrants]);
   useEffect(() => {
-    fetchGrants(payload);
-  }, [payload, fetchGrants]);
+    fetchGrants({ payload, onlyMyGrants });
+  }, [payload, fetchGrants, onlyMyGrants]);
   return null;
 };
 
@@ -20,6 +25,7 @@ GrantsLoader.propTypes = {
   clearGrants: PropTypes.func,
   fetchGrants: PropTypes.func,
   payload: PropTypes.object,
+  onlyMyGrants: PropTypes.bool,
 };
 
 const makeMapStateToProps = () => {

package/src/components/GrantsTable.js

@@ -102,8 +102,8 @@ GrantsTable.propTypes = {
   grantsSorting: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
-  columns: getGrantsTableColumns(state),
+const mapStateToProps = (state, { onlyMyGrants }) => ({
+  columns: getGrantsTableColumns({ ...state, onlyMyGrants }),
   grants: state.grants,
   grantsLoading: state.grantsLoading,
   grantsSorting: _.path("grantQuery.sort")(state),

package/src/components/StructureFieldsDropdown.js

@@ -6,52 +6,6 @@ import { OptionGroup } from "@truedat/core/components";
 import { useIntl } from "react-intl";
 import { getStructuresFields } from "../selectors/getStructuresFields";
 
-const withFilters = (structureFields, filters) =>
-  filters
-    ? _.filter((f) =>
-        _.every.convert({ cap: false })((v, k) => v.includes(_.prop(k)(f)))(
-          filters
-        )
-      )(structureFields)
-    : structureFields;
-
-const getOptions = (structureFields, formatMessage) =>
-  _.flow(
-    _.sortBy(_.flow(_.prop("name"), _.toLower)),
-    _.groupBy("label"),
-    _.reduce.convert({ cap: false })(
-      (acc, v, k) =>
-        _.isNil(k) || k === "undefined"
-          ? [...acc, ...v]
-          : [...acc, { label: k, options: v }],
-      []
-    ),
-    _.map.convert({ cap: false })((field) =>
-      toFieldOption(field, formatMessage)
-    )
-  )(structureFields);
-
-const toFieldOption = (field, formatMessage) =>
-  _.has("options")(field)
-    ? {
-        icon: "table",
-        label: field.label,
-        options: _.map((field) => formatOption(field, formatMessage))(
-          field.options
-        ),
-      }
-    : formatOption(field, formatMessage);
-
-const formatOption = (field, formatMessage) => ({
-  key: field.data_structure_id,
-  text: field.name,
-  value: field.data_structure_id,
-  icon: formatMessage({
-    id: `field_type.icon.${field.field_type}`,
-    defaultMessage: "hashtag",
-  }),
-});
-
 export const StructureFieldsDropdown = ({
   label,
   inline,
@@ -59,13 +13,77 @@ export const StructureFieldsDropdown = ({
   structureFields,
   filters,
   value,
+  typeCastModifiers,
 }) => {
   const { formatMessage } = useIntl();
-  const onClick = ({ value }) => {
+  const onClick = ({ value, modifier }) => {
     const field = _.find(_.propEq("data_structure_id", value))(structureFields);
-    onSelectField(field);
+    onSelectField(field, modifier);
   };
 
+  const formatOption = (field) => {
+    const modifier = _.find({sourceType: field.field_type})(typeCastModifiers)
+    if(modifier){
+      return({
+        key: field.data_structure_id,
+        text: `${field.name} (${formatMessage({
+          id: `filtersGrid.field.modifier.${modifier.name}`
+        })})`,
+        modifier,
+        value: field.data_structure_id,
+        icon: formatMessage({
+          id: `field_type.icon.${field.field_type}`,
+          defaultMessage: "hashtag",
+        }),
+      })
+    }
+    
+    return({
+    key: field.data_structure_id,
+    text: field.name,
+    value: field.data_structure_id,
+    icon: formatMessage({
+      id: `field_type.icon.${field.field_type}`,
+      defaultMessage: "hashtag",
+    }),
+  })
+
+};
+  const toFieldOption = (field) =>
+    _.has("options")(field)
+      ? {
+          icon: "table",
+          label: field.label,
+          options: _.map(formatOption)(field.options),
+        }
+      : formatOption(field);
+
+  const getOptions = _.flow(
+    _.sortBy(_.flow(_.prop("name"), _.toLower)),
+    _.groupBy("label"),
+    _.reduce.convert({ cap: false })(
+      (acc, v, k) =>
+        _.isNil(k) || k === "undefined"
+          ? [...acc, ...v]
+          : [...acc, { label: k, options: v }],
+      []
+    ),
+    _.map(toFieldOption),
+  )
+
+  const castSourceTypes = _.flow(
+    _.map(({sourceType})=>sourceType),
+    _.uniq
+  )(typeCastModifiers)
+  const options = _.flow(
+    _.filter((f) =>
+        _.every.convert({ cap: false })((v, k) => v.includes(_.prop(k)(f)))(
+          filters
+        ) || castSourceTypes.includes(f.field_type)
+      ),
+    getOptions
+  )(structureFields);
+
   return (
     <OptionGroup
       inline={inline}
@@ -75,7 +93,7 @@ export const StructureFieldsDropdown = ({
       placeholder={formatMessage({
         id: "structureFields.dropdown.placeholder",
       })}
-      options={getOptions(withFilters(structureFields, filters), formatMessage)}
+      options={options}
     />
   );
 };
@@ -87,6 +105,7 @@ StructureFieldsDropdown.propTypes = {
   structureFields: PropTypes.array,
   onSelectField: PropTypes.func,
   filters: PropTypes.object,
+  typeCastModifiers: PropTypes.array,
 };
 
 const mapStateToProps = (state, props) => ({

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

@@ -52,7 +52,7 @@ describe("<ValueConditionStructure />", () => {
         data_structure_id: 2,
         field_type: "string",
         label: "bar",
-      });
+      }, undefined);
     });
   });
 });

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__/GrantsLoader.spec.js.snap

@@ -7,7 +7,10 @@ exports[`<GrantsLoader /> matches the latest snapshot 1`] = `
     [MockFunction] {
       "calls": Array [
         Array [
-          Object {},
+          Object {
+            "onlyMyGrants": false,
+            "payload": Object {},
+          },
         ],
       ],
       "results": Array [

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

@@ -25,7 +25,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
         <TableHeaderCell
           as="th"
           className=""
-          content="data_structure_version"
+          content="grant.header.data_structure_version"
           key="1"
           onClick={[Function]}
           sorted="ascending"

package/src/components/index.js

@@ -1,7 +1,6 @@
 import DictionaryRoutes from "./DictionaryRoutes";
 import FilteredNav from "./FilteredNav";
 import GrantSelectedFilters from "./GrantSelectedFilters";
-import GrantsRoutes from "./GrantsRoutes";
 import GrantsTable from "./GrantsTable";
 import LineageDefs from "./LineageDefs";
 import LineageDownloadButton from "./LineageDownloadButton";
@@ -57,7 +56,6 @@ import ValueConditionStructure from "./ValueConditionStructure";
 export {
   DictionaryRoutes,
   FilteredNav,
-  GrantsRoutes,
   GrantSelectedFilters,
   GrantsTable,
   LineageDefs,

package/src/messages/en.js

@@ -34,15 +34,17 @@ export default {
   "grant.cell.end_date.null": "No expiration set",
   "grant.cell.end_date.same_user": "It's you",
   "grant.header.user": "Account",
-  "grant.header.data_structure": "Structure",
+  "grant.header.data_structure_version": "Structure",
   "grant.header.end_date": "Expires",
   "grant.header.start_date": "Access granted",
   "grant.updated_at": "Last changed",
   "grants.header": "Grants",
+  "grants.mine.header": "My grants",
+  "grants.mine.subheader": "Structures granted to me",
   "grants.retrieved.results": "{count} grants found",
-  "grants.search.placeholder": "Enter a search...",
+  "grants.search.placeholder": "Search grants...",
   "grants.search.results.empty": "No grants found",
-  "grants.subheader": "Grants",
+  "grants.subheader": "Granted access to structures",
   "filters.with_content.raw.true": "Extra Info",
   "graph.actions.download.popup": "Select a graph",
   "graph.actions.download.tooltip": "Download to csv",

package/src/messages/es.js

@@ -34,16 +34,18 @@ export default {
   "grant.cell.direct_access": "Acceso Directo",
   "grant.cell.end_date.null": "Sin fecha de expiración",
   "grant.cell.end_date.same_user": "Eres tú",
-  "grant.header.data_structure": "Estructura",
+  "grant.header.data_structure_version": "Estructura",
   "grant.header.end_date": "Expira",
   "grant.header.start_date": "Acceso desde",
   "grant.header.user": "Cuenta",
   "grant.updated_at": "Actualizada",
-  "grants.header": "Grants",
+  "grants.header": "Accesos",
+  "grants.mine.header": "Mis accesos",
+  "grants.mine.subheader": "Estructuras a las que tengo acceso",
   "grants.retrieved.results": "{count} grants encontrados",
-  "grants.search.placeholder": "Introduce una busqueda...",
+  "grants.search.placeholder": "Buscar accesos...",
   "grants.search.results.empty": "Ningún grant encontrado",
-  "grants.subheader": "Grants",
+  "grants.subheader": "Accesos a estructuras",
   "filters.with_content.raw.true": "Contiene información extra",
   "graph.actions.download.popup": "Seleccione un grafo",
   "graph.actions.download.tooltip": "Descargar en csv",

package/src/reducers/grantActiveFilters.js

@@ -5,6 +5,7 @@ import {
   removeGrantFilter,
   resetGrantFilters,
   toggleGrantFilterValue,
+  clearGrantFilters,
 } from "../routines";
 
 export const initialState = {};
@@ -26,6 +27,7 @@ export const grantActiveFilters = (state = initialState, { type, payload }) => {
       const { filter } = payload;
       return _.omit(filter)(state);
     }
+    case clearGrantFilters.TRIGGER:
     case resetGrantFilters.TRIGGER: {
       return initialState;
     }

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

@@ -0,0 +1,97 @@
+import { debounce } from "redux-saga/effects";
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  fetchGrantFiltersRequestSaga,
+  fetchGrantFiltersSaga,
+} from "../fetchGrantFilters";
+import { fetchGrantFilters } from "../../routines";
+import {
+  API_GRANT_FILTERS_SEARCH,
+  API_MY_GRANT_FILTERS_SEARCH,
+} from "../../api";
+
+describe("sagas: fetchGrantFiltersRequestSaga", () => {
+  it("should invoke fetchGrantFiltersSaga on trigger", () => {
+    expect(() => {
+      testSaga(fetchGrantFiltersRequestSaga)
+        .next()
+        .takeLatest(fetchGrantFilters.TRIGGER, fetchGrantFiltersSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(fetchGrantFiltersRequestSaga)
+        .next()
+        .takeLatest("FOO", fetchGrantFiltersSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: fetchGrantFiltersSaga", () => {
+  const grantFilters = { filters: ["filtro1", "filtro2"] };
+  const data = {
+    collection: [
+      { id: 1, user_id: 1, data_structure_id: 1, description: "desc1" },
+      { id: 2, user_id: 1, data_structure_id: 1, description: "desc2" },
+    ],
+  };
+  const headers = {
+    "x-total-count": "123",
+  };
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(fetchGrantFiltersSaga, { payload: { payload: grantFilters } })
+        .next()
+        .put(fetchGrantFilters.request())
+        .next()
+        .call(apiJsonPost, API_GRANT_FILTERS_SEARCH, grantFilters, JSON_OPTS)
+        .next({ data })
+        .put(fetchGrantFilters.success({ data }))
+        .next()
+        .put(fetchGrantFilters.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should call API_MY_GRANTS_URL when onlyMyGrants is true", () => {
+    expect(() => {
+      testSaga(fetchGrantFiltersSaga, {
+        payload: { payload: grantFilters, onlyMyGrants: true },
+      })
+        .next()
+        .put(fetchGrantFilters.request())
+        .next()
+        .call(
+          apiJsonPost,
+          API_MY_GRANT_FILTERS_SEARCH,
+          grantFilters,
+          JSON_OPTS
+        );
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(fetchGrantFiltersSaga, { payload: { payload: grantFilters } })
+        .next()
+        .put(fetchGrantFilters.request())
+        .next()
+        .call(apiJsonPost, API_GRANT_FILTERS_SEARCH, grantFilters, JSON_OPTS)
+        .throw(error)
+        .put(fetchGrantFilters.failure(message))
+        .next()
+        .put(fetchGrantFilters.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

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

@@ -3,7 +3,7 @@ import { testSaga } from "redux-saga-test-plan";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { fetchGrantsRequestSaga, fetchGrantsSaga } from "../fetchGrants";
 import { fetchGrants } from "../../routines";
-import { API_GRANTS_SEARCH } from "../../api";
+import { API_GRANTS_SEARCH, API_MY_GRANTS_SEARCH } from "../../api";
 
 describe("sagas: fetchGrantsRequestSaga", () => {
   it("should invoke fetchGrantsSaga on trigger", () => {
@@ -39,7 +39,7 @@ describe("sagas: fetchGrantsSaga", () => {
 
   it("should put a success action when a response is returned", () => {
     expect(() => {
-      testSaga(fetchGrantsSaga, { payload: grantQuery })
+      testSaga(fetchGrantsSaga, { payload: { payload: grantQuery } })
         .next()
         .put(fetchGrants.request(grantQuery))
         .next()
@@ -53,12 +53,24 @@ describe("sagas: fetchGrantsSaga", () => {
     }).not.toThrow();
   });
 
+  it("should call API_MY_GRANTS_URL when onlyMyGrants is true", () => {
+    expect(() => {
+      testSaga(fetchGrantsSaga, {
+        payload: { payload: grantQuery, onlyMyGrants: true },
+      })
+        .next()
+        .put(fetchGrants.request(grantQuery))
+        .next()
+        .call(apiJsonPost, API_MY_GRANTS_SEARCH, grantQuery, JSON_OPTS);
+    }).not.toThrow();
+  });
+
   it("should put a failure action when the call returns an error", () => {
     const message = "Request failed";
     const error = { message };
 
     expect(() => {
-      testSaga(fetchGrantsSaga, { payload: grantQuery })
+      testSaga(fetchGrantsSaga, { payload: { payload: grantQuery } })
         .next()
         .put(fetchGrants.request(grantQuery))
         .next()

package/src/sagas/fetchGrantFilters.js

@@ -2,13 +2,15 @@ import _ from "lodash/fp";
 import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { fetchGrantFilters } from "../routines";
-import { API_GRANT_FILTERS_SEARCH } from "../api";
+import { API_GRANT_FILTERS_SEARCH, API_MY_GRANT_FILTERS_SEARCH } from "../api";
 
-export function* fetchGrantFiltersSaga(payload) {
+export function* fetchGrantFiltersSaga({ payload: { payload, onlyMyGrants } }) {
   try {
     yield put(fetchGrantFilters.request());
-    const url = API_GRANT_FILTERS_SEARCH;
-    const filters = _.propOr({}, "payload.filters")(payload);
+    const url = onlyMyGrants
+      ? API_MY_GRANT_FILTERS_SEARCH
+      : API_GRANT_FILTERS_SEARCH;
+    const filters = _.propOr({}, "filters")(payload);
     const body = { filters };
     const { data } = yield call(apiJsonPost, url, body, JSON_OPTS);
     yield put(fetchGrantFilters.success({ data }));

package/src/sagas/fetchGrants.js

@@ -1,11 +1,11 @@
 import { call, put, debounce } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { fetchGrants } from "../routines";
-import { API_GRANTS_SEARCH } from "../api";
+import { API_GRANTS_SEARCH, API_MY_GRANTS_SEARCH } from "../api";
 
-export function* fetchGrantsSaga({ payload: body }) {
+export function* fetchGrantsSaga({ payload: { payload: body, onlyMyGrants } }) {
   try {
-    const url = API_GRANTS_SEARCH;
+    const url = onlyMyGrants ? API_MY_GRANTS_SEARCH : API_GRANTS_SEARCH;
     yield put(fetchGrants.request(body));
     const { data, headers } = yield call(apiJsonPost, url, body, JSON_OPTS);
     yield put(fetchGrants.success({ data, headers }));

package/src/selectors/getGrantsColumns.js

@@ -226,14 +226,16 @@ export const defaultGrantsTableColumns = [
 ];
 
 export const getGrantsTableColumns = createSelector(
-  [_.prop("grantsColumns"), _.prop("authentication")],
-  (grantsColumns, authentication) =>
-    _.flow(
+  [_.prop("grantsColumns"), _.prop("authentication"), _.prop("onlyMyGrants")],
+  (grantsColumns, authentication, onlyMyGrants) => {
+    return _.flow(
       _.defaultTo(defaultGrantsTableColumns),
+      _.reject((c) => (onlyMyGrants ? c.name === "user" : false)),
       _.map((c) => {
         return c.name === "user"
           ? { ...c, fieldDecorator: c.fieldDecorator(authentication) }
           : c;
       })
-    )(grantsColumns)
+    )(grantsColumns);
+  }
 );

package/src/components/GrantsRoutes.js

@@ -1,33 +0,0 @@
-import React from "react";
-import { Route } from "react-router-dom";
-import { Unauthorized } from "@truedat/core/components";
-import { useAuthorized } from "@truedat/core/hooks";
-import { GRANTS } from "@truedat/core/routes";
-import GrantsTable from "./GrantsTable";
-import GrantFiltersLoader from "./GrantFiltersLoader";
-import GrantsLoader from "./GrantsLoader";
-import StructureGrants from "./StructureGrants";
-import GrantFilters from "./GrantFilters";
-import Grants from "./Grants";
-
-export const GrantsRoutes = () => {
-  const authorized = true; //useAuthorized("grants");
-  return (
-    <Route
-      path={GRANTS}
-      render={() =>
-        authorized ? (
-          <>
-            <GrantsLoader />
-            <GrantFiltersLoader />
-            <Grants />
-          </>
-        ) : (
-          <Unauthorized />
-        )
-      }
-    />
-  );
-};
-
-export default GrantsRoutes;

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

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

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

@@ -1,8 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<GrantsRoutes /> matches the latest snapshot 1`] = `
-<Route
-  path="/grants"
-  render={[Function]}
-/>
-`;