From a10c058b0409dfe79421827baf9d937c0af8be65 Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Mon, 6 Nov 2023 14:30:52 +0100
Subject: [PATCH] added refResolveSchema to function getTaskTemplate
---
.../frontend/tmss_webapp/src/routes/Task/edit.js | 2 +-
.../tmss_webapp/src/services/task.service.js | 12 ++----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
index d012e963219..dfb467cf66a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
@@ -237,7 +237,7 @@ export class TaskEdit extends Component {
TaskService.getTaskDetails("draft", taskId)
.then(async (task) => {
if (task) {
- const taskTemplate = await TaskService.getTaskTemplateRefResolved(task.specifications_template_id);
+ const taskTemplate = await TaskService.getTaskTemplate(task.specifications_template_id,true);
const schedulingUnit = await TaskService.getSchedulingUnit("draft", task.scheduling_unit_draft_id, true);
let targetTask = _.find(schedulingUnit[`task_drafts`], suTask => (
_.includes(UIConstants.TARGET_OBSERVATION_NAMES, suTask.specifications_template.name)
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 1c3f5c56bbf..66a591348f7 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
@@ -43,17 +43,9 @@ const TaskService = {
console.error(error);
}
},
- getTaskTemplate: async function(templateId) {
+ getTaskTemplate: async function(templateId, refResolveSchema=false) {
try {
- const response = await axios.get('/api/task_template/' + templateId);
- return response.data;
- } catch (error) {
- console.log(error);
- }
- },
- getTaskTemplateRefResolved: async function(templateId) {
- try {
- const response = await axios.get('/api/task_template/' + templateId+'/ref_resolved_schema'); // ref_resolved_schema.
+ const response = await axios.get(`/api/task_template/${templateId}${refResolveSchema ? '/ref_resolved_schema' : ''}`);
return response.data;
} catch (error) {
console.log(error);
--
GitLab