@truedat/bg 7.5.9 → 7.5.11

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@truedat/bg",
-  "version": "7.5.9",
+  "version": "7.5.11",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
-  "jsnext:main": "src/index.js",
   "module": "src/index.js",
   "files": [
-    "src"
+    "src",
+    "index.js"
   ],
   "author": "Bluetab Solutions",
   "license": "GPL-3.0",
@@ -15,64 +15,25 @@
   },
   "scripts": {
     "clean": "rimraf yarn-error.log",
-    "debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
     "test": "TZ=UTC jest --coverage",
-    "test:watch": "TZ=UTC jest --watch",
     "eslint": "eslint src/**",
     "eslint:fix": "eslint --fix src/**"
   },
-  "devDependencies": {
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.20.5",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "7.5.9",
-    "babel-jest": "^28.1.0",
-    "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-react-intl": "^5.1.18",
-    "babel-plugin-transform-semantic-ui-react-imports": "^1.4.1",
-    "enzyme": "^3.11.0",
-    "enzyme-to-json": "^3.6.2",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.0.0",
-    "jest-environment-jsdom": "^29.0.0",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
-    "redux-saga-test-plan": "^4.0.4",
-    "rimraf": "^3.0.2",
-    "semantic-ui-react": "^2.1.4"
-  },
   "jest": {
     "maxWorkers": "50%",
     "testTimeout": 10000,
     "moduleDirectories": [
-      "<rootDir>/src",
-      "../../node_modules"
-    ],
-    "setupFilesAfterEnv": [
-      "@truedat/test/setup"
+      "<rootDir>/src"
     ],
     "moduleNameMapper": {
       "\\.(css|less|png)$": "identity-obj-proxy",
       "^@truedat/([^/]+)$": "<rootDir>/../$1/src/index",
       "^@truedat/([^/]+)/(.*)$": "<rootDir>/../$1/src/$2"
     },
-    "snapshotSerializers": [
-      "enzyme-to-json/serializer"
+    "setupFilesAfterEnv": [
+      "@truedat/test/setup"
     ],
     "testEnvironment": "jsdom",
-    "testPathIgnorePatterns": [
-      "<rootDir>/node_modules/"
-    ],
     "transform": {
       "\\.js$": [
         "babel-jest",
@@ -80,36 +41,46 @@
           "rootMode": "upward"
         }
       ]
-    },
-    "transformIgnorePatterns": [
-      "/node_modules/(?!@truedat).*"
-    ]
+    }
+  },
+  "devDependencies": {
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.2.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@truedat/test": "7.5.11",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^29.7.0",
+    "redux-saga-test-plan": "^4.0.6"
   },
   "dependencies": {
-    "@truedat/core": "7.5.9",
-    "@truedat/df": "7.5.9",
-    "@truedat/lm": "7.5.9",
-    "decode-uri-component": "^0.2.2",
+    "@apollo/client": "^3.13.5",
+    "axios": "^1.8.4",
     "file-saver": "^2.0.5",
-    "moment": "^2.29.4",
-    "path-to-regexp": "^1.7.0",
+    "graphql": "^16.10.0",
+    "is-hotkey": "^0.2.0",
+    "is-url": "^1.2.4",
+    "lodash": "^4.17.21",
+    "moment": "^2.30.1",
+    "path-to-regexp": "^8.2.0",
     "prop-types": "^15.8.1",
     "query-string": "^7.1.2",
-    "react-hook-form": "^7.30.0",
-    "react-intl": "^5.20.10",
-    "react-moment": "^1.1.2",
-    "react-redux": "^7.2.4",
-    "react-router-dom": "^5.2.0",
-    "redux": "^4.1.1",
-    "redux-saga": "^1.2.1",
+    "react": "^19.0.0",
+    "react-csv": "^2.2.2",
+    "react-dom": "^19.0.0",
+    "react-dropzone": "^14.3.8",
+    "react-hook-form": "^7.54.2",
+    "react-intl": "^7.1.10",
+    "react-moment": "^1.1.3",
+    "react-redux": "^9.2.0",
+    "react-router": "^7.4.0",
+    "redux": "^5.0.1",
+    "redux-saga": "^1.3.0",
     "redux-saga-routines": "^3.2.3",
-    "reselect": "^4.1.7",
-    "semantic-ui-react": "^2.1.4"
-  },
-  "peerDependencies": {
-    "react": ">= 16.8.6 < 17",
-    "react-dom": ">= 16.8.6 < 17",
-    "semantic-ui-react": ">= 2.0.3 < 2.2"
+    "reselect": "^5.1.1",
+    "semantic-ui-calendar-react": "^0.15.3",
+    "semantic-ui-react": "^3.0.0-beta.2",
+    "swr": "^2.3.3"
   },
-  "gitHead": "03770e3241daa955de2e6e40fdaea91e3d147860"
+  "gitHead": "cbb92d5206752fe2add4195432b0401da17a0f23"
 }

package/src/concepts/components/Concept.js

@@ -1,8 +1,8 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { lazy, useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Route } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import { Grid, Segment } from "semantic-ui-react";
 import StructureGrantCart from "@truedat/dd/components/StructureGrantCart";
 import { Comments, CommentsLoader } from "@truedat/core/components";
@@ -22,16 +22,16 @@ import ConceptTaxonomy from "./ConceptTaxonomy";
 import SharedToDomains from "./SharedToDomains";
 import ConceptContextProvider, { useConceptContext } from "./ConceptContext";
 
-const EventsLoader = React.lazy(() =>
-  import("@truedat/audit/components/EventsLoader")
+const EventsLoader = lazy(
+  () => import("@truedat/audit/components/EventsLoader")
 );
 
-const RelationsLoader = React.lazy(() =>
-  import("@truedat/lm/components/RelationsLoader")
+const RelationsLoader = lazy(
+  () => import("@truedat/lm/components/RelationsLoader")
 );
 
-const ConceptRulesLoader = React.lazy(() =>
-  import("@truedat/dq/components/ConceptRulesLoader")
+const ConceptRulesLoader = lazy(
+  () => import("@truedat/dq/components/ConceptRulesLoader")
 );
 
 export const Concept = ({ id, concept }) => {
@@ -75,8 +75,8 @@ export const Concept = ({ id, concept }) => {
         is_default || publishedWithoutLang
           ? content
           : _.isEmpty(contentLang?.content)
-          ? { ...noTranslatableContent }
-          : { ...noTranslatableContent, ...contentLang?.content };
+            ? { ...noTranslatableContent }
+            : { ...noTranslatableContent, ...contentLang?.content };
 
       const langName = is_default ? concept.name : contentLang?.name || "";
 
@@ -122,15 +122,18 @@ export const Concept = ({ id, concept }) => {
               selectedContent={selectedContent}
             />
           </Segment>
-          <Route
-            path={CONCEPT_VERSION}
-            exact
-            render={() => (
-              <Segment>
-                <Comments />
-              </Segment>
-            )}
-          />
+          <Routes>
+            <Route
+              // "/concepts/:business_concept_id/versions/:id"
+              path={CONCEPT_VERSION}
+              element={
+                <Segment>
+                  <Comments />
+                </Segment>
+              }
+            />
+            <Route path="*" element={null} />
+          </Routes>
         </Grid.Column>
         <Grid.Column width={4}>
           {grantView ? (

package/src/concepts/components/ConceptActions.js

@@ -1,12 +1,11 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Icon } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link, useNavigate } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
-import { linkTo } from "@truedat/core/routes";
+import { CONCEPTS, linkTo } from "@truedat/core/routes";
 import { conceptAction } from "../routines";
 import { mapActionProps } from "../constants/mappings";
 import ConceptDeleteModalBody from "./ConceptDeleteModalBody";
@@ -46,37 +45,43 @@ const ModalDelete = ({
   deleteAction,
   conceptVersion,
   concept,
-}) => (
-  <ConfirmModal
-    icon="trash"
-    trigger={
-      <Button
-        icon={<Icon name="trash alternate outline" color="red" />}
-        content={<FormattedMessage id="actions.delete" />}
-      />
-    }
-    header={
-      <FormattedMessage id="concepts.actions.delete.confirmation.header" />
-    }
-    content={
-      <>
-        {conceptVersion === 1 ? (
-          <ConceptDeleteModalBody
-            conceptName={_.prop("name")(concept)}
-            conceptDomain={_.prop("domain.name")(concept)}
-            linkCount={_.prop("link_count")(concept)}
-            ruleCount={_.prop("rule_count")(concept)}
-            conceptCount={_.prop("concept_count")(concept)}
-            conceptVersion={_.prop("version")(concept)}
-          />
-        ) : (
-          <FormattedMessage id="concepts.actions.delete.confirmation.content" />
-        )}
-      </>
-    }
-    onConfirm={() => conceptAction({ action: "delete", ...deleteAction })}
-  />
-);
+}) => {
+  const navigate = useNavigate();
+  return (
+    <ConfirmModal
+      icon="trash"
+      trigger={
+        <Button
+          icon={<Icon name="trash alternate outline" color="red" />}
+          content={<FormattedMessage id="actions.delete" />}
+        />
+      }
+      header={
+        <FormattedMessage id="concepts.actions.delete.confirmation.header" />
+      }
+      content={
+        <>
+          {conceptVersion === 1 ? (
+            <ConceptDeleteModalBody
+              conceptName={_.prop("name")(concept)}
+              conceptDomain={_.prop("domain.name")(concept)}
+              linkCount={_.prop("link_count")(concept)}
+              ruleCount={_.prop("rule_count")(concept)}
+              conceptCount={_.prop("concept_count")(concept)}
+              conceptVersion={_.prop("version")(concept)}
+            />
+          ) : (
+            <FormattedMessage id="concepts.actions.delete.confirmation.content" />
+          )}
+        </>
+      }
+      onConfirm={() => {
+        conceptAction({ action: "delete", ...deleteAction });
+        navigate(CONCEPTS);
+      }}
+    />
+  );
+};
 
 ModalDelete.propTypes = {
   concept: PropTypes.object,

package/src/concepts/components/ConceptArchive.js

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

package/src/concepts/components/ConceptArchiveRow.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { Table } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { DateTime } from "@truedat/core/components";
@@ -15,11 +14,11 @@ export const ConceptArchiveRow = ({
   bcv_last_change_by,
   version,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   return (
     <Table.Row
       onClick={() =>
-        history.push(linkTo.CONCEPT_VERSION({ business_concept_id, id }))
+        navigate(linkTo.CONCEPT_VERSION({ business_concept_id, id }))
       }
     >
       <Table.Cell

package/src/concepts/components/ConceptCompleteness.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, Progress, Segment, Icon } from "semantic-ui-react";
@@ -48,6 +47,7 @@ export const Completeness = ({
     isRequired && !_.includes(status)(["published", "versioned"])
       ? fetchMissingRequiredFields(concept, content, isDefault, splitFields)
       : [];
+
   return (
     <>
       <Header as="h3" dividing>
@@ -62,7 +62,6 @@ export const Completeness = ({
           />
         ) : null}
       </Header>
-      <>{}</>
       <Progress
         error={completeness < 50}
         warning={completeness >= 50 && completeness < 85}

package/src/concepts/components/ConceptConfidentialButton.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Popup, Icon } from "semantic-ui-react";
@@ -35,7 +34,7 @@ export const ConceptConfidentialButton = ({
             icon={<Icon name={buttonIcon} className={className} />}
             basic
             className="structureButton"
-            onClick={() => handleSubmit()}
+            onClick={handleSubmit}
             loading={conceptUpdating}
           />
         </span>

package/src/concepts/components/ConceptCreate.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 { connect } from "react-redux";
 import { useLanguage } from "@truedat/core/i18n";

package/src/concepts/components/ConceptCrumbs.js

@@ -1,7 +1,8 @@
-import React from "react";
+import { Fragment } from "react";
 import PropTypes from "prop-types";
 import { Breadcrumb } from "semantic-ui-react";
-import { Link, useHistory } from "react-router-dom";
+import { Link } from "react-router";
+import { useNavigate } from "react-router";
 import { FormattedMessage, useIntl } from "react-intl";
 import { connect } from "react-redux";
 
@@ -19,17 +20,18 @@ const ConceptCrumbs = ({
   i18n_content,
 }) => {
   const { locale } = useIntl();
-  const history = useHistory();
+
+  const navigate = useNavigate();
   const bulkUpdateActive = useActiveRoute(CONCEPTS_BULK_UPDATE);
 
   const name = i18n_content?.[locale]?.name ?? defaultName;
 
   const fromStatus = () =>
     status === "published"
-      ? history.push(linkTo.CONCEPTS)
-      : history.push(linkTo.CONCEPTS_PENDING);
+      ? navigate(linkTo.CONCEPTS)
+      : navigate(linkTo.CONCEPTS_PENDING);
 
-  const goBack = () => (bulkUpdateActive ? history.goBack() : fromStatus());
+  const goBack = () => (bulkUpdateActive ? navigate(-1) : fromStatus());
 
   const additionalCrumbs = [];
 
@@ -82,12 +84,12 @@ const ConceptCrumbs = ({
             };
 
         return (
-          <React.Fragment key={index}>
+          <Fragment key={index}>
             <Breadcrumb.Section active={isLast} {...sectionProps}>
               {crumbLabel}
             </Breadcrumb.Section>
             {!isLast && <Breadcrumb.Divider icon="right angle" />}
-          </React.Fragment>
+          </Fragment>
         );
       })}
     </Breadcrumb>

package/src/concepts/components/ConceptDeleteModalBody.js

@@ -1,4 +1,4 @@
-import React from "react";
+import { Fragment } from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { Header, List } from "semantic-ui-react";
@@ -8,18 +8,17 @@ export const ConceptDeleteModalBody = ({
   conceptDomain,
   linkCount,
   ruleCount,
-  conceptCount
+  conceptCount,
 }) => (
-  <React.Fragment>
+  <Fragment>
     {linkCount > 0 || ruleCount > 0 || conceptCount > 0 ? (
-      <React.Fragment>
+      <Fragment>
         <Header as="h2">
           <Header.Content>
             {conceptName}
             <Header.Subheader>{conceptDomain}</Header.Subheader>
           </Header.Content>
         </Header>
-
         <List divided relaxed>
           {linkCount > 0 && (
             <List.Item className="concept_delete_modal_body__item">
@@ -29,7 +28,6 @@ export const ConceptDeleteModalBody = ({
               <span>{`“${linkCount}“`}</span>
             </List.Item>
           )}
-
           {ruleCount > 0 && (
             <List.Item className="concept_delete_modal_body__item">
               <strong>
@@ -38,7 +36,6 @@ export const ConceptDeleteModalBody = ({
               <span>{`“${ruleCount}“`}</span>
             </List.Item>
           )}
-
           {conceptCount > 0 && (
             <List.Item className="concept_delete_modal_body__item">
               <strong>
@@ -48,11 +45,11 @@ export const ConceptDeleteModalBody = ({
             </List.Item>
           )}
         </List>
-      </React.Fragment>
+      </Fragment>
     ) : (
       <FormattedMessage id="concepts.actions.delete.body.without_content" />
     )}
-  </React.Fragment>
+  </Fragment>
 );
 
 ConceptDeleteModalBody.propTypes = {
@@ -60,7 +57,7 @@ ConceptDeleteModalBody.propTypes = {
   conceptDomain: PropTypes.string,
   linkCount: PropTypes.number,
   ruleCount: PropTypes.number,
-  conceptCount: PropTypes.number
+  conceptCount: PropTypes.number,
 };
 
 export default ConceptDeleteModalBody;

package/src/concepts/components/ConceptDetails.js

@@ -1,11 +1,11 @@
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Segment } from "semantic-ui-react";
 import { I18nProvider } from "@truedat/core/i18n";
 
-const DynamicFormViewer = React.lazy(() =>
-  import("@truedat/df/components/DynamicFormViewer")
+const DynamicFormViewer = lazy(
+  () => import("@truedat/df/components/DynamicFormViewer")
 );
 
 export const ConceptDetails = ({ concept, selectedContent, lang }) => {

package/src/concepts/components/ConceptEdit.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import { compose } from "redux";
 import { connect } from "react-redux";
@@ -9,6 +9,7 @@ import { splitTranslatableFields } from "@truedat/core/services/i18nContent";
 import { useTemplate } from "@truedat/core/hooks";
 import { conceptAction } from "../routines";
 import ConceptForm from "./ConceptForm";
+
 const actionKey = "update";
 
 export const ConceptEdit = ({
@@ -26,7 +27,6 @@ export const ConceptEdit = ({
   const { defaultLang, altLangs } = useLanguage();
 
   const templateFields = splitTranslatableFields(template);
-
   const translatableKeys = _.keys(templateFields.translatable);
 
   const handleSubmit = (e) => {
@@ -46,7 +46,7 @@ export const ConceptEdit = ({
 
     const business_concept_version = {
       name: defaultContent.name,
-      domain_id: domain.id,
+      domain_id: domain?.id,
       type: template.name,
       content: newContent,
       i18n_content: i18nSendConcept,
@@ -63,7 +63,7 @@ export const ConceptEdit = ({
     <>
       <ConceptForm
         actionKey={actionKey}
-        domainId={domain.id}
+        domainId={domain?.id}
         template={template}
         i18nConcept={i18nConcept}
         loading={templateLoading || localesLoading}
@@ -94,7 +94,7 @@ export const ConceptEditLoader = (props) => {
   const { locales } = useLanguage();
   const { data, loading: templateLoading } = useTemplate({
     name: templateName,
-    domainIds: [domain.id],
+    domainIds: [domain?.id],
   });
 
   const template = _.prop("template")(data);