From 0bc60a01875f1f34413f1be9d65e7284313d0347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Morin?= Date: Wed, 28 Feb 2024 22:51:00 -0500 Subject: [PATCH 1/2] Removed 250 and 1000 items/page options and set 10 as default value --- .../filtered-items/filtered-items.component.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts index 48fcfe1faa..529b2f1e15 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts @@ -71,7 +71,7 @@ export class FilteredItemsComponent { collections: this.formBuilder.control([''], []), presetQuery: this.formBuilder.control('new', []), queryPredicates: this.formBuilder.array(formQueryPredicates), - pageLimit: this.formBuilder.control('100', []), + pageLimit: this.formBuilder.control('10', []), filters: FiltersComponent.formGroup(this.formBuilder), additionalFields: this.formBuilder.control([], []) }); @@ -200,9 +200,7 @@ export class FilteredItemsComponent { OptionVO.item('10', '10'), OptionVO.item('25', '25'), OptionVO.item('50', '50'), - OptionVO.item('100', '100'), - OptionVO.item('250', '250'), - OptionVO.item('1000', '1000') + OptionVO.item('100', '100') ]; } @@ -293,6 +291,14 @@ export class FilteredItemsComponent { ); } + /*postFilteredItems(): Observable { + let form = this.queryForm.value; + let scheme = environment.rest.ssl ? 'https' : 'http'; + let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`; + let urlRequest = `${urlRestApp}/api/contentreport/filtereditems?page=${this.currentPage}&size=${this.pageSize()}`; + return this.restService.request(RestRequestMethod.POST, urlRequest, form); + }*/ + getFilteredItems(): Observable { let params = this.toQueryString(); if (params.length > 0) { From bb20b8d18a227ee33645e1ca2ba4b67fb19f9911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Morin?= Date: Thu, 29 Feb 2024 15:00:39 -0500 Subject: [PATCH 2/2] Cleaned obsolete code --- .../filtered-items/filtered-items.component.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts index 529b2f1e15..7fbf90565d 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts @@ -291,14 +291,6 @@ export class FilteredItemsComponent { ); } - /*postFilteredItems(): Observable { - let form = this.queryForm.value; - let scheme = environment.rest.ssl ? 'https' : 'http'; - let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`; - let urlRequest = `${urlRestApp}/api/contentreport/filtereditems?page=${this.currentPage}&size=${this.pageSize()}`; - return this.restService.request(RestRequestMethod.POST, urlRequest, form); - }*/ - getFilteredItems(): Observable { let params = this.toQueryString(); if (params.length > 0) {