refactor: #3319 rename cavatica modal (#3339)

kids-first · Jun 18, 2021 · dd33622 · dd33622
1 parent b018483
commit dd33622
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/src/components/EntityPage/File/index.js b/src/components/EntityPage/File/index.js
@@ -35,7 +35,7 @@ import ShareButton from 'uikit/ShareButton';
 import { Spinner } from 'uikit/Spinner';
 import SummaryTable from 'uikit/SummaryTable';
 
-import CavaticaConnectModal2 from '../../cavatica/CavaticaConnectModal2';
+import CavaticaConnectModal from '../../cavatica/CavaticaConnectModal';
 import CavaticaCopyOpenAccessFileModal from '../../cavatica/CavaticaCopyOpenAccessFileModal';
 
 import Download from './Download';
@@ -143,7 +143,7 @@ const FileEntity = ({ api, fileId, openModalId, closeModal, openModal, isConnect
                 }}
               >
                 {showConnectModal && (
-                  <CavaticaConnectModal2
+                  <CavaticaConnectModal
                     isVisible={showConnectModal}
                     onComplete={() => {
                       closeModal(CAVATICA_CONNECT_FILE_MODAL_ID);

diff --git a/src/components/FileRepo/FileRepo.js b/src/components/FileRepo/FileRepo.js
@@ -31,7 +31,7 @@ import { FilterInput } from 'uikit/Input';
 import Row from 'uikit/Row';
 import Tooltip from 'uikit/Tooltip';
 
-import CavaticaConnectModal2 from '../cavatica/CavaticaConnectModal2';
+import CavaticaConnectModal from '../cavatica/CavaticaConnectModal';
 import CavaticaCopyMultipleFilesModal from '../cavatica/CavaticaCopyMultipleFilesModal';
 
 import customTableColumns from './customTableColumns';
@@ -118,7 +118,7 @@ const FileRepo = ({
                 return (
                   <>
                     {showConnectModal && (
-                      <CavaticaConnectModal2
+                      <CavaticaConnectModal
                         isVisible={showConnectModal}
                         onComplete={() => {
                           closeModal(CAVATICA_CONNECT_FILE_REPO_MODAL_ID);

diff --git a/src/components/UserDashboard/CavaticaProjects/NotConnected.tsx b/src/components/UserDashboard/CavaticaProjects/NotConnected.tsx
@@ -1,14 +1,16 @@
 import React, { FunctionComponent } from 'react';
-import AccessGate from '../../AccessGate';
-import Cavatica from 'icons/Cavatica';
-import Info from '../Info';
+import { connect, ConnectedProps } from 'react-redux';
 import { ApiOutlined, RightOutlined } from '@ant-design/icons';
 import { Button } from 'antd';
-import { selectModalId } from 'store/selectors/modal';
+
+import CavaticaConnectModal from 'components/cavatica/CavaticaConnectModal';
+import Cavatica from 'icons/Cavatica';
 import { closeModal, DispatchModal, openModal } from 'store/actions/modal';
-import { connect, ConnectedProps } from 'react-redux';
-import CavaticaConnectModal2 from 'components/cavatica/CavaticaConnectModal2';
 import { RootState } from 'store/rootState';
+import { selectModalId } from 'store/selectors/modal';
+
+import AccessGate from '../../AccessGate';
+import Info from '../Info';
 
 const mapStateToProps = (state: RootState) => ({
   openModalId: selectModalId(state),
@@ -38,7 +40,7 @@ const NotConnected: FunctionComponent<PropsFromRedux> = ({
 
   return (
     <>
-      <CavaticaConnectModal2
+      <CavaticaConnectModal
         isVisible={openModalId === CAVATICA_CONNECT_MODAL_ID}
         onComplete={onClose}
         onCancelCB={onClose}
@@ -50,9 +52,7 @@ const NotConnected: FunctionComponent<PropsFromRedux> = ({
         detail="To analyze Kids First data on the cloud, connect to Cavatica."
       >
         <Button
-          type={'primary'}
           icon={<ApiOutlined />}
-          shape="round"
           onClick={() => {
             openModal(CAVATICA_CONNECT_MODAL_ID);
           }}

diff --git a/src/components/UserProfile/IntegrationItem.js b/src/components/UserProfile/IntegrationItem.js
@@ -1,18 +1,22 @@
 /* eslint-disable react/prop-types */
-import { Typography, Button, Modal } from 'antd';
-import PropTypes from 'prop-types';
-import { DisconnectOutlined, ApiOutlined } from '@ant-design/icons';
 import React, { Fragment } from 'react';
-import IntegrationItemErrorRow from './IntegrationItemErrorRow';
-import { compose, setPropTypes } from 'recompose';
-import { withRouter } from 'react-router';
-import './style.css';
-import { openModal, closeModal } from 'store/actions/modal';
 import { connect } from 'react-redux';
+import { withRouter } from 'react-router';
+import { ApiOutlined, DisconnectOutlined } from '@ant-design/icons';
+import { Button, Modal, Typography } from 'antd';
+import PropTypes from 'prop-types';
+import { compose, setPropTypes } from 'recompose';
+
+import { closeModal, openModal } from 'store/actions/modal';
 import { selectModalId } from 'store/selectors/modal';
-import CavaticaConnectModal2 from '../cavatica/CavaticaConnectModal2';
+
+import CavaticaConnectModal from '../cavatica/CavaticaConnectModal';
 import FenceAuthorizedStudies from '../Fence/FenceAuthorizedStudies';
+
 import { CAVATICA_INTEGRATION_MODAL_ID } from './constants';
+import IntegrationItemErrorRow from './IntegrationItemErrorRow';
+
+import './style.css';
 
 const { Paragraph } = Typography;
 
@@ -67,9 +71,9 @@ const IntegrationItem = (props) => {
           history={history}
         />
       ) : (
-        <Fragment>
+        <>
           {showCavaticaModal && (
-            <CavaticaConnectModal2
+            <CavaticaConnectModal
               isVisible={showCavaticaModal}
               onComplete={onClose}
               onCancelCB={onClose}
@@ -124,7 +128,7 @@ const IntegrationItem = (props) => {
               )}
             </div>
           </div>
-        </Fragment>
+        </>
       )}
     </Fragment>
   );

diff --git a/...ponents/cavatica/CavaticaConnectModal2.js → ...mponents/cavatica/CavaticaConnectModal.js b/...ponents/cavatica/CavaticaConnectModal2.js → ...mponents/cavatica/CavaticaConnectModal.js
@@ -60,7 +60,7 @@ NumberBullet.propTypes = {
   children: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
 };
 
-const CavaticaConnectModal2 = ({
+const CavaticaConnectModal = ({
   effects,
   withWarning,
   onComplete,
@@ -190,13 +190,12 @@ const CavaticaConnectModal2 = ({
   );
 };
 
-CavaticaConnectModal2.propTypes = {
+CavaticaConnectModal.propTypes = {
   effects: PropTypes.object.isRequired,
   withWarning: PropTypes.bool,
   onComplete: PropTypes.func.isRequired,
   isVisible: PropTypes.bool.isRequired,
   onCancelCB: PropTypes.func.isRequired,
 };
 
-export default enhance(CavaticaConnectModal2);
-//TODO naming + test onComplete + warning
+export default enhance(CavaticaConnectModal);