فهرست منبع

finish error handling

zahmis 5 سال پیش
والد
کامیت
a7fdedeee2

+ 1 - 0
resource/locales/en_US/translation.json

@@ -299,6 +299,7 @@
     "label": {
       "Duplicate page": "Duplicate page",
       "New page name": "New page name",
+      "Fail to get subordinated pages": "Fail to get subordinated pages",
       "Current page name": "Current page name",
       "Duplicate with child": "Duplicate with child"
     }

+ 1 - 0
resource/locales/ja_JP/translation.json

@@ -300,6 +300,7 @@
     "label": {
       "Duplicate page": "ページを複製する",
       "New page name": "複製後のページ名",
+      "Fail to get subordinated pages": "配下ページの取得に失敗しました",
       "Current page name": "現在のページ名",
       "Duplicate with child": "配下のページも一緒に複製する"
     }

+ 3 - 1
src/client/js/components/Page/PageManagement.jsx

@@ -23,6 +23,7 @@ const PageManagement = (props) => {
   const [isPageTemplateModalShown, setIsPageTempleteModalShown] = useState(false);
   const [isPageDeleteModalShown, setIsPageDeleteModalShown] = useState(false);
   const [duplicateModalPaths, setDuplicateModalPaths] = useState(false);
+  const [duplicateError, setDuplicateError] = useState(null);
 
   function openPageRenameModalHandler() {
     setIsPageRenameModalShown(true);
@@ -39,7 +40,7 @@ const PageManagement = (props) => {
       setDuplicateModalPaths(res.data.duplicatePaths);
     }
     catch (err) {
-      console.log('エラーやで');
+      setDuplicateError(t('modal_duplicate.label.Fail to get subordinated pages'));
     }
   }
 
@@ -102,6 +103,7 @@ const PageManagement = (props) => {
           isOpen={isPageDuplicateModalShown}
           onClose={closePageDuplicateModalHandler}
           pageDuplicateModalPaths={duplicateModalPaths}
+          duplicateError={duplicateError}
         />
         <CreateTemplateModal
           isOpen={isPageTemplateModalShown}

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

@@ -105,14 +105,11 @@ const PageDuplicateModal = (props) => {
           <label className="custom-control-label" htmlFor="cbDuplicateRecursively">
             {t('modal_duplicate.label.Duplicate with child')}
           </label>
+          <div> {props.duplicateError} </div>
         </div>
       </ModalBody>
       <ModalFooter>
-        <ApiErrorMessage
-          errorCode={errorCode}
-          errorMessage={errorMessage}
-          targetPath={pageNameInput}
-        />
+        <ApiErrorMessage errorCode={errorCode} errorMessage={errorMessage} targetPath={pageNameInput} />
         <button type="button" className="btn btn-primary" onClick={duplicate}>
           Duplicate page
         </button>
@@ -136,6 +133,7 @@ PageDuplicateModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
   pageDuplicateModalPaths: PropTypes.array,
+  duplicateError: PropTypes.string,
 };
 
 export default withTranslation()(PageDuplicateModallWrapper);