@truedat/dd 7.5.9 → 7.5.11

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@truedat/dd",
-  "version": "7.5.9",
+  "version": "7.5.11",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
-  "jsnext:main": "src/index.js",
   "module": "src/index.js",
   "files": [
-    "src"
+    "src",
+    "index.js"
   ],
   "author": "Bluetab Solutions",
   "license": "GPL-3.0",
@@ -15,65 +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)$": "identity-obj-proxy",
-      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/src/__mocks__/fileMock.js",
+      "\\.(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",
@@ -81,39 +41,48 @@
           "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": {
-    "@apollo/client": "^3.7.1",
-    "@truedat/auth": "7.5.9",
-    "@truedat/core": "7.5.9",
-    "@truedat/df": "7.5.9",
+    "@apollo/client": "^3.13.5",
+    "axios": "^1.8.4",
+    "file-saver": "^2.0.5",
+    "graphql": "^16.10.0",
+    "is-hotkey": "^0.2.0",
+    "is-url": "^1.2.4",
     "lodash": "^4.17.21",
-    "moment": "^2.29.4",
-    "path-to-regexp": "^1.7.0",
+    "match-sorter": "^8.0.0",
+    "moment": "^2.30.1",
+    "path-to-regexp": "^8.2.0",
     "prop-types": "^15.8.1",
-    "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",
+    "query-string": "^7.1.2",
+    "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",
+    "reselect": "^5.1.1",
+    "semantic-ui-calendar-react": "^0.15.3",
+    "semantic-ui-react": "^3.0.0-beta.2",
     "svg-pan-zoom": "^3.6.1",
-    "swr": "^2.0.0",
-    "uuid": "^8.3.2"
-  },
-  "peerDependencies": {
-    "@truedat/profile": ">= 4.45.0",
-    "react": ">= 16.8.6 < 17",
-    "react-dom": ">= 16.8.6 < 17",
-    "semantic-ui-react": ">= 2.0.3 < 2.2"
+    "swr": "^2.3.3"
   },
-  "gitHead": "03770e3241daa955de2e6e40fdaea91e3d147860"
+  "gitHead": "cbb92d5206752fe2add4195432b0401da17a0f23"
 }

package/src/api/queries.js

@@ -516,16 +516,6 @@ export const TASK_QUERY = gql`
   }
 `;
 
-export const CATALOG_VIEW_CONFIGS_QUERY = gql`
-  query CatalogViewConfigs {
-    catalogViewConfigs {
-      id
-      fieldType
-      fieldName
-    }
-  }
-`;
-
 export const CATALOG_VIEW_CONFIG_QUERY = gql`
   query CatalogViewConfig($id: ID!) {
     catalogViewConfig(id: $id) {

package/src/api.js

@@ -35,7 +35,6 @@ const API_NODES = "/api/nodes";
 const API_PROFILE_GROUP = "/api/profile_execution_groups/:id";
 const API_PROFILE_GROUPS = "/api/profile_execution_groups";
 const API_SYSTEM = "/api/systems/:id";
-const API_SYSTEMS = "/api/systems";
 const API_SYSTEM_STRUCTURES = "/api/systems/:id/structures";
 const API_STRUCTURE_TO_STRUCTURE_LINKS = "/api/data_structure_links";
 const API_STRUCTURE_TO_STRUCTURE_LINK =
@@ -92,7 +91,6 @@ export {
   API_PROFILE_GROUPS,
   API_REFERENCE_DATA_DOWNLOAD,
   API_SYSTEM,
-  API_SYSTEMS,
   API_SYSTEM_STRUCTURES,
   API_STRUCTURE_TYPE,
   API_STRUCTURE_TYPES,

package/src/components/AddStructureMember.js

@@ -1,14 +1,12 @@
-import React from "react";
 import PropTypes from "prop-types";
-
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import AddResourceMember from "@truedat/core/components/AddResourceMember";
 import { linkTo } from "@truedat/core/routes";
 import StructureCrumbs from "./StructureCrumbs";
 
 const AddStructureMember = ({ id }) => {
-  const history = useHistory();
-  const onSuccess = () => history.push(linkTo.STRUCTURE_MEMBERS({ id }));
+  const navigate = useNavigate();
+  const onSuccess = () => navigate(linkTo.STRUCTURE_MEMBERS({ id }));
   return (
     <>
       <StructureCrumbs />

package/src/components/BucketView.js

@@ -1,11 +1,12 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Grid, Header, Image, Segment } from "semantic-ui-react";
-import { useParams, useLocation } from "react-router-dom";
-import searchImage from "assets/searching.png";
+import { useLocation } from "react-router";
+import { useParams } from "react-router";
 import { FormattedMessage, useIntl } from "react-intl";
+import searchImage from "assets/searching.png";
 import { saveNavFilter as saveNavFilterRoutine } from "../routines";
 import FilteredNav from "./FilteredNav";
 import StructureCrumbs from "./StructureCrumbs";

package/src/components/CatalogCustomViewCards.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
-import { Link, useParams } from "react-router-dom";
+import { Link } from "react-router";
+import { useParams } from "react-router";
 import { Card, Label } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { FormattedNumber, FormattedMessage } from "react-intl";
@@ -72,8 +72,8 @@ export const CatalogCustomViewCard = ({
           {name === "_missing"
             ? formatMessage({ id: "missingBucket" })
             : name === ""
-            ? formatMessage({ id: "emptyBucket" })
-            : name}
+              ? formatMessage({ id: "emptyBucket" })
+              : name}
         </Card.Header>
         {structures_count && (
           <CatalogCustomViewCardPopup

package/src/components/CatalogViewConfigForm.js

@@ -1,8 +1,8 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useIntl, FormattedMessage } from "react-intl";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import { useForm, Controller } from "react-hook-form";
 import { connect } from "react-redux";
 

package/src/components/CatalogViewConfigs.js

@@ -1,15 +1,14 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl, FormattedMessage } from "react-intl";
 import { columnDecoratorComponent } from "@truedat/core/services";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { BUCKET_VIEW_CONFIG_NEW, linkTo } from "@truedat/core/routes";
 import { useQuery } from "@apollo/client";
 import { Button, Segment, Table } from "semantic-ui-react";
 import { ConfirmModal } from "@truedat/core/components";
 import { connect } from "react-redux";
-import { CATALOG_VIEW_CONFIGS_QUERY } from "../api/queries";
+import { CATALOG_VIEW_CONFIGS_QUERY } from "@truedat/core/api/queries";
 import { deleteCatalogViewConfig as deleteCatalogViewConfigRoutine } from "../routines";
 
 const ConfigLink = (config) =>

package/src/components/CursorPagination.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import queryString from "query-string";
-import { useLocation, Link } from "react-router-dom";
+import { useLocation, Link } from "react-router";
 import { Menu } from "semantic-ui-react";
 
 /* 

package/src/components/DictionaryRoutes.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { Route, Switch } from "react-router-dom";
-import { useActiveRoute } from "@truedat/core/hooks";
+import { Route, Routes } from "react-router";
 import {
   BUCKET_VIEW,
   BUCKET_VIEW_CONFIG_EDIT,
@@ -18,6 +17,8 @@ import {
   SYSTEMS,
   TASKS,
 } from "@truedat/core/routes";
+import { ProtectedRoute } from "@truedat/core/router";
+import SystemsLoader from "@truedat/core/components/SystemsLoader";
 import CatalogViewConfigs from "./CatalogViewConfigs";
 import PendingStructureNotes from "./PendingStructureNotes";
 import ProfileExecution from "./ProfileExecution";
@@ -31,87 +32,76 @@ import StructuresUploadEvents from "./StructuresUploadEvents";
 import StructureTypesLoader from "./StructureTypesLoader";
 import StructureTypesRoutes from "./StructureTypesRoutes";
 import SystemsRoutes from "./SystemsRoutes";
-import SystemsLoader from "./SystemsLoader";
 import TagsRoutes from "./TagsRoutes";
 import TasksRoutes from "./TasksRoutes";
 import {
   CatalogViewConfigFormConnected,
   CatalogViewConfigFormLoader,
 } from "./CatalogViewConfigForm";
+import StructuresView from "./StructuresView";
+import BucketView from "./BucketView";
 
-const TemplatesLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplatesLoader")
+const TemplatesLoader = React.lazy(
+  () => import("@truedat/core/components/TemplatesLoader")
 );
 
-const Loaders = () => {
-  return <TemplatesLoader scope="dd" />;
-};
-
-export const DictionaryRoutes = () => {
-  const structuresActive = useActiveRoute(STRUCTURES);
-  const systemsActive = useActiveRoute(SYSTEMS);
-  const structureTypesActive = useActiveRoute(STRUCTURE_TYPES);
-  const customCatalogViewActive = useActiveRoute(BUCKETS_VIEW);
-  const active =
-    structuresActive ||
-    systemsActive ||
-    structureTypesActive ||
-    customCatalogViewActive;
-
+export default function DictionaryRoutes() {
   return (
-    <>
-      <Route render={() => (active ? <Loaders /> : null)} />
-      <Switch>
-        <Route
-          path={BUCKET_VIEW_CONFIG_EDIT}
-          render={() => <CatalogViewConfigFormLoader />}
-        />
-        <Route
-          path={BUCKET_VIEW_CONFIG_NEW}
-          render={() => <CatalogViewConfigFormConnected />}
-        />
-        <Route
-          path={BUCKET_VIEW_CONFIGS}
-          render={() => <CatalogViewConfigs />}
-        />
-      </Switch>
+    <Routes>
       <Route
-        path={[STRUCTURES, BUCKETS_VIEW, BUCKET_VIEW]}
-        render={() => (
-          <>
+        path="/structures/*"
+        element={
+          <ProtectedRoute authorization="data_dictionary">
+            <TemplatesLoader scope="dd" />
             <StructureTypesLoader />
             <SystemsLoader />
             <StructuresRoutes />
-          </>
-        )}
+          </ProtectedRoute>
+        }
       />
       <Route
-        path={SYSTEMS}
-        render={() => (
+        path="/systems/*"
+        element={
           <>
+            <TemplatesLoader scope="dd" />
             <StructureTypesLoader />
             <SystemsLoader />
             <SystemsRoutes />
           </>
-        )}
+        }
       />
-      <Route path={STRUCTURE_TAGS} render={() => <TagsRoutes />} />
+      <Route path="/referenceDatasets/*" element={<ReferenceDatasetRoutes />} />
       <Route
-        path={STRUCTURE_TYPES}
-        render={() => (
-          <>
-            <StructureTypesLoader />
-            <StructureTypesRoutes />
-          </>
-        )}
+        path="/structureTags/*"
+        element={
+          <ProtectedRoute>
+            <TagsRoutes />
+          </ProtectedRoute>
+        }
       />
+
+      <Route
+        path="/reindex/*"
+        element={
+          <ProtectedRoute>
+            <TasksRoutes />
+          </ProtectedRoute>
+        }
+      />
+
       <Route
-        path={STRUCTURES_UPLOAD_EVENTS}
-        render={() => <StructuresUploadEvents />}
+        path="/structureTypes/*"
+        element={
+          <ProtectedRoute>
+            <TemplatesLoader scope="dd" />
+            <StructureTypesLoader />
+            <StructureTypesRoutes />
+          </ProtectedRoute>
+        }
       />
       <Route
-        path={PENDING_STRUCTURE_NOTES}
-        render={() => (
+        path="/structureNotes"
+        element={
           <>
             <SystemsLoader />
             <PendingStructureNotes
@@ -120,42 +110,64 @@ export const DictionaryRoutes = () => {
               }}
             />
           </>
-        )}
+        }
+      />
+
+      <Route path="/bucketViewConfigs">
+        <Route index element={<CatalogViewConfigs />} />
+        <Route path=":id/edit" element={<CatalogViewConfigFormLoader />} />
+        <Route path="new" element={<CatalogViewConfigFormConnected />} />
+      </Route>
+      <Route
+        path="/buckets/:propertyPath"
+        element={
+          <ProtectedRoute authorization="data_dictionary">
+            <TemplatesLoader scope="dd" />
+            <StructureTypesLoader />
+            <SystemsLoader />
+            <StructuresView customView />
+          </ProtectedRoute>
+        }
+      />
+      <Route
+        path="/bucketStructures"
+        element={
+          <ProtectedRoute authorization="data_dictionary">
+            <StructureTypesLoader />
+            <SystemsLoader />
+            <BucketView />
+          </ProtectedRoute>
+        }
+      />
+
+      <Route
+        path="/bulkUpdateTemplateContentEvents"
+        element={<StructuresUploadEvents />}
       />
+
       <Route
-        path={REFERENCE_DATASETS}
-        render={() => <ReferenceDatasetRoutes />}
+        path="/profileGroups/:id"
+        element={
+          <>
+            <StructureTypesLoader />
+            <ProfileGroupLoader />
+            <ProfileGroup />
+          </>
+        }
       />
       <Route
-        path={PROFILE_GROUP}
-        render={() => (
+        path="/profileGroups/:group_id/profileExecutions/:id"
+        element={
           <>
             <StructureTypesLoader />
             <ProfileGroupLoader />
-            <Switch>
-              <Route
-                exact
-                path={PROFILE_EXECUTION}
-                render={() => (
-                  <>
-                    <ProfileExecutionBreadcrumbs />
-                    <ProfileExecutionLoader />
-                    <ProfileExecution />
-                  </>
-                )}
-              />
-              <Route
-                exact
-                path={PROFILE_GROUP}
-                render={() => <ProfileGroup />}
-              />
-            </Switch>
+            <ProfileExecutionBreadcrumbs />
+            <ProfileExecutionLoader />
+            <ProfileExecution />
           </>
-        )}
+        }
       />
-      <Route path={TASKS} render={() => <TasksRoutes />} />
-    </>
+      <Route path="*" element={null} />
+    </Routes>
   );
-};
-
-export default DictionaryRoutes;
+}

package/src/components/EditDomainForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import {
   Button,
   Checkbox,
@@ -36,7 +36,6 @@ export const EditDomainForm = ({
   return (
     <Container style={{ width: "400px" }}>
       <Header as="h2" content={title} />
-
       <Form onSubmit={saving ? null : onSubmit}>
         <Segment loading={loading}>
           <DomainSelector

package/src/components/EditDomainPopup.js

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

package/src/components/FilteredNav.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useRef } from "react";
+import { useState, useRef } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Icon } from "semantic-ui-react";

package/src/components/Grant.js

@@ -1,9 +1,10 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
 import { useIntl } from "react-intl";
-import { Link, useParams } from "react-router-dom";
+import { Link } from "react-router";
+import { useParams } from "react-router";
 import { Grid, Segment, Header, Icon, List, Button } from "semantic-ui-react";
 import { linkTo } from "@truedat/core/routes";
 import { useGrant, useGrantRemoval, useStructure } from "../hooks/useGrant";
@@ -11,8 +12,8 @@ import GrantCrumbs from "./GrantCrumbs";
 import GrantRemoval from "./GrantRemoval";
 import GrantChangeRequest from "./GrantChangeRequest";
 
-const DynamicFieldValue = React.lazy(() =>
-  import("@truedat/df/components/DynamicFieldValue")
+const DynamicFieldValue = lazy(
+  () => import("@truedat/df/components/DynamicFieldValue")
 );
 
 const GrantView = () => {
@@ -67,11 +68,9 @@ export const GrantHeader = ({ grant, title, actions, onStatusChange }) => {
                 defaultMessage: "key",
               })}
             />
-            <Header.Content>
-              {`${formatMessage({
-                id: "grant.header",
-              })} ${title}`}
-            </Header.Content>
+            <Header.Content>{`${formatMessage({
+              id: "grant.header",
+            })} ${title}`}</Header.Content>
           </Header>
         </Grid.Column>
         <Grid.Column width={4} textAlign="right">

package/src/components/GrantApprovalRule.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
-import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import { useQuery } from "@apollo/client";
 import {
   Button,
@@ -12,8 +11,9 @@ import {
   Segment,
   Table,
 } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
+import { Loading } from "@truedat/core/components/Loading";
 import GenericCrumbs from "@truedat/core/components/GenericCrumbs";
 import { GRANT_APPROVAL_RULE_QUERY } from "../api/queries";
 import GrantApprovalRuleDeleteButton from "./GrantApprovalRuleDeleteButton";
@@ -22,12 +22,14 @@ export const GrantApprovalRule = () => {
   const { id } = useParams();
   const { formatMessage } = useIntl();
 
-  const { data } = useQuery(GRANT_APPROVAL_RULE_QUERY, {
+  const { data, error, loading } = useQuery(GRANT_APPROVAL_RULE_QUERY, {
     variables: { id },
     fetchPolicy: "cache-and-network",
   });
   const approvalRule = data?.grantApprovalRule;
 
+  if (error) return null;
+  if (loading) return <Loading />;
   return approvalRule ? (
     <>
       <GenericCrumbs
@@ -103,7 +105,6 @@ export const GrantApprovalRule = () => {
             <List.Header>
               <FormattedMessage id="grantApprovalRule.conditions" />
             </List.Header>
-
             <Table compact collapsing celled>
               <Table.Header>
                 <Table.Row textAlign="center">
@@ -121,7 +122,6 @@ export const GrantApprovalRule = () => {
                   </Table.HeaderCell>
                 </Table.Row>
               </Table.Header>
-
               <Table.Body>
                 {_.getOr(
                   [],

package/src/components/GrantApprovalRuleConditions.js

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