feat: added connect feature to portal

- webdav - resubmission - element_template - config_delete_Scope - external_tasks_script_worker
4 years ago · 11352747b2
parent c409b6eeeb
commit 11352747b2
13 changed files with 74 additions and 82 deletions
--- a/group_vars/connect_config_delete_scope/main.yml
+++ b/group_vars/connect_config_delete_scope/main.yml
@ -0,0 +1,3 @@
+---
+
+connect_config_delete_scope_enabled: "true"
--- a/group_vars/connect_element_template/main.yml
+++ b/group_vars/connect_element_template/main.yml
@ -0,0 +1,3 @@
+---
+
+connect_element_template_enabled: "true"
--- a/group_vars/connect_external_tasks_script_worker/main.yml
+++ b/group_vars/connect_external_tasks_script_worker/main.yml
@ -0,0 +1,3 @@
+---
+
+connect_external_task_script_worker_enabled: "true"
--- a/group_vars/connect_resubmission/main.yml
+++ b/group_vars/connect_resubmission/main.yml
--- a/group_vars/connect_webdav/main.yml
+++ b/group_vars/connect_webdav/main.yml
@ -0,0 +1,3 @@
+---
+
+connect_webdav_enabled: "true"
--- 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 }}/\"",
--- a/smardigo/provisioning/datasource-file/connect-features.xlsx
+++ b/smardigo/provisioning/datasource-file/connect-features.xlsx
--- 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
-  } ]
-}
+{"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}]}
--- 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"
  } ]
 }
--- 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"
  } ]
 }
--- a/smardigo/provisioning/process/simple-connect.bpmn
+++ b/smardigo/provisioning/process/simple-connect.bpmn
@ -59,6 +59,9 @@
    <bpmn2:task id="Activity_12c4494" name="Defaultwerte setzen">
      <bpmn2:extensionElements>
        <camunda:inputOutput>
+          <camunda:outputParameter name="connect-features">
+            <camunda:script scriptFormat="groovy" resource="initialize-connect-features.groovy" />
+          </camunda:outputParameter>
          <camunda:outputParameter name="progress_current">${0}</camunda:outputParameter>
          <camunda:outputParameter name="progress_max">${1}</camunda:outputParameter>
          <camunda:outputParameter name="cluster">
@ -1657,6 +1660,10 @@ Variables.userId(authenticatedUserId)</camunda:script>
      <bpmndi:BPMNShape id="Activity_1t8u7l0_di" bpmnElement="Activity_1t8u7l0" isExpanded="true">
        <dc:Bounds x="1590" y="2930" width="3832" height="940" />
      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1wmjqng_di" bpmnElement="Flow_1wmjqng">
+        <di:waypoint x="4598" y="3480" />
+        <di:waypoint x="4662" y="3480" />
+      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge id="Flow_0fu5s0o_di" bpmnElement="Flow_0fu5s0o">
        <di:waypoint x="3200" y="3715" />
        <di:waypoint x="3200" y="3650" />
@ -1860,10 +1867,6 @@ Variables.userId(authenticatedUserId)</camunda:script>
        <di:waypoint x="3570" y="3070" />
        <di:waypoint x="3630" y="3070" />
      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1wmjqng_di" bpmnElement="Flow_1wmjqng">
-        <di:waypoint x="4598" y="3480" />
-        <di:waypoint x="4662" y="3480" />
-      </bpmndi:BPMNEdge>
      <bpmndi:BPMNShape id="Event_1xmnacj_di" bpmnElement="Event_1xmnacj">
        <dc:Bounds x="2462" y="3462" width="36" height="36" />
      </bpmndi:BPMNShape>
--- a/smardigo/provisioning/roles/roles.json
+++ b/smardigo/provisioning/roles/roles.json
@ -5,16 +5,13 @@
  "roles" : [ {
    "id" : "user",
    "name" : "User"
-    },
-    {
+  }, {
    "id" : "head",
    "name" : "Head"
-    },
-    {
+  }, {
    "id" : "maintainer",
    "name" : "Maintainer"
-    },
-    {
+  }, {
    "id" : "administrator",
    "name" : "Administrator"
  } ]
--- a/smardigo/provisioning/script/initialize-connect-features.groovy
+++ 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