@bigbinary/neeto-fields-frontend 1.3.7 → 1.3.9

package/dist/index.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useMemo, useLayoutEffect, useRef, useCallback, createContext, memo, useReducer, useContext } from 'react';
+import React, { useEffect, useRef, useState, useMemo, useLayoutEffect, useCallback, createContext, memo, useReducer, useContext } from 'react';
 import { useFuncDebounce, withT, useMutationWithInvalidation, useDebounce, handleMetaClick } from '@bigbinary/neeto-commons-frontend/react-utils';
 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 { isNotEmpty, renameKeys, capitalize, findBy, filterBy, toLabelAndValue, slugify, humanize, countBy, noop as noop$1 } from '@bigbinary/neeto-cist';
@@ -10,7 +10,7 @@ import { joinHyphenCase, buildUrl, getQueryParams } from '@bigbinary/neeto-commo
 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 { useTranslation, Trans } from 'react-i18next';
-import { DEFAULT_PAGE_INDEX, PLURAL } from '@bigbinary/neeto-commons-frontend/constants';
+import { DEFAULT_PAGE_INDEX, DEFAULT_PAGE_SIZE, PLURAL } from '@bigbinary/neeto-commons-frontend/constants';
 import Container from '@bigbinary/neeto-molecules/Container';
 import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
 import { useQuery } from 'react-query';
@@ -180,7 +180,6 @@ function _objectWithoutProperties(source, excluded) {
   return target;
 }
 
-var DEFAULT_PAGE_SIZE = 12;
 var KINDS = {
   text: "text",
   number: "number",
@@ -776,8 +775,8 @@ var dateTimeToString = function dateTimeToString(dateTime) {
 };
 
 var _excluded$5 = ["name", "id", "kind", "data", "individualSubmit", "formRef", "formRefs", "disabled", "isRequiredColumnName"];
-function ownKeys$e(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$e(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$e(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$e(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
 var useFormikFields = function useFormikFields(_ref) {
   var name = _ref.name,
     fieldId = _ref.id,
@@ -849,7 +848,7 @@ var useFormikFields = function useFormikFields(_ref) {
   return {
     dirty: dirty,
     handleSubmit: handleSubmit,
-    fieldProps: _objectSpread$e(_objectSpread$e({}, formikFieldProps), {}, {
+    fieldProps: _objectSpread$f(_objectSpread$f({}, formikFieldProps), {}, {
       error: individualSubmit ? meta.error : meta.touched && meta.error,
       value: getValueForField(formikFieldProps.value),
       label: capitalize(name),
@@ -1018,8 +1017,8 @@ var TextArea = function TextArea(props) {
   }));
 };
 
-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 ownKeys$e(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$e(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$e(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$e(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var standardComponents = {
   text: Text,
   regex: Text,
@@ -1070,7 +1069,7 @@ var transformValues = function transformValues(_ref2) {
     delete allFieldValues[fieldPath];
   });
   var cleanedFieldValues = pipe(removeItemsWithNullData, removeNoiseFromValues)(neetoFieldValues);
-  return _objectSpread$d(_objectSpread$d({}, allFieldValues), {}, {
+  return _objectSpread$e(_objectSpread$e({}, allFieldValues), {}, {
     fieldValuesAttributes: cleanedFieldValues
   });
 };
@@ -1133,8 +1132,8 @@ var neetoFieldsUtils = {
   transformValues: transformValues
 };
 
-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; }
+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 FieldInputs = withT(function (_ref) {
   var t = _ref.t,
     _ref$customComponents = _ref.customComponents,
@@ -1151,7 +1150,7 @@ var FieldInputs = withT(function (_ref) {
     if (Field) {
       return /*#__PURE__*/React.createElement(Field, _extends({
         key: field.id
-      }, _objectSpread$c(_objectSpread$c({}, field), {}, {
+      }, _objectSpread$d(_objectSpread$d({}, field), {}, {
         disabled: disabled,
         formRef: formRef,
         isRequiredColumnName: isRequiredColumnName
@@ -1174,8 +1173,8 @@ var FIELDS_REORDER_URL = "".concat(FIELDS_URL, "/reorder");
 var CONFIGS_URL = "".concat(NEETO_FIELDS_URL, "/configs");
 var INFO_ICON_SIZE = 16;
 
-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; }
+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 fieldUrl = function fieldUrl(fieldId) {
   return buildUrl(FIELD_URL, {
     fieldId: fieldId
@@ -1191,9 +1190,10 @@ var fetch$1 = function fetch(_ref) {
     ownerId = _ref.ownerId,
     state = _ref.state,
     searchTerm = _ref.searchTerm,
-    pageProps = _ref.pageProps;
+    _ref$pageProps = _ref.pageProps,
+    pageProps = _ref$pageProps === void 0 ? {} : _ref$pageProps;
   return axios.get(FIELDS_URL, {
-    params: _objectSpread$b({
+    params: _objectSpread$c({
       resourceType: resourceType,
       ownerId: ownerId,
       state: state,
@@ -1257,27 +1257,23 @@ var QUERY_KEYS = {
 };
 var DEFAULT_STALE_TIME = 3600000; // 1 hour
 
-var _excluded$4 = ["prefixQueryKeys", "pageProps"];
-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 _excluded$4 = ["prefixQueryKeys"];
+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 FIELDS = QUERY_KEYS.FIELDS,
   DEPENDENCIES = QUERY_KEYS.DEPENDENCIES;
 var useFetchFields = function useFetchFields(_ref, options) {
   var _ref$prefixQueryKeys = _ref.prefixQueryKeys,
     prefixQueryKeys = _ref$prefixQueryKeys === void 0 ? [] : _ref$prefixQueryKeys,
-    _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$a({
-      pageProps: pageProps
-    }, params));
-  }, _objectSpread$a({
+  return useQuery([FIELDS].concat(_toConsumableArray(prefixQueryKeys), [params]), function () {
+    return fieldsApi.fetch(params);
+  }, _objectSpread$b({
     staleTime: DEFAULT_STALE_TIME
   }, options));
 };
 var useCreateField = function useCreateField(options) {
-  return useMutationWithInvalidation(fieldsApi.create, _objectSpread$a({
+  return useMutationWithInvalidation(fieldsApi.create, _objectSpread$b({
     keysToInvalidate: [FIELDS]
   }, options));
 };
@@ -1303,12 +1299,12 @@ var useFetchDependencies = function useFetchDependencies(_ref3, options) {
   }, options);
 };
 var useUpdateField = function useUpdateField(options) {
-  return useMutationWithInvalidation(fieldsApi.update, _objectSpread$a({
+  return useMutationWithInvalidation(fieldsApi.update, _objectSpread$b({
     keysToInvalidate: [FIELDS]
   }, options));
 };
 var useDestroyField = function useDestroyField(options) {
-  return useMutationWithInvalidation(fieldsApi.destroy, _objectSpread$a({
+  return useMutationWithInvalidation(fieldsApi.destroy, _objectSpread$b({
     keysToInvalidate: [FIELDS]
   }, options));
 };
@@ -1318,11 +1314,11 @@ var useReorderFields = function useReorderFields() {
   });
 };
 
-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$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 arrangeOptionsDisplayOrder = function arrangeOptionsDisplayOrder(options) {
   return options.map(function (option, index) {
-    return _objectSpread$9(_objectSpread$9({}, option), {}, {
+    return _objectSpread$a(_objectSpread$a({}, option), {}, {
       displayOrder: index
     });
   });
@@ -1337,7 +1333,7 @@ var buildPayload = function buildPayload(_ref) {
   var name = formValues.name.trim();
   return {
     ownerId: isEmpty(ownerId) ? undefined : ownerId,
-    field: _objectSpread$9(_objectSpread$9({}, omit(["createdAt", "id", "ownerId", "ownerType", "updatedAt"], formValues)), {}, {
+    field: _objectSpread$a(_objectSpread$a({}, omit(["createdAt", "id", "ownerId", "ownerType", "updatedAt"], formValues)), {}, {
       kind: kind,
       name: name,
       resourceType: isEmpty(resourceType) ? undefined : resourceType,
@@ -1364,7 +1360,7 @@ var getPermittedKinds = function getPermittedKinds(_ref2) {
   return permittedKinds;
 };
 var generateValidationSchema = function generateValidationSchema(additionalValidations) {
-  return yup.object().shape(_objectSpread$9(_objectSpread$9({}, BASIC_FIELD_FORM_VALIDATIONS), additionalValidations));
+  return yup.object().shape(_objectSpread$a(_objectSpread$a({}, BASIC_FIELD_FORM_VALIDATIONS), additionalValidations));
 };
 var renderFormFooter = function renderFormFooter(_ref3) {
   var onClose = _ref3.onClose,
@@ -1570,6 +1566,7 @@ var AdditionalInputs = function AdditionalInputs() {
         }, /*#__PURE__*/React.createElement("div", {
           className: "w-full"
         }, /*#__PURE__*/React.createElement(Input$1, {
+          autoFocus: true,
           disabled: isSystem,
           name: "data.".concat(index, ".label"),
           placeholder: t("neetoFields.placeholders.enterAnOption"),
@@ -1621,7 +1618,8 @@ var FieldForm = function FieldForm(_ref) {
     isSystem = _ref$isSystem === void 0 ? false : _ref$isSystem,
     _ref$hideRequiredSwit = _ref.hideRequiredSwitch,
     hideRequiredSwitch = _ref$hideRequiredSwit === void 0 ? false : _ref$hideRequiredSwit,
-    children = _ref.children;
+    children = _ref.children,
+    initialFocusField = _ref.initialFocusField;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useFormikContext = useFormikContext(),
@@ -1643,7 +1641,8 @@ var FieldForm = function FieldForm(_ref) {
     disabled: isSystem,
     label: t("neetoFields.labels.fieldName"),
     name: "name",
-    placeholder: t("neetoFields.placeholders.enterFieldName")
+    placeholder: t("neetoFields.placeholders.enterFieldName"),
+    ref: initialFocusField
   }), /*#__PURE__*/React.createElement(Select$1, {
     isSearchable: true,
     isDisabled: isSystem,
@@ -1666,8 +1665,8 @@ var FieldForm = function FieldForm(_ref) {
 };
 
 var _excluded$3 = ["resourceType", "allowedKinds", "ownerId", "additionalValidations", "initialValues", "onClose", "onMutationSuccess"];
-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$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; }
 
 /** @type {React.FC<import("types").AddProps>} */
 
@@ -1704,7 +1703,7 @@ var Add = function Add(_ref) {
     style: "h2"
   }, t("neetoFields.titles.addField"))), /*#__PURE__*/React.createElement(Form, {
     formikProps: {
-      initialValues: _objectSpread$8(_objectSpread$8({}, initialValues), INITIAL_FIELDS),
+      initialValues: _objectSpread$9(_objectSpread$9({}, initialValues), INITIAL_FIELDS),
       validationSchema: generateValidationSchema(additionalValidations),
       onSubmit: handleSubmit
     }
@@ -1723,8 +1722,8 @@ var Add = function Add(_ref) {
 };
 
 var _excluded$2 = ["fieldId", "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; }
+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").EditProps>} */
 
@@ -1777,7 +1776,7 @@ var Edit = function Edit(_ref) {
     style: "h2"
   }, t("neetoFields.titles.editField"))), isLoading ? /*#__PURE__*/React.createElement(PageLoader, null) : /*#__PURE__*/React.createElement(Form, {
     formikProps: {
-      initialValues: _objectSpread$7(_objectSpread$7({}, initialValues), assoc("kind", FIELD_KINDS[field.kind], field)),
+      initialValues: _objectSpread$8(_objectSpread$8({}, initialValues), assoc("kind", FIELD_KINDS[field.kind], field)),
       validationSchema: generateValidationSchema(additionalValidations),
       enableReinitialize: true,
       onSubmit: handleSubmit
@@ -1802,6 +1801,8 @@ var Edit = function Edit(_ref) {
 };
 
 var _excluded$1 = ["isOpen", "selectedField"];
+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").FieldsPaneProps>} */
 
@@ -1810,12 +1811,18 @@ var FieldsPane = function FieldsPane(_ref) {
     _ref$selectedField = _ref.selectedField,
     selectedField = _ref$selectedField === void 0 ? {} : _ref$selectedField,
     props = _objectWithoutProperties(_ref, _excluded$1);
+  var initialFocusField = useRef(null);
   return /*#__PURE__*/React.createElement(Pane, {
     isOpen: isOpen,
+    initialFocusRef: initialFocusField,
     onClose: props.onClose
-  }, isEmpty(selectedField) ? /*#__PURE__*/React.createElement(Add, props) : /*#__PURE__*/React.createElement(Edit, _extends({
+  }, isEmpty(selectedField) ? /*#__PURE__*/React.createElement(Add, _objectSpread$7(_objectSpread$7({}, props), {}, {
+    initialFocusField: initialFocusField
+  })) : /*#__PURE__*/React.createElement(Edit, _extends({
     fieldId: selectedField === null || selectedField === void 0 ? void 0 : selectedField.id
-  }, props)));
+  }, _objectSpread$7(_objectSpread$7({}, props), {}, {
+    initialFocusField: initialFocusField
+  }))));
 };
 
 function commonjsRequire(path) {
@@ -2551,7 +2558,7 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     searchTerm = _useState10[0],
     setSearchTerm = _useState10[1];
   var _useState11 = useState({
-      pageIndex: DEFAULT_PAGE_INDEX,
+      page: DEFAULT_PAGE_INDEX,
       pageSize: DEFAULT_PAGE_SIZE
     }),
     _useState12 = _slicedToArray(_useState11, 2),
@@ -2575,12 +2582,13 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     _useFetchConfigs$data4 = _useFetchConfigs$data2.resourceTypes,
     resourceTypes = _useFetchConfigs$data4 === void 0 ? [] : _useFetchConfigs$data4,
     isConfigsLoading = _useFetchConfigs.isLoading;
-  var fieldParams = _objectSpread$5({
+  var fieldParams = {
     resourceType: !isOwnerBased ? resource : undefined,
     ownerId: ownerId,
     state: state || FIELD_STATES.active,
-    searchTerm: debouncedSearchTerm
-  }, pageProps);
+    searchTerm: debouncedSearchTerm,
+    pageProps: pageProps
+  };
   var _useFetchFields = useFetchFields(fieldParams, {
       enabled: !!resource,
       keepPreviousData: true
@@ -2712,7 +2720,7 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
   }, [isConfigsLoading, resources, resource, state]);
   useEffect(function () {
     setPageProps({
-      pageIndex: DEFAULT_PAGE_INDEX,
+      page: DEFAULT_PAGE_INDEX,
       pageSize: DEFAULT_PAGE_SIZE
     });
   }, [searchTerm, state, resource]);
@@ -2804,7 +2812,7 @@ var FieldsTable = function FieldsTable(_ref) {
   var _getQueryParams = getQueryParams(),
     state = _getQueryParams.state;
   title = title.toLocaleLowerCase();
-  var pageIndex = pageProps.pageIndex,
+  var page = pageProps.page,
     pageSize = pageProps.pageSize;
   var noDataProps = {};
   if (!isFetched && isEmpty(rowData)) {
@@ -2836,14 +2844,14 @@ var FieldsTable = function FieldsTable(_ref) {
     totalCount: totalCount,
     fixedHeight: true,
     allowRowClick: false,
-    currentPageNumber: pageIndex,
+    currentPageNumber: page,
     defaultPageSize: pageSize,
-    loading: isFetching,
-    handlePageChange: function handlePageChange(pageIndex) {
+    handlePageChange: function handlePageChange(page) {
       return setPageProps(_objectSpread$4(_objectSpread$4({}, pageProps), {}, {
-        pageIndex: pageIndex
+        page: page
       }));
-    }
+    },
+    loading: isFetching
   }));
 };