8000 feat(ui): Remove useless ng-template, problem white page (#3382) · ovh/cds@49426e7 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 49426e7

Browse files
richardltyesnault
richardlt
authored and
yesnault
committed
feat(ui): Remove useless ng-template, problem white page (#3382)
1 parent 4c8720a commit 49426e7

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

‎ui/src/app/shared/table/data-table.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ export class DataTableComponent extends Table {
8686
this.filteredData = this.data.filter(this.filterFunc(this.filter));
8787
}
8888

89-
this.dataChange.emit(this.filteredData.length);
89+
if (this.filteredData) {
90+
this.dataChange.emit(this.filteredData.length);
91+
}
9092

9193
return this.filteredData;
9294
}

‎ui/src/app/views/admin/hooks-tasks/details/hooks-task.html

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,51 @@ <h2 class="ui header">
66
{{ 'hook_task_details' | translate }}
77
</h2>
88
<br />
9-
<ng-template>
10-
<div class="ui form">
11-
<div class="ui grid">
12-
<div class="ui row">
13-
<div class="wide column">
14-
<h3>{{ 'workflow_node_hook_form_config' | translate }}</h3>
15-
<br />
16-
<ng-container *ngIf="task && task.config">
17-
<div class="inline fields" *ngFor="let k of task.config | keys">
18-
<div class="four wide field"><label>{{k}}</label></div>
19-
<input type="text" [ngModel]="task.config[k].value" [readonly]="true" *ngIf="k !== 'payload'">
20-
<ng-container *ngIf="k === 'payload'">
21-
<codemirror class="code" [ngModel]="task.config[k].value" [config]="codeMirrorConfig"
22-
#textareaCodeMirror>
23-
</codemirror>
24-
</ng-container>
25-
</div>
26-
</ng-container>
27-
</div>
9+
<div class="ui form">
10+
<div class="ui grid">
11+
<div class="ui row">
12+
<div class="wide column">
13+
<h3>{{ 'workflow_node_hook_form_config' | translate }}</h3>
14+
<br />
15+
<ng-container *ngIf="task && task.config">
16+
<div class="inline fields" *ngFor="let k of task.config | keys">
17+
<div class="four wide field"><label>{{k}}</label></div>
18+
<input type="text" [ngModel]="task.config[k].value" [readonly]="true" *ngIf="k !== 'payload'">
19+
<ng-container *ngIf="k === 'payload'">
20+
<codemirror class="code" [ngModel]="task.config[k].value" [config]="codeMirrorConfig"
21+
#textareaCodeMirror>
22+
</codemirror>
23+
</ng-container>
24+
</div>
25+
</ng-container>
2826
</div>
29-
<div class="ui row">
30-
<div [ngClass]="{sixteen: !selectedExecution, eight: selectedExecution, wide: true, column: true}">
31-
<h3>{{ 'hook_task_execs' | translate }}</h3>
32-
<app-data-table [withPagination]="10" [columns]="columns" [data]="executions" [loading]="loading"></app-data-table>
27+
</div>
28+
<div class="ui row">
29+
<div [ngClass]="{sixteen: !selectedExecution, eight: selectedExecution, wide: true, column: true}">
30+
<h3>{{ 'hook_task_execs' | translate }}</h3>
31+
<app-data-table [withPagination]="10" [columns]="columns" [data]="executions" [loading]="loading"></app-data-table>
32+
</div>
33+
<div class="eight wide column" *ngIf="selectedExecution">
34+
<h3>{{'workflow_hook_log_title' | translate}}</h3>
35+
<br />
36+
<div class="inline fields" *ngIf="selectedExecution.workflow_run">
37+
<div class="four wide field"><label>{{'workflow_hook_log_workflow_run' | translate}}</label></div>
38+
<input type="text" [value]="selectedExecution.workflow_run" [readonly]="true">
3339
</div>
34-
<div class="eight wide column" *ngIf="selectedExecution">
35-
<h3>{{'workflow_hook_log_title' | translate}}</h3>
36-
<br />
37-
<div class="inline fields" *ngIf="selectedExecution.workflow_run">
38-
<div class="four wide field"><label>{{'workflow_hook_log_workflow_run' | translate}}</label></div>
39-
<input type="text" [value]="selectedExecution.workflow_run" [readonly]="true">
40-
</div>
41-
<div class="inline fields">
42-
<div class="four wide field"><label>{{'worker_model_status' | translate}}</label></div>
43-
<input type="text" [value]="selectedExecution.status" [readonly]="true">
44-
</div>
45-
<div class="inline fields" *ngIf="selectedExecution.last_error">
46-
<div class="four wide field"><label>{{'common_error' | translate}}</label></div>
47-
<input type="text" [value]="selectedExecution.last_error" [readonly]="true">
48-
</div>
49-
<div class="inline fields" *ngIf="selectedExecutionBody">
50-
<div class="four wide field"><label>Body</label></div>
51-
<codemirror class="code" [ngModel]="selectedExecutionBody" [config]="codeMirrorConfig">
52-
</codemirror>
53-
</div>
40+
<div class="inline fields">
41+
<div class="four wide field"><label>{{'worker_model_status' | translate}}</label></div>
42+
<input type="text" [value]="selectedExecution.status" [readonly]="true">
43+
</div>
44+
<div class="inline fields" *ngIf="selectedExecution.last_error">
45+
<div class="four wide field"><label>{{'common_error' | translate}}</label></div>
46+
<input type="text" [value]="selectedExecution.last_error" [readonly]="true">
47+
</div>
48+
<div class="inline fields" *ngIf="selectedExecutionBody">
49+
<div class="four wide field"><label>Body</label></div>
50+
<codemirror class="code" [ngModel]="selectedExecutionBody" [config]="codeMirrorConfig">
51+
</codemirror>
5452
</div>
5553
</div>
5654
</div>
5755
</div>
58-
</ng-template>
56+
</div>

0 commit comments

Comments
 (0)
0