From 3cf27e38c19f6728e4d2552ca826efe92a7cc92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 31 Aug 2023 00:55:06 +0300 Subject: [PATCH] Paginated entities service update, mat slider update --- src/assets/styles/common-slider.scss | 6 ++++++ src/lib/listing/services/paginated-entities.service.ts | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/common-slider.scss b/src/assets/styles/common-slider.scss index 6fb97b9..21d2ec6 100644 --- a/src/assets/styles/common-slider.scss +++ b/src/assets/styles/common-slider.scss @@ -13,8 +13,14 @@ --mdc-slider-disabled-handle-color: var(--iqser-primary); --mdc-slider-disabled-active-track-color: var(--iqser-grey-5); --mdc-slider-disabled-inactive-track-color: var(--iqser-grey-7); + --mdc-slider-label-container-color: var(--iqser-accent); + --mat-mdc-slider-value-indicator-opacity: 1; &.mdc-slider--disabled { opacity: 1; } } + +.mdc-slider__value-indicator-text { + white-space: nowrap; +} diff --git a/src/lib/listing/services/paginated-entities.service.ts b/src/lib/listing/services/paginated-entities.service.ts index 024259c..05a374d 100644 --- a/src/lib/listing/services/paginated-entities.service.ts +++ b/src/lib/listing/services/paginated-entities.service.ts @@ -12,10 +12,11 @@ import { mapEach } from '../../utils'; export class PaginatedEntitiesService< Interface, Class extends Interface & IListable, + Options, PrimaryKey extends Id = Class['id'], > extends EntitiesService { - loadPage(name = '', page = 0, size = 100): Observable { - return super._post<{ data: Interface[] }>({ page, size, name }).pipe( + loadPage(options: Options, page = 0, size = 100): Observable { + return super._post<{ data: Interface[] }>({ page, size, options }).pipe( map(response => response.data), mapEach(entity => (this._entityClass ? new this._entityClass(entity) : (entity as unknown as Class))), tap((entities: Class[]) => this.setEntities(entities)),