@truedat/dd 5.5.2 → 5.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.5.2",
+  "version": "5.6.1",
   "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": "5.5.1",
+    "@truedat/test": "5.6.1",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,9 +87,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.5.1",
-    "@truedat/core": "5.5.1",
-    "@truedat/df": "5.5.1",
+    "@truedat/auth": "5.6.1",
+    "@truedat/core": "5.6.1",
+    "@truedat/df": "5.6.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "e74477016a8b5de04718b465791ac608cd924c43"
+  "gitHead": "a8e5efaf772f212a10192b36d853529890dfdea2"
 }

package/src/components/GrantRemoval.js

@@ -11,10 +11,11 @@ export const GrantRemoval = ({
   requestGrantRemoval,
   children,
   onConfirm,
+  previousStructureQuery,
 }) => {
   const { formatMessage } = useIntl();
 
-  if (!grant) return;
+  if (!grant) return null;
 
   const action = grant.pending_removal ? "cancel_removal" : "request_removal";
 
@@ -31,8 +32,9 @@ export const GrantRemoval = ({
         const onConfirmPayload = {
           id: grant.id,
           action,
-          data_structure_id: grant.data_structure.id,
-          version: grant.data_structure_version.id,
+          data_structure_id: _.prop("data_structure.id")(grant),
+          version: _.prop("data_structure_version.id")(grant),
+          previousStructureQuery,
         };
         if (_.isFunction(onConfirm)) onConfirm(onConfirmPayload);
         else requestGrantRemoval(onConfirmPayload);
@@ -48,6 +50,7 @@ GrantRemoval.propTypes = {
   requestGrantRemoval: PropTypes.func,
   children: PropTypes.node,
   onConfirm: PropTypes.func,
+  previousStructureQuery: PropTypes.object,
 };
 
 export default connect(null, { requestGrantRemoval })(GrantRemoval);

package/src/components/GrantRequestCancel.js

@@ -10,9 +10,9 @@ export const GrantRequestCancel = ({
   grantRequest,
   createGrantRequestStatus,
   children,
+  previousStructureQuery,
 }) => {
   const { formatMessage } = useIntl();
-
   if (!grantRequest) return;
 
   return (
@@ -29,6 +29,7 @@ export const GrantRequestCancel = ({
           structureId,
           grantRequestId: grantRequest.id,
           status: "cancelled",
+          previousStructureQuery,
         })
       }
       onOpen={(e) => e.stopPropagation()}
@@ -38,10 +39,11 @@ export const GrantRequestCancel = ({
 };
 
 GrantRequestCancel.propTypes = {
-  structureId: PropTypes.number,
+  structureId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   grantRequest: PropTypes.object,
   createGrantRequestStatus: PropTypes.func,
   children: PropTypes.node,
+  previousStructureQuery: PropTypes.object,
 };
 
 export default connect(null, { createGrantRequestStatus })(GrantRequestCancel);

package/src/components/GrantRoutes.js

@@ -16,6 +16,7 @@ import {
   GRANT_APPROVAL_RULES,
   MY_GRANT_REQUESTS,
   MY_GRANTS,
+  STRUCTURES_GRANT_REQUEST,
 } from "@truedat/core/routes";
 import GrantView from "./Grant";
 import GrantApprovalRule from "./GrantApprovalRule";
@@ -31,6 +32,10 @@ import Grants from "./Grants";
 import GrantsLoader from "./GrantsLoader";
 import MyGrantRequests from "./MyGrantRequests";
 import StructureGrantCartCheckout from "./StructureGrantCartCheckout";
+import StructuresGrantRequestView from "./StructuresGrantRequestView";
+import StructuresLoader from "./StructuresLoader";
+import StructureFiltersLoader from "./StructureFiltersLoader";
+import UserSearchFiltersLoader from "./UserSearchFiltersLoader";
 
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
@@ -117,6 +122,28 @@ export const GrantRoutes = ({ grantRequestLoaded }) => {
           render={() => <GrantApprovalRules />}
         />
       </Switch>
+
+      <Route
+        path={STRUCTURES_GRANT_REQUEST}
+        render={() => {
+          const defaultFilters = {
+            exists: {
+              field: "classes._grantable",
+            },
+          };
+          return (
+            <>
+              <StructuresLoader
+                defaultFilters={defaultFilters}
+                withGrantRequests
+              />
+              <StructureFiltersLoader defaultFilters={defaultFilters} />
+              <UserSearchFiltersLoader scope="data_structure" />
+              <StructuresGrantRequestView />
+            </>
+          );
+        }}
+      />
       <Route
         path={GRANT_REQUESTS}
         render={() => (

package/src/components/StructureGrantCart.js

@@ -4,7 +4,7 @@ import React, { useState, useEffect } from "react";
 import { Link, useLocation, useHistory } from "react-router-dom";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import {
   Segment,
   List,
@@ -36,6 +36,7 @@ export const StructureGrantCart = ({
   removeGrantRequestFromCart,
   updateGrantRequestFilter,
   typeOperators,
+  allowEmptyCart,
 }) => {
   const { formatMessage } = useIntl();
   const history = useHistory();
@@ -44,8 +45,8 @@ export const StructureGrantCart = ({
   const structures = _.pathOr([], "structures")(grantRequestsCart);
 
   useEffect(() => {
-    if (_.isEmpty(structures)) history.push(STRUCTURES);
-  }, [history, structures]);
+    if (_.isEmpty(structures) && !allowEmptyCart) history.push(STRUCTURES);
+  }, [history, structures, allowEmptyCart]);
 
   const removeRequest = (structure) => () =>
     removeGrantRequestFromCart(structure);
@@ -122,14 +123,19 @@ export const StructureGrantCart = ({
           />
         ))}
       </List.List>
-      {!inCartCheckout && (
-        <>
-          <Divider />
-          <Button as={Link} to={linkTo.GRANTS_REQUESTS_CHECKOUT()}>
-            {formatMessage({ id: `structure.grant.cart.checkout` })}
-          </Button>
-        </>
-      )}
+      {!inCartCheckout &&
+        (_.isEmpty(grantRequestsCart?.structures) ? (
+          <p>
+            <FormattedMessage id={`structure.grant.cart.empty`} />
+          </p>
+        ) : (
+          <>
+            <Divider />
+            <Button as={Link} to={linkTo.GRANTS_REQUESTS_CHECKOUT()}>
+              {formatMessage({ id: `structure.grant.cart.checkout` })}
+            </Button>
+          </>
+        ))}
     </Segment>
   );
 };
@@ -137,9 +143,10 @@ export const StructureGrantCart = ({
 StructureGrantCart.propTypes = {
   structure: PropTypes.object,
   grantRequestsCart: PropTypes.object,
-  typeOperators: PropTypes.array,
+  typeOperators: PropTypes.object,
   removeGrantRequestFromCart: PropTypes.func,
   updateGrantRequestFilter: PropTypes.func,
+  allowEmptyCart: PropTypes.bool,
 };
 
 export const StructureGrantCartLoader = (props) => {

package/src/components/StructureGrantDropdown.js

@@ -2,7 +2,6 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Button, Dropdown, Popup, Header } from "semantic-ui-react";
-import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import { useHistory } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
@@ -16,21 +15,23 @@ import StructureGrantRequestAddCart from "./StructureGrantRequestAddCart";
 const isNilOrEmpty = (value) => _.isEmpty(value) || _.isNil(value);
 export const StructureGrantDropdown = ({
   grantRequest,
+  grantRequestStatus,
   structure,
+  grant,
   structureGrantPopup,
   authorized,
   requested,
+  previousStructureQuery,
 }) => {
   const history = useHistory();
   const { formatMessage } = useIntl();
-  const { grant } = structure;
 
-  const hasPendingGrantRequest = _.includes(
-    _.prop("status.status")(grantRequest)
-  )(["pending", "approved"]);
+  const hasPendingGrantRequest = _.includes(grantRequestStatus)([
+    "pending",
+    "approved",
+  ]);
 
-  const hasProcessingGrantRequest =
-    _.prop("status.status")(grantRequest) === "processing";
+  const hasProcessingGrantRequest = grantRequestStatus === "processing";
 
   const isModification = _.prop("group.grant")(grantRequest);
 
@@ -58,7 +59,11 @@ export const StructureGrantDropdown = ({
       />
     ),
     requestRemoval: (
-      <GrantRemoval grant={grant} key="requestRemoval">
+      <GrantRemoval
+        grant={grant}
+        previousStructureQuery={previousStructureQuery}
+        key="requestRemoval"
+      >
         <Dropdown.Item
           icon="delete"
           text={formatMessage({
@@ -68,7 +73,11 @@ export const StructureGrantDropdown = ({
       </GrantRemoval>
     ),
     cancelRemoval: (
-      <GrantRemoval grant={grant} key="cancelRemoval">
+      <GrantRemoval
+        grant={grant}
+        previousStructureQuery={previousStructureQuery}
+        key="cancelRemoval"
+      >
         <Dropdown.Item
           icon="delete"
           text={formatMessage({
@@ -96,6 +105,7 @@ export const StructureGrantDropdown = ({
         key="cancelRequest"
         structureId={structure.id}
         grantRequest={grantRequest}
+        previousStructureQuery={previousStructureQuery}
       >
         <Dropdown.Item
           icon="delete"
@@ -157,10 +167,8 @@ export const StructureGrantDropdown = ({
     })
   )(structureGrantPopup);
 
-  const status = _.prop("status.status")(grantRequest);
-
-  const grantRequestDetails = status ? (
-    <>{formatMessage({ id: `grantRequest.content.${status}` })}</>
+  const grantRequestDetails = grantRequestStatus ? (
+    <>{formatMessage({ id: `grantRequest.content.${grantRequestStatus}` })}</>
   ) : null;
 
   const popupContent = (
@@ -198,31 +206,13 @@ export const StructureGrantDropdown = ({
 
 StructureGrantDropdown.propTypes = {
   grantRequest: PropTypes.object,
+  grantRequestStatus: PropTypes.string,
   structure: PropTypes.object,
+  grant: PropTypes.object,
   structureGrantPopup: PropTypes.array,
   authorized: PropTypes.bool,
   requested: PropTypes.bool,
+  previousStructureQuery: PropTypes.object,
 };
 
-const mapStateToProps = ({
-  structure,
-  structureFields,
-  structureGrantPopup,
-  userPermissions,
-  grantRequestsCart,
-}) => ({
-  structure: {
-    ...structure,
-    hasDataFields: _.negate(_.isEmpty)(structureFields),
-    structureFields,
-  },
-  structureGrantPopup,
-  requested: _.flow(
-    _.pathOr([], "structures"),
-    _.find({ id: structure.id }),
-    _.negate(_.isUndefined)
-  )(grantRequestsCart),
-  authorized: _.pathOr(false, "create_foreign_grant_request")(userPermissions),
-});
-
-export default connect(mapStateToProps)(StructureGrantDropdown);
+export default StructureGrantDropdown;

package/src/components/StructureGrantListButton.js

@@ -0,0 +1,85 @@
+import _ from "lodash/fp";
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import StructureGrantRequestButton from "./StructureGrantRequestButton";
+import StructureGrantDropdown from "./StructureGrantDropdown";
+
+export const StructureGrantListButton = ({
+  structure,
+  structureGrantPopup,
+  authorized_dropdown,
+  authorized_request,
+  requested,
+  previousStructureQuery,
+}) => {
+  const grant = _.flow(_.prop("my_grants"), _.first)(structure);
+  const grantRequest = _.prop("my_grant_request")(structure);
+
+  const grantRequestStatus = _.prop("status")(grantRequest);
+  const isActiveRequest = _.includes(grantRequestStatus)([
+    "pending",
+    "approved",
+    "processing",
+  ]);
+
+  return grant || isActiveRequest ? (
+    <StructureGrantDropdown
+      structure={structure}
+      grant={grant}
+      structureGrantPopup={structureGrantPopup}
+      authorized={authorized_dropdown}
+      requested={requested}
+      grantRequest={isActiveRequest ? grantRequest : null}
+      grantRequestStatus={grantRequestStatus}
+      previousStructureQuery={previousStructureQuery}
+    />
+  ) : (
+    <StructureGrantRequestButton
+      structure={structure}
+      requested={requested}
+      authorized={authorized_request}
+    />
+  );
+};
+
+StructureGrantListButton.propTypes = {
+  structure: PropTypes.object,
+  structureGrantPopup: PropTypes.array,
+  authorized_dropdown: PropTypes.bool,
+  authorized_request: PropTypes.bool,
+  requested: PropTypes.bool,
+  previousStructureQuery: PropTypes.object,
+};
+
+const mapStateToProps = (
+  { structureGrantPopup, grantRequestsCart, previousStructureQuery },
+  { structure }
+) => ({
+  structureGrantPopup,
+  requested: _.flow(
+    _.pathOr([], "structures"),
+    _.find({ id: structure.id + "" }),
+    _.negate(_.isUndefined)
+  )(grantRequestsCart),
+  authorized_dropdown: _.pathOr(
+    false,
+    "create_foreign_grant_request"
+  )(structure.user_permissions),
+  authorized_request: _.pathOr(
+    false,
+    "request_grant"
+  )(structure.user_permissions),
+  previousStructureQuery,
+  structure: {
+    ...structure,
+    id: structure.id + "",
+    hasDataFields: _.negate(_.isEmpty)(structure.data_fields),
+    structureFields: _.flow(
+      _.prop("data_fields"),
+      _.map((dataField) => ({ ...dataField, data_structure_id: dataField.id }))
+    )(structure),
+  },
+});
+
+export default connect(mapStateToProps)(StructureGrantListButton);

package/src/components/StructureGrantRequestButton.js

@@ -1,4 +1,3 @@
-import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Button, Icon, Popup } from "semantic-ui-react";
@@ -48,26 +47,7 @@ StructureGrantRequestButton.propTypes = {
   removeGrantRequestFromCart: PropTypes.func,
 };
 
-const mapStateToProps = ({
-  structure,
-  structureFields,
-  grantRequestsCart,
-  userPermissions,
-}) => ({
-  structure: {
-    ...structure,
-    hasDataFields: _.negate(_.isEmpty)(structureFields),
-    structureFields: structureFields,
-  },
-  requested: _.flow(
-    _.pathOr([], "structures"),
-    _.find({ id: structure.id }),
-    _.negate(_.isUndefined)
-  )(grantRequestsCart),
-  authorized: _.pathOr(false, "request_grant")(userPermissions),
-});
-
-export default connect(mapStateToProps, {
+export default connect(null, {
   addGrantRequestToCart,
   removeGrantRequestFromCart,
 })(StructureGrantRequestButton);

package/src/components/StructureGrantSummaryButton.js

@@ -0,0 +1,87 @@
+import _ from "lodash/fp";
+import React from "react";
+import PropTypes from "prop-types";
+import { useQuery } from "@apollo/client";
+import { connect } from "react-redux";
+import { Loading } from "@truedat/core/components";
+import { LATEST_GRANT_REQUEST_QUERY } from "../api/queries";
+import StructureGrantRequestButton from "./StructureGrantRequestButton";
+import StructureGrantDropdown from "./StructureGrantDropdown";
+
+export const StructureGrantSummaryButton = ({
+  structure,
+  structureGrantPopup,
+  authorizedDropdown,
+  authorizedRequest,
+  requested,
+}) => {
+  const { grant, id } = structure;
+
+  const { loading, error, data } = useQuery(LATEST_GRANT_REQUEST_QUERY, {
+    fetchPolicy: "cache-and-network",
+    variables: { id },
+  });
+  if (error) return null;
+  if (loading) return <Loading />;
+
+  const grantRequest = _.prop("latestGrantRequest")(data);
+  const grantRequestStatus = _.prop("status.status")(grantRequest);
+  const isActiveRequest = _.includes(grantRequestStatus)([
+    "pending",
+    "approved",
+    "processing",
+  ]);
+
+  return grant || isActiveRequest ? (
+    <StructureGrantDropdown
+      structure={structure}
+      grant={grant}
+      structureGrantPopup={structureGrantPopup}
+      authorized={authorizedDropdown}
+      requested={requested}
+      grantRequest={isActiveRequest ? grantRequest : null}
+      grantRequestStatus={grantRequestStatus}
+    />
+  ) : (
+    <StructureGrantRequestButton
+      structure={structure}
+      requested={requested}
+      authorized={authorizedRequest}
+    />
+  );
+};
+
+StructureGrantSummaryButton.propTypes = {
+  structure: PropTypes.object,
+  structureGrantPopup: PropTypes.array,
+  authorizedDropdown: PropTypes.bool,
+  authorizedRequest: PropTypes.bool,
+  requested: PropTypes.bool,
+};
+
+const mapStateToProps = ({
+  structure,
+  structureFields,
+  structureGrantPopup,
+  userPermissions,
+  grantRequestsCart,
+}) => ({
+  structure: {
+    ...structure,
+    hasDataFields: _.negate(_.isEmpty)(structureFields),
+    structureFields,
+  },
+  structureGrantPopup,
+  requested: _.flow(
+    _.pathOr([], "structures"),
+    _.find({ id: structure.id }),
+    _.negate(_.isUndefined)
+  )(grantRequestsCart),
+  authorizedDropdown: _.pathOr(
+    false,
+    "create_foreign_grant_request"
+  )(userPermissions),
+  authorizedRequest: _.pathOr(false, "request_grant")(userPermissions),
+});
+
+export default connect(mapStateToProps)(StructureGrantSummaryButton);

package/src/components/StructureRow.js

@@ -3,6 +3,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { Table } from "semantic-ui-react";
 import { columnDecorator } from "@truedat/core/services";
+import StructureGrantListButton from "./StructureGrantListButton";
 
 export const StructureRow = ({
   structure,
@@ -11,21 +12,23 @@ export const StructureRow = ({
   active,
   disabled,
   positive,
+  grantable,
 }) =>
   _.isEmpty(columns) || _.isEmpty(structure) ? null : (
-    <Table.Row
-      active={active}
-      disabled={disabled}
-      positive={positive}
-      onClick={() => onClick && onClick(structure)}
-    >
+    <Table.Row active={active} disabled={disabled} positive={positive}>
       {columns.map((column, i) => (
         <Table.Cell
           key={i}
           textAlign={column.textAlign}
           content={columnDecorator(column)(structure)}
+          onClick={() => onClick && onClick(structure)}
         />
       ))}
+      {grantable && (
+        <Table.Cell collapsing width="1" textAlign="center">
+          <StructureGrantListButton structure={structure} />
+        </Table.Cell>
+      )}
     </Table.Row>
   );
 
@@ -36,6 +39,7 @@ StructureRow.propTypes = {
   active: PropTypes.bool,
   disabled: PropTypes.bool,
   positive: PropTypes.bool,
+  grantable: PropTypes.bool,
 };
 
 export default StructureRow;

package/src/components/StructureSummary.js

@@ -10,7 +10,7 @@ import { getStructureUpdatedAt } from "../selectors";
 import StructureProperties from "./StructureProperties";
 import StructureConfidentialButton from "./StructureConfidentialButton";
 import StructureDeleteButton from "./StructureDeleteButton";
-import StructureGrantButton from "./StructureGrantButton";
+import StructureGrantSummaryButton from "./StructureGrantSummaryButton";
 import StructureProfileButton from "./StructureProfileButton";
 import StructuresProfileButton from "./StructuresProfileButton";
 import StructureTags from "./StructureTags";
@@ -85,7 +85,9 @@ export const StructureSummary = ({
               <Date {...dateProperties(deleted_at, updatedAt)} />
             )}
             <Divider hidden fitted />
-            {structureClasses?._grantable ? <StructureGrantButton /> : null}
+            {structureClasses?._grantable ? (
+              <StructureGrantSummaryButton />
+            ) : null}
             <ShareLinkPopup
               url={shareUrl}
               title={shareTitle}

package/src/components/StructuresGrantRequestView.js

@@ -0,0 +1,68 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { useHistory } from "react-router-dom";
+import { Grid, Header, Icon, Segment, Divider } from "semantic-ui-react";
+import { FormattedMessage } from "react-intl";
+import { linkTo } from "@truedat/core/routes";
+import { structureRowsSelector } from "../selectors";
+import StructureSelectedFilters from "./StructureSelectedFilters";
+import StructureDateFilter from "./StructureDateFilter";
+import StructuresSearch from "./StructuresSearch";
+import StructuresSearchResults from "./StructuresSearchResults";
+import StructureGrantCart from "./StructureGrantCart";
+
+export const StructuresGrantRequestView = ({ loading, structures }) => {
+  const history = useHistory();
+
+  return (
+    <Grid>
+      <Grid.Row>
+        <Grid.Column width={11}>
+          <Segment>
+            <Header as="h2">
+              <Icon circular name="block layout" />
+              <Header.Content>
+                <FormattedMessage id="structuresGrantRequest.header" />
+                <Header.Subheader>
+                  <FormattedMessage id="structuresGrantRequest.subheader" />
+                </Header.Subheader>
+              </Header.Content>
+            </Header>
+            <Divider hidden />
+            <StructuresSearch />
+            <StructureSelectedFilters />
+            <StructureDateFilter />
+            <StructuresSearchResults
+              structures={structures}
+              loading={loading}
+              grantable
+              onSelect={({ id }) => history.push(linkTo.STRUCTURE({ id }))}
+            />
+          </Segment>
+        </Grid.Column>
+        <Grid.Column width={5}>
+          <StructureGrantCart allowEmptyCart />
+        </Grid.Column>
+      </Grid.Row>
+    </Grid>
+  );
+};
+
+StructuresGrantRequestView.propTypes = {
+  structures: PropTypes.array,
+  loading: PropTypes.bool,
+};
+
+const mapStateToProps = (state) => ({
+  structures: structureRowsSelector(state, null, [
+    "my_grants",
+    "my_grant_request",
+    "external_id",
+    "data_fields",
+    "user_permissions",
+  ]),
+  loading: state.structuresLoading,
+});
+
+export default connect(mapStateToProps)(StructuresGrantRequestView);