Просмотр исходного кода

remove temporary commentout and change

sooouh 6 лет назад
Родитель
Сommit
894a776141

+ 1 - 2
src/client/js/components/Admin/ImportData/GrowiArchive/ErrorViewer.jsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
-// import Modal from 'react-bootstrap/es/Modal';
-import { Modal } from 'reactstrap';
+import Modal from 'react-bootstrap/es/Modal';
 
 import { createSubscribedElement } from '../../../UnstatedUtils';
 

+ 6 - 7
src/client/js/components/Admin/ImportData/GrowiArchive/ImportCollectionItem.jsx

@@ -4,8 +4,7 @@ import PropTypes from 'prop-types';
 // eslint-disable-next-line no-unused-vars
 import { withTranslation } from 'react-i18next';
 
-// import ProgressBar from 'react-bootstrap/es/ProgressBar';
-import { Progress } from 'reactstrap';
+import ProgressBar from 'react-bootstrap/es/ProgressBar';
 
 import GrowiArchiveImportOption from '@commons/models/admin/growi-archive-import-option';
 
@@ -167,11 +166,11 @@ export default class ImportCollectionItem extends React.Component {
     const total = insertedCount + modifiedCount + errorsCount;
 
     return (
-      <Progress className="mb-0">
-        <Progress max={total} striped={isImporting} active={isImporting} now={insertedCount} bsStyle="info" />
-        <Progress max={total} striped={isImporting} active={isImporting} now={modifiedCount} bsStyle="success" />
-        <Progress max={total} striped={isImporting} active={isImporting} now={errorsCount} bsStyle="danger" />
-      </Progress>
+      <ProgressBar className="mb-0">
+        <ProgressBar max={total} striped={isImporting} active={isImporting} now={insertedCount} bsStyle="info" />
+        <ProgressBar max={total} striped={isImporting} active={isImporting} now={modifiedCount} bsStyle="success" />
+        <ProgressBar max={total} striped={isImporting} active={isImporting} now={errorsCount} bsStyle="danger" />
+      </ProgressBar>
     );
   }