@truedat/dd 6.6.1 → 6.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "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.1",
+    "@truedat/test": "6.6.2",
     "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.1",
-    "@truedat/core": "6.6.1",
-    "@truedat/df": "6.6.1",
+    "@truedat/auth": "6.6.2",
+    "@truedat/core": "6.6.2",
+    "@truedat/df": "6.6.2",
     "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": "2fa84eee80136fa3bd394c04153e6f16d2e5a1e0"
+  "gitHead": "b5defab13b213876e57046dc7d9885c6adc4a64d"
 }

package/src/components/GrantRequestBulkRoleSelector.js

@@ -22,6 +22,7 @@ export const GrantRequestBulkRoleSelector = ({
       placeholder={formatMessage({
         id: "grantRequestApproval.form.role.select",
       })}
+      clearable
       selection
       disabled={disabled}
       options={options}

package/src/components/GrantRoutes.js

@@ -1,6 +1,6 @@
 import _ from "lodash/fp";
 import { connect } from "react-redux";
-import { Route, Switch } from "react-router-dom";
+import { Route, Switch, useParams } from "react-router-dom";
 import PropTypes from "prop-types";
 import React from "react";
 import {
@@ -8,6 +8,7 @@ import {
   GRANT_APPROVAL_RULE_EDIT,
   GRANT_APPROVAL_RULE_NEW,
   GRANT_REQUEST,
+  GRANT_REQUEST_GROUP,
   GRANT_REQUESTS,
   GRANT_REQUESTS_APPROVALS_RESULT,
   GRANTS_REQUESTS_CHECKOUT,
@@ -41,6 +42,20 @@ const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
 
+const GrantRequestGroup = () => {
+  const { id } = useParams();
+  const defaultFilters = {
+    group_id: [id],
+  };
+  return (
+    <>
+      <GrantRequestsSearchLoader defaultFilters={defaultFilters} />
+      <GrantRequestsFiltersLoader defaultFilters={defaultFilters} />
+      <GrantRequestsSearchResults defaultFilters={defaultFilters} />
+    </>
+  );
+};
+
 export const GrantRoutes = ({ grantRequestLoaded }) => {
   return (
     <>
@@ -121,6 +136,11 @@ export const GrantRoutes = ({ grantRequestLoaded }) => {
           return <StructuresGrantRequestView defaultFilters={defaultFilters} />;
         }}
       />
+      <Route
+        exact
+        path={GRANT_REQUEST_GROUP}
+        render={() => <GrantRequestGroup />}
+      />
       <Route
         path={GRANT_REQUESTS}
         render={() => (

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

@@ -52,6 +52,11 @@ exports[`<GrantRoutes /> matches the latest snapshot 1`] = `
     path="/structuresGrantRequests"
     render={[Function]}
   />
+  <Route
+    exact={true}
+    path="/grantRequestGroups/:id"
+    render={[Function]}
+  />
   <Route
     path="/grantRequests"
     render={[Function]}

package/src/selectors/getGrantRequestsSelectedFilters.js

@@ -4,5 +4,7 @@ import { createSelector } from "reselect";
 export const getGrantRequestsSelectedFilters = createSelector(
   [_.prop("grantRequestsActiveFilters")],
   (grantRequestsActiveFilters) =>
-    _.without(["must_not_approved_by"])(_.keys(grantRequestsActiveFilters))
+    _.without(["must_not_approved_by", "group_id"])(
+      _.keys(grantRequestsActiveFilters)
+    )
 );