projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "RIFT-15577 - part one: make 'Add' immediately create catalog item in backend"
[osm/UI.git]
/
skyquake
/
framework
/
widgets
/
skyquake_container
/
skyquakeContainerStore.js
diff --git
a/skyquake/framework/widgets/skyquake_container/skyquakeContainerStore.js
b/skyquake/framework/widgets/skyquake_container/skyquakeContainerStore.js
index
fe4a7b0
..
d1a8a9e
100644
(file)
--- a/
skyquake/framework/widgets/skyquake_container/skyquakeContainerStore.js
+++ b/
skyquake/framework/widgets/skyquake_container/skyquakeContainerStore.js
@@
-1,5
+1,5
@@
/*
/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-35,6
+35,7
@@
class SkyquakeContainerStore {
//Notification defaults
this.notificationMessage = '';
this.displayNotification = false;
//Notification defaults
this.notificationMessage = '';
this.displayNotification = false;
+ this.notificationType = 'error';
//Screen Loader default
this.displayScreenLoader = false;
this.bindActions(SkyquakeContainerActions);
//Screen Loader default
this.displayScreenLoader = false;
this.bindActions(SkyquakeContainerActions);
@@
-81,9
+82,9
@@
class SkyquakeContainerStore {
let connection = data.connection;
let streamSource = data.streamSource;
console.log('Success opening notification socket for stream ', streamSource);
let connection = data.connection;
let streamSource = data.streamSource;
console.log('Success opening notification socket for stream ', streamSource);
-
+
let ws = window.multiplexer.channel(connection);
let ws = window.multiplexer.channel(connection);
-
+
if (!connection) return;
self.setState({
socket: ws.ws,
if (!connection) return;
self.setState({
socket: ws.ws,
@@
-162,20
+163,21
@@
class SkyquakeContainerStore {
//Notifications
showNotification = (data) => {
//Notifications
showNotification = (data) => {
- if(typeof(data) == 'string') {
- this.setState({
+ let state = {
displayNotification: true,
displayNotification: true,
- notificationMessage: data
- });
+ notificationMessage: data,
+ notificationType: 'error',
+ displayScreenLoader: false
+ }
+ if(typeof(data) == 'string') {
+
} else {
} else {
- if(data.type == 'error') {
- this.setState({
- displayNotification: true,
- notificationMessage: data.msg,
- displayScreenLoader: false
- });
+ state.notificationMessage = data.msg;
+ if(data.type) {
+ state.notificationType = data.type;
}
}
}
}
+ this.setState(state);
}
hideNotification = () => {
this.setState({
}
hideNotification = () => {
this.setState({