feat(ui,api,cdsctl): Add filter to queue/workflows on status #3293
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ters in status and queue pages
yesnault
approved these changes
Sep 6, 2018
bnjjj
suggested changes
Sep 6, 2018
| @@ -29,16 +29,20 @@ export class QueueComponent implements OnDestroy { | |||
| requirementsList: Array<string> = []; | |||
| loading = true; | |||
|
|
|||
| statusOptions: Array<string> = ['Waiting', 'Building', 'All']; | |||
There was a problem hiding this comment.
There is an enum in pipeline model I think something like PipelineStatus
| @@ -47,6 +51,21 @@ export class QueueComponent implements OnDestroy { | |||
| } | |||
| } | |||
|
|
|||
| getQueueWorkerParams() { | |||
| console.log(this.status) | |||
|
|
||
| <table class="ui definition table" *ngIf="status && !loading"> | ||
| <tbody> | ||
| <tr *ngFor="let line of status.lines" [ngClass]="{'error': line.status=='AL', 'warning': line.status=='WARN', 'positive': line.status=='WARN'}"> | ||
| <td> | ||
| <tr *ngFor="let line of getStatusLines()" [ngClass]="{'error': line.status=='AL', 'warning': line.status=='WARN', 'positive': line.status=='WARN'}"> |
There was a problem hiding this comment.
avoid using function in ngIf/ngFor etc..
ui/src/assets/worker/web/queue.js
Outdated
| onmessage = function (e) { | ||
| loadWorkflowRuns(e.data.user, e.data.session, e.data.api); | ||
| status = e.data.status; | ||
| if (!started) { loadWorkflowRuns(e.data.user, e.data.session, e.data.api); } |
There was a problem hiding this comment.
multiline could be more readable
ui/src/assets/worker/web/queue.js
Outdated
| loop(5, function () { | ||
| var url = '/queue/workflows'; | ||
|
|
||
| if (status && status.length > 0) { | ||
| url = url.concat('?', status.map(function (s) { return "status=" + s; }).join('&')) |
| @@ -17,12 +24,15 @@ <h3>{{'admin_queue_title' | translate }} <span *ngIf="!loading && nodeJobRuns && | |||
| </tr> | |||
| </thead> | |||
| <tbody> | |||
| <tr *ngFor="let wNodeJobRun of nodeJobRuns; let index = index"> | |||
| <tr *ngFor="let wNodeJobRun of getNodeJobRuns(); let index = index"> | |||
There was a problem hiding this comment.
if it's possible please avoid use function in template (to avoid performance issues)
sguiheux
requested changes
Sep 6, 2018
| @@ -3,10 +3,17 @@ <h3>{{'admin_queue_title' | translate }} <span *ngIf="!loading && nodeJobRuns && | |||
|
|
|||
| <div *ngIf="loading" class="ui active text loader">{{ 'common_loading' | translate }}</div> | |||
|
|
|||
| <sm-select class="search fluid" | |||
There was a problem hiding this comment.
do not use sm-select but sui-select
|
|
||
| <table class="ui definition table" *ngIf="status && !loading"> | ||
| <tbody> | ||
| <tr *ngFor="let line of status.lines" [ngClass]="{'error': line.status=='AL', 'warning': line.status=='WARN', 'positive': line.status=='WARN'}"> | ||
| <td> | ||
| <tr *ngFor="let line of getStatusLines()" [ngClass]="{'error': line.status=='AL', 'warning': line.status=='WARN', 'positive': line.status=='WARN'}"> |
There was a problem hiding this comment.
avoid using function in ngIf/ngFor etc..
fsamin
requested changes
Sep 6, 2018
engine/api/workflow_queue.go
Outdated
|
|
||
| status, err := QueryStrings(r, "status") | ||
| if err != nil { | ||
| return sdk.WrapError(err, "getWorkflowJobQueueHandler> Cannot parse request") |
There was a problem hiding this comment.
in this case the error is not a sdk.Error and will be returned as a 500
you should do sdk.NewError(sdk.ErrWrongRequest, err)
yesnault
changed the title
fsamin
approved these changes
Sep 6, 2018
sguiheux
approved these changes
Sep 7, 2018
bnjjj
approved these changes
Sep 7, 2018
This was referenced Feb 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@ovh/cds