@@ -94,7 +94,7 @@
class="table-item pointer"
>
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss
index e602d688d..6fd6360f8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../../assets/styles/red-variables';
+@import '../../../../../assets/styles/variables';
@import '../../../../../assets/styles/red-mixins';
.header-item {
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
index 588e394e8..334b0753a 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
@@ -11,6 +11,7 @@ import { SearchService } from '@shared/services/search.service';
import { ScreenStateService } from '@shared/services/screen-state.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
import { SortingService } from '@services/sorting.service';
+import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui';
@Component({
templateUrl: './dossier-templates-listing-screen.component.html',
@@ -19,7 +20,9 @@ import { SortingService } from '@services/sorting.service';
providers: [FilterService, SearchService, ScreenStateService, SortingService]
})
export class DossierTemplatesListingScreenComponent extends BaseListingComponent
implements OnInit {
- protected _primaryKey = 'name';
+ readonly iconButtonTypes = IconButtonTypes;
+ readonly circleButtonTypes = CircleButtonTypes;
+ protected readonly _primaryKey = 'name';
constructor(
private readonly _dialogService: AdminDialogService,
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
index 8391272b9..69db731d0 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
@@ -5,12 +5,12 @@
-
+ >
@@ -21,11 +21,11 @@
@@ -121,7 +121,7 @@
-
+
@@ -142,24 +142,22 @@
{{ attribute.csvColumnHeader }}
-
+
-
-
-
+
-
+ [type]="circleButtonTypes.dark"
+ >
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss
index 239036305..b4d8ef8d5 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss
@@ -67,6 +67,6 @@ redaction-table-col-name::ng-deep {
visibility: hidden;
}
-.table-item > div:not(.selection-column) redaction-round-checkbox {
+.table-item > div:not(.selection-column) iqser-round-checkbox {
cursor: default;
}
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
index 32d0425ae..db387dac8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
@@ -11,6 +11,7 @@ import { ScreenStateService } from '@shared/services/screen-state.service';
import { SortingService } from '@services/sorting.service';
import { BaseListingComponent } from '@shared/base/base-listing.component';
import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations';
+import { CircleButtonTypes, IconButtonTypes } from '@iqser/common-ui';
@Component({
templateUrl: './file-attributes-listing-screen.component.html',
@@ -19,7 +20,9 @@ import { fileAttributeTypesTranslations } from '../../translations/file-attribut
providers: [FilterService, SearchService, ScreenStateService, SortingService]
})
export class FileAttributesListingScreenComponent extends BaseListingComponent
implements OnInit, OnDestroy {
- translations = fileAttributeTypesTranslations;
+ readonly iconButtonTypes = IconButtonTypes;
+ readonly circleButtonTypes = CircleButtonTypes;
+ readonly translations = fileAttributeTypesTranslations;
protected readonly _primaryKey = 'label';
private _existingConfiguration: FileAttributesConfig;
@ViewChild('fileInput') private _fileInput: ElementRef;
diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html
index 05dae7061..f09d283db 100644
--- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html
@@ -8,14 +8,14 @@
-
+ >
@@ -164,12 +164,12 @@
{{ 'general-config-screen.actions.save' | translate }}
-
+ [type]="iconButtonTypes.dark"
+ >
diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss
index 581e22a78..bfb1f492d 100644
--- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../../assets/styles/red-variables';
+@import '../../../../../assets/styles/variables';
@import '../../../../../assets/styles/red-mixins';
.content-container {
diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts
index 7b616319c..fe4884d8e 100644
--- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
import { PermissionsService } from '@services/permissions.service';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AdminDialogService } from '../../services/admin-dialog.service';
@@ -8,20 +8,22 @@ import {
SmtpConfigurationControllerService,
SMTPConfigurationModel
} from '@redaction/red-ui-http';
-import { AppConfigService } from '../../../app-config/app-config.service';
-import { AutoUnsubscribeComponent } from '../../../shared/base/auto-unsubscribe.component';
-import { Toaster } from '../../../../services/toaster.service';
-import { LoadingService } from '../../../../services/loading.service';
+import { AppConfigService } from '@app-config/app-config.service';
+import { AutoUnsubscribeComponent } from '@iqser/common-ui';
+import { Toaster } from '@services/toaster.service';
+import { LoadingService } from '@services/loading.service';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { IconButtonTypes } from '@iqser/common-ui';
@Component({
selector: 'redaction-general-config-screen',
templateUrl: './general-config-screen.component.html',
styleUrls: ['./general-config-screen.component.scss']
})
-export class GeneralConfigScreenComponent extends AutoUnsubscribeComponent implements OnInit {
- configForm: FormGroup;
- smtpForm: FormGroup;
+export class GeneralConfigScreenComponent extends AutoUnsubscribeComponent implements OnInit, OnDestroy {
+ readonly iconButtonTypes = IconButtonTypes;
+ readonly configForm: FormGroup;
+ readonly smtpForm: FormGroup;
private _initialGeneralConfiguration: GeneralConfigurationModel;
private _initialSMTPConfiguration: SMTPConfigurationModel;
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss
index 8c49b89fc..0138500ea 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss
@@ -1,5 +1,5 @@
@import '../../../../../assets/styles/red-mixins';
-@import '../../../../../assets/styles/red-variables';
+@import '../../../../../assets/styles/variables';
.content-container {
overflow: auto;
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 112675cae..73c972123 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
@@ -4,9 +4,9 @@ import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui
import { AppConfigService } from '@app-config/app-config.service';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
-import { LoadingService } from '@services/loading.service';
-import { ButtonConfig } from '@shared/components/page-header/models/button-config.model';
-import { IconButtonTypes } from '@shared/components/buttons/icon-button/icon-button.component';
+import { LoadingService } from '../../../../services/loading.service';
+import { ButtonConfig } from '../../../shared/components/page-header/models/button-config.model';
+import { IconButtonTypes } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
@Component({
@@ -38,7 +38,7 @@ export class LicenseInformationScreenComponent implements OnInit {
{
label: _('license-info-screen.email-report'),
action: () => this.sendMail(),
- type: IconButtonTypes.PRIMARY
+ type: IconButtonTypes.primary
}
];
diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html
index c80a5168a..80a3fe7c6 100644
--- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html
@@ -5,12 +5,12 @@
-
+ >
@@ -44,12 +44,12 @@