Commit cebacdad authored by Merzough Münker's avatar Merzough Münker
Browse files

fix: mv parameters member to abstract table data source

parent 72e6f6aa

libs/data-source/CHANGELOG

+4 −0
Original line number Diff line number Diff line 
# Changelog



## [0.3.31]

### Fixed

- mv parameters member to abstract table data source



## [0.3.30]

### Fixed

- replace all rxjs operators first() with take(1)

libs/data-source/http/table/src/lib/http-table.data-source.ts

+7 −3
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ import { 
  FilterLike,

  AbstractTableDataSourceMetadata,

  RxapAbstractTableDataSource,

  TableEvent

  TableEvent,

  RXAP_TABLE_DATA_SOURCE_PARAMETERS

} from '@rxap/data-source/table';

import {

  Injectable,
@@ -60,7 +61,7 @@ export interface HttpTableDataSourceMetadata extends AbstractTableDataSourceMeta 
export type TableEventToHttpOptionsFunction = (event: TableEvent) => HttpDataSourceOptions | Observable<HttpDataSourceOptions> | Promise<HttpDataSourceOptions>;



@Injectable()

export class HttpTableDataSource<Data extends Record<any, any>> extends AbstractTableDataSource<Data> {

export class HttpTableDataSource<Data extends Record<any, any>, Parameters = any> extends AbstractTableDataSource<Data> {



  constructor(

    @Inject(RXAP_TABLE_DATA_SOURCE)
@@ -78,10 +79,13 @@ export class HttpTableDataSource<Data extends Record<any, any>> extends Abstract 
    @Inject(RXAP_TABLE_DATA_SOURCE_FILTER)

      filter: FilterLike | null                    = null,

    @Optional()

    @Inject(RXAP_TABLE_DATA_SOURCE_PARAMETERS)

      parameters: Observable<Parameters> | null    = null,

    @Optional()

    @Inject(RXAP_DATA_SOURCE_METADATA)

      metadata: HttpTableDataSourceMetadata | null = dataSource.metadata

  ) {

    super(paginator, sort, filter, metadata);

    super(paginator, sort, filter, parameters, metadata);

    if (tableEventToHttpOptions) {

      this.tableEventToHttpOptions = tableEventToHttpOptions;

    }

libs/data-source/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "@rxap/data-source",

  "version": "0.3.30",

  "version": "0.3.31",

  "private": false,

  "author": "Merzough Münker",

  "homepage": "https://gitlab.com/rxap/packages",

libs/data-source/table/src/lib/abstract-table.data-source.ts

+11 −2
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ import { 
import {

  RXAP_TABLE_DATA_SOURCE_PAGINATOR,

  RXAP_TABLE_DATA_SOURCE_FILTER,

  RXAP_TABLE_DATA_SOURCE_SORT

  RXAP_TABLE_DATA_SOURCE_SORT,

  RXAP_TABLE_DATA_SOURCE_PARAMETERS

} from './tokens';

import {

  PaginatorLike,
@@ -51,7 +52,8 @@ export interface FilterLike { 


export interface AbstractTableDataSourceMetadata extends AbstractPaginationDataSourceMetadata {}



export abstract class AbstractTableDataSource<Data extends Record<any, any>> extends AbstractPaginationDataSource<Data> {

export abstract class AbstractTableDataSource<Data extends Record<any, any>, Parameters = any>

  extends AbstractPaginationDataSource<Data> {



  public get sortByColumn(): string | undefined {

    return this.sort?.active;
@@ -73,6 +75,7 @@ export abstract class AbstractTableDataSource<Data extends Record<any, any>> ext 


  public sort?: SortLike;

  public filter?: FilterLike;

  public parameters?: Observable<Parameters>;



  constructor(

    @Optional()
@@ -85,10 +88,16 @@ export abstract class AbstractTableDataSource<Data extends Record<any, any>> ext 
    @Inject(RXAP_TABLE_DATA_SOURCE_FILTER)

      filter: FilterLike | null                        = null,

    @Optional()

    @Inject(RXAP_TABLE_DATA_SOURCE_PARAMETERS)

      parameters: Observable<Parameters> | null        = null,

    @Optional()

    @Inject(RXAP_DATA_SOURCE_METADATA)

      metadata: AbstractTableDataSourceMetadata | null = null

  ) {

    super(paginator, metadata);

    if (parameters) {

      this.parameters = parameters;

    }

    if (sort) {

      this.sort = sort;

    }

libs/data-source/table/src/lib/dynamic-table.data-source.ts

+6 −9
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ import { TableDataSourceMetadata } from './table.data-source'; 
import {

  RXAP_TABLE_DATA_SOURCE_PAGINATOR,

  RXAP_TABLE_DATA_SOURCE_SORT,

  RXAP_TABLE_DATA_SOURCE_FILTER

  RXAP_TABLE_DATA_SOURCE_FILTER,

  RXAP_TABLE_DATA_SOURCE_PARAMETERS

} from './tokens';

import {

  Method,
@@ -64,9 +65,8 @@ export interface DynamicTableDataSourceViewer<Parameters> extends BaseDataSource 
}



@Injectable()

export class DynamicTableDataSource<Data extends Record<any, any> = any, Parameters = any> extends AbstractTableDataSource<Data> implements OnInit {



  public parameters?: Observable<Parameters>;

export class DynamicTableDataSource<Data extends Record<any, any> = any, Parameters = any>

  extends AbstractTableDataSource<Data, Parameters> implements OnInit {



  private _refresh$ = new BehaviorSubject<number>(Date.now());
@@ -84,16 +84,13 @@ export class DynamicTableDataSource<Data extends Record<any, any> = any, Paramet 
    @Inject(RXAP_TABLE_DATA_SOURCE_FILTER)

      filter: FilterLike | null                 = null,

    @Optional()

    @Inject(RXAP_TABLE_DATA_SOURCE_FILTER)

    @Inject(RXAP_TABLE_DATA_SOURCE_PARAMETERS)

      parameters: Observable<Parameters> | null = null,

    @Optional()

    @Inject(RXAP_DATA_SOURCE_METADATA)

      metadata: TableDataSourceMetadata | null  = remoteMethod.metadata

  ) {

    super(paginator, sort, filter, metadata);

    if (parameters) {

      this.parameters = parameters;

    }

    super(paginator, sort, filter, parameters, metadata);

  }



  public ngOnInit() {