diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
index f915e14dc..e62d97347 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
@@ -3,8 +3,7 @@ import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui
import { ConfigService } from '@services/config.service';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
-import { IconButtonTypes, LoadingService } from '@iqser/common-ui';
-import { ButtonConfig } from '@shared/components/page-header/models/button-config.model';
+import { ButtonConfig, IconButtonTypes, LoadingService } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { UserService } from '@services/user.service';
import { RouterHistoryService } from '@services/router-history.service';
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
index 9a03e1661..9e4443463 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
@@ -1,11 +1,11 @@
-
+ >
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 5c3869dcb..8dfd9464a 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
@@ -17,7 +17,7 @@
*ngIf="currentUser.isUserAdmin"
[label]="'user-listing.add-new' | translate"
[type]="iconButtonTypes.primary"
- icon="red:plus"
+ icon="iqser:plus"
>
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
index 5370f44ed..3b86ddd81 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
@@ -8,7 +8,7 @@ import { FileDataModel } from '@models/file/file-data.model';
import { PermissionsService } from '@services/permissions.service';
import { WebViewerInstance } from '@pdftron/webviewer';
import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape'];
const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
@@ -43,10 +43,10 @@ export class FileWorkloadComponent {
@Output() readonly actionPerformed = new EventEmitter();
displayedPages: number[] = [];
pagesPanelActive = true;
+ readonly displayedAnnotations$: Observable>;
private _annotations$ = new BehaviorSubject([]);
@ViewChild('annotationsElement') private readonly _annotationsElement: ElementRef;
@ViewChild('quickNavigation') private readonly _quickNavigationElement: ElementRef;
- readonly displayedAnnotations$: Observable>;
constructor(
private readonly _permissionsService: PermissionsService,
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
index 056f88103..80255b717 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
@@ -83,7 +83,7 @@
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
index bf2a83074..16e001034 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
@@ -1,8 +1,7 @@
-
@@ -30,7 +29,7 @@
icon="red:upload"
tooltipPosition="below"
>
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
index 87ffe450e..640c77700 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
@@ -23,16 +23,18 @@ import { File } from '@models/file/file';
import { UserService } from '@services/user.service';
import { timer } from 'rxjs';
import { tap } from 'rxjs/operators';
-import { convertFiles, Files, handleFileDrop, OnAttach, OnDetach } from '@utils/index';
+import { convertFiles, Files, handleFileDrop } from '@utils/index';
import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
-import { ActionConfig } from '@shared/components/page-header/models/action-config.model';
import {
+ ActionConfig,
CircleButtonTypes,
DefaultListingServices,
ListingComponent,
ListingModes,
LoadingService,
NestedFilter,
+ OnAttach,
+ OnDetach,
TableColumnConfig,
TableComponent,
Toaster,
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
index aa8395e22..8dc080462 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
@@ -1,11 +1,10 @@
import { Injectable, TemplateRef } from '@angular/core';
-import { IFilterGroup, keyChecker, NestedFilter, TableColumnConfig } from '@iqser/common-ui';
+import { ButtonConfig, IFilterGroup, keyChecker, NestedFilter, TableColumnConfig } from '@iqser/common-ui';
import { Dossier } from '@state/model/dossier';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { TranslateService } from '@ngx-translate/core';
import { UserPreferenceService } from '@services/user-preference.service';
import { UserService } from '@services/user.service';
-import { ButtonConfig } from '@shared/components/page-header/models/button-config.model';
import { User } from '@models/user';
import { fileStatusTranslations } from '../../translations/file-status-translations';
import {
@@ -78,7 +77,7 @@ export class ConfigService {
label: _('dossier-listing.add-new'),
action: addDossier,
hide: !this._currentUser.isManager,
- icon: 'red:plus',
+ icon: 'iqser:plus',
type: 'primary'
}
];
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html
index f56bfe6dc..3994773e7 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html
@@ -1,5 +1,5 @@
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
index d48cebecf..e35358650 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
@@ -10,8 +10,8 @@ import { timer } from 'rxjs';
import { tap } from 'rxjs/operators';
import { Router } from '@angular/router';
import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
-import { groupBy, OnAttach, OnDetach, StatusSorter } from '@utils/index';
-import { DefaultListingServices, ListingComponent, TableComponent } from '@iqser/common-ui';
+import { groupBy, StatusSorter } from '@utils/index';
+import { DefaultListingServices, ListingComponent, OnAttach, OnDetach, TableComponent } from '@iqser/common-ui';
import { fileStatusTranslations } from '../../../translations/file-status-translations';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { ConfigService } from '../config.service';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
index e4dd75f46..47eb63840 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
@@ -10,6 +10,8 @@ import {
FilterService,
INestedFilter,
LoadingService,
+ OnAttach,
+ OnDetach,
processFilters,
Toaster
} from '@iqser/common-ui';
@@ -32,7 +34,6 @@ import { download } from '@utils/file-download-utils';
import { ViewMode } from '@models/file/view-mode';
import { FileWorkloadComponent } from '../../components/file-workload/file-workload.component';
import { DossiersDialogService } from '../../services/dossiers-dialog.service';
-import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy';
import { clearStamps, stampPDFPage } from '@utils/page-stamper';
import { TranslateService } from '@ngx-translate/core';
import { fileStatusTranslations } from '../../translations/file-status-translations';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
index 4654ab7c9..65076d3c2 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
@@ -1,11 +1,11 @@
-
+ >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts
index bba7db62b..1005f3eef 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts
@@ -6,6 +6,7 @@ import {
ListingComponent,
LoadingService,
NestedFilter,
+ SearchPositions,
TableColumnConfig
} from '@iqser/common-ui';
import { List, MatchedDocument, SearchControllerService, SearchResult } from '@redaction/red-ui-http';
@@ -15,7 +16,6 @@ import { ActivatedRoute, Router } from '@angular/router';
import { AppStateService } from '@state/app-state.service';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { fileStatusTranslations } from '../../translations/file-status-translations';
-import { SearchPositions } from '@shared/components/page-header/models/search-positions.type';
import { TranslateService } from '@ngx-translate/core';
import { RouterHistoryService } from '@services/router-history.service';
diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html
index 8d4e6e637..71850629a 100644
--- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html
@@ -15,7 +15,7 @@
[tooltipPosition]="tooltipPosition"
[tooltip]="'dossier-overview.open-document' | translate"
[type]="buttonType"
- icon="red:collapse"
+ icon="iqser:collapse"
>
void;
-}
diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/models/base-config.model.ts b/apps/red-ui/src/app/modules/shared/components/page-header/models/base-config.model.ts
deleted file mode 100644
index 970891c10..000000000
--- a/apps/red-ui/src/app/modules/shared/components/page-header/models/base-config.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface BaseHeaderConfig {
- readonly label: string;
- readonly icon?: string;
- readonly hide?: boolean;
-}
diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/models/button-config.model.ts b/apps/red-ui/src/app/modules/shared/components/page-header/models/button-config.model.ts
deleted file mode 100644
index 73a37f31d..000000000
--- a/apps/red-ui/src/app/modules/shared/components/page-header/models/button-config.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IconButtonType } from '@iqser/common-ui';
-import { ActionConfig } from '@shared/components/page-header/models/action-config.model';
-
-export interface ButtonConfig extends ActionConfig {
- readonly type?: IconButtonType;
-}
diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/models/search-positions.type.ts b/apps/red-ui/src/app/modules/shared/components/page-header/models/search-positions.type.ts
deleted file mode 100644
index 2b6314c43..000000000
--- a/apps/red-ui/src/app/modules/shared/components/page-header/models/search-positions.type.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const SearchPositions = {
- beforeFilters: 'beforeFilters',
- afterFilters: 'afterFilters'
-} as const;
-
-export type SearchPosition = keyof typeof SearchPositions;
diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.html b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.html
deleted file mode 100644
index 829a4b248..000000000
--- a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.scss b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.scss
deleted file mode 100644
index ffe60a1b5..000000000
--- a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import '../../../../../assets/styles/variables';
-
-.ml-6 {
- margin-left: 6px;
-}
diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts
deleted file mode 100644
index 2465429d6..000000000
--- a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Component, EventEmitter, Input, Optional, Output, TemplateRef } from '@angular/core';
-import { ActionConfig } from '@shared/components/page-header/models/action-config.model';
-import { ButtonConfig } from '@shared/components/page-header/models/button-config.model';
-import { FilterService, IconButtonTypes, IListable, SearchService } from '@iqser/common-ui';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { combineLatest, Observable, of } from 'rxjs';
-import { SearchPosition, SearchPositions } from '@shared/components/page-header/models/search-positions.type';
-import { IFileAttributeConfig } from '@redaction/red-ui-http';
-
-@Component({
- selector: 'redaction-page-header',
- templateUrl: './page-header.component.html',
- styleUrls: ['./page-header.component.scss']
-})
-export class PageHeaderComponent {
- readonly searchPositions = SearchPositions;
- readonly iconButtonTypes = IconButtonTypes;
-
- @Input() pageLabel: string;
- @Input() showCloseButton: boolean;
- @Input() actionConfigs: readonly ActionConfig[];
- @Input() buttonConfigs: readonly ButtonConfig[];
- @Input() fileAttributeConfigs: readonly IFileAttributeConfig[];
- @Input() viewModeSelection: TemplateRef;
- @Input() searchPlaceholder: string;
- @Input() searchWidth: number | 'full';
- @Input() searchPosition: SearchPosition = SearchPositions.afterFilters;
- @Output() readonly closeAction = new EventEmitter();
-
- readonly filters$ = this.filterService?.filterGroups$.pipe(map(all => all.filter(f => f.icon)));
- readonly showResetFilters$ = this._showResetFilters$;
-
- constructor(@Optional() readonly filterService: FilterService, @Optional() readonly searchService: SearchService) {}
-
- get _showResetFilters$(): Observable {
- if (!this.filterService) {
- return of(false);
- }
-
- return combineLatest([this.filterService.showResetFilters$, this.searchService.valueChanges$]).pipe(
- map(([showResetFilters, searchValue]) => showResetFilters || !!searchValue),
- distinctUntilChanged()
- );
- }
-
- resetFilters(): void {
- this.filterService.reset();
- this.searchService.reset();
- }
-
- trackByLabel(index: number, item: K): string {
- return item.label;
- }
-}
diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html
index 07e3d5f33..08e777a4a 100644
--- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html
@@ -20,9 +20,9 @@
[class.large-spacing]="largeSpacing"
[size]="32"
[tooltip]="'dossier-details.assign-members' | translate"
- class="member"
- icon="red:plus"
[type]="circleButtonTypes.primary"
+ class="member"
+ icon="iqser:plus"
>
diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts
index dff7c4c5a..34b12e6ce 100644
--- a/apps/red-ui/src/app/modules/shared/shared.module.ts
+++ b/apps/red-ui/src/app/modules/shared/shared.module.ts
@@ -21,7 +21,6 @@ import { DictionaryManagerComponent } from './components/dictionary-manager/dict
import { SideNavComponent } from './components/side-nav/side-nav.component';
import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
import { AssignUserDropdownComponent } from './components/assign-user-dropdown/assign-user-dropdown.component';
-import { PageHeaderComponent } from './components/page-header/page-header.component';
import { DatePipe } from './pipes/date.pipe';
import { LongPressDirective } from './directives/long-press.directive';
import { NamePipe } from './pipes/name.pipe';
@@ -41,7 +40,6 @@ const components = [
SideNavComponent,
DictionaryManagerComponent,
AssignUserDropdownComponent,
- PageHeaderComponent,
TypeFilterComponent,
TeamMembersComponent,
diff --git a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html
index 662ba83cd..bd1d61b02 100644
--- a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html
+++ b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html
@@ -3,7 +3,7 @@
{{ 'upload-status.dialog.title' | translate: { len: uploadService.files.length } }}
-
+
@@ -43,16 +43,16 @@
(action)="uploadItem(model)"
*ngIf="model.error && !model.sizeError"
[tooltip]="'upload-status.dialog.actions.re-upload' | translate"
+ [type]="circleButtonTypes.dark"
icon="iqser:refresh"
tooltipPosition="before"
- [type]="circleButtonTypes.dark"
>
diff --git a/apps/red-ui/src/app/utils/custom-route-reuse.strategy.ts b/apps/red-ui/src/app/utils/custom-route-reuse.strategy.ts
deleted file mode 100644
index 392a6d27d..000000000
--- a/apps/red-ui/src/app/utils/custom-route-reuse.strategy.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { ActivatedRouteSnapshot, DetachedRouteHandle, RouteReuseStrategy } from '@angular/router';
-import { Debounce } from '@iqser/common-ui';
-
-export interface OnAttach {
- ngOnAttach(previousRoute: ActivatedRouteSnapshot);
-}
-
-export interface OnDetach {
- ngOnDetach();
-}
-
-interface RouteStorageObject {
- handle: DetachedRouteHandle;
- previousRoute: ActivatedRouteSnapshot;
-}
-
-export class CustomRouteReuseStrategy implements RouteReuseStrategy {
- private _storedRoutes: { [key: string]: RouteStorageObject } = {};
-
- private static _removeTooltips(): void {
- while (document.getElementsByTagName('mat-tooltip-component').length > 0) {
- document.getElementsByTagName('mat-tooltip-component')[0].remove();
- }
- }
-
- shouldDetach(route: ActivatedRouteSnapshot): boolean {
- return !!route.routeConfig.data?.reuse && !!this._getKey(route);
- }
-
- store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void {
- if (handle === null) {
- return;
- }
- CustomRouteReuseStrategy._removeTooltips();
-
- const element: any = handle;
-
- if (element?.componentRef?.instance?.ngOnDetach) {
- this._onDetach(element.componentRef?.instance);
- }
-
- this._storedRoutes[this._getKey(route)] = {
- handle: element as DetachedRouteHandle,
- previousRoute: route
- };
- }
-
- shouldAttach(route: ActivatedRouteSnapshot): boolean {
- return !!this._storedRoutes[this._getKey(route)];
- }
-
- retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle {
- const key = this._getKey(route);
- const element: any = this._storedRoutes[key]?.handle;
-
- if (element?.componentRef?.instance?.ngOnAttach) {
- this._onAttach(element.componentRef?.instance, this._storedRoutes[key].previousRoute);
- }
-
- return element as DetachedRouteHandle;
- }
-
- shouldReuseRoute(future: ActivatedRouteSnapshot, current: ActivatedRouteSnapshot): boolean {
- return future.routeConfig === current.routeConfig || this._getKey(future) === this._getKey(current);
- }
-
- private _getKey(route: ActivatedRouteSnapshot): string {
- return route.pathFromRoot
- .map((el: ActivatedRouteSnapshot) => (el.routeConfig ? el.routeConfig.path + JSON.stringify(el.params) : ''))
- .filter(str => str.length > 0)
- .join('');
- }
-
- @Debounce()
- private _onAttach(instance: OnAttach, previousRoute?: ActivatedRouteSnapshot) {
- instance.ngOnAttach(previousRoute);
- }
-
- @Debounce()
- private _onDetach(instance: OnDetach) {
- instance.ngOnDetach();
- }
-}
diff --git a/apps/red-ui/src/app/utils/index.ts b/apps/red-ui/src/app/utils/index.ts
index 15c2674bb..3ddc348a7 100644
--- a/apps/red-ui/src/app/utils/index.ts
+++ b/apps/red-ui/src/app/utils/index.ts
@@ -4,7 +4,6 @@ export * from './sorters/super-type-sorter';
export * from './api-path-interceptor';
export * from './configuration.initializer';
-export * from './custom-route-reuse.strategy';
export * from './date-inputs-utils';
export * from './file-download-utils';
export * from './file-drop-utils';
diff --git a/apps/red-ui/src/assets/font/Inter-VariableFont.ttf b/apps/red-ui/src/assets/font/Inter-VariableFont.ttf
deleted file mode 100644
index 32a79990a..000000000
Binary files a/apps/red-ui/src/assets/font/Inter-VariableFont.ttf and /dev/null differ
diff --git a/apps/red-ui/src/assets/font/OpenSans-ExtraBold.ttf b/apps/red-ui/src/assets/font/OpenSans-ExtraBold.ttf
deleted file mode 100644
index 67fcf0fb2..000000000
Binary files a/apps/red-ui/src/assets/font/OpenSans-ExtraBold.ttf and /dev/null differ
diff --git a/apps/red-ui/src/assets/icons/general/arrow-right.svg b/apps/red-ui/src/assets/icons/general/arrow-right.svg
deleted file mode 100644
index a413e5866..000000000
--- a/apps/red-ui/src/assets/icons/general/arrow-right.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/collapse.svg b/apps/red-ui/src/assets/icons/general/collapse.svg
deleted file mode 100644
index 21d8036b4..000000000
--- a/apps/red-ui/src/assets/icons/general/collapse.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/expand.svg b/apps/red-ui/src/assets/icons/general/expand.svg
deleted file mode 100644
index 5fbf68105..000000000
--- a/apps/red-ui/src/assets/icons/general/expand.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/plus.svg b/apps/red-ui/src/assets/icons/general/plus.svg
deleted file mode 100644
index ec0b73a69..000000000
--- a/apps/red-ui/src/assets/icons/general/plus.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/radio-indeterminate.svg b/apps/red-ui/src/assets/icons/general/radio-indeterminate.svg
deleted file mode 100644
index 35c8b8249..000000000
--- a/apps/red-ui/src/assets/icons/general/radio-indeterminate.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/radio-selected.svg b/apps/red-ui/src/assets/icons/general/radio-selected.svg
deleted file mode 100644
index cfef08cf4..000000000
--- a/apps/red-ui/src/assets/icons/general/radio-selected.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/status-collapse.svg b/apps/red-ui/src/assets/icons/general/status-collapse.svg
deleted file mode 100644
index 24559afe8..000000000
--- a/apps/red-ui/src/assets/icons/general/status-collapse.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/icons/general/status-expand.svg b/apps/red-ui/src/assets/icons/general/status-expand.svg
deleted file mode 100644
index b09e5dfe5..000000000
--- a/apps/red-ui/src/assets/icons/general/status-expand.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
diff --git a/apps/red-ui/src/assets/styles/red-fonts.scss b/apps/red-ui/src/assets/styles/red-fonts.scss
deleted file mode 100644
index dcc2676fe..000000000
--- a/apps/red-ui/src/assets/styles/red-fonts.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-/* inter-regular - latin */
-
-@font-face {
- font-family: 'OpenSans Extrabold';
- src: url('../font/OpenSans-ExtraBold.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'Inter';
- font-weight: 300;
- src: url('../font/Inter-VariableFont.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'Inter';
- font-weight: 400;
- src: url('../font/Inter-VariableFont.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'Inter';
- font-weight: 500;
- src: url('../font/Inter-VariableFont.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'Inter';
- font-weight: 600;
- src: url('../font/Inter-VariableFont.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'Inter';
- font-weight: 700;
- src: url('../font/Inter-VariableFont.ttf') format('truetype');
-}
diff --git a/apps/red-ui/src/assets/styles/red-help-mode.scss b/apps/red-ui/src/assets/styles/red-help-mode.scss
deleted file mode 100644
index 35a068059..000000000
--- a/apps/red-ui/src/assets/styles/red-help-mode.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@use 'variables';
-
-.help-mode-on-mouse-over {
- z-index: 100;
- position: absolute;
- top: -5px;
- left: -5px;
- width: 100%;
- height: 100%;
- padding-right: 5px;
- padding-bottom: 10px;
- transition: all 0.25s;
-}
-
-.help-highlight,
-.help-mode-on-mouse-over:hover {
- background: rgba(92, 229, 148, 0.5);
- box-shadow: 0 0 0 2px variables.$green-2 inset;
- cursor: help;
-}
-
-.help-mode-on-mouse-over-filters,
-.help-mode-on-mouse-over-quick-filters,
-.help-mode-on-mouse-over-new-dossier {
- padding-right: 10px;
-}
-
-.help-mode-on-mouse-over-notifications {
- padding-left: 4px;
-}
diff --git a/apps/red-ui/src/assets/styles/red-list.scss b/apps/red-ui/src/assets/styles/red-list.scss
deleted file mode 100644
index a628aa996..000000000
--- a/apps/red-ui/src/assets/styles/red-list.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@use 'variables';
-
-.mat-list-item {
- color: variables.$accent !important;
- font-size: 13px !important;
- line-height: 16px !important;
-}
-
-.list-50vh {
- overflow-y: scroll;
- max-height: 50vh;
-}
diff --git a/apps/red-ui/src/assets/styles/red-loading.scss b/apps/red-ui/src/assets/styles/red-loading.scss
deleted file mode 100644
index ac53e50bc..000000000
--- a/apps/red-ui/src/assets/styles/red-loading.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.loading:after {
- content: '.';
- animation: dots 1s steps(5, end) infinite;
-}
-
-@keyframes dots {
- 0%,
- 20% {
- color: rgba(40, 50, 65, 0);
- text-shadow: 0.25em 0 0 rgba(40, 50, 65, 0), 0.5em 0 0 rgba(40, 50, 65, 0);
- }
- 40% {
- color: #283241;
- text-shadow: 0.25em 0 0 rgba(40, 50, 65, 0), 0.5em 0 0 rgba(40, 50, 65, 0);
- }
- 60% {
- text-shadow: 0.25em 0 0 #283241, 0.5em 0 0 rgba(40, 50, 65, 0);
- }
- 80%,
- 100% {
- text-shadow: 0.25em 0 0 #283241, 0.5em 0 0 #283241;
- }
-}
diff --git a/apps/red-ui/src/assets/styles/red-media-queries.scss b/apps/red-ui/src/assets/styles/red-media-queries.scss
deleted file mode 100644
index 9f351ec92..000000000
--- a/apps/red-ui/src/assets/styles/red-media-queries.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@media only screen and (max-width: 800px) {
- .visible-lg {
- display: none !important;
- }
-}
-
-.visible-lt-lg {
- display: none !important;
-}
-
-@media only screen and (max-width: 800px) {
- .visible-lt-lg {
- display: flex !important;
- }
-}
diff --git a/apps/red-ui/src/assets/styles/red-progress-bar.scss b/apps/red-ui/src/assets/styles/red-progress-bar.scss
deleted file mode 100644
index ebc09d45e..000000000
--- a/apps/red-ui/src/assets/styles/red-progress-bar.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@use 'variables';
-
-.mat-progress-bar {
- height: 6px;
- border-radius: 3px;
-
- .mat-progress-bar-buffer {
- background-color: variables.$grey-4;
- }
-
- &.green {
- .mat-progress-bar-fill::after {
- background-color: variables.$green-2;
- }
- }
-}
diff --git a/apps/red-ui/src/assets/styles/red-select.scss b/apps/red-ui/src/assets/styles/red-select.scss
deleted file mode 100644
index 794f5ed6e..000000000
--- a/apps/red-ui/src/assets/styles/red-select.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@use 'variables';
-@use 'common-mixins';
-
-.mat-select-panel {
- @include common-mixins.scroll-bar;
-
- .mat-option {
- &:hover:not(.mat-option-disabled),
- &:focus:not(.mat-option-disabled) {
- background-color: variables.$grey-6;
- }
-
- &.mat-selected:not(.mat-option-multiple) {
- background-color: rgba(variables.$primary, 0.2);
- color: variables.$accent;
- }
- }
-}
-
-.mat-form-field.no-label .mat-form-field-infix {
- padding: 0 !important;
- border-top: 0 !important;
-}
diff --git a/apps/red-ui/src/assets/styles/red-slider.scss b/apps/red-ui/src/assets/styles/red-slider.scss
deleted file mode 100644
index 7bb1b099a..000000000
--- a/apps/red-ui/src/assets/styles/red-slider.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-@use 'variables';
-
-.mat-slider-horizontal {
- width: 140px;
- height: 32px !important;
-
- .mat-slider-wrapper {
- left: 0 !important;
- top: 16px !important;
- }
-
- .mat-slider-track-wrapper,
- .mat-slider-track-fill {
- height: 6px !important;
- border-radius: 3px;
- }
-
- // For disabled state
- .mat-slider-track-fill {
- background-color: variables.$primary;
- }
-
- .mat-slider-track-background {
- height: 4px !important;
- margin-top: 1px;
- border-radius: 3px;
- background-color: variables.$grey-4 !important;
- }
-
- .mat-slider-focus-ring {
- display: none;
- }
-}
-
-.mat-slider-thumb {
- width: 16px !important;
- height: 16px !important;
- border-width: 0 !important;
- background-color: variables.$primary !important;
-}
-
-.mat-slider:not(.mat-slider-disabled):not(.mat-slider-sliding) .mat-slider-thumb {
- transform: scale(1) !important;
-}
-
-.mat-slider-horizontal.mat-slider-disabled {
- .mat-slider-thumb {
- transform: translateX(-3px);
- }
-}
diff --git a/apps/red-ui/src/assets/styles/red-tabs.scss b/apps/red-ui/src/assets/styles/red-tabs.scss
deleted file mode 100644
index d7f6675a9..000000000
--- a/apps/red-ui/src/assets/styles/red-tabs.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@use 'variables';
-
-.red-tab {
- &:not(:last-child) {
- margin-right: 2px;
- }
-
- height: 30px;
- line-height: 30px;
- padding: 0 14px;
- border-radius: 17px;
- transition: background-color 0.2s;
- cursor: pointer;
-
- &:not(.disabled):not(.active):hover {
- background-color: variables.$grey-6;
- }
-
- &.active {
- background-color: rgba(variables.$primary, 0.1);
- font-weight: 600;
- color: variables.$primary;
- }
-
- &.disabled {
- color: rgba(variables.$accent, 0.3);
- cursor: not-allowed;
- }
-}
diff --git a/apps/red-ui/src/assets/styles/red-theme.scss b/apps/red-ui/src/assets/styles/red-theme.scss
index f51be06f4..fcc44fbd7 100644
--- a/apps/red-ui/src/assets/styles/red-theme.scss
+++ b/apps/red-ui/src/assets/styles/red-theme.scss
@@ -1,17 +1,4 @@
-@use 'red-fonts';
@use '~ngx-toastr/toastr';
@use 'red-material-theme';
-@use 'red-select';
-@use 'red-list';
-@use 'red-toggle';
-@use 'red-toggle-button';
-@use 'red-media-queries';
@use 'red-components';
-@use 'red-toasts';
-@use 'red-tooltips';
@use 'red-editor';
-@use 'red-slider';
-@use 'red-loading';
-@use 'red-progress-bar';
-@use 'red-tabs';
-@use 'red-help-mode';
diff --git a/apps/red-ui/src/assets/styles/red-toasts.scss b/apps/red-ui/src/assets/styles/red-toasts.scss
deleted file mode 100644
index 4e7520593..000000000
--- a/apps/red-ui/src/assets/styles/red-toasts.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-@use 'variables';
-
-$toast-width: 400px;
-
-.toast-container .ngx-toastr,
-.inline-dialog-toast {
- padding: 11px 16px;
- border-radius: 8px;
- background-image: none;
- font-family: Inter, sans-serif;
- font-size: 13px;
- line-height: 18px;
- width: $toast-width;
- display: flex;
- justify-content: space-between;
- align-items: center;
- box-shadow: none;
-
- > *:not(:last-child) {
- margin-right: 10px;
- }
-
- &:hover {
- box-shadow: none;
- }
-
- .actions-wrapper {
- margin-top: 24px;
- display: flex;
-
- > *:not(:last-child) {
- margin-right: 24px;
- }
-
- a {
- font-size: 11px;
- font-weight: 600;
- line-height: 14px;
- color: variables.$accent;
- text-transform: uppercase;
- cursor: pointer;
- }
- }
-}
-
-.toast-top-right {
- top: 128px;
- right: calc(50% - #{$toast-width} / 2);
-}
-
-.toast-file-preview {
- top: 160px;
- right: 405px;
-}
-
-.toast-close-button {
- position: initial;
- opacity: 1;
- text-shadow: none;
-
- mat-icon {
- width: 10px;
- }
-
- &:hover {
- opacity: 1;
- }
-}
-
-.toast-warning,
-.toast-success {
- .toast-message {
- color: variables.$accent;
- }
-
- .toast-close-button {
- color: variables.$accent;
- }
-}
-
-.toast-error,
-.toast-info {
- .toast-close-button:hover {
- color: variables.$white;
- }
-}
-
-.toast-success {
- background-color: variables.$green-2;
-}
-
-.toast-error {
- background-color: variables.$primary;
- color: variables.$white;
-}
-
-.toast-warning {
- background-color: variables.$yellow-2;
- color: variables.$accent;
-}
-
-.toast-info {
- background-color: variables.$accent;
-}
-
-.inline-dialog-toast {
- width: calc(100% - 96px);
- margin-left: 32px;
- margin-top: 14px;
-}
diff --git a/apps/red-ui/src/assets/styles/red-toggle-button.scss b/apps/red-ui/src/assets/styles/red-toggle-button.scss
deleted file mode 100644
index 808f4f61c..000000000
--- a/apps/red-ui/src/assets/styles/red-toggle-button.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@use 'variables';
-
-.mat-button-toggle-standalone,
-.mat-button-toggle-group {
- box-shadow: none;
- border-radius: 100px !important;
- width: fit-content;
-
- .mat-button-toggle:not(.mat-button-toggle-checked) {
- .mat-button-toggle-button {
- background: variables.$grey-6;
- color: variables.$grey-7;
- }
- }
-}
-
-.mat-button-toggle-disabled {
- .mat-button-toggle-button {
- cursor: not-allowed !important;
- }
-
- outline: none;
-}
diff --git a/apps/red-ui/src/assets/styles/red-toggle.scss b/apps/red-ui/src/assets/styles/red-toggle.scss
deleted file mode 100644
index 270388615..000000000
--- a/apps/red-ui/src/assets/styles/red-toggle.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@use 'variables';
-
-.mat-slide-toggle {
- .mat-slide-toggle-bar {
- height: 16px !important;
- width: 30px !important;
- border-radius: 16px !important;
- background-color: variables.$grey-4;
- }
-
- .mat-slide-toggle-thumb-container {
- top: 2px !important;
- left: 2px !important;
- height: 12px !important;
- width: 12px !important;
- }
-
- .mat-slide-toggle-thumb {
- height: 12px !important;
- width: 12px !important;
- box-shadow: none;
- background-color: variables.$grey-2;
- }
-
- .mat-ripple {
- display: none;
- }
-
- &.mat-primary.mat-checked {
- .mat-slide-toggle-bar {
- background-color: variables.$primary;
- }
-
- .mat-slide-toggle-thumb {
- background-color: variables.$white;
- }
-
- .mat-slide-toggle-thumb-container {
- transform: translate3d(14px, 0, 0);
- }
- }
-}
diff --git a/apps/red-ui/src/assets/styles/red-tooltips.scss b/apps/red-ui/src/assets/styles/red-tooltips.scss
deleted file mode 100644
index 84a8655ef..000000000
--- a/apps/red-ui/src/assets/styles/red-tooltips.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-@use 'variables';
-
-.mat-tooltip {
- background-color: variables.$accent;
- border-radius: 3px !important;
- padding: 10px;
- margin: 12px !important;
- font-size: 11px;
- line-height: 14px;
- color: variables.$white !important;
- position: relative;
- overflow: visible !important;
- text-align: center;
-
- //&:after {
- // content: '';
- // position: absolute;
- // left: 50%;
- // margin-left: -5px;
- // width: 0;
- // height: 0;
- // z-index: 3000;
- // border-left: solid 5px transparent;
- // border-right: solid 5px transparent;
- // border-top: solid 6px $accent;
- //}
-
- &.small {
- max-width: 160px;
- }
-
- &.warn {
- background-color: variables.$yellow-2;
- color: variables.$accent !important;
-
- //&:after {
- // border-top: solid 6px $yellow-2;
- //}
- }
-}
-
-//
-//.mat-tooltip[style*='transform-origin: center top']:after {
-// top: -6px;
-// transform: rotate(180deg);
-//}
-//
-//.mat-tooltip[style*='transform-origin: center bottom']:after {
-// top: 100%;
-//}
-//
-//.mat-tooltip[style*='transform-origin: right center']:after {
-// top: 50%;
-// left: 100%;
-// transform: rotate(-90deg) translateY(3px) translateX(3px);
-//}
-//
-//.mat-tooltip[style*='transform-origin: left center']:after {
-// top: 50%;
-// left: 0;
-// transform: rotate(90deg) translateY(3px) translateX(-3px);
-//}
diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss
index 842408eba..91c598cbb 100644
--- a/apps/red-ui/src/styles.scss
+++ b/apps/red-ui/src/styles.scss
@@ -25,6 +25,11 @@
$iqser-grey-4: vars.$grey-4,
$iqser-grey-5: vars.$grey-5,
$iqser-grey-6: vars.$grey-6,
+ $iqser-grey-7: vars.$grey-7,
+ $iqser-green-1: vars.$green-1,
+ $iqser-green-2: vars.$green-2,
+ $iqser-yellow-1: vars.$yellow-1,
+ $iqser-yellow-2: vars.$yellow-2,
$iqser-helpmode-primary: vars.$green-2
);
diff --git a/libs/common-ui b/libs/common-ui
index 52b8c90bb..5eda852e9 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 52b8c90bbf283d2f78dbb0c2744ef1bca771b675
+Subproject commit 5eda852e94ea98a48d8f5354b7ae7f31be94d575
diff --git a/package.json b/package.json
index c1e67b86c..7e33a8766 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"scripts": {
"build": "nx build",
"build-lint-all": "ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix && ng build --project=red-ui --configuration production --base-href /ui/",
- "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css && cp -r apps/red-ui/src/assets/font dist/paligo-styles/fonts",
+ "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css && cp -r libs/common-ui/src/assets/font dist/paligo-styles/fonts",
"i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write",
"postinstall": "ngcc --properties es2015 browser module main",
"lint": "ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix",