@truedat/ie 7.5.7 → 7.5.10

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@truedat/ie",
-  "version": "7.5.7",
+  "version": "7.5.10",
   "description": "Truedat Web Ingests",
   "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.7",
-    "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,32 +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.10",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^29.7.0",
+    "redux-saga-test-plan": "^4.0.6"
   },
   "dependencies": {
-    "@truedat/core": "7.5.7",
-    "@truedat/df": "7.5.7",
+    "@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",
-    "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"
-  },
-  "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": "01b1e4eb176b2c491750b524988e32094413515c"
+  "gitHead": "8a8c49e9d5d6bb4e5f2b503b063bfd6dd20a503d"
 }

package/src/ingests/components/EventRow.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage, useIntl } from "react-intl";
 import Moment from "react-moment";
@@ -39,7 +38,7 @@ EventRow.propTypes = {
   user_name: PropTypes.string,
   event: PropTypes.string,
   ts: PropTypes.string,
-  payload: PropTypes.array
+  payload: PropTypes.array,
 };
 
 export default EventRow;

package/src/ingests/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/ingests/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/ingests/components/Ingest.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Grid } from "semantic-ui-react";
@@ -23,7 +22,7 @@ export const Ingest = ({ ingest }) =>
   );
 
 Ingest.propTypes = {
-  ingest: PropTypes.object
+  ingest: PropTypes.object,
 };
 
 const mapStateToProps = ({ ingest }) => ({ ingest });

package/src/ingests/components/IngestActions.js

@@ -1,10 +1,9 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
+import { Link } from "react-router";
 import { Button, Grid, Icon } from "semantic-ui-react";
-import { Link } from "react-router-dom";
 import { FormattedMessage } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
 import { linkTo } from "@truedat/core/routes";

package/src/ingests/components/IngestArchive.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";
@@ -47,11 +46,11 @@ export const IngestArchive = ({ ingestArchive }) => (
 );
 
 IngestArchive.propTypes = {
-  ingestArchive: PropTypes.array
+  ingestArchive: PropTypes.array,
 };
 
 const mapStateToProps = ({ ingestArchive }) => ({
-  ingestArchive
+  ingestArchive,
 });
 
 export default connect(mapStateToProps)(IngestArchive);

package/src/ingests/components/IngestArchiveLoader.js

@@ -1,48 +1,26 @@
-import React from "react";
-import { withRouter } from "react-router-dom";
+import { useEffect } from "react";
+import { useParams } from "react-router";
 import PropTypes from "prop-types";
-import { compose } from "redux";
-import { connect } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { Loading } from "@truedat/core/components";
 import { fetchIngestArchive, clearIngestArchive } from "../routines";
 
-export class IngestArchiveLoader extends React.Component {
-  static propTypes = {
-    fetchIngestArchive: PropTypes.func,
-    clearIngestArchive: PropTypes.func,
-    ingestArchiveLoading: PropTypes.bool,
-    match: PropTypes.object,
-  };
+export default function IngestArchiveLoader() {
+  const dispatch = useDispatch();
+  const ingestArchiveLoading = useSelector(
+    (state) => state.ingestArchiveLoading
+  );
+  const { id } = useParams();
 
-  componentDidMount() {
-    const { fetchIngestArchive, match } = this.props;
-    const { id } = match.params;
+  useEffect(() => {
     if (id) {
-      fetchIngestArchive({ id });
+      dispatch(fetchIngestArchive({ id }));
     }
-  }
 
-  componentWillUnmount() {
-    const { clearIngestArchive } = this.props;
-    clearIngestArchive();
-  }
+    return () => {
+      dispatch(clearIngestArchive());
+    };
+  }, [id]);
 
-  render() {
-    const { ingestArchiveLoading } = this.props;
-
-    if (ingestArchiveLoading) {
-      return <Loading />;
-    } else {
-      return null;
-    }
-  }
+  return ingestArchiveLoading ? <Loading /> : null;
 }
-
-const mapStateToProps = ({ ingestArchiveLoading }) => ({
-  ingestArchiveLoading,
-});
-
-export default compose(
-  withRouter,
-  connect(mapStateToProps, { clearIngestArchive, fetchIngestArchive })
-)(IngestArchiveLoader);

package/src/ingests/components/IngestArchiveRow.js

@@ -1,6 +1,5 @@
-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";
@@ -11,11 +10,11 @@ export const IngestArchiveRow = ({
   status,
   last_change_at,
   last_change_by,
-  version
+  version,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   return (
-    <Table.Row onClick={() => history.push(linkTo.INGEST({ id }))}>
+    <Table.Row onClick={() => navigate(linkTo.INGEST({ id }))}>
       <Table.Cell
         content={<FormattedMessage id={`ingests.status.${status}`} />}
       />
@@ -31,7 +30,7 @@ IngestArchiveRow.propTypes = {
   status: PropTypes.string,
   last_change_at: PropTypes.string,
   last_change_by: PropTypes.string,
-  version: PropTypes.number
+  version: PropTypes.number,
 };
 
 export default IngestArchiveRow;

package/src/ingests/components/IngestCompleteness.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, Icon } from "semantic-ui-react";

package/src/ingests/components/IngestCrumbs.js

@@ -1,8 +1,7 @@
-import React from "react";
 import PropTypes from "prop-types";
 import { Breadcrumb } from "semantic-ui-react";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { INGESTS, linkTo } from "@truedat/core/routes";
 
@@ -28,7 +27,6 @@ export const IngestCrumbs = ({ name, ingestAction, id }) =>
           )}
         </>
       )}
-
       {ingestAction && (
         <>
           <Breadcrumb.Divider icon="right angle" />
@@ -43,7 +41,7 @@ export const IngestCrumbs = ({ name, ingestAction, id }) =>
 IngestCrumbs.propTypes = {
   name: PropTypes.string,
   ingestAction: PropTypes.string,
-  id: PropTypes.number
+  id: PropTypes.number,
 };
 
 const mapStateToProps = ({ ingest }) => ({ ...ingest });

package/src/ingests/components/IngestDetails.js

@@ -1,12 +1,12 @@
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Segment, Header } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { RichTextEditor } from "@truedat/core/components";
 
-const DynamicFormViewer = React.lazy(() =>
-  import("@truedat/df/components/DynamicFormViewer")
+const DynamicFormViewer = lazy(
+  () => import("@truedat/df/components/DynamicFormViewer")
 );
 
 export const IngestDetails = ({

package/src/ingests/components/IngestDuplicate.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy, Component } from "react";
 import PropTypes from "prop-types";
 import {
   Button,
@@ -18,12 +18,10 @@ import { selectTemplate, selectDomain } from "@truedat/df/routines";
 import { applyTemplate } from "@truedat/df/utils";
 import { ingestAction } from "../routines";
 
-const DynamicForm = React.lazy(() =>
-  import("@truedat/df/components/DynamicForm")
-);
+const DynamicForm = lazy(() => import("@truedat/df/components/DynamicForm"));
 
-const TemplateLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplateLoader")
+const TemplateLoader = lazy(
+  () => import("@truedat/df/templates/components/TemplateLoader")
 );
 
 const actionKey = "create";
@@ -42,7 +40,7 @@ const isValid = _.conforms({
   description: _.negate(_.isEmpty),
 });
 
-export class IngestDuplicate extends React.Component {
+export class IngestDuplicate extends Component {
   static propTypes = {
     action: PropTypes.object,
     applyTemplate: PropTypes.func,
@@ -158,7 +156,6 @@ export class IngestDuplicate extends React.Component {
             </label>
             <Form.Input name="name" value={name} onChange={this.handleChange} />
           </Form.Field>
-
           <Form.Field required>
             <label>
               {formatMessage({ id: "ingests.props.description" })}

package/src/ingests/components/IngestEdit.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy, Component } from "react";
 import PropTypes from "prop-types";
 import {
   Button,
@@ -22,12 +22,10 @@ import {
 import { applyTemplate } from "@truedat/df/utils";
 import { ingestAction } from "../routines";
 
-const DynamicForm = React.lazy(() =>
-  import("@truedat/df/components/DynamicForm")
-);
+const DynamicForm = lazy(() => import("@truedat/df/components/DynamicForm"));
 
-const TemplateLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplateLoader")
+const TemplateLoader = lazy(
+  () => import("@truedat/df/templates/components/TemplateLoader")
 );
 
 const actionKey = "update";
@@ -46,7 +44,7 @@ const isValid = _.conforms({
   description: _.negate(_.isEmpty),
 });
 
-export class IngestEdit extends React.Component {
+export class IngestEdit extends Component {
   static propTypes = {
     action: PropTypes.object,
     applyTemplate: PropTypes.func,
@@ -166,7 +164,6 @@ export class IngestEdit extends React.Component {
             </label>
             <Form.Input name="name" value={name} onChange={this.handleChange} />
           </Form.Field>
-
           <Form.Field required>
             <label>
               {formatMessage({ id: "ingests.props.description" })}

package/src/ingests/components/IngestExecutions.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { Fragment } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { FormattedMessage } from "react-intl";
@@ -16,7 +16,7 @@ const formatBytes = (bytes, separator = " ") => {
     : `${(bytes / 1024 ** i).toFixed(1)}${separator}${sizes[i]}`;
 };
 
-const getRecords = num => {
+const getRecords = (num) => {
   if (!isNaN(parseFloat(num)) && isFinite(num)) {
     return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ".");
   }
@@ -60,7 +60,7 @@ const IngestExecutionRow = ({ ingest }) => (
 export const IngestExecutions = ({ ingestExecutions }) => {
   if (!_.isEmpty(ingestExecutions)) {
     return (
-      <React.Fragment>
+      <Fragment>
         <Segment attached="bottom">
           <Grid>
             <Grid.Row>
@@ -120,11 +120,11 @@ export const IngestExecutions = ({ ingestExecutions }) => {
             </Grid.Row>
           </Grid>
         </Segment>
-      </React.Fragment>
+      </Fragment>
     );
   } else {
     return (
-      <React.Fragment>
+      <Fragment>
         <Segment attached="bottom">
           <Grid>
             <Grid.Row>
@@ -138,13 +138,13 @@ export const IngestExecutions = ({ ingestExecutions }) => {
             </Grid.Row>
           </Grid>
         </Segment>
-      </React.Fragment>
+      </Fragment>
     );
   }
 };
 
 IngestExecutions.propTypes = {
-  ingestExecutions: PropTypes.array
+  ingestExecutions: PropTypes.array,
 };
 
 const mapStateToProps = ({ ingestExecutions }) => ({ ingestExecutions });

package/src/ingests/components/IngestExecutionsLoader.js

@@ -1,11 +1,11 @@
-import React from "react";
+import { Component } from "react";
 import PropTypes from "prop-types";
 import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
 import { Loading } from "@truedat/core/components";
 import { fetchIngestExecutions, clearIngestExecutions } from "../routines";
 
-export class IngestExecutionsLoader extends React.Component {
+export class IngestExecutionsLoader extends Component {
   static propTypes = {
     fetchIngestExecutions: PropTypes.func,
     clearIngestExecutions: PropTypes.func,

package/src/ingests/components/IngestFilters.js

@@ -1,14 +1,13 @@
-import React from "react";
-import { Route, Switch } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import { INGESTS } from "@truedat/core/routes";
 import IngestFiltersDefault from "./IngestFiltersDefault";
 import IngestFiltersPublished from "./IngestFiltersPublished";
 
 export const IngestFilters = () => (
-  <Switch>
-    <Route exact path={INGESTS} render={() => <IngestFiltersPublished />} />
-    <Route render={() => <IngestFiltersDefault />} />
-  </Switch>
+  <Routes>
+    <Route path={INGESTS} element={<IngestFiltersPublished />} />
+    <Route path="*" element={<IngestFiltersDefault />} />
+  </Routes>
 );
 
 export default IngestFilters;

package/src/ingests/components/IngestForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy, Component } from "react";
 import PropTypes from "prop-types";
 import {
   Button,
@@ -20,8 +20,8 @@ import {
 } from "@truedat/core/components";
 import { ingestAction } from "../routines";
 
-const SelectableDynamicForm = React.lazy(() =>
-  import("@truedat/df/components/SelectableDynamicForm")
+const SelectableDynamicForm = lazy(
+  () => import("@truedat/df/components/SelectableDynamicForm")
 );
 
 const actionKey = "create";
@@ -43,7 +43,7 @@ const isValid = _.conforms({
   type: isNonEmptyString,
 });
 
-export class IngestForm extends React.Component {
+export class IngestForm extends Component {
   static propTypes = {
     action: PropTypes.object,
     ingestAction: PropTypes.func,
@@ -150,7 +150,6 @@ export class IngestForm extends React.Component {
               onChange={this.handleEditorChange}
             />
           </Form.Field>
-
           <SelectableDynamicForm
             scope="ie"
             domainIds={_.isNil(domain_id) ? null : [domain_id]}

package/src/ingests/components/IngestHeader.js

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