Parcourir la source

improve onDeletedHandler

kaori il y a 4 ans
Parent
commit
55e31d0f8d

+ 23 - 2
packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -194,8 +194,30 @@ const GrowiContextualSubNavigation = (props) => {
     if (typeof pathOrPathsToDelete !== 'string') {
     if (typeof pathOrPathsToDelete !== 'string') {
       return;
       return;
     }
     }
+
     mutateChildren();
     mutateChildren();
-    window.location.reload();
+
+    const path = pathOrPathsToDelete;
+
+    if (isRecursively) {
+      if (isCompletely) {
+        // redirect to not found page
+        window.location.href = path;
+      }
+      else {
+        window.location.reload();
+      }
+    }
+    else {
+      // eslint-disable-next-line no-lonely-if
+      if (isCompletely) {
+        // redirect to not found page
+        window.location.href = path;
+      }
+      else {
+        window.location.reload();
+      }
+    }
   }, [mutateChildren]);
   }, [mutateChildren]);
 
 
   const deleteItemClickedHandler = useCallback(async(pageToDelete, isAbleToDeleteCompletely) => {
   const deleteItemClickedHandler = useCallback(async(pageToDelete, isAbleToDeleteCompletely) => {
@@ -294,7 +316,6 @@ const GrowiContextualSubNavigation = (props) => {
       tags={tagsInfoData?.tags || []}
       tags={tagsInfoData?.tags || []}
       tagsUpdatedHandler={tagsUpdatedHandler}
       tagsUpdatedHandler={tagsUpdatedHandler}
       controls={ControlComponents}
       controls={ControlComponents}
-      additionalClasses={['container-fluid']}
     />
     />
   );
   );
 };
 };