itizawa 5 лет назад
Родитель
Сommit
eab9616d3b

+ 5 - 4
src/client/js/components/EmptyTrashModal.jsx

@@ -16,17 +16,18 @@ const EmptyTrashModal = (props) => {
     t, isOpen, onClose, appContainer,
   } = props;
 
-  const [errors, setErrors] = useState([]);
+  // errors:array
+  const [errors, setErrors] = useState(null);
 
   async function emptyTrash() {
-    setErrors([]);
+    setErrors(null);
 
     try {
       await appContainer.apiv3Delete('/pages/empty-trash');
       window.location.reload();
     }
-    catch (err) {
-      setErrors(err);
+    catch (errors) {
+      setErrors(errors);
 
     }
   }

+ 5 - 4
src/client/js/components/PageDeleteModal.jsx

@@ -33,7 +33,8 @@ const PageDeleteModal = (props) => {
   const [isDeleteCompletely, setIsDeleteCompletely] = useState(isDeleteCompletelyModal && isAbleToDeleteCompletely);
   const deleteMode = isDeleteCompletely ? 'completely' : 'temporary';
 
-  const [errors, setErrors] = useState([]);
+  // errors:array
+  const [errors, setErrors] = useState(null);
 
   function changeIsDeleteRecursivelyHandler() {
     setIsDeleteRecursively(!isDeleteRecursively);
@@ -47,15 +48,15 @@ const PageDeleteModal = (props) => {
   }
 
   async function deletePage() {
-    setErrors([]);
+    setErrors(null);
 
     try {
       const response = await pageContainer.deletePage(isDeleteRecursively, isDeleteCompletely);
       const trashPagePath = response.page.path;
       window.location.href = encodeURI(trashPagePath);
     }
-    catch (err) {
-      setErrors(err);
+    catch (errors) {
+      setErrors(errors);
     }
   }
 

+ 5 - 4
src/client/js/components/PageDuplicateModal.jsx

@@ -24,7 +24,8 @@ const PageDuplicateModal = (props) => {
 
   const [pageNameInput, setPageNameInput] = useState(path);
 
-  const [errors, setErrors] = useState([]);
+  // errors:array
+  const [errors, setErrors] = useState(null);
 
   const [subordinatedPaths, setSubordinatedPaths] = useState([]);
   const [getSubordinatedError, setGetSuborinatedError] = useState(null);
@@ -68,15 +69,15 @@ const PageDuplicateModal = (props) => {
   }, [props.isOpen, getSubordinatedList]);
 
   async function duplicate() {
-    setErrors([]);
+    setErrors(null);
 
     try {
       const res = await appContainer.apiPost('/pages.duplicate', { page_id: pageId, new_path: pageNameInput });
       const { page } = res;
       window.location.href = encodeURI(`${page.path}?duplicated=${path}`);
     }
-    catch (err) {
-      setErrors(err);
+    catch (errors) {
+      setErrors(errors);
     }
   }
 

+ 5 - 4
src/client/js/components/PageRenameModal.jsx

@@ -24,7 +24,8 @@ const PageRenameModal = (props) => {
 
   const [pageNameInput, setPageNameInput] = useState(path);
 
-  const [errors, setErrors] = useState([]);
+  // errors:array
+  const [errors, setErrors] = useState(null);
 
   const [isRenameRecursively, SetIsRenameRecursively] = useState(true);
   const [isRenameRedirect, SetIsRenameRedirect] = useState(false);
@@ -52,7 +53,7 @@ const PageRenameModal = (props) => {
 
   async function rename() {
     try {
-      setErrors([]);
+      setErrors(null);
 
       const response = await pageContainer.rename(
         pageNameInput,
@@ -70,8 +71,8 @@ const PageRenameModal = (props) => {
 
       window.location.href = `${url.pathname}${url.search}`;
     }
-    catch (errs) {
-      setErrors(errs);
+    catch (errors) {
+      setErrors(errors);
     }
   }
 

+ 5 - 4
src/client/js/components/PutbackPageModal.jsx

@@ -18,7 +18,8 @@ const PutBackPageModal = (props) => {
     t, isOpen, onClose, pageContainer, path,
   } = props;
 
-  const [errors, setErrors] = useState([]);
+  // errors:array
+  const [errors, setErrors] = useState(null);
 
   const [isPutbackRecursively, setIsPutbackRecursively] = useState(true);
 
@@ -27,15 +28,15 @@ const PutBackPageModal = (props) => {
   }
 
   async function putbackPage() {
-    setErrors([]);
+    setErrors(null);
 
     try {
       const response = await pageContainer.revertRemove(isPutbackRecursively);
       const putbackPagePath = response.page.path;
       window.location.href = encodeURI(putbackPagePath);
     }
-    catch (err) {
-      setErrors(err);
+    catch (errors) {
+      setErrors(errors);
     }
   }