@truedat/core 7.5.7 → 7.5.10

package/src/components/ErrorBoundary.js

@@ -1,10 +1,10 @@
-import React from "react";
+import { Component } from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Message } from "semantic-ui-react";
 import { usePath } from "../hooks";
 
-const Error = () => {
+export const Error = () => {
   const { formatMessage } = useIntl();
   const path = usePath();
   return (
@@ -13,23 +13,23 @@ const Error = () => {
       icon="warning sign"
       header={formatMessage({
         id: "error.header",
-        defaultMessage: "Eek! Something went wrong..."
+        defaultMessage: "Eek! Something went wrong...",
       })}
       list={[
         formatMessage({
           id: "error.content",
-          defaultMessage: "Please report this error to the Truedat team."
+          defaultMessage: "Please report this error to the Truedat team.",
         }),
-        path
+        path,
       ]}
     />
   );
 };
 
-export class ErrorBoundary extends React.Component {
+export class ErrorBoundary extends Component {
   static propTypes = {
     children: PropTypes.node,
-    logError: PropTypes.func
+    logError: PropTypes.func,
   };
 
   constructor(props) {
@@ -42,6 +42,7 @@ export class ErrorBoundary extends React.Component {
   }
 
   componentDidCatch(error, errorInfo) {
+    console.error({ error, errorInfo });
     this.props.logError && this.props.logError({ error, errorInfo });
   }
 

package/src/components/FieldLabel.js

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

package/src/components/FilterDropdown.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import {
@@ -137,11 +137,11 @@ export const FilterDropdown = ({
               ))
             )(filteredOptions)}
         </>
-        {loading && (
+        {loading ? (
           <Dimmer active inverted>
             <Loader size="tiny" />
           </Dimmer>
-        )}
+        ) : null}
       </Dimmer.Dimmable>
     </Dropdown>
   );

package/src/components/FilterItem.js

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

package/src/components/FilterMultilevelDropdown.js

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

package/src/components/GenericCrumbs.js

@@ -1,12 +1,11 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Breadcrumb } from "semantic-ui-react";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { FormattedMessage } from "react-intl";
 
 export const GenericCrumbs = ({ header, title }) => {
-  const history = useHistory();
-  const goBack = () => history.goBack();
+  const navigate = useNavigate();
+  const goBack = () => navigate(-1);
 
   return (
     <Breadcrumb>

package/src/components/GlossaryMenu.js

@@ -1,17 +1,14 @@
 import _ from "lodash/fp";
-import React from "react";
-import TemplatesLoader from "@truedat/df/templates/components/TemplatesLoader";
-import { connect } from "react-redux";
 import PropTypes from "prop-types";
-import { makeGetSubscopes } from "@truedat/df/selectors/subscopedTemplates";
-import { matchPath } from "react-router-dom";
-import { linkTo } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
-import { getSidemenuGlossarySubscopes } from "@truedat/bg/concepts/selectors/getSidemenuGlossarySubscopes";
-import { getConceptSubscope } from "@truedat/bg/concepts/selectors/getConceptSubscope";
-import { getConceptStatus } from "@truedat/bg/concepts/selectors/getConceptStatus";
+import { connect } from "react-redux";
 import { useSelector } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { useLocation, matchPath } from "react-router";
+import { linkTo } from "@truedat/core/routes";
+import { makeGetSubscopes } from "@truedat/core/selectors/subscopedTemplates";
+import { getConceptSubscope } from "@truedat/core/selectors/getConceptSubscope";
+import { getSidemenuGlossarySubscopes } from "@truedat/core/selectors/getSidemenuGlossarySubscopes";
+import TemplatesLoader from "@truedat/core/components/TemplatesLoader";
 import { useAuthorized } from "../hooks";
 import {
   CONCEPTS,
@@ -30,17 +27,20 @@ import {
 import Submenu from "./Submenu";
 
 function isMenuSubscope(pathname, subscope) {
-  const match = matchPath(pathname, {
-    path: [
-      CONCEPTS_SUBSCOPE,
-      CONCEPTS_SIDEMENU_SUBSCOPE,
-      CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED,
-      CONCEPTS_SIDEMENU_SUBSCOPE_PENDING,
-    ],
-    exact: false,
-  });
-
-  return !!match?.params?.subscope && subscope === match.params.subscope;
+  // const match = matchPath(
+  //   {
+  //     path: [
+  //       CONCEPTS_SUBSCOPE,
+  //       CONCEPTS_SIDEMENU_SUBSCOPE,
+  //       CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED,
+  //       CONCEPTS_SIDEMENU_SUBSCOPE_PENDING,
+  //     ],
+  //   },
+  //   pathname
+  // );
+
+  // return !!match?.params?.subscope && subscope === match.params.subscope;
+  return false;
 }
 
 function mainMenuSubscopes(allSubscopes, rootSubscopes) {
@@ -167,15 +167,8 @@ function buildManagementSubmenuItems() {
 }
 
 function isMainConcepts(location, conceptSubscope, mainSubscopes) {
-  const isConceptsMatch = matchPath(location.pathname, {
-    path: [CONCEPTS],
-    exact: false,
-  });
-
-  const isConceptsVersionMatch = matchPath(location.pathname, {
-    path: [CONCEPT_VERSION],
-    exact: false,
-  });
+  const isConceptsMatch = matchPath(CONCEPTS, location.pathname);
+  const isConceptsVersionMatch = matchPath(CONCEPT_VERSION, location.pathname);
 
   if (isConceptsVersionMatch) {
     return conceptSubscope === null || mainSubscopes.includes(conceptSubscope);
@@ -190,7 +183,7 @@ export const GlossaryMenu = ({ bgSubscopes, rootSubscopes }) => {
   const { formatMessage } = useIntl();
 
   const conceptSubscope = useSelector(getConceptSubscope);
-  const conceptStatus = useSelector(getConceptStatus);
+  const conceptStatus = useSelector((state) => state.concept?.status ?? null);
 
   const authorized = useAuthorized([
     "business_glossary_view",

package/src/components/GrantMenu.js

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

package/src/components/GroupActions.js

@@ -1,21 +1,21 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Dropdown } from "semantic-ui-react";
 
-export const GroupActions = ({ availableActions, direction, disabled }) => (
-  <Dropdown
-    icon="ellipsis vertical"
-    className="button icon group-actions"
-    floating
-    disabled={disabled}
-    options={availableActions}
-    direction={direction}
-  />
-);
-
-GroupActions.defaultProps = {
-  direction: "left",
-  disabled: false,
+export const GroupActions = ({
+  availableActions,
+  direction = "left",
+  disabled,
+}) => {
+  return (
+    <Dropdown
+      icon="ellipsis vertical"
+      className="button icon group-actions"
+      floating
+      disabled={disabled}
+      options={availableActions}
+      direction={direction}
+    />
+  );
 };
 
 GroupActions.propTypes = {

package/src/components/Hierarchy.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Icon, Grid, Label, Input, Form } from "semantic-ui-react";
@@ -37,7 +37,6 @@ const ListHierarchyItem = ({
         }}
         onClick={() => removeNode(id)}
       />
-
       <div
         style={{
           display: "flex",
@@ -80,8 +79,8 @@ const ListHierarchyItem = ({
                       editionStatus == "dirty"
                         ? "orange"
                         : editionStatus == "added"
-                        ? "green"
-                        : null
+                          ? "green"
+                          : null
                     }
                   />
                 </Label>
@@ -94,8 +93,8 @@ const ListHierarchyItem = ({
                       editionStatus == "dirty"
                         ? "orange"
                         : editionStatus == "added"
-                        ? "green"
-                        : null
+                          ? "green"
+                          : null
                     }
                   />
                 </Label>
@@ -117,8 +116,8 @@ const ListHierarchyItem = ({
                     editionStatus == "dirty"
                       ? "orange"
                       : editionStatus == "added"
-                      ? "green"
-                      : null
+                        ? "green"
+                        : null
                   }
                   name={expanded ? "dot circle outline" : "circle"}
                 />
@@ -127,7 +126,6 @@ const ListHierarchyItem = ({
             <input />
           </Input>
         </div>
-
         <div className="description_wrapper">
           <DescriptionInput
             disabled={!isEditionMode}
@@ -188,7 +186,6 @@ const ListHierarchy = ({
         value={newNodeName}
       >
         <input />
-
         {!newNodeName || newNodeName == "" ? null : (
           <Label
             style={{ cursor: "pointer" }}

package/src/components/HierarchyFilterDropdown.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
-import { useHierarchy } from "@truedat/df/hooks/useHierarchies";
+import { useHierarchy } from "@truedat/core/hooks/useHierarchies";
 import {
   getHierarchyOptions,
   getKeyAndParents,

package/src/components/HierarchyNodeFinder.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { Grid, Header, Icon, Segment } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
@@ -10,7 +10,7 @@ import DomainSelector from "./DomainSelector";
 import NodeOpenActions from "./NodeOpenActions";
 
 const HierarchyNodeFinder = ({ nodes = [], idSelectedNode }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const [allOpen, setAllOpen] = useState(false);
 
   const handleToggleAllNodes = () => {
@@ -18,7 +18,7 @@ const HierarchyNodeFinder = ({ nodes = [], idSelectedNode }) => {
   };
 
   const handleNodeClick = (e, { value }) => {
-    if (value) history.push(linkTo.DOMAIN({ id: value }));
+    if (value) navigate(linkTo.DOMAIN({ id: value }));
   };
 
   return (

package/src/components/HierarchySelector.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
-import { useHierarchy } from "@truedat/df/hooks/useHierarchies";
+import { useHierarchy } from "@truedat/core/hooks/useHierarchies";
 import { accentInsensitivePathOrder } from "../services/sort";
 import { stratify, flatten } from "../services/tree";
 import TreeSelector from "./TreeSelector";

package/src/components/HistoryBackButton.js

@@ -1,10 +1,10 @@
-import React from "react";
 import PropTypes from "prop-types";
-import { useHistory, Link } from "react-router-dom";
+import { Link } from "react-router";
+import { useNavigate } from "react-router";
 import { Button } from "semantic-ui-react";
 
 export const HistoryBackButton = ({ content, disabled, secondary = true }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   return (
     <Button
       as={Link}
@@ -12,9 +12,9 @@ export const HistoryBackButton = ({ content, disabled, secondary = true }) => {
       content={content}
       disabled={disabled}
       secondary={secondary}
-      onClick={e => {
+      onClick={(e) => {
         e.preventDefault();
-        history.goBack();
+        navigate(-1);
       }}
     />
   );
@@ -23,7 +23,7 @@ export const HistoryBackButton = ({ content, disabled, secondary = true }) => {
 HistoryBackButton.propTypes = {
   content: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   disabled: PropTypes.bool,
-  secondary: PropTypes.bool
+  secondary: PropTypes.bool,
 };
 
 export default HistoryBackButton;

package/src/components/IngestMenu.js

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

package/src/components/LanguagesTabs.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { Tab } from "semantic-ui-react";
 import { useIntl } from "react-intl";
@@ -13,9 +13,9 @@ const LanguagesTabs = ({
   const [translationTabs, setTranslationTabs] = useState([]);
   const [initLang, setInitLang] = useState(selectedLang);
   const { formatMessage } = useIntl();
-
   // Create the translation tabs
-  useMemo(() => {
+
+  useEffect(() => {
     const updatedTranslationTabs = [
       // First add required languages
       ...requiredLangs
@@ -44,7 +44,7 @@ const LanguagesTabs = ({
     setTranslationTabs(updatedTranslationTabs);
     initSelectedLang?.lang !== initLang && setInitLang(initSelectedLang?.lang);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [requiredLangs, altLangs, formatMessage]);
+  }, [requiredLangs, altLangs]);
 
   useEffect(() => {
     initLang !== selectedLang && onLangChange(initLang);

package/src/components/LineageMenu.js

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

package/src/components/Loading.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Loader, Message } from "semantic-ui-react";
 
@@ -11,7 +10,7 @@ export const Loading = ({ inline, error }) =>
 
 Loading.propTypes = {
   inline: PropTypes.string,
-  error: PropTypes.object
+  error: PropTypes.object,
 };
 
 export default Loading;

package/src/components/MembersMenu.js

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

package/src/components/ModalSaveFilter.js

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

package/src/components/NodeOpenActions.js

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

package/src/components/OptionGroup.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { Dropdown } from "semantic-ui-react";
 import { lowerDeburr } from "../services/sort";
@@ -121,7 +121,6 @@ export const OptionGroup = ({
   return (
     <>
       {label && <label>{label}</label>}
-
       <Dropdown
         multiple={multiple}
         options={flattenedOptions}

package/src/components/OptionModal.js

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

package/src/components/Pagination.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Pagination as SemanticPagination } from "semantic-ui-react";
 

package/src/components/QualityMenu.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";

package/src/components/QxMenu.js

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

package/src/components/Redirector.js

@@ -1,14 +1,14 @@
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Redirect } from "react-router-dom";
+import { Navigate } from "react-router";
 import { clearRedirect } from "../routines";
 
 export const Redirector = ({ redirect, clearRedirect }) => {
   useEffect(() => {
     clearRedirect();
   }, [clearRedirect]);
-  return <Redirect to={{ pathname: redirect }} />;
+  return <Navigate to={{ pathname: redirect }} />;
 };
 
 Redirector.propTypes = {

package/src/components/ResourceMember.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useIntl } from "react-intl";
 import { Card, Form, Icon, Button, Popup } from "semantic-ui-react";
 import PropTypes from "prop-types";
@@ -164,7 +164,6 @@ export const ResourceMember = ({
               }}
             />
           </Card.Description>
-
           <ConfirmModal
             header={formatMessage({ id: "domain.members.delete" })}
             content={formatMessage({ id: "domain.members.delete.question" })}

package/src/components/ResourceMembers.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { Fragment, useState } from "react";
 import PropTypes from "prop-types";
 import { Card, Header, Input, Message, Grid } from "semantic-ui-react";
 import { useIntl } from "react-intl";
@@ -73,7 +73,7 @@ export const ResourceMembers = ({ type, id }) => {
       )}
       {groupedResourceMembers.map(([groupName, members], groupIndex) => {
         return (
-          <React.Fragment key={`fragment_${groupIndex}`}>
+          <Fragment key={`fragment_${groupIndex}`}>
             <Header as="h3" key={`group_${groupIndex}`} dividing>
               {groupName}
             </Header>
@@ -89,7 +89,7 @@ export const ResourceMembers = ({ type, id }) => {
                 )
               )}
             </Card.Group>
-          </React.Fragment>
+          </Fragment>
         );
       })}
     </>

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;