@truedat/bg 7.5.8 → 7.5.10

package/src/concepts/components/ConceptRoutes.js

@@ -1,10 +1,11 @@
 import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { Route, Switch } from "react-router-dom";
+import { Route, useParams, Routes } from "react-router";
 import { connect } from "react-redux";
-import { Unauthorized } from "@truedat/core/components";
-import { useAuthorized } from "@truedat/core/hooks";
+import { ProtectedRoute } from "@truedat/core/router";
+// import { Unauthorized } from "@truedat/core/components";
+// import { useAuthorized } from "@truedat/core/hooks";
 import {
   CONCEPT_EDIT,
   CONCEPT_LINKS_MANAGEMENT,
@@ -23,7 +24,7 @@ import {
   CONCEPTS,
 } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
-import { getSidemenuGlossarySubscopes } from "../selectors/getSidemenuGlossarySubscopes";
+import { getSidemenuGlossarySubscopes } from "@truedat/core/selectors/getSidemenuGlossarySubscopes";
 import Concept from "./Concept";
 import ConceptCrumbs from "./ConceptCrumbs";
 import ConceptEdit from "./ConceptEdit";
@@ -36,18 +37,47 @@ import ConceptsBulkUpdate from "./ConceptsBulkUpdate";
 import ConceptSubscriptionLoader from "./ConceptSubscriptionLoader";
 import ConceptsUploadEvents from "./ConceptsUploadEvents";
 
-const RelationTagsLoader = React.lazy(() =>
-  import("@truedat/lm/components/RelationTagsLoader")
+const RelationTagsLoader = React.lazy(
+  () => import("@truedat/lm/components/RelationTagsLoader")
 );
 
-const TemplatesLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplatesLoader")
+const TemplatesLoader = React.lazy(
+  () => import("@truedat/core/components/TemplatesLoader")
 );
 
-const RelationsGraphLoader = React.lazy(() =>
-  import("@truedat/lm/components/RelationsGraphLoader")
+const RelationsGraphLoader = React.lazy(
+  () => import("@truedat/lm/components/RelationsGraphLoader")
 );
 
+const ConceptsComponent = ({ filters, viewKey }) => {
+  const { formatMessage } = useIntl();
+  const { subscope = "" } = useParams();
+  const baseId = `concepts.${subscope || "default"}.${viewKey}`;
+  const showCreate = viewKey === "pending";
+  const showUpload = viewKey === "pending";
+
+  return (
+    <Concepts
+      defaultFilters={{
+        ...filters,
+        "template.subscope": subscope ? [subscope] : undefined,
+      }}
+      header={formatMessage({ id: `${baseId}.header` })}
+      subheader={formatMessage({ id: `${baseId}.subheader` })}
+      icon={formatMessage({
+        id: `concepts.${subscope}.icon`,
+        defaultMessage: "tags",
+      })}
+      create={showCreate}
+      upload={showUpload}
+    />
+  );
+};
+ConceptsComponent.propTypes = {
+  filters: PropTypes.object,
+  key: PropTypes.string,
+};
+
 const ConceptRoutes = ({
   concept,
   conceptLoaded,
@@ -55,239 +85,246 @@ const ConceptRoutes = ({
   sidemenuGlossarySubscopes,
 }) => {
   const { formatMessage } = useIntl();
-  const authorized = useAuthorized([
-    "business_glossary_view",
-    "business_glossary_management",
-  ]);
-  if (!authorized) {
-    return <Unauthorized />;
-  }
-
-  const renderConceptsComponent = (props, filters, key) => {
-    const subscope = _.get("match.params.subscope", props) || "";
-    const baseId = `concepts.${subscope || "default"}.${key}`;
-
-    const showCreate = key === "pending";
-    const showUpload = key === "pending";
-
-    return (
-      <Concepts
-        defaultFilters={{
-          ...filters,
-          "template.subscope": subscope ? [subscope] : undefined,
-        }}
-        header={formatMessage({ id: `${baseId}.header` })}
-        subheader={formatMessage({ id: `${baseId}.subheader` })}
-        icon={formatMessage({
-          id: `concepts.${subscope}.icon`,
-          defaultMessage: "tags",
-        })}
-        create={showCreate}
-        upload={showUpload}
-      />
-    );
-  };
+  // const authorized = useAuthorized([
+  //   "business_glossary_view",
+  //   "business_glossary_management",
+  // ]);
+  // if (!authorized) {
+  //   return <Unauthorized />;
+  // }
 
   return (
-    <Switch>
-      <Route
-        exact
-        path={CONCEPTS_BULK_UPLOAD_EVENTS}
-        render={() => <ConceptsUploadEvents />}
-      />
-      <Route
-        exact
-        path={CONCEPTS_SIDEMENU_MANAGEMENT_UPLOADS}
-        render={() => <ConceptsUploadEvents />}
-      />
-
-      <Route
-        exact
-        path={CONCEPTS_SIDEMENU_MANAGEMENT_LINKS}
-        render={() => (
-          <>
-            <RelationTagsLoader />
-            <ConceptsLinksManagement
-              header={formatMessage({ id: "concepts.header.linksManager" })}
-              subheader={formatMessage({
-                id: "concepts.subheader.linksManager",
-              })}
-              icon={formatMessage({
-                id: "concepts.header.linksManager.icon",
-                defaultMessage: "linkify",
-              })}
-            />
-          </>
-        )}
-      />
-
+    <Routes>
       <Route
-        exact
-        path={CONCEPT_LINKS_MANAGEMENT}
-        render={() => (
-          <>
-            <RelationTagsLoader />
-            <ConceptsLinksManagement
-              header={formatMessage({ id: "concepts.header.linksManager" })}
-              subheader={formatMessage({
-                id: "concepts.subheader.linksManager",
-              })}
+        path="concepts"
+        element={
+          <ProtectedRoute
+            authorization={[
+              "business_glossary_view",
+              "business_glossary_management",
+            ]}
+          />
+        }
+      >
+        <Route
+          // CONCEPTS = "/concepts";
+          index
+          element={
+            <Concepts
+              defaultFilters={{
+                status: ["published"],
+                "template.subscope": "",
+              }}
+              header={formatMessage({ id: "concepts.header" })}
+              subheader={formatMessage({ id: "concepts.subheader.view" })}
               icon={formatMessage({
-                id: "concepts.header.linksManager.icon",
-                defaultMessage: "linkify",
+                id: "concepts.header.icon",
+                defaultMessage: "tags",
               })}
             />
-          </>
-        )}
-      />
-
-      <Route
-        exact
-        path={CONCEPTS_PENDING}
-        render={(routeProps) =>
-          authorized ? (
-            renderConceptsComponent(
-              routeProps,
-              {
+          }
+        />
+        <Route
+          // CONCEPTS_PENDING = "/concepts/pending";
+          path="pending"
+          element={
+            <ConceptsComponent
+              viewKey="pending"
+              filters={{
                 status: ["pending_approval", "draft", "rejected"],
                 "mustnot.template.subscope": sidemenuGlossarySubscopes,
-              },
-              "pending"
-            )
-          ) : (
-            <Unauthorized />
-          )
-        }
-      />
-
-      <Route
-        exact
-        path={CONCEPTS_DEPRECATED}
-        render={(routeProps) =>
-          renderConceptsComponent(
-            routeProps,
-            {
-              status: ["deprecated"],
-              "mustnot.template.subscope": sidemenuGlossarySubscopes,
-            },
-            "deprecated"
-          )
-        }
-      />
+              }}
+            />
+          }
+        />
+        <Route
+          // CONCEPTS_DEPRECATED = "/concepts/deprecated";
+          path="deprecated"
+          element={
+            <ConceptsComponent
+              viewKey="deprecated"
+              filters={{
+                status: ["deprecated"],
+                "mustnot.template.subscope": sidemenuGlossarySubscopes,
+              }}
+            />
+          }
+        />
+        <Route
+          // CONCEPTS_NEW = "/concepts/new";
+          path="new"
+          element={
+            <>
+              <ConceptCrumbs conceptAction="concepts.actions.create" />
+              <ConceptCreate />
+            </>
+          }
+        />
+        <Route
+          // CONCEPTS_BULK_UPDATE = "/concepts/bulk_update";
+          path="bulk_update"
+          element={
+            <>
+              <ConceptCrumbs conceptAction="actions.update" />
+              <TemplatesLoader scope="bg" />
+              {templatesLoaded && <ConceptsBulkUpdate />}
+            </>
+          }
+        />
+        <Route
+          // CONCEPTS_BULK_UPLOAD_EVENTS = "/concepts/management/bulk_upload_event";
+          path="management"
+        >
+          <Route
+            //  CONCEPTS_BULK_UPLOAD_EVENTS = "/concepts/management/bulk_upload_event";
+            path="bulk_upload_event"
+            element={<ConceptsUploadEvents />}
+          />
 
-      <Route
-        exact
-        path={CONCEPTS_SUBSCOPE}
-        render={(routeProps) =>
-          renderConceptsComponent(routeProps, { status: ["published"] }, "main")
-        }
-      />
-      <Route
-        exact
-        path={CONCEPTS_SIDEMENU_SUBSCOPE}
-        render={(routeProps) =>
-          renderConceptsComponent(routeProps, { status: ["published"] }, "main")
-        }
-      />
-      <Route
-        exact
-        path={CONCEPTS_SIDEMENU_SUBSCOPE_PENDING}
-        render={(routeProps) =>
-          renderConceptsComponent(
-            routeProps,
-            { status: ["pending_approval", "draft", "rejected"] },
-            "pending"
-          )
-        }
-      />
-      <Route
-        exact
-        path={CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED}
-        render={(routeProps) =>
-          renderConceptsComponent(
-            routeProps,
-            { status: ["deprecated"] },
-            "deprecated"
-          )
-        }
-      />
-      <Route
-        exact
-        path={CONCEPT_EDIT}
-        render={() => (
-          <>
-            <ConceptCrumbs conceptAction="concepts.actions.edit" />
-            <TemplatesLoader scope="bg" />
-            <ConceptLoader />
-            {conceptLoaded && templatesLoaded ? <ConceptEdit /> : null}
-          </>
-        )}
-      />
-      <Route
-        path={CONCEPT_VERSION}
-        render={() => (
-          <>
-            <ConceptLoader />
-            <RelationTagsLoader />
-            {conceptLoaded && (
+          <Route
+            // CONCEPT_LINKS_MANAGEMENT = "/concepts/management/links";
+            path="links"
+            element={
               <>
-                <ConceptSubscriptionLoader />
-                <RelationsGraphLoader
-                  resource_id={concept?.business_concept_id}
+                <RelationTagsLoader />
+                <ConceptsLinksManagement
+                  header={formatMessage({ id: "concepts.header.linksManager" })}
+                  subheader={formatMessage({
+                    id: "concepts.subheader.linksManager",
+                  })}
+                  icon={formatMessage({
+                    id: "concepts.header.linksManager.icon",
+                    defaultMessage: "linkify",
+                  })}
                 />
-                <Concept />
               </>
-            )}
-          </>
-        )}
-      />
-      <Route
-        exact
-        path={CONCEPTS_NEW}
-        render={() => (
-          <>
-            <ConceptCrumbs conceptAction="concepts.actions.create" />
-            <ConceptCreate />
-          </>
-        )}
-      />
-      <Route
-        exact
-        path={CONCEPTS_BULK_UPDATE}
-        render={() => (
-          <>
-            <ConceptCrumbs conceptAction="actions.update" />
-            <TemplatesLoader scope="bg" />
-            {templatesLoaded && <ConceptsBulkUpdate />}
-          </>
-        )}
-      />
-      <Route
-        exact
+            }
+          />
+        </Route>
+
+        <Route
+          // CONCEPT_VERSION = "/concepts/:business_concept_id/versions/:id";
+          path=":business_concept_id/versions/:id/*"
+        >
+          <Route
+            // CONCEPT_EDIT = "/concepts/:business_concept_id/versions/:id/edit";
+            path="edit"
+            element={
+              <>
+                <ConceptCrumbs conceptAction="concepts.actions.edit" />
+                <TemplatesLoader scope="bg" />
+                <ConceptLoader />
+                {conceptLoaded && templatesLoaded ? <ConceptEdit /> : null}
+              </>
+            }
+          />
+          <Route
+            // CONCEPT_VERSION = "/concepts/:business_concept_id/versions/:id";
+            path="*"
+            element={
+              <>
+                <ConceptLoader />
+                <RelationTagsLoader />
+                {conceptLoaded && (
+                  <>
+                    <ConceptSubscriptionLoader />
+                    <RelationsGraphLoader
+                      resource_id={concept?.business_concept_id}
+                    />
+                    <Concept />
+                  </>
+                )}
+              </>
+            }
+          />
+        </Route>
+
+        <Route
+          // CONCEPTS_SUBSCOPE = "/concepts/subscope/:subscope";
+          path="subscope/:subscope"
+          element={
+            <ConceptsComponent
+              viewKey="main"
+              filters={{ status: ["published"] }}
+            />
+          }
+        />
+      </Route>
+
+      {/* <Route
         path={CONCEPTS_NEW}
-        render={() => (
+        element={
           <>
             <ConceptCrumbs conceptAction="concepts.actions.create" />
             <ConceptCreate />
           </>
-        )}
-      />
-      <Route
-        exact
-        path={CONCEPTS}
-        render={() => (
-          <Concepts
-            defaultFilters={{ status: ["published"], "template.subscope": "" }}
-            header={formatMessage({ id: "concepts.header" })}
-            subheader={formatMessage({ id: "concepts.subheader.view" })}
-            icon={formatMessage({
-              id: "concepts.header.icon",
-              defaultMessage: "tags",
-            })}
-          />
-        )}
-      />
-    </Switch>
+        }
+      /> */}
+
+      <Route path="glossaryManagement">
+        <Route
+          // CONCEPTS_SIDEMENU_MANAGEMENT_UPLOADS =  "/glossaryManagement/uploads";
+          path="uploads"
+          element={<ConceptsUploadEvents />}
+        />
+        <Route
+          // CONCEPTS_SIDEMENU_MANAGEMENT_LINKS = "/glossaryManagement/links";
+          path="links"
+          element={
+            <>
+              <RelationTagsLoader />
+              <ConceptsLinksManagement
+                header={formatMessage({ id: "concepts.header.linksManager" })}
+                subheader={formatMessage({
+                  id: "concepts.subheader.linksManager",
+                })}
+                icon={formatMessage({
+                  id: "concepts.header.linksManager.icon",
+                  defaultMessage: "linkify",
+                })}
+              />
+            </>
+          }
+        />
+      </Route>
+
+      <Route path="glossarySubscope">
+        <Route
+          // CONCEPTS_SIDEMENU_SUBSCOPE = "/glossarySubscope/:subscope/published";
+          path=":subscope/published"
+          element={
+            <ConceptsComponent
+              viewKey="main"
+              filters={{ status: ["published"] }}
+            />
+          }
+        />
+
+        <Route
+          //  CONCEPTS_SIDEMENU_SUBSCOPE_PENDING ="/glossarySubscope/:subscope/pending";
+          path=":subscope/pending"
+          element={
+            <ConceptsComponent
+              viewKey="pending"
+              filters={{ status: ["pending_approval", "draft", "rejected"] }}
+            />
+          }
+        />
+
+        <Route
+          //  CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED = "/glossarySubscope/:subscope/deprecated";
+          path=":subscope/deprecated"
+          element={
+            <ConceptsComponent
+              viewKey="deprecated"
+              filters={{ status: ["deprecated"] }}
+            />
+          }
+        />
+      </Route>
+
+      <Route path="*" element={null} />
+    </Routes>
   );
 };
 

package/src/concepts/components/ConceptRow.js

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

package/src/concepts/components/ConceptSubscription.js

@@ -1,16 +1,16 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect, Suspense } from "react";
+import { lazy, useState, useEffect, Suspense } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Popup } from "semantic-ui-react";
 import {
   createSubscription,
   deleteSubscription,
-  updateSubscription
+  updateSubscription,
 } from "@truedat/core/routines";
 
-const SubscriptionWatchForm = React.lazy(() =>
-  import("@truedat/audit/components/SubscriptionWatchForm")
+const SubscriptionWatchForm = lazy(
+  () => import("@truedat/audit/components/SubscriptionWatchForm")
 );
 
 export const ConceptSubscription = ({
@@ -19,7 +19,7 @@ export const ConceptSubscription = ({
   subscriptionUpdating,
   createSubscription,
   updateSubscription,
-  deleteSubscription
+  deleteSubscription,
 }) => {
   const [subscriptionField, setSubscription] = useState(searchSubscription);
 
@@ -37,7 +37,7 @@ export const ConceptSubscription = ({
     "relation_deleted",
     "concept_rejected",
     "concept_rejection_canceled",
-    "concept_deprecated"
+    "concept_deprecated",
   ];
 
   const className = _.isEmpty(searchSubscription) ? "" : "secondary";
@@ -49,21 +49,22 @@ export const ConceptSubscription = ({
         scope: {
           resource_type: "concept",
           resource_id: _.prop("business_concept_id")(concept),
-          events
-        }
+          events,
+        },
       },
-      concept
+      concept,
     };
     _.prop("id")(subscriptionField)
       ? updateSubscription(payload)
       : createSubscription(payload);
   };
+
   const handleDelete = () => {
     const payload = {
       subscription: subscriptionField,
       resource_id: _.prop("business_concept_id")(concept),
       resource_type: "concept",
-      concept
+      concept,
     };
     _.prop("id")(subscriptionField) && deleteSubscription(payload);
   };
@@ -109,23 +110,23 @@ ConceptSubscription.propTypes = {
   subscriptionUpdating: PropTypes.bool,
   createSubscription: PropTypes.func,
   updateSubscription: PropTypes.func,
-  deleteSubscription: PropTypes.func
+  deleteSubscription: PropTypes.func,
 };
 
 export const mapStateToProps = ({
   concept,
   searchSubscription,
-  subscriptionUpdating
+  subscriptionUpdating,
 }) => ({
   concept,
   searchSubscription,
-  subscriptionUpdating
+  subscriptionUpdating,
 });
 
 const mapDispatchToProps = {
   createSubscription,
   updateSubscription,
-  deleteSubscription
+  deleteSubscription,
 };
 
 export default connect(

package/src/concepts/components/ConceptSummary.js

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