@bigbinary/neeto-fields-frontend 1.0.5 → 1.0.7

package/dist/index.cjs.js

@@ -5,19 +5,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var neetoui = require('@bigbinary/neetoui');
 var ramda = require('ramda');
-var formik$1 = require('@bigbinary/neetoui/formik');
+var formik = require('@bigbinary/neetoui/formik');
 var reactQuery = require('react-query');
 var axios = require('axios');
 var utils = require('@bigbinary/neeto-commons-frontend/utils');
 var pure = require('@bigbinary/neeto-commons-frontend/pure');
 var yup = require('yup');
-var formik = require('formik');
+var formik$1 = require('formik');
 var neetoIcons = require('@bigbinary/neeto-icons');
 var Container = require('@bigbinary/neeto-molecules/Container');
 var Header = require('@bigbinary/neeto-molecules/Header');
 var MenuBar = require('@bigbinary/neeto-molecules/MenuBar');
 var PageLoader = require('@bigbinary/neeto-molecules/PageLoader');
 var SubHeader = require('@bigbinary/neeto-molecules/SubHeader');
+var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
 var reactRouterDom = require('react-router-dom');
 var TableWrapper = require('@bigbinary/neeto-molecules/TableWrapper');
 var reactDom = require('react-dom');
@@ -3748,8 +3749,8 @@ function transformOptions(options) {
   return options;
 }
 
-function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$8(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys$d(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$d(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$d(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$d(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function noop$1() {}
@@ -3809,9 +3810,9 @@ var I18n = function (_EventEmitter) {
         }
       }
       var defOpts = get();
-      this.options = _objectSpread$8(_objectSpread$8(_objectSpread$8({}, defOpts), this.options), transformOptions(options));
+      this.options = _objectSpread$d(_objectSpread$d(_objectSpread$d({}, defOpts), this.options), transformOptions(options));
       if (this.options.compatibilityAPI !== 'v1') {
-        this.options.interpolation = _objectSpread$8(_objectSpread$8({}, defOpts.interpolation), this.options.interpolation);
+        this.options.interpolation = _objectSpread$d(_objectSpread$d({}, defOpts.interpolation), this.options.interpolation);
       }
       if (options.keySeparator !== undefined) {
         this.options.userDefinedKeySeparator = options.keySeparator;
@@ -4089,7 +4090,7 @@ var I18n = function (_EventEmitter) {
           }
           options = _this5.options.overloadTranslationOptionHandler([key, opts].concat(rest));
         } else {
-          options = _objectSpread$8({}, opts);
+          options = _objectSpread$d({}, opts);
         }
         options.lng = options.lng || fixedT.lng;
         options.lngs = options.lngs || fixedT.lngs;
@@ -4216,7 +4217,7 @@ var I18n = function (_EventEmitter) {
       var _this8 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop$1;
-      var mergedOptions = _objectSpread$8(_objectSpread$8(_objectSpread$8({}, this.options), options), {
+      var mergedOptions = _objectSpread$d(_objectSpread$d(_objectSpread$d({}, this.options), options), {
         isClone: true
       });
       var clone = new I18n(mergedOptions);
@@ -4227,7 +4228,7 @@ var I18n = function (_EventEmitter) {
       membersToCopy.forEach(function (m) {
         clone[m] = _this8[m];
       });
-      clone.services = _objectSpread$8({}, this.services);
+      clone.services = _objectSpread$d({}, this.services);
       clone.services.utils = {
         hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
       };
@@ -4666,9 +4667,9 @@ function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$c(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$c(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$c(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var defaultOptions$1 = {
   bindI18n: 'languageChanged',
   bindI18nStore: '',
@@ -4682,7 +4683,7 @@ var i18nInstance;
 var I18nContext = React__default["default"].createContext();
 function setDefaults() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  defaultOptions$1 = _objectSpread$7(_objectSpread$7({}, defaultOptions$1), options);
+  defaultOptions$1 = _objectSpread$c(_objectSpread$c({}, defaultOptions$1), options);
 }
 function getDefaults() {
   return defaultOptions$1;
@@ -4838,9 +4839,9 @@ function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 
-function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$b(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$b(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$b(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 function useTranslation(ns) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var i18nFromProps = props.i18n;
@@ -4868,7 +4869,7 @@ function useTranslation(ns) {
 
   if (i18n.options.react && i18n.options.react.wait !== undefined) warnOnce('It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.');
 
-  var i18nOptions = _objectSpread$6(_objectSpread$6(_objectSpread$6({}, getDefaults()), i18n.options.react), props);
+  var i18nOptions = _objectSpread$b(_objectSpread$b(_objectSpread$b({}, getDefaults()), i18n.options.react), props);
 
   var useSuspense = i18nOptions.useSuspense,
       keyPrefix = i18nOptions.keyPrefix;
@@ -4992,6 +4993,7 @@ var fields = {
 		dateRange: "Date range",
 		timeRange: "Time range",
 		textArea: "Text area",
+		textarea: "Textarea",
 		decimal: "Decimal",
 		integer: "Integer",
 		regex: "Regex",
@@ -5014,9 +5016,9 @@ var validations = {
 	fieldOptionIsRequired: "Field option is required",
 	kindIsRequired: "Kind is required",
 	notAValidNumber: "Entered number is not valid",
-	notAValidInteger: "Entered number is not valid",
+	notAValidInteger: "Entered number is not a valid integer",
 	notAValid: "Entered number is not valid",
-	thisIsRequired: "This is s required field",
+	thisIsRequired: "This is a required field",
 	minOneItem: "Select at least one item"
 };
 var tooltips = {
@@ -5072,6 +5074,7 @@ var KINDS = {
   time: "time",
   dateRange: "date_range",
   timeRange: "time_range",
+  textarea: "textarea",
   textArea: "text_area",
   person: "person",
   checkbox: "checkbox",
@@ -5090,6 +5093,7 @@ var DISPLAY_KINDS = {
   time: t("fields.kinds.time"),
   date_range: t("fields.kinds.dateRange"),
   time_range: t("fields.kinds.timeRange"),
+  textarea: t("fields.kinds.textarea"),
   text_area: t("fields.kinds.textArea"),
   person: t("fields.kinds.person"),
   checkbox: t("fields.kinds.checkbox"),
@@ -5123,6 +5127,18 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _toConsumableArray(arr) {
+  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+
 var NEETO_FIELDS_URL = "/neeto_fields_engine/api/v1";
 var FIELDS_URL = "".concat(NEETO_FIELDS_URL, "/fields");
 var FIELD_VALUES_URL = "".concat(NEETO_FIELDS_URL, "/field_values");
@@ -5189,49 +5205,71 @@ var QUERY_KEYS = {
   FIELD_VALUES: "field_values",
   CONFIGS: "configurations"
 };
+var DEFAULT_STALE_TIME = 3600000; // 1 hour
 
+function ownKeys$a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$a(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FIELDS = QUERY_KEYS.FIELDS;
 var useFetchFields = function useFetchFields(_ref, options) {
   var resourceType = _ref.resourceType,
     ownerId = _ref.ownerId,
-    state = _ref.state;
-  return reactQuery.useQuery([FIELDS, resourceType, ownerId, state], function () {
+    state = _ref.state,
+    _ref$prefixQueryKeys = _ref.prefixQueryKeys,
+    prefixQueryKeys = _ref$prefixQueryKeys === void 0 ? [] : _ref$prefixQueryKeys;
+  return reactQuery.useQuery([FIELDS].concat(_toConsumableArray(prefixQueryKeys), [resourceType, ownerId, state]), function () {
     return fieldsApi.fetch({
       resourceType: resourceType,
       ownerId: ownerId,
       state: state
     });
-  }, options);
+  }, _objectSpread$a({
+    staleTime: DEFAULT_STALE_TIME
+  }, options));
 };
-var useCreateField = function useCreateField() {
+var useCreateField = function useCreateField(options) {
   var queryClient = reactQuery.useQueryClient();
-  return reactQuery.useMutation(fieldsApi.create, {
+  return reactQuery.useMutation(fieldsApi.create, _objectSpread$a(_objectSpread$a({}, options), {}, {
     onSuccess: function onSuccess() {
+      var _options$onSuccess;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call.apply(_options$onSuccess, [options].concat(args));
       queryClient.invalidateQueries(FIELDS);
     }
-  });
+  }));
 };
-var useShowField = function useShowField(fieldId) {
+var useShowField = function useShowField(fieldId, options) {
   var queryKey = [FIELDS, fieldId];
   return reactQuery.useQuery(queryKey, function () {
     return fieldsApi.show(fieldId);
-  });
+  }, options);
 };
-var useUpdateField = function useUpdateField() {
+var useUpdateField = function useUpdateField(options) {
   var queryClient = reactQuery.useQueryClient();
-  return reactQuery.useMutation(fieldsApi.update, {
+  return reactQuery.useMutation(fieldsApi.update, _objectSpread$a(_objectSpread$a({}, options), {}, {
     onSuccess: function onSuccess() {
+      var _options$onSuccess2;
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      options === null || options === void 0 ? void 0 : (_options$onSuccess2 = options.onSuccess) === null || _options$onSuccess2 === void 0 ? void 0 : _options$onSuccess2.call.apply(_options$onSuccess2, [options].concat(args));
       queryClient.invalidateQueries(FIELDS);
     }
-  });
+  }));
 };
-var useDestroyField = function useDestroyField() {
+var useDestroyField = function useDestroyField(options) {
   var queryClient = reactQuery.useQueryClient();
-  return reactQuery.useMutation(fieldsApi.destroy, {
+  return reactQuery.useMutation(fieldsApi.destroy, _objectSpread$a(_objectSpread$a({}, options), {}, {
     onSuccess: function onSuccess() {
+      var _options$onSuccess3;
+      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
+      }
+      options === null || options === void 0 ? void 0 : (_options$onSuccess3 = options.onSuccess) === null || _options$onSuccess3 === void 0 ? void 0 : _options$onSuccess3.call.apply(_options$onSuccess3, [options].concat(args));
       queryClient.invalidateQueries(FIELDS);
     }
-  });
+  }));
 };
 var useReorderFields = function useReorderFields() {
   var queryClient = reactQuery.useQueryClient();
@@ -5242,11 +5280,11 @@ var useReorderFields = function useReorderFields() {
   });
 };
 
-function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$9(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var arrangeOptionsDisplayOrder = function arrangeOptionsDisplayOrder(options) {
   return options.map(function (option, index) {
-    return _objectSpread$5(_objectSpread$5({}, option), {}, {
+    return _objectSpread$9(_objectSpread$9({}, option), {}, {
       displayOrder: index
     });
   });
@@ -5258,8 +5296,10 @@ var buildPayload = function buildPayload(_ref) {
     _ref$ownerId = _ref.ownerId,
     ownerId = _ref$ownerId === void 0 ? "" : _ref$ownerId;
   var kind = formValues.kind.value;
-  return _objectSpread$5(_objectSpread$5({}, ramda.omit(["createdAt", "id", "ownerId", "ownerType", "updatedAt"], formValues)), {}, {
+  var name = formValues.name.trim();
+  return _objectSpread$9(_objectSpread$9({}, ramda.omit(["createdAt", "id", "ownerId", "ownerType", "updatedAt"], formValues)), {}, {
     kind: kind,
+    name: name,
     resourceType: ramda.isEmpty(resourceType) ? undefined : resourceType,
     ownerId: ramda.isEmpty(ownerId) ? undefined : ownerId,
     data: isDropdown(kind) ? arrangeOptionsDisplayOrder(formValues.data) : formValues.data
@@ -5284,7 +5324,27 @@ var getPermittedKinds = function getPermittedKinds(_ref2) {
   return permittedKinds;
 };
 var generateValidationSchema = function generateValidationSchema(additionalValidations) {
-  return yup__namespace.object().shape(_objectSpread$5(_objectSpread$5({}, BASIC_FIELD_FORM_VALIDATIONS), additionalValidations));
+  return yup__namespace.object().shape(_objectSpread$9(_objectSpread$9({}, BASIC_FIELD_FORM_VALIDATIONS), additionalValidations));
+};
+var renderFormFooter = function renderFormFooter(_ref3) {
+  var onClose = _ref3.onClose,
+    loading = _ref3.loading,
+    _ref3$dirty = _ref3.dirty,
+    dirty = _ref3$dirty === void 0 ? true : _ref3$dirty;
+  return /*#__PURE__*/React__default["default"].createElement(neetoui.Pane.Footer, null, /*#__PURE__*/React__default["default"].createElement(formik.ActionBlock, {
+    cancelButtonProps: {
+      onClick: onClose,
+      style: "text",
+      disabled: loading
+    },
+    submitButtonProps: {
+      label: t("labels.saveChanges"),
+      className: "mr-2",
+      type: "submit",
+      disabled: !dirty,
+      loading: loading
+    }
+  }));
 };
 
 var regexValidationSchema = yup__namespace.object().shape({
@@ -5346,6 +5406,11 @@ var FIELD_KINDS = {
     label: t("fields.kinds.textArea"),
     group: 1
   },
+  textarea: {
+    value: "textarea",
+    label: t("fields.kinds.textarea"),
+    group: 1
+  },
   person: {
     value: "person",
     label: t("fields.kinds.person"),
@@ -5414,7 +5479,7 @@ var BASIC_FIELD_FORM_VALIDATIONS = {
 var AdditionalInputs = function AdditionalInputs() {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useFormikContext = formik.useFormikContext(),
+  var _useFormikContext = formik$1.useFormikContext(),
     _useFormikContext$val = _useFormikContext.values,
     kind = _useFormikContext$val.kind,
     options = _useFormikContext$val.data,
@@ -5426,7 +5491,7 @@ var AdditionalInputs = function AdditionalInputs() {
     return arrayHelpers.push(DEFAULT_OPTION);
   };
   if (isDropdown(kind.value)) {
-    return /*#__PURE__*/React__default["default"].createElement(formik.FieldArray, {
+    return /*#__PURE__*/React__default["default"].createElement(formik$1.FieldArray, {
       name: "data"
     }, function (arrayHelpers) {
       return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -5439,7 +5504,7 @@ var AdditionalInputs = function AdditionalInputs() {
           key: index
         }, /*#__PURE__*/React__default["default"].createElement("div", {
           className: "w-full"
-        }, /*#__PURE__*/React__default["default"].createElement(formik$1.Input, {
+        }, /*#__PURE__*/React__default["default"].createElement(formik.Input, {
           disabled: isSystem,
           name: "data.".concat(index, ".label"),
           placeholder: t("placeholders.enterAnOption"),
@@ -5466,12 +5531,12 @@ var AdditionalInputs = function AdditionalInputs() {
       className: "flex w-full flex-col gap-y-4"
     }, /*#__PURE__*/React__default["default"].createElement(neetoui.Label, {
       required: true
-    }, t("titles.regexOptions")), /*#__PURE__*/React__default["default"].createElement(formik$1.Input, {
+    }, t("titles.regexOptions")), /*#__PURE__*/React__default["default"].createElement(formik.Input, {
       disabled: isSystem,
       label: t("labels.regexCondition"),
       name: "data.condition",
       placeholder: t("placeholders.regexExample")
-    }), /*#__PURE__*/React__default["default"].createElement(formik$1.Input, {
+    }), /*#__PURE__*/React__default["default"].createElement(formik.Input, {
       disabled: isSystem,
       label: t("labels.helpMessage"),
       name: "data.helpMessage",
@@ -5489,10 +5554,12 @@ var FieldForm = function FieldForm(_ref) {
     kindSelectOptions = _ref$kindSelectOption === void 0 ? [] : _ref$kindSelectOption,
     _ref$isSystem = _ref.isSystem,
     isSystem = _ref$isSystem === void 0 ? false : _ref$isSystem,
+    _ref$hideRequiredSwit = _ref.hideRequiredSwitch,
+    hideRequiredSwitch = _ref$hideRequiredSwit === void 0 ? false : _ref$hideRequiredSwit,
     children = _ref.children;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useFormikContext = formik.useFormikContext(),
+  var _useFormikContext = formik$1.useFormikContext(),
     options = _useFormikContext.values.data,
     setFieldValue = _useFormikContext.setFieldValue;
   var handleKindChange = function handleKindChange(kind) {
@@ -5505,22 +5572,22 @@ var FieldForm = function FieldForm(_ref) {
   };
   return /*#__PURE__*/React__default["default"].createElement(neetoui.Pane.Body, null, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "w-full space-y-4"
-  }, /*#__PURE__*/React__default["default"].createElement(formik$1.Input, {
+  }, /*#__PURE__*/React__default["default"].createElement(formik.Input, {
     required: true,
     disabled: isSystem,
     label: t("labels.fieldName"),
     name: "name",
     placeholder: t("placeholders.enterFieldName")
-  }), /*#__PURE__*/React__default["default"].createElement(formik$1.Select, {
+  }), /*#__PURE__*/React__default["default"].createElement(formik.Select, {
     isSearchable: true,
     isDisabled: isSystem,
     label: t("labels.fieldKind"),
     name: "kind",
     options: kindSelectOptions,
     onChange: handleKindChange
-  }), isAdditionalDataNeeded(chosenKind) && /*#__PURE__*/React__default["default"].createElement(AdditionalInputs, null), /*#__PURE__*/React__default["default"].createElement(neetoui.Label, {
+  }), isAdditionalDataNeeded(chosenKind) && /*#__PURE__*/React__default["default"].createElement(AdditionalInputs, null), !hideRequiredSwitch && /*#__PURE__*/React__default["default"].createElement(neetoui.Label, {
     className: "flex items-center gap-2"
-  }, /*#__PURE__*/React__default["default"].createElement(formik$1.Switch, {
+  }, /*#__PURE__*/React__default["default"].createElement(formik.Switch, {
     name: "isRequired"
   }), /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
     className: "leading-4",
@@ -5529,9 +5596,9 @@ var FieldForm = function FieldForm(_ref) {
   }, t("labels.isRequired"))), children));
 };
 
-var _excluded$2 = ["resourceType", "allowedKinds", "additionalValidations", "initialValues", "onClose"];
-function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _excluded$3 = ["resourceType", "allowedKinds", "additionalValidations", "initialValues", "onClose"];
+function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$8(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 /** @type {React.FC<import("types").AddProps>} */
 
@@ -5541,7 +5608,7 @@ var Add = function Add(_ref) {
     additionalValidations = _ref.additionalValidations,
     initialValues = _ref.initialValues,
     onClose = _ref.onClose,
-    props = _objectWithoutProperties(_ref, _excluded$2);
+    props = _objectWithoutProperties(_ref, _excluded$3);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useCreateField = useCreateField(),
@@ -5559,9 +5626,9 @@ var Add = function Add(_ref) {
   };
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Pane.Header, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
     style: "h2"
-  }, t("titles.addField"))), /*#__PURE__*/React__default["default"].createElement(formik$1.Form, {
+  }, t("titles.addField"))), /*#__PURE__*/React__default["default"].createElement(formik.Form, {
     formikProps: {
-      initialValues: _objectSpread$4(_objectSpread$4({}, initialValues), INITIAL_FIELDS),
+      initialValues: _objectSpread$8(_objectSpread$8({}, initialValues), INITIAL_FIELDS),
       validationSchema: generateValidationSchema(additionalValidations),
       onSubmit: handleSubmit
     }
@@ -5571,26 +5638,17 @@ var Add = function Add(_ref) {
     return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(FieldForm, _extends({
       chosenKind: kind.value,
       kindSelectOptions: filteredKinds
-    }, props)), /*#__PURE__*/React__default["default"].createElement(neetoui.Pane.Footer, null, /*#__PURE__*/React__default["default"].createElement(formik$1.ActionBlock, {
-      cancelButtonProps: {
-        onClick: onClose,
-        style: "text",
-        disabled: isSubmitting
-      },
-      submitButtonProps: {
-        label: t("labels.createField"),
-        className: "mr-2",
-        type: "submit",
-        loading: isSubmitting,
-        disabled: !dirty
-      }
-    })));
+    }, props)), renderFormFooter({
+      onClose: onClose,
+      loading: isSubmitting,
+      dirty: dirty
+    }));
   }));
 };
 
-var _excluded$1 = ["fieldId", "allowedKinds", "additionalValidations", "initialValues", "onClose"];
-function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$3(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _excluded$2 = ["fieldId", "allowedKinds", "additionalValidations", "initialValues", "onClose"];
+function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$7(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 /** @type {React.FC<import("types").EditProps>} */
 
@@ -5602,7 +5660,7 @@ var Edit = function Edit(_ref) {
     _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
     onClose = _ref.onClose,
-    props = _objectWithoutProperties(_ref, _excluded$1);
+    props = _objectWithoutProperties(_ref, _excluded$2);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useShowField = useShowField(fieldId),
@@ -5626,15 +5684,16 @@ var Edit = function Edit(_ref) {
   };
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Pane.Header, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
     style: "h2"
-  }, t("titles.editField"))), /*#__PURE__*/React__default["default"].createElement(formik$1.Form, {
+  }, t("titles.editField"))), /*#__PURE__*/React__default["default"].createElement(formik.Form, {
     formikProps: {
-      initialValues: _objectSpread$3(_objectSpread$3({}, initialValues), ramda.assoc("kind", FIELD_KINDS[field.kind], field)),
+      initialValues: _objectSpread$7(_objectSpread$7({}, initialValues), ramda.assoc("kind", FIELD_KINDS[field.kind], field)),
       validationSchema: generateValidationSchema(additionalValidations),
       enableReinitialize: true,
       onSubmit: handleSubmit
     }
   }, function (_ref2) {
-    var kind = _ref2.values.kind;
+    var kind = _ref2.values.kind,
+      dirty = _ref2.dirty;
     var permittedKinds = getPermittedKinds({
       allowedKinds: allowedKinds,
       selectedKind: kind
@@ -5643,23 +5702,15 @@ var Edit = function Edit(_ref) {
       chosenKind: kind === null || kind === void 0 ? void 0 : kind.value,
       isSystem: field.isSystem,
       kindSelectOptions: permittedKinds
-    }, props)), /*#__PURE__*/React__default["default"].createElement(neetoui.Pane.Footer, null, /*#__PURE__*/React__default["default"].createElement(formik$1.ActionBlock, {
-      cancelButtonProps: {
-        onClick: onClose,
-        style: "text",
-        disabled: isSubmitting
-      },
-      submitButtonProps: {
-        label: t("labels.updateField"),
-        className: "mr-2",
-        type: "submit",
-        loading: isSubmitting
-      }
-    })));
+    }, props)), renderFormFooter({
+      onClose: onClose,
+      loading: isSubmitting,
+      dirty: dirty
+    }));
   }));
 };
 
-var _excluded = ["isOpen", "selectedField"];
+var _excluded$1 = ["isOpen", "selectedField"];
 
 /** @type {React.FC<import("types").FieldsPaneProps>} */
 
@@ -5667,7 +5718,7 @@ var FieldsPane = function FieldsPane(_ref) {
   var isOpen = _ref.isOpen,
     _ref$selectedField = _ref.selectedField,
     selectedField = _ref$selectedField === void 0 ? {} : _ref$selectedField,
-    props = _objectWithoutProperties(_ref, _excluded);
+    props = _objectWithoutProperties(_ref, _excluded$1);
   return /*#__PURE__*/React__default["default"].createElement(neetoui.Pane, {
     isOpen: isOpen,
     onClose: props.onClose
@@ -5684,6 +5735,7 @@ var AddField = function AddField(_ref) {
     allowedKinds = _ref$allowedKinds === void 0 ? ALL_KINDS : _ref$allowedKinds,
     additionalValidations = _ref.additionalValidations,
     initialValues = _ref.initialValues,
+    hideRequiredSwitch = _ref.hideRequiredSwitch,
     children = _ref.children;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -5699,6 +5751,7 @@ var AddField = function AddField(_ref) {
   }), /*#__PURE__*/React__default["default"].createElement(FieldsPane, {
     additionalValidations: additionalValidations,
     allowedKinds: allowedKinds,
+    hideRequiredSwitch: hideRequiredSwitch,
     initialValues: initialValues,
     isOpen: isOpen,
     resourceType: resourceType,
@@ -5708,18 +5761,6 @@ var AddField = function AddField(_ref) {
   }, children));
 };
 
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-}
-
-function _nonIterableSpread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _toConsumableArray(arr) {
-  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-}
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -6132,7 +6173,7 @@ var buildFieldValidationSchema = function buildFieldValidationSchema(_ref) {
       }
     case KINDS.integer:
       {
-        var _schema2 = yup__namespace.number().integer().nullable().typeError(t("validations.notAValidInteger"));
+        var _schema2 = yup__namespace.number().nullable().integer().typeError(t("validations.notAValidInteger"));
         return isRequired ? _schema2.required(t("validations.thisIsRequired")) : _schema2;
       }
     case KINDS.date:
@@ -6217,37 +6258,50 @@ var dateTimeToString = function dateTimeToString(dateTime) {
   return dayjs(dateTime).toString();
 };
 
-function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _excluded = ["name", "id", "kind", "data", "individualSubmit", "formRef", "formRefs", "disabled", "isRequiredColumnName"];
+function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$6(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useFormikFields = function useFormikFields(_ref) {
   var name = _ref.name,
     fieldId = _ref.id,
-    isRequired = _ref.isRequired,
     kind = _ref.kind,
     fieldData = _ref.data,
-    individualSubmit = _ref.individualSubmit;
-  var _useFormikContext = formik.useFormikContext(),
-    setFieldValue = _useFormikContext.setFieldValue,
-    submitForm = _useFormikContext.submitForm,
-    dirty = _useFormikContext.dirty;
+    individualSubmit = _ref.individualSubmit,
+    formRef = _ref.formRef,
+    formRefs = _ref.formRefs,
+    disabled = _ref.disabled,
+    _ref$isRequiredColumn = _ref.isRequiredColumnName,
+    isRequiredColumnName = _ref$isRequiredColumn === void 0 ? "isRequired" : _ref$isRequiredColumn,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var formikContext = formik$1.useFormikContext();
+  var setFieldValue = formikContext.setFieldValue,
+    submitForm = formikContext.submitForm,
+    dirty = formikContext.dirty,
+    isSubmitting = formikContext.isSubmitting;
   var fieldPath = "".concat(name, "-").concat(fieldId);
   var fieldName = kind === KINDS.multiOption ? "values" : "value";
   var fieldValuePath = "".concat(fieldPath, ".data.").concat(fieldName);
-  var _useField = formik.useField({
+  if (ramda.isNil(formRef) && ramda.isNotNil(formRefs)) {
+    formRefs.current[fieldValuePath] = formikContext;
+  } else if (ramda.isNil(formRefs) && ramda.isNotNil(formRef)) {
+    formRef.current = formikContext;
+  }
+  var _useField = formik$1.useField({
       name: fieldValuePath,
       validate: function validate(fieldValue) {
         return validateField({
           fieldValue: fieldValue,
           fieldName: name,
-          isRequired: isRequired,
+          isRequired: props[isRequiredColumnName],
           kind: kind,
           fieldData: fieldData
         });
       }
     }),
-    _useField2 = _slicedToArray(_useField, 2),
+    _useField2 = _slicedToArray(_useField, 3),
     formikFieldProps = _useField2[0],
-    meta = _useField2[1];
+    meta = _useField2[1],
+    helpers = _useField2[2];
   var handleSubmit = function handleSubmit(value) {
     ramda.isNotNil(value) && setFieldValue(fieldValuePath, value);
     individualSubmit && submitForm();
@@ -6261,15 +6315,19 @@ var useFormikFields = function useFormikFields(_ref) {
     return value;
   };
   var isDropdown = ["single_option", "multi_option"].includes(kind);
+  if (isSubmitting && !meta.touched) {
+    helpers.setTouched(true);
+  }
   return {
     handleSubmit: handleSubmit,
-    fieldProps: _objectSpread$2(_objectSpread$2({}, formikFieldProps), {}, {
-      required: isRequired,
-      error: meta.error,
+    fieldProps: _objectSpread$6(_objectSpread$6({}, formikFieldProps), {}, {
+      required: props[isRequiredColumnName],
+      error: meta.touched && meta.error,
       options: isDropdown && buildOptionsToLabelAndValue(fieldData),
       value: getValueForField(formikFieldProps.value),
       dirty: dirty,
-      label: !individualSubmit && name
+      label: !individualSubmit && pure.capitalize(name),
+      disabled: disabled
     })
   };
 };
@@ -6393,7 +6451,7 @@ var Text = function Text(props) {
     fieldProps = _useFormikFields.fieldProps;
   var showSubmitButton = props.individualSubmit && fieldProps.dirty;
   return /*#__PURE__*/React__default["default"].createElement(neetoui.Input, _extends({}, fieldProps, {
-    suffix: showSubmitButton && /*#__PURE__*/React__default["default"].createElement(formik$1.Button, {
+    suffix: showSubmitButton && /*#__PURE__*/React__default["default"].createElement(formik.Button, {
       icon: neetoIcons.Check,
       style: "text",
       onClick: function onClick() {
@@ -6410,7 +6468,7 @@ var TextArea = function TextArea(props) {
     handleSubmit = _useFormikFields.handleSubmit,
     fieldProps = _useFormikFields.fieldProps;
   var showSubmitButton = props.individualSubmit && fieldProps.dirty;
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Textarea, fieldProps), showSubmitButton && /*#__PURE__*/React__default["default"].createElement(formik$1.Button, {
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Textarea, fieldProps), showSubmitButton && /*#__PURE__*/React__default["default"].createElement(formik.Button, {
     className: "m-auto mt-2",
     label: t("labels.submit"),
     size: "small",
@@ -6420,12 +6478,14 @@ var TextArea = function TextArea(props) {
   }));
 };
 
-function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var standardComponents = {
   text: Text,
   regex: Text,
+  textarea: TextArea,
   text_area: TextArea,
+  // TODO: Remove text-area after integration in all hosts.
   number: Number$1,
   monetary: Number$1,
   integer: Number$1,
@@ -6439,21 +6499,15 @@ var standardComponents = {
   time_range: RangePicker,
   checkbox: Checkbox
 };
-var renderFieldInput = function renderFieldInput(_ref) {
+var getFieldInput = function getFieldInput(_ref) {
   var field = _ref.field,
     _ref$customComponents = _ref.customComponents,
-    customComponents = _ref$customComponents === void 0 ? {} : _ref$customComponents,
-    _ref$individualSubmit = _ref.individualSubmit,
-    individualSubmit = _ref$individualSubmit === void 0 ? false : _ref$individualSubmit;
+    customComponents = _ref$customComponents === void 0 ? {} : _ref$customComponents;
   var Component = customComponents[field.kind] || standardComponents[field.kind];
   if (Component) {
-    return /*#__PURE__*/React__default["default"].createElement(Component, _extends({
-      individualSubmit: individualSubmit
-    }, field));
+    return Component;
   }
-  return /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
-    style: "body2"
-  }, t("messages.invalidKind"));
+  return null;
 };
 var removeItemsWithNullData = function removeItemsWithNullData(fieldValues) {
   return fieldValues.filter(function (item) {
@@ -6475,7 +6529,7 @@ var transformValues = function transformValues(_ref2) {
     delete allFieldValues["".concat(name, "-").concat(id)];
   });
   var cleanedFieldValues = ramda.pipe(removeItemsWithNullData, removeNoiseFromValues)(neetoFieldValues);
-  return _objectSpread$1(_objectSpread$1({}, allFieldValues), {}, {
+  return _objectSpread$5(_objectSpread$5({}, allFieldValues), {}, {
     fieldValuesAttributes: cleanedFieldValues
   });
 };
@@ -6512,15 +6566,35 @@ var neetoFieldsUtils = {
   transformValues: transformValues
 };
 
+function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FieldInputs = function FieldInputs(_ref) {
   var _ref$customComponents = _ref.customComponents,
     customComponents = _ref$customComponents === void 0 ? {} : _ref$customComponents,
-    fields = _ref.fields;
+    fields = _ref.fields,
+    formRef = _ref.formRef,
+    disabled = _ref.disabled,
+    isRequiredColumnName = _ref.isRequiredColumnName;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   return getNonSystemFields(fields).map(function (field) {
-    return renderFieldInput({
+    var Field = getFieldInput({
       field: field,
       customComponents: customComponents
     });
+    if (Field) {
+      return /*#__PURE__*/React__default["default"].createElement(Field, _extends({
+        key: field.id
+      }, _objectSpread$4(_objectSpread$4({}, field), {}, {
+        formRef: formRef,
+        disabled: disabled,
+        isRequiredColumnName: isRequiredColumnName
+      })));
+    }
+    return /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
+      key: field.id,
+      style: "body2"
+    }, t("messages.invalidKind"));
   });
 };
 
@@ -6575,42 +6649,42 @@ var renderMenuBarItems = function renderMenuBarItems(_ref2) {
   var items = _ref2.items,
     isOwnerBased = _ref2.isOwnerBased,
     selectedMenu = _ref2.selectedMenu,
-    setSelectedMenu = _ref2.setSelectedMenu;
+    handleBlockClick = _ref2.handleBlockClick;
   if (isOwnerBased) {
     return items.map(function (item) {
       return /*#__PURE__*/React__default["default"].createElement(MenuBar__default["default"].Item, {
         active: selectedMenu === item.id,
+        key: item.id,
+        label: pure.humanize(item.name),
         description: t("messages.manageFieldFor", {
-          resource: item.name
+          resource: pure.humanize(item.name).toLocaleLowerCase()
         }),
-        key: item.id,
-        label: pure.capitalize(item.name),
-        onClick: function onClick() {
-          return setSelectedMenu(item.id);
-        }
+        onClick: handleBlockClick({
+          resource: item.id
+        })
       });
     });
   }
-  return items.map(function (item) {
+  return items.length > 1 && items.map(function (item) {
     return /*#__PURE__*/React__default["default"].createElement(MenuBar__default["default"].Item, {
       active: selectedMenu === item,
+      key: item,
+      label: pure.humanize(item),
       description: t("messages.manageFieldFor", {
-        resource: item
+        resource: pure.humanize(item).toLocaleLowerCase()
       }),
-      key: item,
-      label: pure.capitalize(item),
-      onClick: function onClick() {
-        return setSelectedMenu(item);
-      }
+      onClick: handleBlockClick({
+        resource: item
+      })
     });
   });
 };
 var renderMenuBarFilters = function renderMenuBarFilters(_ref3) {
   var selectedState = _ref3.selectedState,
-    setSelectedState = _ref3.setSelectedState,
     fieldStatesTaxonomy = _ref3.fieldStatesTaxonomy,
     activeFieldsCount = _ref3.activeFieldsCount,
-    inactiveFieldsCount = _ref3.inactiveFieldsCount;
+    inactiveFieldsCount = _ref3.inactiveFieldsCount,
+    handleBlockClick = _ref3.handleBlockClick;
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(MenuBar__default["default"].SubTitle, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
     style: "h5",
     textTransform: "uppercase",
@@ -6619,16 +6693,16 @@ var renderMenuBarFilters = function renderMenuBarFilters(_ref3) {
     active: selectedState === FIELD_STATES.active,
     count: activeFieldsCount,
     label: fieldStatesTaxonomy.active,
-    onClick: function onClick() {
-      return setSelectedState(FIELD_STATES.active);
-    }
+    onClick: handleBlockClick({
+      state: FIELD_STATES.active
+    })
   }), /*#__PURE__*/React__default["default"].createElement(MenuBar__default["default"].Block, {
     active: selectedState === FIELD_STATES.inactive,
     count: inactiveFieldsCount,
     label: fieldStatesTaxonomy.inactive,
-    onClick: function onClick() {
-      return setSelectedState(FIELD_STATES.inactive);
-    }
+    onClick: handleBlockClick({
+      state: FIELD_STATES.inactive
+    })
   }));
 };
 var getDashBoardTitle = function getDashBoardTitle(_ref4) {
@@ -6650,10 +6724,16 @@ var configsApi = {
   fetchConfigs: fetchConfigs
 };
 
-var useFetchConfigs = function useFetchConfigs() {
-  return reactQuery.useQuery([QUERY_KEYS.CONFIGS], configsApi.fetchConfigs);
+function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$3(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var useFetchConfigs = function useFetchConfigs(options) {
+  return reactQuery.useQuery([QUERY_KEYS.CONFIGS], configsApi.fetchConfigs, _objectSpread$3({
+    staleTime: DEFAULT_STALE_TIME
+  }, options));
 };
 
+function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useFieldsDashboard = function useFieldsDashboard(_ref) {
   var buildColumnData = _ref.buildColumnData,
     showOwnersInMenu = _ref.showOwnersInMenu;
@@ -6673,21 +6753,13 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     isReorderPaneOpen = _useState8[0],
     setIsReorderPaneOpen = _useState8[1];
+  var _useState9 = React.useState({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    selectedField = _useState10[0],
+    setSelectedField = _useState10[1];
   var _getQueryParams = utils.getQueryParams(),
     resource = _getQueryParams.resource,
     state = _getQueryParams.state;
-  var _useState9 = React.useState(resource || ""),
-    _useState10 = _slicedToArray(_useState9, 2),
-    selectedMenu = _useState10[0],
-    setSelectedMenu = _useState10[1];
-  var _useState11 = React.useState({}),
-    _useState12 = _slicedToArray(_useState11, 2),
-    selectedField = _useState12[0],
-    setSelectedField = _useState12[1];
-  var _useState13 = React.useState(state || FIELD_STATES.active),
-    _useState14 = _slicedToArray(_useState13, 2),
-    selectedState = _useState14[0],
-    setSelectedState = _useState14[1];
   var history = reactRouterDom.useHistory();
   var _useFetchConfigs = useFetchConfigs(),
     _useFetchConfigs$data = _useFetchConfigs.data,
@@ -6697,12 +6769,13 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     _useFetchConfigs$data4 = _useFetchConfigs$data2.resourceTypes,
     resourceTypes = _useFetchConfigs$data4 === void 0 ? [] : _useFetchConfigs$data4,
     isConfigsLoading = _useFetchConfigs.isLoading;
-  var _useFetchFields = useFetchFields({
-      resourceType: !showOwnersInMenu ? selectedMenu : undefined,
-      ownerId: showOwnersInMenu ? selectedMenu : undefined,
-      state: selectedState
-    }, {
-      enabled: !!selectedMenu
+  var fieldParams = {
+    resourceType: !showOwnersInMenu ? resource : undefined,
+    ownerId: showOwnersInMenu ? resource : undefined,
+    state: state || FIELD_STATES.active
+  };
+  var _useFetchFields = useFetchFields(fieldParams, {
+      enabled: !!resource
     }),
     _useFetchFields$data = _useFetchFields.data,
     _useFetchFields$data2 = _useFetchFields$data === void 0 ? {} : _useFetchFields$data,
@@ -6752,23 +6825,34 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     onDeleteClick: handleDeleteButtonClick,
     defaultColumns: defaultColumns
   });
+  var handleBlockClick = function handleBlockClick(params) {
+    return reactUtils.handleMetaClick(history, utils.buildUrl("", _objectSpread$2({
+      resource: resource,
+      state: state
+    }, params)));
+  };
+  var handleURLWithDefaultValues = function handleURLWithDefaultValues() {
+    var queryParams = {
+      resource: resource,
+      state: state
+    };
+    if (!isConfigsLoading && ramda.isNil(resource)) {
+      var _owners$;
+      queryParams.resource = showOwnersInMenu ? (_owners$ = owners[0]) === null || _owners$ === void 0 ? void 0 : _owners$.id : resourceTypes[0];
+    }
+    if (!isConfigsLoading && ramda.isNil(state)) {
+      queryParams.state = FIELD_STATES.active;
+    }
+    if (!isConfigsLoading && ramda.any(ramda.isNil)([resource, state])) {
+      history.replace(utils.buildUrl("", queryParams));
+    }
+  };
   var menuItems = showOwnersInMenu ? owners : resourceTypes;
   var isScreenLoading = isFieldsLoading || isConfigsLoading;
   var showCountSubheader = count > 0;
   React.useEffect(function () {
-    if (resource) {
-      setSelectedMenu(resource);
-    } else {
-      var _owners$;
-      showOwnersInMenu ? setSelectedMenu((_owners$ = owners[0]) === null || _owners$ === void 0 ? void 0 : _owners$.id) : setSelectedMenu(resourceTypes[0]);
-    }
-  }, [isConfigsLoading, resource]);
-  React.useEffect(function () {
-    history.push(utils.buildUrl("", {
-      resource: selectedMenu,
-      state: selectedState
-    }));
-  }, [selectedMenu, selectedState]);
+    handleURLWithDefaultValues();
+  }, [isConfigsLoading]);
   return {
     isPaneOpen: isPaneOpen,
     setIsPaneOpen: setIsPaneOpen,
@@ -6785,10 +6869,8 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     menuItems: menuItems,
     columnData: columnData,
     selectedField: selectedField,
-    selectedState: selectedState,
-    setSelectedState: setSelectedState,
-    selectedMenu: selectedMenu,
-    setSelectedMenu: setSelectedMenu,
+    selectedState: state,
+    selectedMenu: resource,
     isFieldsFetching: isFieldsFetching,
     isFieldsLoading: isFieldsLoading,
     isDeleting: isDeleting,
@@ -6798,7 +6880,8 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     handleDelete: handleDelete,
     handleAlertClose: handleAlertClose,
     handleClosePane: handleClosePane,
-    handleReorderPaneClose: handleReorderPaneClose
+    handleReorderPaneClose: handleReorderPaneClose,
+    handleBlockClick: handleBlockClick
   };
 };
 
@@ -11224,9 +11307,7 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     columnData = _useFieldsDashboard.columnData,
     selectedField = _useFieldsDashboard.selectedField,
     selectedState = _useFieldsDashboard.selectedState,
-    setSelectedState = _useFieldsDashboard.setSelectedState,
     selectedMenu = _useFieldsDashboard.selectedMenu,
-    setSelectedMenu = _useFieldsDashboard.setSelectedMenu,
     isFieldsFetching = _useFieldsDashboard.isFieldsFetching,
     isFieldsLoading = _useFieldsDashboard.isFieldsLoading,
     isDeleting = _useFieldsDashboard.isDeleting,
@@ -11236,25 +11317,24 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     handleDelete = _useFieldsDashboard.handleDelete,
     handleAlertClose = _useFieldsDashboard.handleAlertClose,
     handleClosePane = _useFieldsDashboard.handleClosePane,
-    handleReorderPaneClose = _useFieldsDashboard.handleReorderPaneClose;
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "flex flex-grow"
-  }, /*#__PURE__*/React__default["default"].createElement(MenuBar__default["default"], {
+    handleReorderPaneClose = _useFieldsDashboard.handleReorderPaneClose,
+    handleBlockClick = _useFieldsDashboard.handleBlockClick;
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(MenuBar__default["default"], {
     showMenu: isMenuBarOpen,
-    title: t("titles.field", SINGULAR)
+    title: t("titles.field", PLURAL)
   }, isConfigsLoading ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "flex items-center justify-center"
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Spinner, null)) : renderMenuBarItems({
     isOwnerBased: showOwnersInMenu,
     items: menuItems,
     selectedMenu: selectedMenu,
-    setSelectedMenu: setSelectedMenu
+    handleBlockClick: handleBlockClick
   }), showStateFilter && renderMenuBarFilters({
     selectedState: selectedState,
-    setSelectedState: setSelectedState,
     fieldStatesTaxonomy: fieldStatesTaxonomy,
     activeFieldsCount: activeFieldsCount,
-    inactiveFieldsCount: inactiveFieldsCount
+    inactiveFieldsCount: inactiveFieldsCount,
+    handleBlockClick: handleBlockClick
   })), isScreenLoading ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "flex w-full flex-grow items-center justify-center"
   }, /*#__PURE__*/React__default["default"].createElement(PageLoader__default["default"], null)) : /*#__PURE__*/React__default["default"].createElement(Container__default["default"], null, /*#__PURE__*/React__default["default"].createElement(Header__default["default"], {
@@ -11280,17 +11360,18 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     }), /*#__PURE__*/React__default["default"].createElement(FieldsPane, {
       additionalValidations: paneProps === null || paneProps === void 0 ? void 0 : paneProps.validations,
       allowedKinds: allowedKinds,
+      hideRequiredSwitch: paneProps === null || paneProps === void 0 ? void 0 : paneProps.hideRequiredSwitch,
       initialValues: paneProps === null || paneProps === void 0 ? void 0 : paneProps.initialValues,
       isOpen: isPaneOpen,
       resourceType: showOwnersInMenu ? resourceType : selectedMenu,
       selectedField: selectedField,
       onClose: handleClosePane
     }, paneProps === null || paneProps === void 0 ? void 0 : paneProps.children)),
-    title: getDashBoardTitle({
+    title: pure.humanize(getDashBoardTitle({
       isOwnerBased: showOwnersInMenu,
       owners: owners,
       selectedVal: selectedMenu
-    })
+    }))
   }), showCountSubheader && /*#__PURE__*/React__default["default"].createElement(SubHeader__default["default"], {
     leftActionBlock: /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
       className: "mr-4 font-semibold",
@@ -11344,11 +11425,11 @@ var fieldValuesApi = {
   update: update
 };
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useCreateFieldValue = function useCreateFieldValue(options) {
   var queryClient = reactQuery.useQueryClient();
-  return reactQuery.useMutation(fieldValuesApi.create, _objectSpread(_objectSpread({}, options), {}, {
+  return reactQuery.useMutation(fieldValuesApi.create, _objectSpread$1(_objectSpread$1({}, options), {}, {
     onSuccess: function onSuccess() {
       queryClient.invalidateQueries([QUERY_KEYS.FIELD_VALUES]);
       options === null || options === void 0 ? void 0 : options.onSuccess();
@@ -11357,7 +11438,7 @@ var useCreateFieldValue = function useCreateFieldValue(options) {
 };
 var useUpdateFieldValue = function useUpdateFieldValue(options) {
   var queryClient = reactQuery.useQueryClient();
-  return reactQuery.useMutation(fieldValuesApi.update, _objectSpread(_objectSpread({}, options), {}, {
+  return reactQuery.useMutation(fieldValuesApi.update, _objectSpread$1(_objectSpread$1({}, options), {}, {
     onSuccess: function onSuccess() {
       queryClient.invalidateQueries([QUERY_KEYS.FIELD_VALUES]);
       options === null || options === void 0 ? void 0 : options.onSuccess();
@@ -11365,53 +11446,25 @@ var useUpdateFieldValue = function useUpdateFieldValue(options) {
   }));
 };
 
-var FieldValueInput = function FieldValueInput(_ref) {
-  var ownerId = _ref.ownerId,
-    field = _ref.field,
+var FieldValueInputWrapper = function FieldValueInputWrapper(_ref) {
+  var field = _ref.field,
     fieldValues = _ref.fieldValues,
-    resource = _ref.resource,
-    resourceId = _ref.resourceId,
-    queryKeysToBeInvalidatedOnSuccess = _ref.queryKeysToBeInvalidatedOnSuccess,
-    customComponents = _ref.customComponents;
-  var queryClient = reactQuery.useQueryClient();
-  var queryOptions = {
-    onSuccess: function onSuccess() {
-      queryClient.invalidateQueries(queryKeysToBeInvalidatedOnSuccess);
-    }
-  };
-  var _useCreateFieldValue = useCreateFieldValue(queryOptions),
-    createFieldValue = _useCreateFieldValue.mutate;
-  var _useUpdateFieldValue = useUpdateFieldValue(queryOptions),
-    updateFieldValue = _useUpdateFieldValue.mutate;
-  var handleSubmit = function handleSubmit(values) {
-    var fieldValue = ramda.head(ramda.values(values));
-    var payload = {
-      fieldValue: fieldValue,
-      resource: resource,
-      resourceId: resourceId,
-      ownerId: ramda.isEmpty(ownerId) ? undefined : ownerId
-    };
-    fieldValue.id ? updateFieldValue({
-      id: fieldValue.id,
-      payload: payload
-    }) : createFieldValue(payload);
-  };
-  return /*#__PURE__*/React__default["default"].createElement(formik$1.Form, {
-    className: "flex w-full",
+    children = _ref.children,
+    onSubmit = _ref.onSubmit,
+    _ref$className = _ref.className,
+    className = _ref$className === void 0 ? "" : _ref$className;
+  return /*#__PURE__*/React__default["default"].createElement(formik.Form, {
+    className: classnames__default["default"]("flex w-full", className),
     formikProps: {
       initialValues: getInitialFieldValue(field, fieldValues),
-      onSubmit: handleSubmit,
+      onSubmit: onSubmit,
       enableReinitialize: true
     }
-  }, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "w-full"
-  }, renderFieldInput({
-    field: field,
-    customComponents: customComponents,
-    individualSubmit: true
-  })));
+  }, children);
 };
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FieldValuesContainer = function FieldValuesContainer(_ref) {
   var _ref$resourceType = _ref.resourceType,
     resourceType = _ref$resourceType === void 0 ? "" : _ref$resourceType,
@@ -11426,36 +11479,85 @@ var FieldValuesContainer = function FieldValuesContainer(_ref) {
     _ref$className = _ref.className,
     className = _ref$className === void 0 ? "" : _ref$className,
     _ref$showBorder = _ref.showBorder,
-    showBorder = _ref$showBorder === void 0 ? true : _ref$showBorder;
+    showBorder = _ref$showBorder === void 0 ? true : _ref$showBorder,
+    formRefs = _ref.formRefs,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    isRequiredColumnName = _ref.isRequiredColumnName,
+    fieldContainerClassName = _ref.fieldContainerClassName,
+    fieldClassName = _ref.fieldClassName,
+    labelClassName = _ref.labelClassName;
+  var queryClient = reactQuery.useQueryClient();
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var queryOptions = {
+    onSuccess: function onSuccess() {
+      queryClient.invalidateQueries(queryKeysToBeInvalidatedOnSuccess);
+    }
+  };
   var _useFetchFields = useFetchFields({
       resourceType: ramda.isEmpty(resourceType) ? undefined : resourceType,
-      ownerId: ramda.isEmpty(ownerId) ? undefined : ownerId
+      ownerId: ramda.isEmpty(ownerId) ? undefined : ownerId,
+      state: "active"
     }),
     _useFetchFields$data = _useFetchFields.data,
     _useFetchFields$data2 = _useFetchFields$data === void 0 ? {} : _useFetchFields$data,
     _useFetchFields$data3 = _useFetchFields$data2.fields,
     fields = _useFetchFields$data3 === void 0 ? [] : _useFetchFields$data3,
     isFieldsLoading = _useFetchFields.isLoading;
+  var _useCreateFieldValue = useCreateFieldValue(queryOptions),
+    createFieldValue = _useCreateFieldValue.mutate;
+  var _useUpdateFieldValue = useUpdateFieldValue(queryOptions),
+    updateFieldValue = _useUpdateFieldValue.mutate;
+  var handleSubmit = function handleSubmit(values) {
+    var fieldValue = ramda.head(ramda.values(values));
+    var payload = {
+      fieldValue: fieldValue,
+      resource: resourceType,
+      resourceId: resourceId,
+      ownerId: ramda.isEmpty(ownerId) ? undefined : ownerId
+    };
+    fieldValue.id ? updateFieldValue({
+      id: fieldValue.id,
+      payload: payload
+    }) : createFieldValue(payload);
+  };
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: classnames__default["default"]("space-y-3", {
-      "neeto-ui-border-gray-300 m-3 rounded-lg border bg-white px-4 py-2": showBorder
+      "neeto-ui-border-gray-300 rounded-lg border bg-white px-4 py-2": showBorder
     }, className)
   }, isFieldsLoading ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "flex items-center justify-center"
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Spinner, null)) : getNonSystemFields(fields).map(function (field) {
-    return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, {
-      key: field.id
-    }, /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
-      style: "h5"
-    }, field.name.toUpperCase()), /*#__PURE__*/React__default["default"].createElement(FieldValueInput, {
-      customComponents: customComponents,
+    var Field = getFieldInput({
       field: field,
-      fieldValues: fieldValues,
-      ownerId: ownerId,
-      resource: resourceType,
-      resourceId: resourceId,
-      queryKeysToBeInvalidatedOnSuccess: queryKeysToBeInvalidatedOnSuccess
-    }));
+      customComponents: customComponents
+    });
+    if (Field) {
+      return /*#__PURE__*/React__default["default"].createElement("div", {
+        className: classnames__default["default"](fieldContainerClassName, "space-y-1"),
+        key: field.id
+      }, /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
+        className: labelClassName,
+        style: "h5"
+      }, pure.capitalize(field.name)), /*#__PURE__*/React__default["default"].createElement(FieldValueInputWrapper, {
+        className: fieldClassName,
+        onSubmit: handleSubmit,
+        field: field,
+        fieldValues: fieldValues
+      }, /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "w-full"
+      }, /*#__PURE__*/React__default["default"].createElement(Field, _objectSpread(_objectSpread({}, field), {}, {
+        individualSubmit: true,
+        formRefs: formRefs,
+        disabled: disabled,
+        isRequiredColumnName: isRequiredColumnName
+      })))));
+    }
+    return /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
+      key: field.id,
+      style: "body2"
+    }, t("messages.invalidKind"));
   }));
 };
 
@@ -11464,5 +11566,9 @@ exports.FieldInputs = FieldInputs;
 exports.FieldValuesContainer = FieldValuesContainer;
 exports.FieldsDashboard = FieldsDashboard;
 exports.neetoFieldsUtils = neetoFieldsUtils;
+exports.useCreateField = useCreateField;
+exports.useDestroyField = useDestroyField;
 exports.useFetchFields = useFetchFields;
+exports.useShowField = useShowField;
+exports.useUpdateField = useUpdateField;
 //# sourceMappingURL=index.cjs.js.map