[KON-583]
BugFixing
diff --git a/proxy.conf-integration.json b/proxy.conf-integration.json
index bc0c49b..27430d8 100644
--- a/proxy.conf-integration.json
+++ b/proxy.conf-integration.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://localhost:9155",
+ "target": "http://entdockergss:9155",
"secure": false,
"pathRewrite": {
"^/api": ""
diff --git a/src/app/pages/contacts/contacts-list/contacts-list.component.ts b/src/app/pages/contacts/contacts-list/contacts-list.component.ts
index 11ce7b8..d0cadd5 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.ts
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.ts
@@ -189,13 +189,14 @@
}
public searchContacts(event) {
- if (event.type == 'click' || event.type == 'change' || (event.type == 'keyup' && event.key == 'Enter')) {
+ if (event.type === 'change' || event.key === 'Enter') {
this.modifiedContacts = { ...this.modifiedContacts };
+ } else if (event.type == 'keyup') {
setTimeout(() => {
this.modifiedContacts = { ...this.modifiedContacts };
}, 1000);
- sessionStorage.setItem(Globals.SESSSION_STORAGE_KEYS.contactListSearchFilterKey, JSON.stringify(this.modifiedContacts));
}
+ sessionStorage.setItem(Globals.SESSSION_STORAGE_KEYS.contactListSearchFilterKey, JSON.stringify(this.modifiedContacts));
}
public sortContacts() {
diff --git a/src/app/shared/directives/agGrid/server-side.directive.ts b/src/app/shared/directives/agGrid/server-side.directive.ts
index 8a4f633..cd63059 100644
--- a/src/app/shared/directives/agGrid/server-side.directive.ts
+++ b/src/app/shared/directives/agGrid/server-side.directive.ts
@@ -37,6 +37,7 @@
host: {},
})
export class ServerSideDirective implements OnInit {
+ private _currentPageNumber: number;
private _queryParameter: any;
private _matPaginator: PaginatorComponent;
@@ -49,12 +50,12 @@
@Input()
public set queryParameter(query: any) {
+ this._currentPageNumber = 1;
this.appState$.dispatch(
this.serverside.loadAction({
payload: {
queryParameter: query,
pageSize: this.serverside.pageSize,
- pageNumber: this.serverside.pageNumber,
} as PageRequestInterface,
})
);
@@ -84,6 +85,8 @@
* @memberof ServerSideDirective
*/
ngOnInit() {
+ this._currentPageNumber = this.serverside.pageNumber;
+ this._retrievePage({ pageIndex: this.serverside.pageNumber });
this._actionsSubject
.pipe(
ofType(this.serverside.successAction.type),
@@ -97,14 +100,13 @@
if (this._matPaginator.totalPages !== pagedItem.totalPages) {
this._matPaginator.totalPages = pagedItem.totalPages;
}
-
+ this._matPaginator.currentPageNumber = this._currentPageNumber;
this._matPaginator.length = pagedItem.totalElements;
this._matPaginator.pageSize = pagedItem.pageable.pageSize || 1;
this._matPaginator.hidePageSize = false;
this._matPaginator.page.pipe(take(1)).subscribe((selectedPage: PageEvent) => {
this._retrievePage(selectedPage);
});
- this._matPaginator.currentPageNumber = this.serverside.pageNumber;
if (!!this._agGrid.api) {
this._agGrid.api.setRowData(pagedItem.content);
} else {
@@ -120,6 +122,7 @@
* @memberof ServerSideDirective
*/
private _retrievePage(event?: PageEvent) {
+ this._currentPageNumber = event.pageIndex;
this.currentPageNumber.emit(event.pageIndex);
this.appState$.dispatch(
this.serverside.loadAction({
diff --git a/src/app/shared/sandbox/base-list.sandbox.ts b/src/app/shared/sandbox/base-list.sandbox.ts
index 078643b..bc4440a 100644
--- a/src/app/shared/sandbox/base-list.sandbox.ts
+++ b/src/app/shared/sandbox/base-list.sandbox.ts
@@ -14,7 +14,7 @@
import { ServerSideModel } from '@shared/models/server-side.model';
export abstract class BaseListSandbox extends BaseSandbox {
- protected pageSize: number = 4;
+ protected pageSize: number = 10;
public serversideModel: ServerSideModel = new ServerSideModel();
public setCurrentPageNumber(pageNumber: number): void {
