Skip to content

Commit

Permalink
feat(ui): Remove useless ng-template, problem white page (#3382)
Browse files Browse the repository at this point in the history
  • Loading branch information
@richardlt @yesnault
richardlt authored and yesnault committed Oct 2, 2018
1 parent 4c8720a commit 49426e7
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
4 changes: 3 additions & 1 deletion ui/src/app/shared/table/data-table.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ export class DataTableComponent extends Table {
this.filteredData = this.data.filter(this.filterFunc(this.filter));
}

this.dataChange.emit(this.filteredData.length);
if (this.filteredData) {
this.dataChange.emit(this.filteredData.length);
}

return this.filteredData;
}
Expand Down
86 changes: 42 additions & 44 deletions ui/src/app/views/admin/hooks-tasks/details/hooks-task.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,53 +6,51 @@ <h2 class="ui header">
{{ 'hook_task_details' | translate }}
</h2>
<br />
<ng-template>
<div class="ui form">
<div class="ui grid">
<div class="ui row">
<div class="wide column">
<h3>{{ 'workflow_node_hook_form_config' | translate }}</h3>
<br />
<ng-container *ngIf="task && task.config">
<div class="inline fields" *ngFor="let k of task.config | keys">
<div class="four wide field"><label>{{k}}</label></div>
<input type="text" [ngModel]="task.config[k].value" [readonly]="true" *ngIf="k !== 'payload'">
<ng-container *ngIf="k === 'payload'">
<codemirror class="code" [ngModel]="task.config[k].value" [config]="codeMirrorConfig"
#textareaCodeMirror>
</codemirror>
</ng-container>
</div>
</ng-container>
</div>
<div class="ui form">
<div class="ui grid">
<div class="ui row">
<div class="wide column">
<h3>{{ 'workflow_node_hook_form_config' | translate }}</h3>
<br />
<ng-container *ngIf="task && task.config">
<div class="inline fields" *ngFor="let k of task.config | keys">
<div class="four wide field"><label>{{k}}</label></div>
<input type="text" [ngModel]="task.config[k].value" [readonly]="true" *ngIf="k !== 'payload'">
<ng-container *ngIf="k === 'payload'">
<codemirror class="code" [ngModel]="task.config[k].value" [config]="codeMirrorConfig"
#textareaCodeMirror>
</codemirror>
</ng-container>
</div>
</ng-container>
</div>
<div class="ui row">
<div [ngClass]="{sixteen: !selectedExecution, eight: selectedExecution, wide: true, column: true}">
<h3>{{ 'hook_task_execs' | translate }}</h3>
<app-data-table [withPagination]="10" [columns]="columns" [data]="executions" [loading]="loading"></app-data-table>
</div>
<div class="ui row">
<div [ngClass]="{sixteen: !selectedExecution, eight: selectedExecution, wide: true, column: true}">
<h3>{{ 'hook_task_execs' | translate }}</h3>
<app-data-table [withPagination]="10" [columns]="columns" [data]="executions" [loading]="loading"></app-data-table>
</div>
<div class="eight wide column" *ngIf="selectedExecution">
<h3>{{'workflow_hook_log_title' | translate}}</h3>
<br />
<div class="inline fields" *ngIf="selectedExecution.workflow_run">
<div class="four wide field"><label>{{'workflow_hook_log_workflow_run' | translate}}</label></div>
<input type="text" [value]="selectedExecution.workflow_run" [readonly]="true">
</div>
<div class="eight wide column" *ngIf="selectedExecution">
<h3>{{'workflow_hook_log_title' | translate}}</h3>
<br />
<div class="inline fields" *ngIf="selectedExecution.workflow_run">
<div class="four wide field"><label>{{'workflow_hook_log_workflow_run' | translate}}</label></div>
<input type="text" [value]="selectedExecution.workflow_run" [readonly]="true">
</div>
<div class="inline fields">
<div class="four wide field"><label>{{'worker_model_status' | translate}}</label></div>
<input type="text" [value]="selectedExecution.status" [readonly]="true">
</div>
<div class="inline fields" *ngIf="selectedExecution.last_error">
<div class="four wide field"><label>{{'common_error' | translate}}</label></div>
<input type="text" [value]="selectedExecution.last_error" [readonly]="true">
</div>
<div class="inline fields" *ngIf="selectedExecutionBody">
<div class="four wide field"><label>Body</label></div>
<codemirror class="code" [ngModel]="selectedExecutionBody" [config]="codeMirrorConfig">
</codemirror>
</div>
<div class="inline fields">
<div class="four wide field"><label>{{'worker_model_status' | translate}}</label></div>
<input type="text" [value]="selectedExecution.status" [readonly]="true">
</div>
<div class="inline fields" *ngIf="selectedExecution.last_error">
<div class="four wide field"><label>{{'common_error' | translate}}</label></div>
<input type="text" [value]="selectedExecution.last_error" [readonly]="true">
</div>
<div class="inline fields" *ngIf="selectedExecutionBody">
<div class="four wide field"><label>Body</label></div>
<codemirror class="code" [ngModel]="selectedExecutionBody" [config]="codeMirrorConfig">
</codemirror>
</div>
</div>
</div>
</div>
</ng-template>
</div>

0 comments on commit 49426e7

Please sign in to comment.