fix(ui,cdsctl): take care of not imported workflow for instance (#5085)

ovh · Mar 26, 2020 · fc05887 · fc05887
1 parent 35467e9
commit fc05887
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/cli/cdsctl/template_bulk.go b/cli/cdsctl/template_bulk.go
@@ -351,7 +351,7 @@ func templateBulkRun(v cli.Values) error {
 	// filter as code workflow
 	wtisFiltered := make([]sdk.WorkflowTemplateInstance, 0, len(wtis))
 	for i := range wtis {
-		if wtis[i].Workflow.FromRepository == "" {
+		if wtis[i].Workflow == nil || wtis[i].Workflow.FromRepository == "" {
 			wtisFiltered = append(wtisFiltered, wtis[i])
 		}
 	}

diff --git a/sdk/exportentities/common.go b/sdk/exportentities/common.go
@@ -59,9 +59,15 @@ func GetFormatFromContentType(ct string) (Format, error) {
 func Unmarshal(btes []byte, f Format, i interface{}) error {
 	switch f {
 	case FormatJSON:
-		return sdk.WithStack(json.Unmarshal(btes, i))
+		if err := json.Unmarshal(btes, i); err != nil {
+			return sdk.NewErrorWithStack(err, sdk.NewErrorFrom(sdk.ErrWrongRequest, "cannot unmarshal given data as json"))
+		}
+		return nil
 	case FormatYAML:
-		return sdk.WithStack(yaml.Unmarshal(btes, i))
+		if err := yaml.Unmarshal(btes, i); err != nil {
+			return sdk.NewErrorWithStack(err, sdk.NewErrorFrom(sdk.ErrWrongRequest, "cannot unmarshal given data as yaml"))
+		}
+		return nil
 	}
 	return sdk.NewErrorFrom(sdk.ErrWrongRequest, "format is not supported")
 }

diff --git a/ui/src/app/shared/workflow-template/bulk-modal/workflow-template.bulk-modal.component.ts b/ui/src/app/shared/workflow-template/bulk-modal/workflow-template.bulk-modal.component.ts
@@ -7,7 +7,7 @@ import {
     Output,
     ViewChild
 } from '@angular/core';
-import {ModalTemplate, SuiActiveModal, SuiModalService, TemplateModalConfig} from '@richardlt/ng2-semantic-ui';
+import { ModalTemplate, SuiActiveModal, SuiModalService, TemplateModalConfig } from '@richardlt/ng2-semantic-ui';
 import {
     InstanceStatus,
     InstanceStatusUtil,
@@ -19,11 +19,11 @@ import {
     WorkflowTemplateBulkOperation,
     WorkflowTemplateInstance
 } from 'app/model/workflow-template.model';
-import {WorkflowTemplateService} from 'app/service/workflow-template/workflow-template.service';
-import {AutoUnsubscribe} from 'app/shared/decorator/autoUnsubscribe';
-import {Column, ColumnType, Select} from 'app/shared/table/data-table.component';
-import {Observable, Subscription} from 'rxjs';
-import {finalize} from 'rxjs/internal/operators/finalize';
+import { WorkflowTemplateService } from 'app/service/workflow-template/workflow-template.service';
+import { AutoUnsubscribe } from 'app/shared/decorator/autoUnsubscribe';
+import { Column, ColumnType, Select } from 'app/shared/table/data-table.component';
+import { Observable, Subscription } from 'rxjs';
+import { finalize } from 'rxjs/internal/operators/finalize';
 
 @Component({
     selector: 'app-workflow-template-bulk-modal',
@@ -33,7 +33,7 @@ import {finalize} from 'rxjs/internal/operators/finalize';
 })
 @AutoUnsubscribe()
 export class WorkflowTemplateBulkModalComponent {
-    @ViewChild('workflowTemplateBulkModal', {static: false}) workflowTemplateBulkModal: ModalTemplate<boolean, boolean, void>;
+    @ViewChild('workflowTemplateBulkModal', { static: false }) workflowTemplateBulkModal: ModalTemplate<boolean, boolean, void>;
     modal: SuiActiveModal<boolean, boolean, void>;
     open: boolean;
 
@@ -154,7 +154,7 @@ export class WorkflowTemplateBulkModalComponent {
                 this.loadingInstances = false;
                 this._cd.markForCheck();
             }))
-            .subscribe(is => this.instances = is.filter(i => !i.workflow.from_repository)
+            .subscribe(is => this.instances = is.filter(i => !i.workflow || !i.workflow.from_repository)
                 .sort((a, b) => a.key() < b.key() ? -1 : 1));
 
         this.selectedInstanceKeys = [];

diff --git a/ui/src/app/views/settings/workflow-template/edit/workflow-template.edit.component.ts b/ui/src/app/views/settings/workflow-template/edit/workflow-template.edit.component.ts
@@ -145,7 +145,7 @@ export class WorkflowTemplateEditComponent implements OnInit {
                     let status = i.status(this.workflowTemplate);
 
                     let labels = [];
-                    if (i.workflow.from_repository) {
+                    if (i.workflow && i.workflow.from_repository) {
                         labels.push({ color: 'blue', title: 'as code' });
                     }
 
@@ -171,12 +171,11 @@ export class WorkflowTemplateEditComponent implements OnInit {
                 }
             }, <Column<WorkflowTemplateInstance>>{
                 type: ColumnType.BUTTON,
-                hidden: (i: WorkflowTemplateInstance) => !!i.workflow.from_repository,
+                hidden: (i: WorkflowTemplateInstance) => i.workflow && !!i.workflow.from_repository,
                 name: 'common_action',
                 class: 'two right aligned',
                 selector: (i: WorkflowTemplateInstance) => {
                     return {
-                        hidden: !!i.workflow.from_repository,
                         title: 'common_update',
                         class: 'primary small',
                         click: () => {