diff --git a/group_vars/connect_config_delete_scope/main.yml b/group_vars/connect_config_delete_scope/main.yml new file mode 100644 index 0000000..148e2f2 --- /dev/null +++ b/group_vars/connect_config_delete_scope/main.yml @@ -0,0 +1,3 @@ +--- + +connect_config_delete_scope_enabled: "true" diff --git a/group_vars/connect_element_template/main.yml b/group_vars/connect_element_template/main.yml new file mode 100644 index 0000000..4c4f4b9 --- /dev/null +++ b/group_vars/connect_element_template/main.yml @@ -0,0 +1,3 @@ +--- + +connect_element_template_enabled: "true" diff --git a/group_vars/connect_external_tasks_script_worker/main.yml b/group_vars/connect_external_tasks_script_worker/main.yml new file mode 100644 index 0000000..03b0b21 --- /dev/null +++ b/group_vars/connect_external_tasks_script_worker/main.yml @@ -0,0 +1,3 @@ +--- + +connect_external_task_script_worker_enabled: "true" diff --git a/group_vars/connect_resubmission/man.yml b/group_vars/connect_resubmission/main.yml similarity index 100% rename from group_vars/connect_resubmission/man.yml rename to group_vars/connect_resubmission/main.yml diff --git a/group_vars/connect_webdav/main.yml b/group_vars/connect_webdav/main.yml new file mode 100644 index 0000000..d4e6057 --- /dev/null +++ b/group_vars/connect_webdav/main.yml @@ -0,0 +1,3 @@ +--- + +connect_webdav_enabled: "true" diff --git a/roles/connect/vars/main.yml b/roles/connect/vars/main.yml index 6f574a4..7cfc353 100644 --- a/roles/connect/vars/main.yml +++ b/roles/connect/vars/main.yml @@ -69,11 +69,11 @@ connect_environment: [ "ELASTIC_ANALYSIS_INDEX: \"{{ connect_elastic_analysis_index | default('analysis') }}\"", "RESUBMISSION_ENABLED: \"{{ connect_resubmission_enabled | default('false') }}\"", - "ELEMENT_TEMPLATE_ENABLED: \"{{ connect_element_template_enabled | default('true') }}\"", - "CONFIG_DELETE_SCOPE_ENABLED: \"{{ connect_config_delete_scope_enabled | default('true') }}\"", - "EXTERNAL_TASK_SCRIPT_WORKER_ENABLED: \"{{ connect_external_task_script_worker_enabled | default('true') }}\"", + "ELEMENT_TEMPLATE_ENABLED: \"{{ connect_element_template_enabled | default('false') }}\"", + "CONFIG_DELETE_SCOPE_ENABLED: \"{{ connect_config_delete_scope_enabled | default('false') }}\"", + "EXTERNAL_TASK_SCRIPT_WORKER_ENABLED: \"{{ connect_external_task_script_worker_enabled | default('false') }}\"", - "SMA_ENABLE_WEBDAV_DOC_EDITING: \"true\"", + "SMA_ENABLE_WEBDAV_DOC_EDITING: \"{{ connect_webdav_enabled | default('false') }}\"", "SMA_WEBDAV_BASE_PATH: \"{{ http_s }}://{{ connect_base_url }}\"", "SMA_WEBDAV_HOST_URL: \"{{ http_s }}://{{ shared_service_webdav_hostname }}/\"", "SMA_WEBDAV_FRONTEND_URL: \"{{ http_s }}://{{ shared_service_webdav_hostname }}/\"", diff --git a/smardigo/provisioning/datasource-file/connect-features.xlsx b/smardigo/provisioning/datasource-file/connect-features.xlsx index 7cacd79..02af016 100644 Binary files a/smardigo/provisioning/datasource-file/connect-features.xlsx and b/smardigo/provisioning/datasource-file/connect-features.xlsx differ diff --git a/smardigo/provisioning/datasource/connect-features.json b/smardigo/provisioning/datasource/connect-features.json index c4f061e..af8487a 100644 --- a/smardigo/provisioning/datasource/connect-features.json +++ b/smardigo/provisioning/datasource/connect-features.json @@ -1,31 +1 @@ -{ - "name" : "connect-features", - "restApi" : true, - "configKey" : "connect-features", - "payloadType" : "EXCEL", - "config" : [ { - "name" : "file", - "type" : "FILE", - "value" : "connect-features.xlsx" - }, { - "name" : "columnNames", - "type" : "STRING", - "value" : "" - }, { - "name" : "sqlStatement", - "type" : "STRING", - "value" : "select * from features" - }, { - "name" : "columnNameLineNumber", - "type" : "INT", - "value" : 1 - }, { - "name" : "skipEmptyLines", - "type" : "BOOLEAN", - "value" : false - }, { - "name" : "skipEmptyColumns", - "type" : "BOOLEAN", - "value" : false - } ] -} \ No newline at end of file +{"name":"connect-features","restApi":true,"configKey":"connect-features","payloadType":"EXCEL","config":[{"name":"file","type":"FILE","value":"connect-features.xlsx"},{"name":"columnNames","type":"STRING","value":""},{"name":"sqlStatement","type":"STRING","value":"select * from features where default in (${default})"},{"name":"columnNameLineNumber","type":"INT","value":1},{"name":"skipEmptyLines","type":"BOOLEAN","value":false},{"name":"skipEmptyColumns","type":"BOOLEAN","value":false}]} \ No newline at end of file diff --git a/smardigo/provisioning/form/select-connect-feature-set.json b/smardigo/provisioning/form/select-connect-feature-set.json index 0493100..ecbd919 100644 --- a/smardigo/provisioning/form/select-connect-feature-set.json +++ b/smardigo/provisioning/form/select-connect-feature-set.json @@ -81,7 +81,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "ej3cdtl" + "id" : "e2e6mdi" }, { "label" : "Optionale Features", "mask" : false, @@ -105,7 +105,7 @@ "eq" : "" }, "data" : { - "url" : "api/v1/scopes/{{ context.scopeId }}/processes/{{ context.processId }}/datasources/connect-features/query", + "url" : "api/v1/scopes/{{ context.scopeId }}/processes/{{ context.processId }}/datasources/connect-features/query?default='0','1'", "values" : [ { } ] }, "template" : "{{ item.key }}", @@ -154,7 +154,7 @@ "buttonSelectAll" : "Alle auswählen", "buttonDeselectAll" : "Alle abwählen", "selectAll" : false, - "id" : "e04qnv" + "id" : "e7k5sf" } ], "tabs" : null, "reorder" : false, @@ -197,6 +197,6 @@ "custom" : "", "customPrivate" : false }, - "id" : "e3myfvi" + "id" : "enh5f1d" } ] } \ No newline at end of file diff --git a/smardigo/provisioning/form/simple-connect.json b/smardigo/provisioning/form/simple-connect.json index 41e6e36..bd27afd 100644 --- a/smardigo/provisioning/form/simple-connect.json +++ b/smardigo/provisioning/form/simple-connect.json @@ -82,7 +82,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "easzwg" + "id" : "eesrola" }, { "label" : "HTML", "labelPosition" : "left-left", @@ -149,7 +149,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "e279n5i" + "id" : "eb3aywh" }, { "label" : "progress_current", "labelPosition" : "left-left", @@ -215,7 +215,7 @@ "refreshOn" : "", "clearOnRefresh" : false, "validateOn" : "change", - "id" : "e0o7l9k" + "id" : "en8jo4n" }, { "label" : "progress_max", "labelPosition" : "left-left", @@ -281,7 +281,7 @@ "refreshOn" : "", "clearOnRefresh" : false, "validateOn" : "change", - "id" : "e44c5tv" + "id" : "eqoi05t" } ], "tabs" : null, "reorder" : false, @@ -324,7 +324,7 @@ "custom" : "", "customPrivate" : false }, - "id" : "enkosqr" + "id" : "e53eyz6" }, { "label" : "Links", "mask" : false, @@ -405,7 +405,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "equgyyf" + "id" : "e8418y" }, { "label" : "HTML", "labelPosition" : "left-left", @@ -472,7 +472,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "eko0ec7" + "id" : "erg0qja" }, { "label" : "HTML", "labelPosition" : "left-left", @@ -539,7 +539,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "edi3jde" + "id" : "e8p3roq" }, { "label" : "HTML", "labelPosition" : "left-left", @@ -606,7 +606,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "elpjmys" + "id" : "eydtec" } ], "tabs" : null, "reorder" : false, @@ -649,7 +649,7 @@ "custom" : "", "customPrivate" : false }, - "id" : "enl1cfi" + "id" : "e2j161d" }, { "label" : "Status", "mask" : false, @@ -730,7 +730,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tag" : "p", - "id" : "eti0z2" + "id" : "elisl2r" }, { "label" : "Optionale Features", "mask" : false, @@ -754,7 +754,7 @@ "eq" : "" }, "data" : { - "url" : "api/v1/scopes/{{ context.scopeId }}/processes/{{ context.processId }}/datasources/connect-features/query", + "url" : "api/v1/scopes/{{ context.scopeId }}/processes/{{ context.processId }}/datasources/connect-features/query?default='0','1'", "values" : [ { } ] }, "template" : "{{ item.key }}", @@ -803,7 +803,7 @@ "buttonSelectAll" : "Alle auswählen", "buttonDeselectAll" : "Alle abwählen", "selectAll" : false, - "id" : "etowbm5" + "id" : "e587op" } ], "tabs" : null, "reorder" : false, @@ -846,7 +846,7 @@ "custom" : "", "customPrivate" : false }, - "id" : "e5rtoi" + "id" : "ewzogp" }, { "label" : "Connect", "mask" : false, @@ -977,7 +977,7 @@ "infiniteScroll" : false, "clearValueIfNotInItems" : false, "clientSideFilter" : "", - "id" : "e5158b" + "id" : "e96z1wg" } ], "tabs" : null, "reorder" : false, @@ -1019,7 +1019,7 @@ "custom" : "", "customPrivate" : false }, - "id" : "eys8p86" + "id" : "e2j3vnr" } ], "tabs" : null, "encrypted" : false, @@ -1059,7 +1059,7 @@ "clearOnRefresh" : false, "validateOn" : "change", "tree" : true, - "id" : "e9byos" + "id" : "e8nireh" }, { "label" : "Cluster", "mask" : false, @@ -1169,7 +1169,7 @@ "mask" : false, "inputType" : "text", "inputMask" : "", - "id" : "edbxblb" + "id" : "e2gc4zv" }, { "label" : "Name", "labelPosition" : "left-left", @@ -1244,7 +1244,7 @@ "mask" : false, "inputType" : "text", "inputMask" : "", - "id" : "e5xhwr9" + "id" : "e2hig9r" }, { "label" : "Size", "labelPosition" : "left-left", @@ -1310,7 +1310,7 @@ "refreshOn" : "", "clearOnRefresh" : false, "validateOn" : "change", - "id" : "et9k0fj" + "id" : "e65jfg" }, { "label" : "Service", "labelPosition" : "left-left", @@ -1385,7 +1385,7 @@ "mask" : false, "inputType" : "text", "inputMask" : "", - "id" : "ek9ch1a" + "id" : "ecivp7p" } ], "tabs" : null, "reorder" : false, @@ -1428,7 +1428,7 @@ "custom" : "", "customPrivate" : false }, - "id" : "ek2pygv" + "id" : "e69kjk" } ], "tabs" : null, "encrypted" : false, @@ -1468,6 +1468,6 @@ "clearOnRefresh" : false, "validateOn" : "change", "tree" : true, - "id" : "e44jqhs" + "id" : "e8nty8" } ] } \ No newline at end of file diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn index 5f36cc5..359b66c 100644 --- a/smardigo/provisioning/process/simple-connect.bpmn +++ b/smardigo/provisioning/process/simple-connect.bpmn @@ -59,6 +59,9 @@ + + + ${0} ${1} @@ -1657,6 +1660,10 @@ Variables.userId(authenticatedUserId) + + + + @@ -1860,10 +1867,6 @@ Variables.userId(authenticatedUserId) - - - - diff --git a/smardigo/provisioning/roles/roles.json b/smardigo/provisioning/roles/roles.json index 5ea96bb..44c16c9 100644 --- a/smardigo/provisioning/roles/roles.json +++ b/smardigo/provisioning/roles/roles.json @@ -3,19 +3,16 @@ "configKey" : "roles", "configType" : "roles", "roles" : [ { - "id" : "user", - "name" : "User" - }, - { - "id" : "head", - "name" : "Head" - }, - { - "id" : "maintainer", - "name" : "Maintainer" - }, - { - "id" : "administrator", - "name" : "Administrator" - } ] -} + "id" : "user", + "name" : "User" + }, { + "id" : "head", + "name" : "Head" + }, { + "id" : "maintainer", + "name" : "Maintainer" + }, { + "id" : "administrator", + "name" : "Administrator" + } ] +} \ No newline at end of file diff --git a/smardigo/provisioning/script/initialize-connect-features.groovy b/smardigo/provisioning/script/initialize-connect-features.groovy new file mode 100644 index 0000000..cf66253 --- /dev/null +++ b/smardigo/provisioning/script/initialize-connect-features.groovy @@ -0,0 +1,10 @@ + +def parameters = [:] +parameters["default"] = "'1'" + +def defaultFeatures = datasources.query("connect-features").processScope(contextScopeId, contextScopeTag).parameters(parameters).list(); + +def features = [] +defaultFeatures.each { val -> features+= val.key } + +features \ No newline at end of file