@bigbinary/neeto-folders-frontend 2.0.12 → 2.0.13

package/dist/cjs/hooks.js

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

package/dist/components.js

@@ -7,10 +7,10 @@ import { buildUrl, showThumbsUpToastr } from '@bigbinary/neeto-commons-frontend/
 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--QXsOnUm.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-DzLwUir3.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-DWQZ8Va7.js';
-import { a as isActiveFolder, i as isArray, g as getActiveFolderId, m as mapObj } from './internal-PLqSv_EP.js';
+import { a as isActiveFolder, g as getActiveFolderId, i as isArray, m as mapObj } from './internal-PLqSv_EP.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import Pane from '@bigbinary/neetoui/Pane';
 import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
@@ -21,7 +21,6 @@ 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';
-import { isEmpty, assoc } from 'ramda';
 import { t as t$1 } from 'i18next';
 import { object, string } from 'yup';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
@@ -31,6 +30,7 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import useHotkeys from '@bigbinary/neeto-hotkeys';
 import Button from '@bigbinary/neetoui/Button';
 import { hyphenate, noop, isNotPresent } from '@bigbinary/neeto-cist';
+import { isEmpty, assoc } from 'ramda';
 import classNames from 'classnames';
 import Radio from '@bigbinary/neetoui/Radio';
 import { useDraggable, useDroppable, DndContext, DragOverlay, useSensors, useSensor, PointerSensor } from '@dnd-kit/core';
@@ -191,8 +191,18 @@ var createPayload = function createPayload(values, extraAttrs) {
   });
   return payload;
 };
+var filterExtraAttributes = function filterExtraAttributes(attributes, isEditing) {
+  if (!attributes || !Array.isArray(attributes)) return [];
+  return attributes.filter(function (attribute) {
+    if (isEditing) {
+      return attribute.isEditAttribute !== false;
+    }
+    return attribute.isCreateAttribute !== false;
+  });
+};
 
 var AddEditPane = function AddEditPane(_ref) {
+  var _config$addEditValida;
   var setFocusField = _ref.setFocusField,
     config = _ref.config,
     onClose = _ref.onClose;
@@ -214,7 +224,11 @@ var AddEditPane = function AddEditPane(_ref) {
   var _useUpdateFolder = useUpdateFolder(config),
     updateFolder = _useUpdateFolder.mutateAsync;
   var isEditing = type === "edit" && item;
+  var activeFolderSid = getActiveFolderId(config);
   var extraAttributes = config.extraAttributes;
+  var filteredExtraAttributes = useMemo(function () {
+    return filterExtraAttributes(extraAttributes, isEditing);
+  }, [extraAttributes, isEditing]);
   var handleError = function handleError(setStatus, error) {
     var response = error.response;
     if (response && response.data && response.data.errors) {
@@ -228,9 +242,14 @@ var AddEditPane = function AddEditPane(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setStatus = _ref2.setStatus;
-            payload = createPayload(values, extraAttributes);
+            payload = createPayload(values, filteredExtraAttributes);
             reactQueryOptions = {
-              onSuccess: function onSuccess() {
+              onSuccess: function onSuccess(_ref4) {
+                var sid = _ref4.sid;
+                if (isEditing && sid !== item.sid) {
+                  var newPath = window.location.pathname.replace(activeFolderSid, sid);
+                  window.location.href = newPath;
+                }
                 showThumbsUpToastr();
                 onClose();
               },
@@ -249,7 +268,8 @@ var AddEditPane = function AddEditPane(_ref) {
             return updateFolder({
               id: item.id,
               payload: payload,
-              config: config
+              config: config,
+              initialSlug: item.sid
             }, reactQueryOptions);
           case 7:
             _context.next = 11;
@@ -271,8 +291,8 @@ var AddEditPane = function AddEditPane(_ref) {
     };
   }();
   var initialValues = useMemo(function () {
-    return isEditing ? item : createInitialValues({}, extraAttributes);
-  }, [isEditing, item, extraAttributes]);
+    return isEditing ? item : createInitialValues({}, filteredExtraAttributes);
+  }, [isEditing, item, filteredExtraAttributes]);
   if (isFetching) {
     return /*#__PURE__*/jsx(Pane.Body, {
       className: "flex items-center justify-center",
@@ -290,11 +310,11 @@ var AddEditPane = function AddEditPane(_ref) {
       formikProps: {
         initialValues: initialValues,
         enableReinitialize: true,
-        validationSchema: FORM_VALIDATION_SCHEMA,
+        validationSchema: ((_config$addEditValida = config.addEditValidationSchema) === null || _config$addEditValida === void 0 ? void 0 : _config$addEditValida.call(config, isEditing)) || FORM_VALIDATION_SCHEMA,
         onSubmit: onSubmitForm
       },
-      children: function children(_ref4) {
-        var dirty = _ref4.dirty;
+      children: function children(_ref5) {
+        var dirty = _ref5.dirty;
         return /*#__PURE__*/jsxs(Fragment, {
           children: [/*#__PURE__*/jsx(Pane.Body, {
             className: "pb-6",
@@ -306,7 +326,7 @@ var AddEditPane = function AddEditPane(_ref) {
                 name: "name",
                 ref: setFocusField
               }), /*#__PURE__*/jsx(ExtraAttributes, {
-                attributes: extraAttributes
+                attributes: filteredExtraAttributes
               }), /*#__PURE__*/jsxs("div", {
                 children: [/*#__PURE__*/jsx(TreeSelect, {
                   config: config,