From 844c54ffdb035333385c4cf711b676b8570d6b11 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 9 Jul 2020 11:53:02 +0200
Subject: [PATCH] FEAT #13671 TIME 0:05 fix validator dbname
---
src/frontend/app/installer/database/database.component.ts | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/frontend/app/installer/database/database.component.ts b/src/frontend/app/installer/database/database.component.ts
index 89371fd988d..325f698e65e 100644
--- a/src/frontend/app/installer/database/database.component.ts
+++ b/src/frontend/app/installer/database/database.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators, ValidationErrors } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators, ValidationErrors, ValidatorFn } from '@angular/forms';
import { NotificationService } from '../../../service/notification/notification.service';
import { HttpClient } from '@angular/common/http';
import { tap } from 'rxjs/internal/operators/tap';
@@ -32,12 +32,14 @@ export class DatabaseComponent implements OnInit {
private functionsService: FunctionsService,
private installerService: InstallerService
) {
+ const valDbName: ValidatorFn[] = [Validators.pattern(/^[^\;\"]+$/), Validators.required];
+
this.stepFormGroup = this._formBuilder.group({
dbHostCtrl: ['localhost', Validators.required],
dbLoginCtrl: ['', Validators.required],
dbPortCtrl: ['5432', Validators.required],
dbPasswordCtrl: ['', Validators.required],
- dbNameCtrl: ['', Validators.required],
+ dbNameCtrl: ['', valDbName],
dbSampleCtrl: ['data_fr', Validators.required],
stateStep: ['', Validators.required]
});
--
GitLab