Merge pull request #233 from Vafilor/feat/nodepool

fix: wrong nodepool manifest value used

Author: Vafilor

src/api/api/labelService.service.ts

@@ -285,7 +285,7 @@ export class LabelServiceService {
             responseType = 'text';
         }
 
-        return this.httpClient.get<GetLabelsResponse>(`${this.configuration.basePath}/apis/v1beta1/labels/${encodeURIComponent(String(namespace))}/${encodeURIComponent(String(resource))}/labels`,
+        return this.httpClient.get<GetLabelsResponse>(`${this.configuration.basePath}/apis/v1beta1/${encodeURIComponent(String(namespace))}/${encodeURIComponent(String(resource))}/labels`,
             {
                 params: queryParameters,
                 responseType: <any>responseType,

src/app/parameters/models.ts

@@ -1,21 +1,17 @@
-import { Parameter } from "../../api";
+import { Parameter } from '../../api';
 
 export class ParameterUtils {
     /**
      * Goes through the template of a Parameter, which includes display name, options, etc, and the actual
      * used value of a parameter, which includes name and value, and combines them into a parameter with all of the information.
-     *
-     * @param values
-     * @param templates
      */
-    public static combineValueAndTemplate(values: Parameter[], templates: Parameter[]): Parameter[]
-    {
-        let result = new Array<Parameter>();
+    public static combineValueAndTemplate(values: Parameter[], templates: Parameter[]): Parameter[] {
+        const result = new Array<Parameter>();
 
-        for(const template of templates) {
-            let resultParameter = template;
+        for (const template of templates) {
+            const resultParameter = template;
             const valueParameter = values.find((val: Parameter) => val.name === template.name);
-            if(valueParameter) {
+            if (valueParameter) {
                 resultParameter.value = valueParameter.value;
             }
 

src/app/workflow-template-select/workflow-template-select.component.ts

@@ -42,7 +42,7 @@ export class WorkflowTemplateSelectComponent implements OnInit {
       name: 'Model training',
       manifest: `arguments:
   parameters:
-
+  
   # following are a list of parameters that might change based on user response.
   # some of these parameters are prefixed with cvat- to denote that they are special parameters and will be automatically populated by CVAT.
   # you can change the names, but changing names of special parameters might break the workflow.
@@ -233,7 +233,7 @@ volumeClaimTemplates:
       name: 'Ensemble inference',
       manifest: `arguments:
   parameters:
-
+  
   # Following are a list of parameters that might change based on user response.
   # some of these parameters are prefixed with cvat- to denote that they are special parameters and will be automatically populated by CVAT.
   # you can change the names, but changing names of special parameters might break the workflow.

src/app/workflow-template/workflow-template-create/workflow-template-create.component.ts

@@ -147,7 +147,8 @@ export class WorkflowTemplateCreateComponent implements OnInit, OnDestroy, CanCo
     this.manifestChanged = false;
 
     this.state = 'creating';
-    const manifestText = this.manifestDagEditor.manifestTextCurrent;
+    const manifestText = this.manifestDagEditor.rawManifest;
+
     this.workflowTemplateServiceService
         .createWorkflowTemplate(this.namespace, {
           name: templateName,

src/app/workflow-template/workflow-template-edit/workflow-template-edit.component.ts

@@ -181,7 +181,7 @@ export class WorkflowTemplateEditComponent implements OnInit, CanComponentDeacti
         return;
     }
 
-    const manifestText = this.manifestDagEditor.manifestTextCurrent;
+    const manifestText = this.manifestDagEditor.rawManifest;
 
     this.saving = true;
 

src/app/workflow/workflow-execute-dialog/workflow-execute-dialog.component.ts

@@ -7,6 +7,7 @@ import { CronWorkflowFormatter } from '../../cron-workflow/models';
 import * as yaml from 'js-yaml';
 import { Alert } from '../../alert/alert';
 import { AppRouter } from '../../router/app-router.service';
+import { ParameterUtils } from '../../parameters/models';
 
 export interface WorkflowExecuteDialogData {
     namespace: string;
@@ -24,16 +25,6 @@ type WorkflowExecutionState = 'loading' | 'ready' | 'creating';
     styleUrls: ['./workflow-execute-dialog.component.scss']
 })
 export class WorkflowExecuteDialogComponent implements OnInit, OnDestroy {
-    state: WorkflowExecutionState = 'loading';
-
-    alert: Alert;
-    namespace = '';
-    workflowTemplates: WorkflowTemplate[] = [];
-
-    selectedWorkflowTemplateUid = '';
-
-    // tslint:disable-next-line:variable-name
-    private _selectedTemplate: WorkflowTemplate;
     set selectedTemplate(value: WorkflowTemplate) {
         this.selectedWorkflowTemplateUid = value.uid;
         this._selectedTemplate = value;
@@ -44,18 +35,10 @@ export class WorkflowExecuteDialogComponent implements OnInit, OnDestroy {
             this.parameters = [];
         }
     }
-
     get selectedTemplate(): WorkflowTemplate {
         return this._selectedTemplate;
     }
 
-    @ViewChild(FormComponent, {static: false}) form: FormComponent;
-
-    showCron = false;
-    parameters: Array<Parameter> = [];
-    labels = new Array<KeyValue>();
-    schedulingText: string = CronWorkflowFormatter.toYamlString({}, true);
-
     constructor(
         private appRouter: AppRouter,
         private workflowTemplateSerivce: WorkflowTemplateServiceService,
@@ -81,9 +64,26 @@ export class WorkflowExecuteDialogComponent implements OnInit, OnDestroy {
 
         // Parameters are set after setting workflow template to override any parameters it has
         if (data.parameters) {
-            this.parameters = data.parameters;
+            this.updateParameterValues(data.parameters);
         }
     }
+    state: WorkflowExecutionState = 'loading';
+
+    alert: Alert;
+    namespace = '';
+    workflowTemplates: WorkflowTemplate[] = [];
+
+    selectedWorkflowTemplateUid = '';
+
+    @ViewChild(FormComponent, {static: false}) form: FormComponent;
+
+    showCron = false;
+    parameters: Array<Parameter> = [];
+    labels = new Array<KeyValue>();
+    schedulingText: string = CronWorkflowFormatter.toYamlString({}, true);
+
+    // tslint:disable-next-line:variable-name
+    private _selectedTemplate: WorkflowTemplate;
 
     public static pluckParameters(manifest) {
         const res = yaml.safeLoad(manifest);
@@ -100,6 +100,10 @@ export class WorkflowExecuteDialogComponent implements OnInit, OnDestroy {
         return parameters;
     }
 
+    updateParameterValues(parameters: Parameter[]) {
+        this.parameters = ParameterUtils.combineValueAndTemplate(parameters, this.parameters);
+    }
+
     ngOnInit() {
     }