fix(ui): disabled button, displaytag (#5122)

Author: sguiheux

ui/src/app/shared/parameter/list/parameter.component.ts

@@ -14,6 +14,7 @@ import { ParameterService } from 'app/service/parameter/parameter.service';
 import { ParameterEvent } from 'app/shared/parameter/parameter.event.model';
 import { SharedService } from 'app/shared/shared.service';
 import { Table } from 'app/shared/table/table';
+import { cloneDeep } from 'lodash-es';
 import { finalize } from 'rxjs/operators';
 
 @Component({
@@ -27,6 +28,7 @@ export class ParameterListComponent extends Table<Parameter> implements OnInit {
     set parameters(newP: Array<Parameter>) {
         if (Array.isArray(newP)) {
             this._parameters = newP.map((d) => {
+                d = cloneDeep(d);
                 d.previousName = d.name;
                 return d;
             });

ui/src/app/shared/workflow/node/run/node.run.param.html

@@ -52,15 +52,16 @@ <h3>{{ 'pipeline_parent_commit_to_deploy' | translate}}</h3>
     <div class="actions">
         <button class="ui button" [disabled]="loading"
             (click)="modal.approve(false)">{{'common_cancel' | translate}}</button>
-        <div class="ui green buttons" [class.loading]="loading" [class.disabled]="loading" >
-            <div class="ui button" (click)="run(false, false)" autofocus>{{'common_run' | translate}}</div>
+        <div class="ui green buttons">
+            <div class="ui button" [class.loading]="loading" [class.disabled]="loading"
+                 (click)="run(false, false)" autofocus>{{'common_run' | translate}}</div>
             <div class="ui floating dropdown icon button" suiDropdown>
                 <i class="dropdown icon"></i>
                 <div class="menu" suiDropdownMenu>
-                    <div class="item" [class.disabled]="!currentNodeRun" (click)="run(true, false)" suiPopup [popupText]="'workflow_run_resync_help' | translate">
+                    <div class="item" [class.disabled]="!currentNodeRun || loading || workflow.from_repository" (click)="run(true, false)" suiPopup [popupText]="'workflow_run_resync_help' | translate">
                         <i class="sync icon"></i>{{'workflow_resync' | translate }}
                     </div>
-                    <div class="item" [class.disabled]="!currentNodeRun || currentNodeRun.status !== 'Fail'" (click)="run(false, true)"><i class="bug icon"></i>{{'workflow_run_only_failed' | translate }}</div>
+                    <div class="item" [class.disabled]="loading || !currentNodeRun || currentNodeRun.status !== 'Fail'" (click)="run(false, true)"><i class="bug icon"></i>{{'workflow_run_only_failed' | translate }}</div>
                 </div>
             </div>
         </div>

ui/src/app/shared/workflow/sidebar/run-list/workflow.sidebar.run.component.ts

@@ -16,6 +16,7 @@ import { WorkflowRun, WorkflowRunTags } from 'app/model/workflow.run.model';
 import { WorkflowRunService } from 'app/service/workflow/run/workflow.run.service';
 import { AutoUnsubscribe } from 'app/shared/decorator/autoUnsubscribe';
 import { DurationService } from 'app/shared/duration/duration.service';
+import { ProjectState } from 'app/store/project.state';
 import { CleanWorkflowRun, GetWorkflowRuns } from 'app/store/workflow.action';
 import { WorkflowState } from 'app/store/workflow.state';
 import { Observable, Subscription } from 'rxjs';
@@ -31,15 +32,15 @@ import { finalize, first } from 'rxjs/operators';
 export class WorkflowSidebarRunListComponent implements OnDestroy {
     @ViewChild('tagsList', {static: false}) tagsList: ElementRef;
 
-    @Input() project: Project;
-
     workflowRuns = new Array<WorkflowRun>();
     _workflow: Workflow;
     @Input('workflow')
     set workflow(data: Workflow) {
         if (data) {
             if (!this._workflow || this._workflow.id !== data.id) {
+                this.filteredTags = {};
                 this._workflow = data;
+                this.deleteInterval();
                 this.initSelectableTags();
             }
             this._workflow = data;
@@ -55,6 +56,8 @@ export class WorkflowSidebarRunListComponent implements OnDestroy {
     @Select(WorkflowState.getRunSidebarFilters()) filters$: Observable<{}>;
     filtersSubs: Subscription;
 
+    project: Project;
+
     // search part
     selectedTags: Array<string>;
     tagsSelectable: Array<string>;
@@ -77,6 +80,7 @@ export class WorkflowSidebarRunListComponent implements OnDestroy {
         private _store: Store,
         private _cd: ChangeDetectorRef
     ) {
+        this.project = this._store.selectSnapshot(ProjectState.projectSnapshot);
         this._routerActivated.params.subscribe(p => {
             if (p['number']) {
                 this.currentWorkflowRunNumber = p['number'];
@@ -88,7 +92,7 @@ export class WorkflowSidebarRunListComponent implements OnDestroy {
                 return;
             }
             this.workflowRuns = runs;
-            if (!this.durationIntervalID && this.workflowRuns && this.workflow && this.workflowRuns.length > 0) {
+            if (this.workflowRuns && this.workflow && this.workflowRuns.length > 0) {
                 this.refreshRun();
             }
             this._cd.markForCheck();

ui/src/app/views/workflow/workflow.component.ts

@@ -98,6 +98,9 @@ export class WorkflowComponent implements OnInit {
         this.projectSubscription = this._store.select(ProjectState)
             .subscribe((projectState: ProjectStateModel) => {
                 this.project = projectState.project;
+                if (this.project && this.workflow && this.project.key !== this.workflow.project_key) {
+                    delete this.workflow;
+                }
                 this._cd.detectChanges();
             });
 

ui/src/app/views/workflow/workflow.html

@@ -97,12 +97,10 @@
                 </app-workflow-sidebar-hook>
             </ng-container>
             <ng-container *ngIf="sidebarMode === sidebarModes.RUNS">
-                <app-workflow-sidebar-run-list [project]="project" [workflow]="workflow">
-                </app-workflow-sidebar-run-list>
+                <app-workflow-sidebar-run-list [workflow]="workflow"></app-workflow-sidebar-run-list>
             </ng-container>
             <ng-container *ngIf="sidebarMode === sidebarModes.RUN_HOOK" >
-                <app-workflow-sidebar-run-hook [project]="project" [wname]="workflow.name">
-                </app-workflow-sidebar-run-hook>
+                <app-workflow-sidebar-run-hook [project]="project" [wname]="workflow.name"></app-workflow-sidebar-run-hook>
             </ng-container>
             <ng-container *ngIf="sidebarMode === sidebarModes.RUN_NODE" >
                 <app-workflow-sidebar-run-node></app-workflow-sidebar-run-node>