This is an automated email from the ASF dual-hosted git repository.
pingsutw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 8188a3f SUBMARINE-985. Fix limit on the experiment name
8188a3f is described below
commit 8188a3f2bce6fb5fc003a9b859855ee2c3ccc335
Author: jeff-901 <[email protected]>
AuthorDate: Mon Aug 16 15:40:21 2021 +0800
SUBMARINE-985. Fix limit on the experiment name
### What is this PR for?
The hyphens can't be the end of the experiment name too. Update the current
regex.
### What type of PR is it?
Bug Fix
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-985
### How should this be tested?
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: jeff-901 <[email protected]>
Signed-off-by: Kevin <[email protected]>
Closes #714 from jeff-901/SUBMARINE-985 and squashes the following commits:
91ed48c8 [jeff-901] fix regex and edit error message
---
.../experiment-customized-form.component.html | 2 +-
.../experiment-customized-form/experiment-customized-form.component.ts | 2 +-
.../experiment-predefined-form.component.html | 2 +-
.../experiment-predefined-form/experiment-predefined-form.component.ts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.html
index e1ba5fd..5604852 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.html
@@ -42,7 +42,7 @@
placeholder="mnist-example"
/>
<div class="alert-message"
*ngIf="experiment.get('experimentName').hasError('pattern')">
- Only letters(a-z), numbers(0-9), and hyphens are allowed, but you
can't start with hyphens.
+ Only letters(a-z), numbers(0-9), and hyphens are allowed, but you
can't start or end with hyphens.
</div>
</div>
<div class="single-field-group">
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
index f490a63..b0659ed 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
@@ -86,7 +86,7 @@ export class ExperimentCustomizedFormComponent implements
OnInit, OnDestroy {
ngOnInit() {
this.experiment = new FormGroup({
- experimentName: new FormControl(null,
[Validators.pattern('[a-zA-Z0-9][a-zA-Z0-9\-]*'), Validators.required]),
+ experimentName: new FormControl(null,
[Validators.pattern('([a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]|[a-zA-Z0-9]+)'),
Validators.required]),
description: new FormControl(null, [Validators.required]),
tags: new FormControl([], []),
cmd: new FormControl('', [Validators.required]),
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
index 0a94c96..c40b10f 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
@@ -42,7 +42,7 @@
<nz-form-control [nzSpan]="12" *ngIf="item.name == 'experiment_name'">
<input type="text" nz-input [id]="item.name"
[formControlName]="item.name" />
<div class="alert-message"
*ngIf="predefinedForm.get('params').get(item.name).hasError('pattern')">
- Only letters(a-z), numbers(0-9), and hyphens are allowed, but you
can't start with hyphens.
+ Only letters(a-z), numbers(0-9), and hyphens are allowed, but you
can't start or end with hyphens.
</div>
</nz-form-control>
</nz-form-item>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
index a8f2bae..549e5c8 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
@@ -151,7 +151,7 @@ export class ExperimentPredefinedFormComponent implements
OnInit, OnDestroy {
controls[item.name] = [item.value];
if (item.required === 'true') {
if(item.name !== 'experiment_name')
controls[item.name].push([Validators.required]);
- else controls[item.name].push([Validators.required,
Validators.pattern('[a-zA-Z0-9][a-zA-Z0-9\-]*')]);
+ else controls[item.name].push([Validators.required,
Validators.pattern('([a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]|[a-zA-Z0-9]+)')]);
}
}
const new_param_group = this.fb.group(controls);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
