You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/03/16 14:04:31 UTC
[incubator-streampipes] branch dev updated: Fix bug in build file
of UI
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new b7b703e Fix bug in build file of UI
b7b703e is described below
commit b7b703eeeabb5a5776049c0a18f5bae2f81d07ea
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Mar 16 15:04:15 2020 +0100
Fix bug in build file of UI
---
.../src/main/java/org/apache/streampipes/model/Notification.java | 9 +++++++++
ui/deployment/app.module.mst | 2 --
ui/deployment/appng5.module.mst | 2 ++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/Notification.java b/streampipes-model/src/main/java/org/apache/streampipes/model/Notification.java
index c161c0d..af4f5cf 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/Notification.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/Notification.java
@@ -29,6 +29,7 @@ public class Notification {
private String title;
private Date createdAt;
+ private long createdAtTimestamp;
private String targetedAt;
private String correspondingPipelineId;
@@ -109,4 +110,12 @@ public class Notification {
public void setCorrespondingPipelineId(String correspondingPipelineId) {
this.correspondingPipelineId = correspondingPipelineId;
}
+
+ public long getCreatedAtTimestamp() {
+ return createdAtTimestamp;
+ }
+
+ public void setCreatedAtTimestamp(long createdAtTimestamp) {
+ this.createdAtTimestamp = createdAtTimestamp;
+ }
}
diff --git a/ui/deployment/app.module.mst b/ui/deployment/app.module.mst
index 3958e94..e407f60 100644
--- a/ui/deployment/app.module.mst
+++ b/ui/deployment/app.module.mst
@@ -30,7 +30,6 @@ import spServices from './services/services.module';
import spCore from './core/core.module';
import spLayout from './layout/layout.module';
import spLogin from './login/login.module';
-import spNotifications from './notifications/notifications.module';
import spAppLinks from './applinks/applinks.module';
import spPipelineDetails from './pipeline-details/pipeline-details.module';
import { SpButtonDirective } from "./core/button/button.directive";
@@ -51,7 +50,6 @@ export const Ng1AppModule = angular
spCore,
spLayout,
spLogin,
- spNotifications,
spAppLinks,
spPipelineDetails,
'ui.router',
diff --git a/ui/deployment/appng5.module.mst b/ui/deployment/appng5.module.mst
index 54be583..cbac941 100644
--- a/ui/deployment/appng5.module.mst
+++ b/ui/deployment/appng5.module.mst
@@ -45,6 +45,7 @@ import { {{{ng5_moduleName}}} } from '{{{path}}}';
import {ConsoleLogService} from './shared/logger/log.service';
import {Logger} from './shared/logger/default-log.service';
import { AppContainerModule } from './app-container/app-container.module';
+import { NotificationModule } from './notifications/notifications.module';
@NgModule({
@@ -65,6 +66,7 @@ import { AppContainerModule } from './app-container/app-container.module';
AppAssetMonitoringModule,
AppTransportMonitoringModule,
AppContainerModule,
+ NotificationModule,
{{#modulesActive}}
{{#ng5}}
{{{ng5_moduleName}}},