Explorar el Código

move GrowiArchiveImportOption to commons

Yuki Takei hace 6 años
padre
commit
59130f657d

+ 4 - 4
src/client/js/components/Admin/ImportData/GrowiZipImportConfigurationModal.jsx

@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 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 { toastSuccess, toastError } from '../../../util/apiNotification';
 
-import GrowiZipImportOption from '../../../models/GrowiZipImportOption';
-
 
 class GrowiZipImportConfigurationModal extends React.Component {
 
@@ -16,7 +16,7 @@ class GrowiZipImportConfigurationModal extends React.Component {
     super(props);
 
     this.state = {
-      importOptions: this.props.importOptions,
+      option: this.props.option,
     };
   }
 
@@ -94,7 +94,7 @@ GrowiZipImportConfigurationModal.propTypes = {
   onClose: PropTypes.func.isRequired,
 
   collectionName: PropTypes.string,
-  importOption: PropTypes.instanceOf(GrowiZipImportOption).isRequired,
+  option: PropTypes.instanceOf(GrowiArchiveImportOption).isRequired,
 };
 
 /**

+ 6 - 5
src/client/js/components/Admin/ImportData/GrowiZipImportForm.jsx

@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import * as toastr from 'toastr';
 
+import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
+
 import { createSubscribedElement } from '../../UnstatedUtils';
 import AppContainer from '../../../services/AppContainer';
 import WebsocketContainer from '../../../services/WebsocketContainer';
 import { toastSuccess, toastError } from '../../../util/apiNotification';
 
-import GrowiZipImportOption from '../../../models/GrowiZipImportOption';
 
 import GrowiZipImportItem, { DEFAULT_MODE, MODE_RESTRICTED_COLLECTION } from './GrowiZipImportItem';
 import GrowiZipImportConfigurationModal from './GrowiZipImportConfigurationModal';
@@ -41,7 +42,7 @@ class GrowiImportForm extends React.Component {
 
       // store relations from collection name to file name
       collectionNameToFileNameMap: {},
-      // store relations from collection name to GrowiZipImportOption instance
+      // store relations from collection name to GrowiArchiveImportOption instance
       optionsMap: {},
 
       isConfigurationModalOpen: false,
@@ -65,8 +66,8 @@ class GrowiImportForm extends React.Component {
       const initialMode = (MODE_RESTRICTED_COLLECTION[collectionName] != null)
         ? MODE_RESTRICTED_COLLECTION[collectionName][0]
         : DEFAULT_MODE;
-      // create GrowiZipImportOption
-      this.initialState.optionsMap[collectionName] = new GrowiZipImportOption(initialMode);
+      // create GrowiArchiveImportOption
+      this.initialState.optionsMap[collectionName] = new GrowiArchiveImportOption(initialMode);
     });
 
     this.state = this.initialState;
@@ -398,7 +399,7 @@ class GrowiImportForm extends React.Component {
         isOpen={isConfigurationModalOpen}
         onClose={() => this.setState({ isConfigurationModalOpen: false })}
         collectionName={collectionName}
-        importOption={optionsMap[collectionName]}
+        option={optionsMap[collectionName]}
       />
     );
   }

+ 2 - 2
src/client/js/components/Admin/ImportData/GrowiZipImportItem.jsx

@@ -6,7 +6,7 @@ import { withTranslation } from 'react-i18next';
 
 import ProgressBar from 'react-bootstrap/es/ProgressBar';
 
-import GrowiZipImportOption from '../../../models/GrowiZipImportOption';
+import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
 
 
 const MODE_ATTR_MAP = {
@@ -223,7 +223,7 @@ export default class GrowiZipImportItem extends React.Component {
 GrowiZipImportItem.propTypes = {
   collectionName: PropTypes.string.isRequired,
   isSelected: PropTypes.bool.isRequired,
-  option: PropTypes.instanceOf(GrowiZipImportOption).isRequired,
+  option: PropTypes.instanceOf(GrowiArchiveImportOption).isRequired,
 
   isImporting: PropTypes.bool.isRequired,
   isImported: PropTypes.bool.isRequired,

+ 3 - 1
src/client/js/models/GrowiZipImportOption.js → src/lib/models/admin/growi-archive-import-option.js

@@ -1,4 +1,4 @@
-export default class ImportOption {
+class GrowiArchiveImportOption {
 
   constructor(mode, schema = {}) {
     this.mode = mode;
@@ -6,3 +6,5 @@ export default class ImportOption {
   }
 
 }
+
+module.exports = GrowiArchiveImportOption;