1.48.0 release

Author: baumandm

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.48.0
+
+## Bug Fixes
+
+- Table Widget: fixed export to exclude internally-used columns
+
+# 1.47.0
+
+## Features
+
+## Bug Fixes
+
+ - CyclotronData: Fixed incorrect 404 responses for POST /data with a new key
+
+ - Proxy: Proxy request bodies that include an array were getting mangled
+
 # 1.46.0
 
 ## Features

cyclotron-site/app/scripts/common/services/services.commonConfigService.coffee

@@ -39,7 +39,7 @@ cyclotronServices.factory 'commonConfigService', ->
 
     exports = {
 
-        version: '1.46.0'
+        version: '1.48.0'
 
         logging: 
             enableDebug: false

cyclotron-site/app/widgets/table/tableWidget.coffee

@@ -332,26 +332,9 @@ cyclotronApp.controller 'TableWidget', ($scope, $location, $window, dashboardSer
 
             data = eventData.data[dsDefinition.resultSet].data
             isUpdate = eventData.isUpdate
-            
-            # Filter the data if the widget has "filters"
-            if $scope.widget.filters?
-                data = dataService.filter(data, $scope.widget.filters)
-
-            # Check for no data
-            if _.isEmpty data
-                $scope.sortedRows = null
-                $scope.widgetContext.loading = false
-                $scope.widgetContext.allowExport = false
-
-                if $scope.widget.noData?
-                    $scope.widgetContext.nodata = _.jsExec($scope.widget.noData)
-                    
-                else
-                    $scope.widgetContext.nodata = null
-                return
-            else
-                $scope.widgetContext.nodata = null
-                $scope.widgetContext.allowExport = $scope.widget.allowExport != false
+           
+            # Filter and sort the data 
+            data = $scope.filterAndSortWidgetData(data)
 
             data = _.cloneDeep(data)
             _.each data, (row, index) -> row.__index = index
@@ -421,7 +404,7 @@ cyclotronApp.controller 'TableWidget', ($scope, $location, $window, dashboardSer
             $scope.processRules(data, $scope.widget.rules)
 
             # Save and sort rows
-            $scope.sortedRows = $scope.widgetContext.data = data
+            $scope.sortedRows = data
             $scope.sortRows()
 
             $scope.paging.totalItems = $scope.sortedRows.length

cyclotron-site/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cyclotron-site",
   "description": "Cyclotron: website",
-  "version": "1.46.0",
+  "version": "1.48.0",
   "author": "Dave Bauman <dbauman@expedia.com>",
   "license": "MIT",
   "private": true,
@@ -59,4 +59,4 @@
     "merge-stream": "~0.1.7",
     "phantomjs-prebuilt": "~2.1.13"
   }
-}
+}

cyclotron-svc/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cyclotron-svc",
   "description": "Cyclotron: REST API",
-  "version": "1.46.0",
+  "version": "1.48.0",
   "author": "Dave Bauman <dbauman@expedia.com>",
   "license": "MIT",
   "private": true,

cyclotron-svc/routes/api.data.js

@@ -89,6 +89,7 @@ exports.putPostSingle = function (req, res) {
         },
         $inc: { rev: 1 }
     }, {
+        new: true,
         upsert: true
     }).exec(_.wrap(res, api.getCallback));
 };

cyclotron-svc/routes/api.proxy.js

@@ -24,7 +24,7 @@
 var config = require('../config/config'),
     _ = require('lodash'),
     request = require('request'),
-    aws4  = require('aws4'),
+    aws4 = require('aws4'),
     crypto = require('crypto');
 
 /* Crypto-process request options */
@@ -39,6 +39,8 @@ var decrypter = function (req) {
                 encrypted += cipher.final('utf8');
                 return encrypted;
             });
+        } else if (_.isArray(value)) {
+            return _.map(value, decrypt);
         } else if (_.isObject(value)) {
             return _.mapValues(value, decrypt);
         } else {

cyclotron-svc/routes/api.users.js

@@ -65,7 +65,10 @@ var createSession = function (user, ip) {
         $setOnInsert: {
             firstLogin: new Date()
         }
-    }, { upsert: true})
+    }, { 
+        new: true,
+        upsert: true
+    })
     .then(_.partial(auth.createNewSession, ip))
     .spread(function (session) {
         return session.populateAsync('user');