@truedat/core 7.5.9 → 7.5.11

package/src/components/ResourceMembersActions.js

@@ -1,6 +1,5 @@
-import React from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Button } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { linkTo } from "../routes";

package/src/components/RichTextEditor.js

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { isKeyHotkey } from "is-hotkey";
 import isUrl from "is-url";
-import { injectIntl } from "react-intl";
 import { Editor, getEventTransfer } from "slate-react";
 import { Value } from "slate";
 import { Menu, Icon } from "semantic-ui-react";
@@ -51,7 +50,7 @@ function renderBlock(props, _editor, next) {
     case "list-item":
       return <li {...attributes}>{children}</li>;
     case "numbered-list":
-      return <ol {...attributes}> {children}</ol>;
+      return <ol {...attributes}>{children}</ol>;
     case "link":
       return (
         <SafeLink href={node.data?.get("href")} {...attributes}>
@@ -105,10 +104,10 @@ function onKeyDown(event, editor, next) {
   const mark = isBoldHotkey(event)
     ? "bold"
     : isItalicHotkey(event)
-    ? "italic"
-    : isUnderlinedHotkey(event)
-    ? "underlined"
-    : undefined;
+      ? "italic"
+      : isUnderlinedHotkey(event)
+        ? "underlined"
+        : undefined;
   if (!_.isNil(mark)) {
     event.preventDefault();
     editor.toggleMark(mark);
@@ -363,4 +362,4 @@ RichTextEditor.propTypes = {
   value: PropTypes.object,
 };
 
-export default injectIntl(RichTextEditor);
+export default RichTextEditor;

package/src/components/RouteListener.js

@@ -1,37 +1,16 @@
 import _ from "lodash/fp";
-import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import { compose } from "redux";
-import { withRouter } from "react-router-dom";
-import { getMessage } from "../selectors";
+import { useEffect } from "react";
+import { useDispatch } from "react-redux";
+import { useLocation } from "react-router";
 import { dismissAlert } from "../routines";
 
-export class RouteListener extends React.Component {
-  componentDidUpdate(prevProps) {
-    const prevPath = prevProps.location.pathname;
-    const currentPath = this.props.location.pathname;
-    if (!_.isEmpty(this.props.message) && prevPath !== currentPath) {
-      this.props.dismissAlert();
-    }
-  }
+export default function RouteListener() {
+  const location = useLocation();
+  const dispatch = useDispatch();
 
-  render() {
-    return null;
-  }
-}
-
-RouteListener.propTypes = {
-  location: PropTypes.object,
-  message: PropTypes.object,
-  dismissAlert: PropTypes.func,
-};
-
-const mapStateToProps = (state) => ({ message: getMessage(state) });
+  useEffect(() => {
+    dispatch(dismissAlert());
+  }, [location.pathname, dispatch]);
 
-const mapDispatchToProps = { dismissAlert };
-
-export default compose(
-  withRouter,
-  connect(mapStateToProps, mapDispatchToProps)
-)(RouteListener);
+  return null;
+}

package/src/components/SafeLink.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { validUrl } from "../services/validation";
 

package/src/components/ScrollToTop.js

@@ -1,22 +1,19 @@
-import { Component } from "react";
+import { useEffect } from "react";
 import PropTypes from "prop-types";
-import { withRouter } from "react-router-dom";
+import { useLocation } from "react-router";
 
-class ScrollToTop extends Component {
-  static propTypes = {
-    location: PropTypes.object,
-    children: PropTypes.node
-  };
+function ScrollToTop({ children }) {
+  const location = useLocation();
 
-  componentDidUpdate(prevProps) {
-    if (this.props.location !== prevProps.location) {
-      window.scrollTo(0, 0);
-    }
-  }
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, [location]);
 
-  render() {
-    return this.props.children;
-  }
+  return children;
 }
 
-export default withRouter(ScrollToTop);
+ScrollToTop.propTypes = {
+  children: PropTypes.node,
+};
+
+export default ScrollToTop;

package/src/components/SearchFilterDropdown.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 
 import _ from "lodash/fp";

package/src/components/SearchInput.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from "react";
+import { useEffect, useRef } from "react";
 import { Input } from "semantic-ui-react";
 import PropTypes from "prop-types";
 
@@ -21,7 +21,7 @@ export const SearchInput = ({ icon, focus, onChange, placeholder, value }) => {
 SearchInput.defaultProps = {
   focus: true,
   icon: { name: "search", link: true },
-  value: ""
+  value: "",
 };
 
 SearchInput.propTypes = {
@@ -29,7 +29,7 @@ SearchInput.propTypes = {
   icon: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
   onChange: PropTypes.func,
   placeholder: PropTypes.string,
-  value: PropTypes.string
+  value: PropTypes.string,
 };
 
 export default SearchInput;

package/src/components/SearchMenu.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { useIntl } from "react-intl";
 import { SEARCH } from "../routes";
 import Submenu from "./Submenu";

package/src/components/SelectedFilters.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import FilterDropdown from "./FilterDropdown";
 import FilterMultilevelDropdown from "./FilterMultilevelDropdown";
 import HierarchyFilterDropdown from "./HierarchyFilterDropdown";

package/src/components/SideMenu.js

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

package/src/components/SidebarToggle.js

@@ -1,8 +1,8 @@
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import { Icon, Menu } from "semantic-ui-react";
 import { hideSidebar, toggleSidebar } from "@truedat/core/routines";
 

package/src/components/StructureFilterItem.js

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

package/src/components/Submenu.js

@@ -1,12 +1,12 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { useIntl, FormattedMessage } from "react-intl";
 import { connect } from "react-redux";
-import { useLocation, useHistory, Link } from "react-router-dom";
+import { useLocation, Link, useNavigate } from "react-router";
 import { Dropdown, Icon, Menu } from "semantic-ui-react";
 import { useAuthorizedItems, useActiveRoutes } from "@truedat/core/hooks";
-import { clearNavFilter as clearBucketFilterRoutine } from "@truedat/dd/routines";
+import { clearNavFilter as clearBucketFilterRoutine } from "@truedat/core/routines";
 
 export const MenuItem = ({ active, clearNavFilter, name, routes }) => {
   const { formatMessage } = useIntl();
@@ -69,7 +69,8 @@ export const Submenu = ({
   isActiveOverride,
 }) => {
   const [open, setOpen] = useState(false);
-  const history = useHistory();
+
+  const navigate = useNavigate();
   const location = useLocation();
 
   const activeRoute = useActiveRoutes(_.flatMap("routes")(items), navFilter);
@@ -109,7 +110,7 @@ export const Submenu = ({
         active
         className="selectable"
         as="div"
-        onClick={() => history.push(primaryRoute)}
+        onClick={() => navigate(primaryRoute)}
       >
         <Link to={primaryRoute}>
           <Icon size="large" name={icon} />
@@ -161,14 +162,14 @@ export const Submenu = ({
           open={open}
           className={className}
           trigger={trigger}
-          onClick={() => history.push(primaryRoute)}
+          onClick={() => navigate(primaryRoute)}
         >
           <Dropdown.Menu onClick={(e) => e.stopPropagation()}>
             {_.size(filteredItems) > 1 && (
               <>
                 <Dropdown.Header
                   className="selectable"
-                  onClick={() => history.push(primaryRoute)}
+                  onClick={() => navigate(primaryRoute)}
                 >
                   <FormattedMessage
                     id={`sidemenu.${name}`}

package/src/components/SystemsLoader.js

@@ -0,0 +1,27 @@
+import { useEffect } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { clearSystems, fetchSystems } from "../routines";
+
+export const SystemsLoader = ({ clearSystems, fetchSystems }) => {
+  useEffect(() => {
+    return () => {
+      clearSystems();
+    };
+  }, [clearSystems]);
+  useEffect(() => {
+    fetchSystems();
+  }, [fetchSystems]);
+  return null;
+};
+
+SystemsLoader.propTypes = {
+  clearSystems: PropTypes.func,
+  fetchSystems: PropTypes.func,
+};
+
+const mapStateToProps = ({ systemsLoading }) => ({ systemsLoading });
+
+export default connect(mapStateToProps, { clearSystems, fetchSystems })(
+  SystemsLoader
+);

package/src/components/TaxonomyMenu.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { useIntl } from "react-intl";
 import { useAuthorized } from "../hooks";
 import { DOMAINS } from "../routes";

package/src/components/TemplateSelector.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Form, Label } from "semantic-ui-react";
 import { useIntl, FormattedMessage } from "react-intl";
@@ -100,6 +99,7 @@ export const TemplateSelectorLoader = ({
     onCompleted: onLoad,
   });
   if (error) return null;
+
   const templates = data?.templates || emptyTemplates;
   return (
     <TemplateSelector loading={loading} templates={templates} {...props} />

package/src/components/TemplatesLoader.js

@@ -0,0 +1,24 @@
+import { useEffect } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { clearTemplates, fetchTemplates } from "@truedat/core/routines";
+
+export const TemplatesLoader = ({ scope, fetchTemplates, clearTemplates }) => {
+  useEffect(() => {
+    fetchTemplates({ scope });
+    return () => {
+      clearTemplates();
+    };
+  }, [clearTemplates, fetchTemplates, scope]);
+  return null;
+};
+
+TemplatesLoader.propTypes = {
+  clearTemplates: PropTypes.func,
+  fetchTemplates: PropTypes.func,
+  scope: PropTypes.string,
+};
+
+export default connect(null, { clearTemplates, fetchTemplates })(
+  TemplatesLoader
+);

package/src/components/TreeSelector.js

@@ -1,6 +1,6 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
-import { Dropdown, Form, Icon, Input, Label } from "semantic-ui-react";
+import { useState, useEffect } from "react";
+import { Dropdown, FormDropdown, Icon, Input, Label } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import { lowerDeburr } from "../services/sort";
 import { recursiveMatch, descendents, childIds } from "../services/tree";
@@ -230,7 +230,7 @@ export const TreeSelector = ({
     );
 
     return !notDropdown ? (
-      <Form.Dropdown
+      <FormDropdown
         className={`fix-dropdown-selector ${!notDropdown ? className : ""}`}
         error={error}
         floating
@@ -245,7 +245,7 @@ export const TreeSelector = ({
         disabled={disabled}
       >
         {content}
-      </Form.Dropdown>
+      </FormDropdown>
     ) : (
       <>{content}</>
     );

package/src/components/Unauthorized.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { useIntl } from "react-intl";
 import { Message } from "semantic-ui-react";