@truedat/dd 6.6.3 → 6.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.6.3",
+  "version": "6.6.5",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.6.3",
+    "@truedat/test": "6.6.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "6.6.3",
-    "@truedat/core": "6.6.3",
-    "@truedat/df": "6.6.3",
+    "@truedat/auth": "6.6.5",
+    "@truedat/core": "6.6.5",
+    "@truedat/df": "6.6.5",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "1cb86ec68afdf2e6fd018a748bc94c8e598d0e77"
+  "gitHead": "875dcb0716cc64d30974106dc64c861d4306fcd6"
 }

package/src/components/GrantRequest.js

@@ -19,7 +19,6 @@ const ConditionSummary = React.lazy(() =>
   import("@truedat/dq/components/ConditionSummary")
 );
 
-
 export const GrantRequest = ({ grantRequest, template }) => {
   const { formatMessage } = useIntl();
   const metadata = grantRequest?.metadata;
@@ -100,17 +99,6 @@ export const GrantRequest = ({ grantRequest, template }) => {
                     })}
                   </Label>
                 </List.Description>
-                {grantRequest?.status_reason && (
-                  <span
-                    style={{
-                      color: "red",
-                      fontSize: "12px",
-                      marginLeft: "10px",
-                    }}
-                  >
-                    {grantRequest?.status_reason}
-                  </span>
-                )}
               </List.Item>
             </List>
             {metadata && template && (

package/src/components/GrantRequestBulkActions.js

@@ -29,6 +29,7 @@ export const GrantRequestBulkActions = ({
   query,
   cleanSelectedGrantRequests,
   zeroResults,
+  canApprove,
 }) => {
   const history = useHistory();
   const [saving, setSaving] = useState();
@@ -70,7 +71,7 @@ export const GrantRequestBulkActions = ({
       <Grid.Column width={4} textAlign="right">
         <GrantRequestBulkRoleSelector
           roles={rolesPermission}
-          disabled={_.size(rolesPermission) == 1}
+          disabled={_.size(rolesPermission) == 1 || !canApprove}
           selectedRole={roleSelected}
           onChange={onChangeRole}
         />
@@ -82,7 +83,8 @@ export const GrantRequestBulkActions = ({
             _.isNull(roleSelected) ||
             loading ||
             zeroResults ||
-            _.size(selectedGrantRequests) == 0
+            _.size(selectedGrantRequests) == 0 ||
+            !canApprove
           }
           loading={saving}
           primary
@@ -95,7 +97,8 @@ export const GrantRequestBulkActions = ({
             _.isNull(roleSelected) ||
             loading ||
             zeroResults ||
-            _.size(selectedGrantRequests) == 0
+            _.size(selectedGrantRequests) == 0 ||
+            !canApprove
           }
           loading={saving}
           secondary

package/src/components/GrantRequestPagination.js

@@ -0,0 +1,18 @@
+import { connect } from "react-redux";
+import { bindActionCreators } from "redux";
+import { Pagination } from "@truedat/core/components";
+import { selectGrantRequestPage } from "../routines";
+
+const mapDispatchToProps = (dispatch) =>
+  bindActionCreators({ selectPage: selectGrantRequestPage }, dispatch);
+
+const mapStateToProps = ({
+  grantRequestsQuery,
+  grantRequestCount,
+  grantRequestPageSize,
+}) => ({
+  activePage: grantRequestsQuery?.page,
+  totalPages: Math.ceil(grantRequestCount / grantRequestPageSize),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Pagination);

package/src/components/GrantRequestRow.js

@@ -15,6 +15,7 @@ export const GrantRequestRow = ({
   onChange,
   grantRequest,
   roleSelected,
+  canApprove,
 }) => {
   const history = useHistory();
   const createdById = _.path("created_by_id")(grantRequest);
@@ -27,7 +28,7 @@ export const GrantRequestRow = ({
       onClick={() => onClick && onClick(grantRequest)}
       warning={createdById !== userId}
     >
-      {roleSelected ? (
+      {roleSelected && canApprove ? (
         <Table.Cell collapsing width="1" textAlign="center">
           <Checkbox
             id={grantRequest.id}
@@ -57,13 +58,14 @@ export const GrantRequestRow = ({
 
 GrantRequestRow.propTypes = {
   active: PropTypes.bool,
+  canApprove: PropTypes.bool,
   checked: PropTypes.bool,
   disabled: PropTypes.bool,
   grantRequest: PropTypes.object,
+  roleSelected: PropTypes.string,
   columns: PropTypes.array,
   onChange: PropTypes.func,
   onClick: PropTypes.func,
-  roleSelected: PropTypes.string,
 };
 
 export default GrantRequestRow;

package/src/components/GrantRequestSearchFilters.js

@@ -1,3 +1,4 @@
+import React from "react";
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 import { AvailableFilters } from "@truedat/core/components";

package/src/components/GrantRequestsSearchLoader.js

@@ -36,7 +36,7 @@ const makeMapStateToProps = () => {
   );
 
   const mapStateToProps = (state, props) => ({
-    query: searchQuerySelector(state, { ...props, pageSize: 1000 }),
+    query: searchQuerySelector(state, { ...props, pageSize: 20 }),
   });
   return mapStateToProps;
 };

package/src/components/GrantRequestsSearchResults.js

@@ -4,37 +4,63 @@ import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { Header, Icon, Segment, Dimmer, Loader } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import { toggleGrantRequestsFilterValue } from "../routines";
+import {
+  toggleGrantRequestsFilterValue,
+  removeGrantRequestsFilter,
+} from "../routines";
 import GrantRequestBulkActions from "./GrantRequestBulkActions";
 import GrantRequestsSearch from "./GrantRequestsSearch";
 import GrantRequestsSelectedFilters from "./GrantRequestsSelectedFilters";
 import GrantRequestsTable from "./GrantRequestsTable";
 import GrantRequestsLabelResults from "./GrantRequestsLabelResults";
+import GrantRequestPagination from "./GrantRequestPagination";
 
 export const GrantRequestsSearchResults = ({
   grantRequests,
   loading,
   rolesPermission,
-  toggleGrantRequestsFilterValue,
   defaultFilters,
+  activeFilters,
+  toggleGrantRequestsFilterValue,
+  removeGrantRequestsFilter,
 }) => {
   const [selectedGrantRequests, setSelectedGrantRequests] = useState([]);
   const [roleSelected, setSelectedRole] = useState(null);
+  const [canApprove, setCanApprove] = useState(false);
 
-  const onChangeRole = (role) => {
-    setSelectedRole(role);
-    toggleGrantRequestsFilterValue({
-      filter: "must_not_approved_by",
-      value: [role],
-    });
+  const isOnlyPending = (status) => {
+    return _.size(_.uniq(status)) === 1 && _.includes("pending", status);
   };
 
   useEffect(() => {
     if (_.size(rolesPermission) == 1) {
-      onChangeRole(_.first(rolesPermission));
+      setSelectedRole(_.first(rolesPermission));
     }
   }, [rolesPermission]);
 
+  useEffect(() => {
+    if (canApprove && roleSelected) {
+      toggleGrantRequestsFilterValue({
+        filter: "must_not_approved_by",
+        value: [roleSelected],
+      });
+    } else {
+      removeGrantRequestsFilter({ filter: "must_not_approved_by" });
+    }
+  }, [canApprove, roleSelected]);
+
+  useEffect(() => {
+    const canApprove = _.flow(
+      _.propOr([], "current_status"),
+      _.cond([
+        [_.isEmpty, _.negate(_.stubTrue)],
+        [isOnlyPending, _.stubTrue],
+        [_.stubTrue, _.negate(_.stubTrue)],
+      ])
+    )(activeFilters);
+    setCanApprove(canApprove);
+  }, [activeFilters]);
+
   const allChecked = () => {
     const ids = _.map(_.prop("id"))(grantRequests);
     return (
@@ -99,12 +125,13 @@ export const GrantRequestsSearchResults = ({
         <GrantRequestBulkActions
           selectedGrantRequests={selectedGrantRequests}
           rolesPermission={rolesPermission}
-          onChangeRole={onChangeRole}
+          onChangeRole={setSelectedRole}
           roleSelected={roleSelected}
           loading={loading}
           cleanSelectedGrantRequests={() => setSelectedGrantRequests([])}
           defaultFilters={defaultFilters}
           zeroResults={_.isEmpty(grantRequests)}
+          canApprove={canApprove}
         />
 
         <GrantRequestsSearch />
@@ -122,6 +149,7 @@ export const GrantRequestsSearchResults = ({
               />
               <GrantRequestsTable
                 addAll={addAll}
+                canApprove={canApprove}
                 checkedAll={allChecked()}
                 checkRow={checkRow}
                 isRowChecked={isRowChecked}
@@ -130,6 +158,7 @@ export const GrantRequestsSearchResults = ({
               />
             </>
           ) : null}
+          <GrantRequestPagination />
         </Dimmer.Dimmable>
       </Segment>
     </Segment>
@@ -142,6 +171,9 @@ GrantRequestsSearchResults.propTypes = {
   role: PropTypes.string,
   rolesPermission: PropTypes.array,
   defaultFilters: PropTypes.object,
+  activeFilters: PropTypes.object,
+  toggleGrantRequestsFilterValue: PropTypes.func,
+  removeGrantRequestsFilter: PropTypes.func,
 };
 
 const mapStateToProps = (state) => ({
@@ -149,8 +181,10 @@ const mapStateToProps = (state) => ({
     state.grantRequestsSearchLoading || state.grantRequestPermissionsLoading,
   grantRequests: state.grantRequestsSearch,
   rolesPermission: state.grantRequestPermissions,
+  activeFilters: state.grantRequestsActiveFilters,
 });
 
-export default connect(mapStateToProps, { toggleGrantRequestsFilterValue })(
-  GrantRequestsSearchResults
-);
+export default connect(mapStateToProps, {
+  toggleGrantRequestsFilterValue,
+  removeGrantRequestsFilter,
+})(GrantRequestsSearchResults);

package/src/components/GrantRequestsSelectedFilters.js

@@ -1,3 +1,4 @@
+import React from "react";
 import _ from "lodash/fp";
 import { bindActionCreators } from "redux";
 import { connect } from "react-redux";

package/src/components/GrantRequestsTable.js

@@ -20,6 +20,7 @@ export const GrantRequestsTable = ({
   grantRequestsSort,
   sortGrantRequests,
   roleSelected,
+  canApprove,
 }) => {
   const { formatMessage } = useIntl();
 
@@ -43,7 +44,7 @@ export const GrantRequestsTable = ({
         <Table sortable selectable>
           <Table.Header>
             <Table.Row>
-              {roleSelected ? (
+              {roleSelected && canApprove ? (
                 <Table.HeaderCell textAlign="center">
                   <Checkbox
                     id="selectGrantRequest"
@@ -88,6 +89,7 @@ export const GrantRequestsTable = ({
                 checked={isRowChecked && isRowChecked(gr)}
                 grantRequest={gr}
                 columns={columns}
+                canApprove={canApprove}
                 onChange={() => checkRow && checkRow(gr)}
               />
             ))}
@@ -107,16 +109,17 @@ export const GrantRequestsTable = ({
 };
 
 GrantRequestsTable.propTypes = {
-  addAll: PropTypes.func,
+  columns: PropTypes.array,
+  grantRequests: PropTypes.array,
+  grantRequestsSort: PropTypes.array,
+  roleSelected: PropTypes.string,
+  canApprove: PropTypes.bool,
   checkedAll: PropTypes.bool,
+  grantRequestsSearchLoading: PropTypes.bool,
+  addAll: PropTypes.func,
   checkRow: PropTypes.func,
   isRowChecked: PropTypes.func,
-  grantRequestsSort: PropTypes.array,
-  columns: PropTypes.array,
-  grantRequests: PropTypes.array,
   sortGrantRequests: PropTypes.func,
-  grantRequestsSearchLoading: PropTypes.bool,
-  roleSelected: PropTypes.string,
 };
 
 const mapStateToProps = (state) => ({

package/src/components/GrantRoutes.js

@@ -150,14 +150,13 @@ export const GrantRoutes = ({ grantRequestLoaded }) => {
                 exact
                 path={GRANT_REQUESTS}
                 render={() => {
-                  const defaultFilters = {
-                    current_status: ["pending"],
-                  };
+                  const defaultFilters = {};
                   return (
                     <>
                       <GrantRequestsSearchLoader
                         defaultFilters={defaultFilters}
                       />
+
                       <GrantRequestsFiltersLoader
                         defaultFilters={defaultFilters}
                       />

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

@@ -6,6 +6,7 @@ describe("<GrantRequestBulkActions />", () => {
   const cleanSelectedGrantRequests = jest.fn();
   const props = {
     cleanSelectedGrantRequests,
+    canApprove: true,
   };
 
   const renderOpts = {
@@ -28,4 +29,17 @@ describe("<GrantRequestBulkActions />", () => {
     );
     expect(container).toMatchSnapshot();
   });
+
+  it("disable acctions when canApprove is false", () => {
+    const newProps = {
+      ...props,
+      canApprove: false,
+    };
+    const { getByRole } = render(
+      <GrantRequestBulkActions {...newProps} />,
+      renderOpts
+    );
+    expect(getByRole("button", { name: /approve_request/i })).toBeDisabled();
+    expect(getByRole("button", { name: /reject/i })).toBeDisabled();
+  });
 });

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

@@ -29,6 +29,7 @@ const grantRequest = {
   path: ["DBO", "SWAPS"],
   inserted_at: "2023-10-17T14:26:34.645189Z",
   user: "blah",
+  current_status: "pending",
 };
 
 describe("<GrantRequestRow />", () => {
@@ -44,6 +45,7 @@ describe("<GrantRequestRow />", () => {
     onChange,
     grantRequest,
     roleSelected: "foo",
+    canApprove: true,
   };
 
   it("matches the latest snapshot", () => {
@@ -57,6 +59,21 @@ describe("<GrantRequestRow />", () => {
     expect(container).toMatchSnapshot();
   });
 
+  it("disable checkbox when can not Approve", () => {
+    const newProps = {
+      ...props,
+      canApprove: false,
+    };
+    const { container } = render(
+      <table>
+        <tbody>
+          <GrantRequestRow {...newProps} />
+        </tbody>
+      </table>
+    );
+    expect(container).toMatchSnapshot();
+  });
+
   it("click on checkbox element", async () => {
     const { getByText, getByRole } = render(
       <table>

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

@@ -1,5 +1,4 @@
 import React from "react";
-import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { render } from "@truedat/test/render";
 import GrantRequestsSearchResults from "../GrantRequestsSearchResults";
@@ -8,13 +7,14 @@ describe("<GrantRequestsSearchResults />", () => {
   const grantRequests = [{ id: 1 }, { id: 2 }];
   const toggleGrantRequestsFilterValue = jest.fn();
   const rolesPermission = ["foo", "bar"];
-  const defaultFilters = { current_status: ["pending"] };
+  const activeFilters = { current_status: ["pending"] };
 
   const state = {
     grantRequests,
     grantRequestsSearch: grantRequests,
     rolesPermission,
     grantRequestPermissions: rolesPermission,
+    grantRequestsActiveFilters: activeFilters,
   };
 
   const renderOpts = (state) => ({
@@ -28,6 +28,8 @@ describe("<GrantRequestsSearchResults />", () => {
         "grantRequests.header.approve": "header approve",
         "grantRequests.bulk.selected": "selected",
         "grantRequests.retrieved.results": "results",
+        "search.applied_filters": "Filters:",
+        "search.clear_filters": "Clear filters",
       },
     },
     state: state,
@@ -37,7 +39,6 @@ describe("<GrantRequestsSearchResults />", () => {
     loading: false,
     rolesPermission,
     toggleGrantRequestsFilterValue,
-    defaultFilters,
     grantRequests,
   };
 

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

@@ -26,6 +26,7 @@ describe("<GrantRequestsTable />", () => {
     grantRequestsSort,
     sortGrantRequests,
     roleSelected: "foo",
+    canApprove: true,
   };
 
   it("matches the latest snapshot", () => {

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

@@ -1,5 +1,39 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`<GrantRequestRow /> disable checkbox when can not Approve 1`] = `
+<div>
+  <table>
+    <tbody>
+      <tr
+        class="active warning"
+      >
+        <td
+          class=""
+        >
+          blah
+        </td>
+        <td
+          class=""
+        >
+          DBO
+        </td>
+        <td
+          class=""
+        >
+          DBO
+          SWAPS
+        </td>
+        <td
+          class=""
+        >
+          2023-10-17T14:26:34.645189Z
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+`;
+
 exports[`<GrantRequestRow /> matches the latest snapshot 1`] = `
 <div>
   <table>

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

@@ -144,7 +144,37 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
       </div>
       <div
         class="selectedFilters"
-      />
+      >
+        <div
+          class="appliedFilters"
+        >
+          Filters:
+        </div>
+        <div
+          aria-expanded="false"
+          class="ui floating item scrolling dropdown"
+          role="listbox"
+          tabindex="0"
+        >
+          <div
+            class="ui label"
+          >
+            current_status
+            <i
+              aria-hidden="true"
+              class="delete icon"
+            />
+          </div>
+          <div
+            class="menu transition dimmable"
+          />
+        </div>
+        <a
+          class="resetFilters"
+        >
+          Clear filters
+        </a>
+      </div>
       <div
         class="dimmable"
       >
@@ -188,6 +218,11 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
               >
                 path
               </th>
+              <th
+                class="two wide"
+              >
+                current_status
+              </th>
               <th
                 class="two wide"
               >
@@ -214,6 +249,9 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
               >
                 
               </td>
+              <td
+                class=""
+              />
               <td
                 class="center aligned"
               />
@@ -234,6 +272,9 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
               >
                 
               </td>
+              <td
+                class=""
+              />
               <td
                 class="center aligned"
               />

package/src/components/index.js

@@ -5,6 +5,7 @@ import GrantRoutes from "./GrantRoutes";
 import GrantRequestBulkActions from "./GrantRequestBulkActions";
 import GrantRequestsTable from "./GrantRequestsTable";
 import GrantRequestRow from "./GrantRequestRow";
+import GrantRequestPagination from "./GrantRequestPagination";
 import GrantSelectedFilters from "./GrantSelectedFilters";
 import GrantRequestsSelectedFilters from "./GrantRequestsSelectedFilters";
 import GrantsTable from "./GrantsTable";
@@ -60,6 +61,7 @@ export {
   GrantRequestsTable,
   GrantRequestRow,
   GrantRequestsSelectedFilters,
+  GrantRequestPagination,
   GrantRoutes,
   GrantSelectedFilters,
   GrantsTable,

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

@@ -0,0 +1,36 @@
+import { fetchGrantRequestsSearch } from "../../routines";
+import { grantRequestPageSize } from "..";
+
+const fooState = { foo: "bar" };
+const initialState = 20;
+
+describe("reducers: grantRequestPageSize", () => {
+  it("should provide the initial state", () => {
+    expect(grantRequestPageSize(undefined, {})).toEqual(initialState);
+  });
+
+  describe("action: fetchGrantRequestsSearch.TRIGGER", () => {
+    describe("with an empty payload", () => {
+      it("should return the passed state if no size is specified", () => {
+        const payload = {};
+        expect(
+          grantRequestPageSize(fooState, {
+            type: fetchGrantRequestsSearch.TRIGGER,
+            payload,
+          })
+        ).toEqual(fooState);
+      });
+    });
+
+    it("should set size value if specified", () => {
+      const size = 1234;
+
+      expect(
+        grantRequestPageSize(fooState, {
+          type: fetchGrantRequestsSearch.TRIGGER,
+          payload: { size },
+        })
+      ).toBe(1234);
+    });
+  });
+});

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

@@ -15,7 +15,7 @@ describe("reducers: grantRequestSearchQuery", () => {
   const query = "";
   const sort = [{ inserted_at: "asc" }];
   const page = 1;
-  const size = 1000;
+  const size = 20;
 
   const initialState = { query, sort, page, size };
 

package/src/reducers/grantRequestPageSize.js

@@ -0,0 +1,15 @@
+import { fetchGrantRequestsSearch } from "../routines";
+
+const defaultPageSize = 20;
+
+const grantRequestPageSize = (state = defaultPageSize, { type, payload }) => {
+  switch (type) {
+    case fetchGrantRequestsSearch.TRIGGER:
+      const { size } = payload;
+      return size || state;
+    default:
+      return state;
+  }
+};
+
+export { grantRequestPageSize };

package/src/reducers/grantRequestSearchQuery.js

@@ -1,15 +1,16 @@
 import _ from "lodash/fp";
 import {
   clearGrantRequestsFilters,
+  clearGrantRequestsSort,
   removeGrantRequestsFilter,
   searchGrantRequests,
   sortGrantRequests,
   toggleGrantRequestsFilterValue,
-  clearGrantRequestsSort,
+  selectGrantRequestPage,
 } from "../routines";
 
 const defaultPage = 1;
-const defaultSize = 1000;
+const defaultSize = 20;
 const defaultSearchSort = [{ _score: "desc" }, { inserted_at: "asc" }];
 const byInsertedSort = [{ inserted_at: "asc" }];
 
@@ -42,6 +43,10 @@ export const grantRequestSearchQuery = (
       const sort = query != "" ? defaultSearchSort : byInsertedSort;
       return { ...state, query, page, sort };
     }
+    case selectGrantRequestPage.TRIGGER: {
+      const { activePage } = payload;
+      return { ...state, page: activePage };
+    }
     case sortGrantRequests.TRIGGER: {
       const sort = payload;
       return { ...state, sort, page: defaultPage };

package/src/reducers/grantRequestsActiveFilters.js

@@ -8,7 +8,9 @@ import {
   clearGrantRequestsFilters,
 } from "../routines";
 
-export const initialState = {};
+export const initialState = {
+  current_status: ["pending"],
+};
 
 export const grantRequestsActiveFilters = (
   state = initialState,

package/src/reducers/index.js

@@ -30,6 +30,8 @@ import { grantRequestsSelectedFilter } from "./grantRequestsSelectedFilter";
 import { grants } from "./grants";
 import { grantSelectedFilter } from "./grantSelectedFilter";
 import { grantsPageSize } from "./grantsPageSize";
+import { grantRequestPageSize } from "./grantRequestPageSize";
+
 import { graph } from "./graph";
 import { graphLoading } from "./graphLoading";
 import { graphRedirect } from "./graphRedirect";
@@ -126,6 +128,7 @@ export {
   grants,
   grantSelectedFilter,
   grantsPageSize,
+  grantRequestPageSize,
   graph,
   graphLoading,
   graphRedirect,

package/src/routines.js

@@ -163,6 +163,8 @@ export const searchGrantRequests = createRoutine("SEARCH_GRANT_REQUESTS");
 export const searchGrants = createRoutine("SEARCH_GRANTS");
 export const searchStructures = createRoutine("SEARCH_STRUCTURES");
 export const selectGrantPage = createRoutine("SELECT_GRANT_PAGE");
+export const selectGrantRequestPage = createRoutine("SELECT_GRANT_REQUEST_PAGE");
+
 export const selectGrantRequestTemplate = createRoutine(
   "SELECT_GRANT_REQUEST_TEMPLATE"
 );

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -67,15 +67,17 @@ DateDecorator.propTypes = {
   date: PropTypes.string,
 };
 
-const StatusDecorator = ({ status }) => {
+const StatusDecorator = ({ current_status }) => {
   const { formatMessage } = useIntl();
-  return status ? (
-    <>{formatMessage({ id: `grantRequest.content.${status}` })}</>
+  return current_status ? (
+    <>
+      {formatMessage({ id: `grantRequest.current_status.${current_status}` })}
+    </>
   ) : null;
 };
 
 StatusDecorator.propTypes = {
-  status: PropTypes.string,
+  current_status: PropTypes.string,
 };
 
 export const defaultGrantRequestsSearchTableColumns = [
@@ -102,6 +104,13 @@ export const defaultGrantRequestsSearchTableColumns = [
     }),
     fieldDecorator: PathDecorator,
   },
+  {
+    name: "current_status",
+    sort: { name: "current_status" },
+    fieldSelector: (grantRequest) => grantRequest,
+    fieldDecorator: StatusDecorator,
+    width: 2,
+  },
   {
     name: "inserted_at",
     sort: { name: "inserted_at" },