@c10t/nice-component-library 0.0.4-beta → 0.0.5-beta

package/components/base/base-search.component.d.ts

@@ -27,15 +27,15 @@ export declare class BaseSearchComponent extends BaseTableComponent implements O
     protected activatedRoute: ActivatedRoute;
     protected authoritiesService: AuthoritiesService;
     protected formGroup: FormGroup;
-    protected moduleName: string;
-    protected unsubscribe$: Subject<void>;
-    protected isResetPaging: boolean;
     isAdvancedSearch: boolean;
     searchForm: FormGroup;
     paging: TablePagingRequestModel;
     results: MatTableDataSource<BaseModel>;
     columns: ColumnModel[];
     config: NiceComponentLibraryConfig;
+    protected moduleName: string;
+    protected unsubscribe$: Subject<void>;
+    protected isResetPaging: boolean;
     constructor(router: Router, apiService: ApiService, utilsService: UtilsService, formStateService: FormStateService, translateService: TranslateService, injector: Injector, activatedRoute: ActivatedRoute, authoritiesService: AuthoritiesService, formGroup: FormGroup);
     ngOnInit(): void;
     ngAfterViewInit(): void;
@@ -43,9 +43,6 @@ export declare class BaseSearchComponent extends BaseTableComponent implements O
     onSubmit(): void;
     search(): void;
     afterSearch: (data: TablePagingResponseModel) => void;
-    private afterFillData;
-    private removeEmptyParams;
-    private updateHttpParams;
     _fillData(nativeUrl: string, params: HttpParams, baseUrl?: string): void;
     _fillDataByPostMethod(nativeUrl: string, obj: any, options: {
         headers?: HttpHeaders;
@@ -57,6 +54,9 @@ export declare class BaseSearchComponent extends BaseTableComponent implements O
     resetSearchFormValue(): void;
     toggleAdvancedSearch(): void;
     params2Object(params: HttpParams): Object;
+    private afterFillData;
+    private removeEmptyParams;
+    private updateHttpParams;
     static ɵfac: i0.ɵɵFactoryDeclaration<BaseSearchComponent, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<BaseSearchComponent, "BaseSearchComponent", never, {}, {}, never, never, false, never>;
 }

package/fesm2022/c10t-nice-component-library.mjs

@@ -241,9 +241,12 @@ class Authority {
 
 class TablePagingResponseModel {
     content = [];
-    size = null;
-    number = null;
-    totalElements = null;
+    page = {
+        size: null,
+        number: null,
+        totalElements: null,
+        totalPages: null,
+    };
 }
 
 class TablePagingRequestModel {
@@ -1139,15 +1142,15 @@ class BaseSearchComponent extends BaseTableComponent {
     activatedRoute;
     authoritiesService;
     formGroup;
-    moduleName = '';
-    unsubscribe$ = new Subject();
-    isResetPaging = true;
     isAdvancedSearch = false;
     searchForm;
     paging;
     results = new MatTableDataSource([]);
     columns = [];
     config;
+    moduleName = '';
+    unsubscribe$ = new Subject();
+    isResetPaging = true;
     constructor(router, apiService, utilsService, formStateService, translateService, injector, activatedRoute, authoritiesService, formGroup) {
         super(activatedRoute, authoritiesService);
         this.router = router;
@@ -1223,41 +1226,6 @@ class BaseSearchComponent extends BaseTableComponent {
     afterSearch = (data) => {
         // Form extends will be override custom by business
     };
-    afterFillData = (data) => {
-        this.isResetPaging = false;
-        if (data.content && data.content.length > 0) {
-            this.columns.forEach((column) => {
-                column.isShowHeader = false;
-            });
-        }
-        this.afterSearch(data);
-        this.results = new MatTableDataSource(data.content);
-        this.paging = new TablePagingRequestModel();
-        this.paging.pageSize = data.size ? data.size : 0;
-        this.paging.pageNumber = (data.number ? data.number : 0) + 1;
-        this.paging.totalElements = data.totalElements ? data.totalElements : 0;
-    };
-    removeEmptyParams(params) {
-        params.keys().forEach(key => {
-            const value = params.get(key) ? params.get(key) + '' : '';
-            if (value) {
-                params = params.set(key, value.trim());
-            }
-        });
-        const emptyValuesKey = params.keys().filter(key => !params.get(key));
-        emptyValuesKey.forEach(key => {
-            params = params.delete(key);
-        });
-        return params;
-    }
-    updateHttpParams(params) {
-        params = this.removeEmptyParams(params);
-        if (!params.keys().includes('pageNumber')) {
-            params = params.append('pageNumber', this.isResetPaging ? '1' : (this.paging ? this.paging.pageNumber.toString() : '1'))
-                .append('pageSize', this.paging ? this.paging.pageSize.toString() : this.config.PAGE_SIZE.toString());
-        }
-        return params;
-    }
     _fillData(nativeUrl, params, baseUrl) {
         params = this.updateHttpParams(params);
         this.apiService.get(nativeUrl, params, baseUrl).subscribe(this.afterFillData);
@@ -1307,6 +1275,41 @@ class BaseSearchComponent extends BaseTableComponent {
         });
         return result;
     }
+    afterFillData = (data) => {
+        this.isResetPaging = false;
+        if (data.content && data.content.length > 0) {
+            this.columns.forEach((column) => {
+                column.isShowHeader = false;
+            });
+        }
+        this.afterSearch(data);
+        this.results = new MatTableDataSource(data.content);
+        this.paging = new TablePagingRequestModel();
+        this.paging.pageSize = data.page.size ? data.page.size : 0;
+        this.paging.pageNumber = (data.page.number ? data.page.number : 0) + 1;
+        this.paging.totalElements = data.page.totalElements ? data.page.totalElements : 0;
+    };
+    removeEmptyParams(params) {
+        params.keys().forEach(key => {
+            const value = params.get(key) ? params.get(key) + '' : '';
+            if (value) {
+                params = params.set(key, value.trim());
+            }
+        });
+        const emptyValuesKey = params.keys().filter(key => !params.get(key));
+        emptyValuesKey.forEach(key => {
+            params = params.delete(key);
+        });
+        return params;
+    }
+    updateHttpParams(params) {
+        params = this.removeEmptyParams(params);
+        if (!params.keys().includes('pageNumber')) {
+            params = params.append('pageNumber', this.isResetPaging ? '1' : (this.paging ? this.paging.pageNumber.toString() : '1'))
+                .append('pageSize', this.paging ? this.paging.pageSize.toString() : this.config.PAGE_SIZE.toString());
+        }
+        return params;
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: BaseSearchComponent, deps: [{ token: i1$4.Router }, { token: ApiService }, { token: UtilsService }, { token: FormStateService }, { token: i1.TranslateService }, { token: i0.Injector }, { token: i1$4.ActivatedRoute }, { token: AuthoritiesService }, { token: i1$2.FormGroup }], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "19.1.5", type: BaseSearchComponent, isStandalone: false, selector: "BaseSearchComponent", usesInheritance: true, ngImport: i0 });
 }