From 810b5dd2d436022897c49ccbf1c1749747434f82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9E=84=EC=A4=80=ED=98=81?= Date: Tue, 24 Sep 2024 23:44:41 +0900 Subject: [PATCH] Separate component into root folder MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I63b53d7045cd36df95b27c94755832c0391bc129 Signed-off-by: 임준혁 --- .../status/Checkbox.js => checkbox/checkbox.jsx} | 6 +----- src/components/checkbox/index.js | 1 + src/components/home/status/ListFeatureGroup.js | 9 ++++---- src/components/home/status/StatusPageRows.js | 11 +++++----- src/components/index.js | 5 ++++- src/components/popup/index.js | 1 + .../{home/status/Popup.js => popup/popup.jsx} | 25 +++++++--------------- src/components/steps-state/index.js | 1 + .../StepsState.css => steps-state/steps-state.css} | 0 .../StepsState.js => steps-state/steps-state.jsx} | 9 ++++---- src/components/training-job-info/index.js | 1 + .../training-job-info.jsx} | 10 +++++---- 12 files changed, 38 insertions(+), 41 deletions(-) rename src/components/{home/status/Checkbox.js => checkbox/checkbox.jsx} (92%) create mode 100644 src/components/checkbox/index.js create mode 100644 src/components/popup/index.js rename src/components/{home/status/Popup.js => popup/popup.jsx} (69%) create mode 100644 src/components/steps-state/index.js rename src/components/{home/status/StepsState.css => steps-state/steps-state.css} (100%) rename src/components/{home/status/StepsState.js => steps-state/steps-state.jsx} (96%) create mode 100644 src/components/training-job-info/index.js rename src/components/{home/status/TrainingJobInfo.js => training-job-info/training-job-info.jsx} (97%) diff --git a/src/components/home/status/Checkbox.js b/src/components/checkbox/checkbox.jsx similarity index 92% rename from src/components/home/status/Checkbox.js rename to src/components/checkbox/checkbox.jsx index ab080cc..503ccb9 100644 --- a/src/components/home/status/Checkbox.js +++ b/src/components/checkbox/checkbox.jsx @@ -26,9 +26,5 @@ export const Checkbox = React.forwardRef(({ indeterminate, ...rest }, ref) => { resolvedRef.current.indeterminate = indeterminate; }, [resolvedRef, indeterminate]); - return ( - <> - - - ); + return ; }); diff --git a/src/components/checkbox/index.js b/src/components/checkbox/index.js new file mode 100644 index 0000000..8d78b3e --- /dev/null +++ b/src/components/checkbox/index.js @@ -0,0 +1 @@ +export * from './checkbox'; diff --git a/src/components/home/status/ListFeatureGroup.js b/src/components/home/status/ListFeatureGroup.js index acb0b90..f9eec18 100644 --- a/src/components/home/status/ListFeatureGroup.js +++ b/src/components/home/status/ListFeatureGroup.js @@ -20,13 +20,14 @@ import React, { useMemo, useState, useEffect } from 'react'; import BTable from 'react-bootstrap/Table'; import Button from 'react-bootstrap/Button'; import { useTable, useRowSelect } from 'react-table'; -import { Checkbox } from './Checkbox'; -import Popup from './Popup'; + +import { Checkbox, Popup } from '../../../components'; +import { UCMgr_baseUrl } from '../../../states'; +import { featureGroupAPI } from '../../../apis'; + import FeatureGroupInfo from './FeatureGroupInfo'; import CreateFeatureGroup from '../create/CreateFeatureGroup'; import { deleteFeatureGroups } from './API_STATUS'; -import { UCMgr_baseUrl } from '../../../states'; -import { featureGroupAPI } from '../../../apis/feature-group'; const ListFeatureGroup = props => { const logger = props.logger; diff --git a/src/components/home/status/StatusPageRows.js b/src/components/home/status/StatusPageRows.js index eb361de..6c13d72 100644 --- a/src/components/home/status/StatusPageRows.js +++ b/src/components/home/status/StatusPageRows.js @@ -20,15 +20,14 @@ import React, { useMemo, useState, useEffect } from 'react'; import BTable from 'react-bootstrap/Table'; import Button from 'react-bootstrap/Button'; import { useTable, useRowSelect } from 'react-table'; -import { Checkbox } from './Checkbox'; -import Popup from './Popup'; -import TrainingJobInfo from './TrainingJobInfo'; + +import { Checkbox, Popup, StepsState, TrainingJobInfo } from '../../../components'; +import { UCMgr_baseUrl } from '../../../states'; +import { trainingJobAPI } from '../../../apis'; + import { invokeStartTraining, deleteTrainingjobs } from './API_STATUS'; -import StepsState from './StepsState'; import CreateOrEditTrainingJobForm from '../form/CreateOrEditTrainingJobForm'; import CreateTrainingJob from '../create/CreateTrainingJob'; -import { UCMgr_baseUrl } from '../../../states'; -import { trainingJobAPI } from '../../../apis/training-job'; const StatusPageRows = props => { const logger = props.logger; diff --git a/src/components/index.js b/src/components/index.js index 267be40..df7d721 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,3 +1,6 @@ export * from './button'; -export * from './home'; export * from './navigation'; +export * from './checkbox'; +export * from './popup'; +export * from './steps-state'; +export * from './training-job-info'; diff --git a/src/components/popup/index.js b/src/components/popup/index.js new file mode 100644 index 0000000..beb7b99 --- /dev/null +++ b/src/components/popup/index.js @@ -0,0 +1 @@ +export * from './popup'; diff --git a/src/components/home/status/Popup.js b/src/components/popup/popup.jsx similarity index 69% rename from src/components/home/status/Popup.js rename to src/components/popup/popup.jsx index a3f0248..d186133 100644 --- a/src/components/home/status/Popup.js +++ b/src/components/popup/popup.jsx @@ -19,22 +19,13 @@ import React from 'react'; import { Modal } from 'react-bootstrap'; -function Popup(props) { +export const Popup = props => { return ( - <> - - - {props.title} - - {props.children} - - + + + {props.title} + + {props.children} + ); -} - -export default Popup; +}; diff --git a/src/components/steps-state/index.js b/src/components/steps-state/index.js new file mode 100644 index 0000000..1d68626 --- /dev/null +++ b/src/components/steps-state/index.js @@ -0,0 +1 @@ +export * from './steps-state'; diff --git a/src/components/home/status/StepsState.css b/src/components/steps-state/steps-state.css similarity index 100% rename from src/components/home/status/StepsState.css rename to src/components/steps-state/steps-state.css diff --git a/src/components/home/status/StepsState.js b/src/components/steps-state/steps-state.jsx similarity index 96% rename from src/components/home/status/StepsState.js rename to src/components/steps-state/steps-state.jsx index cbbd2cf..2496d60 100644 --- a/src/components/home/status/StepsState.js +++ b/src/components/steps-state/steps-state.jsx @@ -17,11 +17,12 @@ // ================================================================================== import React, { useEffect, useState } from 'react'; -import './StepsState.css'; -import { UCMgr_baseUrl } from '../../../states'; -import { trainingJobAPI } from '../../../apis/training-job'; +import './steps-state.css'; -const StepsState = props => { +import { UCMgr_baseUrl } from '../../states'; +import { trainingJobAPI } from '../../apis'; + +export const StepsState = props => { const [boxesState, setBoxesState] = useState([]); const [connectionsState, setConnectionsState] = useState([]); const [boxes, setBoxes] = useState([]); diff --git a/src/components/training-job-info/index.js b/src/components/training-job-info/index.js new file mode 100644 index 0000000..b24b36a --- /dev/null +++ b/src/components/training-job-info/index.js @@ -0,0 +1 @@ +export * from './training-job-info'; diff --git a/src/components/home/status/TrainingJobInfo.js b/src/components/training-job-info/training-job-info.jsx similarity index 97% rename from src/components/home/status/TrainingJobInfo.js rename to src/components/training-job-info/training-job-info.jsx index 0966823..4b6fb45 100644 --- a/src/components/home/status/TrainingJobInfo.js +++ b/src/components/training-job-info/training-job-info.jsx @@ -18,11 +18,13 @@ import React, { useEffect, useState } from 'react'; import { Form } from 'react-bootstrap'; -import { convertToCommaSeparatedString, getDatalakeNameWithoutConversion } from '../common/CommonMethods'; -import { UCMgr_baseUrl } from '../../../states'; -import { trainingJobAPI } from '../../../apis/training-job'; -const TrainingJobInfo = props => { +import { UCMgr_baseUrl } from '../../states'; +import { trainingJobAPI } from '../../apis'; + +import { convertToCommaSeparatedString, getDatalakeNameWithoutConversion } from '../home/common/CommonMethods'; + +export const TrainingJobInfo = props => { const [trainingJobName, setTrainingJobName] = useState(''); const [isMme, setIsMme] = useState(false); const [modelName, setModelName] = useState(''); -- 2.16.6