-
+
-
-
- Description
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{ wfConfForm.errors?.['serverError'] }}
-
-
-
-
+
+
+
diff --git a/frontends/dnet-is-application/src/app/wf-confs/wf-confs.component.ts b/frontends/dnet-is-application/src/app/wf-confs/wf-confs.component.ts
index 42a5942c..d3042423 100644
--- a/frontends/dnet-is-application/src/app/wf-confs/wf-confs.component.ts
+++ b/frontends/dnet-is-application/src/app/wf-confs/wf-confs.component.ts
@@ -57,7 +57,7 @@ export class WfConfsComponent implements OnInit {
priority: 75,
workflow: '',
schedulingEnabled: false,
- cronExpression: '',
+ cronExpression: '0 30 12 1/1 * ?',
cronMinInterval: 9600,
details: new Map,
configured: true,
@@ -79,35 +79,51 @@ export class WfConfsComponent implements OnInit {
styleUrls: ['./wf-confs.component.css']
})
export class WfConfDialog {
- wfConfForm = new FormGroup({
+
+ wfConfFormStep1 = new FormGroup({
+ workflow: new FormControl('', [Validators.required]),
+ });
+
+
+ wfConfFormStep2 = new FormGroup({
name: new FormControl('', [Validators.required]),
//details: Map
,
enabled: new FormControl(true, [Validators.required]),
priority: new FormControl(75, [Validators.required, Validators.min(1), Validators.max(100)]),
- schedulingEnabled: new FormControl(false, [Validators.required]),
- cronExpression: new FormControl("", [Validators.required]),
- cronMinInterval: new FormControl("", [Validators.required]),
- workflow: new FormControl('', [Validators.required]),
+ });
+
+ wfConfFormStep3 = new FormGroup({
//systemParams: Map,
//userParams: Map
});
+ wfConfFormStep4 = new FormGroup({
+ schedulingEnabled: new FormControl(false, [Validators.required]),
+ cronExpression: new FormControl("", [Validators.required]),
+ cronMinInterval: new FormControl("", [Validators.required]),
+ });
+
+ wfConfFormFinal = new FormGroup({});
+
constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any, public service: ISService) {
- this.wfConfForm.get('name')?.setValue(data.name);
+ this.wfConfFormStep1.get('workflow')?.setValue(data.workflow);
+
+ this.wfConfFormStep2.get('name')?.setValue(data.name);
+ this.wfConfFormStep2.get('enabled')?.setValue(data.enabled);
+ this.wfConfFormStep2.get('priority')?.setValue(data.priority);
//details
- this.wfConfForm.get('enabled')?.setValue(data.enabled);
- this.wfConfForm.get('priority')?.setValue(data.priority);
- this.wfConfForm.get('schedulingEnabled')?.setValue(data.schedulingEnabled);
- this.wfConfForm.get('cronExpression')?.setValue(data.cronExpression);
- this.wfConfForm.get('cronMinInterval')?.setValue(data.cronMinInterval);
- this.wfConfForm.get('workflow')?.setValue(data.workflow);
+
//systemParams,
//userParams
+
+ this.wfConfFormStep4.get('schedulingEnabled')?.setValue(data.schedulingEnabled);
+ this.wfConfFormStep4.get('cronExpression')?.setValue(data.cronExpression);
+ this.wfConfFormStep4.get('cronMinInterval')?.setValue(data.cronMinInterval);
}
onSubmit(): void {
- const conf = Object.assign({}, this.data, this.wfConfForm.value);
- this.service.saveWfConfiguration(conf, (data: void) => this.dialogRef.close(1), this.wfConfForm);
+ const conf = Object.assign({}, this.data, this.wfConfFormStep1.value, this.wfConfFormStep2.value, this.wfConfFormStep3.value, this.wfConfFormStep4.value);
+ this.service.saveWfConfiguration(conf, (data: void) => this.dialogRef.close(1), this.wfConfFormFinal);
}
onNoClick(): void {