mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-14 09:55:12 +00:00
feat(console): warning if backdrop click or escape key is pressed when new action form is dirty (#5989)
* fix: add action control esc and backdrop click * fix: set values for new action and update action * feat: add translations for supported languages * feat: add some comments * fix: add suggested changes by @peintnermax
This commit is contained in:
@@ -98,6 +98,7 @@ export class ActionTableComponent implements OnInit {
|
||||
const dialogRef = this.dialog.open(AddActionDialogComponent, {
|
||||
data: {},
|
||||
width: '500px',
|
||||
disableClose: true,
|
||||
});
|
||||
|
||||
dialogRef.afterClosed().subscribe((req: CreateActionRequest) => {
|
||||
@@ -120,6 +121,7 @@ export class ActionTableComponent implements OnInit {
|
||||
action: action,
|
||||
},
|
||||
width: '500px',
|
||||
disableClose: true,
|
||||
});
|
||||
|
||||
dialogRef.afterClosed().subscribe((req: UpdateActionRequest) => {
|
||||
|
||||
@@ -2,27 +2,29 @@
|
||||
<span *ngIf="id" class="action-dialog-title" mat-dialog-title>{{ 'FLOWS.DIALOG.UPDATE.TITLE' | translate }}</span>
|
||||
|
||||
<div mat-dialog-content>
|
||||
<cnsl-form-field class="form-field">
|
||||
<cnsl-label>{{ 'FLOWS.NAME' | translate }}</cnsl-label>
|
||||
<input cnslInput [(ngModel)]="name" />
|
||||
</cnsl-form-field>
|
||||
<form [formGroup]="form">
|
||||
<cnsl-form-field class="form-field">
|
||||
<cnsl-label>{{ 'FLOWS.NAME' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="name" />
|
||||
</cnsl-form-field>
|
||||
|
||||
<ngx-codemirror
|
||||
*ngIf="opened$ | async"
|
||||
[(ngModel)]="script"
|
||||
[options]="{
|
||||
lineNumbers: true,
|
||||
theme: 'material',
|
||||
mode: 'javascript'
|
||||
}"
|
||||
></ngx-codemirror>
|
||||
<ngx-codemirror
|
||||
*ngIf="opened$ | async"
|
||||
formControlName="script"
|
||||
[options]="{
|
||||
lineNumbers: true,
|
||||
theme: 'material',
|
||||
mode: 'javascript'
|
||||
}"
|
||||
></ngx-codemirror>
|
||||
|
||||
<cnsl-form-field class="form-field">
|
||||
<cnsl-label>{{ 'FLOWS.TIMEOUTINSEC' | translate }}</cnsl-label>
|
||||
<input type="number" cnslInput [(ngModel)]="durationInSec" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="form-field">
|
||||
<cnsl-label>{{ 'FLOWS.TIMEOUTINSEC' | translate }}</cnsl-label>
|
||||
<input type="number" cnslInput formControlName="durationInSec" />
|
||||
</cnsl-form-field>
|
||||
|
||||
<mat-checkbox [(ngModel)]="allowedToFail">{{ 'FLOWS.ALLOWEDTOFAIL' | translate }}</mat-checkbox>
|
||||
<mat-checkbox formControlName="allowedToFail">{{ 'FLOWS.ALLOWEDTOFAIL' | translate }}</mat-checkbox>
|
||||
</form>
|
||||
</div>
|
||||
<div mat-dialog-actions class="action">
|
||||
<button *ngIf="id" mat-stroked-button color="warn" (click)="deleteAndCloseDialog()">
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
import { Component, Inject } from '@angular/core';
|
||||
import { Component, Inject, OnInit } from '@angular/core';
|
||||
import { FormControl, FormGroup } from '@angular/forms';
|
||||
import {
|
||||
MatLegacyDialog as MatDialog,
|
||||
MatLegacyDialogRef as MatDialogRef,
|
||||
MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
|
||||
} from '@angular/material/legacy-dialog';
|
||||
|
||||
import { Duration } from 'google-protobuf/google/protobuf/duration_pb';
|
||||
import { mapTo } from 'rxjs';
|
||||
import { WarnDialogComponent } from 'src/app/modules/warn-dialog/warn-dialog.component';
|
||||
@@ -17,35 +19,76 @@ import { ToastService } from 'src/app/services/toast.service';
|
||||
templateUrl: './add-action-dialog.component.html',
|
||||
styleUrls: ['./add-action-dialog.component.scss'],
|
||||
})
|
||||
export class AddActionDialogComponent {
|
||||
public name: string = '';
|
||||
public script: string = '';
|
||||
public durationInSec: number = 10;
|
||||
public allowedToFail: boolean = false;
|
||||
|
||||
export class AddActionDialogComponent implements OnInit {
|
||||
public id: string = '';
|
||||
|
||||
public opened$ = this.dialogRef.afterOpened().pipe(mapTo(true));
|
||||
|
||||
public form: FormGroup = new FormGroup({
|
||||
name: new FormControl<string>('', []),
|
||||
script: new FormControl<string>('', []),
|
||||
durationInSec: new FormControl<number>(10, []),
|
||||
allowedToFail: new FormControl<boolean>(false, []),
|
||||
});
|
||||
constructor(
|
||||
private toast: ToastService,
|
||||
private mgmtService: ManagementService,
|
||||
private dialog: MatDialog,
|
||||
private unsavedChangesDialog: MatDialog,
|
||||
public dialogRef: MatDialogRef<AddActionDialogComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: any,
|
||||
) {
|
||||
if (data && data.action) {
|
||||
const action: Action.AsObject = data.action;
|
||||
this.name = action.name;
|
||||
this.script = action.script;
|
||||
if (action.timeout?.seconds) {
|
||||
this.durationInSec = action.timeout?.seconds;
|
||||
}
|
||||
this.allowedToFail = action.allowedToFail;
|
||||
this.form.setValue({
|
||||
name: action.name,
|
||||
script: action.script,
|
||||
durationInSec: action.timeout?.seconds ?? 10,
|
||||
allowedToFail: action.allowedToFail,
|
||||
});
|
||||
this.id = action.id;
|
||||
}
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
// prevent unsaved changes get lost if backdrop is clicked
|
||||
this.dialogRef.backdropClick().subscribe(() => {
|
||||
if (this.form.dirty) {
|
||||
this.showUnsavedDialog();
|
||||
} else {
|
||||
this.dialogRef.close(false);
|
||||
}
|
||||
});
|
||||
|
||||
// prevent unsaved changes get lost if escape key is pressed
|
||||
this.dialogRef.keydownEvents().subscribe((event) => {
|
||||
if (event.key === 'Escape') {
|
||||
if (this.form.dirty) {
|
||||
this.showUnsavedDialog();
|
||||
} else {
|
||||
this.dialogRef.close(false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private showUnsavedDialog(): void {
|
||||
const unsavedChangesDialogRef = this.unsavedChangesDialog.open(WarnDialogComponent, {
|
||||
data: {
|
||||
confirmKey: 'ACTIONS.UNSAVED.DIALOG.DISCARD',
|
||||
cancelKey: 'ACTIONS.UNSAVED.DIALOG.CANCEL',
|
||||
titleKey: 'ACTIONS.UNSAVEDCHANGES',
|
||||
descriptionKey: 'ACTIONS.UNSAVED.DIALOG.DESCRIPTION',
|
||||
},
|
||||
width: '400px',
|
||||
});
|
||||
|
||||
unsavedChangesDialogRef.afterClosed().subscribe((resp) => {
|
||||
if (resp) {
|
||||
this.dialogRef.close(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public closeDialog(): void {
|
||||
this.dialogRef.close(false);
|
||||
}
|
||||
@@ -54,27 +97,27 @@ export class AddActionDialogComponent {
|
||||
if (this.id) {
|
||||
const req = new UpdateActionRequest();
|
||||
req.setId(this.id);
|
||||
req.setName(this.name);
|
||||
req.setScript(this.script);
|
||||
req.setName(this.form.value.name);
|
||||
req.setScript(this.form.value.script);
|
||||
|
||||
const duration = new Duration();
|
||||
duration.setNanos(0);
|
||||
duration.setSeconds(this.durationInSec);
|
||||
duration.setSeconds(this.form.value.durationInSec);
|
||||
|
||||
req.setAllowedToFail(this.allowedToFail);
|
||||
req.setAllowedToFail(this.form.value.allowedToFail);
|
||||
|
||||
req.setTimeout(duration);
|
||||
this.dialogRef.close(req);
|
||||
} else {
|
||||
const req = new CreateActionRequest();
|
||||
req.setName(this.name);
|
||||
req.setScript(this.script);
|
||||
req.setName(this.form.value.name);
|
||||
req.setScript(this.form.value.script);
|
||||
|
||||
const duration = new Duration();
|
||||
duration.setNanos(0);
|
||||
duration.setSeconds(this.durationInSec);
|
||||
duration.setSeconds(this.form.value.durationInSec);
|
||||
|
||||
req.setAllowedToFail(this.allowedToFail);
|
||||
req.setAllowedToFail(this.form.value.allowedToFail);
|
||||
|
||||
req.setTimeout(duration);
|
||||
this.dialogRef.close(req);
|
||||
|
||||
Reference in New Issue
Block a user