From 66cf2aa5b56ee964bb072785a7d977600bba6a5a Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Fri, 4 Feb 2022 23:02:56 +0100 Subject: [PATCH] SMARCH-115: feat: select/change feature set --- .../form/select-connect-feature-set.json | 202 +++++++ .../form/select-connect-version.json | 218 ++++++++ .../simple-connect.json | 20 + .../provisioning/process/simple-connect.bpmn | 499 ++++++++++++++---- 4 files changed, 825 insertions(+), 114 deletions(-) create mode 100644 smardigo/provisioning/form/select-connect-feature-set.json create mode 100644 smardigo/provisioning/form/select-connect-version.json diff --git a/smardigo/provisioning/form/select-connect-feature-set.json b/smardigo/provisioning/form/select-connect-feature-set.json new file mode 100644 index 0000000..0493100 --- /dev/null +++ b/smardigo/provisioning/form/select-connect-feature-set.json @@ -0,0 +1,202 @@ +{ + "configKey" : "select-connect-feature-set", + "name" : "select-connect-feature-set", + "components" : [ { + "label" : "Status", + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "well", + "input" : false, + "key" : "status2", + "conditional" : { + "show" : "", + "when" : "", + "json" : "", + "eq" : "" + }, + "components" : [ { + "label" : "HTML", + "className" : "", + "attrs" : [ { + "attr" : "", + "value" : "" + } ], + "content" : "

Features

", + "refreshOnChange" : false, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "htmlelement", + "input" : false, + "key" : "html7", + "validate" : { + "customMessage" : "", + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "", + "eq" : "" + }, + "tabs" : null, + "encrypted" : false, + "properties" : { }, + "tags" : null, + "customConditional" : "", + "logic" : [ ], + "reorder" : false, + "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", + "tag" : "p", + "id" : "ej3cdtl" + }, { + "label" : "Optionale Features", + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "dualmultiselect", + "input" : true, + "key" : "connect-features", + "defaultValue" : [ ], + "validate" : { + "customMessage" : "", + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "", + "eq" : "" + }, + "data" : { + "url" : "api/v1/scopes/{{ context.scopeId }}/processes/{{ context.processId }}/datasources/connect-features/query", + "values" : [ { } ] + }, + "template" : "{{ item.key }}", + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "projection" : "key", + "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" : "e04qnv" + } ], + "tabs" : null, + "reorder" : false, + "properties" : { }, + "tags" : null, + "customConditional" : "", + "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" : "e3myfvi" + } ] +} \ No newline at end of file diff --git a/smardigo/provisioning/form/select-connect-version.json b/smardigo/provisioning/form/select-connect-version.json new file mode 100644 index 0000000..eaf1da8 --- /dev/null +++ b/smardigo/provisioning/form/select-connect-version.json @@ -0,0 +1,218 @@ +{ + "configKey" : "select-connect-version", + "name" : "select-connect-version", + "components" : [ { + "label" : "Connect", + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "container", + "input" : true, + "key" : "connect", + "validate" : { + "customMessage" : "", + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "", + "eq" : "" + }, + "components" : [ { + "label" : "Connect", + "hideLabel" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "well", + "input" : false, + "key" : "connect2", + "conditional" : { + "show" : "", + "when" : "", + "json" : "", + "eq" : "" + }, + "components" : [ { + "label" : "Version", + "labelPosition" : "left-left", + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "select", + "input" : true, + "key" : "version", + "defaultValue" : "latest", + "validate" : { + "select" : false, + "customMessage" : "", + "json" : "", + "required" : false, + "custom" : "", + "customPrivate" : false + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "", + "eq" : "" + }, + "data" : { + "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/whitelabel-docker-image-tags/query", + "headers" : [ { + "key" : "", + "value" : "" + } ], + "values" : [ ], + "json" : "", + "resource" : "", + "custom" : "" + }, + "dataSrc" : "url", + "valueProperty" : "value", + "tabs" : null, + "properties" : { }, + "selectThreshold" : 0.3, + "encrypted" : false, + "lazyLoad" : false, + "selectValues" : "", + "disableLimit" : false, + "sort" : "", + "tags" : null, + "customConditional" : "", + "logic" : [ ], + "customDefaultValue" : "value='latest'", + "reorder" : false, + "reference" : 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, + "calculateValue" : "", + "allowCalculateOverride" : false, + "widget" : null, + "refreshOn" : "", + "clearOnRefresh" : false, + "validateOn" : "change", + "limit" : 100, + "filter" : "", + "searchEnabled" : true, + "searchField" : "", + "minSearch" : 0, + "readOnlyValue" : false, + "authenticate" : false, + "template" : "{{ item.label }}", + "selectFields" : "", + "customSearchCriteria" : "", + "searchThreshold" : 0.3, + "fuseOptions" : { }, + "customOptions" : { }, + "infiniteScroll" : false, + "clearValueIfNotInItems" : false, + "clientSideFilter" : "", + "id" : "e0qkvu" + } ], + "tabs" : null, + "reorder" : false, + "properties" : { }, + "tags" : null, + "customConditional" : "", + "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" : "", + "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" : "e0jo9ps" + } ], + "tabs" : null, + "encrypted" : false, + "properties" : { }, + "tags" : null, + "customConditional" : "", + "logic" : [ ], + "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" : "er94pcr" + } ] +} \ No newline at end of file diff --git a/smardigo/provisioning/process-variable-declaration/simple-connect.json b/smardigo/provisioning/process-variable-declaration/simple-connect.json index ed1a0da..4cbd9a5 100644 --- a/smardigo/provisioning/process-variable-declaration/simple-connect.json +++ b/smardigo/provisioning/process-variable-declaration/simple-connect.json @@ -7,6 +7,10 @@ "type" : "string", "classification" : "PRIVATE" }, + "awxPath" : { + "type" : "string", + "classification" : "PRIVATE" + }, "cluster" : { "type" : "object", "classification" : "PRIVATE" @@ -31,10 +35,18 @@ "type" : "boolean", "classification" : "PRIVATE" }, + "extra_vars" : { + "type" : "object", + "classification" : "PRIVATE" + }, "id" : { "type" : "string", "classification" : "PRIVATE" }, + "job_template_id" : { + "type" : "string", + "classification" : "PRIVATE" + }, "key" : { "type" : "string", "classification" : "PRIVATE" @@ -51,6 +63,10 @@ "type" : "long", "classification" : "PRIVATE" }, + "pruefer_id" : { + "type" : "string", + "classification" : "PRIVATE" + }, "selected_tenant" : { "type" : "object", "classification" : "PRIVATE" @@ -75,6 +91,10 @@ "type" : "object", "classification" : "PRIVATE" }, + "tenant_id" : { + "type" : "string", + "classification" : "PRIVATE" + }, "vorgang_status" : { "type" : "string", "classification" : "PRIVATE" diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn index 27c171c..5f36cc5 100644 --- a/smardigo/provisioning/process/simple-connect.bpmn +++ b/smardigo/provisioning/process/simple-connect.bpmn @@ -571,16 +571,6 @@ Variables.userId(authenticatedUserId) Flow_07sf9z8 Flow_1c6reic - - - - ${50} - Service gestartet - - - Flow_0e5dqc8 - Flow_1qzrr09 - @@ -631,16 +621,6 @@ Variables.userId(authenticatedUserId) Flow_0nhy074 Flow_1pt1vey - - - - ${50} - Service gestartet - - - Flow_0pukv52 - Flow_1tj0uqy - @@ -669,12 +649,14 @@ Variables.userId(authenticatedUserId) Flow_1pt1vey Flow_0pukv52 - + Flow_1lt30rz Flow_1lbjdee Flow_0obgxao Flow_15yi07j + Flow_0bhv1gi + Flow_09x0w6y @@ -709,18 +691,20 @@ Variables.userId(authenticatedUserId) - Flow_1bdsym1 + Flow_1wmjqng - - Flow_1qzrr09 - Flow_1tj0uqy - Flow_1rv440f + Flow_05an5rx + Flow_0fu5s0o + Flow_0e5dqc8 + Flow_0pukv52 + Flow_00jy6ae + Flow_0ju2tch + Flow_0s7lukd Flow_1bdsym1 - - + @@ -741,16 +725,6 @@ Variables.userId(authenticatedUserId) Flow_1c39717 Flow_09id3fl - - - - ${50} - Service gestartet - - - Flow_00jy6ae - Flow_1rv440f - @@ -773,7 +747,6 @@ Variables.userId(authenticatedUserId) ${$action=='wiederherstellen'} - Flow_1yyd3eu @@ -835,7 +808,7 @@ Variables.userId(authenticatedUserId) Flow_00a7lij Flow_00jy6ae - + @@ -849,7 +822,180 @@ Variables.userId(authenticatedUserId) Flow_1c6reic Flow_0e5dqc8 - + + + + + + + + + ${5} + + + Flow_140km0x + Flow_0iaarud + + + + + ${1} + ${3} + + + Flow_0ekn24z + Flow_140km0x + + + + + ${44} + Service wird aktualisiert + + + Flow_0bhv1gi + Flow_1fy2say + + + + + + + + + + Flow_01vwyx0 + Flow_0ekn24z + + + + + + + + + ${progress_current + 1} + + + Flow_0iaarud + Flow_0ju2tch + + + + + + + + ${$action=='auf-neue-version-aktualisieren'} + + + + Flow_1fy2say + Flow_0lmp48m + + + Flow_0lmp48m + Flow_01vwyx0 + Flow_05an5rx + + + ${$action == 'ok'} + + + ${$action == 'abbrechen'} + + + + + + + + + ${5} + + + Flow_0swo8uc + Flow_0sjgl0x + + + + + ${1} + ${3} + + + Flow_05exzhl + Flow_0swo8uc + + + + + ${45} + Service wird aktualisiert + + + Flow_09x0w6y + Flow_16vxkhf + + + + + + + + + + Flow_0dd4zj2 + Flow_05exzhl + + + + + + + + + ${progress_current + 1} + + + Flow_0sjgl0x + Flow_0s7lukd + + + Flow_16vxkhf + Flow_0x16obd + + + Flow_0x16obd + Flow_0dd4zj2 + Flow_0fu5s0o + + + + + + + + ${$action == 'ok'} + + + + ${$action=='features-aktualisieren'} + + + ${$action == 'abbrechen'} + + + + + ${50} + Service gestartet + + + Flow_1bdsym1 + Flow_1wmjqng + + Flow_042d7e6 @@ -1511,31 +1657,125 @@ Variables.userId(authenticatedUserId) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - + + + - - + + - - + + - - - - - @@ -1545,38 +1785,28 @@ Variables.userId(authenticatedUserId) - - + + - - + + - - - - - - + - - - - - - + - - + + - - + + @@ -1587,16 +1817,17 @@ Variables.userId(authenticatedUserId) - - + + + - - + + - + @@ -1619,30 +1850,28 @@ Variables.userId(authenticatedUserId) - + - - - - + + + + + + + + - - - - - - - + - + @@ -1660,25 +1889,19 @@ Variables.userId(authenticatedUserId) - - - - - - - + - + - + - + @@ -1695,14 +1918,11 @@ Variables.userId(authenticatedUserId) - - - - - + + - + @@ -1711,19 +1931,70 @@ Variables.userId(authenticatedUserId) - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +