Fix the training job deletion api

The delete interface of tm is changed to
/ai-ml-model-training/v1/training-jobs/{id}

Issue-ID: AIMLFW-184

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

diff --git a/src/apis/training-job.js b/src/apis/training-job.js
index 2802ef5..b27298a 100644 (file)
--- a/src/apis/training-job.js
+++ b/src/apis/training-job.js
@@ -13,7 +13,7 @@ export const trainingJobAPI = {
   invokeTrainingJob: async ({ data }) => {
     return await instance.post('/ai-ml-model-training/v1/training-jobs', { ...data });
   },
-  deleteTrainingJob: async ({ data }) => {
-    return await instance.delete('/trainingjobs', { ...data });
+  deleteTrainingJob: async ({ params }) => {
+    return await instance.delete(`/ai-ml-model-training/v1/training-jobs/${params.trainingJobId}`);
   },
 };

diff --git a/src/components/home/status/API_STATUS.js b/src/components/home/status/API_STATUS.js
index cc1798d..a6644e3 100644 (file)
--- a/src/components/home/status/API_STATUS.js
+++ b/src/components/home/status/API_STATUS.js
@@ -34,10 +34,12 @@ export const invokeStartTraining = async trainingjobNames => {
 export const deleteTrainingjobs = async deleteTJList => {
   console.log('Delete API called ', deleteTJList);
   try {
-    const res = await trainingJobAPI.deleteTrainingJob({ data: { data: { list: deleteTJList } } });
-    console.log('Delete API response', res);
-    let result = 'trainingjob deletion initiated for selected trainingjob(s),Result' + '\n' + JSON.stringify(res.data);
-    alert(result);
+    for (const job of deleteTJList) {
+      let res = await trainingJobAPI.deleteTrainingJob({ params: {trainingJobId: job.id} });
+      console.log('Delete API response', res);
+      let result = `trainingjob deletion initiated for selected trainingjob ${job.id}, Result` + '\n' + JSON.stringify(res.status);
+      alert(result);
+    }
   } catch (error) {
     console.log(error);
   }

diff --git a/src/components/home/status/StatusPageRows.js b/src/components/home/status/StatusPageRows.js
index e1390e7..035766e 100644 (file)
--- a/src/components/home/status/StatusPageRows.js
+++ b/src/components/home/status/StatusPageRows.js
@@ -115,8 +115,7 @@ const StatusPageRows = props => {
       let deleteTJList = [];
       for (const row of selectedFlatRows) {
         let trainingjobDict = {};
-        trainingjobDict['trainingjob_name'] = row.original.trainingjob_name;
-        trainingjobDict['version'] = row.original.version;
+        trainingjobDict['id'] = row.original.id;
         deleteTJList.push(trainingjobDict);
       }
       console.log('Selected trainingjobs for deletion : ', deleteTJList);