RED-4238: update nx & angular
This commit is contained in:
parent
1febf9e55f
commit
b4d47005fb
@ -2,6 +2,7 @@
|
|||||||
"version": 1,
|
"version": 1,
|
||||||
"projects": {
|
"projects": {
|
||||||
"common-ui": {
|
"common-ui": {
|
||||||
|
"$schema": "../../node_modules/nx/schemas/project-schema.json",
|
||||||
"projectType": "library",
|
"projectType": "library",
|
||||||
"root": "libs/common-ui",
|
"root": "libs/common-ui",
|
||||||
"sourceRoot": "libs/common-ui/src",
|
"sourceRoot": "libs/common-ui/src",
|
||||||
@ -26,6 +27,7 @@
|
|||||||
"tags": []
|
"tags": []
|
||||||
},
|
},
|
||||||
"red-cache": {
|
"red-cache": {
|
||||||
|
"$schema": "../../node_modules/nx/schemas/project-schema.json",
|
||||||
"projectType": "library",
|
"projectType": "library",
|
||||||
"root": "libs/red-cache",
|
"root": "libs/red-cache",
|
||||||
"sourceRoot": "libs/red-cache/src",
|
"sourceRoot": "libs/red-cache/src",
|
||||||
@ -55,6 +57,7 @@
|
|||||||
"tags": []
|
"tags": []
|
||||||
},
|
},
|
||||||
"red-domain": {
|
"red-domain": {
|
||||||
|
"$schema": "../../node_modules/nx/schemas/project-schema.json",
|
||||||
"projectType": "library",
|
"projectType": "library",
|
||||||
"root": "libs/red-domain",
|
"root": "libs/red-domain",
|
||||||
"sourceRoot": "libs/red-domain/src",
|
"sourceRoot": "libs/red-domain/src",
|
||||||
@ -78,6 +81,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"red-ui": {
|
"red-ui": {
|
||||||
|
"$schema": "../../node_modules/nx/schemas/project-schema.json",
|
||||||
"projectType": "application",
|
"projectType": "application",
|
||||||
"schematics": {
|
"schematics": {
|
||||||
"@schematics/angular:component": {
|
"@schematics/angular:component": {
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
import { CompositeRouteGuard } from '@iqser/common-ui';
|
import { CompositeRouteGuard } from '@iqser/common-ui';
|
||||||
import { AuthGuard } from '../auth/auth.guard';
|
import { AuthGuard } from '../auth/auth.guard';
|
||||||
import { RedRoleGuard } from '../auth/red-role.guard';
|
import { RedRoleGuard } from '../auth/red-role.guard';
|
||||||
import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component';
|
import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component';
|
||||||
|
|
||||||
const routes = [
|
const routes: Routes = [
|
||||||
{ path: '', redirectTo: 'user-profile', pathMatch: 'full' },
|
{ path: '', redirectTo: 'user-profile', pathMatch: 'full' },
|
||||||
{
|
{
|
||||||
path: 'user-profile',
|
path: 'user-profile',
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { NotificationPreferencesService } from '../../../services/notification-preferences.service';
|
import { NotificationPreferencesService } from '../../../services/notification-preferences.service';
|
||||||
import { BaseFormComponent, LoadingService, Toaster } from '@iqser/common-ui';
|
import { BaseFormComponent, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
@ -26,7 +26,7 @@ export class NotificationsScreenComponent extends BaseFormComponent implements O
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _notificationPreferencesService: NotificationPreferencesService,
|
private readonly _notificationPreferencesService: NotificationPreferencesService,
|
||||||
private readonly _changeRef: ChangeDetectorRef,
|
private readonly _changeRef: ChangeDetectorRef,
|
||||||
@ -77,7 +77,7 @@ export class NotificationsScreenComponent extends BaseFormComponent implements O
|
|||||||
this._loadingService.stop();
|
this._loadingService.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
inAppNotificationsEnabled: [undefined],
|
inAppNotificationsEnabled: [undefined],
|
||||||
emailNotificationsEnabled: [undefined],
|
emailNotificationsEnabled: [undefined],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
|
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { BaseFormComponent, LoadingService } from '@iqser/common-ui';
|
import { BaseFormComponent, LoadingService } from '@iqser/common-ui';
|
||||||
@ -25,7 +25,7 @@ export class UserProfileScreenComponent extends BaseFormComponent implements OnI
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
readonly permissionsService: PermissionsService,
|
readonly permissionsService: PermissionsService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _userService: UserService,
|
private readonly _userService: UserService,
|
||||||
private readonly _configService: ConfigService,
|
private readonly _configService: ConfigService,
|
||||||
private readonly _languageService: LanguageService,
|
private readonly _languageService: LanguageService,
|
||||||
@ -89,7 +89,7 @@ export class UserProfileScreenComponent extends BaseFormComponent implements OnI
|
|||||||
this._initializeForm();
|
this._initializeForm();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
email: [undefined, [Validators.required, Validators.email]],
|
email: [undefined, [Validators.required, Validators.email]],
|
||||||
firstName: [undefined],
|
firstName: [undefined],
|
||||||
|
|||||||
@ -22,7 +22,7 @@ import { DossierStatesListingScreenComponent } from './screens/dossier-states-li
|
|||||||
import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component';
|
import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component';
|
||||||
import { PermissionsGuard } from '../../guards/permissions-guard';
|
import { PermissionsGuard } from '../../guards/permissions-guard';
|
||||||
|
|
||||||
const dossierTemplateIdRoutes = [
|
const dossierTemplateIdRoutes: Routes = [
|
||||||
{
|
{
|
||||||
path: 'info',
|
path: 'info',
|
||||||
canActivate: [CompositeRouteGuard],
|
canActivate: [CompositeRouteGuard],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, HostListener, Inject, Injector, OnDestroy } from '@angular/core';
|
import { Component, HostListener, Inject, Injector, OnDestroy } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { DossierAttributeConfigTypes, FileAttributeConfigTypes, IDossierAttributeConfig } from '@red/domain';
|
import { DossierAttributeConfigTypes, FileAttributeConfigTypes, IDossierAttributeConfig } from '@red/domain';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { BaseDialogComponent, IqserEventTarget, LoadingService, Toaster } from '@iqser/common-ui';
|
import { BaseDialogComponent, IqserEventTarget, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
@ -18,7 +18,7 @@ export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent
|
|||||||
readonly typeOptions = Object.keys(DossierAttributeConfigTypes);
|
readonly typeOptions = Object.keys(DossierAttributeConfigTypes);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _dossierAttributesService: DossierAttributesService,
|
private readonly _dossierAttributesService: DossierAttributesService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
@ -74,7 +74,7 @@ export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(dossierAttribute: IDossierAttributeConfig): FormGroup {
|
private _getForm(dossierAttribute: IDossierAttributeConfig): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
label: [dossierAttribute?.label, Validators.required],
|
label: [dossierAttribute?.label, Validators.required],
|
||||||
...(!!dossierAttribute && {
|
...(!!dossierAttribute && {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
||||||
import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui';
|
import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { IDossierState } from '@red/domain';
|
import { IDossierState } from '@red/domain';
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
@ -20,7 +20,7 @@ interface DialogData {
|
|||||||
})
|
})
|
||||||
export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
|
export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _dossierStatesService: DossierStatesService,
|
private readonly _dossierStatesService: DossierStatesService,
|
||||||
@ -52,7 +52,7 @@ export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
|
|||||||
this._loadingService.stop();
|
this._loadingService.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
#getForm(): FormGroup {
|
#getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
name: [this.data.dossierState?.name, Validators.required],
|
name: [this.data.dossierState?.name, Validators.required],
|
||||||
color: [this.data.dossierState?.color, Validators.required],
|
color: [this.data.dossierState?.color, Validators.required],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector } from '@angular/core';
|
import { Component, Inject, Injector } from '@angular/core';
|
||||||
import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { applyIntervalConstraints } from '@utils/date-inputs-utils';
|
import { applyIntervalConstraints } from '@utils/date-inputs-utils';
|
||||||
import { downloadTypesTranslations } from '@translations/download-types-translations';
|
import { downloadTypesTranslations } from '@translations/download-types-translations';
|
||||||
@ -39,7 +39,7 @@ export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogCompon
|
|||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _dossierTemplatesService: DossierTemplatesService,
|
private readonly _dossierTemplatesService: DossierTemplatesService,
|
||||||
private readonly _dictionaryService: DictionaryService,
|
private readonly _dictionaryService: DictionaryService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<AddEditCloneDossierTemplateDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<AddEditCloneDossierTemplateDialogComponent>,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
@ -102,7 +102,7 @@ export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogCompon
|
|||||||
this._loadingService.stop();
|
this._loadingService.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
name: [this._getCloneName(), Validators.required],
|
name: [this._getCloneName(), Validators.required],
|
||||||
description: [this.dossierTemplate?.description],
|
description: [this.dossierTemplate?.description],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain';
|
import { FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations';
|
import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations';
|
||||||
@ -22,7 +22,7 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent {
|
|||||||
readonly canSetFilterable!: boolean;
|
readonly canSetFilterable!: boolean;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _fileAttributesService: FileAttributesService,
|
private readonly _fileAttributesService: FileAttributesService,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<AddEditFileAttributeDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<AddEditFileAttributeDialogComponent>,
|
||||||
@ -50,7 +50,7 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent {
|
|||||||
this._dialogRef.close(fileAttribute);
|
this._dialogRef.close(fileAttribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(fileAttribute: IFileAttributeConfig): FormGroup {
|
private _getForm(fileAttribute: IFileAttributeConfig): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
label: [fileAttribute?.label, Validators.required],
|
label: [fileAttribute?.label, Validators.required],
|
||||||
csvColumnHeader: [fileAttribute?.csvColumnHeader],
|
csvColumnHeader: [fileAttribute?.csvColumnHeader],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, EventEmitter, Input, Output } from '@angular/core';
|
import { Component, EventEmitter, Input, Output } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { UserService } from '@services/user.service';
|
import { UserService } from '@services/user.service';
|
||||||
import { LoadingService, Toaster } from '@iqser/common-ui';
|
import { LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { User } from '@red/domain';
|
import { User } from '@red/domain';
|
||||||
@ -17,7 +17,7 @@ export class ResetPasswordComponent {
|
|||||||
@Output() readonly toggleResetPassword = new EventEmitter();
|
@Output() readonly toggleResetPassword = new EventEmitter();
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _userService: UserService,
|
private readonly _userService: UserService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
@ -42,7 +42,7 @@ export class ResetPasswordComponent {
|
|||||||
this._loadingService.stop();
|
this._loadingService.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
temporaryPassword: [null, Validators.required],
|
temporaryPassword: [null, Validators.required],
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core';
|
import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { AdminDialogService } from '../../../services/admin-dialog.service';
|
import { AdminDialogService } from '../../../services/admin-dialog.service';
|
||||||
import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { rolesTranslations } from '@translations/roles-translations';
|
import { rolesTranslations } from '@translations/roles-translations';
|
||||||
@ -27,7 +27,7 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges
|
|||||||
private readonly _ROLE_REQUIREMENTS = { RED_MANAGER: 'RED_USER', RED_ADMIN: 'RED_USER_ADMIN' };
|
private readonly _ROLE_REQUIREMENTS = { RED_MANAGER: 'RED_USER', RED_ADMIN: 'RED_USER_ADMIN' };
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _dialogService: AdminDialogService,
|
private readonly _dialogService: AdminDialogService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
@ -108,7 +108,7 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges
|
|||||||
this._dialogService.deleteUsers([this.user.id], null, () => this.closeDialog.emit(true));
|
this._dialogService.deleteUsers([this.user.id], null, () => this.closeDialog.emit(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
firstName: [this.user?.firstName, Validators.required],
|
firstName: [this.user?.firstName, Validators.required],
|
||||||
lastName: [this.user?.lastName, Validators.required],
|
lastName: [this.user?.lastName, Validators.required],
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import { KmsSignatureConfigurationComponent } from './form/kms-signature-configu
|
|||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
import { HttpStatusCode } from '@angular/common/http';
|
import { HttpStatusCode } from '@angular/common/http';
|
||||||
import { DigitalSignatureOption, DigitalSignatureOptions } from '@red/domain';
|
import { DigitalSignatureOption, DigitalSignatureOptions } from '@red/domain';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||||
|
|
||||||
const DEFAULT_DIALOG_WIDTH = '662px';
|
const DEFAULT_DIALOG_WIDTH = '662px';
|
||||||
const KMS_SIGNATURE_DIALOG_WIDTH = '810px';
|
const KMS_SIGNATURE_DIALOG_WIDTH = '810px';
|
||||||
@ -40,7 +40,7 @@ export class ConfigureCertificateDialogComponent extends BaseDialogComponent {
|
|||||||
constructor(
|
constructor(
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<ConfigureCertificateDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<ConfigureCertificateDialogComponent>,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _changeDetectorRef: ChangeDetectorRef,
|
private readonly _changeDetectorRef: ChangeDetectorRef,
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, Validators } from '@angular/forms';
|
||||||
import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
|
import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
|
||||||
import { IKmsDigitalSignature, IKmsDigitalSignatureRequest, DigitalSignatureOptions } from '@red/domain';
|
import { IKmsDigitalSignature, IKmsDigitalSignatureRequest, DigitalSignatureOptions } from '@red/domain';
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
@ -14,7 +14,7 @@ import { DigitalSignatureService } from '../../../../services/digital-signature.
|
|||||||
export class KmsSignatureConfigurationComponent extends BaseSignatureConfigurationComponent implements OnInit {
|
export class KmsSignatureConfigurationComponent extends BaseSignatureConfigurationComponent implements OnInit {
|
||||||
@Input() digitalSignature!: IKmsDigitalSignatureRequest;
|
@Input() digitalSignature!: IKmsDigitalSignatureRequest;
|
||||||
|
|
||||||
constructor(protected readonly _digitalSignatureService: DigitalSignatureService, private readonly _formBuilder: FormBuilder) {
|
constructor(protected readonly _digitalSignatureService: DigitalSignatureService, private readonly _formBuilder: UntypedFormBuilder) {
|
||||||
super(_digitalSignatureService, DigitalSignatureOptions.KMS);
|
super(_digitalSignatureService, DigitalSignatureOptions.KMS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, Validators } from '@angular/forms';
|
||||||
import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
|
import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
|
||||||
import { IPkcsDigitalSignature, IPkcsDigitalSignatureRequest, DigitalSignatureOptions } from '@red/domain';
|
import { IPkcsDigitalSignature, IPkcsDigitalSignatureRequest, DigitalSignatureOptions } from '@red/domain';
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
@ -15,7 +15,7 @@ import { lastIndexOfEnd } from '../../../../../../utils';
|
|||||||
export class PkcsSignatureConfigurationComponent extends BaseSignatureConfigurationComponent implements OnInit {
|
export class PkcsSignatureConfigurationComponent extends BaseSignatureConfigurationComponent implements OnInit {
|
||||||
@Input() digitalSignature!: IPkcsDigitalSignatureRequest;
|
@Input() digitalSignature!: IPkcsDigitalSignatureRequest;
|
||||||
|
|
||||||
constructor(protected readonly _digitalSignatureService: DigitalSignatureService, private readonly _formBuilder: FormBuilder) {
|
constructor(protected readonly _digitalSignatureService: DigitalSignatureService, private readonly _formBuilder: UntypedFormBuilder) {
|
||||||
super(_digitalSignatureService, DigitalSignatureOptions.PKCS);
|
super(_digitalSignatureService, DigitalSignatureOptions.PKCS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
|
||||||
import { DossierState } from '@red/domain';
|
import { DossierState } from '@red/domain';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
import { firstValueFrom, forkJoin } from 'rxjs';
|
import { firstValueFrom, forkJoin } from 'rxjs';
|
||||||
import { DossierStatesService } from '@services/entity-services/dossier-states.service';
|
import { DossierStatesService } from '@services/entity-services/dossier-states.service';
|
||||||
@ -23,10 +23,10 @@ interface DialogData {
|
|||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class ConfirmDeleteDossierStateDialogComponent {
|
export class ConfirmDeleteDossierStateDialogComponent {
|
||||||
readonly form: FormGroup;
|
readonly form: UntypedFormGroup;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _dossierStatesService: DossierStatesService,
|
private readonly _dossierStatesService: DossierStatesService,
|
||||||
@ -64,7 +64,7 @@ export class ConfirmDeleteDossierStateDialogComponent {
|
|||||||
this._loadingService.stop();
|
this._loadingService.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
#getForm(): FormGroup {
|
#getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
replaceDossierStatusId: [null],
|
replaceDossierStatusId: [null],
|
||||||
});
|
});
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { Component, Inject, Injector } from '@angular/core';
|
|||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { DefaultColorType, IColors } from '@red/domain';
|
import { DefaultColorType, IColors } from '@red/domain';
|
||||||
import { BaseDialogComponent, Toaster } from '@iqser/common-ui';
|
import { BaseDialogComponent, Toaster } from '@iqser/common-ui';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { defaultColorsTranslations } from '@translations/default-colors-translations';
|
import { defaultColorsTranslations } from '@translations/default-colors-translations';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
@ -24,7 +24,7 @@ export class EditColorDialogComponent extends BaseDialogComponent {
|
|||||||
private readonly _dossierTemplateId: string;
|
private readonly _dossierTemplateId: string;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _dictionaryService: DictionaryService,
|
private readonly _dictionaryService: DictionaryService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _translateService: TranslateService,
|
private readonly _translateService: TranslateService,
|
||||||
@ -56,7 +56,7 @@ export class EditColorDialogComponent extends BaseDialogComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
color: [this.data.colors[this.data.colorKey], [Validators.required, Validators.minLength(7)]],
|
color: [this.data.colors[this.data.colorKey], [Validators.required, Validators.minLength(7)]],
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain';
|
import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain';
|
||||||
import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations';
|
import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations';
|
||||||
import { BaseDialogComponent, Toaster } from '@iqser/common-ui';
|
import { BaseDialogComponent, Toaster } from '@iqser/common-ui';
|
||||||
@ -20,7 +20,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo
|
|||||||
private readonly _configuration: IFileAttributesConfig = this._data.config;
|
private readonly _configuration: IFileAttributesConfig = this._data.config;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _dossierTemplatesService: DossierTemplatesService,
|
private readonly _dossierTemplatesService: DossierTemplatesService,
|
||||||
private readonly _fileAttributesService: FileAttributesService,
|
private readonly _fileAttributesService: FileAttributesService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
@ -58,7 +58,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo
|
|||||||
this._dialogRef.close();
|
this._dialogRef.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
supportCsvMapping: [!!this._configuration.filenameMappingColumnHeaderName],
|
supportCsvMapping: [!!this._configuration.filenameMappingColumnHeaderName],
|
||||||
keyColumn: [this._configuration.keyColumn || '', [Validators.required]],
|
keyColumn: [this._configuration.keyColumn || '', [Validators.required]],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
||||||
import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
|
import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, ValidatorFn, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import * as Papa from 'papaparse';
|
import * as Papa from 'papaparse';
|
||||||
import { firstValueFrom, Observable } from 'rxjs';
|
import { firstValueFrom, Observable } from 'rxjs';
|
||||||
@ -26,7 +26,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<IFi
|
|||||||
parseResult: { data: any[]; errors: any[]; meta: any; fields: IField[] };
|
parseResult: { data: any[]; errors: any[]; meta: any; fields: IField[] };
|
||||||
hoveredColumn: string;
|
hoveredColumn: string;
|
||||||
activeFields: IField[] = [];
|
activeFields: IField[] = [];
|
||||||
readonly form: FormGroup;
|
readonly form: UntypedFormGroup;
|
||||||
isSearchOpen = false;
|
isSearchOpen = false;
|
||||||
previewExpanded = true;
|
previewExpanded = true;
|
||||||
filteredKeyOptions: Observable<string[]>;
|
filteredKeyOptions: Observable<string[]>;
|
||||||
@ -39,7 +39,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<IFi
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
readonly dialogRef: MatDialogRef<FileAttributesCsvImportDialogComponent>,
|
readonly dialogRef: MatDialogRef<FileAttributesCsvImportDialogComponent>,
|
||||||
private readonly _fileAttributesService: FileAttributesService,
|
private readonly _fileAttributesService: FileAttributesService,
|
||||||
@Inject(MAT_DIALOG_DATA) readonly data: IFileAttributesCSVImportData,
|
@Inject(MAT_DIALOG_DATA) readonly data: IFileAttributesCSVImportData,
|
||||||
@ -199,7 +199,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<IFi
|
|||||||
}, 0);
|
}, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
filenameMappingColumnHeaderName: ['', [Validators.required, this._autocompleteStringValidator()]],
|
filenameMappingColumnHeaderName: ['', [Validators.required, this._autocompleteStringValidator()]],
|
||||||
delimiter: [undefined, Validators.required],
|
delimiter: [undefined, Validators.required],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector } from '@angular/core';
|
import { Component, Inject, Injector } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { UserService } from '@services/user.service';
|
import { UserService } from '@services/user.service';
|
||||||
import { ISmtpConfiguration } from '@red/domain';
|
import { ISmtpConfiguration } from '@red/domain';
|
||||||
@ -12,7 +12,7 @@ import { BaseDialogComponent } from '@iqser/common-ui';
|
|||||||
})
|
})
|
||||||
export class SmtpAuthDialogComponent extends BaseDialogComponent {
|
export class SmtpAuthDialogComponent extends BaseDialogComponent {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _userService: UserService,
|
private readonly _userService: UserService,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<SmtpAuthDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<SmtpAuthDialogComponent>,
|
||||||
@ -23,7 +23,7 @@ export class SmtpAuthDialogComponent extends BaseDialogComponent {
|
|||||||
this.initialFormValue = this.form.getRawValue();
|
this.initialFormValue = this.form.getRawValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
user: [this.data?.user || this._userService.currentUser.email, [Validators.required]],
|
user: [this.data?.user || this._userService.currentUser.email, [Validators.required]],
|
||||||
password: [this.data?.password, Validators.required],
|
password: [this.data?.password, Validators.required],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, forwardRef, Injector, OnDestroy, OnInit } from '@angular/core';
|
import { Component, forwardRef, Injector, OnDestroy, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { applyIntervalConstraints } from '@utils/date-inputs-utils';
|
import { applyIntervalConstraints } from '@utils/date-inputs-utils';
|
||||||
import { DefaultListingServices, ListingComponent, LoadingService, TableColumnConfig } from '@iqser/common-ui';
|
import { DefaultListingServices, ListingComponent, LoadingService, TableColumnConfig } from '@iqser/common-ui';
|
||||||
import { auditCategoriesTranslations } from '@translations/audit-categories-translations';
|
import { auditCategoriesTranslations } from '@translations/audit-categories-translations';
|
||||||
@ -23,7 +23,7 @@ export class AuditScreenComponent extends ListingComponent<Audit> implements OnD
|
|||||||
readonly ALL_USERS = _('audit-screen.all-users');
|
readonly ALL_USERS = _('audit-screen.all-users');
|
||||||
readonly translations = auditCategoriesTranslations;
|
readonly translations = auditCategoriesTranslations;
|
||||||
readonly currentUser = this._userService.currentUser;
|
readonly currentUser = this._userService.currentUser;
|
||||||
readonly form: FormGroup = this._getForm();
|
readonly form: UntypedFormGroup = this._getForm();
|
||||||
categories: string[] = [];
|
categories: string[] = [];
|
||||||
userIds: Set<string>;
|
userIds: Set<string>;
|
||||||
logs: IAuditResponse;
|
logs: IAuditResponse;
|
||||||
@ -40,7 +40,7 @@ export class AuditScreenComponent extends ListingComponent<Audit> implements OnD
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly _userService: UserService,
|
private readonly _userService: UserService,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _auditService: AuditService,
|
private readonly _auditService: AuditService,
|
||||||
) {
|
) {
|
||||||
@ -68,7 +68,7 @@ export class AuditScreenComponent extends ListingComponent<Audit> implements OnD
|
|||||||
await this._fetchData();
|
await this._fetchData();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
category: [this.ALL_CATEGORIES],
|
category: [this.ALL_CATEGORIES],
|
||||||
userId: [this.ALL_USERS],
|
userId: [this.ALL_USERS],
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
import { SharedModule } from '@shared/shared.module';
|
import { SharedModule } from '@shared/shared.module';
|
||||||
import { DictionaryScreenComponent } from './screens/dictionary/dictionary-screen.component';
|
import { DictionaryScreenComponent } from './screens/dictionary/dictionary-screen.component';
|
||||||
import { PendingChangesGuard } from '@guards/can-deactivate.guard';
|
import { PendingChangesGuard } from '@guards/can-deactivate.guard';
|
||||||
@ -8,7 +8,7 @@ import { InfoComponent } from './screens/info/info.component';
|
|||||||
import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
|
import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
|
||||||
import { SharedAdminModule } from '../../shared/shared-admin.module';
|
import { SharedAdminModule } from '../../shared/shared-admin.module';
|
||||||
|
|
||||||
const routes = [
|
const routes: Routes = [
|
||||||
{ path: '', redirectTo: 'info', pathMatch: 'full' },
|
{ path: '', redirectTo: 'info', pathMatch: 'full' },
|
||||||
{
|
{
|
||||||
path: 'info',
|
path: 'info',
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import { BaseFormComponent, LoadingService } from '@iqser/common-ui';
|
|||||||
import { GeneralSettingsService } from '@services/general-settings.service';
|
import { GeneralSettingsService } from '@services/general-settings.service';
|
||||||
import { IGeneralConfiguration } from '@red/domain';
|
import { IGeneralConfiguration } from '@red/domain';
|
||||||
import { ConfigService } from '@services/config.service';
|
import { ConfigService } from '@services/config.service';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@ -18,7 +18,7 @@ export class GeneralConfigFormComponent extends BaseFormComponent implements OnI
|
|||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _generalSettingsService: GeneralSettingsService,
|
private readonly _generalSettingsService: GeneralSettingsService,
|
||||||
private readonly _configService: ConfigService,
|
private readonly _configService: ConfigService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
this.form = this._getForm();
|
this.form = this._getForm();
|
||||||
@ -40,7 +40,7 @@ export class GeneralConfigFormComponent extends BaseFormComponent implements OnI
|
|||||||
await this._loadData();
|
await this._loadData();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
forgotPasswordFunctionEnabled: [false],
|
forgotPasswordFunctionEnabled: [false],
|
||||||
auxiliaryName: [undefined],
|
auxiliaryName: [undefined],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, OnDestroy, OnInit } from '@angular/core';
|
import { Component, OnDestroy, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { ISmtpConfiguration } from '@red/domain';
|
import { ISmtpConfiguration } from '@red/domain';
|
||||||
import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { AdminDialogService } from '../../../services/admin-dialog.service';
|
import { AdminDialogService } from '../../../services/admin-dialog.service';
|
||||||
@ -17,7 +17,7 @@ export class SmtpFormComponent extends BaseFormComponent implements OnInit, OnDe
|
|||||||
private _initialConfiguration: ISmtpConfiguration;
|
private _initialConfiguration: ISmtpConfiguration;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _dialogService: AdminDialogService,
|
private readonly _dialogService: AdminDialogService,
|
||||||
private readonly _smtpConfigService: SmtpConfigService,
|
private readonly _smtpConfigService: SmtpConfigService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
@ -66,7 +66,7 @@ export class SmtpFormComponent extends BaseFormComponent implements OnInit, OnDe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
host: [undefined, Validators.required],
|
host: [undefined, Validators.required],
|
||||||
port: [25],
|
port: [25],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { SystemPreferences } from '@red/domain';
|
import { SystemPreferences } from '@red/domain';
|
||||||
import { BaseFormComponent, KeysOf, LoadingService } from '@iqser/common-ui';
|
import { BaseFormComponent, KeysOf, LoadingService } from '@iqser/common-ui';
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
@ -25,7 +25,7 @@ export class SystemPreferencesFormComponent extends BaseFormComponent {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _systemPreferencesService: SystemPreferencesService,
|
private readonly _systemPreferencesService: SystemPreferencesService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
this.form = this._getForm();
|
this.form = this._getForm();
|
||||||
@ -39,7 +39,7 @@ export class SystemPreferencesFormComponent extends BaseFormComponent {
|
|||||||
this._loadingService.stop();
|
this._loadingService.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
const controlsConfig = {};
|
const controlsConfig = {};
|
||||||
this.keys.forEach(key => (controlsConfig[key.name] = [this._systemPreferencesService.values[key.name], Validators.required]));
|
this.keys.forEach(key => (controlsConfig[key.name] = [this._systemPreferencesService.values[key.name], Validators.required]));
|
||||||
return this._formBuilder.group(controlsConfig);
|
return this._formBuilder.group(controlsConfig);
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { Justification } from '@red/domain';
|
import { Justification } from '@red/domain';
|
||||||
import { JustificationsService } from '@services/entity-services/justifications.service';
|
import { JustificationsService } from '@services/entity-services/justifications.service';
|
||||||
@ -15,7 +15,7 @@ import { firstValueFrom } from 'rxjs';
|
|||||||
})
|
})
|
||||||
export class AddEditJustificationDialogComponent extends BaseDialogComponent {
|
export class AddEditJustificationDialogComponent extends BaseDialogComponent {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _justificationService: JustificationsService,
|
private readonly _justificationService: JustificationsService,
|
||||||
private readonly _dossierTemplatesService: DossierTemplatesService,
|
private readonly _dossierTemplatesService: DossierTemplatesService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
@ -39,7 +39,7 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent {
|
|||||||
this._dialogRef.close(true);
|
this._dialogRef.close(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
name: [{ value: this.data.justification?.name, disabled: !!this.data.justification }, Validators.required],
|
name: [{ value: this.data.justification?.name, disabled: !!this.data.justification }, Validators.required],
|
||||||
reason: [this.data.justification?.reason, Validators.required],
|
reason: [this.data.justification?.reason, Validators.required],
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, ElementRef, Inject, OnInit, ViewChild } f
|
|||||||
import { PermissionsService } from '@services/permissions.service';
|
import { PermissionsService } from '@services/permissions.service';
|
||||||
import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
|
import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { Debounce, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
import { Debounce, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { DOSSIER_TEMPLATE_ID, IWatermark, WatermarkOrientation, WatermarkOrientations } from '@red/domain';
|
import { DOSSIER_TEMPLATE_ID, IWatermark, WatermarkOrientation, WatermarkOrientations } from '@red/domain';
|
||||||
import { BASE_HREF_FN, BaseHrefFn } from '../../../../../tokens';
|
import { BASE_HREF_FN, BaseHrefFn } from '../../../../../tokens';
|
||||||
@ -30,7 +30,7 @@ export const DEFAULT_WATERMARK: IWatermark = {
|
|||||||
})
|
})
|
||||||
export class WatermarkScreenComponent implements OnInit {
|
export class WatermarkScreenComponent implements OnInit {
|
||||||
readonly iconButtonTypes = IconButtonTypes;
|
readonly iconButtonTypes = IconButtonTypes;
|
||||||
readonly form: FormGroup = this._getForm();
|
readonly form: UntypedFormGroup = this._getForm();
|
||||||
readonly #dossierTemplateId: string;
|
readonly #dossierTemplateId: string;
|
||||||
private _instance: WebViewerInstance;
|
private _instance: WebViewerInstance;
|
||||||
private _watermark: IWatermark = {};
|
private _watermark: IWatermark = {};
|
||||||
@ -41,7 +41,7 @@ export class WatermarkScreenComponent implements OnInit {
|
|||||||
route: ActivatedRoute,
|
route: ActivatedRoute,
|
||||||
private readonly _http: HttpClient,
|
private readonly _http: HttpClient,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
readonly permissionsService: PermissionsService,
|
readonly permissionsService: PermissionsService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _licenseService: LicenseService,
|
private readonly _licenseService: LicenseService,
|
||||||
@ -187,7 +187,7 @@ export class WatermarkScreenComponent implements OnInit {
|
|||||||
this._changeDetectorRef.detectChanges();
|
this._changeDetectorRef.detectChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
const defaultValue = {
|
const defaultValue = {
|
||||||
value: null,
|
value: null,
|
||||||
disabled: !this.permissionsService.isAdmin(),
|
disabled: !this.permissionsService.isAdmin(),
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
|
||||||
import { Dictionary, IDictionary } from '@red/domain';
|
import { Dictionary, IDictionary } from '@red/domain';
|
||||||
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { map, startWith } from 'rxjs/operators';
|
import { map, startWith } from 'rxjs/operators';
|
||||||
import { firstValueFrom, Observable } from 'rxjs';
|
import { firstValueFrom, Observable } from 'rxjs';
|
||||||
import { toSnakeCase } from '@utils/functions';
|
import { toSnakeCase } from '@utils/functions';
|
||||||
@ -32,7 +32,7 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
|
|||||||
private readonly _dictionaryService: DictionaryService,
|
private readonly _dictionaryService: DictionaryService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _changeRef: ChangeDetectorRef,
|
private readonly _changeRef: ChangeDetectorRef,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
@ -111,17 +111,17 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
|
|||||||
if (isHint) {
|
if (isHint) {
|
||||||
REDACTION_FIELDS.forEach(field => form.removeControl(field));
|
REDACTION_FIELDS.forEach(field => form.removeControl(field));
|
||||||
} else {
|
} else {
|
||||||
form.addControl('defaultReason', new FormControl({ value: null, disabled: true }));
|
form.addControl('defaultReason', new UntypedFormControl({ value: null, disabled: true }));
|
||||||
|
|
||||||
if (form.get('hasDictionary').value) {
|
if (form.get('hasDictionary').value) {
|
||||||
form.addControl('addToDictionaryAction', new FormControl(this.#addToDictionaryActionControl));
|
form.addControl('addToDictionaryAction', new UntypedFormControl(this.#addToDictionaryActionControl));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
form.get('hasDictionary').valueChanges.subscribe(hasDictionary => {
|
form.get('hasDictionary').valueChanges.subscribe(hasDictionary => {
|
||||||
if (hasDictionary && !form.get('hint').value) {
|
if (hasDictionary && !form.get('hint').value) {
|
||||||
form.addControl('addToDictionaryAction', new FormControl(this.#addToDictionaryActionControl));
|
form.addControl('addToDictionaryAction', new UntypedFormControl(this.#addToDictionaryActionControl));
|
||||||
} else {
|
} else {
|
||||||
form.removeControl('addToDictionaryAction');
|
form.removeControl('addToDictionaryAction');
|
||||||
}
|
}
|
||||||
@ -153,7 +153,7 @@ export class AddEditEntityComponent extends BaseFormComponent implements OnInit
|
|||||||
return technicalName;
|
return technicalName;
|
||||||
}
|
}
|
||||||
|
|
||||||
private _colorEmpty$(form: FormGroup, field: string) {
|
private _colorEmpty$(form: UntypedFormGroup, field: string) {
|
||||||
return form.get(field).valueChanges.pipe(
|
return form.get(field).valueChanges.pipe(
|
||||||
startWith(form.get(field).value),
|
startWith(form.get(field).value),
|
||||||
map((value: string) => !value || value?.length === 0),
|
map((value: string) => !value || value?.length === 0),
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { PermissionsService } from '@services/permissions.service';
|
import { PermissionsService } from '@services/permissions.service';
|
||||||
import { Dictionary, Dossier } from '@red/domain';
|
import { Dictionary, Dossier } from '@red/domain';
|
||||||
@ -29,7 +29,7 @@ export class AcceptRecommendationDialogComponent extends BaseDialogComponent imp
|
|||||||
private readonly _dossier: Dossier;
|
private readonly _dossier: Dossier;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _permissionsService: PermissionsService,
|
private readonly _permissionsService: PermissionsService,
|
||||||
private readonly _activeDossiersService: ActiveDossiersService,
|
private readonly _activeDossiersService: ActiveDossiersService,
|
||||||
private readonly _dictionaryService: DictionaryService,
|
private readonly _dictionaryService: DictionaryService,
|
||||||
@ -77,7 +77,7 @@ export class AcceptRecommendationDialogComponent extends BaseDialogComponent imp
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
dictionary: [Validators.required],
|
dictionary: [Validators.required],
|
||||||
comment: [null],
|
comment: [null],
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { PermissionsService } from '@services/permissions.service';
|
import { PermissionsService } from '@services/permissions.service';
|
||||||
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
|
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
|
||||||
import { JustificationsService } from '@services/entity-services/justifications.service';
|
import { JustificationsService } from '@services/entity-services/justifications.service';
|
||||||
@ -25,7 +25,7 @@ export class ChangeLegalBasisDialogComponent extends BaseDialogComponent impleme
|
|||||||
private readonly _justificationsService: JustificationsService,
|
private readonly _justificationsService: JustificationsService,
|
||||||
private readonly _activeDossiersService: ActiveDossiersService,
|
private readonly _activeDossiersService: ActiveDossiersService,
|
||||||
private readonly _permissionsService: PermissionsService,
|
private readonly _permissionsService: PermissionsService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<ChangeLegalBasisDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<ChangeLegalBasisDialogComponent>,
|
||||||
@Inject(MAT_DIALOG_DATA) private readonly _data: { annotations: AnnotationWrapper[]; dossier: Dossier },
|
@Inject(MAT_DIALOG_DATA) private readonly _data: { annotations: AnnotationWrapper[]; dossier: Dossier },
|
||||||
@ -65,7 +65,7 @@ export class ChangeLegalBasisDialogComponent extends BaseDialogComponent impleme
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
reason: [null, Validators.required],
|
reason: [null, Validators.required],
|
||||||
comment: [null],
|
comment: [null],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { Dossier, File, IFileAttributeConfig } from '@red/domain';
|
import { Dossier, File, IFileAttributeConfig } from '@red/domain';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { FileAttributesService } from '@services/entity-services/file-attributes.service';
|
import { FileAttributesService } from '@services/entity-services/file-attributes.service';
|
||||||
@ -13,14 +13,14 @@ import { firstValueFrom } from 'rxjs';
|
|||||||
styleUrls: ['./document-info-dialog.component.scss'],
|
styleUrls: ['./document-info-dialog.component.scss'],
|
||||||
})
|
})
|
||||||
export class DocumentInfoDialogComponent extends BaseDialogComponent implements OnInit {
|
export class DocumentInfoDialogComponent extends BaseDialogComponent implements OnInit {
|
||||||
form: FormGroup;
|
form: UntypedFormGroup;
|
||||||
attributes: IFileAttributeConfig[];
|
attributes: IFileAttributeConfig[];
|
||||||
|
|
||||||
private readonly _dossier: Dossier;
|
private readonly _dossier: Dossier;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _activeDossiersService: ActiveDossiersService,
|
private readonly _activeDossiersService: ActiveDossiersService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _fileAttributesService: FileAttributesService,
|
private readonly _fileAttributesService: FileAttributesService,
|
||||||
private readonly _filesService: FilesService,
|
private readonly _filesService: FilesService,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
@ -50,7 +50,7 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements
|
|||||||
this._dialogRef.close(true);
|
this._dialogRef.close(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group(
|
return this._formBuilder.group(
|
||||||
this.attributes.reduce(
|
this.attributes.reduce(
|
||||||
(acc, attr) => ({
|
(acc, attr) => ({
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { BaseDialogComponent } from '@iqser/common-ui';
|
import { BaseDialogComponent } from '@iqser/common-ui';
|
||||||
import { JustificationsService } from '@services/entity-services/justifications.service';
|
import { JustificationsService } from '@services/entity-services/justifications.service';
|
||||||
@ -22,7 +22,7 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
|
|||||||
legalOptions: LegalBasisOption[] = [];
|
legalOptions: LegalBasisOption[] = [];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _justificationsService: JustificationsService,
|
private readonly _justificationsService: JustificationsService,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<ForceAnnotationDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<ForceAnnotationDialogComponent>,
|
||||||
@ -66,7 +66,7 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
|
|||||||
this._dialogRef.close(this._createForceRedactionRequest());
|
this._dialogRef.close(this._createForceRedactionRequest());
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
reason: this._data.hint ? ['Forced Hint'] : [null, Validators.required],
|
reason: this._data.hint ? ['Forced Hint'] : [null, Validators.required],
|
||||||
comment: [null],
|
comment: [null],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector } from '@angular/core';
|
import { Component, Inject, Injector } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { TextHighlightOperation, TextHighlightOperationPages } from '@red/domain';
|
import { TextHighlightOperation, TextHighlightOperationPages } from '@red/domain';
|
||||||
import { BaseDialogComponent, LoadingService } from '@iqser/common-ui';
|
import { BaseDialogComponent, LoadingService } from '@iqser/common-ui';
|
||||||
@ -26,7 +26,7 @@ export class HighlightActionDialogComponent extends BaseDialogComponent {
|
|||||||
options = [TextHighlightOperationPages.THIS_PAGE, TextHighlightOperationPages.ALL_PAGES];
|
options = [TextHighlightOperationPages.THIS_PAGE, TextHighlightOperationPages.ALL_PAGES];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<HighlightActionDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<HighlightActionDialogComponent>,
|
||||||
private readonly _textHighlightService: TextHighlightService,
|
private readonly _textHighlightService: TextHighlightService,
|
||||||
@ -57,7 +57,7 @@ export class HighlightActionDialogComponent extends BaseDialogComponent {
|
|||||||
this._dialogRef.close(true);
|
this._dialogRef.close(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
if (this.data.color) {
|
if (this.data.color) {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
color: [{ value: this.data.color, disabled: true }, Validators.required],
|
color: [{ value: this.data.color, disabled: true }, Validators.required],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
|
import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
|
||||||
import { JustificationsService } from '@services/entity-services/justifications.service';
|
import { JustificationsService } from '@services/entity-services/justifications.service';
|
||||||
@ -34,7 +34,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
|
|||||||
private readonly _dossier: Dossier;
|
private readonly _dossier: Dossier;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _justificationsService: JustificationsService,
|
private readonly _justificationsService: JustificationsService,
|
||||||
private readonly _manualRedactionService: ManualRedactionService,
|
private readonly _manualRedactionService: ManualRedactionService,
|
||||||
private readonly _activeDossiersService: ActiveDossiersService,
|
private readonly _activeDossiersService: ActiveDossiersService,
|
||||||
@ -139,7 +139,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
selectedText: this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value,
|
selectedText: this.data?.manualRedactionEntryWrapper?.manualRedactionEntry?.value,
|
||||||
section: [null],
|
section: [null],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, Validators } from '@angular/forms';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
||||||
import { imageCategoriesTranslations } from '@translations/image-categories-translations';
|
import { imageCategoriesTranslations } from '@translations/image-categories-translations';
|
||||||
@ -14,7 +14,7 @@ export class RecategorizeImageDialogComponent extends BaseDialogComponent implem
|
|||||||
translations = imageCategoriesTranslations;
|
translations = imageCategoriesTranslations;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<RecategorizeImageDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<RecategorizeImageDialogComponent>,
|
||||||
@Inject(MAT_DIALOG_DATA) public data: { annotations: AnnotationWrapper[]; dossier: Dossier },
|
@Inject(MAT_DIALOG_DATA) public data: { annotations: AnnotationWrapper[]; dossier: Dossier },
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { Component, Inject, Injector } from '@angular/core';
|
|||||||
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { FormBuilder } from '@angular/forms';
|
import { UntypedFormBuilder } from '@angular/forms';
|
||||||
import { BaseDialogComponent, humanize } from '@iqser/common-ui';
|
import { BaseDialogComponent, humanize } from '@iqser/common-ui';
|
||||||
import { Dossier } from '@red/domain';
|
import { Dossier } from '@red/domain';
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ export interface RemoveAnnotationsDialogInput {
|
|||||||
export class RemoveAnnotationsDialogComponent extends BaseDialogComponent {
|
export class RemoveAnnotationsDialogComponent extends BaseDialogComponent {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _translateService: TranslateService,
|
private readonly _translateService: TranslateService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<RemoveAnnotationsDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<RemoveAnnotationsDialogComponent>,
|
||||||
@Inject(MAT_DIALOG_DATA) public data: RemoveAnnotationsDialogInput,
|
@Inject(MAT_DIALOG_DATA) public data: RemoveAnnotationsDialogInput,
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { FormBuilder } from '@angular/forms';
|
import { UntypedFormBuilder } from '@angular/forms';
|
||||||
import { BaseDialogComponent } from '@iqser/common-ui';
|
import { BaseDialogComponent } from '@iqser/common-ui';
|
||||||
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
||||||
|
|
||||||
@ -9,7 +9,7 @@ import { AnnotationWrapper } from '@models/file/annotation.wrapper';
|
|||||||
})
|
})
|
||||||
export class ResizeAnnotationDialogComponent extends BaseDialogComponent implements OnInit {
|
export class ResizeAnnotationDialogComponent extends BaseDialogComponent implements OnInit {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
protected readonly _injector: Injector,
|
protected readonly _injector: Injector,
|
||||||
protected readonly _dialogRef: MatDialogRef<ResizeAnnotationDialogComponent>,
|
protected readonly _dialogRef: MatDialogRef<ResizeAnnotationDialogComponent>,
|
||||||
@Inject(MAT_DIALOG_DATA) private readonly _data: { annotation: AnnotationWrapper; text?: string },
|
@Inject(MAT_DIALOG_DATA) private readonly _data: { annotation: AnnotationWrapper; text?: string },
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core';
|
|||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { UserService } from '@services/user.service';
|
import { UserService } from '@services/user.service';
|
||||||
import { LoadingService, Toaster } from '@iqser/common-ui';
|
import { LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { Dossier, File, WorkflowFileStatus, WorkflowFileStatuses } from '@red/domain';
|
import { Dossier, File, WorkflowFileStatus, WorkflowFileStatuses } from '@red/domain';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
import { FilesService } from '@services/files/files.service';
|
import { FilesService } from '@services/files/files.service';
|
||||||
@ -23,14 +23,14 @@ class DialogData {
|
|||||||
styleUrls: ['./assign-reviewer-approver-dialog.component.scss'],
|
styleUrls: ['./assign-reviewer-approver-dialog.component.scss'],
|
||||||
})
|
})
|
||||||
export class AssignReviewerApproverDialogComponent {
|
export class AssignReviewerApproverDialogComponent {
|
||||||
readonly form: FormGroup;
|
readonly form: UntypedFormGroup;
|
||||||
readonly mode: 'reviewer' | 'approver';
|
readonly mode: 'reviewer' | 'approver';
|
||||||
dossier: Dossier;
|
dossier: Dossier;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
readonly userService: UserService,
|
readonly userService: UserService,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _activeDossiersService: ActiveDossiersService,
|
private readonly _activeDossiersService: ActiveDossiersService,
|
||||||
private readonly _filesService: FilesService,
|
private readonly _filesService: FilesService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
@ -118,7 +118,7 @@ export class AssignReviewerApproverDialogComponent {
|
|||||||
this._dialogRef.close(true);
|
this._dialogRef.close(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
// Allow a null reviewer if a previous reviewer exists (= it's not the first assignment) & current user is allowed to unassign
|
// Allow a null reviewer if a previous reviewer exists (= it's not the first assignment) & current user is allowed to unassign
|
||||||
user: [this._user, this._canUnassignFiles && !this._user ? Validators.required : null],
|
user: [this._user, this._canUnassignFiles && !this._user ? Validators.required : null],
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-doss
|
|||||||
import { Dossier, DossierAttributeConfigType, DossierAttributeConfigTypes, DossierAttributeWithValue } from '@red/domain';
|
import { Dossier, DossierAttributeConfigType, DossierAttributeConfigTypes, DossierAttributeWithValue } from '@red/domain';
|
||||||
import { PermissionsService } from '@services/permissions.service';
|
import { PermissionsService } from '@services/permissions.service';
|
||||||
import { CircleButtonTypes, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
import { CircleButtonTypes, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { DossierAttributesService } from '@services/entity-services/dossier-attributes.service';
|
import { DossierAttributesService } from '@services/entity-services/dossier-attributes.service';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
@ -24,14 +24,14 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa
|
|||||||
imageAttributes: DossierAttributeWithValue[] = [];
|
imageAttributes: DossierAttributeWithValue[] = [];
|
||||||
attributes: DossierAttributeWithValue[] = [];
|
attributes: DossierAttributeWithValue[] = [];
|
||||||
|
|
||||||
form: FormGroup;
|
form: UntypedFormGroup;
|
||||||
@ViewChildren('fileInput') private _fileInputs: QueryList<ElementRef>;
|
@ViewChildren('fileInput') private _fileInputs: QueryList<ElementRef>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _permissionsService: PermissionsService,
|
private readonly _permissionsService: PermissionsService,
|
||||||
private readonly _dossierAttributesService: DossierAttributesService,
|
private readonly _dossierAttributesService: DossierAttributesService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa
|
|||||||
this.imageAttributes = this.attributes.filter(attr => this.isSpecificType(attr, this.dossierAttributeConfigTypes.IMAGE));
|
this.imageAttributes = this.attributes.filter(attr => this.isSpecificType(attr, this.dossierAttributeConfigTypes.IMAGE));
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
const controlsConfig = {};
|
const controlsConfig = {};
|
||||||
for (const attribute of this.attributes) {
|
for (const attribute of this.attributes) {
|
||||||
controlsConfig[attribute.id] = [{ value: attribute.value, disabled: this.disabled }];
|
controlsConfig[attribute.id] = [{ value: attribute.value, disabled: this.disabled }];
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import { DictionaryManagerComponent } from '@shared/components/dictionary-manage
|
|||||||
import { DictionaryService } from '@services/entity-services/dictionary.service';
|
import { DictionaryService } from '@services/entity-services/dictionary.service';
|
||||||
import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
import { DossiersService } from '@services/dossiers/dossiers.service';
|
import { DossiersService } from '@services/dossiers/dossiers.service';
|
||||||
|
|
||||||
@ -18,7 +18,7 @@ import { DossiersService } from '@services/dossiers/dossiers.service';
|
|||||||
export class EditDossierDictionaryComponent implements EditDossierSectionInterface, OnInit {
|
export class EditDossierDictionaryComponent implements EditDossierSectionInterface, OnInit {
|
||||||
@Input() dossier: Dossier;
|
@Input() dossier: Dossier;
|
||||||
|
|
||||||
form: FormGroup;
|
form: UntypedFormGroup;
|
||||||
canEdit = false;
|
canEdit = false;
|
||||||
canEditDisplayName = false;
|
canEditDisplayName = false;
|
||||||
dossierDictionary: Dictionary;
|
dossierDictionary: Dictionary;
|
||||||
@ -31,7 +31,7 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
|
|||||||
private readonly _dictionaryService: DictionaryService,
|
private readonly _dictionaryService: DictionaryService,
|
||||||
private readonly _permissionsService: PermissionsService,
|
private readonly _permissionsService: PermissionsService,
|
||||||
private readonly _loadingService: LoadingService,
|
private readonly _loadingService: LoadingService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _toaster: Toaster,
|
private readonly _toaster: Toaster,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@ -117,7 +117,7 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
addToDictionaryAction: [
|
addToDictionaryAction: [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { Component, Input, OnInit } from '@angular/core';
|
import { Component, Input, OnInit } from '@angular/core';
|
||||||
import { Dossier, DownloadFileType, IReportTemplate } from '@red/domain';
|
import { Dossier, DownloadFileType, IReportTemplate } from '@red/domain';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
|
||||||
import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
|
import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
|
||||||
import { downloadTypesTranslations } from '@translations/download-types-translations';
|
import { downloadTypesTranslations } from '@translations/download-types-translations';
|
||||||
import { ReportTemplateService } from '@services/report-template.service';
|
import { ReportTemplateService } from '@services/report-template.service';
|
||||||
@ -14,7 +14,7 @@ import { DossiersService } from '@services/dossiers/dossiers.service';
|
|||||||
styleUrls: ['./edit-dossier-download-package.component.scss'],
|
styleUrls: ['./edit-dossier-download-package.component.scss'],
|
||||||
})
|
})
|
||||||
export class EditDossierDownloadPackageComponent implements OnInit, EditDossierSectionInterface {
|
export class EditDossierDownloadPackageComponent implements OnInit, EditDossierSectionInterface {
|
||||||
form: FormGroup;
|
form: UntypedFormGroup;
|
||||||
downloadTypes: { key: DownloadFileType; label: string }[] = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(
|
downloadTypes: { key: DownloadFileType; label: string }[] = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(
|
||||||
(type: DownloadFileType) => ({
|
(type: DownloadFileType) => ({
|
||||||
key: type,
|
key: type,
|
||||||
@ -28,7 +28,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly _dossiersService: DossiersService,
|
private readonly _dossiersService: DossiersService,
|
||||||
private readonly _reportTemplateController: ReportTemplateService,
|
private readonly _reportTemplateController: ReportTemplateService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _permissionsService: PermissionsService,
|
private readonly _permissionsService: PermissionsService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@ -111,7 +111,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group(
|
return this._formBuilder.group(
|
||||||
{
|
{
|
||||||
reportTemplateIds: [this.dossier.reportTemplateIds],
|
reportTemplateIds: [this.dossier.reportTemplateIds],
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
|
||||||
import { UserService } from '@services/user.service';
|
import { UserService } from '@services/user.service';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { Dossier, IDossierRequest } from '@red/domain';
|
import { Dossier, IDossierRequest } from '@red/domain';
|
||||||
import { AutoUnsubscribe } from '@iqser/common-ui';
|
import { AutoUnsubscribe } from '@iqser/common-ui';
|
||||||
import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
|
import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
|
||||||
@ -16,7 +16,7 @@ import { compareLists } from '@utils/functions';
|
|||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDossierSectionInterface, OnInit, OnDestroy {
|
export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDossierSectionInterface, OnInit, OnDestroy {
|
||||||
form: FormGroup;
|
form: UntypedFormGroup;
|
||||||
searchQuery = '';
|
searchQuery = '';
|
||||||
|
|
||||||
@Input() dossier: Dossier;
|
@Input() dossier: Dossier;
|
||||||
@ -28,7 +28,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
readonly userService: UserService,
|
readonly userService: UserService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _dossiersService: DossiersService,
|
private readonly _dossiersService: DossiersService,
|
||||||
private readonly _permissionsService: PermissionsService,
|
private readonly _permissionsService: PermissionsService,
|
||||||
) {
|
) {
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { Dossier, DOSSIER_TEMPLATE_ID, IDossierRequest, IDossierTemplate } from '@red/domain';
|
import { Dossier, DOSSIER_TEMPLATE_ID, IDossierRequest, IDossierTemplate } from '@red/domain';
|
||||||
import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
|
import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
|
||||||
import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
|
import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
|
||||||
@ -30,7 +30,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
|
|||||||
|
|
||||||
@Input() dossier: Dossier;
|
@Input() dossier: Dossier;
|
||||||
|
|
||||||
form: FormGroup;
|
form: UntypedFormGroup;
|
||||||
statusPlaceholder: string;
|
statusPlaceholder: string;
|
||||||
hasDueDate: boolean;
|
hasDueDate: boolean;
|
||||||
dossierTemplates: IDossierTemplate[];
|
dossierTemplates: IDossierTemplate[];
|
||||||
@ -43,7 +43,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
|
|||||||
private readonly _dossiersService: DossiersService,
|
private readonly _dossiersService: DossiersService,
|
||||||
private readonly _trashService: TrashService,
|
private readonly _trashService: TrashService,
|
||||||
private readonly _dossierStatsService: DossierStatsService,
|
private readonly _dossierStatsService: DossierStatsService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _dialogService: DossiersDialogService,
|
private readonly _dialogService: DossiersDialogService,
|
||||||
private readonly _router: Router,
|
private readonly _router: Router,
|
||||||
private readonly _editDossierDialogRef: MatDialogRef<EditDossierDialogComponent>,
|
private readonly _editDossierDialogRef: MatDialogRef<EditDossierDialogComponent>,
|
||||||
@ -179,7 +179,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
|
|||||||
return this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId).color;
|
return this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId).color;
|
||||||
}
|
}
|
||||||
|
|
||||||
#getForm(): FormGroup {
|
#getForm(): UntypedFormGroup {
|
||||||
const formFieldWithArchivedCheck = value => ({ value, disabled: !this.dossier.isActive });
|
const formFieldWithArchivedCheck = value => ({ value, disabled: !this.dossier.isActive });
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
dossierName: [formFieldWithArchivedCheck(this.dossier.dossierName), Validators.required],
|
dossierName: [formFieldWithArchivedCheck(this.dossier.dossierName), Validators.required],
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
import { Component, Inject, Injector, OnInit } from '@angular/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { DOSSIER_TEMPLATE_ID, DownloadFileType, IDossierRequest, IDossierTemplate, IReportTemplate } from '@red/domain';
|
import { DOSSIER_TEMPLATE_ID, DownloadFileType, IDossierRequest, IDossierTemplate, IReportTemplate } from '@red/domain';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { downloadTypesTranslations } from '@translations/download-types-translations';
|
import { downloadTypesTranslations } from '@translations/download-types-translations';
|
||||||
import { BaseDialogComponent, IconButtonTypes, LoadingService, SaveOptions } from '@iqser/common-ui';
|
import { BaseDialogComponent, IconButtonTypes, LoadingService, SaveOptions } from '@iqser/common-ui';
|
||||||
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
|
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
|
||||||
@ -36,7 +36,7 @@ export class AddDossierDialogComponent extends BaseDialogComponent implements On
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly _activeDossiersService: ActiveDossiersService,
|
private readonly _activeDossiersService: ActiveDossiersService,
|
||||||
private readonly _dossierTemplatesService: DossierTemplatesService,
|
private readonly _dossierTemplatesService: DossierTemplatesService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
private readonly _reportTemplateController: ReportTemplateService,
|
private readonly _reportTemplateController: ReportTemplateService,
|
||||||
private readonly _router: Router,
|
private readonly _router: Router,
|
||||||
private readonly _dialogService: DossiersDialogService,
|
private readonly _dialogService: DossiersDialogService,
|
||||||
@ -116,7 +116,7 @@ export class AddDossierDialogComponent extends BaseDialogComponent implements On
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private _getForm(): FormGroup {
|
private _getForm(): UntypedFormGroup {
|
||||||
return this._formBuilder.group(
|
return this._formBuilder.group(
|
||||||
{
|
{
|
||||||
dossierName: [null, Validators.required],
|
dossierName: [null, Validators.required],
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core';
|
|||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
import { DetailsRadioOption, IconButtonTypes } from '@iqser/common-ui';
|
import { DetailsRadioOption, IconButtonTypes } from '@iqser/common-ui';
|
||||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
||||||
import { OverwriteFileOption, OverwriteFileOptions } from '@red/domain';
|
import { OverwriteFileOption, OverwriteFileOptions } from '@red/domain';
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ import { OverwriteFileOption, OverwriteFileOptions } from '@red/domain';
|
|||||||
})
|
})
|
||||||
export class OverwriteFilesDialogComponent {
|
export class OverwriteFilesDialogComponent {
|
||||||
readonly iconButtonTypes = IconButtonTypes;
|
readonly iconButtonTypes = IconButtonTypes;
|
||||||
readonly form: FormGroup;
|
readonly form: UntypedFormGroup;
|
||||||
readonly options: DetailsRadioOption<OverwriteFileOption>[] = [
|
readonly options: DetailsRadioOption<OverwriteFileOption>[] = [
|
||||||
{
|
{
|
||||||
label: _('overwrite-files-dialog.options.full-overwrite.label'),
|
label: _('overwrite-files-dialog.options.full-overwrite.label'),
|
||||||
@ -34,7 +34,7 @@ export class OverwriteFilesDialogComponent {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly _translateService: TranslateService,
|
private readonly _translateService: TranslateService,
|
||||||
private readonly _formBuilder: FormBuilder,
|
private readonly _formBuilder: UntypedFormBuilder,
|
||||||
public dialogRef: MatDialogRef<OverwriteFilesDialogComponent>,
|
public dialogRef: MatDialogRef<OverwriteFilesDialogComponent>,
|
||||||
@Inject(MAT_DIALOG_DATA) public filename: string,
|
@Inject(MAT_DIALOG_DATA) public filename: string,
|
||||||
) {
|
) {
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
import { FormGroup } from '@angular/forms';
|
import { UntypedFormGroup } from '@angular/forms';
|
||||||
import { Dayjs } from 'dayjs';
|
import { Dayjs } from 'dayjs';
|
||||||
|
|
||||||
export function applyIntervalConstraints(
|
export function applyIntervalConstraints(
|
||||||
value,
|
value,
|
||||||
previousFrom: Dayjs,
|
previousFrom: Dayjs,
|
||||||
previousTo: Dayjs,
|
previousTo: Dayjs,
|
||||||
form: FormGroup,
|
form: UntypedFormGroup,
|
||||||
fromKey: string,
|
fromKey: string,
|
||||||
toKey: string,
|
toKey: string,
|
||||||
): boolean {
|
): boolean {
|
||||||
|
|||||||
@ -9,5 +9,8 @@
|
|||||||
{
|
{
|
||||||
"path": "./tsconfig.spec.json"
|
"path": "./tsconfig.spec.json"
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "es2020"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit 43a9067bf3c712316c78223a243ae98868e46932
|
Subproject commit 9ee7b12e4a51c7d1ee8923dc87e359b12e5be118
|
||||||
@ -9,5 +9,8 @@
|
|||||||
{
|
{
|
||||||
"path": "./tsconfig.spec.json"
|
"path": "./tsconfig.spec.json"
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "es2020"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
4
nx.json
4
nx.json
@ -31,7 +31,6 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"cli": {
|
"cli": {
|
||||||
"defaultCollection": "@nrwl/angular",
|
|
||||||
"analytics": false,
|
"analytics": false,
|
||||||
"packageManager": "yarn"
|
"packageManager": "yarn"
|
||||||
},
|
},
|
||||||
@ -46,5 +45,6 @@
|
|||||||
"unitTestRunner": "jest"
|
"unitTestRunner": "jest"
|
||||||
},
|
},
|
||||||
"@nrwl/angular:component": {}
|
"@nrwl/angular:component": {}
|
||||||
}
|
},
|
||||||
|
"$schema": "./node_modules/nx/schemas/nx-schema.json"
|
||||||
}
|
}
|
||||||
|
|||||||
62
package.json
62
package.json
@ -8,7 +8,7 @@
|
|||||||
"build-lint-all": "ng build --project=red-ui --configuration production --base-href /ui/",
|
"build-lint-all": "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",
|
"build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css",
|
||||||
"i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/{en,de}.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write",
|
"i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/{en,de}.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write",
|
||||||
"postinstall": "ngcc --properties es2015 browser module main",
|
"postinstall": "ngcc --properties es2020 browser module main",
|
||||||
"lint": "ng lint --project=red-domain --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix",
|
"lint": "ng lint --project=red-domain --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix",
|
||||||
"nx": "nx",
|
"nx": "nx",
|
||||||
"start": "nx serve",
|
"start": "nx serve",
|
||||||
@ -24,23 +24,23 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "13.3.9",
|
"@angular/animations": "14.0.1",
|
||||||
"@angular/cdk": "13.3.7",
|
"@angular/cdk": "14.0.1",
|
||||||
"@angular/common": "13.3.9",
|
"@angular/common": "14.0.1",
|
||||||
"@angular/compiler": "13.3.9",
|
"@angular/compiler": "14.0.1",
|
||||||
"@angular/core": "13.3.9",
|
"@angular/core": "14.0.1",
|
||||||
"@angular/forms": "13.3.9",
|
"@angular/forms": "14.0.1",
|
||||||
"@angular/material": "13.3.7",
|
"@angular/material": "14.0.1",
|
||||||
"@angular/platform-browser": "13.3.9",
|
"@angular/platform-browser": "14.0.1",
|
||||||
"@angular/platform-browser-dynamic": "13.3.9",
|
"@angular/platform-browser-dynamic": "14.0.1",
|
||||||
"@angular/router": "13.3.9",
|
"@angular/router": "14.0.1",
|
||||||
"@angular/service-worker": "13.3.9",
|
"@angular/service-worker": "14.0.1",
|
||||||
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
|
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
|
||||||
"@materia-ui/ngx-monaco-editor": "^6.0.0",
|
"@materia-ui/ngx-monaco-editor": "^6.0.0",
|
||||||
"@ngneat/until-destroy": "^9.2.0",
|
"@ngneat/until-destroy": "^9.2.0",
|
||||||
"@ngx-translate/core": "^14.0.0",
|
"@ngx-translate/core": "^14.0.0",
|
||||||
"@ngx-translate/http-loader": "^7.0.0",
|
"@ngx-translate/http-loader": "^7.0.0",
|
||||||
"@nrwl/angular": "14.1.9",
|
"@nrwl/angular": "14.3.1",
|
||||||
"@pdftron/webviewer": "8.5.0",
|
"@pdftron/webviewer": "8.5.0",
|
||||||
"@tabuckner/material-dayjs-adapter": "2.0.0",
|
"@tabuckner/material-dayjs-adapter": "2.0.0",
|
||||||
"angular-google-charts": "^2.2.2",
|
"angular-google-charts": "^2.2.2",
|
||||||
@ -66,29 +66,29 @@
|
|||||||
"zone.js": "0.11.5"
|
"zone.js": "0.11.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/build-angular": "13.3.6",
|
"@angular-devkit/build-angular": "14.0.1",
|
||||||
"@angular-eslint/eslint-plugin": "13.2.1",
|
"@angular-eslint/eslint-plugin": "13.2.1",
|
||||||
"@angular-eslint/eslint-plugin-template": "13.2.1",
|
"@angular-eslint/eslint-plugin-template": "13.2.1",
|
||||||
"@angular-eslint/template-parser": "13.2.1",
|
"@angular-eslint/template-parser": "13.2.1",
|
||||||
"@angular/cli": "13.3.6",
|
"@angular/cli": "~14.0.0",
|
||||||
"@angular/compiler-cli": "13.3.9",
|
"@angular/compiler-cli": "14.0.1",
|
||||||
"@angular/language-service": "13.3.9",
|
"@angular/language-service": "14.0.1",
|
||||||
"@bartholomej/ngx-translate-extract": "^8.0.2",
|
"@bartholomej/ngx-translate-extract": "^8.0.2",
|
||||||
"@nrwl/cli": "14.1.9",
|
"@nrwl/cli": "14.3.1",
|
||||||
"@nrwl/eslint-plugin-nx": "14.1.9",
|
"@nrwl/eslint-plugin-nx": "14.3.1",
|
||||||
"@nrwl/jest": "14.1.9",
|
"@nrwl/jest": "14.3.1",
|
||||||
"@nrwl/linter": "14.1.9",
|
"@nrwl/linter": "14.3.1",
|
||||||
"@nrwl/workspace": "14.1.9",
|
"@nrwl/workspace": "14.3.1",
|
||||||
"@types/google.visualization": "^0.0.68",
|
"@types/google.visualization": "^0.0.68",
|
||||||
"@types/jest": "27.5.1",
|
"@types/jest": "27.5.1",
|
||||||
"@types/lodash-es": "^4.17.6",
|
"@types/lodash-es": "^4.17.6",
|
||||||
"@types/node": "17.0.35",
|
"@types/node": "17.0.35",
|
||||||
"@types/puppeteer": "^5.4.6",
|
"@types/puppeteer": "^5.4.6",
|
||||||
"@typescript-eslint/eslint-plugin": "5.26.0",
|
"@typescript-eslint/eslint-plugin": "5.24.0",
|
||||||
"@typescript-eslint/parser": "5.26.0",
|
"@typescript-eslint/parser": "5.24.0",
|
||||||
"axios": "^0.27.2",
|
"axios": "^0.27.2",
|
||||||
"dotenv": "16.0.1",
|
"dotenv": "16.0.1",
|
||||||
"eslint": "8.16.0",
|
"eslint": "8.15.0",
|
||||||
"eslint-config-airbnb-base": "^15.0.0",
|
"eslint-config-airbnb-base": "^15.0.0",
|
||||||
"eslint-config-airbnb-typescript": "^17.0.0",
|
"eslint-config-airbnb-typescript": "^17.0.0",
|
||||||
"eslint-config-prettier": "8.5.0",
|
"eslint-config-prettier": "8.5.0",
|
||||||
@ -97,21 +97,21 @@
|
|||||||
"google-translate-api-browser": "^1.1.71",
|
"google-translate-api-browser": "^1.1.71",
|
||||||
"husky": "4.3.8",
|
"husky": "4.3.8",
|
||||||
"jest": "28.1.0",
|
"jest": "28.1.0",
|
||||||
"jest-preset-angular": "12.0.1",
|
"jest-preset-angular": "11.1.2",
|
||||||
"ng-packagr": "13.3.1",
|
"ng-packagr": "14.0.2",
|
||||||
"nx": "14.1.9",
|
"nx": "14.3.1",
|
||||||
"postcss": "^8.4.14",
|
"postcss": "^8.4.14",
|
||||||
"postcss-import": "14.1.0",
|
"postcss-import": "14.1.0",
|
||||||
"postcss-preset-env": "~7.6.0",
|
"postcss-preset-env": "~7.6.0",
|
||||||
"postcss-url": "10.1.3",
|
"postcss-url": "10.1.3",
|
||||||
"prettier": "2.6.2",
|
"prettier": "2.7.0",
|
||||||
"pretty-quick": "^3.1.3",
|
"pretty-quick": "^3.1.3",
|
||||||
"sonarqube-scanner": "^2.8.1",
|
"sonarqube-scanner": "^2.8.1",
|
||||||
"superagent": "^7.1.3",
|
"superagent": "^7.1.3",
|
||||||
"superagent-promise": "^1.1.0",
|
"superagent-promise": "^1.1.0",
|
||||||
"ts-jest": "28.0.3",
|
"ts-jest": "28.0.3",
|
||||||
"ts-node": "10.8.0",
|
"ts-node": "10.8.1",
|
||||||
"typescript": "4.6.4",
|
"typescript": "4.7.3",
|
||||||
"webpack": "^5.72.1",
|
"webpack": "^5.72.1",
|
||||||
"webpack-bundle-analyzer": "^4.5.0",
|
"webpack-bundle-analyzer": "^4.5.0",
|
||||||
"xliff": "^6.0.0"
|
"xliff": "^6.0.0"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user