@truedat/dd 7.5.9 → 7.5.11

package/src/components/GrantApprovalRuleDeleteButton.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";

package/src/components/GrantApprovalRuleEdit.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Loader } from "semantic-ui-react";
 import { useQuery } from "@apollo/client";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import { connect } from "react-redux";
 import { GRANT_APPROVAL_RULE_QUERY } from "../api/queries";
 import { updateGrantApprovalRule } from "../routines";

package/src/components/GrantApprovalRuleForm.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { useForm, useWatch, Controller } from "react-hook-form";
 import { useIntl } from "react-intl";
@@ -131,7 +130,6 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
             />
           )}
         />
-
         <Controller
           control={control}
           name="role"
@@ -152,7 +150,6 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
             />
           )}
         />
-
         <Controller
           control={control}
           rules={{ required: true }}
@@ -180,7 +177,6 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
             />
           )}
         />
-
         <Controller
           control={control}
           name="comment"
@@ -202,7 +198,6 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
             />
           )}
         />
-
         <Controller
           control={control}
           name="conditions"
@@ -240,7 +235,6 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
             </Segment>
           )}
         />
-
         <div className="actions">
           <HistoryBackButton
             content={formatMessage({ id: "actions.cancel" })}

package/src/components/GrantApprovalRuleNew.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { createGrantApprovalRule } from "../routines";

package/src/components/GrantApprovalRules.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { useIntl } from "react-intl";
 import { useQuery } from "@apollo/client";
 import {
@@ -10,7 +9,7 @@ import {
   Segment,
   Table,
 } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { GRANT_APPROVAL_RULE_NEW, linkTo } from "@truedat/core/routes";
 import { columnDecoratorComponent } from "@truedat/core/services";
 import { GRANT_APPROVAL_RULES_QUERY } from "../api/queries";
@@ -71,7 +70,6 @@ export default function GrantApprovalRules() {
           })}
         />
       </Segment>
-
       {!_.isEmpty(grantApprovalRules) && !loading ? (
         <Table>
           <Table.Header>

package/src/components/GrantChangeRequest.js

@@ -1,7 +1,7 @@
-import React from "react";
+import { cloneElement } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { setGrantChangeRequestCart } from "../routines";
 
@@ -11,13 +11,13 @@ export const GrantChangeRequest = ({
   setGrantChangeRequestCart,
   children,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   if (!structure) return;
 
-  return React.cloneElement(children, {
+  return cloneElement(children, {
     onClick: () => {
       setGrantChangeRequestCart({ structure, grant });
-      history.push(linkTo.GRANTS_REQUESTS_CHECKOUT());
+      navigate(linkTo.GRANTS_REQUESTS_CHECKOUT());
     },
   });
 };

package/src/components/GrantCrumbs.js

@@ -1,7 +1,6 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Breadcrumb } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { GRANTS } from "@truedat/core/routes";
 

package/src/components/GrantDateFilter.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { propOr } from "lodash/fp";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";

package/src/components/GrantRemoval.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { requestGrantRemoval } from "../routines";

package/src/components/GrantRemovalDirectButton.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { ConfirmModal } from "@truedat/core/components";
@@ -23,11 +23,11 @@ export const GrantRemovalDirectButton = ({
             translation: "grant.actions.markPendingRemoval.button",
           }
         : operation === "unmarkPendingRemoval"
-        ? {
-            color: "olive",
-            translation: "grant.actions.unmarkPendingRemoval.button",
-          }
-        : { color: null, translation: null };
+          ? {
+              color: "olive",
+              translation: "grant.actions.unmarkPendingRemoval.button",
+            }
+          : { color: null, translation: null };
 
     setButton(
       <Button

package/src/components/GrantRemovalWorkflow.js

@@ -1,9 +1,9 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import { useQuery } from "@apollo/client";
 import { Button, Loader, Popup } from "semantic-ui-react";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useIntl } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
 import { LATEST_GRANT_REQUEST_BY_GRANT_QUERY } from "@truedat/dd/api/queries";
@@ -14,7 +14,7 @@ export const GrantRemovalWorkflow = ({
   latestGrantRequest: latestGrantRequestProp,
   grant,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const { formatMessage } = useIntl();
   const [latestGrantRequest, setLatestGrantRequest] = useState(
     latestGrantRequestProp
@@ -32,7 +32,7 @@ export const GrantRemovalWorkflow = ({
         },
       },
     } = await createGrantRequestGroupTrigger(payload);
-    history.push(linkTo.GRANT_REQUEST({ id: grantDeletionRequestId }));
+    navigate(linkTo.GRANT_REQUEST({ id: grantDeletionRequestId }));
   };
 
   const payload = {

package/src/components/GrantRemovalWorkflowDropdown.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Button, Dropdown, Popup, Header } from "semantic-ui-react";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useIntl } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
 
@@ -13,7 +12,7 @@ export const GrantRemovalWorkflowDropdown = ({
   setLatestGrantRequest,
   grant,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const { formatMessage } = useIntl();
 
   const grantRequestStatus = _.prop("status.status")(latestGrantRequest);
@@ -23,7 +22,7 @@ export const GrantRemovalWorkflowDropdown = ({
       <Dropdown.Item
         key="viewRequest"
         onClick={() =>
-          history.push(linkTo.GRANT_REQUEST({ id: latestGrantRequest.id }))
+          navigate(linkTo.GRANT_REQUEST({ id: latestGrantRequest.id }))
         }
         icon="info"
         text={formatMessage({

package/src/components/GrantRequest.js

@@ -1,8 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
 import { Grid, Segment, List, Label } from "semantic-ui-react";
@@ -11,12 +11,12 @@ import { getGrantRequestTemplate } from "../selectors";
 import GrantRequestHeader from "./GrantRequestHeader";
 import GrantRequestSummary from "./GrantRequestSummary";
 
-const DynamicFormViewer = React.lazy(() =>
-  import("@truedat/df/components/DynamicFormViewer")
+const DynamicFormViewer = lazy(
+  () => import("@truedat/df/components/DynamicFormViewer")
 );
 
-const ConditionSummary = React.lazy(() =>
-  import("@truedat/dq/components/ConditionSummary")
+const ConditionSummary = lazy(
+  () => import("@truedat/dq/components/ConditionSummary")
 );
 
 export const GrantRequest = ({ grantRequest, template }) => {
@@ -36,6 +36,7 @@ export const GrantRequest = ({ grantRequest, template }) => {
   const showReason =
     _.includes(grantRequest?.status)(["processing", "processed", "failed"]) &&
     !_.isEmpty(grantRequest?.status_reason);
+
   return (
     <>
       <GenericCrumbs

package/src/components/GrantRequestApprovalForm.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { useForm, Controller } from "react-hook-form";
 import { Button, Container, Form, Header } from "semantic-ui-react";
 import PropTypes from "prop-types";

package/src/components/GrantRequestApprovalPopup.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { Button, Popup } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import GrantRequestApprovalForm from "./GrantRequestApprovalForm";

package/src/components/GrantRequestApprovalResults.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import { useIntl } from "react-intl";
 import { Breadcrumb, Message } from "semantic-ui-react";
-import { useLocation, Link } from "react-router-dom";
+import { useLocation, Link } from "react-router";
 import { GRANT_REQUESTS } from "@truedat/core/routes";
 
 export default function GrantRequestApprovalResults() {
@@ -16,7 +15,6 @@ export default function GrantRequestApprovalResults() {
         <Breadcrumb.Section as={Link} to={GRANT_REQUESTS} active={false}>
           {formatMessage({ id: "grantRequests.header.approve" })}
         </Breadcrumb.Section>
-
         <Breadcrumb.Divider icon="right angle" />
         <Breadcrumb.Section active>
           {formatMessage({ id: "grantRequests.header.approve.results" })}

package/src/components/GrantRequestBulkActions.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useIntl } from "react-intl";
 import { Dropdown } from "semantic-ui-react";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
@@ -23,7 +23,7 @@ export const GrantRequestBulkActions = ({
     searchMust,
     cleanQuery,
   } = useSearchContext();
-  const history = useHistory();
+  const navigate = useNavigate();
   const [selectedRole, setSelectedRole] = useState(null);
   const [saving, setSaving] = useState();
   const { formatMessage } = useIntl();
@@ -67,7 +67,7 @@ export const GrantRequestBulkActions = ({
             must: { id: selectedGrantRequests },
           }
     ).then((data) => {
-      history.push(GRANT_REQUESTS_APPROVALS_RESULT, _.prop("data.data")(data));
+      navigate(GRANT_REQUESTS_APPROVALS_RESULT);
     });
   };
 
@@ -88,7 +88,6 @@ export const GrantRequestBulkActions = ({
         onChange={(_e, { value }) => selectRole(value)}
         value={selectedRole}
       />
-
       <GrantRequestBulkApprovalPopup
         onSubmit={onSubmit}
         content={formatMessage({ id: "grantRequest.actions.approve" })}

package/src/components/GrantRequestBulkApprovalForm.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { useForm, Controller } from "react-hook-form";
 import { Button, Container, Form, Header } from "semantic-ui-react";
 import PropTypes from "prop-types";

package/src/components/GrantRequestBulkApprovalPopup.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { Button, Popup } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import GrantRequestBulkApprovalForm from "./GrantRequestBulkApprovalForm";

package/src/components/GrantRequestBulkRoleSelector.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Dropdown } from "semantic-ui-react";

package/src/components/GrantRequestCancel.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";

package/src/components/GrantRequestHeader.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
@@ -10,9 +9,9 @@ const selectGrantTypeOptions = (grantRequest) => {
   const [color, translationId] =
     grantRequest?.request_type === "grant_removal"
       ? ["red", "request.grantRemoval"]
-      : grantRequest?._embedded?.group?._embedded.modification_grant
-      ? ["yellow", "grantRequest.header.modification"]
-      : [undefined, "request.grantAccess"];
+      : grantRequest?._embedded?.group?._embedded?.modification_grant
+        ? ["yellow", "grantRequest.header.modification"]
+        : [undefined, "request.grantAccess"];
   return { color, translationId };
 };
 

package/src/components/GrantRequestLoader.js

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 import { connect } from "react-redux";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import PropTypes from "prop-types";
 import { clearGrantRequest, fetchGrantRequest } from "../routines";
 

package/src/components/GrantRequestRow.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Checkbox, Table } from "semantic-ui-react";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { columnDecoratorComponent } from "@truedat/core/services";
 
@@ -16,7 +15,7 @@ export const GrantRequestRow = ({
   grantRequest,
   approveView,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const createdById = _.path("created_by_id")(grantRequest);
   const userId = _.path("user_id")(grantRequest);
 
@@ -46,7 +45,7 @@ export const GrantRequestRow = ({
              * inside an anchor, such as an icon) is clicked
              */
             !ev.target.closest("a") &&
-              history.push(linkTo.GRANT_REQUEST(grantRequest));
+              navigate(linkTo.GRANT_REQUEST(grantRequest));
           }}
           content={columnDecoratorComponent(column)(grantRequest)}
         />

package/src/components/GrantRequestSummary.js

@@ -1,5 +1,4 @@
 import { flow, getOr, reverse, sortBy } from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl, FormattedMessage } from "react-intl";
@@ -43,7 +42,7 @@ const GrantRequestApproval = ({
         })}
         color={is_rejection ? "red" : "blue"}
       />
-      <FieldValue field="user" value={_embedded.user.full_name} />
+      <FieldValue field="user" value={_embedded?.user?.full_name} />
       <FieldValue field="role" value={role} />
       <FieldValue
         field="inserted_at"
@@ -76,7 +75,6 @@ export const GrantRequestSummary = ({ grantRequest }) => {
       <Header as="h3" dividing>
         {formatMessage({ id: "grantRequestApproval.header" })}
       </Header>
-
       <List divided>
         {approvals.length == 0 &&
           formatMessage({ id: "grantRequest.summary.emptyApprovals" })}
@@ -86,13 +84,11 @@ export const GrantRequestSummary = ({ grantRequest }) => {
           </List.Item>
         ))}
       </List>
-
       {grantRequest?.all_pending_roles?.length > 0 && (
         <>
           <Header as="h3" dividing>
             {formatMessage({ id: "grantRequest.summary.pendingRoles" })}
           </Header>
-
           {grantRequest.all_pending_roles.map((role, i) => (
             <Label key={i}>{role}</Label>
           ))}

package/src/components/GrantRequests.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { Table, Header, Icon, Segment } from "semantic-ui-react";
 import { connect } from "react-redux";
 import { columnDecoratorComponent } from "@truedat/core/services";
@@ -14,7 +13,7 @@ export const GrantRequests = ({
   grantRequestsLoading,
 }) => {
   const { formatMessage } = useIntl();
-  const history = useHistory();
+  const navigate = useNavigate();
 
   return (
     <Segment attached="bottom">
@@ -57,7 +56,7 @@ export const GrantRequests = ({
                            * inside an anchor, such as an icon) is clicked
                            */
                           !ev.target.closest("a") &&
-                            history.push(linkTo.GRANT_REQUEST(grantRequest));
+                            navigate(linkTo.GRANT_REQUEST(grantRequest));
                         }}
                         content={columnDecoratorComponent(column)(grantRequest)}
                       />

package/src/components/GrantRequestsLabelResults.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { Label } from "semantic-ui-react";

package/src/components/GrantRequestsSearchResults.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import {
   Header,
   Button,
@@ -107,7 +107,6 @@ export const GrantRequestsSearchResults = () => {
           </Header.Subheader>
         </Header.Content>
       </Header>
-
       <Segment attached="bottom">
         <div className="grant-requests-bulk-actions">
           <div>
@@ -136,7 +135,6 @@ export const GrantRequestsSearchResults = () => {
                     </Button.Group>
                   </GridColumn>
                 </GridRow>
-
                 {approveView ? (
                   <GridRow>
                     <GridColumn textAlign="right" width={5}>
@@ -151,12 +149,12 @@ export const GrantRequestsSearchResults = () => {
             ) : null}
           </div>
         </div>
-
         <Dimmer.Dimmable dimmed={loading}>
-          <Dimmer active={loading} inverted>
-            <Loader />
-          </Dimmer>
-
+          {loading ? (
+            <Dimmer active inverted>
+              <Loader />
+            </Dimmer>
+          ) : null}
           <GrantRequestsLabelResults
             approveView={approveView}
             selectedCount={_.size(selectedGrantRequests)}

package/src/components/GrantRequestsTable.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";