@bigbinary/neeto-fields-frontend 1.3.3 → 1.3.5

package/dist/index.cjs.js

@@ -6542,17 +6542,9 @@ var useFetchFields = function useFetchFields(_ref, options) {
   }, options));
 };
 var useCreateField = function useCreateField(options) {
-  var queryClient = reactQuery.useQueryClient();
-  return reactQuery.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++) {
-        args[_key] = arguments[_key];
-      }
-      options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call.apply(_options$onSuccess, [options].concat(args));
-      queryClient.invalidateQueries(FIELDS);
-    }
-  }));
+  return reactUtils.useMutationWithInvalidation(fieldsApi.create, _objectSpread$9({
+    keysToInvalidate: [FIELDS]
+  }, options));
 };
 var useShowField = function useShowField(_ref2, options) {
   var fieldId = _ref2.fieldId,
@@ -6576,37 +6568,18 @@ var useFetchDependencies = function useFetchDependencies(_ref3, options) {
   }, options);
 };
 var useUpdateField = function useUpdateField(options) {
-  var queryClient = reactQuery.useQueryClient();
-  return reactQuery.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++) {
-        args[_key2] = arguments[_key2];
-      }
-      options === null || options === void 0 ? void 0 : (_options$onSuccess2 = options.onSuccess) === null || _options$onSuccess2 === void 0 ? void 0 : _options$onSuccess2.call.apply(_options$onSuccess2, [options].concat(args));
-      queryClient.invalidateQueries(FIELDS);
-    }
-  }));
+  return reactUtils.useMutationWithInvalidation(fieldsApi.update, _objectSpread$9({
+    keysToInvalidate: [FIELDS]
+  }, options));
 };
 var useDestroyField = function useDestroyField(options) {
-  var queryClient = reactQuery.useQueryClient();
-  return reactQuery.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++) {
-        args[_key3] = arguments[_key3];
-      }
-      options === null || options === void 0 ? void 0 : (_options$onSuccess3 = options.onSuccess) === null || _options$onSuccess3 === void 0 ? void 0 : _options$onSuccess3.call.apply(_options$onSuccess3, [options].concat(args));
-      queryClient.invalidateQueries(FIELDS);
-    }
-  }));
+  return reactUtils.useMutationWithInvalidation(fieldsApi.destroy, _objectSpread$9({
+    keysToInvalidate: [FIELDS]
+  }, options));
 };
 var useReorderFields = function useReorderFields() {
-  var queryClient = reactQuery.useQueryClient();
-  return reactQuery.useMutation(fieldsApi.reorder, {
-    onSuccess: function onSuccess() {
-      queryClient.invalidateQueries(FIELDS);
-    }
+  return reactUtils.useMutationWithInvalidation(fieldsApi.reorder, {
+    keysToInvalidate: [FIELDS]
   });
 };
 
@@ -7886,7 +7859,8 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     inactiveFieldsCount = _useFetchFields$data2.inactiveFieldsCount,
     reorderable = _useFetchFields$data2.reorderable,
     isFieldsLoading = _useFetchFields.isLoading,
-    isFieldsFetching = _useFetchFields.isFetching;
+    isFieldsFetching = _useFetchFields.isFetching,
+    isFieldsFetched = _useFetchFields.isFetched;
   var _useDestroyField = useDestroyField({
       onSuccess: function onSuccess() {
         setIsDeleteAlertOpen(false);
@@ -8000,7 +7974,7 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
   }, [menuItems, resource]);
   React.useEffect(function () {
     handleURLWithDefaultValues();
-  }, [isConfigsLoading, resources]);
+  }, [isConfigsLoading, resources, resource, state]);
   React.useEffect(function () {
     setPageProps({
       pageIndex: constants.DEFAULT_PAGE_INDEX,
@@ -8020,11 +7994,10 @@ var useFieldsDashboard = function useFieldsDashboard(_ref) {
     selectedMenu: resource,
     // resource will be ownerId if showOwnersInMenu is true, else it will be resourceType
     ownerId: ownerId,
-    isFieldsFetching: isFieldsFetching,
-    isFieldsLoading: isFieldsLoading,
     isDeleting: isDeleting,
+    isFieldsFetching: isFieldsFetching,
+    isFieldsFetched: isFieldsFetched,
     isScreenLoading: isScreenLoading,
-    isConfigsLoading: isConfigsLoading,
     isMenuBarNeeded: isMenuBarNeeded,
     showCountSubheader: showCountSubheader,
     handleDelete: handleDelete,
@@ -8080,7 +8053,8 @@ function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if
 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,
+    isFetched = _ref.isFetched,
+    isFetching = _ref.isFetching,
     rowData = _ref.rowData,
     columnData = _ref.columnData,
     setIsPaneOpen = _ref.setIsPaneOpen,
@@ -8090,10 +8064,13 @@ var FieldsTable = function FieldsTable(_ref) {
     setPageProps = _ref.setPageProps;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var showNoDataScreen = !isLoading && ramda.isEmpty(rowData);
+  var showNoDataScreen = isFetched && ramda.isEmpty(rowData);
   title = title.toLocaleLowerCase();
   var pageIndex = pageProps.pageIndex,
     pageSize = pageProps.pageSize;
+  if (!isFetched && ramda.isEmpty(rowData)) {
+    return /*#__PURE__*/React__default["default"].createElement(PageLoader__default["default"], null);
+  }
   return /*#__PURE__*/React__default["default"].createElement(TableWrapper__default["default"], null, showNoDataScreen ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "flex h-full w-full items-center justify-center"
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.NoData, _extends({}, helpDocUrl && {
@@ -8116,7 +8093,7 @@ var FieldsTable = function FieldsTable(_ref) {
     totalCount: totalCount,
     currentPageNumber: pageIndex,
     defaultPageSize: pageSize,
-    loading: isLoading,
+    loading: isFetching,
     handlePageChange: function handlePageChange(pageIndex) {
       return setPageProps(_objectSpread$3(_objectSpread$3({}, pageProps), {}, {
         pageIndex: pageIndex
@@ -8174,11 +8151,9 @@ var Header = function Header(_ref) {
     actionBlockProps = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React__default["default"].createElement(NeetoUIHeader__default["default"], {
     size: "small",
+    breadcrumbs: breadcrumbs,
     searchProps: searchProps,
     actionBlock: /*#__PURE__*/React__default["default"].createElement(ActionBlock, actionBlockProps),
-    breadcrumbs: [].concat(_toConsumableArray(breadcrumbs), [{
-      text: pure.truncate(title, 50)
-    }]),
     title: /*#__PURE__*/React__default["default"].createElement(TitleWithHelpLink, {
       helpUrl: helpDocUrl,
       title: title
@@ -8187,15 +8162,12 @@ var Header = function Header(_ref) {
 };
 
 var Menubar = function Menubar(_ref) {
-  var isConfigsLoading = _ref.isConfigsLoading,
-    menuBarItems = _ref.menuBarItems,
+  var menuBarItems = _ref.menuBarItems,
     title = _ref.title;
   return /*#__PURE__*/React__default["default"].createElement(MenuBar__default["default"], {
     showMenu: true,
     title: title
-  }, isConfigsLoading ? /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "flex items-center justify-center"
-  }, /*#__PURE__*/React__default["default"].createElement(neetoui.Spinner, null)) : menuBarItems);
+  }, menuBarItems);
 };
 
 function useCombinedRefs() {
@@ -12638,10 +12610,9 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     selectedMenu = _useFieldsDashboard.selectedMenu,
     ownerId = _useFieldsDashboard.ownerId,
     isFieldsFetching = _useFieldsDashboard.isFieldsFetching,
-    isFieldsLoading = _useFieldsDashboard.isFieldsLoading,
+    isFieldsFetched = _useFieldsDashboard.isFieldsFetched,
     isDeleting = _useFieldsDashboard.isDeleting,
     isScreenLoading = _useFieldsDashboard.isScreenLoading,
-    isConfigsLoading = _useFieldsDashboard.isConfigsLoading,
     isMenuBarNeeded = _useFieldsDashboard.isMenuBarNeeded,
     showCountSubheader = _useFieldsDashboard.showCountSubheader,
     handleDelete = _useFieldsDashboard.handleDelete,
@@ -12665,15 +12636,15 @@ var FieldsDashboard = function FieldsDashboard(_ref) {
     title: headerDisplayTitle
   };
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, isMenuBarNeeded && /*#__PURE__*/React__default["default"].createElement(Menubar, {
-    isConfigsLoading: isConfigsLoading,
     menuBarItems: menuBarItems,
     title: title
-  }), isScreenLoading && ramda.isEmpty(fields) ? /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "flex h-screen w-full flex-grow items-center justify-center"
-  }, /*#__PURE__*/React__default["default"].createElement(PageLoader__default["default"], null)) : /*#__PURE__*/React__default["default"].createElement(Container__default["default"], null, /*#__PURE__*/React__default["default"].createElement(Header, headerProps), showStateFilter && stateFilterTabs, showCountSubheader && /*#__PURE__*/React__default["default"].createElement(Subheader, {
+  }), /*#__PURE__*/React__default["default"].createElement(Container__default["default"], null, /*#__PURE__*/React__default["default"].createElement(Header, headerProps), showStateFilter && stateFilterTabs, showCountSubheader && /*#__PURE__*/React__default["default"].createElement(Subheader, {
     count: count
-  }), /*#__PURE__*/React__default["default"].createElement(FieldsTable, {
-    isLoading: isFieldsFetching || isFieldsLoading,
+  }), isScreenLoading ? /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "flex h-screen w-full flex-grow items-center justify-center"
+  }, /*#__PURE__*/React__default["default"].createElement(PageLoader__default["default"], null)) : /*#__PURE__*/React__default["default"].createElement(FieldsTable, {
+    isFetched: isFieldsFetched,
+    isFetching: isFieldsFetching,
     rowData: ramda.isEmpty(rowData) ? fields : rowData,
     totalCount: count,
     columnData: columnData,
@@ -12741,40 +12712,19 @@ var fieldValuesApi = {
 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 = reactQuery.useQueryClient();
-  return reactQuery.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];
-      }
-      options === null || options === void 0 ? void 0 : options.onSuccess.apply(options, args);
-      queryClient.invalidateQueries([QUERY_KEYS.FIELD_VALUES]);
-    }
-  }));
+  return reactUtils.useMutationWithInvalidation(fieldValuesApi.create, _objectSpread$2({
+    keysToInvalidate: [[QUERY_KEYS.FIELD_VALUES]]
+  }, options));
 };
 var useUpdateFieldValue = function useUpdateFieldValue(options) {
-  var queryClient = reactQuery.useQueryClient();
-  return reactQuery.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];
-      }
-      options === null || options === void 0 ? void 0 : options.onSuccess.apply(options, args);
-      queryClient.invalidateQueries([QUERY_KEYS.FIELD_VALUES]);
-    }
-  }));
+  return reactUtils.useMutationWithInvalidation(fieldValuesApi.update, _objectSpread$2({
+    keysToInvalidate: [[QUERY_KEYS.FIELD_VALUES]]
+  }, options));
 };
 var useDeleteFieldValue = function useDeleteFieldValue(options) {
-  var queryClient = reactQuery.useQueryClient();
-  return reactQuery.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];
-      }
-      options === null || options === void 0 ? void 0 : options.onSuccess.apply(options, args);
-      queryClient.invalidateQueries([QUERY_KEYS.FIELD_VALUES]);
-    }
-  }));
+  return reactUtils.useMutationWithInvalidation(fieldValuesApi.destroy, _objectSpread$2({
+    keysToInvalidate: [[QUERY_KEYS.FIELD_VALUES]]
+  }, options));
 };
 
 const useNavPrompt = ({