nutella_framework 0.6.18 → 0.6.19

data/framework_components/roomcast-main-app/src/app/components/NutellaMixin.js

@@ -27,7 +27,9 @@ var NutellaMixin = {
             day: date.getDate(),
             time: date.getHours() + ":" +date.getMinutes() + ":" +date.getSeconds()
         };
-        doc.info = info;
+        if(Object.keys(info).length !== 0) {
+            doc.info = info;
+        }
         nutella.net.publish('roomcast-log-bot/store', doc);
     },
 

data/framework_components/roomcast-main-app/src/app/components/app/main.js

@@ -88,7 +88,6 @@ var Main = React.createClass({
      * @param rid current identity
      */
     updateChannelsForRid: function(message, rid) {
-
         var self = this;
         var myChannelsId = [];
         var myChannels = [];
@@ -135,7 +134,6 @@ var Main = React.createClass({
             }
         });
         this.setState({players: newPlayers});
-        console.log(catalogue, players, newPlayers);
     },
 
     getInitialState: function() {
@@ -212,8 +210,8 @@ var Main = React.createClass({
 
         // #LOG action
         this.logAction('playChannel', this.props.params.app_id, this.props.params.run_id, {
-            channelName: this.state.channelsCatalogue[id].name,
-            packageName: this.state.rid,
+            channel_name: this.state.channelsCatalogue[id].name,
+            package_name: this.state.rid
         });
     },
 
@@ -256,7 +254,11 @@ var Main = React.createClass({
     },
 
     handleLogout: function() {
-        //this.handleSelectedResource(null);
+        // #LOG action
+        this.logAction('logout', this.props.params.app_id, this.props.params.run_id, {
+            package_name: this.state.rid
+        });
+
         this.props.onSwitchPage(1);
     },
 
@@ -265,7 +267,8 @@ var Main = React.createClass({
             <IdentitySelector
                 params = {this.props.params}
                 onSetRid = {this.handleSetRid}
-                mode = {mode}/>);
+                mode = {mode}
+                old_rid = {this._old_rid} />);
     },
 
     componentWillUnmount: function() {
@@ -330,10 +333,18 @@ var Main = React.createClass({
         if(id) {
             if(ids.indexOf(id) !== -1) {
                 this.updateChannelsForRid(mapping, this.state.rid);
+                // #LOG action
+                this.logAction('transitionActivity', this.props.app_id, this.props.run_id, {
+                    old_package_name: id,
+                    new_package_name: id,
+                    transparent: true
+                });
             } else {
+                this._old_rid = id;
                 this.setState({rid: null, modal: 'activity'});
             }
         } else {
+            this._old_rid = id;
             this.setState({rid: null, modal: 'activity'});
         }
     },

data/framework_components/roomcast-main-app/src/app/components/identity-selector/IdentitiesGrid.js

@@ -74,7 +74,11 @@ var IdentitiesGrid = React.createClass({
                         cardStyle={cardStyle}
                         hasBeenSelected={self.state.hasBeenSelected}
                         onSelectedIdentity={self.setHasBeenSelected}
-                        onSetRid = {self.props.onSetRid} />);
+                        onSetRid = {self.props.onSetRid}
+                        mode = {self.props.mode}
+                        app_id={self.props.app_id}
+                        run_id={self.props.run_id}
+                        old_rid={self.props.old_rid} />);
         });
 
         return (

data/framework_components/roomcast-main-app/src/app/components/identity-selector/IdentityCard.js

@@ -1,12 +1,12 @@
-
 var React = require('react');
 var Mui = require('material-ui');
 var Paper = Mui.Paper;
 var iOSMixin = require('./iOSMixin');
+var NutellaMixin = require('../NutellaMixin');
 
 var IdentityCard = React.createClass({
 
-    mixins: [iOSMixin],
+    mixins: [iOSMixin, NutellaMixin],
 
     componentDidMount: function() {
         var self= this;
@@ -34,6 +34,23 @@ var IdentityCard = React.createClass({
 
             // Trigger native animation
             var callback = function() {
+
+                // #LOG action
+                console.log(self.props.mode);
+                if(self.props.mode === 'id') {
+                    self.logAction('login', self.props.app_id, self.props.run_id, {
+                        package_name: self.props.name
+                    });
+                } else {
+                    if(self.props.mode === 'activity') {
+                        self.logAction('transitionActivity', self.props.app_id, self.props.run_id, {
+                            old_package_name: self.props.old_rid,
+                            new_package_name: self.props.name,
+                            transparent: self.props.name === self.props.old_rid
+                        });
+                    }
+                }
+
                 // Exit point from identity-selector
                 self.props.onSetRid(self.props.name);
             };

data/framework_components/roomcast-main-app/src/app/components/identity-selector/main.js

@@ -91,7 +91,11 @@ var Main = React.createClass({
 
                     <IdentitiesGrid
                         identities={this.state.identities}
-                        onSetRid = {this.props.onSetRid} />
+                        onSetRid={this.props.onSetRid}
+                        mode={this.props.mode}
+                        app_id={this.props.params.app_id}
+                        run_id={this.props.params.run_id}
+                        old_rid={this.props.old_rid} />
 
                 </div>
 

data/framework_components/roomcast-main-app/src/app/components/login/main.js

@@ -13,7 +13,6 @@ var Main = React.createClass({
     componentDidMount: function() {
         var query_parameters = NUTELLA.parseURLParameters();
         var broker = 'ltg.evl.uic.edu';
-        //var broker = 'localhost';
         if(query_parameters.broker) {
             broker = query_parameters.broker;
         }