@bigbinary/neeto-fields-frontend 1.1.12 → 1.1.14

package/dist/index.js

@@ -1,23 +1,24 @@
 import React, { useContext, useState, useRef, useEffect, useMemo, useLayoutEffect, useCallback, createContext, memo, useReducer } from 'react';
 import { Checkbox as Checkbox$1, TimePicker, DatePicker, Select, Input, Textarea, Typography, Pane, Label, Button as Button$1, Dropdown, Tab, Alert, NoData, Table, Spinner } from '@bigbinary/neetoui';
-import { toLabelAndValue, isNotEmpty, capitalize as capitalize$1, filterBy, findBy, slugify, humanize, countBy, existsBy, noop as noop$2 } from '@bigbinary/neeto-commons-frontend/pure';
-import { values, map, isNotNil, isNil, isEmpty, pluck, clone as clone$1, pipe, mergeAll, omit, prop, pick, assoc, any, not, head } from 'ramda';
+import { toLabelAndValue, isNotEmpty, capitalize as capitalize$1, filterBy, findBy, slugify, humanize, truncate, countBy, noop as noop$2 } from '@bigbinary/neeto-commons-frontend/pure';
+import { values, map, isNotNil, isNil, isEmpty, prop, pluck, clone as clone$1, pipe, mergeAll, omit, pick, assoc, any, head } from 'ramda';
 import { useFormikContext, useField, FieldArray } from 'formik';
 import { useFuncDebounce, useDebounce, handleMetaClick } from '@bigbinary/neeto-commons-frontend/react-utils';
 import * as yup from 'yup';
-import { Check, Info, Delete, MenuHorizontal, Reorder } from '@bigbinary/neeto-icons';
-import { Button, ActionBlock, Input as Input$1, Select as Select$1, Switch, Form } from '@bigbinary/neetoui/formik';
+import { Check, Delete, MenuHorizontal, Info, Reorder } from '@bigbinary/neeto-icons';
+import { Button, ActionBlock as ActionBlock$1, Input as Input$1, Select as Select$1, Switch, Form } from '@bigbinary/neetoui/formik';
+import { DEFAULT_PAGE_INDEX, PLURAL } from '@bigbinary/neeto-commons-frontend/constants';
 import Container from '@bigbinary/neeto-molecules/Container';
-import Header from '@bigbinary/neeto-molecules/Header';
-import MenuBar from '@bigbinary/neeto-molecules/MenuBar';
 import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
-import SubHeader from '@bigbinary/neeto-molecules/SubHeader';
 import { useQuery, useQueryClient, useMutation } from 'react-query';
 import axios from 'axios';
 import { buildUrl, getQueryParams } from '@bigbinary/neeto-commons-frontend/utils';
 import { Link, useHistory } from 'react-router-dom';
+import MenuBar from '@bigbinary/neeto-molecules/MenuBar';
 import TableWrapper from '@bigbinary/neeto-molecules/TableWrapper';
+import NeetoUIHeader from '@bigbinary/neeto-molecules/Header';
 import { unstable_batchedUpdates, createPortal } from 'react-dom';
+import NeetoUISubHeader from '@bigbinary/neeto-molecules/SubHeader';
 import classnames from 'classnames';
 
 /*! @license DOMPurify 3.0.2 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.0.2/LICENSE */
@@ -3714,8 +3715,8 @@ function transformOptions(options) {
   return options;
 }
 
-function ownKeys$f(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$f(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$f(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$f(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys$h(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$h(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$h(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$h(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() {}
@@ -3775,9 +3776,9 @@ var I18n = function (_EventEmitter) {
         }
       }
       var defOpts = get();
-      this.options = _objectSpread$f(_objectSpread$f(_objectSpread$f({}, defOpts), this.options), transformOptions(options));
+      this.options = _objectSpread$h(_objectSpread$h(_objectSpread$h({}, defOpts), this.options), transformOptions(options));
       if (this.options.compatibilityAPI !== 'v1') {
-        this.options.interpolation = _objectSpread$f(_objectSpread$f({}, defOpts.interpolation), this.options.interpolation);
+        this.options.interpolation = _objectSpread$h(_objectSpread$h({}, defOpts.interpolation), this.options.interpolation);
       }
       if (options.keySeparator !== undefined) {
         this.options.userDefinedKeySeparator = options.keySeparator;
@@ -4055,7 +4056,7 @@ var I18n = function (_EventEmitter) {
           }
           options = _this5.options.overloadTranslationOptionHandler([key, opts].concat(rest));
         } else {
-          options = _objectSpread$f({}, opts);
+          options = _objectSpread$h({}, opts);
         }
         options.lng = options.lng || fixedT.lng;
         options.lngs = options.lngs || fixedT.lngs;
@@ -4182,7 +4183,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$f(_objectSpread$f(_objectSpread$f({}, this.options), options), {
+      var mergedOptions = _objectSpread$h(_objectSpread$h(_objectSpread$h({}, this.options), options), {
         isClone: true
       });
       var clone = new I18n(mergedOptions);
@@ -4193,7 +4194,7 @@ var I18n = function (_EventEmitter) {
       membersToCopy.forEach(function (m) {
         clone[m] = _this8[m];
       });
-      clone.services = _objectSpread$f({}, this.services);
+      clone.services = _objectSpread$h({}, this.services);
       clone.services.utils = {
         hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
       };
@@ -4702,9 +4703,9 @@ function cape(m) {
   return unes[m];
 }
 
-function ownKeys$e(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$g(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$e(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$e(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$e(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$g(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$g(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$g(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var defaultOptions$1 = {
   bindI18n: 'languageChanged',
   bindI18nStore: '',
@@ -4718,7 +4719,7 @@ var i18nInstance;
 var I18nContext = React.createContext();
 function setDefaults() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  defaultOptions$1 = _objectSpread$e(_objectSpread$e({}, defaultOptions$1), options);
+  defaultOptions$1 = _objectSpread$g(_objectSpread$g({}, defaultOptions$1), options);
 }
 function getDefaults() {
   return defaultOptions$1;
@@ -4842,12 +4843,12 @@ function hasLoadedNamespace(ns, i18n) {
   });
 }
 
-var _excluded$4 = ["format"],
+var _excluded$6 = ["format"],
     _excluded2 = ["children", "count", "parent", "i18nKey", "context", "tOptions", "values", "defaults", "components", "ns", "i18n", "t", "shouldUnescape"];
 
-function ownKeys$d(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$f(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$d(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$d(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$d(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$f(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$f(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$f(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function hasChildren(node, checkLength) {
   if (!node) return false;
@@ -4873,7 +4874,7 @@ function getAsArray(data) {
 }
 
 function mergeProps(source, target) {
-  var newTarget = _objectSpread$d({}, target);
+  var newTarget = _objectSpread$f({}, target);
 
   newTarget.props = Object.assign(source.props, target.props);
   return newTarget;
@@ -4908,7 +4909,7 @@ function nodesToString(children, i18nOptions) {
       warn("Trans: the passed in value is invalid - seems you passed in a null child.");
     } else if (_typeof$1(child) === 'object') {
       var format = child.format,
-          clone = _objectWithoutProperties(child, _excluded$4);
+          clone = _objectWithoutProperties(child, _excluded$6);
 
       var keys = Object.keys(clone);
 
@@ -4943,7 +4944,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
   getData(children);
   var ast = c.parse("<0>".concat(targetString, "</0>"));
 
-  var opts = _objectSpread$d(_objectSpread$d({}, data), combinedTOpts);
+  var opts = _objectSpread$f(_objectSpread$f({}, data), combinedTOpts);
 
   function renderInner(child, node, rootReactNode) {
     var childs = getChildren(child);
@@ -4953,7 +4954,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
 
   function pushTranslatedJSX(child, inner, mem, i, isVoid) {
     if (child.dummy) child.children = inner;
-    mem.push(React.cloneElement(child, _objectSpread$d(_objectSpread$d({}, child.props), {}, {
+    mem.push(React.cloneElement(child, _objectSpread$f(_objectSpread$f({}, child.props), {}, {
       key: i
     }), isVoid ? undefined : inner));
   }
@@ -4985,7 +4986,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
           } else if (isEmptyTransWithHTML) {
           var _inner = mapAST(reactNodes, node.children, rootReactNode);
 
-          mem.push(React.cloneElement(child, _objectSpread$d(_objectSpread$d({}, child.props), {}, {
+          mem.push(React.cloneElement(child, _objectSpread$f(_objectSpread$f({}, child.props), {}, {
             key: i
           }), _inner));
         } else if (Number.isNaN(parseFloat(node.name))) {
@@ -5016,11 +5017,11 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
           var content = node.children[0] ? translationContent : null;
           if (content) mem.push(content);
         } else if (node.children.length === 1 && translationContent) {
-          mem.push(React.cloneElement(child, _objectSpread$d(_objectSpread$d({}, child.props), {}, {
+          mem.push(React.cloneElement(child, _objectSpread$f(_objectSpread$f({}, child.props), {}, {
             key: i
           }), translationContent));
         } else {
-          mem.push(React.cloneElement(child, _objectSpread$d(_objectSpread$d({}, child.props), {}, {
+          mem.push(React.cloneElement(child, _objectSpread$f(_objectSpread$f({}, child.props), {}, {
             key: i
           })));
         }
@@ -5083,7 +5084,7 @@ function Trans(_ref) {
 
   if (context) tOptions.context = context;
 
-  var reactI18nextOptions = _objectSpread$d(_objectSpread$d({}, getDefaults()), i18n.options && i18n.options.react);
+  var reactI18nextOptions = _objectSpread$f(_objectSpread$f({}, getDefaults()), i18n.options && i18n.options.react);
 
   var namespaces = ns || t.ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
   namespaces = typeof namespaces === 'string' ? [namespaces] : namespaces || ['translation'];
@@ -5091,13 +5092,13 @@ function Trans(_ref) {
   var hashTransKey = reactI18nextOptions.hashTransKey;
   var key = i18nKey || (hashTransKey ? hashTransKey(defaultValue) : defaultValue);
   var interpolationOverride = values ? tOptions.interpolation : {
-    interpolation: _objectSpread$d(_objectSpread$d({}, tOptions.interpolation), {}, {
+    interpolation: _objectSpread$f(_objectSpread$f({}, tOptions.interpolation), {}, {
       prefix: '#$?',
       suffix: '?$#'
     })
   };
 
-  var combinedTOpts = _objectSpread$d(_objectSpread$d(_objectSpread$d(_objectSpread$d({}, tOptions), {}, {
+  var combinedTOpts = _objectSpread$f(_objectSpread$f(_objectSpread$f(_objectSpread$f({}, tOptions), {}, {
     count: count
   }, values), interpolationOverride), {}, {
     defaultValue: defaultValue,
@@ -5142,9 +5143,9 @@ function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 
-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 ownKeys$e(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$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; }
+function _objectSpread$e(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$e(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$e(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;
@@ -5172,7 +5173,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$c(_objectSpread$c(_objectSpread$c({}, getDefaults()), i18n.options.react), props);
+  var i18nOptions = _objectSpread$e(_objectSpread$e(_objectSpread$e({}, getDefaults()), i18n.options.react), props);
 
   var useSuspense = i18nOptions.useSuspense,
       keyPrefix = i18nOptions.keyPrefix;
@@ -5248,6 +5249,8 @@ var common = {
 var titles = {
 	field_one: "Field",
 	field_other: "Fields",
+	fieldWithCount_one: "{{count}} field",
+	fieldWithCount_other: "{{count}} fields",
 	addField: "Add new field",
 	editField: "Edit field",
 	deleteField: "Delete field?",
@@ -5314,7 +5317,13 @@ var messages = {
 	titleForResource: "{{title}} for {{resource}}",
 	stateTitleForResource: "{{state}} {{title}} for {{resource}}",
 	invalidKind: "Invalid kind",
-	reorderFields: "Fields are displayed from top to bottom."
+	reorderFields: "Fields are displayed from top to bottom.",
+	blockNavigationAlert: {
+		title: "You have unsaved changes",
+		message: "All of your unsaved changes will be lost. This can't be undone.",
+		submitButtonLabel: "Discard changes",
+		cancelButtonLabel: "Cancel"
+	}
 };
 var validations = {
 	regexConditionIsRequired: "Regex condition is required",
@@ -5405,6 +5414,7 @@ function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
 
+var DEFAULT_PAGE_SIZE = 12;
 var KINDS = {
   text: "text",
   number: "number",
@@ -5453,6 +5463,13 @@ var DEFAULT_FIELD_STATE_TAXONOMY = {
 };
 var ALL_KINDS = values(KINDS);
 
+var isDateTime = function isDateTime(kind) {
+  return ["date", "time", "date_range", "time_range", "datetime"].includes(kind);
+};
+var isDropdown$1 = function isDropdown(kind) {
+  return ["single_option", "multi_option"].includes(kind);
+};
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -6000,9 +6017,9 @@ var dateTimeToString = function dateTimeToString(dateTime) {
   return dateTime && dayjs(dateTime).toString() || "";
 };
 
-var _excluded$3 = ["name", "id", "kind", "data", "individualSubmit", "formRef", "formRefs", "disabled", "isRequiredColumnName"];
-function ownKeys$b(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$b(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$b(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _excluded$5 = ["name", "id", "kind", "data", "individualSubmit", "formRef", "formRefs", "disabled", "isRequiredColumnName"];
+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; }
 var useFormikFields = function useFormikFields(_ref) {
   var name = _ref.name,
     fieldId = _ref.id,
@@ -6014,7 +6031,7 @@ var useFormikFields = function useFormikFields(_ref) {
     disabled = _ref.disabled,
     _ref$isRequiredColumn = _ref.isRequiredColumnName,
     isRequiredColumnName = _ref$isRequiredColumn === void 0 ? "isRequired" : _ref$isRequiredColumn,
-    props = _objectWithoutProperties(_ref, _excluded$3);
+    props = _objectWithoutProperties(_ref, _excluded$5);
   var formikContext = useFormikContext();
   var submitForm = formikContext.submitForm,
     dirty = formikContext.dirty,
@@ -6056,7 +6073,6 @@ var useFormikFields = function useFormikFields(_ref) {
     }
     return value || "";
   };
-  var isDropdown = ["single_option", "multi_option"].includes(kind);
   useEffect(function () {
     if (isSubmitting && !meta.touched) {
       helpers.setTouched(true);
@@ -6065,15 +6081,17 @@ var useFormikFields = function useFormikFields(_ref) {
   return {
     dirty: dirty,
     handleSubmit: handleSubmit,
-    fieldProps: _objectSpread$b(_objectSpread$b({}, formikFieldProps), {}, {
+    fieldProps: _objectSpread$d(_objectSpread$d({}, formikFieldProps), {}, {
       error: individualSubmit ? meta.error : meta.touched && meta.error,
-      options: isDropdown ? buildOptionsToLabelAndValue(fieldData) : undefined,
       value: getValueForField(formikFieldProps.value),
       label: capitalize$1(name),
       labelProps: {
         required: props[isRequiredColumnName]
       },
-      disabled: disabled
+      disabled: disabled,
+      //conditional props
+      options: isDropdown$1(kind) ? buildOptionsToLabelAndValue(fieldData) : undefined,
+      getPopupContainer: isDateTime(kind) ? prop("parentElement") : undefined
     })
   };
 };
@@ -6095,28 +6113,25 @@ var DateOrTime = function DateOrTime(props) {
   var _useFormikFields = useFormikFields(props),
     handleSubmit = _useFormikFields.handleSubmit,
     fieldProps = _useFormikFields.fieldProps;
+  var handleChange = function handleChange(dateTime) {
+    return handleSubmit(dateTimeToString(dateTime));
+  };
   if (props.kind === KINDS.time) {
     return /*#__PURE__*/React.createElement(TimePicker, _extends({}, fieldProps, {
       use12Hours: true,
       format: "h:mm A",
-      onChange: function onChange(dateTime) {
-        return handleSubmit(dateTimeToString(dateTime));
-      }
+      onChange: handleChange
     }));
   } else if (props.kind === KINDS.date) {
     return /*#__PURE__*/React.createElement(DatePicker, _extends({}, fieldProps, {
-      onChange: function onChange(dateTime) {
-        return handleSubmit(dateTimeToString(dateTime));
-      }
+      onChange: handleChange
     }));
   }
   return /*#__PURE__*/React.createElement(DatePicker, _extends({
     showTime: true,
     timeFormat: "h:mm A"
   }, fieldProps, {
-    onChange: function onChange(dateTime) {
-      return handleSubmit(dateTimeToString(dateTime));
-    }
+    onChange: handleChange
   }));
 };
 
@@ -6233,8 +6248,8 @@ var TextArea = function TextArea(props) {
   }));
 };
 
-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; }
+function ownKeys$c(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$c(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$c(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var standardComponents = {
   text: Text,
   regex: Text,
@@ -6285,7 +6300,7 @@ var transformValues = function transformValues(_ref2) {
     delete allFieldValues[fieldPath];
   });
   var cleanedFieldValues = pipe(removeItemsWithNullData, removeNoiseFromValues)(neetoFieldValues);
-  return _objectSpread$a(_objectSpread$a({}, allFieldValues), {}, {
+  return _objectSpread$c(_objectSpread$c({}, allFieldValues), {}, {
     fieldValuesAttributes: cleanedFieldValues
   });
 };
@@ -6348,8 +6363,8 @@ var neetoFieldsUtils = {
   transformValues: transformValues
 };
 
-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; }
+function ownKeys$b(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$b(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$b(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$b(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,
@@ -6367,7 +6382,7 @@ var FieldInputs = function FieldInputs(_ref) {
     if (Field) {
       return /*#__PURE__*/React.createElement(Field, _extends({
         key: field.id
-      }, _objectSpread$9(_objectSpread$9({}, field), {}, {
+      }, _objectSpread$b(_objectSpread$b({}, field), {}, {
         formRef: formRef,
         disabled: disabled,
         isRequiredColumnName: isRequiredColumnName
@@ -6388,28 +6403,10 @@ var FIELD_URL = "".concat(NEETO_FIELDS_URL, "/fields/:fieldId");
 var DEPENDENCIES_URL = "".concat(NEETO_FIELDS_URL, "/fields/:fieldId/dependencies");
 var FIELDS_REORDER_URL = "".concat(FIELDS_URL, "/reorder");
 var CONFIGS_URL = "".concat(NEETO_FIELDS_URL, "/configs");
-var SINGULAR = {
-  count: 1
-};
-var PLURAL = {
-  count: 2
-};
 var INFO_ICON_SIZE = 16;
 
-var TitleWithHelpLink = function TitleWithHelpLink(_ref) {
-  var title = _ref.title,
-    helpUrl = _ref.helpUrl;
-  return /*#__PURE__*/React.createElement("div", {
-    className: "flex items-center gap-x-1"
-  }, title, helpUrl && /*#__PURE__*/React.createElement("a", {
-    href: helpUrl,
-    rel: "noreferrer",
-    target: "_blank"
-  }, /*#__PURE__*/React.createElement(Info, {
-    size: INFO_ICON_SIZE
-  })));
-};
-
+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 fieldUrl = function fieldUrl(fieldId) {
   return buildUrl(FIELD_URL, {
     fieldId: fieldId
@@ -6424,14 +6421,15 @@ var fetch$1 = function fetch(_ref) {
   var resourceType = _ref.resourceType,
     ownerId = _ref.ownerId,
     state = _ref.state,
-    searchTerm = _ref.searchTerm;
+    searchTerm = _ref.searchTerm,
+    pageProps = _ref.pageProps;
   return axios.get(FIELDS_URL, {
-    params: {
+    params: _objectSpread$a({
       resourceType: resourceType,
       ownerId: ownerId,
       state: state,
       searchTerm: searchTerm
-    }
+    }, pageProps)
   });
 };
 var create$1 = function create(payload) {
@@ -6490,31 +6488,28 @@ var QUERY_KEYS = {
 };
 var DEFAULT_STALE_TIME = 3600000; // 1 hour
 
-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; }
+var _excluded$4 = ["prefixQueryKeys", "pageProps"];
+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 FIELDS = QUERY_KEYS.FIELDS,
   DEPENDENCIES = QUERY_KEYS.DEPENDENCIES;
 var useFetchFields = function useFetchFields(_ref, options) {
-  var resourceType = _ref.resourceType,
-    ownerId = _ref.ownerId,
-    state = _ref.state,
-    _ref$prefixQueryKeys = _ref.prefixQueryKeys,
+  var _ref$prefixQueryKeys = _ref.prefixQueryKeys,
     prefixQueryKeys = _ref$prefixQueryKeys === void 0 ? [] : _ref$prefixQueryKeys,
-    searchTerm = _ref.searchTerm;
-  return useQuery([FIELDS].concat(_toConsumableArray(prefixQueryKeys), [resourceType, ownerId, state, searchTerm]), function () {
-    return fieldsApi.fetch({
-      resourceType: resourceType,
-      ownerId: ownerId,
-      state: state,
-      searchTerm: searchTerm
-    });
-  }, _objectSpread$8({
+    _ref$pageProps = _ref.pageProps,
+    pageProps = _ref$pageProps === void 0 ? {} : _ref$pageProps,
+    params = _objectWithoutProperties(_ref, _excluded$4);
+  return useQuery([FIELDS].concat(_toConsumableArray(prefixQueryKeys), [pageProps, params]), function () {
+    return fieldsApi.fetch(_objectSpread$9({
+      pageProps: pageProps
+    }, params));
+  }, _objectSpread$9({
     staleTime: DEFAULT_STALE_TIME
   }, options));
 };
 var useCreateField = function useCreateField(options) {
   var queryClient = useQueryClient();
-  return useMutation(fieldsApi.create, _objectSpread$8(_objectSpread$8({}, options), {}, {
+  return useMutation(fieldsApi.create, _objectSpread$9(_objectSpread$9({}, options), {}, {
     onSuccess: function onSuccess() {
       var _options$onSuccess;
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -6548,7 +6543,7 @@ var useFetchDependencies = function useFetchDependencies(_ref3, options) {
 };
 var useUpdateField = function useUpdateField(options) {
   var queryClient = useQueryClient();
-  return useMutation(fieldsApi.update, _objectSpread$8(_objectSpread$8({}, options), {}, {
+  return useMutation(fieldsApi.update, _objectSpread$9(_objectSpread$9({}, options), {}, {
     onSuccess: function onSuccess() {
       var _options$onSuccess2;
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
@@ -6561,7 +6556,7 @@ var useUpdateField = function useUpdateField(options) {
 };
 var useDestroyField = function useDestroyField(options) {
   var queryClient = useQueryClient();
-  return useMutation(fieldsApi.destroy, _objectSpread$8(_objectSpread$8({}, options), {}, {
+  return useMutation(fieldsApi.destroy, _objectSpread$9(_objectSpread$9({}, options), {}, {
     onSuccess: function onSuccess() {
       var _options$onSuccess3;
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
@@ -6581,11 +6576,11 @@ var useReorderFields = function useReorderFields() {
   });
 };
 
-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; }
+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; }
 var arrangeOptionsDisplayOrder = function arrangeOptionsDisplayOrder(options) {
   return options.map(function (option, index) {
-    return _objectSpread$7(_objectSpread$7({}, option), {}, {
+    return _objectSpread$8(_objectSpread$8({}, option), {}, {
       displayOrder: index
     });
   });
@@ -6600,7 +6595,7 @@ var buildPayload = function buildPayload(_ref) {
   var name = formValues.name.trim();
   return {
     ownerId: isEmpty(ownerId) ? undefined : ownerId,
-    field: _objectSpread$7(_objectSpread$7({}, omit(["createdAt", "id", "ownerId", "ownerType", "updatedAt"], formValues)), {}, {
+    field: _objectSpread$8(_objectSpread$8({}, omit(["createdAt", "id", "ownerId", "ownerType", "updatedAt"], formValues)), {}, {
       kind: kind,
       name: name,
       resourceType: isEmpty(resourceType) ? undefined : resourceType,
@@ -6627,14 +6622,14 @@ var getPermittedKinds = function getPermittedKinds(_ref2) {
   return permittedKinds;
 };
 var generateValidationSchema = function generateValidationSchema(additionalValidations) {
-  return yup.object().shape(_objectSpread$7(_objectSpread$7({}, BASIC_FIELD_FORM_VALIDATIONS), additionalValidations));
+  return yup.object().shape(_objectSpread$8(_objectSpread$8({}, 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.createElement(Pane.Footer, null, /*#__PURE__*/React.createElement(ActionBlock, {
+  return /*#__PURE__*/React.createElement(Pane.Footer, null, /*#__PURE__*/React.createElement(ActionBlock$1, {
     cancelButtonProps: {
       onClick: onClose,
       style: "text",
@@ -6926,9 +6921,9 @@ var FieldForm = function FieldForm(_ref) {
   }, t("labels.isRequired"))), children));
 };
 
-var _excluded$2 = ["resourceType", "allowedKinds", "ownerId", "additionalValidations", "initialValues", "onClose", "onMutationSuccess"];
-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 _excluded$3 = ["resourceType", "allowedKinds", "ownerId", "additionalValidations", "initialValues", "onClose", "onMutationSuccess"];
+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").AddProps>} */
 
@@ -6941,7 +6936,7 @@ var Add = function Add(_ref) {
     initialValues = _ref.initialValues,
     onClose = _ref.onClose,
     onMutationSuccess = _ref.onMutationSuccess,
-    props = _objectWithoutProperties(_ref, _excluded$2);
+    props = _objectWithoutProperties(_ref, _excluded$3);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useCreateField = useCreateField({
@@ -6965,7 +6960,7 @@ var Add = function Add(_ref) {
     style: "h2"
   }, t("titles.addField"))), /*#__PURE__*/React.createElement(Form, {
     formikProps: {
-      initialValues: _objectSpread$6(_objectSpread$6({}, initialValues), INITIAL_FIELDS),
+      initialValues: _objectSpread$7(_objectSpread$7({}, initialValues), INITIAL_FIELDS),
       validationSchema: generateValidationSchema(additionalValidations),
       onSubmit: handleSubmit
     }
@@ -6983,9 +6978,9 @@ var Add = function Add(_ref) {
   }));
 };
 
-var _excluded$1 = ["fieldId", "allowedKinds", "ownerId", "additionalValidations", "initialValues", "onClose", "onMutationSuccess"];
-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 _excluded$2 = ["fieldId", "allowedKinds", "ownerId", "additionalValidations", "initialValues", "onClose", "onMutationSuccess"];
+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; }
 
 /** @type {React.FC<import("types").EditProps>} */
 
@@ -7000,7 +6995,7 @@ var Edit = function Edit(_ref) {
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
     onClose = _ref.onClose,
     onMutationSuccess = _ref.onMutationSuccess,
-    props = _objectWithoutProperties(_ref, _excluded$1);
+    props = _objectWithoutProperties(_ref, _excluded$2);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useShowField = useShowField({
@@ -7038,7 +7033,7 @@ var Edit = function Edit(_ref) {
     style: "h2"
   }, t("titles.editField"))), isLoading ? /*#__PURE__*/React.createElement(PageLoader, null) : /*#__PURE__*/React.createElement(Form, {
     formikProps: {
-      initialValues: _objectSpread$5(_objectSpread$5({}, initialValues), assoc("kind", FIELD_KINDS[field.kind], field)),
+      initialValues: _objectSpread$6(_objectSpread$6({}, initialValues), assoc("kind", FIELD_KINDS[field.kind], field)),
       validationSchema: generateValidationSchema(additionalValidations),
       enableReinitialize: true,
       onSubmit: handleSubmit
@@ -7062,7 +7057,7 @@ var Edit = function Edit(_ref) {
   }));
 };
 
-var _excluded = ["isOpen", "selectedField"];
+var _excluded$1 = ["isOpen", "selectedField"];
 
 /** @type {React.FC<import("types").FieldsPaneProps>} */
 
@@ -7070,7 +7065,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.createElement(Pane, {
     isOpen: isOpen,
     onClose: props.onClose
@@ -7599,6 +7594,7 @@ var buildDefaultColumns = function buildDefaultColumns(_ref) {
     key: "name",
     dataIndex: "name",
     title: t$1("titles.fieldName"),
+    width: "30%",
     render: function render(name, field) {
       return /*#__PURE__*/React.createElement("div", {
         className: "flex items-center justify-between gap-x-3"
@@ -7630,7 +7626,8 @@ var buildDefaultColumns = function buildDefaultColumns(_ref) {
     title: t$1("titles.fieldKind"),
     render: function render(kind) {
       return DISPLAY_KINDS[kind];
-    }
+    },
+    width: "30%"
   }, {
     key: "isRequired",
     dataIndex: "isRequired",
@@ -7771,16 +7768,16 @@ var configsApi = {
   fetchConfigs: fetchConfigs
 };
 
-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; }
+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 useFetchConfigs = function useFetchConfigs(options) {
-  return useQuery([QUERY_KEYS.CONFIGS], configsApi.fetchConfigs, _objectSpread$4({
+  return useQuery([QUERY_KEYS.CONFIGS], configsApi.fetchConfigs, _objectSpread$5({
     staleTime: DEFAULT_STALE_TIME
   }, options));
 };
 
-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; }
+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 useFieldsDashboard = function useFieldsDashboard(_ref) {
   var buildColumnData = _ref.buildColumnData,
     isOwnerBased = _ref.isOwnerBased,
@@ -7793,26 +7790,29 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     isPaneOpen = _useState2[0],
     setIsPaneOpen = _useState2[1];
-  var _useState3 = useState(true),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    isMenuBarOpen = _useState4[0],
-    setIsMenuBarOpen = _useState4[1];
+    isDeleteAlertOpen = _useState4[0],
+    setIsDeleteAlertOpen = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    isDeleteAlertOpen = _useState6[0],
-    setIsDeleteAlertOpen = _useState6[1];
-  var _useState7 = useState(false),
+    isReorderPaneOpen = _useState6[0],
+    setIsReorderPaneOpen = _useState6[1];
+  var _useState7 = useState({}),
     _useState8 = _slicedToArray(_useState7, 2),
-    isReorderPaneOpen = _useState8[0],
-    setIsReorderPaneOpen = _useState8[1];
-  var _useState9 = useState({}),
+    selectedField = _useState8[0],
+    setSelectedField = _useState8[1];
+  var _useState9 = useState(""),
     _useState10 = _slicedToArray(_useState9, 2),
-    selectedField = _useState10[0],
-    setSelectedField = _useState10[1];
-  var _useState11 = useState(""),
+    searchTerm = _useState10[0],
+    setSearchTerm = _useState10[1];
+  var _useState11 = useState({
+      pageIndex: DEFAULT_PAGE_INDEX,
+      pageSize: DEFAULT_PAGE_SIZE
+    }),
     _useState12 = _slicedToArray(_useState11, 2),
-    searchTerm = _useState12[0],
-    setSearchTerm = _useState12[1];
+    pageProps = _useState12[0],
+    setPageProps = _useState12[1];
   var debouncedSearchTerm = useDebounce(searchTerm.trim());
   var history = useHistory();
   var _useTranslation = useTranslation(),
@@ -7831,12 +7831,12 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     _useFetchConfigs$data4 = _useFetchConfigs$data2.resourceTypes,
     resourceTypes = _useFetchConfigs$data4 === void 0 ? [] : _useFetchConfigs$data4,
     isConfigsLoading = _useFetchConfigs.isLoading;
-  var fieldParams = {
+  var fieldParams = _objectSpread$4({
     resourceType: !isOwnerBased ? resource : undefined,
     ownerId: ownerId,
     state: state || FIELD_STATES.active,
     searchTerm: debouncedSearchTerm
-  };
+  }, pageProps);
   var _useFetchFields = useFetchFields(fieldParams, {
       enabled: !!resource,
       keepPreviousData: true
@@ -7848,18 +7848,9 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     count = _useFetchFields$data2.count,
     activeFieldsCount = _useFetchFields$data2.activeFieldsCount,
     inactiveFieldsCount = _useFetchFields$data2.inactiveFieldsCount,
+    reorderable = _useFetchFields$data2.reorderable,
     isFieldsLoading = _useFetchFields.isLoading,
     isFieldsFetching = _useFetchFields.isFetching;
-  var _useFetchFields2 = useFetchFields(_objectSpread$3(_objectSpread$3({}, fieldParams), {}, {
-      state: FIELD_STATES.active,
-      searchTerm: ""
-    }), {
-      enabled: !!resource
-    }),
-    _useFetchFields2$data = _useFetchFields2.data,
-    _useFetchFields2$data2 = _useFetchFields2$data === void 0 ? {} : _useFetchFields2$data,
-    _useFetchFields2$data3 = _useFetchFields2$data2.fields,
-    allFields = _useFetchFields2$data3 === void 0 ? [] : _useFetchFields2$data3;
   var _useDestroyField = useDestroyField({
       onSuccess: function onSuccess() {
         setIsDeleteAlertOpen(false);
@@ -7903,7 +7894,7 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     defaultColumns: defaultColumns
   });
   var handleBlockClick = function handleBlockClick(params) {
-    return handleMetaClick(history, buildUrl("", _objectSpread$3({
+    return handleMetaClick(history, buildUrl("", _objectSpread$4({
       resource: resource,
       state: state
     }, params)));
@@ -7974,11 +7965,15 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
   useEffect(function () {
     handleURLWithDefaultValues();
   }, [isConfigsLoading, resources]);
+  useEffect(function () {
+    setPageProps({
+      pageIndex: DEFAULT_PAGE_INDEX,
+      pageSize: DEFAULT_PAGE_SIZE
+    });
+  }, [searchTerm, state, resource]);
   return {
     isPaneOpen: isPaneOpen,
     setIsPaneOpen: setIsPaneOpen,
-    isMenuBarOpen: isMenuBarOpen,
-    setIsMenuBarOpen: setIsMenuBarOpen,
     isDeleteAlertOpen: isDeleteAlertOpen,
     isReorderPaneOpen: isReorderPaneOpen,
     setIsReorderPaneOpen: setIsReorderPaneOpen,
@@ -7986,7 +7981,6 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     count: count,
     columnData: columnData,
     selectedField: selectedField,
-    selectedState: state,
     selectedMenu: resource,
     // resource will be ownerId if showOwnersInMenu is true, else it will be resourceType
     ownerId: ownerId,
@@ -8004,8 +7998,10 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     searchProps: searchProps,
     stateFilterTabs: stateFilterTabs,
     menuBarItems: menuBarItems,
-    allFields: allFields,
-    headerDisplayTitle: headerDisplayTitle
+    reorderable: reorderable,
+    headerDisplayTitle: headerDisplayTitle,
+    pageProps: pageProps,
+    setPageProps: setPageProps
   };
 };
 
@@ -8044,6 +8040,8 @@ var DeleteAlert = function DeleteAlert(_ref) {
   });
 };
 
+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 FieldsTable = function FieldsTable(_ref) {
   var totalCount = _ref.totalCount,
     isLoading = _ref.isLoading,
@@ -8051,11 +8049,15 @@ var FieldsTable = function FieldsTable(_ref) {
     columnData = _ref.columnData,
     setIsPaneOpen = _ref.setIsPaneOpen,
     helpDocUrl = _ref.helpDocUrl,
-    title = _ref.title;
+    title = _ref.title,
+    pageProps = _ref.pageProps,
+    setPageProps = _ref.setPageProps;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var showNoDataScreen = !isLoading && isEmpty(rowData);
   title = title.toLocaleLowerCase();
+  var pageIndex = pageProps.pageIndex,
+    pageSize = pageProps.pageSize;
   return /*#__PURE__*/React.createElement(TableWrapper, null, showNoDataScreen ? /*#__PURE__*/React.createElement("div", {
     className: "flex h-full w-full items-center justify-center"
   }, /*#__PURE__*/React.createElement(NoData, _extends({}, helpDocUrl && {
@@ -8074,12 +8076,92 @@ var FieldsTable = function FieldsTable(_ref) {
     fixedHeight: true,
     allowRowClick: false,
     columnData: columnData,
-    loading: isLoading,
     rowData: rowData,
-    totalCount: totalCount
+    totalCount: totalCount,
+    currentPageNumber: pageIndex,
+    defaultPageSize: pageSize,
+    loading: isLoading,
+    handlePageChange: function handlePageChange(pageIndex) {
+      return setPageProps(_objectSpread$3(_objectSpread$3({}, pageProps), {}, {
+        pageIndex: pageIndex
+      }));
+    }
+  }));
+};
+
+var TitleWithHelpLink = function TitleWithHelpLink(_ref) {
+  var title = _ref.title,
+    helpUrl = _ref.helpUrl;
+  return /*#__PURE__*/React.createElement("div", {
+    className: "flex items-center gap-x-1"
+  }, title, helpUrl && /*#__PURE__*/React.createElement("a", {
+    href: helpUrl,
+    rel: "noreferrer",
+    target: "_blank"
+  }, /*#__PURE__*/React.createElement(Info, {
+    size: INFO_ICON_SIZE
+  })));
+};
+
+// eslint-disable-next-line @bigbinary/neeto/no-dumb-components-with-use-translation
+var ActionBlock = function ActionBlock(_ref) {
+  var reorderable = _ref.reorderable,
+    setIsReorderPaneOpen = _ref.setIsReorderPaneOpen,
+    setIsPaneOpen = _ref.setIsPaneOpen;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  return /*#__PURE__*/React.createElement("div", {
+    className: "flex flex-shrink-0 items-center gap-3"
+  }, /*#__PURE__*/React.createElement(Button$1, {
+    "data-cy": "neeto-fields-reorder-button",
+    disabled: !reorderable,
+    label: t("labels.reorder"),
+    style: "secondary",
+    onClick: function onClick() {
+      return setIsReorderPaneOpen(true);
+    }
+  }), /*#__PURE__*/React.createElement(Button$1, {
+    "data-cy": "neeto-fields-add-button",
+    label: t("labels.addField"),
+    onClick: function onClick() {
+      return setIsPaneOpen(true);
+    }
   }));
 };
 
+var _excluded = ["searchProps", "breadcrumbs", "title", "helpDocUrl"];
+var Header = function Header(_ref) {
+  var searchProps = _ref.searchProps,
+    breadcrumbs = _ref.breadcrumbs,
+    title = _ref.title,
+    helpDocUrl = _ref.helpDocUrl,
+    actionBlockProps = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/React.createElement(NeetoUIHeader, {
+    size: "small",
+    searchProps: searchProps,
+    actionBlock: /*#__PURE__*/React.createElement(ActionBlock, actionBlockProps),
+    breadcrumbs: [].concat(_toConsumableArray(breadcrumbs), [{
+      text: truncate(title, 50)
+    }]),
+    title: /*#__PURE__*/React.createElement(TitleWithHelpLink, {
+      helpUrl: helpDocUrl,
+      title: title
+    })
+  });
+};
+
+var Menubar = function Menubar(_ref) {
+  var isConfigsLoading = _ref.isConfigsLoading,
+    menuBarItems = _ref.menuBarItems,
+    title = _ref.title;
+  return /*#__PURE__*/React.createElement(MenuBar, {
+    showMenu: true,
+    title: title
+  }, isConfigsLoading ? /*#__PURE__*/React.createElement("div", {
+    className: "flex items-center justify-center"
+  }, /*#__PURE__*/React.createElement(Spinner, null)) : menuBarItems);
+};
+
 function useCombinedRefs() {
   for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) {
     refs[_key] = arguments[_key];
@@ -12353,7 +12435,6 @@ var FieldBlock$1 = /*#__PURE__*/React.memo(FieldBlock);
 var ReorderPane = function ReorderPane(_ref) {
   var isOpen = _ref.isOpen,
     onClose = _ref.onClose,
-    allFields = _ref.allFields,
     ownerId = _ref.ownerId;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -12362,12 +12443,32 @@ var ReorderPane = function ReorderPane(_ref) {
   var initialStateRef = useRef([]);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var _getQueryParams = getQueryParams(),
+    resource = _getQueryParams.resource;
   var _useReorderFields = useReorderFields(),
     reorderField = _useReorderFields.mutate,
     isSubmitting = _useReorderFields.isLoading;
-  var handleDragEnd = function handleDragEnd(_ref2) {
-    var active = _ref2.active,
-      over = _ref2.over;
+  var fieldParams = {
+    resourceType: isEmpty(ownerId) ? resource : undefined,
+    ownerId: ownerId,
+    state: FIELD_STATES.active,
+    searchTerm: ""
+  };
+  var _useFetchFields = useFetchFields(fieldParams, {
+      enabled: !!resource && isOpen,
+      onSuccess: function onSuccess(_ref2) {
+        var fields = _ref2.fields;
+        setFields(fields);
+        initialStateRef.current = fields;
+      }
+    }),
+    _useFetchFields$data = _useFetchFields.data,
+    _useFetchFields$data2 = _useFetchFields$data === void 0 ? {} : _useFetchFields$data,
+    _useFetchFields$data3 = _useFetchFields$data2.fields,
+    allFields = _useFetchFields$data3 === void 0 ? [] : _useFetchFields$data3;
+  var handleDragEnd = function handleDragEnd(_ref3) {
+    var active = _ref3.active,
+      over = _ref3.over;
     if (active.id !== over.id) {
       setFields(function (fields) {
         return arrayMove(fields, active.data.current.index, over.data.current.index);
@@ -12389,10 +12490,6 @@ var ReorderPane = function ReorderPane(_ref) {
       onSuccess: onClose
     });
   };
-  useEffect(function () {
-    setFields(allFields);
-    initialStateRef.current = allFields;
-  }, [allFields]);
   return /*#__PURE__*/React.createElement(Pane, {
     isOpen: isOpen,
     onClose: onClose
@@ -12436,8 +12533,21 @@ var ReorderPane = function ReorderPane(_ref) {
   })));
 };
 
-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; }
+// eslint-disable-next-line @bigbinary/neeto/no-dumb-components-with-use-translation
+var Subheader = function Subheader(_ref) {
+  var count = _ref.count;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  return /*#__PURE__*/React.createElement(NeetoUISubHeader, {
+    leftActionBlock: /*#__PURE__*/React.createElement(Typography, {
+      className: "neeto-ui-gray-800 mr-4 font-semibold",
+      "data-cy": "neeto-fields-subheader-text",
+      style: "h4"
+    }, t("titles.fieldWithCount", {
+      count: count
+    }))
+  });
+};
 
 /** @type {React.FC<import("types").FieldsDashboardProps>} */
 
@@ -12482,8 +12592,6 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     }),
     isPaneOpen = _useFieldsDashboard.isPaneOpen,
     setIsPaneOpen = _useFieldsDashboard.setIsPaneOpen,
-    isMenuBarOpen = _useFieldsDashboard.isMenuBarOpen,
-    setIsMenuBarOpen = _useFieldsDashboard.setIsMenuBarOpen,
     isDeleteAlertOpen = _useFieldsDashboard.isDeleteAlertOpen,
     isReorderPaneOpen = _useFieldsDashboard.isReorderPaneOpen,
     setIsReorderPaneOpen = _useFieldsDashboard.setIsReorderPaneOpen,
@@ -12491,7 +12599,6 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     count = _useFieldsDashboard.count,
     columnData = _useFieldsDashboard.columnData,
     selectedField = _useFieldsDashboard.selectedField,
-    selectedState = _useFieldsDashboard.selectedState,
     selectedMenu = _useFieldsDashboard.selectedMenu,
     ownerId = _useFieldsDashboard.ownerId,
     isFieldsFetching = _useFieldsDashboard.isFieldsFetching,
@@ -12508,59 +12615,36 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     searchProps = _useFieldsDashboard.searchProps,
     stateFilterTabs = _useFieldsDashboard.stateFilterTabs,
     menuBarItems = _useFieldsDashboard.menuBarItems,
-    allFields = _useFieldsDashboard.allFields,
-    headerDisplayTitle = _useFieldsDashboard.headerDisplayTitle;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, isMenuBarNeeded && /*#__PURE__*/React.createElement(MenuBar, {
-    showMenu: isMenuBarOpen,
+    reorderable = _useFieldsDashboard.reorderable,
+    headerDisplayTitle = _useFieldsDashboard.headerDisplayTitle,
+    pageProps = _useFieldsDashboard.pageProps,
+    setPageProps = _useFieldsDashboard.setPageProps;
+  var headerProps = {
+    reorderable: reorderable,
+    breadcrumbs: breadcrumbs,
+    helpDocUrl: helpDocUrl,
+    searchProps: searchProps,
+    setIsPaneOpen: setIsPaneOpen,
+    setIsReorderPaneOpen: setIsReorderPaneOpen,
+    title: headerDisplayTitle
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, isMenuBarNeeded && /*#__PURE__*/React.createElement(Menubar, {
+    isConfigsLoading: isConfigsLoading,
+    menuBarItems: menuBarItems,
     title: title
-  }, isConfigsLoading ? /*#__PURE__*/React.createElement("div", {
-    className: "flex items-center justify-center"
-  }, /*#__PURE__*/React.createElement(Spinner, null)) : menuBarItems), isScreenLoading && isEmpty(fields) ? /*#__PURE__*/React.createElement("div", {
+  }), isScreenLoading && isEmpty(fields) ? /*#__PURE__*/React.createElement("div", {
     className: "flex h-screen w-full flex-grow items-center justify-center"
-  }, /*#__PURE__*/React.createElement(PageLoader, null)) : /*#__PURE__*/React.createElement(Container, null, /*#__PURE__*/React.createElement(Header, _extends({}, _objectSpread$2(_objectSpread$2({
-    breadcrumbs: breadcrumbs
-  }, isMenuBarNeeded && {
-    menuBarToggle: function menuBarToggle() {
-      return setIsMenuBarOpen(not);
-    }
-  }), {}, {
-    searchProps: searchProps
-  }), {
-    actionBlock: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button$1, {
-      "data-cy": "neeto-fields-reorder-button",
-      label: t("labels.reorder"),
-      style: "secondary",
-      disabled: selectedState === FIELD_STATES.inactive || !existsBy({
-        isSystem: false,
-        state: "active"
-      }, allFields),
-      onClick: function onClick() {
-        return setIsReorderPaneOpen(true);
-      }
-    })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button$1, {
-      "data-cy": "neeto-fields-add-button",
-      label: t("labels.addField"),
-      onClick: function onClick() {
-        return setIsPaneOpen(true);
-      }
-    }))),
-    title: /*#__PURE__*/React.createElement(TitleWithHelpLink, {
-      helpUrl: helpDocUrl,
-      title: headerDisplayTitle
-    })
-  })), showCountSubheader && /*#__PURE__*/React.createElement(SubHeader, {
-    leftActionBlock: /*#__PURE__*/React.createElement(Typography, {
-      className: "mr-4 font-semibold",
-      "data-cy": "neeto-fields-subheader-text",
-      style: "h4"
-    }, "".concat(count, " "), t("titles.field", count > 1 ? PLURAL : SINGULAR).toLocaleLowerCase())
-  }), showStateFilter && stateFilterTabs, /*#__PURE__*/React.createElement(FieldsTable, {
+  }, /*#__PURE__*/React.createElement(PageLoader, null)) : /*#__PURE__*/React.createElement(Container, null, /*#__PURE__*/React.createElement(Header, headerProps), showStateFilter && stateFilterTabs, showCountSubheader && /*#__PURE__*/React.createElement(Subheader, {
+    count: count
+  }), /*#__PURE__*/React.createElement(FieldsTable, {
     isLoading: isFieldsFetching || isFieldsLoading,
     rowData: isEmpty(rowData) ? fields : rowData,
     totalCount: count,
     columnData: columnData,
     helpDocUrl: helpDocUrl,
+    pageProps: pageProps,
     setIsPaneOpen: setIsPaneOpen,
+    setPageProps: setPageProps,
     title: title
   }), /*#__PURE__*/React.createElement(FieldsPane, {
     additionalValidations: paneProps === null || paneProps === void 0 ? void 0 : paneProps.validations,
@@ -12576,8 +12660,7 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
   }, paneProps === null || paneProps === void 0 ? void 0 : paneProps.children)), /*#__PURE__*/React.createElement(ReorderPane, {
     isOpen: isReorderPaneOpen,
     ownerId: isOwnerBased ? selectedMenu : "",
-    onClose: handleReorderPaneClose,
-    allFields: allFields
+    onClose: handleReorderPaneClose
   }), /*#__PURE__*/React.createElement(DeleteAlert, {
     handleAlertClose: handleAlertClose,
     handleDelete: handleDelete,
@@ -12619,11 +12702,11 @@ var fieldValuesApi = {
   update: update
 };
 
-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$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 useCreateFieldValue = function useCreateFieldValue(options) {
   var queryClient = useQueryClient();
-  return useMutation(fieldValuesApi.create, _objectSpread$1(_objectSpread$1({}, options), {}, {
+  return useMutation(fieldValuesApi.create, _objectSpread$2(_objectSpread$2({}, options), {}, {
     onSuccess: function onSuccess() {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
@@ -12635,7 +12718,7 @@ var useCreateFieldValue = function useCreateFieldValue(options) {
 };
 var useUpdateFieldValue = function useUpdateFieldValue(options) {
   var queryClient = useQueryClient();
-  return useMutation(fieldValuesApi.update, _objectSpread$1(_objectSpread$1({}, options), {}, {
+  return useMutation(fieldValuesApi.update, _objectSpread$2(_objectSpread$2({}, options), {}, {
     onSuccess: function onSuccess() {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
@@ -12647,7 +12730,7 @@ var useUpdateFieldValue = function useUpdateFieldValue(options) {
 };
 var useDeleteFieldValue = function useDeleteFieldValue(options) {
   var queryClient = useQueryClient();
-  return useMutation(fieldValuesApi.destroy, _objectSpread$1(_objectSpread$1({}, options), {}, {
+  return useMutation(fieldValuesApi.destroy, _objectSpread$2(_objectSpread$2({}, options), {}, {
     onSuccess: function onSuccess() {
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
         args[_key3] = arguments[_key3];
@@ -12658,6 +12741,88 @@ var useDeleteFieldValue = function useDeleteFieldValue(options) {
   }));
 };
 
+const useNavPrompt = ({
+  shouldBlock
+}) => {
+  const history = useHistory();
+
+  const _unblock = useRef(null);
+
+  const _navPath = useRef(null);
+
+  const [blocked, setBlocked] = useState(false);
+  useEffect(() => {
+    if (shouldBlock) {
+      _unblock.current = history.block(location => {
+        // need to use ref?
+        setBlocked(true);
+        _navPath.current = location.pathname + location.search; // $FlowFixMe - See https://github.com/ReactTraining/history/issues/728
+
+        return false;
+      });
+      return () => {
+        if (_unblock.current) {
+          _unblock.current();
+        }
+      };
+    }
+  }, [shouldBlock]);
+
+  const navigate = () => {
+    if (_unblock.current) {
+      _unblock.current();
+
+      setBlocked(false);
+
+      if (_navPath.current) {
+        history.push(_navPath.current);
+      }
+    }
+  };
+
+  const hidePrompt = () => {
+    setBlocked(false);
+  };
+
+  return {
+    blocked,
+    navigate,
+    hidePrompt
+  };
+};
+
+var DEAFULT_BLOCK_NAVIGATION_ALERT_PROPS = {
+  title: t$1("messages.blockNavigationAlert.title"),
+  message: t$1("messages.blockNavigationAlert.message"),
+  submitButtonLabel: t$1("messages.blockNavigationAlert.submitButtonLabel"),
+  cancelButtonLabel: t$1("messages.blockNavigationAlert.cancelButtonLabel")
+};
+
+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 BlockNavigation = function BlockNavigation(_ref) {
+  var blockNavigation = _ref.blockNavigation,
+    blockNavigationAlertProps = _ref.blockNavigationAlertProps;
+  var _useFormikContext = useFormikContext(),
+    dirty = _useFormikContext.dirty;
+  var _useNavPrompt = useNavPrompt({
+      shouldBlock: blockNavigation && dirty
+    }),
+    blocked = _useNavPrompt.blocked,
+    hidePrompt = _useNavPrompt.hidePrompt,
+    navigate = _useNavPrompt.navigate;
+  var alertProps = _objectSpread$1(_objectSpread$1({}, DEAFULT_BLOCK_NAVIGATION_ALERT_PROPS), blockNavigationAlertProps);
+  return /*#__PURE__*/React.createElement(Alert, {
+    cancelButtonLabel: alertProps["cancelButtonLabel"],
+    isOpen: blocked,
+    message: alertProps["message"],
+    submitButtonLabel: alertProps["submitButtonLabel"],
+    title: alertProps["title"],
+    onClose: hidePrompt,
+    onSubmit: navigate
+  });
+};
+
 var FieldValueInputWrapper = function FieldValueInputWrapper(_ref) {
   var field = _ref.field,
     fieldValues = _ref.fieldValues,
@@ -12710,7 +12875,11 @@ var FieldValuesContainer = function FieldValuesContainer(_ref) {
     isRequiredColumnName = _ref.isRequiredColumnName,
     fieldClassName = _ref.fieldClassName,
     _ref$onMutationSucces = _ref.onMutationSuccess,
-    onMutationSuccess = _ref$onMutationSucces === void 0 ? noop$2 : _ref$onMutationSucces;
+    onMutationSuccess = _ref$onMutationSucces === void 0 ? noop$2 : _ref$onMutationSucces,
+    _ref$blockNavigation = _ref.blockNavigation,
+    blockNavigation = _ref$blockNavigation === void 0 ? false : _ref$blockNavigation,
+    _ref$blockNavigationA = _ref.blockNavigationAlertProps,
+    blockNavigationAlertProps = _ref$blockNavigationA === void 0 ? {} : _ref$blockNavigationA;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var queryOptions = {
@@ -12757,7 +12926,7 @@ var FieldValuesContainer = function FieldValuesContainer(_ref) {
   var fields = propFields || fetchedFields;
   return /*#__PURE__*/React.createElement("div", {
     className: classnames("space-y-3 py-3", {
-      "neeto-ui-border-gray-300 rounded-lg border bg-white px-4 py-2": showBorder
+      "neeto-ui-border-gray-300 neeto-ui-rounded-lg neeto-ui-bg-white border px-4 py-2": showBorder
     }, className)
   }, isFieldsLoading ? /*#__PURE__*/React.createElement("div", {
     className: "flex items-center justify-center"
@@ -12779,12 +12948,16 @@ var FieldValuesContainer = function FieldValuesContainer(_ref) {
         fieldValues: fieldValues
       }, /*#__PURE__*/React.createElement("div", {
         className: "w-full"
-      }, /*#__PURE__*/React.createElement(Field, _objectSpread(_objectSpread({}, field), {}, {
-        individualSubmit: true,
-        formRefs: formRefs,
+      }, /*#__PURE__*/React.createElement(Field, _extends({}, _objectSpread(_objectSpread({}, field), {}, {
         disabled: disabled,
+        formRefs: formRefs,
         isRequiredColumnName: isRequiredColumnName
-      })))));
+      }), {
+        individualSubmit: true
+      })), /*#__PURE__*/React.createElement(BlockNavigation, {
+        blockNavigation: blockNavigation,
+        blockNavigationAlertProps: blockNavigationAlertProps
+      }))));
     }
     return /*#__PURE__*/React.createElement(Typography, {
       key: field.id,