fix(ui): cannot add a worker model without required info #4816 (#4933)

ovh · Jan 30, 2020 · 4932951 · 4932951
1 parent d39462a
commit 4932951
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/ui/src/app/views/settings/worker-model/form/worker-model.form.component.ts b/ui/src/app/views/settings/worker-model/form/worker-model.form.component.ts
@@ -1,12 +1,4 @@
-import {
-    ChangeDetectionStrategy, ChangeDetectorRef,
-    Component,
-    EventEmitter,
-    Input,
-    OnInit,
-    Output,
-    ViewChild
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { Group } from 'app/model/group.model';
 import { AuthentifiedUser } from 'app/model/user.model';
 import { ModelPattern, WorkerModel } from 'app/model/worker-model.model';
@@ -26,7 +18,7 @@ import { Subscription } from 'rxjs/Subscription';
 })
 @AutoUnsubscribe()
 export class WorkerModelFormComponent implements OnInit {
-    @ViewChild('codeMirror', {static: false}) codemirror: any;
+    @ViewChild('codeMirror', { static: false }) codemirror: any;
 
     _workerModel: WorkerModel;
     @Input() set workerModel(wm: WorkerModel) {
@@ -109,6 +101,37 @@ pattern_name: basic_unix`;
             .subscribe((wmStr) => this.workerModelAsCode = wmStr);
     }
 
+    canSave(): boolean {
+        if (!this.workerModel.editable) {
+            return false;
+        }
+
+        let minimal_required_info = !!this.workerModel.name && !!this.workerModel.group_id && !!this.workerModel.type;
+        if (!minimal_required_info) {
+            return false;
+        }
+
+        switch (this.workerModel.type) {
+            case 'docker':
+                let minimal_info_docker = !!this.workerModel.model_docker.image
+                    && !!this.workerModel.model_docker.shell && !!this.workerModel.model_docker.cmd;
+                if (!minimal_info_docker) {
+                    return false;
+                }
+                break;
+            case 'host':
+            case 'openstack':
+            case 'vsphere':
+                let minimal_info_vm = !!this.workerModel.model_virtual_machine.image && !!this.workerModel.model_virtual_machine.cmd;
+                if (!minimal_info_vm) {
+                    return false;
+                }
+                break;
+        }
+
+        return true;
+    }
+
     filterPatterns(type: string) {
         this.patternsFiltered = this.patterns.filter((pattern) => pattern.type === type);
     }

diff --git a/ui/src/app/views/settings/worker-model/form/worker-model.form.html b/ui/src/app/views/settings/worker-model/form/worker-model.form.html
@@ -293,7 +293,8 @@ <h4 *ngIf="workerModel.last_spawn_err_log">{{ 'worker_model_error_log' | transla
                     <div *ngIf="workerModel.editable" class="field">
                         <app-delete-button *ngIf="workerModel.id" class="left floated" (event)="clickDelete()"
                             [loading]="deleteLoading"></app-delete-button>
-                        <button class="ui green right floated button" [class.loading]="loading" (click)="clickSave()">
+                        <button class="ui green right floated button" [class.loading]="loading"
+                            [class.disabled]="!canSave()" (click)="clickSave()">
                             <i class="save icon"></i>{{ 'btn_save' | translate }}
                         </button>
                     </div>