Merge branch 'unprotected' into 'master'

update master

See merge request fforesight/shared-ui-libraries/common-ui!15

.eslintrc.js

@@ -206,6 +206,7 @@ module.exports = {
             ],
             rules: {
                 'rxjs/no-ignored-subscription': 'error',
+                '@angular-eslint/prefer-standalone': 'off',
                 '@angular-eslint/directive-selector': [
                     'error',
                     {

.gitlab-ci.yml

@@ -0,0 +1,19 @@
+sonarqube:
+  stage: test
+  image:
+    name: sonarsource/sonar-scanner-cli:11.1
+    entrypoint:
+    - ''
+  variables:
+    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"
+    GIT_DEPTH: '0'
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+    - ".sonar/cache"
+  script:
+  - sonar-scanner
+  rules:
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+  - if: "$CI_COMMIT_BRANCH =~ /^release/"

sonar-project.properties

@@ -0,0 +1,2 @@
+sonar.projectKey=common-ui
+sonar.qualitygate.wait=false

src/assets/styles/common-components.scss

@@ -22,6 +22,14 @@
         font-size: var(--iqser-font-size);
     }
 
+    &.extra-small {
+        height: 16px;
+        width: 16px;
+        min-width: 16px;
+        font-size: 10px;
+        font-weight: lighter;
+    }
+
     &.gray-dark {
         background-color: var(--iqser-user-avatar-1);
         color: var(--iqser-text);

src/assets/styles/common-dialogs.scss

@@ -47,7 +47,10 @@
                 font-weight: bold;
                 padding-bottom: 8px;
             }
+        }
 
+        &.redaction,
+        &.force-annotation {
             iqser-details-radio {
                 padding-top: 20px;
             }

src/assets/styles/common-file-upload.scss

@@ -7,6 +7,7 @@
         width: 100%;
         box-sizing: border-box;
         background: var(--iqser-alt-background);
+        height: 68px;
 
         &.drag-over {
             background-color: var(--iqser-file-drop-drag-over);
@@ -15,7 +16,6 @@
 
     .upload-area {
         gap: 16px;
-        height: 88px;
         cursor: pointer;
         padding: 0 32px;
 
@@ -33,7 +33,6 @@
 
     .file-area {
         gap: 10px;
-        height: 48px;
 
         mat-icon:first-child {
             opacity: 0.5;

src/assets/styles/common-layout.scss

@@ -156,13 +156,15 @@ section.settings {
     box-sizing: border-box;
     background: var(--iqser-background);
     overflow: hidden;
-    transition:
-        width ease-in-out 0.2s,
-        min-width ease-in-out 0.2s;
+    &.with-transition {
+        transition:
+            width ease-in-out 0.2s,
+            min-width ease-in-out 0.2s;
+    }
+    @include common-mixins.scroll-bar;
 
     &:hover {
         overflow-y: auto;
-        @include common-mixins.scroll-bar;
     }
 
     .collapsed-wrapper {
@@ -254,6 +256,10 @@ section.settings {
     cursor: pointer;
 }
 
+.cursor-default {
+    cursor: default;
+}
+
 .fit-content {
     width: fit-content;
 }

src/assets/styles/common-utilities.scss

@@ -1,3 +1,5 @@
+@use 'sass:string';
+@use 'sass:list';
 /* Margins, paddings */
 
 $start: 0;
@@ -7,19 +9,19 @@ $values: '';
 $sides: (top, bottom, left, right);
 
 @for $i from $start + 1 through $end {
-    $values: append($values, $i, comma);
-    $values: set-nth($values, 1, $start);
+    $values: list.append($values, $i, comma);
+    $values: list.set-nth($values, 1, $start);
 }
 
 // TODO: Check if !important can be avoided
 
 @each $space in $values {
     @each $side in $sides {
-        .m#{str-slice($side, 0, 1)}-#{$space} {
+        .m#{string.slice($side, 0, 1)}-#{$space} {
             margin-#{$side}: #{$space}px !important;
         }
 
-        .p#{str-slice($side, 0, 1)}-#{$space} {
+        .p#{string.slice($side, 0, 1)}-#{$space} {
             padding-#{$side}: #{$space}px !important;
         }
     }

src/lib/buttons/chevron-button/chevron-button.component.ts

@@ -8,7 +8,6 @@ import { randomString } from '../../utils';
     templateUrl: './chevron-button.component.html',
     styleUrls: ['./chevron-button.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatIconModule, MatButtonModule],
 })
 export class ChevronButtonComponent {

src/lib/buttons/circle-button/circle-button.component.ts

@@ -24,7 +24,6 @@ import { CircleButtonType, CircleButtonTypes } from '../types/circle-button.type
     templateUrl: './circle-button.component.html',
     styleUrls: ['./circle-button.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatTooltipModule, MatIconModule, MatButtonModule, StopPropagationDirective],
 })
 export class CircleButtonComponent {

src/lib/buttons/icon-button/icon-button.component.ts

@@ -11,7 +11,6 @@ import { IconButtonType, IconButtonTypes } from '../types/icon-button.type';
     selector: 'iqser-icon-button',
     templateUrl: './icon-button.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [NgClass, MatButtonModule, MatIconModule, StopPropagationDirective],
 })
 export class IconButtonComponent {

src/lib/dialog/confirmation-dialog/confirmation-dialog.component.html

@@ -11,6 +11,10 @@
     }
 
     <div class="dialog-content">
+        @if (config.component) {
+            <ng-container #detailsComponent></ng-container>
+        }
+
         <p [class.heading]="isDeleteAction" [innerHTML]="config.question" class="mt-0 mb-8"></p>
         @if (config.details) {
             <p [innerHTML]="config.details" class="mt-0"></p>
@@ -35,14 +39,20 @@
         }
     </div>
 
-    <div class="dialog-actions">
-        <iqser-icon-button
-            (action)="confirm(confirmOption)"
-            [disabled]="(config.requireInput && confirmationDoesNotMatch()) || config.disableConfirm"
-            [label]="config.confirmationText"
-            [type]="iconButtonTypes.primary"
-            buttonId="confirm"
-        ></iqser-icon-button>
+    <div class="dialog-actions" [class.reverse]="config.cancelButtonPrimary">
+        @if (!config.cancelButtonPrimary) {
+            <iqser-icon-button
+                (action)="confirm(confirmOption)"
+                [disabled]="(config.requireInput && confirmationDoesNotMatch()) || config.disableConfirm"
+                [label]="config.confirmationText"
+                [type]="iconButtonTypes.primary"
+                buttonId="confirm"
+            ></iqser-icon-button>
+        } @else {
+            <div (click)="confirm(confirmOption)" class="all-caps-label cancel no-uppercase" id="confirm">
+                {{ config.confirmationText }}
+            </div>
+        }
 
         @if (config.alternativeConfirmationText) {
             <iqser-icon-button
@@ -60,9 +70,13 @@
         }
 
         @if (!config.discardChangesText) {
-            <div (click)="deny()" class="all-caps-label cancel">
-                {{ config.denyText }}
-            </div>
+            @if (config.cancelButtonPrimary) {
+                <iqser-icon-button (click)="deny()" [label]="config.denyText" [type]="iconButtonTypes.primary"></iqser-icon-button>
+            } @else {
+                <div (click)="deny()" class="all-caps-label cancel">
+                    {{ config.denyText }}
+                </div>
+            }
         }
     </div>
 

src/lib/dialog/confirmation-dialog/confirmation-dialog.component.scss

@@ -6,3 +6,12 @@
     display: flex;
     flex-direction: column;
 }
+
+.reverse {
+    flex-direction: row-reverse;
+    justify-content: flex-end;
+}
+
+.no-uppercase {
+    text-transform: unset;
+}

src/lib/dialog/confirmation-dialog/confirmation-dialog.component.ts

@@ -1,15 +1,24 @@
 import { NgTemplateOutlet } from '@angular/common';
-import { ChangeDetectionStrategy, Component, HostListener, inject, TemplateRef } from '@angular/core';
+import {
+    AfterViewInit,
+    ChangeDetectionStrategy,
+    Component,
+    HostListener,
+    inject,
+    TemplateRef,
+    Type,
+    viewChild,
+    ViewContainerRef,
+} from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { CircleButtonComponent } from '../../buttons/circle-button/circle-button.component';
-import { IconButtonComponent } from '../../buttons/icon-button/icon-button.component';
-import { IconButtonTypes } from '../../buttons/types/icon-button.type';
-import { ValuesOf } from '../../utils/types/utility-types';
+import { CircleButtonComponent, IconButtonTypes } from '../../buttons';
+import { IconButtonComponent } from '../../buttons';
+import { ValuesOf } from '../../utils';
 
 export const TitleColors = {
     DEFAULT: 'default',
@@ -48,6 +57,9 @@ interface InternalConfirmationDialogData {
     readonly checkboxes: CheckBox[];
     readonly checkboxesValidation: boolean;
     readonly toastMessage?: string;
+    readonly component?: Type<unknown>;
+    readonly componentInputs?: { [key: string]: unknown };
+    readonly cancelButtonPrimary?: boolean;
 }
 
 export type IConfirmationDialogData = Partial<InternalConfirmationDialogData>;
@@ -65,6 +77,9 @@ function getConfig(options?: IConfirmationDialogData): InternalConfirmationDialo
         denyText: options?.denyText ?? _('common.confirmation-dialog.deny'),
         checkboxes: options?.checkboxes ?? [],
         checkboxesValidation: typeof options?.checkboxesValidation === 'boolean' ? options.checkboxesValidation : true,
+        component: options?.component,
+        componentInputs: options?.componentInputs,
+        cancelButtonPrimary: options?.cancelButtonPrimary ?? false,
     };
 }
 
@@ -72,7 +87,6 @@ function getConfig(options?: IConfirmationDialogData): InternalConfirmationDialo
     templateUrl: './confirmation-dialog.component.html',
     styleUrls: ['./confirmation-dialog.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         MatIconModule,
         FormsModule,
@@ -84,13 +98,14 @@ function getConfig(options?: IConfirmationDialogData): InternalConfirmationDialo
         MatDialogModule,
     ],
 })
-export class ConfirmationDialogComponent {
+export class ConfirmationDialogComponent implements AfterViewInit {
     readonly config = getConfig(inject(MAT_DIALOG_DATA));
     inputValue = '';
     showToast = false;
     readonly inputLabel: string;
     readonly confirmOptions = ConfirmOptions;
     readonly iconButtonTypes = IconButtonTypes;
+    readonly detailsComponentRef = viewChild.required('detailsComponent', { read: ViewContainerRef });
 
     constructor(
         private readonly _dialogRef: MatDialogRef<ConfirmationDialogComponent, ConfirmOption>,
@@ -115,13 +130,19 @@ export class ConfirmationDialogComponent {
         return ConfirmOptions.CONFIRM;
     }
 
-    @HostListener('window:keyup.enter')
-    onKeyupEnter(): void {
-        if (this.config.requireInput && !this.confirmationDoesNotMatch()) {
-            this.confirm(ConfirmOptions.CONFIRM);
+    @HostListener('window:keyup.enter', ['$event'])
+    onKeyupEnter(event: KeyboardEvent): void {
+        event?.stopImmediatePropagation();
+        if (!this.config.requireInput || !this.confirmationDoesNotMatch()) {
+            if (!this.config.cancelButtonPrimary) this.confirm(ConfirmOptions.CONFIRM);
+            else this.deny();
         }
     }
 
+    ngAfterViewInit() {
+        this.#initializeDetailsComponent();
+    }
+
     confirmationDoesNotMatch(): boolean {
         return this.inputValue.toLowerCase() !== this.config.confirmationText.toLowerCase();
     }
@@ -156,9 +177,13 @@ export class ConfirmationDialogComponent {
         });
     }
 
-    @HostListener('window:keydown.Enter', ['$event'])
-    onEnter(event: KeyboardEvent): void {
-        event?.stopImmediatePropagation();
-        this.confirm(ConfirmOptions.CONFIRM);
+    #initializeDetailsComponent() {
+        if (!this.config.component) return;
+        const component = this.detailsComponentRef().createComponent(this.config.component);
+        if (this.config.componentInputs) {
+            for (const [key, value] of Object.entries(this.config.componentInputs)) {
+                (component.instance as any)[key] = value;
+            }
+        }
     }
 }

src/lib/dialog/iqser-dialog-component.directive.ts

@@ -22,6 +22,8 @@ export abstract class IqserDialogComponent<ComponentType, DataType = null, Retur
     readonly data = inject<DataType>(MAT_DIALOG_DATA);
     readonly dialog = inject(MatDialog);
     readonly form?: FormGroup;
+    readonly ignoredKeys: string[] = [];
+
     initialFormValue: Record<string, unknown> = {};
 
     constructor(private readonly _editMode = false) {
@@ -37,7 +39,7 @@ export abstract class IqserDialogComponent<ComponentType, DataType = null, Retur
     }
 
     get changed(): boolean {
-        return !this.form || hasFormChanged(this.form, this.initialFormValue);
+        return !this.form || hasFormChanged(this.form, this.initialFormValue, this.ignoredKeys);
     }
 
     get disabled(): boolean {

src/lib/directives/disable-stop-propagation.directive.ts

@@ -2,7 +2,6 @@ import { booleanAttribute, Directive, input } from '@angular/core';
 
 @Directive({
     selector: '[iqserDisableStopPropagation]',
-    standalone: true,
 })
 export class DisableStopPropagationDirective {
     readonly iqserDisableStopPropagation = input(true, { transform: booleanAttribute });

src/lib/directives/has-scrollbar.directive.ts

@@ -1,39 +1,35 @@
-import { ChangeDetectorRef, Directive, ElementRef, HostBinding, OnDestroy, OnInit } from '@angular/core';
+import { Directive, ElementRef, OnDestroy, OnInit, signal } from '@angular/core';
 
 @Directive({
     selector: '[iqserHasScrollbar]',
-    standalone: true,
+    host: {
+        '[class]': '_class()',
+    },
 })
 export class HasScrollbarDirective implements OnInit, OnDestroy {
-    @HostBinding('class') class = '';
     private readonly _resizeObserver: ResizeObserver;
+    protected readonly _class = signal('');
 
-    get hasScrollbar() {
-        const element = this._elementRef?.nativeElement as HTMLElement;
-        return element.clientHeight < element.scrollHeight;
-    }
-
-    constructor(
-        protected readonly _elementRef: ElementRef,
-        protected readonly _changeDetector: ChangeDetectorRef,
-    ) {
-        this._resizeObserver = new ResizeObserver(entry => {
+    constructor(protected readonly _elementRef: ElementRef) {
+        this._resizeObserver = new ResizeObserver(() => {
             this.process();
         });
 
         this._resizeObserver.observe(this._elementRef.nativeElement);
     }
 
+    private get _hasScrollbar() {
+        const element = this._elementRef?.nativeElement as HTMLElement;
+        return element.clientHeight < element.scrollHeight;
+    }
+
     ngOnInit() {
         setTimeout(() => this.process(), 0);
     }
 
     process() {
-        const newClass = this.hasScrollbar ? 'has-scrollbar' : '';
-        if (this.class !== newClass) {
-            this.class = newClass;
-            this._changeDetector.markForCheck();
-        }
+        const newClass = this._hasScrollbar ? 'has-scrollbar' : '';
+        this._class.set(newClass);
     }
 
     ngOnDestroy() {

src/lib/directives/hidden-action.directive.ts

@@ -2,7 +2,6 @@ import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/c
 
 @Directive({
     selector: '[iqserHiddenAction]',
-    standalone: true,
 })
 export class HiddenActionDirective {
     @Input() requiredClicks = 4;

src/lib/directives/prevent-default.directive.ts

@@ -3,7 +3,6 @@ import { NGXLogger } from 'ngx-logger';
 
 @Directive({
     selector: '[iqserPreventDefault]',
-    standalone: true,
 })
 export class PreventDefaultDirective {
     readonly #logger = inject(NGXLogger);

src/lib/directives/stop-propagation.directive.ts

@@ -4,7 +4,6 @@ import { DisableStopPropagationDirective } from './disable-stop-propagation.dire
 
 @Directive({
     selector: '[iqserStopPropagation]',
-    standalone: true,
 })
 export class StopPropagationDirective {
     readonly #disableStopPropagation = inject(DisableStopPropagationDirective, { optional: true });

src/lib/directives/sync-width.directive.ts

@@ -2,7 +2,6 @@ import { Directive, ElementRef, HostListener, Input, OnDestroy } from '@angular/
 
 @Directive({
     selector: '[iqserSyncWidth]',
-    standalone: true,
 })
 export class SyncWidthDirective implements OnDestroy {
     @Input() iqserSyncWidth!: string;

src/lib/empty-state/empty-state.component.ts

@@ -19,7 +19,6 @@ import { randomString } from '../utils/functions';
     templateUrl: './empty-state.component.html',
     styleUrls: ['./empty-state.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [NgStyle, MatIconModule, IconButtonComponent],
 })
 export class EmptyStateComponent {

src/lib/error/connection-status/connection-status.component.ts

@@ -17,6 +17,7 @@ import { ErrorService } from '../error.service';
         ]),
     ],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class ConnectionStatusComponent {
     protected readonly connectionStatusTranslations = connectionStatusTranslations;

src/lib/error/full-page-error/full-page-error.component.ts

@@ -8,6 +8,7 @@ import { CustomError, ErrorService, ErrorType } from '../error.service';
     templateUrl: './full-page-error.component.html',
     styleUrls: ['./full-page-error.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class FullPageErrorComponent {
     protected readonly iconButtonTypes = IconButtonTypes;

src/lib/filtering/filter-card/filter-card.component.html

@@ -14,7 +14,7 @@
 
     @if (primaryFilters$ | async; as filters) {
         <div class="filter-content">
-            @for (filter of filters; track filter) {
+            @for (filter of filters; track filter.id) {
                 <ng-container
                     [ngTemplateOutletContext]="{
                         filter: filter,
@@ -33,7 +33,7 @@
                 <div class="all-caps-label" translate="filter-menu.filter-options"></div>
             </div>
 
-            @for (filter of secondaryGroup.filters; track filter) {
+            @for (filter of secondaryGroup.filters; track filter.id) {
                 <ng-container
                     [ngTemplateOutletContext]="{
                         filter: filter,

src/lib/filtering/filter-card/filter-card.component.ts

@@ -37,7 +37,6 @@ const atLeastOneIsExpandable = pipe(
             },
         },
     ],
-    standalone: true,
     imports: [AsyncPipe, InputWithActionComponent, NgTemplateOutlet, TranslateModule, MatIcon, MatCheckbox, StopPropagationDirective],
 })
 export class FilterCardComponent implements OnInit {

src/lib/filtering/filter-utils.ts

@@ -16,6 +16,7 @@ function copySettings(oldFilters: INestedFilter[], newFilters: INestedFilter[])
         const newFilter = newFilters.find(f => f.id === filter.id);
         if (newFilter) {
             newFilter.checked = filter.checked;
+            newFilter.expanded = filter.expanded;
             newFilter.indeterminate = filter.indeterminate;
             if (filter.children && newFilter.children) {
                 copySettings(filter.children, newFilter.children);

src/lib/filtering/filter.service.ts

@@ -44,11 +44,6 @@ export class FilterService {
         this.showResetFilters$ = this._showResetFilters$;
     }
 
-    get noAnnotationsFilterChecked() {
-        const filterGroup = this.filterGroups.find(g => g.slug === 'primaryFilters');
-        return !!filterGroup?.filters[0]?.children.find(f => f.id === 'no-annotations-filter' && f.checked);
-    }
-
     get filterGroups(): IFilterGroup[] {
         return Object.values(this.#filterGroups$.getValue());
     }

src/lib/filtering/models/nested-filter.ts

@@ -8,8 +8,8 @@ export class NestedFilter extends Filter implements INestedFilter, IListable {
     disabled?: boolean;
     helpModeKey?: string;
     readonly children: Filter[];
-    readonly skipTranslation?: boolean;
-    readonly metadata?: Record<string, any>;
+    override readonly skipTranslation?: boolean;
+    override readonly metadata?: Record<string, any>;
 
     constructor(nestedFilter: INestedFilter) {
         super(nestedFilter);

src/lib/filtering/popup-filter/popup-filter.component.ts

@@ -29,7 +29,6 @@ import { IFilterGroup } from '../models/filter-group.model';
         StopPropagationDirective,
         MatMenuContent,
     ],
-    standalone: true,
 })
 export class PopupFilterComponent implements OnInit {
     @Input() primaryFiltersSlug!: string;

src/lib/filtering/quick-filters/quick-filters.component.html

@@ -1,5 +1,5 @@
 @if (quickFilters$ | async; as filters) {
-    @for (filter of filters; track filter) {
+    @for (filter of filters; track filter.id) {
         <div
             (click)="filterService.toggleFilter('quickFilters', filter.id)"
             [class.active]="filter.checked"

src/lib/filtering/quick-filters/quick-filters.component.ts

@@ -6,6 +6,7 @@ import { FilterService } from '../filter.service';
     templateUrl: './quick-filters.component.html',
     styleUrls: ['./quick-filters.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class QuickFiltersComponent {
     readonly quickFilters$ = this.filterService.getFilterModels$('quickFilters');

src/lib/filtering/simple-popup-filter/simple-popup-filter.component.ts

@@ -13,7 +13,6 @@ import { SimpleFilterOption } from '../models/simple-filter-option';
     selector: 'iqser-simple-popup-filter',
     templateUrl: './simple-popup-filter.component.html',
     styleUrls: ['./simple-popup-filter.component.scss'],
-    standalone: true,
     imports: [
         MatMenuModule,
         IconButtonComponent,

src/lib/filtering/single-filter/single-filter.component.ts

@@ -7,6 +7,7 @@ import { IFilter } from '../models/filter.model';
     selector: 'iqser-single-filter',
     templateUrl: './single-filter.component.html',
     styleUrls: ['./single-filter.component.scss'],
+    standalone: false,
 })
 export class SingleFilterComponent {
     @Input() filter!: IFilter;

src/lib/help-mode/help-button/help-button.component.scss

@@ -14,7 +14,7 @@
 
     &.active,
     &.dialog-toggle {
-        z-index: 1100;
+        z-index: 1200;
     }
 
     .toggle-input {

src/lib/help-mode/help-button/help-button.component.ts

@@ -10,7 +10,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
     selector: 'iqser-help-button',
     templateUrl: './help-button.component.html',
     styleUrls: ['./help-button.component.scss'],
-    standalone: true,
     imports: [MatIcon, MatTooltip],
 })
 export class HelpButtonComponent implements OnInit, OnDestroy {

src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.ts

@@ -12,7 +12,6 @@ const DEFAULT_CDK_OVERLAY_CONTAINER_ZINDEX = '800';
     templateUrl: './help-mode-dialog.component.html',
     styleUrls: ['./help-mode-dialog.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatCheckbox, CircleButtonComponent, TranslateModule],
 })
 export class HelpModeDialogComponent implements OnInit, OnDestroy {

src/lib/help-mode/help-mode.service.ts

@@ -242,6 +242,7 @@ export class HelpModeService {
                 const iframe: HTMLIFrameElement = document.getElementById(PDF_TRON_IFRAME_ID) as HTMLIFrameElement;
                 const iframeRect = iframe.getBoundingClientRect();
                 dimensions.y += iframeRect.top;
+                dimensions.x += iframeRect.left;
             }
 
             helper.helperElement.style.cssText = `

src/lib/help-mode/help-mode/help-mode.component.ts

@@ -3,7 +3,7 @@ import { HelpModeService } from '../help-mode.service';
 import { IqserEventTarget } from '../../utils';
 import { MatDialog } from '@angular/material/dialog';
 import { CircleButtonComponent, CircleButtonTypes } from '../../buttons';
-import { AsyncPipe, NgIf } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
@@ -11,8 +11,7 @@ import { TranslateModule } from '@ngx-translate/core';
     templateUrl: './help-mode.component.html',
     styleUrls: ['./help-mode.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
-    imports: [AsyncPipe, TranslateModule, NgIf, CircleButtonComponent],
+    imports: [AsyncPipe, TranslateModule, CircleButtonComponent],
 })
 export class HelpModeComponent {
     readonly circleButtonTypes = CircleButtonTypes;

src/lib/help-mode/utils/constants.ts

@@ -9,7 +9,7 @@ export const PDF_TRON_IFRAME_ID = 'webviewer-1';
 export const WEB_VIEWER_ELEMENTS = [
     {
         querySelector: '.HeaderItems',
-        documentKey: 'pdf_features',
+        documentKey: 'document_viewer_features',
     },
 ];
 
@@ -18,6 +18,7 @@ export const ScrollableParentViews = {
     ANNOTATIONS_LIST: 'ANNOTATIONS_LIST',
     SCM_EDIT_DIALOG: 'SCM_EDIT_DIALOG',
     WORKFLOW_VIEW: 'WORKFLOW_VIEW',
+    COMPONENTS_VIEW: 'COMPONENTS_VIEW',
 } as const;
 
 export const SCROLLABLE_PARENT_VIEWS_IDS = {
@@ -25,6 +26,7 @@ export const SCROLLABLE_PARENT_VIEWS_IDS = {
     ANNOTATIONS_LIST: 'annotations-list',
     SCM_EDIT_DIALOG: 'scm-edit',
     WORKFLOW_VIEW: 'workflow-view',
+    COMPONENTS_VIEW: 'components-view',
 } as const;
 
 export type ScrollableParentView = keyof typeof ScrollableParentViews;

src/lib/inputs/details-radio/details-radio-option.ts

@@ -1,19 +1,29 @@
-interface ExtraOption {
+interface AdditionalField {
     label: string;
-    checked: boolean;
+    description?: string;
+}
+
+interface AdditionalCheck extends AdditionalField {
+    checked?: boolean;
     hidden?: boolean;
     disabled?: boolean;
-    description?: string;
+}
+
+interface AdditionalInput extends AdditionalField {
+    value: string;
+    placeholder?: string;
+    errorCode?: string;
 }
 
 export interface DetailsRadioOption<I> {
     id?: string;
     label: string;
     description: string;
-    descriptionParams?: Record<string, string>;
+    descriptionParams?: Record<string, string | number>;
     icon?: string;
     value: I;
     disabled?: boolean;
     tooltip?: string;
-    extraOption?: ExtraOption;
+    additionalCheck?: AdditionalCheck;
+    additionalInput?: AdditionalInput;
 }

src/lib/inputs/details-radio/details-radio.component.html

@@ -14,29 +14,54 @@
                 <div class="icon-option">
                     <mat-icon [svgIcon]="option.icon" class="icon"></mat-icon>
                     <div class="text">
-                        <label class="details-radio-label pointer">{{ option.label | translate: option.descriptionParams }}</label>
+                        <label class="details-radio-label pointer">{{
+                            option.label | translate: option.descriptionParams | replaceNbsp
+                        }}</label>
 
                         <span class="hint">{{ option.description | translate: option.descriptionParams | replaceNbsp }}</span>
 
-                        @if (option.extraOption && !option.extraOption.hidden && isSelected(option)) {
-                            <div class="iqser-input-group">
-                                <mat-checkbox
-                                    (change)="emitExtraOption()"
-                                    [(ngModel)]="option.extraOption.checked"
-                                    [checked]="option.extraOption.checked"
-                                    [disabled]="!!option.extraOption.disabled"
-                                    color="primary"
-                                >
-                                    {{ option.extraOption.label | translate }}
-                                </mat-checkbox>
+                        @if (isSelected(option)) {
+                            @if (option.additionalCheck && !option.additionalCheck.hidden) {
+                                <div class="iqser-input-group w-450">
+                                    <mat-checkbox
+                                        (change)="emitExtraOption()"
+                                        [(ngModel)]="option.additionalCheck.checked"
+                                        [checked]="option.additionalCheck.checked"
+                                        [disabled]="!!option.additionalCheck.disabled"
+                                        color="primary"
+                                    >
+                                        {{ option.additionalCheck.label | translate | replaceNbsp }}
+                                    </mat-checkbox>
 
-                                @if (option.extraOption.description) {
-                                    <span
-                                        [innerHTML]="option.extraOption.description | translate"
-                                        class="hint extra-option-description"
-                                    ></span>
-                                }
-                            </div>
+                                    @if (option.additionalCheck.description) {
+                                        <span
+                                            [innerHTML]="option.additionalCheck.description | translate"
+                                            class="hint additional-check-description"
+                                        ></span>
+                                    }
+                                </div>
+                            }
+
+                            @if (option.additionalInput) {
+                                <div class="iqser-input-group w-full additional-input">
+                                    <span class="label"> {{ option.additionalInput.label | translate }} </span>
+                                    <div class="flex-column">
+                                        <input
+                                            [(ngModel)]="option.additionalInput.value"
+                                            [ngClass]="{ error: additionalInputTouched && hasError(option.additionalInput.errorCode) }"
+                                            [placeholder]="
+                                                option.additionalInput.placeholder ? (option.additionalInput.placeholder | translate) : ''
+                                            "
+                                            (blur)="additionalInputTouched = true"
+                                            (focus)="additionalInputTouched = false"
+                                            (keydown)="emitExtraOption()"
+                                        />
+                                        @if (option.additionalInput.description) {
+                                            <span class="hint" [innerHTML]="option.additionalInput.description | translate"></span>
+                                        }
+                                    </div>
+                                </div>
+                            }
                         }
                     </div>
 
@@ -48,10 +73,10 @@
                 <div class="flex-align-items-center mb-8">
                     <iqser-round-checkbox [active]="isSelected(option)" class="mr-6"></iqser-round-checkbox>
 
-                    <label class="details-radio-label pointer">{{ option.label | translate }}</label>
+                    <label class="details-radio-label pointer">{{ option.label | translate | replaceNbsp }}</label>
                 </div>
 
-                <span class="hint">{{ option.description | translate }}</span>
+                <span class="hint">{{ option.description | translate | replaceNbsp }}</span>
             }
         </div>
     }

src/lib/inputs/details-radio/details-radio.component.scss

@@ -43,10 +43,44 @@ label {
         }
     }
 
-    .extra-option-description {
+    .additional-check-description {
         margin-left: 23px;
         opacity: 0.49;
     }
+
+    .additional-input {
+        display: flex;
+        flex-direction: row;
+        gap: 10px;
+
+        span {
+            margin-top: 8px;
+            font-size: 12px;
+        }
+
+        div {
+            .error {
+                border-color: var(--iqser-red-1);
+            }
+
+            display: flex;
+
+            span {
+                font-size: 10px;
+                margin-top: 4px;
+            }
+        }
+
+        .flex-column {
+            flex: 1;
+
+            input {
+                width: 232px;
+                min-height: 30px;
+                height: 30px;
+            }
+        }
+    }
 }
 
 .row {

src/lib/inputs/details-radio/details-radio.component.ts

@@ -14,7 +14,6 @@ import { DetailsRadioOption } from './details-radio-option';
     selector: 'iqser-details-radio',
     templateUrl: './details-radio.component.html',
     styleUrls: ['./details-radio.component.scss'],
-    standalone: true,
     providers: [
         {
             provide: NG_VALUE_ACCESSOR,
@@ -42,8 +41,8 @@ import { DetailsRadioOption } from './details-radio-option';
 export class DetailsRadioComponent<I> extends FormFieldComponent<DetailsRadioOption<I>> {
     readonly options = input.required<DetailsRadioOption<I>[]>();
     readonly displayInRow = input(false, { transform: booleanAttribute });
-
     readonly extraOptionChanged = output<DetailsRadioOption<I>>();
+    additionalInputTouched = false;
 
     toggleOption(option: DetailsRadioOption<I>) {
         if (option.value !== this._value?.value && !option.disabled) {

src/lib/inputs/dynamic-input/dynamic-input.component.ts

@@ -23,7 +23,6 @@ type DynamicInput = number | string | Date;
     templateUrl: './dynamic-input.component.html',
     styleUrls: ['./dynamic-input.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     providers: [
         {
             provide: NG_VALUE_ACCESSOR,
@@ -51,7 +50,7 @@ export class DynamicInputComponent extends FormFieldComponent<DynamicInput> {
     readonly isNumber = computed(() => this.type() === InputTypes.NUMBER);
     readonly isText = computed(() => this.type() === InputTypes.TEXT);
 
-    writeValue(input: DynamicInput): void {
+    override writeValue(input: DynamicInput): void {
         this.input.set(input);
     }
 

src/lib/inputs/editable-input/editable-input.component.ts

@@ -8,7 +8,6 @@ import { CircleButtonType, CircleButtonTypes } from '../../buttons/types/circle-
     templateUrl: './editable-input.component.html',
     styleUrls: ['./editable-input.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [CircleButtonComponent, FormsModule],
     host: {
         '[class.editing]': '_editing()',

src/lib/inputs/form-field/form-field-component.directive.ts

@@ -1,19 +1,47 @@
-import { ChangeDetectorRef, Directive, inject } from '@angular/core';
-import { ControlValueAccessor, ValidationErrors, Validator } from '@angular/forms';
+import { ChangeDetectorRef, Directive, inject, Injector, OnInit } from '@angular/core';
+import {
+    ControlValueAccessor,
+    FormControl,
+    FormControlDirective,
+    FormControlName,
+    FormGroupDirective,
+    NgControl,
+    ValidationErrors,
+    Validator,
+} from '@angular/forms';
 
 @Directive()
-export abstract class FormFieldComponent<I> implements ControlValueAccessor, Validator {
+export abstract class FormFieldComponent<I> implements ControlValueAccessor, Validator, OnInit {
     touched = false;
     disabled = false;
 
     protected readonly _changeRef = inject(ChangeDetectorRef);
+    protected readonly _injector = inject(Injector);
 
+    protected _formControl: FormControl | undefined;
     protected _value: I | undefined;
 
     get value(): I | undefined {
         return this._value;
     }
 
+    ngOnInit() {
+        const ngControl = this._injector.get(NgControl);
+
+        if (ngControl instanceof FormControlName) {
+            this._formControl = this._injector.get(FormGroupDirective).getControl(ngControl);
+        } else {
+            this._formControl = (ngControl as FormControlDirective).form as FormControl;
+        }
+    }
+
+    hasError(errorCode: string | undefined): boolean {
+        if (errorCode && this._formControl) {
+            return this._formControl.hasError(errorCode);
+        }
+        return false;
+    }
+
     // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
     onChange = (value?: I) => {};
 

src/lib/inputs/input-with-action/input-with-action.component.ts

@@ -10,7 +10,6 @@ import { randomString } from '../../utils/functions';
     templateUrl: './input-with-action.component.html',
     styleUrls: ['./input-with-action.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [FormsModule, MatIconModule, CircleButtonComponent],
 })
 export class InputWithActionComponent {

src/lib/inputs/round-checkbox/round-checkbox.component.ts

@@ -6,7 +6,6 @@ import { MatIconModule } from '@angular/material/icon';
     templateUrl: './round-checkbox.component.html',
     styleUrls: ['./round-checkbox.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatIconModule],
 })
 export class RoundCheckboxComponent {

src/lib/listing/page-header/models/action-config.model.ts

@@ -1,9 +1,10 @@
 import { BaseHeaderConfig } from './base-config.model';
 import { Observable } from 'rxjs';
-import { OverlappingElement } from '../../../help-mode';
 
 export interface ActionConfig extends BaseHeaderConfig {
     readonly action: ($event: MouseEvent) => void;
     readonly helpModeKey?: string;
     readonly disabled$?: Observable<boolean>;
+    readonly disabled?: boolean;
+    readonly disableStopPropagation?: boolean;
 }

src/lib/listing/page-header/models/button-config.model.ts

@@ -3,4 +3,5 @@ import { ActionConfig } from './action-config.model';
 
 export interface ButtonConfig extends ActionConfig {
     readonly type?: IconButtonType;
+    readonly tooltip?: string;
 }

src/lib/listing/page-header/page-header.component.html

@@ -46,11 +46,14 @@
                 @if (!config.hide) {
                     <iqser-icon-button
                         (action)="config.action($event)"
-                        [buttonId]="(config.label | translate).replace('.', '-')"
+                        [buttonId]="config.label.replace('.', '-')"
                         [icon]="config.icon"
                         [label]="config.label | translate"
                         [type]="config.type"
+                        [matTooltip]="(config.tooltip | translate) ?? ''"
+                        [disabled]="config.disabled"
                         [attr.help-mode-key]="config.helpModeKey"
+                        matTooltipPosition="above"
                     ></iqser-icon-button>
                 }
             }
@@ -60,10 +63,11 @@
                         <iqser-circle-button
                             (action)="config.action($event)"
                             [buttonId]="config.id"
-                            [disabled]="config.disabled$ && (config.disabled$ | async)"
+                            [disabled]="config.disabled"
                             [icon]="config.icon"
                             [tooltip]="config.label | translate"
                             [attr.help-mode-key]="config.helpModeKey"
+                            [iqserDisableStopPropagation]="config.disableStopPropagation"
                         ></iqser-circle-button>
                     }
                 }

src/lib/listing/page-header/page-header.component.ts

@@ -15,13 +15,14 @@ import { filterEach } from '../../utils';
 import { List } from '../../utils';
 import { IListable } from '../models';
 import { ActionConfig, ButtonConfig, SearchPosition, SearchPositions } from './models';
+import { MatTooltip } from '@angular/material/tooltip';
+import { DisableStopPropagationDirective } from '../../directives';
 
 @Component({
     selector: 'iqser-page-header',
     templateUrl: './page-header.component.html',
     styleUrls: ['./page-header.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         AsyncPipe,
         NgTemplateOutlet,
@@ -31,6 +32,8 @@ import { ActionConfig, ButtonConfig, SearchPosition, SearchPositions } from './m
         CircleButtonComponent,
         TranslateModule,
         InputWithActionComponent,
+        MatTooltip,
+        DisableStopPropagationDirective,
     ],
 })
 export class PageHeaderComponent<T extends IListable> {

src/lib/listing/scroll-button/scroll-button.component.ts

@@ -18,7 +18,6 @@ type ButtonType = keyof typeof ButtonTypes;
     templateUrl: './scroll-button.component.html',
     styleUrls: ['./scroll-button.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [AsyncPipe, MatIcon],
 })
 export class ScrollButtonComponent implements OnInit {

src/lib/listing/services/active-listing-entity.service.ts

@@ -1,13 +0,0 @@
-import { Injectable, signal } from '@angular/core';
-
-@Injectable({
-    providedIn: 'root',
-})
-export class ActiveListingEntityService {
-    readonly #activeEntity = signal<string>('');
-    readonly activeEntity = this.#activeEntity.asReadonly();
-
-    updateEntity(entity: string = '') {
-        this.#activeEntity.set(entity);
-    }
-}

src/lib/listing/services/listing.service.ts

@@ -52,7 +52,7 @@ export class ListingService<Class extends IListable<PrimaryKey>, PrimaryKey exte
 
     get selected(): Class[] {
         const selectedIds = this.selectedIds;
-        return this._entitiesService.all.filter(a => selectedIds.includes(a.id));
+        return selectedIds.map(id => this._entitiesService.all.find(a => a.id === id)).filter(a => !!a);
     }
 
     get selectedIds(): PrimaryKey[] {

src/lib/listing/table-column-name/table-column-name.component.ts

@@ -12,7 +12,6 @@ import { Id, IListable } from '../models';
     templateUrl: './table-column-name.component.html',
     styleUrls: ['./table-column-name.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatIcon, MatTooltip, TranslateModule, AsyncPipe, NgClass],
 })
 export class TableColumnNameComponent<T extends IListable<PrimaryKey>, PrimaryKey extends Id = T['id']> {

src/lib/listing/table-content/table-content.component.html

@@ -11,35 +11,33 @@
             <!-- mouseenter and mouseleave triggers change detection event if itemMouse functions are undefined -->
             <!-- this little hack below ensures that change detection won't be triggered if functions are undefined -->
             @if (itemMouseEnterFn || itemMouseLeaveFn) {
-                <div
+                <a
                     (mouseenter)="itemMouseEnterFn && itemMouseEnterFn(entity)"
                     (mouseleave)="itemMouseLeaveFn && itemMouseLeaveFn(entity)"
                     [class.help-mode-active]="helpModeService?.isHelpModeActive$ | async"
-                    [class.active-entity]="activeListingEntityService.activeEntity() === entity.id"
                     [id]="rowIdPrefix + '-' + ((entity[namePropertyKey] | snakeCase) ?? entity.id)"
                     [ngClass]="getTableItemClasses(entity)"
                     [routerLink]="entity.routerLink"
                 >
                     <iqser-table-item
                         (click)="multiSelect(entity, $event)"
-                        [entity]="entity"
+                        [entity]="$any(entity)"
                         [selectionEnabled]="selectionEnabled"
                     ></iqser-table-item>
-                </div>
+                </a>
             } @else {
-                <div
+                <a
                     [class.help-mode-active]="helpModeService?.isHelpModeActive$ | async"
-                    [class.active-entity]="activeListingEntityService.activeEntity() === entity.id"
                     [id]="rowIdPrefix + '-' + ((entity[namePropertyKey] | snakeCase) ?? entity.id)"
                     [ngClass]="getTableItemClasses(entity)"
                     [routerLink]="entity.routerLink"
                 >
                     <iqser-table-item
                         (click)="multiSelect(entity, $event)"
-                        [entity]="entity"
+                        [entity]="$any(entity)"
                         [selectionEnabled]="selectionEnabled"
                     ></iqser-table-item>
-                </div>
+                </a>
             }
         </ng-container>
     </cdk-virtual-scroll-viewport>

src/lib/listing/table-content/table-content.component.scss

@@ -2,7 +2,7 @@
 
 :host cdk-virtual-scroll-viewport {
     height: calc(100vh - 50px - 31px - var(--iqser-top-bar-height) - 50px);
-    overflow-y: hidden !important;
+    overflow-y: auto !important;
     background-color: var(--iqser-background);
     @include mixins.scroll-bar;
 
@@ -33,7 +33,7 @@
             }
 
             &:hover,
-            &.active-entity,
+            &:has(iqser-circle-button[aria-expanded='true']),
             &.help-mode-active {
                 .selection-column iqser-round-checkbox .wrapper {
                     opacity: 1;
@@ -72,3 +72,8 @@
 .display-contents {
     display: contents;
 }
+
+a {
+    display: contents;
+    @include mixins.clear-a;
+}

src/lib/listing/table-content/table-content.component.ts

@@ -15,13 +15,11 @@ import { IListable } from '../models/listable';
 import { Id } from '../models/trackable';
 import { ListingService } from '../services/listing.service';
 import { TableItemComponent } from './table-item/table-item.component';
-import { ActiveListingEntityService } from '../services/active-listing-entity.service';
 
 @Component({
     selector: 'iqser-table-content',
     templateUrl: './table-content.component.html',
     styleUrls: ['./table-content.component.scss'],
-    standalone: true,
     imports: [
         CdkVirtualScrollViewport,
         AsyncPipe,
@@ -54,7 +52,6 @@ export class TableContentComponent<Class extends IListable<PrimaryKey>, PrimaryK
     constructor(
         @Inject(forwardRef(() => ListingComponent)) readonly listingComponent: ListingComponent<Class>,
         readonly listingService: ListingService<Class>,
-        readonly activeListingEntityService: ActiveListingEntityService,
         @Optional() readonly helpModeService: HelpModeService,
     ) {
         super();
@@ -89,7 +86,7 @@ export class TableContentComponent<Class extends IListable<PrimaryKey>, PrimaryK
     getTableItemClasses(entity: Class): Record<string, boolean> {
         const classes: Record<string, boolean> = {
             'table-item': true,
-            pointer: !!entity.routerLink && entity.routerLink.length > 0,
+            'cursor-default': !entity.routerLink,
         };
         for (const key in this.tableItemClasses) {
             if (Object.prototype.hasOwnProperty.call(this.tableItemClasses, key)) {

src/lib/listing/table-content/table-item/table-item.component.ts

@@ -12,7 +12,6 @@ import { ListingService } from '../../services/listing.service';
     templateUrl: './table-item.component.html',
     styleUrls: ['./table-item.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [RoundCheckboxComponent, AsyncPipe, NgTemplateOutlet],
 })
 export class TableItemComponent<T extends IListable> implements OnChanges {
@@ -34,6 +33,7 @@ export class TableItemComponent<T extends IListable> implements OnChanges {
 
     toggleEntitySelected($event: MouseEvent, entity: T): void {
         $event.stopPropagation();
+        $event.preventDefault();
         this.listingService.select(entity, $event.shiftKey);
     }
 }

src/lib/listing/table-header/table-header.component.ts

@@ -13,7 +13,6 @@ import { TableColumnNameComponent } from '../table-column-name/table-column-name
     templateUrl: './table-header.component.html',
     styleUrls: ['./table-header.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         RoundCheckboxComponent,
         AsyncPipe,

src/lib/listing/table/table.component.ts

@@ -28,7 +28,6 @@ const SCROLLBAR_WIDTH = 11;
     selector: 'iqser-table [tableColumnConfigs] [itemSize]',
     templateUrl: './table.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [TableHeaderComponent, NgTemplateOutlet, AsyncPipe, EmptyStateComponent, ScrollButtonComponent, TableContentComponent],
 })
 export class TableComponent<Class extends IListable<PrimaryKey>, PrimaryKey extends Id = Class['id']> implements OnChanges {
@@ -87,18 +86,17 @@ export class TableComponent<Class extends IListable<PrimaryKey>, PrimaryKey exte
     }
 
     private _setColumnsWidth(element: HTMLElement) {
-        let gridTemplateColumnsHover = '';
+        let gridTemplateColumns = '';
         if (this.selectionEnabled) {
-            gridTemplateColumnsHover += '30px ';
+            gridTemplateColumns += '30px ';
         }
         for (const config of this.tableColumnConfigs) {
-            gridTemplateColumnsHover += `${config.width || '1fr'} `;
+            gridTemplateColumns += `${config.width || '1fr'} `;
         }
-        gridTemplateColumnsHover += this.emptyColumnWidth || '';
-        const gridTemplateColumns = `${gridTemplateColumnsHover} ${SCROLLBAR_WIDTH}px`;
+        gridTemplateColumns += this.emptyColumnWidth || '';
+        gridTemplateColumns = `${gridTemplateColumns} ${SCROLLBAR_WIDTH}px`;
 
         element.style.setProperty('--gridTemplateColumns', gridTemplateColumns);
-        element.style.setProperty('--gridTemplateColumnsHover', gridTemplateColumnsHover);
     }
 
     private _setItemSize(element: HTMLElement) {

src/lib/listing/workflow/column-header/column-header.component.ts

@@ -36,7 +36,6 @@ interface ColumnHeaderContext {
     templateUrl: './column-header.component.html',
     styleUrls: ['./column-header.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [AsyncPipe, TranslateModule, RoundCheckboxComponent, NgTemplateOutlet, CircleButtonComponent],
 })
 export class ColumnHeaderComponent<T extends IListable, K extends string> extends ContextComponent<ColumnHeaderContext> implements OnInit {

src/lib/listing/workflow/workflow.component.scss

@@ -1,5 +1,5 @@
-@import '../../../assets/styles/common-variables';
-@import '../../../assets/styles/common-mixins';
+@use '../../../assets/styles/common-variables';
+@use '../../../assets/styles/common-mixins' as mixins;
 
 :host {
     display: flex;
@@ -67,7 +67,7 @@
 
 .cdk-drop-list {
     overflow-y: auto;
-    @include no-scroll-bar;
+    @include mixins.no-scroll-bar;
     min-height: calc(100% - 36px);
 
     &.multi-select-active {
@@ -135,5 +135,5 @@
 
 cdk-virtual-scroll-viewport {
     height: 100%;
-    @include no-scroll-bar;
+    @include mixins.no-scroll-bar;
 }

src/lib/listing/workflow/workflow.component.ts

@@ -50,7 +50,6 @@ interface WorkflowContext<T> {
     templateUrl: './workflow.component.html',
     styleUrls: ['./workflow.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [
         TableHeaderComponent,
         AsyncPipe,

src/lib/loading/full-page-loading-indicator/full-page-loading-indicator.component.ts

@@ -5,6 +5,7 @@ import { LoadingService } from '../loading.service';
     selector: 'iqser-full-page-loading-indicator',
     templateUrl: './full-page-loading-indicator.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class FullPageLoadingIndicatorComponent {
     constructor(readonly loadingService: LoadingService) {}

src/lib/loading/progress-bar/progress-bar.component.ts

@@ -1,15 +1,16 @@
-import { ChangeDetectionStrategy, Component, Input, Optional, OnInit } from '@angular/core';
-import { ProgressBarConfigModel } from './progress-bar-config.model';
-import { FilterService, INestedFilter } from '../../filtering';
+import { ChangeDetectionStrategy, Component, Input, OnInit, Optional } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { get, shareLast } from '../../utils';
 import { map } from 'rxjs/operators';
+import { FilterService, INestedFilter } from '../../filtering';
+import { get, shareLast } from '../../utils';
+import { ProgressBarConfigModel } from './progress-bar-config.model';
 
 @Component({
     selector: 'iqser-progress-bar [config]',
     templateUrl: './progress-bar.component.html',
     styleUrls: ['./progress-bar.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class ProgressBarComponent implements OnInit {
     @Input() config!: ProgressBarConfigModel;

src/lib/loading/progress-loading/progress-loading.component.ts

@@ -6,6 +6,7 @@ import { ILoadingConfig } from '../loading.service';
     templateUrl: './progress-loading.component.html',
     styleUrls: ['./progress-loading.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class ProgressLoadingComponent {
     @Input() config!: ILoadingConfig;

src/lib/pagination/pagination.component.ts

@@ -7,7 +7,6 @@ import { PaginationSettings } from './pagination-settings';
     selector: 'iqser-pagination',
     templateUrl: './pagination.component.html',
     styleUrls: ['./pagination.component.scss'],
-    standalone: true,
     changeDetection: ChangeDetectionStrategy.OnPush,
     imports: [TranslateModule],
 })

src/lib/permissions/directives/allow.directive.ts

@@ -6,7 +6,6 @@ import { assertTemplate, IqserPermissionsDirective } from './permissions.directi
 
 @Directive({
     selector: '[allow]',
-    standalone: true,
 })
 export class IqserAllowDirective extends IqserPermissionsDirective implements OnDestroy, OnInit {
     /**

src/lib/permissions/directives/deny.directive.ts

@@ -6,7 +6,6 @@ import { assertTemplate, IqserPermissionsDirective } from './permissions.directi
 
 @Directive({
     selector: '[deny]',
-    standalone: true,
 })
 export class IqserDenyDirective extends IqserPermissionsDirective implements OnDestroy, OnInit {
     /**

src/lib/permissions/utils.ts

@@ -29,7 +29,7 @@ export function isArray<T>(value: unknown): value is T[] {
 }
 
 export function toArray(value?: string | List): List {
-    return isString(value) ? [value] : value ?? [];
+    return isString(value) ? [value] : (value ?? []);
 }
 
 export function isRedirectWithParameters(object: any | IqserRedirectToNavigationParameters): object is IqserRedirectToNavigationParameters {

src/lib/pipes/capitalize.pipe.ts

@@ -3,7 +3,6 @@ import { capitalize } from '../utils';
 
 @Pipe({
     name: 'capitalize',
-    standalone: true,
 })
 export class CapitalizePipe implements PipeTransform {
     transform(value: string): string {

src/lib/pipes/humanize-camel-case.pipe.ts

@@ -3,7 +3,6 @@ import { humanizeCamelCase } from '../utils';
 
 @Pipe({
     name: 'humanizeCamelCase',
-    standalone: true,
 })
 export class HumanizeCamelCasePipe implements PipeTransform {
     transform(item: string): string {

src/lib/pipes/humanize.pipe.ts

@@ -3,7 +3,6 @@ import { humanize } from '../utils';
 
 @Pipe({
     name: 'humanize',
-    standalone: true,
 })
 export class HumanizePipe implements PipeTransform {
     transform(item: string, lowercase = false): string {

src/lib/pipes/log.pipe.ts

@@ -2,7 +2,6 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
     name: 'log',
-    standalone: true,
 })
 export class LogPipe implements PipeTransform {
     transform<T>(value: T, message = ''): T {

src/lib/pipes/replace-nbsp.pipe.ts

@@ -2,7 +2,6 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
     name: 'replaceNbsp',
-    standalone: true,
 })
 export class ReplaceNbspPipe implements PipeTransform {
     transform(value: string): string {

src/lib/pipes/size.pipe.ts

@@ -3,7 +3,6 @@ import { size } from '../utils';
 
 @Pipe({
     name: 'size',
-    standalone: true,
 })
 export class SizePipe implements PipeTransform {
     transform(value: number): string {

src/lib/pipes/snake-case.pipe.ts

@@ -2,7 +2,6 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
     name: 'snakeCase',
-    standalone: true,
 })
 export class SnakeCasePipe implements PipeTransform {
     transform(value: string): string | undefined {

src/lib/services/composite-route.guard.ts

@@ -86,3 +86,23 @@ export function orderedAsyncGuards(guards: Array<AsyncGuard>): CanActivateFn {
         );
     };
 }
+
+export function unorderedAsyncGuards(guards: Array<AsyncGuard>): CanActivateFn {
+    return async (route, state) => {
+        const injector = inject(Injector);
+        const loadingService = inject(LoadingService);
+
+        loadingService.start();
+
+        try {
+            const result = await Promise.all(guards.map(guard => runInInjectionContext(injector, () => guard(route, state))));
+            loadingService.stop();
+            return result.every(Boolean);
+        } catch (error) {
+            console.error(error);
+            loadingService.stop();
+        }
+
+        return false;
+    };
+}

src/lib/services/generic.service.ts

@@ -6,7 +6,6 @@ import { HeadersConfiguration } from '../utils/headers-configuration';
 import { List } from '../utils/types/iqser-types';
 
 export const ROOT_CHANGES_KEY = 'root';
-export const LAST_CHECKED_OFFSET = 30000;
 
 export interface QueryParam {
     readonly key: string;
@@ -19,9 +18,7 @@ export interface QueryParam {
  */
 export abstract class GenericService<I> {
     protected readonly _http = inject(HttpClient);
-    protected readonly _lastCheckedForChanges = new Map<string, string>([
-        [ROOT_CHANGES_KEY, new Date(Date.now() - LAST_CHECKED_OFFSET).toISOString()],
-    ]);
+    protected readonly _lastCheckedForChanges = new Map<string, string>([[ROOT_CHANGES_KEY, new Date(Date.now()).toISOString()]]);
     protected abstract readonly _defaultModelPath: string;
     protected readonly _serviceName: string = 'redaction-gateway-v1';
 
@@ -126,6 +123,6 @@ export abstract class GenericService<I> {
     }
 
     protected _updateLastChanged(key = ROOT_CHANGES_KEY): void {
-        this._lastCheckedForChanges.set(key, new Date(Date.now() - LAST_CHECKED_OFFSET).toISOString());
+        this._lastCheckedForChanges.set(key, new Date().toISOString());
     }
 }

src/lib/services/iqser-config.service.ts

@@ -3,14 +3,18 @@ import { Title } from '@angular/platform-browser';
 import { CacheApiService } from '../caching/cache-api.service';
 import { wipeAllCaches } from '../caching/cache-utils';
 import { IqserAppConfig } from '../utils/iqser-app-config';
+import { LANDING_PAGE_THEMES, MANUAL_BASE_URL, THEME_DIRECTORIES } from '../utils/constants';
+import { IStoredTenantId, TenantsService } from '../tenants';
 
 @Injectable()
 export class IqserConfigService<T extends IqserAppConfig = IqserAppConfig> {
     protected readonly _cacheApiService = inject(CacheApiService);
     protected readonly _titleService = inject(Title);
+    protected readonly _tenantsService = inject(TenantsService);
 
     constructor(@Inject('Doesnt matter') protected _values: T) {
         this._checkFrontendVersion();
+        this.#updateAppType();
         this._titleService.setTitle(this._values.APP_NAME);
     }
 
@@ -23,6 +27,16 @@ export class IqserConfigService<T extends IqserAppConfig = IqserAppConfig> {
         this._titleService.setTitle(this._values.APP_NAME);
     }
 
+    updateIsDocumine(tenant: IStoredTenantId): void {
+        const isDocumine = tenant.documine;
+        this._values = {
+            ...this._values,
+            IS_DOCUMINE: isDocumine,
+            THEME: !isDocumine ? THEME_DIRECTORIES.REDACT : THEME_DIRECTORIES.SCM,
+            MANUAL_BASE_URL: !isDocumine ? MANUAL_BASE_URL.REDACT_MANAGER : MANUAL_BASE_URL.DOCUMINE,
+        };
+    }
+
     protected _checkFrontendVersion(): void {
         this._cacheApiService.getCachedValue('FRONTEND_APP_VERSION').then(async lastVersion => {
             const version = this._values.FRONTEND_APP_VERSION;
@@ -34,6 +48,28 @@ export class IqserConfigService<T extends IqserAppConfig = IqserAppConfig> {
             await this._cacheApiService.cacheValue('FRONTEND_APP_VERSION', version);
         });
     }
+
+    #updateAppType() {
+        const storedTenants = this._tenantsService.getStoredTenants();
+        if (storedTenants.length) {
+            const isRedaction = !!storedTenants.find(t => !t.documine);
+            const isDocumine = !!storedTenants.find(t => t.documine);
+            const landingPageTheme =
+                isRedaction && isDocumine
+                    ? LANDING_PAGE_THEMES.MIXED
+                    : isDocumine
+                      ? LANDING_PAGE_THEMES.DOCUMINE
+                      : LANDING_PAGE_THEMES.REDACT_MANAGER;
+
+            this._values = {
+                ...this._values,
+                LANDING_PAGE_THEME: landingPageTheme,
+                APP_NAME: landingPageTheme === LANDING_PAGE_THEMES.MIXED ? 'Knecon Cloud' : isDocumine ? 'DocuMine' : 'RedactManager',
+                IS_DOCUMINE: isDocumine,
+                THEME: !isDocumine ? THEME_DIRECTORIES.REDACT : THEME_DIRECTORIES.SCM,
+            };
+        }
+    }
 }
 
 export function getConfig<T extends IqserAppConfig = IqserAppConfig>() {

src/lib/services/iqser-user-preference.service.ts

@@ -1,7 +1,7 @@
 import { APP_BASE_HREF } from '@angular/common';
 import { inject, Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
-import { List } from '../utils/types/iqser-types';
+import { List } from '../utils';
 import { GenericService } from './generic.service';
 
 export type UserAttributes = Record<string, List>;
@@ -16,7 +16,7 @@ export const KEYS = {
 export abstract class IqserUserPreferenceService extends GenericService<UserAttributes> {
     #userAttributes: UserAttributes = {};
     protected abstract readonly _devFeaturesEnabledKey: string;
-    protected readonly _serviceName: string = 'tenant-user-management';
+    protected override readonly _serviceName: string = 'tenant-user-management';
 
     get userAttributes(): UserAttributes {
         return this.#userAttributes;
@@ -37,7 +37,7 @@ export abstract class IqserUserPreferenceService extends GenericService<UserAttr
     }
 
     getLanguage(): string {
-        return this._getAttribute(KEYS.language);
+        return this._getAttribute(KEYS.language, 'en');
     }
 
     async saveLanguage(language: string): Promise<void> {

src/lib/services/stats.service.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 import { BehaviorSubject, Observable, switchMap } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 import { HeadersConfiguration } from '../utils/headers-configuration';
 import { mapEach } from '../utils/operators';
 
@@ -26,6 +26,14 @@ export abstract class StatsService<E, I = E> {
         );
     }
 
+    getOne(id: string): Observable<E> {
+        const request = this.#http.get<I>(`/${this._serviceName}/${encodeURI(this._defaultModelPath)}/${id}`, {
+            headers: HeadersConfiguration.getHeaders(),
+        });
+
+        return request.pipe(map(entity => new this._entityClass(entity)));
+    }
+
     get(key: string): E {
         return this._getBehaviourSubject(key).value;
     }

src/lib/shared/logo/logo.component.ts

@@ -1,9 +1,9 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'iqser-logo',
-    template: ` <mat-icon [svgIcon]="icon"></mat-icon>`,
+    template: `<mat-icon [svgIcon]="icon()"></mat-icon>`,
     styles: [
         `
             :host {
@@ -17,9 +17,8 @@ import { MatIconModule } from '@angular/material/icon';
         `,
     ],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatIconModule],
 })
 export class LogoComponent {
-    @Input({ required: true }) icon!: string;
+    readonly icon = input.required<string>();
 }

src/lib/shared/side-nav/side-nav.component.ts

@@ -4,7 +4,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
     selector: 'iqser-side-nav [title]',
     templateUrl: './side-nav.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
 })
 export class SideNavComponent {
     @Input() title!: string;

src/lib/shared/skeleton/skeleton.component.ts

@@ -9,7 +9,6 @@ import { tap } from 'rxjs/operators';
     templateUrl: './skeleton.component.html',
     styleUrls: ['./skeleton.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [NgTemplateOutlet, AsyncPipe],
 })
 export class SkeletonComponent {

src/lib/shared/small-chip/small-chip.component.ts

@@ -13,7 +13,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
         `,
     ],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
 })
 export class SmallChipComponent {
     @Input() color!: string;

src/lib/shared/spacer/spacer.component.ts

@@ -4,7 +4,6 @@ import { Component, HostBinding, Input } from '@angular/core';
     selector: 'iqser-spacer [height]',
     template: ' <div></div> ',
     styleUrls: ['./spacer.component.scss'],
-    standalone: true,
 })
 export class SpacerComponent {
     @Input({ required: true }) height!: number;

src/lib/shared/status-bar/status-bar.component.ts

@@ -9,7 +9,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';
     styleUrls: ['./status-bar.component.scss'],
     encapsulation: ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [NgClass, NgStyle, MatTooltipModule],
 })
 export class StatusBarComponent<T extends string> {

src/lib/shared/toast/toast.component.ts

@@ -8,7 +8,6 @@ import { StopPropagationDirective } from '../../directives';
 @Component({
     templateUrl: './toast.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [MatIconModule, StopPropagationDirective],
 })
 export class ToastComponent extends Toast {

src/lib/sorting/sort-by.pipe.ts

@@ -3,7 +3,7 @@ import { SortingOrder } from './models/sorting-order.type';
 import { KeysOf } from '../utils';
 import { sort } from './functions';
 
-@Pipe({ name: 'sortBy', standalone: true })
+@Pipe({ name: 'sortBy' })
 export class SortByPipe implements PipeTransform {
     transform<T>(values: T[], order: SortingOrder, column: KeysOf<T>): T[] {
         return sort(values, order, column);

src/lib/tenants/services/keycloak-status.service.ts

@@ -1,7 +1,9 @@
 import { inject, Injectable } from '@angular/core';
-import { KeycloakService } from 'keycloak-angular';
+import { KeycloakEventType, KeycloakService } from 'keycloak-angular';
 import { NGXLogger } from 'ngx-logger';
+import { filter, switchMap } from 'rxjs/operators';
 import { getConfig } from '../../services/iqser-config.service';
+import { log, shareLast } from '../../utils';
 import { UI_ROOT } from '../../utils/tokens';
 import { getKeycloakOptions } from '../keycloak-options';
 import { TenantsService } from './tenants.service';
@@ -13,6 +15,12 @@ export class KeycloakStatusService {
     readonly #tenantsService = inject(TenantsService);
     readonly #uiRoot = inject(UI_ROOT);
     readonly #logger = inject(NGXLogger);
+    readonly token$ = this.#keycloakService.keycloakEvents$.pipe(
+        log('[KEYCLOAK] New event:'),
+        filter(event => event.type === KeycloakEventType.OnAuthSuccess || event.type === KeycloakEventType.OnAuthRefreshSuccess),
+        switchMap(() => this.#keycloakService.getToken()),
+        shareLast(),
+    );
 
     createLoginUrlAndExecute(username?: string | null) {
         const keycloakInstance = this.#keycloakService?.getKeycloakInstance();

src/lib/tenants/services/tenants.service.ts

@@ -1,14 +1,18 @@
 import { inject, Injectable, signal } from '@angular/core';
 import dayjs from 'dayjs';
 import { NGXLogger } from 'ngx-logger';
-import { List } from '../../utils';
+import { firstValueFrom, Observable, take } from 'rxjs';
 import { GenericService } from '../../services';
+import { List } from '../../utils';
 import { Tenant, TenantDetails } from '../types';
-import { Observable } from 'rxjs';
+import { APPLICATION_TYPES } from '../../utils/constants';
+import { toObservable } from '@angular/core/rxjs-interop';
+import { filter } from 'rxjs/operators';
 
 export interface IStoredTenantId {
     readonly tenantId: string;
     readonly created: string;
+    readonly documine: boolean;
 }
 
 export type StoredTenantIds = List<IStoredTenantId>;
@@ -27,25 +31,35 @@ export class TenantsService extends GenericService<Tenant> {
         key: localStorage.key.bind(localStorage),
     };
     readonly #activeTenantId = signal('');
+    readonly #tenantSet = signal(false);
+    readonly tenantSet$ = toObservable(this.#tenantSet);
     protected readonly _defaultModelPath = 'tenants';
-    protected readonly _serviceName: string = 'tenant-user-management';
+    protected override readonly _serviceName: string = 'tenant-user-management';
 
     get activeTenantId() {
         return this.#activeTenantId();
     }
 
+    get activeTenant() {
+        return this.getStoredTenants().find(t => t.tenantId === this.activeTenantId);
+    }
+
     async selectTenant(tenantId: string): Promise<boolean> {
         this.#mutateStorage(tenantId);
         this.#setActiveTenantId(tenantId);
         return true;
     }
 
-    storeTenant() {
+    async storeTenant() {
         const storedTenants = this.getStoredTenants();
         const activeTenantId = this.#activeTenantId();
         const existing = storedTenants.find(s => s.tenantId === activeTenantId);
+
+        const tenant = await firstValueFrom(this.getActiveTenant());
+
         if (existing) {
             this.#logger.info('[TENANTS] Stored tenant exists: ', storedTenants);
+            this.#tenantSet.set(true);
             return;
         }
 
@@ -54,8 +68,13 @@ export class TenantsService extends GenericService<Tenant> {
             return;
         }
 
-        storedTenants.push({ tenantId: activeTenantId, created: new Date().toISOString() });
+        storedTenants.push({
+            tenantId: activeTenantId,
+            created: new Date().toISOString(),
+            documine: tenant.applicationType === APPLICATION_TYPES.DOCUMINE,
+        });
         this.#storageReference.setItem(STORED_TENANTS_KEY, JSON.stringify(storedTenants));
+        this.#tenantSet.set(true);
         this.#logger.info('[TENANTS] Stored tenants: ', storedTenants);
     }
 
@@ -104,6 +123,13 @@ export class TenantsService extends GenericService<Tenant> {
         return this._getOne([this.activeTenantId]);
     }
 
+    waitForSettingTenant(): Observable<boolean> {
+        return this.tenantSet$.pipe(
+            filter(tenantSet => tenantSet),
+            take(1),
+        );
+    }
+
     #setActiveTenantId(tenantId: string) {
         this.#logger.info('[TENANTS] Set current tenant id: ', tenantId);
         this.#activeTenantId.set(tenantId);

src/lib/tenants/tenant-select/tenant-select.component.html

@@ -21,7 +21,7 @@
         <div>
             @for (stored of storedTenants; track stored) {
                 <div (click)="select(stored.tenantId)" class="d-flex pointer mat-elevation-z2 card stored-tenant-card mt-10">
-                    <iqser-logo class="card-icon" icon="iqser:logo" mat-card-image></iqser-logo>
+                    <iqser-logo class="card-icon" [icon]="tenantIcon(stored)" mat-card-image></iqser-logo>
                     <div class="card-content flex-column">
                         <span class="heading">{{ stored.tenantId }}</span>
                     </div>

src/lib/tenants/tenant-select/tenant-select.component.ts

@@ -15,6 +15,7 @@ import { KeycloakStatusService } from '../services/keycloak-status.service';
     templateUrl: './tenant-select.component.html',
     styleUrls: ['./tenant-select.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone: false,
 })
 export class TenantSelectComponent {
     readonly #uiRoot = inject(UI_ROOT);
@@ -70,6 +71,10 @@ export class TenantSelectComponent {
         this.#loadStoredTenants();
     }
 
+    protected tenantIcon(tenant: IStoredTenantId) {
+        return `red:${tenant.documine ? 'documine' : 'redaction'}-logo`;
+    }
+
     #loadStoredTenants() {
         this.storedTenants = this.tenantsService.getStoredTenants().sort((a, b) => a.tenantId.localeCompare(b.tenantId));
     }

src/lib/tenants/types/tenant.ts

@@ -1,7 +1,10 @@
+import { ApplicationType } from '../../utils/constants';
+
 export type TenantDetails = Record<string, unknown>;
 
 export interface Tenant<TD extends TenantDetails = TenantDetails> {
     tenantId: string;
     displayName: string;
+    applicationType: ApplicationType;
     details: TD;
 }

src/lib/translations/http-loader-factory.ts

@@ -2,11 +2,13 @@ import { HttpClient } from '@angular/common/http';
 import { inject } from '@angular/core';
 import { getConfig } from '../services';
 import { PruningTranslationLoader } from '../utils';
+import { TenantsService } from '../tenants';
 
 export function pruningTranslationLoaderFactory(pathPrefix: string): PruningTranslationLoader {
     const httpClient = inject(HttpClient);
+    const tenantService = inject(TenantsService);
     const config = getConfig();
     const version = config.FRONTEND_APP_VERSION;
 
-    return new PruningTranslationLoader(httpClient, pathPrefix, `.json?version=${version}`);
+    return new PruningTranslationLoader(httpClient, tenantService, pathPrefix, `.json?version=${version}`);
 }

src/lib/translations/iqser-translate-parser.service.ts

@@ -4,7 +4,7 @@ import { escapeHtml } from '../utils';
 
 @Injectable()
 export class IqserTranslateParser extends TranslateDefaultParser {
-    interpolate(expr: any, params?: Record<string, unknown>) {
+    override interpolate(expr: any, params?: Record<string, unknown>) {
         const entries = Object.entries(params ?? {});
         const escapedParams = entries.reduce((acc, [key, value]) => ({ ...acc, [key]: escapeHtml(value) }), {});
         return super.interpolate(expr, escapedParams);