Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

updated base dialog to not verify the changes on closing the window when it's on edit mode

Browse Source
This commit is contained in:
Valentin Mihai 2022-02-25 12:45:34 +02:00
parent cbeb63e121
commit fecec0e32e
14 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/red-ui/src/app/modules/admin/admin-routing.module.ts
View File

@ -75,7 +75,6 @@ const routes: Routes = [
path: 'rules', path: 'rules',
component: BaseDossierTemplateScreenComponent, component: BaseDossierTemplateScreenComponent,
canActivate: [CompositeRouteGuard], canActivate: [CompositeRouteGuard],
canDeactivate: [PendingChangesGuard],
data: { data: {
routeGuards: [AuthGuard, RedRoleGuard], routeGuards: [AuthGuard, RedRoleGuard],
}, },

2
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
View File

@ -41,7 +41,7 @@ export class AddEditDictionaryDialogComponent extends BaseDialogComponent {
@Inject(MAT_DIALOG_DATA) @Inject(MAT_DIALOG_DATA)
private readonly _data: { readonly dictionary: Dictionary; readonly dossierTemplateId: string }, private readonly _data: { readonly dictionary: Dictionary; readonly dossierTemplateId: string },
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, !!_data.dictionary);
this.form = this._getForm(this.dictionary); this.form = this._getForm(this.dictionary);
this.initialFormValue = this.form.getRawValue(); this.initialFormValue = this.form.getRawValue();
this.hasColor$ = this._colorEmpty$; this.hasColor$ = this._colorEmpty$;

2
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts
View File

@ -27,7 +27,7 @@ export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent
@Inject(MAT_DIALOG_DATA) @Inject(MAT_DIALOG_DATA)
readonly data: { readonly dossierAttribute: IDossierAttributeConfig; dossierTemplateId: string }, readonly data: { readonly dossierAttribute: IDossierAttributeConfig; dossierTemplateId: string },
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, !!data.dossierAttribute);
this.form = this._getForm(this.dossierAttribute); this.form = this._getForm(this.dossierAttribute);
this.initialFormValue = this.form.getRawValue(); this.initialFormValue = this.form.getRawValue();
} }

2
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts
View File

@ -22,7 +22,7 @@ export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
protected readonly _dialogRef: MatDialogRef<AddEditDossierStateDialogComponent>, protected readonly _dialogRef: MatDialogRef<AddEditDossierStateDialogComponent>,
@Inject(MAT_DIALOG_DATA) readonly data: DialogData, @Inject(MAT_DIALOG_DATA) readonly data: DialogData,
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, !!data.dossierState);
this.form = this.#getForm(); this.form = this.#getForm();
this.initialFormValue = this.form.getRawValue(); this.initialFormValue = this.form.getRawValue();
} }

2
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts
View File

@ -41,7 +41,7 @@ export class AddEditDossierTemplateDialogComponent extends BaseDialogComponent {
private readonly _loadingService: LoadingService, private readonly _loadingService: LoadingService,
@Inject(MAT_DIALOG_DATA) readonly dossierTemplateId: string, @Inject(MAT_DIALOG_DATA) readonly dossierTemplateId: string,
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, !!dossierTemplateId);
this.dossierTemplate = this._dossierTemplatesService.find(this.dossierTemplateId); this.dossierTemplate = this._dossierTemplatesService.find(this.dossierTemplateId);
this.form = this._getForm(); this.form = this._getForm();
this.initialFormValue = this.form.getRawValue(); this.initialFormValue = this.form.getRawValue();

2
apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts
View File

@ -34,7 +34,7 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent {
numberOfFilterableAttrs: number; numberOfFilterableAttrs: number;
}, },
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, !!data.fileAttribute);
this.canSetDisplayed = data.numberOfDisplayedAttrs < this.DISPLAYED_FILTERABLE_LIMIT || data.fileAttribute?.displayedInFileList; this.canSetDisplayed = data.numberOfDisplayedAttrs < this.DISPLAYED_FILTERABLE_LIMIT || data.fileAttribute?.displayedInFileList;
this.canSetFilterable = data.numberOfFilterableAttrs < this.DISPLAYED_FILTERABLE_LIMIT || data.fileAttribute?.filterable; this.canSetFilterable = data.numberOfFilterableAttrs < this.DISPLAYED_FILTERABLE_LIMIT || data.fileAttribute?.filterable;
this.form = this._getForm(this.fileAttribute); this.form = this._getForm(this.fileAttribute);

4
apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts
View File

@ -19,9 +19,9 @@ export class AddEditUserDialogComponent extends BaseDialogComponent {
protected readonly _dialogRef: MatDialogRef<AddEditUserDialogComponent>, protected readonly _dialogRef: MatDialogRef<AddEditUserDialogComponent>,
@Inject(MAT_DIALOG_DATA) readonly user: User, @Inject(MAT_DIALOG_DATA) readonly user: User,
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, !!user);
} }
X;
toggleResetPassword() { toggleResetPassword() {
this.resettingPassword = !this.resettingPassword; this.resettingPassword = !this.resettingPassword;
} }

2
apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts
View File

@ -33,7 +33,7 @@ export class EditColorDialogComponent extends BaseDialogComponent {
@Inject(MAT_DIALOG_DATA) @Inject(MAT_DIALOG_DATA)
readonly data: IEditColorData, readonly data: IEditColorData,
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, true);
this._dossierTemplateId = data.dossierTemplateId; this._dossierTemplateId = data.dossierTemplateId;
this.form = this._getForm(); this.form = this._getForm();

2
apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts
View File

@ -28,7 +28,7 @@ export class FileAttributesConfigurationsDialogComponent extends BaseDialogCompo
protected readonly _dialogRef: MatDialogRef<FileAttributesConfigurationsDialogComponent>, protected readonly _dialogRef: MatDialogRef<FileAttributesConfigurationsDialogComponent>,
@Inject(MAT_DIALOG_DATA) private _data: { config: IFileAttributesConfig; dossierTemplateId: string }, @Inject(MAT_DIALOG_DATA) private _data: { config: IFileAttributesConfig; dossierTemplateId: string },
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, true);
this.form = this._getForm(); this.form = this._getForm();
this.initialFormValue = this.form.getRawValue(); this.initialFormValue = this.form.getRawValue();
} }

2
apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts
View File

@ -23,7 +23,7 @@ export class AddEditJustificationDialogComponent extends BaseDialogComponent {
protected readonly _dialogRef: MatDialogRef<AddEditJustificationDialogComponent>, protected readonly _dialogRef: MatDialogRef<AddEditJustificationDialogComponent>,
@Inject(MAT_DIALOG_DATA) public data: { justification?: Justification; dossierTemplateId: string }, @Inject(MAT_DIALOG_DATA) public data: { justification?: Justification; dossierTemplateId: string },
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, !!data.justification);
this.form = this._getForm(); this.form = this._getForm();
this.initialFormValue = this.form.getRawValue(); this.initialFormValue = this.form.getRawValue();

3
apps/red-ui/src/app/modules/admin/screens/rules/rules.module.ts
View File

@ -4,8 +4,9 @@ import { RouterModule } from '@angular/router';
import { SharedModule } from '../../../shared/shared.module'; import { SharedModule } from '../../../shared/shared.module';
import { RulesScreenComponent } from './rules-screen/rules-screen.component'; import { RulesScreenComponent } from './rules-screen/rules-screen.component';
import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard';
const routes = [{ path: '', component: RulesScreenComponent }]; const routes = [{ path: '', component: RulesScreenComponent, canDeactivate: [PendingChangesGuard] }];
@NgModule({ @NgModule({
declarations: [RulesScreenComponent], declarations: [RulesScreenComponent],

2
apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts
View File

@ -31,7 +31,7 @@ export class ChangeLegalBasisDialogComponent extends BaseDialogComponent impleme
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 },
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, true);
this.form = this._getForm(); this.form = this._getForm();
} }

2
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
View File

@ -53,7 +53,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A
section?: Section; section?: Section;
}, },
) { ) {
super(_injector, _dialogRef); super(_injector, _dialogRef, true);
this.navItems = [ this.navItems = [
{ {
key: 'dossierInfo', key: 'dossierInfo',

2
libs/common-ui

@ -1 +1 @@
Subproject commit 8f8ce778bd78a42076db33c886b4e623a17d4f15 Subproject commit 6c82fe505b7495d06bec21acbc2a20b653a791ed