[incubator-streampipes] 01/04: [STREAMPIPES-145] Use migrated editor module as default

[ri...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-145
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 8f539278395b378fc5a714519b66591f02b2c348
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Jun 14 18:22:25 2020 +0200

    [STREAMPIPES-145] Use migrated editor module as default
---
 ui/deployment/dev/config.yml   |  1 -
 ui/deployment/modules.yml      | 36 +++++++++++-------------------------
 ui/deployment/state.config.mst |  1 +
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/ui/deployment/dev/config.yml b/ui/deployment/dev/config.yml
index 3efb6ec..568a8c6 100644
--- a/ui/deployment/dev/config.yml
+++ b/ui/deployment/dev/config.yml
@@ -28,4 +28,3 @@ modules:
   - spDataExplorer
   - spConfiguration
   - spDataExplorer2
-  - spEditor2
diff --git a/ui/deployment/modules.yml b/ui/deployment/modules.yml
index 515ecde..02e92fa 100644
--- a/ui/deployment/modules.yml
+++ b/ui/deployment/modules.yml
@@ -14,19 +14,20 @@
 # limitations under the License.
 
 spEditor:
-  ng5: False
-  ng1_templateUrl: '../editor/editor.html'
-  ng5_moduleName: ''
-  ng5_component: ''
-  ng5_componentPath: ''
-  path: './editor/editor.module'
+  ng5: True
+  ng1_templateUrl: ''
+  ng1_controller: ''
+  ng5_moduleName: 'EditorModule'
+  ng5_component: 'EditorComponent'
+  ng5_componentPath: '../editor-v2/editor.component'
+  path: './editor-v2/editor.module'
   link: 'streampipes.editor'
   url: '/editor/:pipeline'
-  title: 'Pipeline Editor'
-  description: 'The editor can be used to model new pipelines'
+  title: 'Editor'
+  description: 'editor-v2'
   icon: 'action:ic_dashboard_24px'
-  homeImage: '/assets/img/home/editor.png'
-  admin: False
+  homeImage: '/assets/img/home/configuration.png'
+  admin: false
 spConnect:
   ng5: True
   ng1_templateUrl: ''
@@ -170,19 +171,4 @@ spDataExplorer2:
   description: 'data-explorer-v2'
   icon: 'navigation:ic_apps_24px'
   homeImage: '/assets/img/home/configuration.png'
-  admin: false
-spEditor2:
-  ng5: True
-  ng1_templateUrl: ''
-  ng1_controller: ''
-  ng5_moduleName: 'EditorModule'
-  ng5_component: 'EditorComponent'
-  ng5_componentPath: '../editor-v2/editor.component'
-  path: './editor-v2/editor.module'
-  link: 'streampipes.editor2'
-  url: '/editor2'
-  title: 'Editor'
-  description: 'editor-v2'
-  icon: 'action:ic_dashboard_24px'
-  homeImage: '/assets/img/home/configuration.png'
   admin: false
\ No newline at end of file
diff --git a/ui/deployment/state.config.mst b/ui/deployment/state.config.mst
index 330e598..cbd9462 100644
--- a/ui/deployment/state.config.mst
+++ b/ui/deployment/state.config.mst
@@ -170,6 +170,7 @@ export default function stateConfig($stateProvider, $urlRouterProvider) {
         {{#ng5}}
         .state('{{{link}}}', {
             url: '{{{url}}}',
+            {{#containsPipeline}}{{ng1_templateUrl}}{{/containsPipeline}}
             views: {
                 "spMain@streampipes": {
                     component: {{{ng5_component}}}