@bigbinary/neeto-folders-frontend 2.0.8 → 2.0.10

package/dist/cjs/hooks.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var useFolderActions = require('../useFolderActions-ibifd0ZD.js');
+var useFolderActions = require('../useFolderActions-Ok2WR6Ht.js');
 require('@babel/runtime/helpers/defineProperty');
 require('i18next');
 require('@bigbinary/neeto-cist');

package/dist/components.js

@@ -3,11 +3,11 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import { shallow } from 'zustand/shallow';
 import { useQueryClient } from '@tanstack/react-query';
 import { useQueryParams, useStateWithDependency } from '@bigbinary/neeto-commons-frontend/react-utils';
-import { buildUrl } from '@bigbinary/neeto-commons-frontend/utils';
+import { buildUrl, showThumbsUpToastr } from '@bigbinary/neeto-commons-frontend/utils';
 import Alert from '@bigbinary/neetoui/Alert';
 import { useTranslation as useTranslation$1, Trans } from 'react-i18next';
 import { useHistory, Link, NavLink } from 'react-router-dom';
-import { c as useFolderStore, d as useDestroyFolder, a as useFolders, e as useFetchFolders, f as useCreateFolder, g as useUpdateFolder, h as useReorderFolders, D as DEFAULT_CONFIG, u as useFolder, b as useFolderActions } from './useFolderActions-Cckopfet.js';
+import { c as useFolderStore, d as useDestroyFolder, a as useFolders, e as useFetchFolders, f as useCreateFolder, g as useUpdateFolder, h as useReorderFolders, D as DEFAULT_CONFIG, u as useFolder, b as useFolderActions } from './useFolderActions-DQUMayG_.js';
 import { QUERY_KEYS } from './constants.js';
 import { p as pathToFolder, t as treeToMap, m as measureDepth, a as mapToTree, b as mapToSortedTree } from './index-CO0LgS5v.js';
 import { a as isActiveFolder, m as mapObj, g as getActiveFolderId, i as isArray } from './internal-B2c8gwOa.js';
@@ -17,6 +17,7 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import React, { createElement, forwardRef, useMemo, useState, useId, useEffect, startTransition } from 'react';
 import Typography from '@bigbinary/neetoui/Typography';
+import Spinner from '@bigbinary/neetoui/Spinner';
 import Input from '@bigbinary/neetoui/formik/Input';
 import ActionBlock from '@bigbinary/neetoui/formik/ActionBlock';
 import Form from '@bigbinary/neetoui/formik/Form';
@@ -347,7 +348,8 @@ var AddEditPane = function AddEditPane(_ref) {
     type = _useFolderStore.type,
     item = _useFolderStore.item;
   var _useFetchFolders = useFetchFolders(config),
-    folders = _useFetchFolders.data;
+    folders = _useFetchFolders.data,
+    isFetching = _useFetchFolders.isFetching;
   var _useCreateFolder = useCreateFolder(config),
     createFolder = _useCreateFolder.mutate;
   var _useUpdateFolder = useUpdateFolder(config),
@@ -361,38 +363,59 @@ var AddEditPane = function AddEditPane(_ref) {
   var isValidParent = (activeFolder === null || activeFolder === void 0 ? void 0 : activeFolder.meta.depth) < config.maxDepth;
   var parentId = isValidParent ? activeFolder.id : null;
   var extraAttributes = config.extraAttributes;
+  var handleError = function handleError(setStatus, error) {
+    var response = error.response;
+    if (response && response.data && response.data.errors) {
+      setStatus(response.data.errors);
+    }
+  };
   var onSubmitForm = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
-      var payload;
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, _ref2) {
+      var setStatus, payload, reactQueryOptions, config;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            setStatus = _ref2.setStatus;
             payload = createPayload(values, extraAttributes);
+            reactQueryOptions = {
+              onSuccess: function onSuccess() {
+                showThumbsUpToastr();
+                onClose();
+              },
+              onError: function onError(error) {
+                return handleError(setStatus, error);
+              }
+            };
+            config = {
+              showToastr: false
+            };
             if (!isEditing) {
-              _context.next = 6;
+              _context.next = 9;
               break;
             }
-            _context.next = 4;
+            _context.next = 7;
             return updateFolder({
               id: item.id,
-              payload: payload
-            });
-          case 4:
-            _context.next = 8;
+              payload: payload,
+              config: config
+            }, reactQueryOptions);
+          case 7:
+            _context.next = 11;
             break;
-          case 6:
-            _context.next = 8;
-            return createFolder(payload);
-          case 8:
-            onClose();
           case 9:
+            _context.next = 11;
+            return createFolder({
+              payload: payload,
+              config: config
+            }, reactQueryOptions);
+          case 11:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onSubmitForm(_x) {
-      return _ref2.apply(this, arguments);
+    return function onSubmitForm(_x, _x2) {
+      return _ref3.apply(this, arguments);
     };
   }();
   var folderOptions = useMemo(function () {
@@ -403,6 +426,12 @@ var AddEditPane = function AddEditPane(_ref) {
       parentId: parentId
     }, extraAttributes);
   }, [isEditing, item, parentId, extraAttributes]);
+  if (isFetching) {
+    return /*#__PURE__*/jsx(Pane.Body, {
+      className: "flex items-center justify-center",
+      children: /*#__PURE__*/jsx(Spinner, {})
+    });
+  }
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Pane.Header, {
       children: /*#__PURE__*/jsx(Typography, {
@@ -417,8 +446,8 @@ var AddEditPane = function AddEditPane(_ref) {
         validationSchema: FORM_VALIDATION_SCHEMA,
         onSubmit: onSubmitForm
       },
-      children: function children(_ref3) {
-        var dirty = _ref3.dirty;
+      children: function children(_ref4) {
+        var dirty = _ref4.dirty;
         return /*#__PURE__*/jsxs(Fragment, {
           children: [/*#__PURE__*/jsx(Pane.Body, {
             className: "pb-6",
@@ -601,7 +630,8 @@ var PaneBody = function PaneBody(_ref) {
     setFolderState = _useFolderStore.setFolderState;
   var _useFetchFolders = useFetchFolders(config),
     _useFetchFolders$data = _useFetchFolders.data,
-    folders = _useFetchFolders$data === void 0 ? [] : _useFetchFolders$data;
+    folders = _useFetchFolders$data === void 0 ? [] : _useFetchFolders$data,
+    isFetching = _useFetchFolders.isFetching;
   var _useTranslation = useTranslation(config),
     t = _useTranslation.t;
   var _useFolderStore2 = useFolderStore(function (store) {
@@ -640,6 +670,12 @@ var PaneBody = function PaneBody(_ref) {
     mode: "global",
     enabled: !!type
   });
+  if (isFetching) {
+    return /*#__PURE__*/jsx(Pane.Body, {
+      className: "flex items-center justify-center",
+      children: /*#__PURE__*/jsx(Spinner, {})
+    });
+  }
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsxs(Pane.Header, {
       className: "flex items-center justify-between",
@@ -811,7 +847,8 @@ var RearrangeFoldersPane = function RearrangeFoldersPane(_ref) {
   var _useTranslation = useTranslation(config),
     t = _useTranslation.t;
   var _useFetchFolders = useFetchFolders(config),
-    folders = _useFetchFolders.data;
+    folders = _useFetchFolders.data,
+    isFetching = _useFetchFolders.isFetching;
   var _useReorderFolders = useReorderFolders(config),
     reorderFolders = _useReorderFolders.mutate;
   var _useFolderStore = useFolderStore(function (store) {
@@ -880,6 +917,12 @@ var RearrangeFoldersPane = function RearrangeFoldersPane(_ref) {
       className: "neeto-ui-text-gray-500 relative -left-[0.3125rem] flex-shrink-0"
     })
   };
+  if (isFetching) {
+    return /*#__PURE__*/jsx(Pane.Body, {
+      className: "flex items-center justify-center",
+      children: /*#__PURE__*/jsx(Spinner, {})
+    });
+  }
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Pane.Header, {
       children: /*#__PURE__*/jsx(Typography, {
@@ -1126,7 +1169,8 @@ var ReorderFoldersPane = function ReorderFoldersPane(_ref) {
   var _useTranslation = useTranslation(config),
     t = _useTranslation.t;
   var _useFetchFolders = useFetchFolders(config),
-    folders = _useFetchFolders.data;
+    folders = _useFetchFolders.data,
+    isFetching = _useFetchFolders.isFetching;
   var _useReorderFolders = useReorderFolders(config),
     reorderFolders = _useReorderFolders.mutate;
   var sensors = useSensors(useSensor(PointerSensor, sensorConfig));
@@ -1208,6 +1252,12 @@ var ReorderFoldersPane = function ReorderFoldersPane(_ref) {
       className: "neeto-ui-text-gray-500 relative -left-[0.3125rem] flex-shrink-0"
     })
   };
+  if (isFetching) {
+    return /*#__PURE__*/jsx(Pane.Body, {
+      className: "flex items-center justify-center",
+      children: /*#__PURE__*/jsx(Spinner, {})
+    });
+  }
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Pane.Header, {
       children: /*#__PURE__*/jsx(Typography, {
@@ -1508,12 +1558,32 @@ var FoldersTree = function FoldersTree(_ref) {
     var _activeFolder$meta;
     if (!folders) return;
     // When active folder changes from external sources, update expanded keys to auto expand tree.
-    var expandedKeys = [];
+    var updatedExpandedKeys = _toConsumableArray(expandedKeys);
     var map = treeToMap(folders, "sid");
     var activeFolder = map[activeFolderSid];
     var parentSid = activeFolder === null || activeFolder === void 0 || (_activeFolder$meta = activeFolder.meta) === null || _activeFolder$meta === void 0 || (_activeFolder$meta = _activeFolder$meta.parent) === null || _activeFolder$meta === void 0 ? void 0 : _activeFolder$meta.sid;
-    if (parentSid) expandedKeys.push(parentSid);
-    setExpandedKeys(expandedKeys);
+    if (parentSid && !updatedExpandedKeys.includes(parentSid)) {
+      updatedExpandedKeys.push(parentSid);
+    }
+    setExpandedKeys(updatedExpandedKeys);
+  };
+  var handleExpand = function handleExpand(keys, _ref2) {
+    var expanded = _ref2.expanded,
+      node = _ref2.node;
+    if (expanded) {
+      setExpandedKeys(keys);
+      return;
+    }
+    var keysSet = new Set(keys);
+    var _removeChildKeys = function removeChildKeys() {
+      var children = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      children.forEach(function (child) {
+        keysSet["delete"](child.sid);
+        _removeChildKeys(child.children);
+      });
+    };
+    _removeChildKeys(node.children);
+    setExpandedKeys(_toConsumableArray(keysSet));
   };
   useEffect(function () {
     // Non urgent update.
@@ -1551,7 +1621,7 @@ var FoldersTree = function FoldersTree(_ref) {
         }))
       });
     },
-    onExpand: setExpandedKeys
+    onExpand: handleExpand
   });
 };