mirror of
https://github.com/sartography/cr-connect-bpmn.git
synced 2025-01-28 01:25:52 +00:00
Merge pull request #114 from sartography/bug/spec-validation-497
Bug/spec validation 497
This commit is contained in:
commit
3df3953ae9
@ -3,11 +3,9 @@ import {FormControl, FormGroup, ValidationErrors} from '@angular/forms';
|
|||||||
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
|
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
|
||||||
import {FormlyFieldConfig, FormlyFormOptions, FormlyTemplateOptions} from '@ngx-formly/core';
|
import {FormlyFieldConfig, FormlyFormOptions, FormlyTemplateOptions} from '@ngx-formly/core';
|
||||||
import {ApiService, toSnakeCase} from 'sartography-workflow-lib';
|
import {ApiService, toSnakeCase} from 'sartography-workflow-lib';
|
||||||
import {v4 as uuidv4} from 'uuid';
|
|
||||||
import {WorkflowSpecDialogData} from '../../_interfaces/dialog-data';
|
import {WorkflowSpecDialogData} from '../../_interfaces/dialog-data';
|
||||||
import {of} from "rxjs";
|
import {of} from "rxjs";
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-workflow-spec-dialog',
|
selector: 'app-workflow-spec-dialog',
|
||||||
templateUrl: './workflow-spec-dialog.component.html',
|
templateUrl: './workflow-spec-dialog.component.html',
|
||||||
@ -37,26 +35,72 @@ export class WorkflowSpecDialogComponent {
|
|||||||
this.specs = wfs.map(w => w.id);
|
this.specs = wfs.map(w => w.id);
|
||||||
|
|
||||||
this.fields = [
|
this.fields = [
|
||||||
|
{
|
||||||
|
key: 'display_name',
|
||||||
|
type: 'input',
|
||||||
|
defaultValue: this.data.display_name,
|
||||||
|
templateOptions: {
|
||||||
|
label: 'Display Name',
|
||||||
|
placeholder: 'Title of the workflow specification',
|
||||||
|
description: 'This is a human-readable title for the workflow specification,' +
|
||||||
|
'which should be easy for others to read and remember.',
|
||||||
|
required: true,
|
||||||
|
modelOptions:
|
||||||
|
{
|
||||||
|
updateOn: 'blur',
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: 'id',
|
key: 'id',
|
||||||
type: 'input',
|
type: 'input',
|
||||||
defaultValue: this.data.id,
|
defaultValue: this.data.id,
|
||||||
templateOptions: {
|
templateOptions: {
|
||||||
label: 'id',
|
label: 'ID',
|
||||||
placeholder: 'Name of workflow specification',
|
placeholder: 'Name of workflow specification',
|
||||||
description: 'Enter a name to identify this spec. It cannot be changed later.' +
|
description: 'Enter a name to identify this spec. It cannot be changed later.' +
|
||||||
'It will be converted to all_lowercase_with_underscores when you save.',
|
'It will be converted to all_lowercase_with_underscores when you save.',
|
||||||
required: true,
|
required: true,
|
||||||
disabled: this.data.id !== '',
|
disabled: this.data.id !== '',
|
||||||
|
help: 'This must be in a universal format for XML standards. ' +
|
||||||
|
'It can only contain letters, numbers, and underscores. ' +
|
||||||
|
'It should not start with a digit.',
|
||||||
|
modelOptions:
|
||||||
|
{
|
||||||
|
updateOn: 'focus',
|
||||||
|
}
|
||||||
|
},
|
||||||
|
expressionProperties: {
|
||||||
|
'model.id': (m, formState, field) => {
|
||||||
|
if (!m.id && field.focus) {
|
||||||
|
m.id = m.display_name.replace(/ /g,"_").toLowerCase();
|
||||||
|
field.formControl.markAsDirty();
|
||||||
|
return m.id;
|
||||||
|
} else {
|
||||||
|
return m.id;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
'templateOptions.change': (m, formState, field)=> {
|
||||||
|
if (field.focus) {
|
||||||
|
field.formControl.updateValueAndValidity();
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
asyncValidators: {
|
asyncValidators: {
|
||||||
uniqueID: {
|
uniqueID: {
|
||||||
expression: (control: FormControl) => {
|
expression: (control: FormControl) => {
|
||||||
|
|
||||||
return of(this.specs.indexOf(control.value) === -1);
|
return of(this.specs.indexOf(control.value) === -1);
|
||||||
},
|
},
|
||||||
message: 'This ID name is already taken.',
|
message: 'This ID name is already taken.',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
validators: {
|
||||||
|
formatter: {
|
||||||
|
expression: (c) => !c.value || /^[A-Za-z_][A-Za-z0-9]*(?:_[A-Za-z0-9]+)*$/.test(c.value),
|
||||||
|
message: (error, field: FormlyFieldConfig) => `"${field.formControl.value}" is not in a valid format.`,
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'category_id',
|
key: 'category_id',
|
||||||
@ -70,18 +114,6 @@ export class WorkflowSpecDialogComponent {
|
|||||||
},
|
},
|
||||||
hideExpression: this.data.library,
|
hideExpression: this.data.library,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: 'display_name',
|
|
||||||
type: 'input',
|
|
||||||
defaultValue: this.data.display_name,
|
|
||||||
templateOptions: {
|
|
||||||
label: 'Display Name',
|
|
||||||
placeholder: 'Title of the workflow specification',
|
|
||||||
description: 'This is a human-readable title for the workflow specification,' +
|
|
||||||
'which should be easy for others to read and remember.',
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
key: 'description',
|
key: 'description',
|
||||||
type: 'textarea',
|
type: 'textarea',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user