Skip to content

Commit

Permalink
fix: renamed descriptions to description
Browse files Browse the repository at this point in the history
  • Loading branch information
klopfdreh committed May 22, 2023
1 parent cbc7b48 commit 56d2ebe
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions ui/src/app/shared/api/task.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class TaskService {
page: number,
size: number,
taskName?: string,
descriptions?: string,
description?: string,
dslText?: string,
sort?: string,
order?: string
Expand All @@ -34,8 +34,8 @@ export class TaskService {
if (taskName) {
params = params.append('taskName', taskName);
}
if (descriptions) {
params = params.append('description', descriptions);
if (description) {
params = params.append('description', description);
}
if (dslText) {
params = params.append('dslText', dslText);
Expand Down
6 changes: 3 additions & 3 deletions ui/src/app/tasks-jobs/tasks/tasks.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ <h1 class="page-title-actions">
<ng-container>{{ 'commons.name' | translate }}</ng-container>
</clr-dg-column>
<clr-dg-column
[clrDgField]="'descriptions'"
[clrDgSortOrder]="context.by === 'descriptions' ? (context.reverse ? -1 : 1) : 0"
[clrDgField]="'description'"
[clrDgSortOrder]="context.by === 'description' ? (context.reverse ? -1 : 1) : 0"
(clrDgColumnResize)="updateContext('sizeDescription', $event)"
[style.width.px]="context.sizeDescription | datagridcolumn: datagrid:contextName:15 | async"
[clrFilterValue]="context.descriptions"
[clrFilterValue]="context.description"
>
<ng-container>{{ 'commons.description' | translate }}</ng-container>
</clr-dg-column>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/tasks-jobs/tasks/tasks.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export class TasksComponent extends DatagridComponent {
params.current - 1,
params.size,
params?.taskName || '',
params?.descriptions || '',
params?.description || '',
params?.dslText || '',
`${params.by || ''}`,
`${params.reverse ? 'DESC' : 'ASC'}`
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/tests/api/task.service.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {delay, map} from 'rxjs/operators';
export class TaskServiceMock {
static mock: TaskServiceMock = null;

getTasks(page: number, size: number, taskName?: string, descriptions?: string, dslText?: string, sort?: string, order?: string): Observable<TaskPage> {
getTasks(page: number, size: number, taskName?: string, description?: string, dslText?: string, sort?: string, order?: string): Observable<TaskPage> {
return of(GET_TASKS).pipe(delay(1), map(TaskPage.parse));
}

Expand Down

0 comments on commit 56d2ebe

Please sign in to comment.