@truedat/bg 7.5.9 → 7.5.10

package/src/concepts/components/ConceptTabPane.js

@@ -1,6 +1,5 @@
-import React from "react";
-import { Switch, Route } from "react-router-dom";
-import { ErrorBoundary } from "@truedat/core/components";
+import { lazy } from "react";
+import { Route, Routes } from "react-router";
 import {
   CONCEPT_ARCHIVE,
   CONCEPT_EVENTS,
@@ -17,47 +16,43 @@ import ConceptArchive from "./ConceptArchive";
 import ConceptDetails from "./ConceptDetails";
 import Events from "./Events";
 
-const ConceptRules = React.lazy(() =>
-  import("@truedat/dq/components/ConceptRules")
-);
+const ConceptRules = lazy(() => import("@truedat/dq/components/ConceptRules"));
 
-const NewRule = React.lazy(() => import("@truedat/dq/components/NewRule"));
+const NewRule = lazy(() => import("@truedat/dq/components/NewRule"));
 
 export const ConceptTabPane = ({ selectedContent, lang }) => (
-  <ErrorBoundary>
-    <Switch>
-      <Route
-        path={CONCEPT_VERSION}
-        exact
-        render={() => (
-          <ConceptDetails selectedContent={selectedContent} lang={lang} />
-        )}
-      />
-      <Route
-        path={CONCEPT_LINKS_STRUCTURES}
-        render={() => <ConceptRelationsRoutes />}
-      />
-      <Route
-        path={CONCEPT_LINKS_CONCEPTS}
-        render={() => <ConceptRelationsRoutes />}
-      />
-      <Route
-        path={CONCEPT_LINKS_IMPLEMENTATIONS}
-        render={() => <ConceptRelationsRoutes />}
-      />
-      <Route
-        path={CONCEPT_RULES}
-        render={() => (
-          <Switch>
-            <Route path={CONCEPT_RULES_NEW} render={() => <NewRule />} />
-            <Route render={() => <ConceptRules />} />
-          </Switch>
-        )}
-      />
-      <Route path={CONCEPT_ARCHIVE} render={() => <ConceptArchive />} />
-      <Route path={CONCEPT_EVENTS} render={() => <Events />} />
-    </Switch>
-  </ErrorBoundary>
+  <Routes>
+    <Route
+      // "/concepts/:business_concept_id/versions/:id";
+      index
+      element={<ConceptDetails selectedContent={selectedContent} lang={lang} />}
+    />
+
+    <Route
+      // "/concepts/:business_concept_id/versions/:id/archive";
+      path="archive"
+      element={<ConceptArchive />}
+    />
+
+    <Route
+      // "/concepts/:business_concept_id/versions/:id/events";
+      path="events"
+      element={<Events />}
+    />
+
+    <Route
+      //  "/concepts/:business_concept_id/versions/:id/links/structures";
+      path="links/*"
+      element={<ConceptRelationsRoutes />}
+    />
+    <Route
+      // "/concepts/:business_concept_id/versions/:id/rules"
+      path="rules"
+    >
+      <Route index element={<ConceptRules />} />
+      <Route path="new" element={<NewRule />} />
+    </Route>
+  </Routes>
 );
 
 ConceptTabPane.propTypes = {

package/src/concepts/components/ConceptTabs.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { Menu } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { connect } from "react-redux";
 import { FormattedMessage } from "react-intl";
 import { useActiveRoute } from "@truedat/core/hooks";
@@ -27,7 +26,6 @@ export const ConceptTabs = ({
   const archiveActive = useActiveRoute(CONCEPT_ARCHIVE);
   const conceptActive = useActiveRoute({
     path: CONCEPT_VERSION,
-    exact: true,
   });
   const conceptLinksActive = useActiveRoute(CONCEPT_LINKS_CONCEPTS);
   const eventsActive = useActiveRoute(CONCEPT_EVENTS);
@@ -91,7 +89,6 @@ export const ConceptTabs = ({
       >
         <FormattedMessage id="tabs.bg.history" />
       </Menu.Item>
-
       <Menu.Item
         active={eventsActive}
         as={Link}

package/src/concepts/components/ConceptTaxonomy.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { List, Header, Segment } from "semantic-ui-react";
@@ -12,10 +11,9 @@ export const ConceptTaxonomy = ({ domainPath }) =>
   _.negate(_.isEmpty)(domainPath) && (
     <Segment>
       <Header as="h3" dividing>
-        <FormattedMessage id="concepts.taxonomy" defaultMessage="Taxonomía" />
+        <FormattedMessage id="concepts.taxonomy" />
       </Header>
       <ConceptManageDomainPopup conceptAction="concepts.actions.edit" />
-
       <List horizontal>
         {_.map.convert({ cap: false })((domain, i) => (
           <DomainItem

package/src/concepts/components/Concepts.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Header, Icon, Segment } from "semantic-ui-react";
 import ConceptsPanel from "./ConceptsPanel";

package/src/concepts/components/ConceptsActions.js

@@ -1,10 +1,9 @@
 import { CONCEPTS_NEW } from "@truedat/core/routes";
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import React from "react";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Button } from "semantic-ui-react";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { downloadConcepts, uploadConcepts } from "../routines";
@@ -25,6 +24,7 @@ export const ConceptsActions = ({
   const createUrl = conceptsActions?.create ? CONCEPTS_NEW : null;
   const canAutoPublish = conceptsActions?.autoPublish && true;
   const { formatMessage, locale } = useIntl();
+
   return hidden ? null : (
     <div>
       {create && createUrl ? (
@@ -48,7 +48,6 @@ export const ConceptsActions = ({
           })}
         />
       ) : null}
-
       {upload ? <ConceptsUploadButton canAutoPublish={canAutoPublish} /> : null}
       {update ? <ConceptsUpdateButton /> : null}
     </div>

package/src/concepts/components/ConceptsBulkUpdate.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { lazy, useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { connect } from "react-redux";
@@ -23,9 +23,7 @@ import { useTemplate } from "@truedat/core/hooks";
 import { applyTemplateWithoutDefaults } from "@truedat/df/utils";
 import { bulkUpdate } from "../routines";
 
-const DynamicForm = React.lazy(() =>
-  import("@truedat/df/components/DynamicForm")
-);
+const DynamicForm = lazy(() => import("@truedat/df/components/DynamicForm"));
 
 const isEmptyValue = (value) => !_.isNumber(value) && _.isEmpty(value);
 const fieldsToOmit = ["_confidential"];
@@ -100,6 +98,7 @@ export const ConceptsBulkUpdate = ({
     setDomainsLoading(false);
     setDomains(domains);
   };
+
   const handleDomainSelected = (value) => {
     const domain = _.find({ id: value })(domains);
     if (domain && domain.id !== selectedDomain) {
@@ -165,7 +164,6 @@ export const ConceptsBulkUpdate = ({
           />
         </Header.Content>
       </Header>
-
       {validConcepts && conceptCount != 0 ? (
         <>
           <Header as="h4">
@@ -192,7 +190,6 @@ export const ConceptsBulkUpdate = ({
                 setTemplate={setTemplate}
               />
             ) : null}
-
             <ConfirmModal
               actions={actions(handleSubmit)}
               trigger={

package/src/concepts/components/ConceptsLabelResults.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { FormattedMessage } from "react-intl";
 import { Label } from "semantic-ui-react";
 import { useSearchContext } from "@truedat/core/search/SearchContext";

package/src/concepts/components/ConceptsLinkDecorator.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import ArrayDecorator from "@truedat/core/components/ArrayDecorator";
 

package/src/concepts/components/ConceptsLinksManagement.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { lazy, useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
@@ -11,16 +11,16 @@ import { pickConceptAttrs } from "../relations/components/ConceptRelationForm";
 import LinkedMessage from "./LinkedMessage";
 import ConceptLinksDropdownSelector from "./ConceptLinksDropdownSelector";
 
-const RelationsLoader = React.lazy(() =>
-  import("@truedat/lm/components/RelationsLoader")
+const RelationsLoader = lazy(
+  () => import("@truedat/lm/components/RelationsLoader")
 );
 
-const TagTypeDropdownSelector = React.lazy(() =>
-  import("@truedat/lm/components/TagTypeDropdownSelector")
+const TagTypeDropdownSelector = lazy(
+  () => import("@truedat/lm/components/TagTypeDropdownSelector")
 );
 
-const StructureSelector = React.lazy(() =>
-  import("@truedat/dd/components/StructureSelector")
+const StructureSelector = lazy(
+  () => import("@truedat/dd/components/StructureSelector")
 );
 
 const linksDefaultFilters = {
@@ -183,7 +183,6 @@ export const ConceptsLinksManagement = ({
                   <TagTypeDropdownSelector options={tagOptions} />
                 )}
               </Grid.Column>
-
               <Grid.Column width={8}>
                 {selectedSourceConcept || selectedTag ? (
                   <LinkedMessage

package/src/concepts/components/ConceptsPagination.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { Pagination } from "@truedat/core/components";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
 

package/src/concepts/components/ConceptsPanel.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Dimmer, Loader } from "semantic-ui-react";
@@ -31,9 +30,11 @@ export function ConceptsPanelContent({ subscope }) {
       <ConceptsActions {...actions} download={download(actions)} />
       <SearchWidget />
       <Dimmer.Dimmable dimmed={loading}>
-        <Dimmer active={loading} inverted>
-          <Loader />
-        </Dimmer>
+        {loading ? (
+          <Dimmer active inverted>
+            <Loader />
+          </Dimmer>
+        ) : null}
         <ConceptsLabelResults />
         <ConceptsTable subscope={subscope} />
         <ConceptsPagination />

package/src/concepts/components/ConceptsTable.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import { Table, Header, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { CONCEPTS_PENDING } from "@truedat/core/routes";
@@ -30,7 +29,7 @@ export const ConceptsTable = ({ columnsByScope, subscope }) => {
 
   const conceptColumns = columns.filter(
     (column) =>
-      _.last(CONCEPTS_PENDING.split("/")) === scope || column.name != "status"
+      _.last(CONCEPTS_PENDING.split("/")) === scope || column.name !== "status"
   );
 
   return (

package/src/concepts/components/ConceptsUpdateButton.js

@@ -1,8 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import { useDispatch } from "react-redux";
 import { Button, Popup } from "semantic-ui-react";
-import { useLocation, useHistory } from "react-router-dom";
+import { useLocation } from "react-router";
+import { useNavigate } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { useAuthorized } from "@truedat/core/hooks";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
@@ -24,7 +24,7 @@ const verifyTemplateSize = (template) => _.size(template) === 1;
 export const ConceptsUpdateButton = () => {
   const setBulkUpdateQuery = useDispatch();
 
-  const history = useHistory();
+  const navigate = useNavigate();
   const {
     allActiveFilters: conceptActiveFilters,
     count: conceptCount,
@@ -45,7 +45,7 @@ export const ConceptsUpdateButton = () => {
       ? CONCEPTS_BULK_UPDATE
       : null;
 
-  const navigate = () => {
+  const navigateToBulkUpdate = () => {
     setBulkUpdateQuery(
       bulkUpdateQuery({
         conceptCount,
@@ -53,7 +53,7 @@ export const ConceptsUpdateButton = () => {
         concepts: searchData?.data || [],
       })
     );
-    history.push(updateUrl + `?${pathNameWithoutSlash}` || "");
+    navigate(updateUrl + `?${pathNameWithoutSlash}` || "");
   };
 
   return authorized ? (
@@ -65,7 +65,7 @@ export const ConceptsUpdateButton = () => {
         <span className="button-update">
           <Button
             primary
-            onClick={navigate}
+            onClick={navigateToBulkUpdate}
             content={<FormattedMessage id="actions.update" />}
             disabled={_.isEmpty(updateUrl)}
           />

package/src/concepts/components/ConceptsUploadButton.js

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

package/src/concepts/components/ConceptsUploadEvents.js

@@ -1,5 +1,3 @@
-import React from "react";
-
 import { Header, Icon, Segment } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import ConceptsUploadEventsTable from "./ConceptsUploadEventsTable";

package/src/concepts/components/ConceptsUploadEventsTable.js

@@ -1,17 +1,13 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-
 import _ from "lodash/fp";
-
 import { FormattedMessage } from "react-intl";
 import { Table } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { columnDecorator } from "@truedat/core/services";
-
 import { useUploadEvents } from "../hooks/useUploadEvents";
 import { getConceptUploadEventColumns } from "../selectors";
-
 import "../styles/conceptsUploadEventColumns.less";
 
 const getColumnsWithData = (conceptsResults, columns) =>
@@ -37,7 +33,6 @@ const messagesImp = (data) => {
 const ConceptsUploadEventsTable = ({ getColumns }) => {
   const { formatMessage } = useIntl();
   const [eventExpandedIndex, setEventExpandedIndex] = useState(null);
-
   const { data, loading } = useUploadEvents();
 
   const events =
@@ -88,18 +83,16 @@ const ConceptsUploadEventsTable = ({ getColumns }) => {
         <Table sortable selectable>
           <Table.Header>
             <Table.Row>
-              {columns.map((column, i) => {
-                return (
-                  <Table.HeaderCell
-                    key={i}
-                    width={column.width}
-                    content={formatMessage({
-                      id: `concepts.upload.props.${column.name}`,
-                      defaultMessage: column.name,
-                    })}
-                  />
-                );
-              })}
+              {columns.map((column, i) => (
+                <Table.HeaderCell
+                  key={i}
+                  width={column.width}
+                  content={formatMessage({
+                    id: `concepts.upload.props.${column.name}`,
+                    defaultMessage: column.name,
+                  })}
+                />
+              ))}
             </Table.Row>
           </Table.Header>
           <Table.Body>
@@ -131,7 +124,7 @@ const ConceptsUploadEventsTable = ({ getColumns }) => {
                           <FormattedMessage
                             id={`concepts.upload.props.file_hash`}
                           />
-                          :&nbsp;{events[eventKey].file_hash}
+                          : {events[eventKey].file_hash}
                         </>
                       ) : null}
                       {columns.map((column, key) => (

package/src/concepts/components/DomainConcepts.js

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

package/src/concepts/components/EventRow.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/concepts/components/Events.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";
@@ -18,12 +17,12 @@ export const Events = ({ events, eventsLoading }) =>
 
 Events.propTypes = {
   events: PropTypes.array,
-  eventsLoading: PropTypes.bool
+  eventsLoading: PropTypes.bool,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   events: getParsedEvents(state),
-  eventsLoading: state.eventsLoading
+  eventsLoading: state.eventsLoading,
 });
 
 export default connect(mapStateToProps)(Events);

package/src/concepts/components/FieldGroupTable.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Table } from "semantic-ui-react";
 
@@ -13,7 +12,7 @@ const FieldValue = ({ field, value }, i) => (
 
 FieldValue.propTypes = {
   field: PropTypes.string,
-  value: PropTypes.string
+  value: PropTypes.string,
 };
 
 export const FieldGroupTable = ([groupName, fieldValues], i) => (

package/src/concepts/components/LinkedMessage.js

@@ -1,4 +1,3 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Message } from "semantic-ui-react";
@@ -27,29 +26,26 @@ const LinkedMessage = ({
     <Message success={status !== STATUS_PENDING} floating>
       <Message.Header>{messagesMap[status]}</Message.Header>
       <Message.List>
-        {selectedSourceConcept ? (
+        {selectedSourceConcept && (
           <Message.Item>
-            {formatMessage({ id: "conceptRelations.from" })}
-            {": "} {selectedSourceConcept.name}
+            {formatMessage({ id: "conceptRelations.from" })}:{" "}
+            {selectedSourceConcept.name}
           </Message.Item>
-        ) : null}
+        )}
         {selectedStructure ? (
           <Message.Item>
-            {formatMessage({ id: "conceptRelations.to" })}
-            {": "}
+            {formatMessage({ id: "conceptRelations.to" })}:{" "}
             {selectedStructure.name}
           </Message.Item>
         ) : selectedTargetConcept ? (
           <Message.Item>
-            {formatMessage({ id: "conceptRelations.to" })}
-            {": "}
+            {formatMessage({ id: "conceptRelations.to" })}:{" "}
             {selectedTargetConcept.name}
           </Message.Item>
         ) : null}
-        {selectedTag ? (
+        {selectedTag && (
           <Message.Item>
-            {formatMessage({ id: "conceptRelations.tag" })}
-            {": "}
+            {formatMessage({ id: "conceptRelations.tag" })}:{" "}
             {selectedLinkType === "structures"
               ? formatMessage({
                   id: selectedTag.text,
@@ -63,7 +59,7 @@ const LinkedMessage = ({
                   }),
                 })}
           </Message.Item>
-        ) : null}
+        )}
       </Message.List>
     </Message>
   );

package/src/concepts/components/SharedToDomains.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { Dimmer, List, Loader, Header, Segment } from "semantic-ui-react";
@@ -11,14 +10,16 @@ export const SharedToDomains = ({ loading, sharedTo }) => {
   return (
     _.negate(_.isEmpty)(sharedTo) && (
       <Dimmer.Dimmable dimmed={loading}>
-        <Dimmer active={loading} inverted>
-          <Loader />
-        </Dimmer>
+        {loading ? (
+          <Dimmer active inverted>
+            <Loader />
+          </Dimmer>
+        ) : null}
         <Segment>
           <Header as="h3" dividing>
             {formatMessage({
               id: "concept.sharedDomains.header",
-              defaultMessage: "Compartido con"
+              defaultMessage: "Compartido con",
             })}
           </Header>
           <List divided>
@@ -36,12 +37,12 @@ export const SharedToDomains = ({ loading, sharedTo }) => {
 
 SharedToDomains.propTypes = {
   loading: PropTypes.bool,
-  sharedTo: PropTypes.array
+  sharedTo: PropTypes.array,
 };
 
 const mapStateToProps = ({ savingSharedTo, sharedToDomains }) => ({
   loading: savingSharedTo,
-  sharedTo: sharedToDomains
+  sharedTo: sharedToDomains,
 });
 
 export default connect(mapStateToProps)(SharedToDomains);

package/src/concepts/components/SharedToDomainsPopup.js

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

package/src/concepts/components/SharedToForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { useState } from "react";
 import { connect } from "react-redux";
 import { useForm, Controller } from "react-hook-form";
 import { Button, Container, Form, Header } from "semantic-ui-react";
@@ -10,7 +10,7 @@ import { saveSharedTo } from "../routines";
 
 export const SharedToForm = ({ id, saveSharedTo, saving, sharedTo }) => {
   const { formatMessage } = useIntl();
-  const [loading, setLoading] = React.useState(true);
+  const [loading, setLoading] = useState(true);
   const { handleSubmit, control, formState } = useForm({
     mode: "all",
     defaultValues: {
@@ -22,10 +22,7 @@ export const SharedToForm = ({ id, saveSharedTo, saving, sharedTo }) => {
 
   return (
     <Container style={{ width: "400px" }}>
-      <Header
-        as="h2"
-        content={formatMessage({ id: "concept.sharedTo.header" })}
-      />
+      <Header as="h2" content={formatMessage({ id: "concept.sharedTo.header" })} />
       <Form loading={loading} onSubmit={handleSubmit(onSubmit)}>
         <Controller
           control={control}