fix getTrainingJobStatus api

Change-Id: I3b16dd5c82452788bca9e99d31f34782259395d5
Signed-off-by: Taewan Kim <t25.kim@samsung.com>

diff --git a/src/apis/training-job.js b/src/apis/training-job.js
index d9d21e5..9dc190b 100644 (file)
--- a/src/apis/training-job.js
+++ b/src/apis/training-job.js
@@ -4,8 +4,8 @@ export const trainingJobAPI = {
   getTrainingJobByNameAndVersion: async ({ params }) => {
     return await instance.get(`/trainingjobs/${params.trainingJobName}/${params.trainingJobVersion}`);
   },
-  getTrainingJobStepsState: async ({ params }) => {
-    return await instance.get(`/trainingjobs/${params.trainingJobName}/${params.trainingJobVersion}/steps_state`);
+  getTrainingJobStatus: async ({ params }) => {
+    return await instance.get(`/ai-ml-model-training/v1/training-jobs/${params.trainingJobId}/status`);
   },
   getLatestTrainingJob: async () => {
     return await instance.get('/ai-ml-model-training/v1/training-jobs');

diff --git a/src/components/home/status/StatusPageRows.js b/src/components/home/status/StatusPageRows.js
index 3f2ecce..81a7b80 100644 (file)
--- a/src/components/home/status/StatusPageRows.js
+++ b/src/components/home/status/StatusPageRows.js
@@ -39,7 +39,7 @@ const StatusPageRows = props => {
   const closeEditPopup = () => setEditPopup(false);
   const closeCreatePopup = () => setCreatePopup(false);
   const [stepsStatePopup, setStepsStatePopup] = useState(false);
-  const [stepsStateTrainingJobAndVersion, setStepsStateTrainingJobNameAndVersion] = useState(null);
+  const [statusTrainingJobId, setStatusTrainingJobId] = useState(null);
   const closeStepsStatePopup = () => setStepsStatePopup(false);
   const [infoPopup, setInfoPopup] = useState(false);
   const [infoTrainingJobAndVersion, setInfoTrainingJobNameAndVersion] = useState(null);
@@ -132,11 +132,8 @@ const StatusPageRows = props => {
     }
   };
 
-  const handleStepStateClick = (trainingjob_name, version) => {
-    setStepsStateTrainingJobNameAndVersion({
-      trainingjob_name: trainingjob_name,
-      version: version,
-    });
+  const handleStepStateClick = (id) => {
+    setStatusTrainingJobId(id);
     setStepsStatePopup(true);
   };
 
@@ -186,7 +183,7 @@ const StatusPageRows = props => {
             <Button
               variant='primary'
               style={{ backgroundColor: '#6282f6', border: '#6282f6' }}
-              onClick={() => handleStepStateClick(row.original.trainingjob_name, row.original.version)}
+              onClick={() => handleStepStateClick(row.values.id)}
             >
               Detailed Status
             </Button>
@@ -272,7 +269,7 @@ const StatusPageRows = props => {
         ></CreateOrEditTrainingJobForm>
       </Popup>
       <Popup size='sm' show={stepsStatePopup} onHide={closeStepsStatePopup} title='Detailed Status'>
-        <StepsState trainingjob_name_and_version={stepsStateTrainingJobAndVersion}></StepsState>
+        <StepsState trainingJobId={statusTrainingJobId}></StepsState>
       </Popup>
       <Popup show={infoPopup} onHide={closeInfoPopup} title='Training Job Info'>
         <TrainingJobInfo trainingjob_name_and_version={infoTrainingJobAndVersion} />

diff --git a/src/components/steps-state/steps-state.jsx b/src/components/steps-state/steps-state.jsx
index 2496d60..7acb4ef 100644 (file)
--- a/src/components/steps-state/steps-state.jsx
+++ b/src/components/steps-state/steps-state.jsx
@@ -19,7 +19,6 @@
 import React, { useEffect, useState } from 'react';
 import './steps-state.css';
 
-import { UCMgr_baseUrl } from '../../states';
 import { trainingJobAPI } from '../../apis';
 
 export const StepsState = props => {
@@ -30,20 +29,11 @@ export const StepsState = props => {
     const periodicTask = async () => {
       let res = null;
       try {
-        res = await trainingJobAPI.getTrainingJobStepsState({
-          params: {
-            trainingJobName: props.trainingjob_name_and_version.trainingjob_name,
-            trainingJobVersion: props.trainingjob_name_and_version.version,
-          },
-        });
+        res = await trainingJobAPI.getTrainingJobStatus({ params: { trainingJobId: props.trainingJobId } });
       } catch (error) {
         console.log(error);
       }
       const json_from_backend = res.data;
-      console.log(
-        `response for ${UCMgr_baseUrl}/trainingjobs/${props.trainingjob_name_and_version.trainingjob_name}/${props.trainingjob_name_and_version.version}/steps_state`,
-        res,
-      );
       const newBoxesState = [];
       const newConnectionsState = [];
       const newBoxes = ['Data extraction', 'Training', 'Trained Model'];