streampipes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zehn...@apache.org
Subject [incubator-streampipes] 04/05: Fix build process
Date Sun, 08 Dec 2019 19:29:52 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit ad3655d73030c3814fa5d80fafe8b9083b2c661b
Author: Dominik Riemer <riemer@fzi.de>
AuthorDate: Sun Dec 8 20:13:00 2019 +0100

    Fix build process
---
 .gitlab-ci.yml                                               |  1 +
 ui/deployment/prebuild.js                                    |  1 -
 ui/package.json                                              | 12 ++++--------
 .../components/actions/pipeline-actions.controller.ts        |  5 ++---
 .../components/actions/pipeline-actions.tmpl.html            |  2 +-
 .../pipeline-details/pipeline-details.controller.ts          |  6 ++----
 .../components/pipeline-details/pipeline-details.tmpl.html   |  2 +-
 7 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c186b22..d0d58c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ build:
   script:
     - echo "$GPG_PRIVATE_KEY" | gpg --batch --import --passphrase "$GPG_PASSPHRASE"
     - echo "$MAVEN_CREDENTIALS" > /root/.m2/settings.xml
+    - export GPG_TTY=$(tty)
     - mvn clean package javadoc:aggregate gpg:sign -DskipTests
    # - mvn clean package javadoc:aggregate
     - export MVN_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate
-Dexpression=project.version | grep -v '\[')
diff --git a/ui/deployment/prebuild.js b/ui/deployment/prebuild.js
index 819b80c..1894553 100644
--- a/ui/deployment/prebuild.js
+++ b/ui/deployment/prebuild.js
@@ -95,7 +95,6 @@ fs.writeFileSync('src/app/appng5.module.ts', mustache.render(fs.readFileSync('de
 fs.writeFileSync('src/app/core/state.config.ts', mustache.render(fs.readFileSync('deployment/state.config.mst',
'utf8').toString(), modulesActive));
 fs.writeFileSync('src/app/layout/toolbar.controller.ts', mustache.render(fs.readFileSync('deployment/toolbar.controller.mst',
'utf8').toString(), modulesActive));
 fs.writeFileSync('src/app/home/home.service.ts', mustache.render(fs.readFileSync('deployment/home.service.mst',
'utf8').toString(), modulesActive));
-fs.writeFileSync('src/app/services/version/version.service.ts', mustache.render(fs.readFileSync('deployment/version.service.mst',
'utf8').toString(), modulesActive));
 
 
 // Move Images
diff --git a/ui/package.json b/ui/package.json
index 3ede185..5356205 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,15 +1,11 @@
 {
-  "name": "StreamPipes",
+  "name": "apache-streampipes",
   "version": "0.0.1",
-  "description": "This is the StreamPipes front end",
-  "authors": [
-    "Dominik Riemer",
-    "Philipp Zehnder"
-  ],
-  "homepage": "http://streampipes.fzi.de",
+  "description": "Apache StreamPipes (incubating) user interface",
+  "homepage": "http://streampipes.apache.org",
   "repository": {
     "type": "git",
-    "url": "https://laus.fzi.de/gitlab/streampipes/streampipes-ui"
+    "url": "https://github.com/apache/incubator-streampipes"
   },
   "scripts": {
     "start": "node ./deployment/prebuild.js && webpack-dev-server -d --env=dev",
diff --git a/ui/src/app/pipeline-details/components/actions/pipeline-actions.controller.ts
b/ui/src/app/pipeline-details/components/actions/pipeline-actions.controller.ts
index e049a77..a5174a2 100644
--- a/ui/src/app/pipeline-details/components/actions/pipeline-actions.controller.ts
+++ b/ui/src/app/pipeline-details/components/actions/pipeline-actions.controller.ts
@@ -20,14 +20,13 @@
 export class PipelineActionsController {
 
     PipelineOperationsService: any;
-    VersionService: any;
     starting: any;
     stopping: any;
     pipeline: any;
     $state: any;
     loadPipeline: any;
 
-    constructor(PipelineOperationsService, $state, VersionService) {
+    constructor(PipelineOperationsService, $state) {
         this.PipelineOperationsService = PipelineOperationsService;
         this.starting = false;
         this.stopping = false;
@@ -58,4 +57,4 @@ export class PipelineActionsController {
 
 }
 
-PipelineActionsController.$inject = ['PipelineOperationsService', '$state', 'VersionService'];
+PipelineActionsController.$inject = ['PipelineOperationsService', '$state'];
diff --git a/ui/src/app/pipeline-details/components/actions/pipeline-actions.tmpl.html b/ui/src/app/pipeline-details/components/actions/pipeline-actions.tmpl.html
index c3d3431..e9468bd 100644
--- a/ui/src/app/pipeline-details/components/actions/pipeline-actions.tmpl.html
+++ b/ui/src/app/pipeline-details/components/actions/pipeline-actions.tmpl.html
@@ -67,7 +67,7 @@
                 </md-button>
             </div>
             <div flex="30">
-            <md-button ng-if="!ctrl.VersionService.isEnterpriseEdition()" ng-click="ctrl.PipelineOperationsService.showLogs(ctrl.pipeline._id)"
class="md-button">
+            <md-button ng-click="ctrl.PipelineOperationsService.showLogs(ctrl.pipeline._id)"
class="md-button">
                 <md-icon
                         md-svg-icon="action:ic_info_24px"
                         aria-label="Logs" class="md-accent"></md-icon>
diff --git a/ui/src/app/pipelines/components/pipeline-details/pipeline-details.controller.ts
b/ui/src/app/pipelines/components/pipeline-details/pipeline-details.controller.ts
index d54c250..59765ca 100644
--- a/ui/src/app/pipelines/components/pipeline-details/pipeline-details.controller.ts
+++ b/ui/src/app/pipelines/components/pipeline-details/pipeline-details.controller.ts
@@ -25,7 +25,6 @@ export class PipelineDetailsController {
     stopping: any;
     refreshPipelines: any;
     PipelineOperationsService: any;
-    VersionService: any;
     activeCategory: any;
     dtOptions = {paging: false, searching: false,   "order": [], "columns": [
             { "orderable": false },
@@ -34,9 +33,8 @@ export class PipelineDetailsController {
             { "orderable": false },
         ]};
 
-    constructor(PipelineOperationsService, VersionService) {
+    constructor(PipelineOperationsService) {
         this.PipelineOperationsService = PipelineOperationsService;
-        this.VersionService = VersionService;
         this.starting = false;
         this.stopping = false;
     }
@@ -63,4 +61,4 @@ export class PipelineDetailsController {
 
 }
 
-PipelineDetailsController.$inject = ['PipelineOperationsService', 'VersionService'];
\ No newline at end of file
+PipelineDetailsController.$inject = ['PipelineOperationsService'];
\ No newline at end of file
diff --git a/ui/src/app/pipelines/components/pipeline-details/pipeline-details.tmpl.html b/ui/src/app/pipelines/components/pipeline-details/pipeline-details.tmpl.html
index 9baf695..7d583421 100644
--- a/ui/src/app/pipelines/components/pipeline-details/pipeline-details.tmpl.html
+++ b/ui/src/app/pipelines/components/pipeline-details/pipeline-details.tmpl.html
@@ -82,7 +82,7 @@
             </sp-button>
         </span>
                 <span flex flex-order="4" layout="row" layout-align="center center">
-            <sp-button sp-button-icon ng-if="ctrl.VersionService.isEnterpriseEdition()"
ng-click="ctrl.PipelineOperationsService.showLogs(pipeline._id)" class="md-icon-button"><i
class="material-icons">info</i>
+            <sp-button sp-button-icon ng-click="ctrl.PipelineOperationsService.showLogs(pipeline._id)"
class="md-icon-button"><i class="material-icons">info</i>
                 <md-tooltip md-direction="top">
                 Show Logs
             </md-tooltip>


Mime
View raw message