@truedat/bg 6.3.3 → 6.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.3.3",
+  "version": "6.3.5",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.3.3",
+    "@truedat/test": "6.3.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,9 +86,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "6.3.3",
-    "@truedat/df": "6.3.3",
-    "@truedat/lm": "6.3.3",
+    "@truedat/core": "6.3.5",
+    "@truedat/df": "6.3.5",
+    "@truedat/lm": "6.3.5",
     "decode-uri-component": "^0.2.2",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "ee40175932833d26f2d0ca297ce5a3a26fb71cb2"
+  "gitHead": "2cacdf1fc99746cb4f8dca7d770662c0d96c5bb7"
 }

package/src/concepts/api.js

@@ -1,5 +1,7 @@
 const API_BUSINESS_CONCEPT_VERSION =
   "/api/business_concepts/:business_concept_id/versions/:id";
+const API_BUSINESS_CONCEPT_VERSIONS_ACTIONS =
+  "/api/business_concept_versions/actions";
 const API_BUSINESS_CONCEPT_VERSIONS_CSV = "/api/business_concept_versions/csv";
 const API_BUSINESS_CONCEPT_VERSIONS_XLSX =
   "/api/business_concept_versions/xlsx";
@@ -10,10 +12,6 @@ const API_BUSINESS_CONCEPT_VERSIONS_UPLOAD =
 const API_CONCEPT_ARCHIVE = "/api/business_concepts/:id/versions";
 const API_CONCEPT_FILTERS = "/api/business_concept_filters/search";
 const API_CONCEPT_SHARED_DOMAINS = "/api/business_concepts/:id/shared_domains";
-const API_CONCEPT_USER_FILTERS = "/api/business_concept_user_filters";
-const API_CONCEPT_USER_FILTER = "/api/business_concept_user_filters/:id";
-const API_GET_CONCEPT_USER_FILTERS =
-  "/api/business_concept_user_filters/user/me";
 const API_BUSINESS_CONCEPT_BULK_UPDATE =
   "/api/business_concept_versions/bulk_update";
 const API_BUSINESS_CONCEPT_BULK_UPLOAD =
@@ -23,6 +21,7 @@ const API_BUSINESS_CONCEPT_SET_CONFIDENTIAL =
 
 export {
   API_BUSINESS_CONCEPT_VERSION,
+  API_BUSINESS_CONCEPT_VERSIONS_ACTIONS,
   API_BUSINESS_CONCEPT_VERSIONS_CSV,
   API_BUSINESS_CONCEPT_VERSIONS_XLSX,
   API_BUSINESS_CONCEPT_VERSIONS_SEARCH,
@@ -30,9 +29,6 @@ export {
   API_CONCEPT_ARCHIVE,
   API_CONCEPT_FILTERS,
   API_CONCEPT_SHARED_DOMAINS,
-  API_CONCEPT_USER_FILTER,
-  API_CONCEPT_USER_FILTERS,
-  API_GET_CONCEPT_USER_FILTERS,
   API_BUSINESS_CONCEPT_BULK_UPDATE,
   API_BUSINESS_CONCEPT_BULK_UPLOAD,
   API_BUSINESS_CONCEPT_SET_CONFIDENTIAL,

package/src/concepts/components/ConceptActions.js

@@ -230,6 +230,7 @@ const hiddenActions = [
   "bulk_update",
   "set_confidential",
   "update_domain",
+  "actions",
 ];
 
 const editUrl = (conceptActions, concept) =>

package/src/concepts/components/ConceptCreate.js

@@ -8,12 +8,14 @@ import {
   formatLocales,
 } from "@truedat/core/services/i18nContent";
 import { conceptAction } from "../routines";
+import { useConceptVersionsActions } from "../hooks/useConcepts";
 import ConceptForms from "./ConceptForms";
 
 const actionKey = "create";
 
-const ConceptCreate = ({ action, conceptActionLoading, conceptAction }) => {
+const ConceptCreate = ({ conceptActionLoading, conceptAction }) => {
   const { locales, loading: localesLoading } = useLocales(false);
+  const { actions: conceptsActions } = useConceptVersionsActions();
 
   const [i18nConcept, setI18nConcept] = useState({});
   const [domainId, setDomainId] = useState();
@@ -55,6 +57,8 @@ const ConceptCreate = ({ action, conceptActionLoading, conceptAction }) => {
     if (i18nConceptInit) setI18nConcept(i18nConceptInit);
   }
 
+  const action = _.prop(actionKey)(conceptsActions);
+
   const langs = formatLocales(locales);
 
   const handleSubmit = (e) => {
@@ -104,13 +108,11 @@ const ConceptCreate = ({ action, conceptActionLoading, conceptAction }) => {
 };
 
 ConceptCreate.propTypes = {
-  action: PropTypes.object,
   conceptAction: PropTypes.func,
   conceptActionLoading: PropTypes.string,
 };
 
-const mapStateToProps = ({ conceptActionLoading, conceptsActions }) => ({
-  action: _.prop(actionKey)(conceptsActions),
+const mapStateToProps = ({ conceptActionLoading }) => ({
   conceptActionLoading,
 });
 

package/src/concepts/components/ConceptRoutes.js

@@ -21,14 +21,12 @@ import { useIntl } from "react-intl";
 import Concept from "./Concept";
 import ConceptCrumbs from "./ConceptCrumbs";
 import ConceptEdit from "./ConceptEdit";
-import ConceptFiltersLoader from "./ConceptFiltersLoader";
-import ConceptUserFiltersLoader from "./ConceptUserFiltersLoader";
 import ConceptCreate from "./ConceptCreate";
 import ConceptsLinksManagement from "./ConceptsLinksManagement";
 import ConceptLoader from "./ConceptLoader";
 import Concepts from "./Concepts";
 import ConceptsBulkUpdate from "./ConceptsBulkUpdate";
-import ConceptsLoader from "./ConceptsLoader";
+
 import ConceptSubscriptionLoader from "./ConceptSubscriptionLoader";
 import ConceptsUploadEvents from "./ConceptsUploadEvents";
 
@@ -56,6 +54,7 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
   const archivedConceptsDefaultFilters = {
     status: ["deprecated"],
   };
+
   return (
     <>
       <Route
@@ -94,12 +93,8 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
         render={() =>
           authorized ? (
             <>
-              <ConceptFiltersLoader
-                defaultFilters={pendingConceptsDefaultFilters}
-              />
-              <ConceptsLoader defaultFilters={pendingConceptsDefaultFilters} />
-              <ConceptUserFiltersLoader />
               <Concepts
+                defaultFilters={pendingConceptsDefaultFilters}
                 header={formatMessage({ id: "concepts.header.manage" })}
                 subheader={formatMessage({ id: "concepts.subheader.manage" })}
                 icon="edit"
@@ -118,12 +113,8 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
         render={() =>
           authorized ? (
             <>
-              <ConceptFiltersLoader
-                defaultFilters={archivedConceptsDefaultFilters}
-              />
-              <ConceptsLoader defaultFilters={archivedConceptsDefaultFilters} />
-              <ConceptUserFiltersLoader />
               <Concepts
+                defaultFilters={archivedConceptsDefaultFilters}
                 header={formatMessage({ id: "concepts.header.deprecated" })}
                 subheader={formatMessage({
                   id: "concepts.subheader.deprecated",
@@ -146,13 +137,13 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
             status: ["published"],
             ...(subscope ? { "template.subscope": [subscope] } : {}),
           };
-
           return authorized ? (
             <>
-              <ConceptFiltersLoader defaultFilters={defaultFilters} />
-              <ConceptsLoader defaultFilters={defaultFilters} />
-              <ConceptUserFiltersLoader />
-              <Concepts header={subscope} icon="tags" />
+              <Concepts
+                header={subscope}
+                icon="tags"
+                defaultFilters={defaultFilters}
+              />
             </>
           ) : (
             <Unauthorized />
@@ -160,17 +151,6 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
         }}
       />
 
-      <Route
-        path={CONCEPTS}
-        render={() => (
-          <ConceptsLoader
-            defaultFilters={{
-              status: ["published"],
-              "template.subscope": "",
-            }}
-          />
-        )}
-      />
       <Route
         path={CONCEPTS}
         render={() =>
@@ -181,14 +161,11 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
                 path={CONCEPTS}
                 render={() => (
                   <>
-                    <ConceptFiltersLoader
+                    <Concepts
                       defaultFilters={{
                         status: ["published"],
                         "template.subscope": "",
                       }}
-                    />
-                    <ConceptUserFiltersLoader />
-                    <Concepts
                       header={formatMessage({ id: "concepts.header" })}
                       subheader={formatMessage({
                         id: "concepts.subheader.view",

package/src/concepts/components/Concepts.js

@@ -4,28 +4,37 @@ import { Header, Icon, Segment } from "semantic-ui-react";
 import ConceptCrumbs from "./ConceptCrumbs";
 import ConceptsPanel from "./ConceptsPanel";
 
-export const Concepts = ({ header, subheader, icon, ...actions }) => (
-  <>
-    <ConceptCrumbs />
-    <Segment>
-      <Header as="h2">
-        <Icon circular name={icon} />
-        <Header.Content>
-          {header}
-          <Header.Subheader>{subheader}</Header.Subheader>
-        </Header.Content>
-      </Header>
-      <Segment attached="bottom">
-        <ConceptsPanel {...actions} />
+export const Concepts = ({
+  header,
+  subheader,
+  icon,
+  defaultFilters,
+  ...actions
+}) => {
+  return (
+    <>
+      <ConceptCrumbs />
+      <Segment>
+        <Header as="h2">
+          <Icon circular name={icon} />
+          <Header.Content>
+            {header}
+            <Header.Subheader>{subheader}</Header.Subheader>
+          </Header.Content>
+        </Header>
+        <Segment attached="bottom">
+          <ConceptsPanel actions={actions} defaultFilters={defaultFilters} />
+        </Segment>
       </Segment>
-    </Segment>
-  </>
-);
+    </>
+  );
+};
 
 Concepts.propTypes = {
   header: PropTypes.string,
   icon: PropTypes.string,
   subheader: PropTypes.string,
+  defaultFilters: PropTypes.object,
 };
 
 export default Concepts;

package/src/concepts/components/ConceptsActions.js

@@ -6,20 +6,24 @@ import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { Button } from "semantic-ui-react";
+import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { downloadConcepts, uploadConcepts } from "../routines";
 import ConceptsUpdateButton from "./ConceptsUpdateButton";
 import ConceptsUploadButton from "./ConceptsUploadButton";
 
 export const ConceptsActions = ({
   create,
-  createUrl,
   conceptsDownloading,
   downloadConcepts,
-  hidden,
   upload,
   update,
   canAutoPublish,
 }) => {
+  const { searchData, filterParams: searchParams } = useSearchContext();
+  const conceptsActions = _.propOr({}, "_actions")(searchData);
+  const hidden = _.isEmpty(conceptsActions);
+  const createUrl = conceptsActions?.create ? CONCEPTS_NEW : null;
+
   const { formatMessage, locale } = useIntl();
 
   return hidden ? null : (
@@ -37,7 +41,7 @@ export const ConceptsActions = ({
         floated="right"
         secondary
         icon="download"
-        onClick={() => downloadConcepts({ lang: locale })}
+        onClick={() => downloadConcepts({ lang: locale, searchParams })}
         loading={conceptsDownloading}
         data-tooltip={formatMessage({
           id: "concepts.actions.download.tooltip",
@@ -51,9 +55,7 @@ export const ConceptsActions = ({
 
 ConceptsActions.propTypes = {
   conceptsDownloading: PropTypes.bool,
-  hidden: PropTypes.bool,
   create: PropTypes.bool,
-  createUrl: PropTypes.string,
   downloadConcepts: PropTypes.func,
   upload: PropTypes.bool,
   update: PropTypes.bool,
@@ -64,16 +66,8 @@ ConceptsActions.defaultProps = {
   update: true,
 };
 
-const mapStateToProps = ({
-  conceptActions,
-  conceptsActions,
-  conceptsDownloading,
-}) => ({
-  createUrl:
-    _.isEmpty(conceptActions) && conceptsActions?.create ? CONCEPTS_NEW : null,
+const mapStateToProps = ({ conceptsDownloading }) => ({
   conceptsDownloading: conceptsDownloading,
-  hidden: _.isEmpty(conceptsActions),
-  canAutoPublish: conceptsActions?.autoPublish && true,
 });
 
 export default connect(mapStateToProps, { downloadConcepts, uploadConcepts })(

package/src/concepts/components/ConceptsBulkUpdate.js

@@ -2,7 +2,6 @@ import _ from "lodash/fp";
 import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
-import { useLocation } from "react-router-dom";
 import { connect } from "react-redux";
 import {
   Button,
@@ -21,10 +20,8 @@ import {
   Loading,
 } from "@truedat/core/components";
 import { useTemplate } from "@truedat/core/hooks";
-import { makeSearchQuerySelector } from "@truedat/core/selectors";
-
 import { applyTemplateWithoutDefaults } from "@truedat/df/utils";
-import { bulkUpdate, fetchConcepts } from "../routines";
+import { bulkUpdate } from "../routines";
 
 const DynamicForm = React.lazy(() =>
   import("@truedat/df/components/DynamicForm")
@@ -32,12 +29,6 @@ const DynamicForm = React.lazy(() =>
 
 const isEmptyValue = (value) => !_.isNumber(value) && _.isEmpty(value);
 const fieldsToOmit = ["_confidential"];
-const pendingConceptsFilters = {
-  status: ["pending_approval", "draft", "rejected"],
-};
-const conceptFilters = {
-  status: ["published"],
-};
 
 const TemplateLoader = ({
   templateName,
@@ -56,7 +47,7 @@ const TemplateLoader = ({
 
   useEffect(() => {
     setTemplate(template);
-  }, [template]);
+  }, [template, setTemplate]);
 
   return loading || !template ? (
     <Loading />
@@ -82,12 +73,9 @@ TemplateLoader.propTypes = {
 
 export const ConceptsBulkUpdate = ({
   loading,
-  conceptCount,
-  concepts,
-  templateName,
   bulkUpdate,
-  fetchConcepts,
-  conceptPayload,
+  templates,
+  bulkUpdateQueryInfo,
 }) => {
   const [content, setContent] = useState({});
   const [domains, setDomains] = useState([]);
@@ -96,24 +84,17 @@ export const ConceptsBulkUpdate = ({
   const [domainId, setDomainId] = useState(null);
   const [template, setTemplate] = useState(null);
 
-  const { search } = useLocation();
-  const path = search.split("?").pop();
+  const { concepts, searchParams, conceptCount } = bulkUpdateQueryInfo;
 
-  useEffect(() => {
-    const defaultFilters =
-      path === "pendingConcepts" ? pendingConceptsFilters : conceptFilters;
-    const subscope =
-      path !== "concepts" && path !== "pendingConcepts" ? [path] : "";
-    fetchConcepts({
-      ...conceptPayload,
-      must: {
-        ...conceptPayload.must,
-        ...defaultFilters,
-        "template.subscope": subscope,
-      },
-      size: 20,
-    });
-  }, []);
+  const concept = _.head(concepts);
+
+  const templateName =
+    templates && concept?.type
+      ? _.flow(
+          _.find(_.propEq("name", concept.type)),
+          _.prop("name")
+        )(templates)
+      : null;
 
   const handleDomainsLoaded = (domains) => {
     setDomainsLoading(false);
@@ -145,7 +126,8 @@ export const ConceptsBulkUpdate = ({
     )(content);
 
     bulkUpdate({
-      update_attributes: { content: parsedContent, domain_id: domainId },
+      updateAttributes: { content: parsedContent, domain_id: domainId },
+      searchParams,
     });
   };
 
@@ -252,38 +234,17 @@ export const ConceptsBulkUpdate = ({
 
 ConceptsBulkUpdate.propTypes = {
   loading: PropTypes.bool,
-  conceptCount: PropTypes.number,
-  concepts: PropTypes.array,
-  templateName: PropTypes.string,
   bulkUpdate: PropTypes.func,
-  fetchConcepts: PropTypes.func,
-  conceptPayload: PropTypes.object,
+  templates: PropTypes.array,
+  bulkUpdateQueryInfo: PropTypes.object,
 };
 
-const makeMapStateToProps = () => {
-  const searchQuerySelector = makeSearchQuerySelector(
-    "conceptQuery",
-    "conceptActiveFilters"
-  );
-  const mapStateToProps = (state, props) => {
-    const concept = _.head(state.concepts);
-    const templateName =
-      state.templates && concept?.type
-        ? _.flow(
-            _.find(_.propEq("name", concept.type)),
-            _.prop("name")
-          )(state.templates)
-        : null;
-    return {
-      conceptPayload: searchQuerySelector(state, props),
-      loading: state.templateLoading || state.bulkUpdateLoading,
-      templateName,
-      concepts: state.concepts,
-      conceptCount: state.conceptCount,
-    };
+const mapStateToProps = (state) => {
+  return {
+    loading: state.templateLoading || state.bulkUpdateLoading,
+    templates: state.templates,
+    bulkUpdateQueryInfo: state.bulkUpdateQueryInfo,
   };
-  return mapStateToProps;
 };
-export default connect(makeMapStateToProps, { bulkUpdate, fetchConcepts })(
-  ConceptsBulkUpdate
-);
+
+export default connect(mapStateToProps, { bulkUpdate })(ConceptsBulkUpdate);

package/src/concepts/components/ConceptsLabelResults.js

@@ -1,30 +1,17 @@
 import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
 import { FormattedMessage } from "react-intl";
 import { Label } from "semantic-ui-react";
+import { useSearchContext } from "@truedat/core/search/SearchContext";
 
-export const ConceptsLabelResults = ({ conceptCount, conceptsLoading }) => (
-  <Label className="concepts-label-results">
-    {conceptsLoading ? (
-      <FormattedMessage id="concepts.searching" />
-    ) : (
-      <FormattedMessage
-        id="concepts.retrieved.results"
-        values={{ count: conceptCount }}
-      />
-    )}
-  </Label>
-);
-
-ConceptsLabelResults.propTypes = {
-  conceptCount: PropTypes.number,
-  conceptsLoading: PropTypes.bool
-};
-
-const mapStateToProps = ({ conceptCount, conceptsLoading }) => ({
-  conceptCount,
-  conceptsLoading
-});
-
-export default connect(mapStateToProps)(ConceptsLabelResults);
+export default function ConceptsLabelResults() {
+  const { loading, count } = useSearchContext();
+  return (
+    <Label className="concepts-label-results">
+      {loading ? (
+        <FormattedMessage id="concepts.searching" />
+      ) : (
+        <FormattedMessage id="concepts.retrieved.results" values={{ count }} />
+      )}
+    </Label>
+  );
+}