@truedat/ie 4.30.7 → 4.31.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.31.1] 2021-10-20
+
+### Added
+
+- [TD-4124] Dependent domain field in template content
+
 ## [4.30.0] 2021-10-06
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/ie",
-  "version": "4.30.7",
+  "version": "4.31.3",
   "description": "Truedat Web Ingests",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -30,7 +30,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@truedat/test": "4.30.7",
+    "@truedat/test": "4.31.3",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -79,8 +79,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.30.7",
-    "@truedat/df": "4.30.7",
+    "@truedat/core": "4.31.3",
+    "@truedat/df": "4.31.3",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -99,5 +99,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "5d259eef9b6f85b4c763bdda618fb6beb92fe635"
+  "gitHead": "e4563a736dc70e2bfcdba22d9c820f1b34250b36"
 }

package/src/ingests/components/IngestDuplicate.js

@@ -110,7 +110,10 @@ export class IngestDuplicate extends React.Component {
       this.state
     );
 
-    const content = _.flow(_.prop("content"), applyTemplate)(this.state);
+    const content = applyTemplate(
+      this.state?.content,
+      ingestVersion?.domain_id
+    );
 
     ingestAction({
       action: actionKey,

package/src/ingests/components/IngestEdit.js

@@ -84,9 +84,14 @@ export class IngestEdit extends React.Component {
       !_.isUndefined(this.props.ingest.content)
     ) {
       const { content, domain, name, description, type } = this.props.ingest;
-      this.setState({ content, name, description, type });
-      const { selectDomain, selectTemplate, template } = this.props;
       const domain_id = domain.id;
+      this.setState({
+        content,
+        name,
+        description,
+        type,
+      });
+      const { selectDomain, selectTemplate, template } = this.props;
       selectDomain({ id: domain_id });
       selectTemplate({ id: template.id });
     }
@@ -113,7 +118,8 @@ export class IngestEdit extends React.Component {
     const { action, applyTemplate, ingestAction } = this.props;
     const ingestVersion = _.pick(["description", "name", "type"])(this.state);
 
-    const content = _.flow(_.prop("content"), applyTemplate)(this.state);
+    const domain_id = this.props?.ingest?.domain?.id;
+    const content = applyTemplate(this.state?.content, domain_id);
 
     ingestAction({
       action: actionKey,
@@ -135,6 +141,7 @@ export class IngestEdit extends React.Component {
       templateLoading ||
       (action && action.href && ingestActionLoading === action.href);
     const { content, name, description } = this.state;
+
     if (_.isUndefined(content) || _.isEmpty(template)) {
       return null;
     }

package/src/ingests/components/IngestForm.js

@@ -55,7 +55,7 @@ export class IngestForm extends React.Component {
   static propTypes = {
     action: PropTypes.object,
     applyTemplate: PropTypes.func,
-
+    ingestAction: PropTypes.func,
     ingestActionLoading: PropTypes.string,
     intl: PropTypes.object,
     selectDomain: PropTypes.func,
@@ -125,7 +125,10 @@ export class IngestForm extends React.Component {
       this.state
     );
 
-    const content = _.flow(_.prop("content"), applyTemplate)(this.state);
+    const content = applyTemplate(
+      this.state?.content,
+      ingestVersion?.domain_id
+    );
 
     ingestAction({
       action: actionKey,