Skip to content

Commit

Permalink
fix(metamodel) Update titles of form fields decorators
Browse files Browse the repository at this point in the history
Signed-off-by: jeromesimeon <[email protected]>
  • Loading branch information
jeromesimeon committed Jul 19, 2021
1 parent bf8239a commit 025476d
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/concerto/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ concept DecoratorBoolean extends DecoratorLiteral {

concept TypeIdentifier {
@FormEditor("selectOptions", "types")
o String name
o String name default="Concept"
}

concept DecoratorIdentifier extends DecoratorLiteral {
Expand All @@ -60,10 +60,10 @@ abstract concept ClassDeclaration {
o Decorator[] decorators optional
o Boolean isAbstract default=false
// TODO use regex /^(?!null|true|false)(\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\p{Mn}|\\p{Mc}|\\p{Nd}|\\p{Pc}|\\u200C|\\u200D)*/u
@FormEditor("title", "name")
o String name default="className" // regex=/^(?!null|true|false)(\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\S|\\u200C|\\u200D)*$/
@FormEditor("title", "Name")
o String name default="ClassName" // regex=/^(?!null|true|false)(\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\S|\\u200C|\\u200D)*$/
o Identified identified optional
@FormEditor("title", "parentType")
@FormEditor("title", "Super Type")
o TypeIdentifier superType optional
o FieldDeclaration[] fields
}
Expand Down Expand Up @@ -112,9 +112,9 @@ abstract concept FieldDeclaration {
// regex /^(?!null|true|false)(\\p{Lu}|\\p{Ll}|\\p{Lt}|\\pLm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\p{Mn}|\\p{Mc}|\\p{Nd}|\\p{Pc}|\\u200C|\\u200D)*/u
// This regex is an approximation of what the parser accepts without using unicode character classes
o String name default="fieldName" // regex=/^(?!null|true|false)(\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\w|\\d|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\S|\\u200C|\\u200D)*$/
@FormEditor("title", "isArray?")
@FormEditor("title", "Is Array?")
o Boolean isArray default=false
@FormEditor("title", "isOptional?")
@FormEditor("title", "Is Optional?")
o Boolean isOptional default=false
@FormEditor("hide", true)
o Decorator[] decorators optional
Expand All @@ -123,7 +123,7 @@ abstract concept FieldDeclaration {
concept ObjectFieldDeclaration extends FieldDeclaration {
@FormEditor("hide", true)
o StringDefault defaultValue optional
@FormEditor("title", "typeIdentifier", "selectOptions", "types")
@FormEditor("title", "Type Name", "selectOptions", "types")
o TypeIdentifier type
}

Expand Down Expand Up @@ -184,7 +184,7 @@ concept LongFieldDeclaration extends FieldDeclaration {
}

concept RelationshipDeclaration extends FieldDeclaration {
@FormEditor("title", "typeIdentifier", "selectOptions", "types")
@FormEditor("title", "Type Name", "selectOptions", "types")
o TypeIdentifier type
}

Expand All @@ -204,6 +204,6 @@ concept ModelFile {
o String namespace default="my.namespace"
@FormEditor("hide", true)
o Import[] imports optional
@FormEditor("title", "classes")
@FormEditor("title", "Classes")
o ClassDeclaration[] declarations optional
}

0 comments on commit 025476d

Please sign in to comment.