فهرست منبع

omit unnecessary code and submit args into constant

keigo-h 3 سال پیش
والد
کامیت
a8c2afd262
2فایلهای تغییر یافته به همراه14 افزوده شده و 3 حذف شده
  1. 4 2
      packages/app/src/components/DescendantsPageList.tsx
  2. 10 1
      packages/app/src/components/SearchPage2/SearchPageBase.tsx

+ 4 - 2
packages/app/src/components/DescendantsPageList.tsx

@@ -62,11 +62,13 @@ export const DescendantsPageListSubstance = (props: SubstanceProps): JSX.Element
   }
   }
 
 
   const pageDeletedHandler: OnDeletedFunction = useCallback((...args) => {
   const pageDeletedHandler: OnDeletedFunction = useCallback((...args) => {
-    if (args[0] == null || args[2] == null) {
+    const path = args[0];
+    const isCompletely = args[2];
+    if (path == null || isCompletely == null) {
       toastSuccess(t('deleted_page'));
       toastSuccess(t('deleted_page'));
     }
     }
     else {
     else {
-      toastSuccess(args[2] ? t('deleted_pages_completely', { path: args[0] }) : t('deleted_pages', { path: args[0] }));
+      toastSuccess(t('deleted_pages_completely', { path }));
     }
     }
 
 
     advancePt();
     advancePt();

+ 10 - 1
packages/app/src/components/SearchPage2/SearchPageBase.tsx

@@ -255,7 +255,16 @@ export const usePageDeleteModalForBulkDeletion = (
 
 
     openDeleteModal(selectedPages, {
     openDeleteModal(selectedPages, {
       onDeleted: (...args) => {
       onDeleted: (...args) => {
-        toastSuccess(args[2] ? t('deleted_pages_completely', { path: args[0] }) : t('deleted_pages', { path: args[0] }));
+        // ここにargs[2]が存在しなかった際の条件分岐を記述
+        // descendantPagelistと同様の処理を記述
+        const path = args[0];
+        const isCompletely = args[2];
+        if (path == null || isCompletely == null) {
+          toastSuccess(t('deleted_page'));
+        }
+        else {
+          toastSuccess(t('deleted_pages_completely', { path }));
+        }
         advancePt();
         advancePt();
 
 
         if (onDeleted != null) {
         if (onDeleted != null) {