diff --git a/npm/ng-packs/packages/core/src/lib/models/dtos.ts b/npm/ng-packs/packages/core/src/lib/models/dtos.ts index 70aad747b0..ee1f03fab3 100644 --- a/npm/ng-packs/packages/core/src/lib/models/dtos.ts +++ b/npm/ng-packs/packages/core/src/lib/models/dtos.ts @@ -21,6 +21,26 @@ export class PagedResultDto extends ListResultDto { } } +export class ExtensibleObject { + extraProperties?: ABP.Dictionary; + + constructor(initialValues: Partial = {}) { + for (const key in initialValues) { + if (checkHasProp(initialValues, key) && initialValues[key] !== undefined) { + this[key] = initialValues[key]; + } + } + } +} + +export class ExtensibleEntityDto extends ExtensibleObject { + id?: TKey; + + constructor(initialValues: Partial> = {}) { + super(initialValues); + } +} + export class LimitedResultRequestDto { maxResultCount = 10; @@ -33,6 +53,14 @@ export class LimitedResultRequestDto { } } +export class ExtensibleLimitedResultRequestDto extends ExtensibleEntityDto { + maxResultCount = 10; + + constructor(initialValues: Partial = {}) { + super(initialValues); + } +} + export class PagedResultRequestDto extends LimitedResultRequestDto { skipCount?: number; @@ -41,6 +69,14 @@ export class PagedResultRequestDto extends LimitedResultRequestDto { } } +export class ExtensiblePagedResultRequestDto extends ExtensibleLimitedResultRequestDto { + skipCount?: number; + + constructor(initialValues: Partial = {}) { + super(initialValues); + } +} + export class PagedAndSortedResultRequestDto extends PagedResultRequestDto { sorting?: string; @@ -49,6 +85,14 @@ export class PagedAndSortedResultRequestDto extends PagedResultRequestDto { } } +export class ExtensiblePagedAndSortedResultRequestDto extends ExtensiblePagedResultRequestDto { + sorting?: string; + + constructor(initialValues: Partial = {}) { + super(initialValues); + } +} + export class EntityDto { id?: TKey; @@ -127,26 +171,6 @@ export class FullAuditedEntityWithUserDto< } } -export class ExtensibleObject { - extraProperties?: ABP.Dictionary; - - constructor(initialValues: Partial = {}) { - for (const key in initialValues) { - if (checkHasProp(initialValues, key)) { - this[key] = initialValues[key]; - } - } - } -} - -export class ExtensibleEntityDto extends ExtensibleObject { - id?: TKey; - - constructor(initialValues: Partial> = {}) { - super(initialValues); - } -} - export class ExtensibleCreationAuditedEntityDto< TPrimaryKey = string, > extends ExtensibleEntityDto {