@truedat/df 7.12.5 → 7.12.7

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

@@ -293,6 +293,23 @@ exports[`<FieldForm /> matches the latest snapshot 1`] = `
                 Table
               </span>
             </div>
+            <div
+              aria-checked="false"
+              aria-selected="false"
+              class="item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <i
+                aria-hidden="true"
+                class="table icon"
+              />
+              <span
+                class="text"
+              >
+                Dynamic Table
+              </span>
+            </div>
             <div
               aria-checked="false"
               aria-selected="false"
@@ -891,6 +908,23 @@ exports[`<FieldForm /> renders MandatoryConditional 1`] = `
                 Table
               </span>
             </div>
+            <div
+              aria-checked="false"
+              aria-selected="false"
+              class="item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <i
+                aria-hidden="true"
+                class="table icon"
+              />
+              <span
+                class="text"
+              >
+                Dynamic Table
+              </span>
+            </div>
             <div
               aria-checked="false"
               aria-selected="false"
@@ -1647,6 +1681,23 @@ exports[`<FieldForm /> renders ValuesField and manages onChange 1`] = `
                 Table
               </span>
             </div>
+            <div
+              aria-checked="false"
+              aria-selected="false"
+              class="item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <i
+                aria-hidden="true"
+                class="table icon"
+              />
+              <span
+                class="text"
+              >
+                Dynamic Table
+              </span>
+            </div>
             <div
               aria-checked="false"
               aria-selected="false"

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

@@ -1233,6 +1233,23 @@ exports[`<TemplateForm /> matches the latest snapshot for filled template 1`] =
                           Table
                         </span>
                       </div>
+                      <div
+                        aria-checked="false"
+                        aria-selected="false"
+                        class="item"
+                        role="option"
+                        style="pointer-events: all;"
+                      >
+                        <i
+                          aria-hidden="true"
+                          class="table icon"
+                        />
+                        <span
+                          class="text"
+                        >
+                          Dynamic Table
+                        </span>
+                      </div>
                       <div
                         aria-checked="false"
                         aria-selected="false"

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

@@ -51,129 +51,6 @@ exports[`<ValuesField /> fixed matches the latest snapshot for null values 1`] =
 </div>
 `;
 
-exports[`<ValuesField /> fixed_tuple matches the latest snapshot for null values 1`] = `
-<div>
-  <div
-    class="ui segment"
-  >
-    <div
-      class="ui middle aligned list"
-      role="list"
-    >
-      <div
-        class="item"
-        role="listitem"
-      >
-        <i
-          aria-hidden="true"
-          class="remove circle link icon"
-        />
-        <i
-          aria-hidden="true"
-          class="chevron circle up disabled link icon"
-        />
-        <i
-          aria-hidden="true"
-          class="chevron circle down disabled link icon"
-        />
-        <div
-          class="content"
-        >
-          Foo
-          / 
-          Bar
-        </div>
-      </div>
-      <div
-        class="item"
-        role="listitem"
-      >
-        <div
-          class="equal width fields"
-        >
-          <div
-            class="field"
-          >
-            <div
-              class="ui input"
-            >
-              <input
-                name="tuple_value"
-                placeholder="template.field.values.add_value"
-                type="text"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="field"
-          >
-            <div
-              class="ui icon input"
-            >
-              <input
-                name="tuple_text"
-                placeholder="template.field.values.add_text"
-                type="text"
-                value=""
-              />
-              <i
-                aria-hidden="true"
-                class="add circle link icon"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="equal width fields"
-    >
-      <div
-        class="field"
-      >
-        <div
-          class="field"
-        >
-          <div
-            class="ui checked checkbox"
-          >
-            <input
-              checked=""
-              class="hidden"
-              name="undefined.editable"
-              readonly=""
-              tabindex="0"
-              type="checkbox"
-            />
-            <label>
-              Editable
-            </label>
-          </div>
-        </div>
-      </div>
-      <div
-        class="field"
-      >
-        <div
-          class="ui checkbox"
-        >
-          <input
-            class="hidden"
-            readonly=""
-            tabindex="0"
-            type="checkbox"
-          />
-          <label>
-            template.field.subscribable
-          </label>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
 exports[`<ValuesField /> noPrefix matches the latest snapshot for null values 1`] = `
 <div>
   <div
@@ -225,58 +102,7 @@ exports[`<ValuesField /> noPrefix matches the latest snapshot for null values 1`
 </div>
 `;
 
-exports[`<ValuesField /> role_users matches the latest snapshot for not null values 1`] = `
-<div>
-  <div
-    class="ui segment"
-  >
-    <div
-      class="equal width fields"
-    >
-      <div
-        class="field"
-      >
-        <div
-          class="field"
-        >
-          <div
-            class="ui checked checkbox"
-          >
-            <input
-              checked=""
-              class="hidden"
-              name="undefined.editable"
-              readonly=""
-              tabindex="0"
-              type="checkbox"
-            />
-            <label>
-              Editable
-            </label>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="field"
-    >
-      <label>
-        template.field.values.default_value
-      </label>
-      <div
-        class="ui input"
-      >
-        <input
-          name="default_value"
-          type="text"
-        />
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<ValuesField /> switch matches the latest snapshot for null values 1`] = `
+exports[`<ValuesField /> table_columns matches the latest snapshot 1`] = `
 <div>
   <div
     class="ui segment"
@@ -288,174 +114,52 @@ exports[`<ValuesField /> switch matches the latest snapshot for null values 1`]
       <div
         class="item"
         role="listitem"
-      >
-        <div
-          class="field"
-        >
-          <label>
-            template.field.values.switch_field.label
-          </label>
-          <div
-            class="ui input"
-          >
-            <input
-              placeholder="template.field.values.switch_field"
-              type="text"
-              value="test"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="ui segment"
       >
         <i
           aria-hidden="true"
           class="remove circle link icon"
         />
-        a
+        <i
+          aria-hidden="true"
+          class="chevron circle up disabled link icon"
+        />
+        <i
+          aria-hidden="true"
+          class="chevron circle down link icon"
+        />
         <div
-          class="ui middle aligned list"
-          role="list"
+          class="content"
         >
-          <div
-            class="item"
-            role="listitem"
-          >
-            <i
-              aria-hidden="true"
-              class="remove circle link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="chevron circle up disabled link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="chevron circle down disabled link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="circle outline link icon"
-            />
-            <div
-              class="content"
-            >
-              1
-            </div>
-          </div>
-          <div
-            class="item"
-            role="listitem"
+          field1
+           
+          <span
+            class="is_required"
           >
-            <div
-              class="field"
-            >
-              <div
-                class="ui icon input"
-              >
-                <input
-                  name="fixed_value"
-                  placeholder="template.field.values.add_value"
-                  type="text"
-                  value=""
-                />
-                <i
-                  aria-hidden="true"
-                  class="add circle link icon"
-                />
-              </div>
-            </div>
-          </div>
+            *
+          </span>
         </div>
       </div>
       <div
-        class="ui segment"
+        class="item"
+        role="listitem"
       >
         <i
           aria-hidden="true"
           class="remove circle link icon"
         />
-        b
+        <i
+          aria-hidden="true"
+          class="chevron circle up link icon"
+        />
+        <i
+          aria-hidden="true"
+          class="chevron circle down disabled link icon"
+        />
         <div
-          class="ui middle aligned list"
-          role="list"
+          class="content"
         >
-          <div
-            class="item"
-            role="listitem"
-          >
-            <i
-              aria-hidden="true"
-              class="remove circle link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="chevron circle up disabled link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="chevron circle down link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="circle outline link icon"
-            />
-            <div
-              class="content"
-            >
-              2
-            </div>
-          </div>
-          <div
-            class="item"
-            role="listitem"
-          >
-            <i
-              aria-hidden="true"
-              class="remove circle link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="chevron circle up link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="chevron circle down disabled link icon"
-            />
-            <i
-              aria-hidden="true"
-              class="circle outline link icon"
-            />
-            <div
-              class="content"
-            >
-              3
-            </div>
-          </div>
-          <div
-            class="item"
-            role="listitem"
-          >
-            <div
-              class="field"
-            >
-              <div
-                class="ui icon input"
-              >
-                <input
-                  name="fixed_value"
-                  placeholder="template.field.values.add_value"
-                  type="text"
-                  value=""
-                />
-                <i
-                  aria-hidden="true"
-                  class="add circle link icon"
-                />
-              </div>
-            </div>
-          </div>
+          field2
+           
         </div>
       </div>
       <div
@@ -463,63 +167,48 @@ exports[`<ValuesField /> switch matches the latest snapshot for null values 1`]
         role="listitem"
       >
         <div
-          class="field"
+          class="equal width fields vertical_align"
         >
-          <label>
-            template.field.values.add_switch_value.label
-          </label>
           <div
-            class="ui icon input"
+            class="field"
           >
-            <input
-              placeholder="template.field.values.add_switch_value"
-              type="text"
-              value=""
-            />
-            <i
-              aria-hidden="true"
-              class="add circle icon"
-            />
+            <div
+              class="ui icon input"
+            >
+              <input
+                name="column_name"
+                placeholder="template.field.values.column_name"
+                type="text"
+                value=""
+              />
+              <i
+                aria-hidden="true"
+                class="add circle link icon"
+              />
+            </div>
           </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="equal width fields"
-    >
-      <div
-        class="field"
-      >
-        <div
-          class="field"
-        >
           <div
-            class="ui checked checkbox"
+            class="required field"
           >
-            <input
-              checked=""
-              class="hidden"
-              name="undefined.editable"
-              readonly=""
-              tabindex="0"
-              type="checkbox"
-            />
-            <label>
-              Editable
-            </label>
+            <div
+              class="ui checkbox"
+            >
+              <input
+                class="hidden"
+                name="column_mandatory"
+                readonly=""
+                required=""
+                tabindex="0"
+                type="checkbox"
+              />
+              <label>
+                template.field.values.column_mandatory
+              </label>
+            </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
-</div>
-`;
-
-exports[`<ValuesField /> table_columns matches the latest snapshot 1`] = `
-<div>
-  <div
-    class="ui segment"
-  >
     <div
       class="equal width fields"
     >
@@ -547,21 +236,6 @@ exports[`<ValuesField /> table_columns matches the latest snapshot 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="field"
-    >
-      <label>
-        template.field.values.default_value
-      </label>
-      <div
-        class="ui input"
-      >
-        <input
-          name="default_value"
-          type="text"
-        />
-      </div>
-    </div>
   </div>
 </div>
 `;

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

@@ -2,6 +2,14 @@ import _ from "lodash/fp";
 
 const arrayAnd = (list) => _.indexOf(true)(list) >= 0;
 
+const reduceField = (field) => {
+  if (field.type === "dynamic_table") {
+    const tableColumns = _.defaultTo([])(field?.values?.table_columns);
+    return [field, ...tableColumns];
+  }
+  return field;
+}
+
 export const parseContentValidation = (content) => {
   const duplicatedGroupNames = _.flow([
     _.countBy("name"),
@@ -11,6 +19,7 @@ export const parseContentValidation = (content) => {
   const duplicatedFieldNames = _.flow([
     _.map("fields"),
     _.reduce((acc, f) => [...acc, ...f], []),
+    _.flatMap(reduceField),
     _.countBy("name"),
     _.omitBy((v) => v == 1),
     _.keys,
@@ -74,8 +83,8 @@ export const parseContentValidation = (content) => {
         ],
       ])();
 
-      const tableCoulmnEmpty =
-        checkFieldType(field, "table") &&
+      const tableColumnEmpty =
+        (checkFieldType(field, "table") || checkFieldType(field, "dynamic_table")) &&
         _.has("table_columns", field.values) &&
         _.isEmpty(field.values.table_columns);
 
@@ -94,7 +103,7 @@ export const parseContentValidation = (content) => {
         nameEmpty,
         labelEmpty,
         dropdownWidgetInvalid,
-        tableCoulmnEmpty,
+        tableColumnEmpty,
         conditionalVisibilityValueEmpty,
         mandatoryDependingOnValueEmpty,
       ]);
@@ -102,6 +111,16 @@ export const parseContentValidation = (content) => {
         hasErrors,
         nameDuplicated,
       };
+
+      if (field?.type === "dynamic_table") {
+        const validatedTableColumns = parseFieldsValidation(field.values.table_columns);
+        const hasChildrenErrors = _.any(_.propOr(false, "errors.hasErrors"))(validatedTableColumns);
+
+        return _.flow(
+          _.set("errors", { ...errors, hasErrors: errors?.hasErrors || hasChildrenErrors }),
+          _.set("values.table_columns", validatedTableColumns)
+        )(field);
+      }
       return { ...field, errors };
     })(fields);
   };

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

@@ -29,6 +29,7 @@ const eligibleValues = {
   color_picker: { string: [null] },
   enriched_text: { enriched_text: [null] },
   table: { table: ["table_columns"] },
+  dynamic_table: { dynamic_table: ["table_columns"] },
   password: { string: [null] },
   image: { image: [null] },
 };
@@ -38,8 +39,7 @@ export const getValues = (widget, fieldType) => {
   return _.filter(({ value }) => available.includes(value))(valueTypes);
 };
 
-export const listFormat = (type) =>
-  ["fixed", "fixed_tuple", "table_columns"].includes(type);
+export const listFormat = (type) => ["fixed", "fixed_tuple", "table_columns"].includes(type);
 
 export const defaultValue = (type, fieldType) =>
   (!type && _.negate(_.includes(fieldType))(["url", "system", "domain"])) ||
@@ -54,3 +54,17 @@ export const valuesSelector = (type) =>
 
 export const valueSegment = (values, type, fieldType) =>
   _.size(values) > 1 || valuesSelector(type) || defaultValue(type, fieldType);
+
+export const hasAiSuggestions = (fieldType, keyType) => _.includes(fieldType)(["string", "enriched_text"]) &&
+  _.includes(keyType)(["fixed", "fixed_tuple", undefined]);
+
+const typeFromKey = (keys) =>
+  _.includes("role_groups")(keys)
+    ? "role_groups"
+    : _.includes("role_users")(keys)
+      ? "role_users"
+      : _.includes("hierarchy")(keys)
+        ? "hierarchy"
+        : _.first(keys);
+
+export const getKeyType = (field) => _.flow([_.getOr({}, "values"), _.keys, typeFromKey])(field);