refactor import components

src/client/js/components/Admin/ImportData/ErrorViewer.jsx → src/client/js/components/Admin/ImportData/GrowiArchive/ErrorViewer.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import Modal from 'react-bootstrap/es/Modal';
 
-import { createSubscribedElement } from '../../UnstatedUtils';
+import { createSubscribedElement } from '../../../UnstatedUtils';
 
 
 class ErrorViewer extends React.Component {

src/client/js/components/Admin/ImportData/GrowiZipImportConfigurationModal.jsx → src/client/js/components/Admin/ImportData/GrowiArchive/ImportCollectionConfigurationModal.jsx

@@ -7,12 +7,12 @@ import Modal from 'react-bootstrap/es/Modal';
 
 import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
 
-import { createSubscribedElement } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
+import { createSubscribedElement } from '../../../UnstatedUtils';
+import AppContainer from '../../../../services/AppContainer';
 // import { toastSuccess, toastError } from '../../../util/apiNotification';
 
 
-class GrowiZipImportConfigurationModal extends React.Component {
+class ImportCollectionConfigurationModal extends React.Component {
 
   constructor(props) {
     super(props);
@@ -207,7 +207,7 @@ class GrowiZipImportConfigurationModal extends React.Component {
 
 }
 
-GrowiZipImportConfigurationModal.propTypes = {
+ImportCollectionConfigurationModal.propTypes = {
   t: PropTypes.func.isRequired, // i18next
 
   isOpen: PropTypes.bool.isRequired,
@@ -221,8 +221,8 @@ GrowiZipImportConfigurationModal.propTypes = {
 /**
  * Wrapper component for using unstated
  */
-const GrowiZipImportConfigurationModalWrapper = (props) => {
-  return createSubscribedElement(GrowiZipImportConfigurationModal, props, [AppContainer]);
+const ImportCollectionConfigurationModalWrapper = (props) => {
+  return createSubscribedElement(ImportCollectionConfigurationModal, props, [AppContainer]);
 };
 
-export default withTranslation()(GrowiZipImportConfigurationModalWrapper);
+export default withTranslation()(ImportCollectionConfigurationModalWrapper);

src/client/js/components/Admin/ImportData/GrowiZipImportItem.jsx → src/client/js/components/Admin/ImportData/GrowiArchive/ImportCollectionItem.jsx

@@ -22,7 +22,7 @@ export const MODE_RESTRICTED_COLLECTION = {
   users: ['insert', 'upsert'],
 };
 
-export default class GrowiZipImportItem extends React.Component {
+export default class ImportCollectionItem extends React.Component {
 
   constructor(props) {
     super(props);
@@ -227,7 +227,7 @@ export default class GrowiZipImportItem extends React.Component {
 
 }
 
-GrowiZipImportItem.propTypes = {
+ImportCollectionItem.propTypes = {
   collectionName: PropTypes.string.isRequired,
   isSelected: PropTypes.bool.isRequired,
   option: PropTypes.instanceOf(GrowiArchiveImportOption).isRequired,
@@ -246,7 +246,7 @@ GrowiZipImportItem.propTypes = {
   onErrorLinkClicked: PropTypes.func,
 };
 
-GrowiZipImportItem.defaultProps = {
+ImportCollectionItem.defaultProps = {
   insertedCount: 0,
   modifiedCount: 0,
   errorsCount: 0,

src/client/js/components/Admin/ImportData/GrowiZipImportForm.jsx → src/client/js/components/Admin/ImportData/GrowiArchive/ImportForm.jsx

@@ -6,14 +6,14 @@ import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import
 import ImportOptionForPages from '@commons/models/admin/import-option-for-pages';
 import ImportOptionForRevisions from '@commons/models/admin/import-option-for-revisions';
 
-import { createSubscribedElement } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
-import WebsocketContainer from '../../../services/WebsocketContainer';
-import { toastSuccess, toastError } from '../../../util/apiNotification';
+import { createSubscribedElement } from '../../../UnstatedUtils';
+import AppContainer from '../../../../services/AppContainer';
+import WebsocketContainer from '../../../../services/WebsocketContainer';
+import { toastSuccess, toastError } from '../../../../util/apiNotification';
 
 
-import GrowiZipImportItem, { DEFAULT_MODE, MODE_RESTRICTED_COLLECTION } from './GrowiZipImportItem';
-import GrowiZipImportConfigurationModal from './GrowiZipImportConfigurationModal';
+import ImportCollectionItem, { DEFAULT_MODE, MODE_RESTRICTED_COLLECTION } from './ImportCollectionItem';
+import ImportCollectionConfigurationModal from './ImportCollectionConfigurationModal';
 import ErrorViewer from './ErrorViewer';
 
 
@@ -33,7 +33,7 @@ const IMPORT_OPTION_CLASS_MAPPING = {
   revisions: ImportOptionForRevisions,
 };
 
-class GrowiImportForm extends React.Component {
+class ImportForm extends React.Component {
 
   constructor(props) {
     super(props);
@@ -386,7 +386,7 @@ class GrowiImportForm extends React.Component {
 
           return (
             <div className="col-xs-6 my-1" key={collectionName}>
-              <GrowiZipImportItem
+              <ImportCollectionItem
                 isImporting={isImporting}
                 isImported={collectionProgress ? isImported : false}
                 insertedCount={collectionProgress ? collectionProgress.insertedCount : 0}
@@ -419,7 +419,7 @@ class GrowiImportForm extends React.Component {
     }
 
     return (
-      <GrowiZipImportConfigurationModal
+      <ImportCollectionConfigurationModal
         isOpen={isConfigurationModalOpen}
         onClose={() => this.setState({ isConfigurationModalOpen: false })}
         onOptionChange={this.updateOption}
@@ -486,7 +486,7 @@ class GrowiImportForm extends React.Component {
 
 }
 
-GrowiImportForm.propTypes = {
+ImportForm.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   websocketContainer: PropTypes.instanceOf(WebsocketContainer).isRequired,
@@ -500,8 +500,8 @@ GrowiImportForm.propTypes = {
 /**
  * Wrapper component for using unstated
  */
-const GrowiImportFormWrapper = (props) => {
-  return createSubscribedElement(GrowiImportForm, props, [AppContainer, WebsocketContainer]);
+const ImportFormWrapper = (props) => {
+  return createSubscribedElement(ImportForm, props, [AppContainer, WebsocketContainer]);
 };
 
-export default withTranslation()(GrowiImportFormWrapper);
+export default withTranslation()(ImportFormWrapper);

src/client/js/components/Admin/ImportData/GrowiZipUploadForm.jsx → src/client/js/components/Admin/ImportData/GrowiArchive/UploadForm.jsx

@@ -2,11 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from '../../UnstatedUtils';
-import AppContainer from '../../../services/AppContainer';
+import { createSubscribedElement } from '../../../UnstatedUtils';
+import AppContainer from '../../../../services/AppContainer';
 // import { toastSuccess, toastError } from '../../../util/apiNotification';
 
-class GrowiZipUploadForm extends React.Component {
+class UploadForm extends React.Component {
 
   constructor(props) {
     super(props);
@@ -77,7 +77,7 @@ class GrowiZipUploadForm extends React.Component {
 
 }
 
-GrowiZipUploadForm.propTypes = {
+UploadForm.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   onUpload: PropTypes.func.isRequired,
@@ -86,8 +86,8 @@ GrowiZipUploadForm.propTypes = {
 /**
  * Wrapper component for using unstated
  */
-const GrowiZipUploadFormWrapper = (props) => {
-  return createSubscribedElement(GrowiZipUploadForm, props, [AppContainer]);
+const UploadFormWrapper = (props) => {
+  return createSubscribedElement(UploadForm, props, [AppContainer]);
 };
 
-export default withTranslation()(GrowiZipUploadFormWrapper);
+export default withTranslation()(UploadFormWrapper);

src/client/js/components/Admin/ImportData/GrowiZipImportSection.jsx → src/client/js/components/Admin/ImportData/GrowiArchiveSection.jsx

@@ -7,10 +7,10 @@ import { createSubscribedElement } from '../../UnstatedUtils';
 import AppContainer from '../../../services/AppContainer';
 // import { toastSuccess, toastError } from '../../../util/apiNotification';
 
-import GrowiZipUploadForm from './GrowiZipUploadForm';
-import GrowiZipImportForm from './GrowiZipImportForm';
+import UploadForm from './GrowiArchive/UploadForm';
+import ImportForm from './GrowiArchive/ImportForm';
 
-class GrowiZipImportSection extends React.Component {
+class GrowiArchiveSection extends React.Component {
 
   constructor(props) {
     super(props);
@@ -87,14 +87,14 @@ class GrowiZipImportSection extends React.Component {
 
         { this.state.fileName != null ? (
           <div className="px-4">
-            <GrowiZipImportForm
+            <ImportForm
               fileName={this.state.fileName}
               innerFileStats={this.state.innerFileStats}
               onDiscard={this.discardData}
             />
           </div>
         ) : (
-          <GrowiZipUploadForm
+          <UploadForm
             onUpload={this.handleUpload}
           />
         )}
@@ -104,7 +104,7 @@ class GrowiZipImportSection extends React.Component {
 
 }
 
-GrowiZipImportSection.propTypes = {
+GrowiArchiveSection.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
 };
@@ -112,8 +112,8 @@ GrowiZipImportSection.propTypes = {
 /**
  * Wrapper component for using unstated
  */
-const GrowiZipImportSectionWrapper = (props) => {
-  return createSubscribedElement(GrowiZipImportSection, props, [AppContainer]);
+const GrowiArchiveSectionWrapper = (props) => {
+  return createSubscribedElement(GrowiArchiveSection, props, [AppContainer]);
 };
 
-export default withTranslation()(GrowiZipImportSectionWrapper);
+export default withTranslation()(GrowiArchiveSectionWrapper);

src/client/js/components/Admin/ImportDataPage.jsx

@@ -8,7 +8,7 @@ import { toastSuccess, toastError } from '../../util/apiNotification';
 
 import AppContainer from '../../services/AppContainer';
 
-import GrowiZipImportSection from './ImportData/GrowiZipImportSection';
+import GrowiArchiveSection from './ImportData/GrowiArchiveSection';
 
 const logger = loggerFactory('growi:importer');
 
@@ -135,7 +135,7 @@ class ImportDataPage extends React.Component {
     const { t } = this.props;
     return (
       <Fragment>
-        <GrowiZipImportSection />
+        <GrowiArchiveSection />
 
         <form
           className="form-horizontal mt-5"