From 52932d6eea8f4cd3dc663585a56618a27eccfcdd Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <ramesh.p@matriotsolutions.com>
Date: Thu, 25 Mar 2021 12:43:15 +0530
Subject: [PATCH] TMSS-213: Updated getTask function to return only data
instead of full response.
---
.../src/routes/Search/find.object.result.js | 5 +--
.../tmss_webapp/src/services/task.service.js | 44 +++++++++----------
2 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Search/find.object.result.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Search/find.object.result.js
index 512f8dd7876..b909ed8a93b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Search/find.object.result.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Search/find.object.result.js
@@ -94,9 +94,8 @@ export class FindObjectResult extends Component{
* @returns
*/
async findTask(taskType, id){
- const response = await TaskService.getTask(taskType, id);
- if (response) {
- const taskDetails = response.data;
+ const taskDetails = await TaskService.getTask(taskType, id);
+ if (taskDetails) {
let task = {};
task['key'] = 'task'+taskDetails.id;
task['label'] = <> Task ({taskDetails.id})
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
index 1fec6a26958..a0439b92d07 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
@@ -3,38 +3,38 @@ const axios = require('axios');
const TaskService = {
getTaskDetails: async function (taskType, taskId) {
try {
- const response = await this.getTask(taskType, taskId);
- response.data.predecessors = [];
- response.data.successors = [];
+ const responseData = await this.getTask(taskType, taskId);
+ responseData.predecessors = [];
+ responseData.successors = [];
if (taskType === 'blueprint') {
- response.data.blueprints = [];
+ responseData.blueprints = [];
} else {
- response.data.draftName = null;
+ responseData.draftName = null;
}
- return this.getTaskRelationsByTask(taskType, response.data)
+ return this.getTaskRelationsByTask(taskType, responseData)
.then(relations => {
- response.data.predecessors = relations.predecessors;
- response.data.successors = relations.successors;
+ responseData.predecessors = relations.predecessors;
+ responseData.successors = relations.successors;
if (taskType === 'draft') {
- response.data.blueprints = relations.blueprints;
+ responseData.blueprints = relations.blueprints;
} else {
- response.data.draftObject = relations.draft;
+ responseData.draftObject = relations.draft;
}
- return response.data;
- });
+ return responseData;
+ });
- } catch (error) {
- console.error(error);
- }
+ } catch (error) {
+ console.error(error);
+ }
},
getTask : async function (taskType, taskId) {
- try {
- const url = taskType === 'blueprint'? '/api/task_blueprint/': '/api/task_draft/';
- const response = await axios.get(url + taskId);
- return response;
- } catch (error) {
- console.error(error);
- }
+ try {
+ const url = taskType === 'blueprint'? '/api/task_blueprint/': '/api/task_draft/';
+ const response = await axios.get(url + taskId);
+ return response.data;
+ } catch (error) {
+ console.error(error);
+ }
},
getTaskTemplate: async function(templateId) {
try {
--
GitLab