takeru0001 5 лет назад
Родитель
Сommit
f192ed39a7
1 измененных файлов с 12 добавлено и 20 удалено
  1. 12 20
      src/client/js/components/PageDuplicateModal.jsx

+ 12 - 20
src/client/js/components/PageDuplicateModal.jsx

@@ -59,18 +59,17 @@ const PageDuplicateModal = (props) => {
   function checkExistPath() {
   function checkExistPath() {
     let existFlag = false;
     let existFlag = false;
     return subordinatedPaths.map((duplicatedNewPath) => {
     return subordinatedPaths.map((duplicatedNewPath) => {
-        const existPath = existPaths.includes(duplicatedNewPath); // existPaths is dummy data
-        let result;
-        if (existPath) {
-          result = <li className="text-danger">{duplicatedNewPath} (exist)</li>;
-          existFlag = true;
-        }
-        else {
-          result = <li>{duplicatedNewPath}</li>;
-        }
-        return result;
-      })
-    );
+      const existPath = existPaths.includes(duplicatedNewPath); // existPaths is dummy data
+      let result;
+      if (existPath) {
+        result = <li className="duplicate-exist" key={duplicatedNewPath}>{duplicatedNewPath}: Same page already exists</li>;
+        existFlag = true;
+      }
+      else {
+        result = <li key={duplicatedNewPath}>{duplicatedNewPath}</li>;
+      }
+      return result;
+    });
   }
   }
 
 
   const getSubordinatedList = useCallback(async() => {
   const getSubordinatedList = useCallback(async() => {
@@ -171,14 +170,7 @@ const PageDuplicateModal = (props) => {
           </ul>
           </ul>
           <div>
           <div>
             <ul className="duplicate-name">
             <ul className="duplicate-name">
-              {isDuplicateRecursively && subordinatedPaths.map((duplicatedNewPath) => {
-                  // ToDo: The "true" statement below will be modified by task GW3503
-                  if (true) {
-                    return <li className="duplicate-exist" key={duplicatedNewPath}>{duplicatedNewPath}: Same page already exists</li>;
-                  }
-                  return <li key={duplicatedNewPath}>{duplicatedNewPath}</li>;
-                })
-              }
+              {isDuplicateRecursively && checkExistPath()}
             </ul>
             </ul>
           </div>
           </div>
           <div> {getSubordinatedError} </div>
           <div> {getSubordinatedError} </div>