@truedat/df 6.1.4 → 6.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "6.1.4",
+  "version": "6.2.0",
   "description": "Truedat Web Data Quality Module",
   "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.1.4",
+    "@truedat/test": "6.2.0",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,8 +87,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "6.1.4",
-    "@truedat/core": "6.1.4",
+    "@truedat/auth": "6.2.0",
+    "@truedat/core": "6.2.0",
     "decode-uri-component": "^0.2.2",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -109,5 +109,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "c0ef00d553186b7601e136f3e38fa0d0d7287fd9"
+  "gitHead": "5c10ee429997ab081477edf0679547eb4bc11f9b"
 }

package/src/components/DynamicForm.js

@@ -16,6 +16,7 @@ export const DynamicForm = ({
   onChange,
   selectedDomain,
   template,
+  noTranslatableFields,
 }) => {
   const { formatMessage } = useIntl();
   const domainId = selectedDomain?.id;
@@ -51,7 +52,6 @@ export const DynamicForm = ({
   return parsedGroups.map(({ name, fields }, i) => (
     <FieldGroupSegment
       key={i}
-      onFieldChange={handleChange}
       name={
         name
           ? formatMessage({
@@ -60,8 +60,10 @@ export const DynamicForm = ({
             })
           : null
       }
+      noTranslatableFields={noTranslatableFields}
       scope={template?.scope}
       fields={fields}
+      onFieldChange={handleChange}
       isModification={isModification}
     />
   ));
@@ -76,6 +78,7 @@ DynamicForm.propTypes = {
   onChange: PropTypes.func,
   selectedDomain: PropTypes.object,
   template: PropTypes.object,
+  noTranslatableFields: PropTypes.array,
 };
 
 const makeMapStateToProps = () => {

package/src/components/FieldGroupSegment.js

@@ -1,3 +1,4 @@
+import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Segment, Header } from "semantic-ui-react";
@@ -9,6 +10,7 @@ export const FieldGroupSegment = ({
   fields,
   isModification,
   name,
+  noTranslatableFields,
   onFieldChange,
 }) => (
   <Segment>
@@ -26,7 +28,10 @@ export const FieldGroupSegment = ({
         ) : (
           <DynamicField
             scope={scope}
-            field={field}
+            field={{
+              ...field,
+              disabled: _.includes(field.name)(noTranslatableFields),
+            }}
             fields={fields}
             isModification={isModification}
             key={i}
@@ -43,6 +48,7 @@ FieldGroupSegment.propTypes = {
   name: PropTypes.string,
   onFieldChange: PropTypes.func,
   scope: PropTypes.string,
+  noTranslatableFields: PropTypes.array,
 };
 
 export default FieldGroupSegment;

package/src/components/SelectableDynamicForm.js

@@ -12,6 +12,8 @@ export default function SelectableDynamicForm({
   hideLabel,
   isModification,
   name,
+  noTranslatableFields,
+  actionKey,
   onChange,
   onNameChange,
   onTemplateChange = () => {},
@@ -19,8 +21,11 @@ export default function SelectableDynamicForm({
   required,
   scope,
   disabled,
+  disableSelector,
+  selectedTemplate,
 }) {
-  const [template, setTemplate] = useState();
+  const [thisTemplate, setThisTemplate] = useState();
+  const template = selectedTemplate || thisTemplate;
   const domain = _.size(domainIds) > 0 ? { id: _.head(domainIds) } : null;
 
   const handleChange = (content, currentTemplate = template) => {
@@ -41,7 +46,7 @@ export default function SelectableDynamicForm({
       template ? applyTemplate(template)(content, domain?.id) : {},
       template
     );
-    setTemplate(template);
+    setThisTemplate(template);
   };
 
   const handleSelected = (_e, { template }) => {
@@ -51,31 +56,35 @@ export default function SelectableDynamicForm({
       template ? applyTemplate(template)(content, domain?.id) : {},
       template
     );
-    setTemplate(template);
+    setThisTemplate(template);
   };
 
   return (
     <>
-      <TemplateSelector
-        scope={scope}
-        domainIds={domainIds}
-        hideLabel={hideLabel}
-        onChange={handleSelected}
-        onLoad={handleLoad}
-        placeholder={placeholder}
-        required={required}
-        selectedValue={template?.id}
-        disabled={disabled}
-      />
+      {!actionKey || actionKey == "create" ? (
+        <TemplateSelector
+          scope={scope}
+          domainIds={domainIds}
+          hideLabel={hideLabel}
+          onChange={handleSelected}
+          onLoad={handleLoad}
+          placeholder={placeholder}
+          required={required}
+          selectedValue={template?.id}
+          disabled={disabled || disableSelector}
+        />
+      ) : null}
+
       {!disabled && template ? (
         <>
           {header}
           <DynamicForm
             content={content}
-            isModification={isModification}
-            onChange={handleChange}
             selectedDomain={domain}
             template={template}
+            noTranslatableFields={noTranslatableFields}
+            isModification={isModification}
+            onChange={handleChange}
           />
         </>
       ) : null}
@@ -90,6 +99,8 @@ SelectableDynamicForm.propTypes = {
   hideLabel: PropTypes.bool,
   isModification: PropTypes.bool,
   name: PropTypes.string,
+  noTranslatableFields: PropTypes.array,
+  actionKey: PropTypes.string,
   onChange: PropTypes.func,
   onNameChange: PropTypes.func,
   onTemplateChange: PropTypes.func,
@@ -97,4 +108,6 @@ SelectableDynamicForm.propTypes = {
   required: PropTypes.bool,
   scope: PropTypes.string,
   disabled: PropTypes.bool,
+  disableSelector: PropTypes.bool,
+  selectedTemplate: PropTypes.object,
 };

package/src/components/widgets/DynamicField.js

@@ -74,13 +74,17 @@ export const DynamicField = ({
     description,
     value,
     editable = true,
+    disabled = false,
     ...fieldProps
   },
   isModification,
   onChange,
   scope,
 }) => (
-  <Form.Field disabled={!editable && isModification} data-testid="form-field">
+  <Form.Field
+    disabled={(!editable && isModification) || disabled}
+    data-testid="form-field"
+  >
     <label>
       {(label && fieldProps.type != "hierarchy") ||
       (fieldProps.type == "hierarchy" &&