@truedat/df 5.18.3 → 5.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "5.18.3",
+  "version": "5.19.0",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -87,8 +87,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.18.3",
-    "@truedat/core": "5.18.3",
+    "@truedat/auth": "5.19.0",
+    "@truedat/core": "5.19.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": "ba00f358149f00dcdabb3e3edd883c54c0bbd43a"
+  "gitHead": "df3fcd6655456c3468259d79762800c3c417147d"
 }

package/src/templates/components/templateForm/FieldForm.js

@@ -15,7 +15,6 @@ import {
 import { getValues } from "./valueDefinitions";
 
 const boostingEnabledScopes = ["bg", "dq", "ie", "ri"];
-const searchableEnabledScopes = ["bg", "dq", "ie", "ri", "dd"];
 
 const typeFromKey = (keys) =>
   _.includes("role_groups")(keys)
@@ -50,9 +49,7 @@ export const FieldForm = ({
     widget,
     disabledName,
     errors,
-    editable = true,
     boost = "",
-    searchable = true,
   } = field;
   const fieldNamePrefix = `${groupNamePrefix}.fields[${fieldIndex}]`;
   const valueName = `${fieldNamePrefix}.values`;
@@ -122,12 +119,6 @@ export const FieldForm = ({
     changeValue(valueName, value);
   };
 
-  const checkboxEnabledText = (value) => {
-    const msgPath = "template.field.checkbox.";
-    const msg = value ? msgPath + "enabled" : msgPath + "disabled";
-    return formatMessage({ id: msg });
-  };
-
   //On widget change, verify if type and cardinality are still valid
   useEffect(() => {
     const widgetOptions = _.find({ value: widget })(WIDGETS);
@@ -263,34 +254,6 @@ export const FieldForm = ({
             />
           </Form.Field>
         ) : null}
-        {_.includes(scope)(searchableEnabledScopes) ? (
-          <Form.Field>
-            <label>
-              <FormattedMessage id="template.field.searchable" />
-            </label>
-            <Form.Checkbox
-              name={`${fieldNamePrefix}.searchable`}
-              label={checkboxEnabledText(searchable)}
-              checked={searchable}
-              onChange={(e, { name, checked: value }) =>
-                onChange(null, { name, value })
-              }
-            />
-          </Form.Field>
-        ) : null}
-        <Form.Field>
-          <label>
-            <FormattedMessage id="template.field.editable" />
-          </label>
-          <Form.Checkbox
-            name={`${fieldNamePrefix}.editable`}
-            label={checkboxEnabledText(editable)}
-            checked={editable}
-            onChange={(e, { name, checked: value }) =>
-              onChange(null, { name, value })
-            }
-          />
-        </Form.Field>
       </Form.Group>
       <ValuesField
         defaultField={defaultField}
@@ -301,6 +264,8 @@ export const FieldForm = ({
         onChange={onChange}
         onSelectionChange={onValueSelectionChange}
         subscribableField={subscribableField}
+        fieldNamePrefix={fieldNamePrefix}
+        scope={scope}
         values={values}
       />
       <ConditionalFieldForm

package/src/templates/components/templateForm/TemplateForm.js

@@ -80,6 +80,7 @@ export const TemplateForm = ({ loading, template, onSubmit }) => {
               "editable",
               "boost",
               "searchable",
+              "ai_suggestion",
             ];
 
             const dependsProperty = _.isEmpty(_.path("depends.on")(field))

package/src/templates/components/templateForm/ValuesField.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { Form, Segment } from "semantic-ui-react";
 import { useIntl } from "react-intl";
@@ -7,6 +7,8 @@ import DefaultValue from "./DefaultValue";
 import ValuesSelector from "./ValuesSelector";
 import { valueSegment } from "./valueDefinitions";
 
+const searchableEnabledScopes = ["bg", "dq", "ie", "ri", "dd"];
+
 export const ValuesField = ({
   defaultField,
   field,
@@ -17,8 +19,22 @@ export const ValuesField = ({
   onSelectionChange,
   subscribableField,
   values,
+  fieldNamePrefix,
+  scope,
 }) => {
   const { formatMessage } = useIntl();
+  const { ai_suggestion, editable = true, searchable = true } = field;
+
+  const hasAiSuggestion =
+    fieldType === "string" &&
+    _.includes(keyType)(["fixed", "fixed_tuple", undefined]);
+  useEffect(() => {
+    if (!hasAiSuggestion)
+      onChange(null, {
+        name: `${fieldNamePrefix}.ai_suggestion`,
+        value: false,
+      });
+  }, [hasAiSuggestion]);
 
   const valueTypes = (options) =>
     _.map(({ id, value }) => ({
@@ -54,16 +70,63 @@ export const ValuesField = ({
               values={_.path(`values.${keyType}`)(field)}
             />
           ) : null}
-          {_.includes(keyType)(["fixed", "fixed_tuple"]) ? (
-            <Form.Checkbox
-              name={subscribableField}
-              label={formatMessage({ id: "template.field.subscribable" })}
-              checked={_.prop("subscribable")(field) || false}
-              onChange={(e, { name, checked: value }) =>
-                onChange(null, { name, value })
-              }
-            />
-          ) : null}
+          <Form.Group size="small" widths="equal">
+            <Form.Field>
+              <Form.Checkbox
+                name={`${fieldNamePrefix}.editable`}
+                label={formatMessage({
+                  id: "template.field.editable",
+                  defaultMessage: "Editable",
+                })}
+                checked={editable}
+                onChange={(e, { name, checked: value }) =>
+                  onChange(null, { name, value })
+                }
+              />
+            </Form.Field>
+
+            {hasAiSuggestion ? (
+              <Form.Field>
+                <Form.Checkbox
+                  name={`${fieldNamePrefix}.ai_suggestion`}
+                  label={formatMessage({
+                    id: "template.field.ai_suggestion",
+                    defaultMessage: "AI Suggestions",
+                  })}
+                  checked={ai_suggestion}
+                  onChange={(_e, { name, checked: value }) =>
+                    onChange(null, { name, value })
+                  }
+                />
+              </Form.Field>
+            ) : null}
+
+            {_.includes(scope)(searchableEnabledScopes) ? (
+              <Form.Field>
+                <Form.Checkbox
+                  name={`${fieldNamePrefix}.searchable`}
+                  label={formatMessage({
+                    id: "template.field.searchable",
+                    defaultMessage: "Sercheable",
+                  })}
+                  checked={searchable}
+                  onChange={(_e, { name, checked: value }) =>
+                    onChange(null, { name, value })
+                  }
+                />
+              </Form.Field>
+            ) : null}
+            {_.includes(keyType)(["fixed", "fixed_tuple"]) ? (
+              <Form.Checkbox
+                name={subscribableField}
+                label={formatMessage({ id: "template.field.subscribable" })}
+                checked={_.prop("subscribable")(field) || false}
+                onChange={(_e, { name, checked: value }) =>
+                  onChange(null, { name, value })
+                }
+              />
+            ) : null}
+          </Form.Group>
           <DefaultValue
             defaultField={defaultField}
             field={field}
@@ -86,6 +149,8 @@ ValuesField.propTypes = {
   onSelectionChange: PropTypes.func,
   subscribableField: PropTypes.string,
   values: PropTypes.array,
+  fieldNamePrefix: PropTypes.string,
+  scope: PropTypes.string,
 };
 
 export default ValuesField;

package/src/templates/components/templateForm/__tests__/__snapshots__/FieldForm.spec.js.snap

@@ -208,21 +208,6 @@ exports[`<FieldForm /> manages handleCardinalityChange 1`] = `
       selection={true}
       value="?"
     />
-    <FormField>
-      <label>
-        <MemoizedFormattedMessage
-          id="template.field.editable"
-        />
-      </label>
-      <FormCheckbox
-        as={[Function]}
-        checked={true}
-        control={[Function]}
-        label="template.field.checkbox.enabled"
-        name="Group.fields[0].editable"
-        onChange={[Function]}
-      />
-    </FormField>
   </FormGroup>
   <ValuesField
     defaultField="Group.fields[0].default"
@@ -239,6 +224,7 @@ exports[`<FieldForm /> manages handleCardinalityChange 1`] = `
         "name": "name",
       }
     }
+    fieldNamePrefix="Group.fields[0]"
     name="Group.fields[0].values"
     onChange={[MockFunction]}
     onSelectionChange={[Function]}
@@ -602,21 +588,6 @@ exports[`<FieldForm /> matches the latest snapshot 1`] = `
       required={true}
       selection={true}
     />
-    <FormField>
-      <label>
-        <MemoizedFormattedMessage
-          id="template.field.editable"
-        />
-      </label>
-      <FormCheckbox
-        as={[Function]}
-        checked={true}
-        control={[Function]}
-        label="template.field.checkbox.enabled"
-        name="undefined.fields[0].editable"
-        onChange={[Function]}
-      />
-    </FormField>
   </FormGroup>
   <ValuesField
     defaultField="undefined.fields[0].default"
@@ -637,6 +608,7 @@ exports[`<FieldForm /> matches the latest snapshot 1`] = `
         "widget": "string",
       }
     }
+    fieldNamePrefix="undefined.fields[0]"
     fieldType="list"
     keyType="0"
     name="undefined.fields[0].values"
@@ -877,21 +849,6 @@ exports[`<FieldForm /> renders MandatoryConditional 1`] = `
       selection={true}
       value="?"
     />
-    <FormField>
-      <label>
-        <MemoizedFormattedMessage
-          id="template.field.editable"
-        />
-      </label>
-      <FormCheckbox
-        as={[Function]}
-        checked={true}
-        control={[Function]}
-        label="template.field.checkbox.enabled"
-        name="Group.fields[0].editable"
-        onChange={[Function]}
-      />
-    </FormField>
   </FormGroup>
   <ValuesField
     defaultField="Group.fields[0].default"
@@ -908,6 +865,7 @@ exports[`<FieldForm /> renders MandatoryConditional 1`] = `
         "name": "name",
       }
     }
+    fieldNamePrefix="Group.fields[0]"
     name="Group.fields[0].values"
     onChange={[MockFunction]}
     onSelectionChange={[Function]}
@@ -1296,21 +1254,6 @@ exports[`<FieldForm /> renders ValuesField and manages onChange 1`] = `
       required={true}
       selection={true}
     />
-    <FormField>
-      <label>
-        <MemoizedFormattedMessage
-          id="template.field.editable"
-        />
-      </label>
-      <FormCheckbox
-        as={[Function]}
-        checked={true}
-        control={[Function]}
-        label="template.field.checkbox.enabled"
-        name="Group.fields[0].editable"
-        onChange={[Function]}
-      />
-    </FormField>
   </FormGroup>
   <ValuesField
     defaultField="Group.fields[0].default"
@@ -1330,6 +1273,7 @@ exports[`<FieldForm /> renders ValuesField and manages onChange 1`] = `
         "widget": "dropdown",
       }
     }
+    fieldNamePrefix="Group.fields[0]"
     fieldType="string"
     keyType="fixed"
     name="Group.fields[0].values"

package/src/templates/components/templateForm/__tests__/__snapshots__/ValuesField.spec.js.snap

@@ -2,6 +2,21 @@
 
 exports[`<ValuesField /> fixed matches the latest snapshot for null values 1`] = `
 <Segment>
+  <FormGroup
+    size="small"
+    widths="equal"
+  >
+    <FormField>
+      <FormCheckbox
+        as={[Function]}
+        checked={true}
+        control={[Function]}
+        label="template.field.editable"
+        name="undefined.editable"
+        onChange={[Function]}
+      />
+    </FormField>
+  </FormGroup>
   <DefaultValue
     field={
       {
@@ -35,13 +50,28 @@ exports[`<ValuesField /> fixed_tuple matches the latest snapshot for null values
       ]
     }
   />
-  <FormCheckbox
-    as={[Function]}
-    checked={false}
-    control={[Function]}
-    label="template.field.subscribable"
-    onChange={[Function]}
-  />
+  <FormGroup
+    size="small"
+    widths="equal"
+  >
+    <FormField>
+      <FormCheckbox
+        as={[Function]}
+        checked={true}
+        control={[Function]}
+        label="template.field.editable"
+        name="undefined.editable"
+        onChange={[Function]}
+      />
+    </FormField>
+    <FormCheckbox
+      as={[Function]}
+      checked={false}
+      control={[Function]}
+      label="template.field.subscribable"
+      onChange={[Function]}
+    />
+  </FormGroup>
   <DefaultValue
     field={
       {
@@ -64,6 +94,21 @@ exports[`<ValuesField /> fixed_tuple matches the latest snapshot for null values
 
 exports[`<ValuesField /> noPrefix matches the latest snapshot for null values 1`] = `
 <Segment>
+  <FormGroup
+    size="small"
+    widths="equal"
+  >
+    <FormField>
+      <FormCheckbox
+        as={[Function]}
+        checked={true}
+        control={[Function]}
+        label="template.field.editable"
+        name="undefined.editable"
+        onChange={[Function]}
+      />
+    </FormField>
+  </FormGroup>
   <DefaultValue
     field={
       {
@@ -78,6 +123,21 @@ exports[`<ValuesField /> noPrefix matches the latest snapshot for null values 1`
 
 exports[`<ValuesField /> role_users matches the latest snapshot for not null values 1`] = `
 <Segment>
+  <FormGroup
+    size="small"
+    widths="equal"
+  >
+    <FormField>
+      <FormCheckbox
+        as={[Function]}
+        checked={true}
+        control={[Function]}
+        label="template.field.editable"
+        name="undefined.editable"
+        onChange={[Function]}
+      />
+    </FormField>
+  </FormGroup>
   <DefaultValue
     field={
       {
@@ -114,6 +174,21 @@ exports[`<ValuesField /> switch matches the latest snapshot for null values 1`]
       }
     }
   />
+  <FormGroup
+    size="small"
+    widths="equal"
+  >
+    <FormField>
+      <FormCheckbox
+        as={[Function]}
+        checked={true}
+        control={[Function]}
+        label="template.field.editable"
+        name="undefined.editable"
+        onChange={[Function]}
+      />
+    </FormField>
+  </FormGroup>
   <DefaultValue
     field={
       {
@@ -142,6 +217,21 @@ exports[`<ValuesField /> switch matches the latest snapshot for null values 1`]
 
 exports[`<ValuesField /> table_columns matches the latest snapshot 1`] = `
 <Segment>
+  <FormGroup
+    size="small"
+    widths="equal"
+  >
+    <FormField>
+      <FormCheckbox
+        as={[Function]}
+        checked={true}
+        control={[Function]}
+        label="template.field.editable"
+        name="undefined.editable"
+        onChange={[Function]}
+      />
+    </FormField>
+  </FormGroup>
   <DefaultValue
     field={
       {