diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
index e57155ba4..460f9c2c9 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
@@ -20,36 +20,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.scss
index 89fce9593..4473f5e59 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.scss
@@ -1,26 +1,16 @@
-.content-container cdk-virtual-scroll-viewport {
- ::ng-deep.cdk-virtual-scroll-content-wrapper {
- grid-template-columns: 2fr 1fr 2fr 11px;
-
- .table-item {
- > div:not(.scrollbar-placeholder) {
- padding-left: 24px;
- }
-
- .color-wrapper {
- align-items: center;
-
- .color-square {
- width: 16px;
- height: 16px;
- min-width: 16px;
- }
- }
- }
+:host ::ng-deep iqser-table cdk-virtual-scroll-viewport .cdk-virtual-scroll-content-wrapper .table-item > div.cell {
+ &:not(.scrollbar-placeholder) {
+ padding-left: 24px;
}
- &.has-scrollbar:hover ::ng-deep.cdk-virtual-scroll-content-wrapper {
- grid-template-columns: 2fr 1fr 2fr;
+ &.color-wrapper {
+ align-items: center;
+
+ .color-square {
+ width: 16px;
+ height: 16px;
+ min-width: 16px;
+ }
}
}
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
index 3fdb6fe75..4b69deb9b 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit, TemplateRef, ViewChild } from '@angular/core';
import { AppStateService } from '@state/app-state.service';
import { Colors, DictionaryControllerService } from '@redaction/red-ui-http';
import { ActivatedRoute } from '@angular/router';
@@ -18,20 +18,16 @@ interface ListItem extends Listable {
templateUrl: './default-colors-screen.component.html',
styleUrls: ['./default-colors-screen.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
- providers: [...DefaultListingServices]
+ providers: [...DefaultListingServices, { provide: ListingComponent, useExisting: forwardRef(() => DefaultColorsScreenComponent) }]
})
export class DefaultColorsScreenComponent extends ListingComponent implements OnInit {
+ @ViewChild('nameTemplate', { static: true }) nameTemplate: TemplateRef;
+ @ViewChild('colorTemplate', { static: true }) colorTemplate: TemplateRef;
readonly circleButtonTypes = CircleButtonTypes;
readonly currentUser = this._userService.currentUser;
readonly translations = defaultColorsTranslations;
readonly tableHeaderLabel = _('default-colors-screen.table-header.title');
- readonly tableColumnConfigs: TableColumnConfig[] = [
- {
- label: _('default-colors-screen.table-col-names.key'),
- sortByKey: 'key'
- },
- { label: _('default-colors-screen.table-col-names.color'), class: 'flex-center' }
- ];
+ tableColumnConfigs: TableColumnConfig[];
protected readonly _primaryKey = 'key';
private _colorsObj: Colors;
@@ -49,6 +45,7 @@ export class DefaultColorsScreenComponent extends ListingComponent imp
}
async ngOnInit() {
+ this._configureTableColumns();
await this._loadColors();
}
@@ -68,6 +65,18 @@ export class DefaultColorsScreenComponent extends ListingComponent imp
);
}
+ private _configureTableColumns() {
+ this.tableColumnConfigs = [
+ {
+ label: _('default-colors-screen.table-col-names.key'),
+ sortByKey: 'key',
+ template: this.nameTemplate,
+ width: '2fr'
+ },
+ { label: _('default-colors-screen.table-col-names.color'), class: 'flex-center', template: this.colorTemplate }
+ ];
+ }
+
private async _loadColors() {
this._loadingService.start();
const data = await this._dictionaryControllerService.getColors(this._appStateService.activeDossierTemplateId).toPromise();
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
index 3ad73de7e..a050c77b9 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
@@ -87,21 +87,19 @@
-