create null action

src/client/js/components/ArchiveCreateModal.jsx

@@ -26,10 +26,19 @@ const ArchiveCreateModal = (props) => {
     setIsSubordinatedPageDownload(!isSubordinatedPageDownload);
   }
 
+  function closeModalHandler() {
+    if (props.onClose == null) {
+      return;
+    }
+
+    props.onClose();
+
+  }
+
 
   return (
-    <Modal size="lg" isOpen={props.isOpen} toggle={props.onClose}>
-      <ModalHeader tag="h4" toggle={props.onClose} className="bg-primary text-white">
+    <Modal size="lg" isOpen={props.isOpen} toggle={closeModalHandler}>
+      <ModalHeader tag="h4" toggle={closeModalHandler} className="bg-primary text-white">
         {t('Create Archive Page')}
       </ModalHeader>
       <ModalBody>
@@ -79,7 +88,7 @@ const ArchiveCreateModal = (props) => {
             onChange={changeIsSubordinatedPageDownloadHandler}
           />
           <label className="custom-control-label" htmlFor="subordinatedFile">
-            {'Include Subordinated Page'}
+            {t('Include Subordinated Page')}
           </label>
         </div>
       </ModalBody>

src/client/js/components/Page/PageShareManagement.jsx

@@ -30,33 +30,26 @@ const PageShareManagement = (props) => {
   }
 
   function closeArchiveCreateModalHandler() {
-
     setIsArchiveCreateModalShown(false);
-
-    if (setIsArchiveCreateModalShown == null) {
-      return null;
-    }
-
   }
 
 
   function renderModals() {
     return (
-      <OutsideShareLinkModal
-        isOpen={isOutsideShareLinkModalShown}
-        onClose={closeOutsideShareLinkModalHandler}
-      />
+      <>
+        <OutsideShareLinkModal
+          isOpen={isOutsideShareLinkModalShown}
+          onClose={closeOutsideShareLinkModalHandler}
+        />
+
+        <ArchiveCreateModal
+          isOpen={isArchiveCreateModalShown}
+          onClose={closeArchiveCreateModalHandler}
+        />
+      </>
     );
   }
 
-  function renderArchiveModals() {
-    return (
-      <ArchiveCreateModal
-        isOpen={isArchiveCreateModalShown}
-        onClose={closeArchiveCreateModalHandler}
-      />
-    );
-  }
 
   function renderCurrentUser() {
     return (
@@ -104,7 +97,6 @@ const PageShareManagement = (props) => {
 
       </div>
       {renderModals()}
-      {renderArchiveModals()}
     </>
   );