@truedat/dd 7.5.9 → 7.5.10

package/src/components/StructureChildrenRelations.js

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

package/src/components/StructureConfidentialButton.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { Component } from "react";
 import PropTypes from "prop-types";
 import { compose } from "redux";
 import { connect } from "react-redux";
@@ -7,7 +7,7 @@ import { injectIntl } from "react-intl";
 import { Button, Popup, Icon } from "semantic-ui-react";
 import { updateStructure } from "../routines";
 
-export class StructureConfidentialButton extends React.Component {
+export class StructureConfidentialButton extends Component {
   static propTypes = {
     structure: PropTypes.object,
     structureUpdating: PropTypes.bool,

package/src/components/StructureCrumbs.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React, { useContext } from "react";
 import PropTypes from "prop-types";
 import { Breadcrumb } from "semantic-ui-react";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { STRUCTURES, linkTo } from "@truedat/core/routes";
 

package/src/components/StructureDeleteButton.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/StructureEventRow.js

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

package/src/components/StructureEvents.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Feed, Segment } from "semantic-ui-react";
 import { connect } from "react-redux";

package/src/components/StructureFieldRow.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Checkbox, Table } from "semantic-ui-react";
 import { columnDecorator } from "@truedat/core/services";

package/src/components/StructureFields.js

@@ -1,8 +1,9 @@
 import _ from "lodash/fp";
-import React, { useState, useCallback } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import queryString from "query-string";
-import { useLocation, useParams, useHistory } from "react-router-dom";
+import { useLocation } from "react-router";
+import { useParams, useNavigate } from "react-router";
 import { useQuery } from "@apollo/client";
 import {
   Button,
@@ -136,7 +137,7 @@ export const StructureFields = ({
   const { id: dataStructureId, version: version } = useParams();
   const { search, pathname } = useLocation();
   const { before, after, q } = queryString.parse(search);
-  const history = useHistory();
+  const navigate = useNavigate();
   const { formatMessage } = useIntl();
   const [profilingMode, setProfilingMode] = useState(false);
   const [checkedFields, setCheckedFields] = useState([]);
@@ -163,15 +164,15 @@ export const StructureFields = ({
     _.contains(structureId)(checkedFields)
   )(pageStructureIds);
 
-  const debounceSearch = useCallback(
-    _.debounce(300)((value) => {
-      history.replace({
+  const debounceSearch = _.debounce(300)((value) => {
+    navigate(
+      {
         pathname: pathname,
         search: queryString.stringify({ q: value }),
-      });
-    }),
-    []
-  );
+      },
+      { replace: true }
+    );
+  });
 
   const handleInputChange = (e) => {
     const value = e.target.value;

package/src/components/StructureFieldsDropdown.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { OptionGroup } from "@truedat/core/components";
@@ -39,29 +38,29 @@ export const StructureFieldsDropdown = ({
           structureFields
         ) || _.find({ data_structure_id: fieldIdentifier })(structureFields)
       : _.any({
-          type: "reference_dataset_field",
-          parent_index: Number(parentIndex),
-        })(structureFields)
-      ? _.find({
-          name: fieldIdentifier,
-          parent_index: Number(parentIndex),
-        })(structureFields)
-      : _.find({
-          data_structure_id: Number(fieldIdentifier),
-          parent_index: Number(parentIndex),
-        })(structureFields) ||
-        _.find({
-          data_structure_id: fieldIdentifier,
-          parent_index: Number(parentIndex),
-        })(structureFields);
+            type: "reference_dataset_field",
+            parent_index: Number(parentIndex),
+          })(structureFields)
+        ? _.find({
+            name: fieldIdentifier,
+            parent_index: Number(parentIndex),
+          })(structureFields)
+        : _.find({
+            data_structure_id: Number(fieldIdentifier),
+            parent_index: Number(parentIndex),
+          })(structureFields) ||
+          _.find({
+            data_structure_id: fieldIdentifier,
+            parent_index: Number(parentIndex),
+          })(structureFields);
   };
 
   const formatOption = (field) => {
     const value = _.isNil(field?.parent_index)
       ? field.data_structure_id
       : field?.type === "reference_dataset_field"
-      ? `${field.name}/${field.parent_index}`
-      : `${field.data_structure_id}/${field.parent_index}`;
+        ? `${field.name}/${field.parent_index}`
+        : `${field.data_structure_id}/${field.parent_index}`;
     const modifiers = _.filter({ sourceType: field.field_type })(
       typeCastModifiers
     );

package/src/components/StructureGrantCart.js

@@ -1,7 +1,8 @@
 import { linkTo } from "@truedat/core/routes";
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
-import { Link, useLocation, useHistory } from "react-router-dom";
+import { useState, useEffect } from "react";
+import { Link, useLocation } from "react-router";
+import { useNavigate } from "react-router";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -39,13 +40,13 @@ export const StructureGrantCart = ({
   allowEmptyCart,
 }) => {
   const { formatMessage } = useIntl();
-  const history = useHistory();
+  const navigate = useNavigate();
   const inCartCheckout = useLocation().pathname == GRANTS_REQUESTS_CHECKOUT;
   const [openedStructureFilter, setOpenedStructureFilter] = useState();
   const structures = _.pathOr([], "structures")(grantRequestsCart);
 
   useEffect(() => {
-    if (_.isEmpty(structures) && !allowEmptyCart) history.push(STRUCTURES);
+    if (_.isEmpty(structures) && !allowEmptyCart) navigate(STRUCTURES);
   }, [history, structures, allowEmptyCart]);
 
   const removeRequest = (structure) => () =>

package/src/components/StructureGrantCartCheckout.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Header, Segment, Grid, Button, GridColumn } from "semantic-ui-react";
 import { bindActionCreators } from "redux";

package/src/components/StructureGrantCartInformation.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import { useQuery } from "@apollo/client";
 import PropTypes from "prop-types";
 import { Segment, Divider, Form, Header } from "semantic-ui-react";
@@ -12,8 +12,8 @@ import {
 } from "../routines";
 import StructureGrantCartUserSelector from "./StructureGrantCartUserSelector";
 
-const SelectableDynamicForm = React.lazy(() =>
-  import("@truedat/df/components/SelectableDynamicForm")
+const SelectableDynamicForm = lazy(
+  () => import("@truedat/df/components/SelectableDynamicForm")
 );
 
 export const StructureGrantCartInformation = ({

package/src/components/StructureGrantCartUserSelector.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { lazy, useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { Form, Checkbox, Header, Label, Popup } from "semantic-ui-react";
 import { connect } from "react-redux";
@@ -10,8 +10,8 @@ import { RoleSelector } from "@truedat/auth/roles/components";
 import { useRoles } from "@truedat/auth/hooks/useRoles";
 import { updateGrantRequestUser } from "../routines";
 
-const UsersSearchLoader = React.lazy(() =>
-  import("@truedat/auth/users/components/UsersSearchLoader")
+const UsersSearchLoader = lazy(
+  () => import("@truedat/auth/users/components/UsersSearchLoader")
 );
 
 export const StructureGrantCartUserSelector = ({
@@ -125,11 +125,9 @@ export const StructureGrantCartUserSelector = ({
 
   return updateGrant ? (
     <Header as="h4">
-      <Header.Content>
-        {`${formatMessage({ id: "grantRequestCart.user.label" })} ${
-          modificationGrant.user?.full_name
-        }`}
-      </Header.Content>
+      <Header.Content>{`${formatMessage({ id: "grantRequestCart.user.label" })} ${
+        modificationGrant.user?.full_name
+      }`}</Header.Content>
     </Header>
   ) : (
     <>

package/src/components/StructureGrantDropdown.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Button, Dropdown, Popup, Header } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { Date } from "@truedat/core/components";
 import { config } from "@truedat/core/truedatConfig";
@@ -25,7 +24,7 @@ export const StructureGrantDropdown = ({
   previousStructureQuery,
   size,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const { formatMessage } = useIntl();
 
   const hasPendingGrantRequest = _.includes(grantRequestStatus)([
@@ -51,9 +50,7 @@ export const StructureGrantDropdown = ({
     viewRequest: (
       <Dropdown.Item
         key="viewRequest"
-        onClick={() =>
-          history.push(linkTo.GRANT_REQUEST({ id: grantRequest.id }))
-        }
+        onClick={() => navigate(linkTo.GRANT_REQUEST({ id: grantRequest.id }))}
         icon="info"
         text={formatMessage({
           id: `grant.actions.viewRequest.confirmation.header`,
@@ -124,8 +121,8 @@ export const StructureGrantDropdown = ({
   const currentState = hasPendingGrantRequest
     ? "pendingRequest"
     : hasProcessingGrantRequest
-    ? "processingRequest"
-    : "activeGrant";
+      ? "processingRequest"
+      : "activeGrant";
 
   const stateProps = dropdownStates[currentState];
 

package/src/components/StructureGrantListButton.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useSearchContext } from "@truedat/core/search/SearchContext";

package/src/components/StructureGrantRequestAddCart.js

@@ -1,4 +1,4 @@
-import React from "react";
+import { cloneElement } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { addGrantRequestToCart } from "../routines";
@@ -10,7 +10,7 @@ export const StructureGrantRequestAddCart = ({
 }) => {
   if (!structure) return;
 
-  return React.cloneElement(children, {
+  return cloneElement(children, {
     onClick: () => addGrantRequestToCart(structure),
   });
 };

package/src/components/StructureGrantRequestButton.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Button, Popup } from "semantic-ui-react";
 import { connect } from "react-redux";

package/src/components/StructureGrantSummaryButton.js

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

package/src/components/StructureGrants.js

@@ -1,10 +1,9 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Table } from "semantic-ui-react";
 import { connect } from "react-redux";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { columnDecorator } from "@truedat/core/services";
 import { linkTo } from "@truedat/core/routes";
 import { getGrantsColumns } from "../selectors";
@@ -20,7 +19,7 @@ export const StructureGrants = ({
   userPermissions,
 }) => {
   const { formatMessage } = useIntl();
-  const history = useHistory();
+  const navigate = useNavigate();
   const canUpdateRemoval =
     userPermissions?.update_grant_removal &&
     _.any(matchesStructure(structure))(grants);
@@ -56,7 +55,7 @@ export const StructureGrants = ({
                    * some possibly contained anchor (or an element
                    * inside an anchor, such as an icon) is clicked
                    */
-                  !ev.target.closest("a") && history.push(linkTo.GRANT(grant));
+                  !ev.target.closest("a") && navigate(linkTo.GRANT(grant));
                 }}
               />
             ))}

package/src/components/StructureGraph.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { createGraph, fetchStructureGraph } from "../routines";

package/src/components/StructureImpact.js

@@ -1,11 +1,10 @@
-import React from "react";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { Grid } from "semantic-ui-react";
 import StructureGraph from "./StructureGraph";
 import LineageDownloadButton from "./LineageDownloadButton";
 
-export const StructureImpact = props => (
+export const StructureImpact = (props) => (
   <>
     <Grid>
       <Grid.Row>
@@ -19,16 +18,16 @@ export const StructureImpact = props => (
 );
 
 StructureImpact.propTypes = {
-  graph: PropTypes.object
+  graph: PropTypes.object,
 };
 
 const mapStateToProps = ({
   structureImpactId: graphId,
-  structureImpactGraph: graph
+  structureImpactGraph: graph,
 }) => ({
   graph,
   graphId,
-  type: "impact"
+  type: "impact",
 });
 
 export default connect(mapStateToProps)(StructureImpact);

package/src/components/StructureItem.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { List } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { STRUCTURES, linkTo } from "@truedat/core/routes";
@@ -68,13 +67,13 @@ export const StructureItem = ({
         value
           ? [truthyToClassName[key], ...acc]
           : value !== undefined
-          ? [
-              ...(notUndefinedToClassName[key]
-                ? [notUndefinedToClassName[key]]
-                : []),
-              ...acc,
-            ]
-          : acc,
+            ? [
+                ...(notUndefinedToClassName[key]
+                  ? [notUndefinedToClassName[key]]
+                  : []),
+                ...acc,
+              ]
+            : acc,
       []
     ),
     _.join(" ")
@@ -88,12 +87,12 @@ export const StructureItem = ({
         active
           ? undefined
           : type == "system" && id
-          ? linkTo.SYSTEM_STRUCTURES({ id })
-          : type == "bucket"
-          ? `${linkTo.BUCKET_VIEW()}?${filterQueryParams(navFilter.filter)}`
-          : id
-          ? linkTo.STRUCTURE({ id })
-          : STRUCTURES
+            ? linkTo.SYSTEM_STRUCTURES({ id })
+            : type == "bucket"
+              ? `${linkTo.BUCKET_VIEW()}?${filterQueryParams(navFilter.filter)}`
+              : id
+                ? linkTo.STRUCTURE({ id })
+                : STRUCTURES
       }
       className={toClassNames({ deleted_at, hasCatalogViewProp })}
       active={active}

package/src/components/StructureItemRoot.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import { connect } from "react-redux";
 import { FormattedMessage } from "react-intl";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import PropTypes from "prop-types";
 import { List } from "semantic-ui-react";
 import { STRUCTURES, linkTo } from "@truedat/core/routes";
@@ -17,7 +16,7 @@ const filterParams = _.flow(
 );
 
 export const StructureItemRoot = ({ navFilter }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const url =
     navFilter?.view === "BUCKET_VIEW"
       ? linkTo.BUCKETS_VIEW({
@@ -25,7 +24,7 @@ export const StructureItemRoot = ({ navFilter }) => {
         })
       : STRUCTURES;
   return (
-    <List.Item onClick={() => history.push(url)}>
+    <List.Item onClick={() => navigate(url)}>
       <List.Icon name="angle double left" verticalAlign="middle" />
       <List.Content>
         <FormattedMessage id="structure.navigation.home" />

package/src/components/StructureItems.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import StructureItem from "./StructureItem";
 

package/src/components/StructureLineage.js

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

package/src/components/StructureLoader.js

@@ -1,7 +1,7 @@
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import { clearStructure, fetchStructure } from "../routines";
 
 export const StructureLoader = ({ fetchStructure, clearStructure }) => {

package/src/components/StructureMetadata.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 { connect } from "react-redux";
 import { Accordion, Menu } from "semantic-ui-react";

package/src/components/StructureNav.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { List, Divider } from "semantic-ui-react";
 import { Loading } from "@truedat/core/components";
@@ -60,11 +59,9 @@ export const StructureNav = ({
       {totalChildStructures && totalChildStructures > childStructures.length ? (
         <List>
           <List.Item disabled active={false}>
-            <span>
-              {`${childStructures.length} ${formatMessage({
-                id: "structure.navigation.showing",
-              })} ${totalChildStructures}`}
-            </span>
+            <span>{`${childStructures.length} ${formatMessage({
+              id: "structure.navigation.showing",
+            })} ${totalChildStructures}`}</span>
           </List.Item>
         </List>
       ) : null}

package/src/components/StructureNavClassified.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { Fragment, useState } from "react";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
@@ -35,7 +35,7 @@ export const StructureNavClassified = ({
     _.sortBy(_.head)
   )(structures);
   return entries.map(([label, children], key) => (
-    <React.Fragment key={key}>
+    <Fragment key={key}>
       <List.Item
         onClick={() => toggleAccordion(label)}
         icon={expanded[label] ? "down triangle" : "right triangle"}
@@ -50,7 +50,7 @@ export const StructureNavClassified = ({
           fnHasCatalogViewProp={fnHasCatalogViewProp}
         />
       ) : null}
-    </React.Fragment>
+    </Fragment>
   ));
 };
 

package/src/components/StructureNoteActions.js

@@ -1,6 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { Button, Icon } from "semantic-ui-react";

package/src/components/StructureNotes.js

@@ -1,10 +1,10 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { lazy, useState } from "react";
 import PropTypes from "prop-types";
 import { useIntl, FormattedMessage } from "react-intl";
 import Moment from "react-moment";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Button, Segment, Message, Loader, Label } from "semantic-ui-react";
 import { linkTo } from "@truedat/core/routes";
 import {
@@ -14,8 +14,8 @@ import {
 
 import StructureNoteActions from "./StructureNoteActions";
 
-const DynamicFormViewer = React.lazy(() =>
-  import("@truedat/df/components/DynamicFormViewer")
+const DynamicFormViewer = lazy(
+  () => import("@truedat/df/components/DynamicFormViewer")
 );
 
 const StructureNote = ({ structureNote, template, structure, notesSize }) => {

package/src/components/StructureNotesEdit.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { lazy, useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Form, Segment } from "semantic-ui-react";
@@ -12,12 +12,10 @@ import SuggestionsWidget from "@truedat/ai/components/suggestions/SuggestionsWid
 import { doStructureNoteAction } from "../routines";
 import { getLatestDfContent } from "../selectors/getSortedStructureNotes";
 
-const DynamicForm = React.lazy(() =>
-  import("@truedat/df/components/DynamicForm")
-);
+const DynamicForm = lazy(() => import("@truedat/df/components/DynamicForm"));
 
-const TemplateLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplateLoader")
+const TemplateLoader = lazy(
+  () => import("@truedat/df/templates/components/TemplateLoader")
 );
 
 export const StructureNotesEdit = ({
@@ -85,8 +83,7 @@ export const StructureNotesEdit = ({
 
   return (
     <Segment attached="bottom">
-      <TemplateLoader />
-
+      <TemplateLoader id="templateloader" />
       {aiSuggestionsUrl ? (
         <SuggestionsWidget
           requestAiSuggestion={requestAiSuggestion}

package/src/components/StructureParentRelations.js

@@ -1,10 +1,9 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import {
   getParentRelationColumns,
-  getSortedParentRelations
+  getSortedParentRelations,
 } from "../selectors";
 import StructureRelations from "./StructureRelations";
 
@@ -14,12 +13,12 @@ export const StructureParentRelations = ({ columns, relations, ...rest }) => (
 
 StructureParentRelations.propTypes = {
   columns: PropTypes.array,
-  relations: PropTypes.array
+  relations: PropTypes.array,
 };
 
 const mapStateToProps = (state, ownProps) => ({
   relations: getSortedParentRelations(state),
-  columns: _.propOr(getParentRelationColumns(state), "columns")(ownProps)
+  columns: _.propOr(getParentRelationColumns(state), "columns")(ownProps),
 });
 
 export default connect(mapStateToProps)(StructureParentRelations);