From 4aba8edf234dfb528b91f99ceca4f5e0a9706601 Mon Sep 17 00:00:00 2001 From: Sofia Papacharalampous Date: Thu, 23 May 2024 15:45:49 +0300 Subject: [PATCH] refactor latest-activity in progress *added keyword info on url --- .../recent-edited-activity.component.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index 7e22c5833..9d703224d 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -117,6 +117,14 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } updateUrl() { + // let parameters = "" + + // (this.page != 1 ? "&page=" + this.page : "") + + // //TODO refactor + // // (((this.formGroup.get("order").value != this.order.UpdatedAt && !this.publicMode) || (this.formGroup.get("order").value != this.order.Published && this.publicMode)) ? "&order=" + this.formGroup.get("order").value : "") + + // (this.formGroup.get("like").value ? ("&keyword=" + this.formGroup.get("like").value) : ""); + // this.location.go(this.router.url.split('?')[0] + parameters); + + let parametersArray: string[] = [ ...(this.currentPage > 1 ? ["page=" + this.currentPage] : []), ...(this.formGroup.get("like").value ? ["&keyword=" + this.formGroup.get("like").value] : []) @@ -148,7 +156,8 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn ] }; - this.loadMore({ size: this.pageSize*this.currentPage, offset: 0 }, false); + const initItems = this.currentPage == 0; + this.loadMore({ size: initItems ? this.pageSize : this.pageSize*this.currentPage, offset: 0 }, initItems); } loadMore(page?: Lookup.Paging, updatePage: boolean = true) { @@ -195,6 +204,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn }) if (updatePage && response.length > 0 && this.listingItems.length >= this.currentPage*this.pageSize) this._setPage(this.currentPage+1); + else this.updateUrl(); }); }