From b4be575da2a0a80bda5383747832f6ce3abe049a Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Thu, 16 Dec 2021 12:32:25 +0100 Subject: [PATCH] bugfix: portal variable validation - Tenant Name: ^[ a-zA-Z-]{4,15}$ -> ^[ a-zA-Z0-9-]{4,20}$ - Tenant Key: ^[a-z]{4,15}$ -> ^[a-z]{4,10}$ - Service Name: - -> ^[a-z0-9]{4,15}$ --- .../form/simple-connect-create.json | 16 +- .../provisioning/form/simple-connect.json | 555 ++++++++++++++++-- .../process-search/simple-connect.json | 4 + 3 files changed, 525 insertions(+), 50 deletions(-) diff --git a/smardigo/provisioning/form/simple-connect-create.json b/smardigo/provisioning/form/simple-connect-create.json index c5d26fe..37dd95e 100644 --- a/smardigo/provisioning/form/simple-connect-create.json +++ b/smardigo/provisioning/form/simple-connect-create.json @@ -206,14 +206,14 @@ "defaultValue" : "", "validate" : { "unique" : false, - "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 15 Zeichen", + "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 20 Zeichen", "json" : "", "required" : true, "minLength" : null, "maxLength" : null, "minWords" : null, "maxWords" : null, - "pattern" : "^[ a-zA-Z-]{4,15}$" + "pattern" : "^[ a-zA-Z0-9-]{4,20}$" }, "inputFormat" : "plain", "properties" : { }, @@ -266,14 +266,14 @@ "key" : "key", "defaultValue" : "", "validate" : { - "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 15 Zeichen", + "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 10 Zeichen, alles kleingeschrieben", "json" : "", "required" : true, "minLength" : null, "maxLength" : null, "minWords" : null, "maxWords" : null, - "pattern" : "^[a-z]{4,15}$" + "pattern" : "^[a-z]{4,10}$" }, "conditional" : { "show" : "", @@ -353,14 +353,14 @@ "defaultValue" : "", "validate" : { "unique" : false, - "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 15 Zeichen", + "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 20 Zeichen", "json" : "", "required" : true, "minLength" : null, "maxLength" : null, "minWords" : null, "maxWords" : null, - "pattern" : "^[ a-zA-Z]{4,15}$" + "pattern" : "^[ a-zA-Z0-9-]{4,20}$" }, "inputFormat" : "plain", "properties" : { }, @@ -404,14 +404,14 @@ "key" : "key", "defaultValue" : "", "validate" : { - "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 15 Zeichen", + "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 10 Zeichen, alles kleingeschrieben", "json" : "", "required" : true, "minLength" : null, "maxLength" : null, "minWords" : null, "maxWords" : null, - "pattern" : "^[a-z]{4,15}$" + "pattern" : "^[a-z]{4,10}$" }, "conditional" : { "show" : "", diff --git a/smardigo/provisioning/form/simple-connect.json b/smardigo/provisioning/form/simple-connect.json index f717c51..c0a3b11 100644 --- a/smardigo/provisioning/form/simple-connect.json +++ b/smardigo/provisioning/form/simple-connect.json @@ -20,12 +20,16 @@ "key" : "html", "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "encrypted" : false, @@ -34,7 +38,37 @@ "customConditional" : "", "logic" : [ ], "refreshOn" : "data", - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : false, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "clearOnRefresh" : false, + "validateOn" : "change", + "tag" : "p", + "id" : "etzf4n" }, { "label" : "progress_current", "labelPosition" : "left-left", @@ -47,12 +81,20 @@ "key" : "progress_current", "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false, + "min" : "", + "max" : "", + "step" : "any", + "integer" : "" }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "delimiter" : false, @@ -63,7 +105,36 @@ "decimalLimit" : null, "customConditional" : "", "logic" : [ ], - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : true, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "id" : "e57exg" }, { "label" : "progress_max", "labelPosition" : "left-left", @@ -76,12 +147,20 @@ "key" : "progress_max", "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false, + "min" : "", + "max" : "", + "step" : "any", + "integer" : "" }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "delimiter" : false, @@ -92,7 +171,36 @@ "tags" : [ ], "customConditional" : "", "logic" : [ ], - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : true, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "id" : "eoxj7p" }, { "label" : "HTML", "labelPosition" : "left-left", @@ -111,12 +219,16 @@ "key" : "html2", "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "encrypted" : false, @@ -125,7 +237,37 @@ "customConditional" : "", "logic" : [ ], "refreshOn" : "data", - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : false, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "clearOnRefresh" : false, + "validateOn" : "change", + "tag" : "p", + "id" : "e0g48vt" }, { "label" : "HTML", "labelPosition" : "left-left", @@ -144,12 +286,16 @@ "key" : "html4", "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "encrypted" : false, @@ -158,7 +304,37 @@ "customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ", "logic" : [ ], "refreshOn" : "data", - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : false, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "clearOnRefresh" : false, + "validateOn" : "change", + "tag" : "p", + "id" : "egrh2" }, { "label" : "HTML", "labelPosition" : "left-left", @@ -177,12 +353,16 @@ "key" : "html3", "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "encrypted" : false, @@ -191,7 +371,37 @@ "customConditional" : "", "logic" : [ ], "refreshOn" : "data", - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : false, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "clearOnRefresh" : false, + "validateOn" : "change", + "tag" : "p", + "id" : "eodf3h" }, { "label" : "Optionale Features", "mask" : false, @@ -203,12 +413,16 @@ "defaultValue" : [ ], "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "data" : { "url" : "api/v1/scopes/{{ context.scopeId }}/processes/{{ context.processId }}/datasources/connect-features/query", @@ -222,7 +436,45 @@ "customConditional" : "", "logic" : [ ], "projection" : "key", - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "protected" : false, + "unique" : false, + "persistent" : true, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelPosition" : "top", + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "dataSrc" : "url", + "filter" : true, + "filterPlaceholder" : "Tippen um zu filtern.", + "labelAll" : "Alle Werte", + "labelSelected" : "Ausgewählte Werte", + "buttonSelectAll" : "Alle auswählen", + "buttonDeselectAll" : "Alle abwählen", + "selectAll" : false, + "id" : "edyvsf" }, { "label" : "Cluster", "mask" : false, @@ -233,12 +485,16 @@ "key" : "cluster", "validate" : { "customMessage" : "", - "json" : "" + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "components" : [ { "label" : "Cluster", @@ -251,7 +507,8 @@ "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "components" : [ { "label" : "Stage", @@ -273,12 +530,16 @@ "minLength" : null, "maxLength" : null, "minWords" : null, - "maxWords" : null + "maxWords" : null, + "custom" : "", + "customPrivate" : false, + "pattern" : "" }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "inputFormat" : "plain", @@ -288,9 +549,42 @@ "customConditional" : "", "logic" : [ ], "widget" : { - "type" : "" + "type" : "", + "format" : "yyyy-MM-dd hh:mm a", + "dateFormat" : "yyyy-MM-dd hh:mm a", + "saveAs" : "text" }, - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "protected" : false, + "unique" : false, + "persistent" : true, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "mask" : false, + "inputType" : "text", + "inputMask" : "", + "id" : "e1sh16" }, { "label" : "Name", "labelPosition" : "left-left", @@ -304,18 +598,22 @@ "key" : "name", "defaultValue" : "", "validate" : { - "customMessage" : "", + "customMessage" : "Zeichenkette ohne Sonderzeichen, mindestens 4 und höchstens 15 Zeichen, alles kleingeschrieben", "json" : "", "required" : true, "minLength" : null, "maxLength" : null, "minWords" : null, - "maxWords" : null + "maxWords" : null, + "pattern" : "^[a-z0-9]{4,15}$", + "custom" : "", + "customPrivate" : false }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "inputFormat" : "plain", @@ -325,9 +623,43 @@ "customConditional" : "", "logic" : [ ], "widget" : { - "type" : "" + "type" : "", + "format" : "yyyy-MM-dd hh:mm a", + "dateFormat" : "yyyy-MM-dd hh:mm a", + "saveAs" : "text" }, - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "protected" : false, + "unique" : false, + "persistent" : true, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "mask" : false, + "inputType" : "text", + "inputMask" : "", + "id" : "e7pf9ih" }, { "label" : "Size", "labelPosition" : "left-left", @@ -343,12 +675,17 @@ "json" : "", "required" : true, "min" : null, - "max" : null + "max" : null, + "custom" : "", + "customPrivate" : false, + "step" : "any", + "integer" : "" }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "properties" : { }, @@ -359,7 +696,36 @@ "decimalLimit" : null, "customConditional" : "", "logic" : [ ], - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : true, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "id" : "e5npzs" }, { "label" : "Service", "labelPosition" : "left-left", @@ -380,12 +746,16 @@ "minLength" : null, "maxLength" : null, "minWords" : null, - "maxWords" : null + "maxWords" : null, + "custom" : "", + "customPrivate" : false, + "pattern" : "" }, "conditional" : { "show" : "", "when" : "", - "json" : "" + "json" : "", + "eq" : "" }, "tabs" : null, "inputFormat" : "plain", @@ -395,16 +765,85 @@ "customConditional" : "", "logic" : [ ], "widget" : { - "type" : "" + "type" : "", + "format" : "yyyy-MM-dd hh:mm a", + "dateFormat" : "yyyy-MM-dd hh:mm a", + "saveAs" : "text" }, - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "protected" : false, + "unique" : false, + "persistent" : true, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "mask" : false, + "inputType" : "text", + "inputMask" : "", + "id" : "eqxm1s" } ], "tabs" : null, "reorder" : false, "properties" : { }, "tags" : null, "customConditional" : "", - "logic" : [ ] + "logic" : [ ], + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : false, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelPosition" : "top", + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "validate" : { + "required" : false, + "custom" : "", + "customPrivate" : false + }, + "id" : "ebmljyd" } ], "tabs" : null, "encrypted" : false, @@ -412,6 +851,38 @@ "tags" : [ ], "customConditional" : "", "logic" : [ ], - "reorder" : false + "reorder" : false, + "placeholder" : "", + "prefix" : "", + "customClass" : "", + "suffix" : "", + "multiple" : false, + "defaultValue" : null, + "protected" : false, + "unique" : false, + "persistent" : true, + "hidden" : false, + "clearOnHide" : true, + "dataGridLabel" : false, + "labelPosition" : "top", + "labelWidth" : 30, + "labelMargin" : 3, + "description" : "", + "errorLabel" : "", + "tooltip" : "", + "hideLabel" : false, + "tabindex" : "", + "disabled" : false, + "autofocus" : false, + "dbIndex" : false, + "customDefaultValue" : "", + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "tree" : true, + "id" : "exh01oc" } ] } \ No newline at end of file diff --git a/smardigo/provisioning/process-search/simple-connect.json b/smardigo/provisioning/process-search/simple-connect.json index 772e82f..baa0b34 100644 --- a/smardigo/provisioning/process-search/simple-connect.json +++ b/smardigo/provisioning/process-search/simple-connect.json @@ -87,5 +87,9 @@ "key" : "default", "name" : "Alle" } + } ], + "sorts" : [ { + "key" : "creation_date", + "direction" : "desc" } ] } \ No newline at end of file