Merge pull request #178 from eve-bright/fix-number-formatting-from-bolt

Maintain big integers from Bolt until ready to present or export them

Author: oskarhane

app/index.jade

@@ -114,6 +114,7 @@ html(class="no-js", lang="en", ng-app="neo4jApp", ng-controller="MainCtrl")
     script(src='scripts/services/Timer.js')
     script(src='scripts/directives/focusOn.js')
     script(src='scripts/services/CSV.js')
+    script(src='scripts/services/BoltIntHelpers.js')
     script(src='scripts/directives/resizable.js')
     script(src='scripts/directives/fileUpload.js')
     script(src='scripts/directives/neoTable.js')
@@ -210,5 +211,6 @@ html(class="no-js", lang="en", ng-app="neo4jApp", ng-controller="MainCtrl")
     script(src='scripts/services/ProtocolFactory.js')
     script(src='scripts/controllers/SyncSigninController.js')
     script(src='lib/helpers.js')
+    script(src='lib/boltIntHelpers.js')
     script(src='lib/serializer.js')
     //endbuild

app/scripts/app.coffee

@@ -31,7 +31,8 @@ angular.module('neo4jApp.services', [
   'AsciiTableModule',
   'auth0',
   'firebase',
-  'angular-jwt'
+  'angular-jwt',
+  'neo.boltint'
 ])
 
 app = angular.module('neo4jApp', [

app/scripts/controllers/CypherResult.coffee

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict'
 
 angular.module('neo4jApp.controllers')
-  .controller 'CypherResultCtrl', ['$rootScope', '$scope', 'AsciiTableFactory', ($rootScope, $scope, AsciiTableFactory) ->
+  .controller 'CypherResultCtrl', ['$rootScope', '$scope', 'AsciiTableFactory', 'BoltIntHelpers',  ($rootScope, $scope, AsciiTableFactory, BoltIntHelpers) ->
     $scope.displayInternalRelationships = $rootScope.stickyDisplayInternalRelationships ? true
     $scope.availableModes = []
     $scope.slider = {min: 4, max: 20}
@@ -64,7 +64,7 @@ angular.module('neo4jApp.controllers')
 
     $scope.loadAscii = () ->
       return if not tableData or not tableData.data
-      rows = tableData.data.map((data_obj) -> return data_obj.row)
+      rows = tableData.data.map((data_obj) -> return BoltIntHelpers.mapBoltIntsToStrings(data_obj.row))
       rows.splice(0, 0, tableData.columns)
       res = asciiTable.get(rows, {maxColumnWidth: $scope.ascii_col_width})
       $scope.slider.max = asciiTable.maxWidth

app/scripts/directives/exportable.coffee

@@ -68,7 +68,8 @@ angular.module('neo.exportable', ['neo.csv'])
       '$scope',
       'CSV',
       'exportService'
-      ($scope, CSV, exportService) ->
+      'BoltIntHelpers'
+      ($scope, CSV, exportService, BoltIntHelpers) ->
 
         $scope.exportGraphSVG = ->
           $scope.$emit('frame.export.graph.svg')
@@ -88,6 +89,7 @@ angular.module('neo.exportable', ['neo.csv'])
 
         $scope.exportJSON = (data) ->
           return unless data
+          data = BoltIntHelpers.mapBoltIntsToInts data
           exportService.download('result.json', 'application/json', JSON.stringify(data))
 
         $scope.exportCSV = (data) ->

app/scripts/directives/neoTable.coffee

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 angular.module('neo4jApp.directives')
   .directive('neoTable', ['Utils', (Utils) ->
+      bolt = window.neo4j.v1
       replace: yes
       restrict: 'E'
       link: (scope, elm, attr) ->
@@ -40,7 +41,9 @@ angular.module('neo4jApp.directives')
           html
 
         cell2html = (cell) ->
-          if angular.isString(cell)
+          if bolt.isInt cell
+            return cell.toString()
+          else if angular.isString(cell)
             return emptyMarker() unless cell.length
             Utils.escapeHTML(cell)
           else if angular.isArray(cell)

app/scripts/services/Bolt.coffee

@@ -29,7 +29,8 @@ angular.module('neo4jApp.services')
     '$location'
     '$q'
     'Utils'
-    (Settings, AuthDataService, localStorageService, $rootScope, $location, $q, Utils) ->
+    'BoltIntHelpers'
+    (Settings, AuthDataService, localStorageService, $rootScope, $location, $q, Utils, BoltIntHelpers) ->
       bolt = window.neo4j.v1
       _driver = null
       _errorStatus = null
@@ -47,7 +48,7 @@ angular.module('neo4jApp.services')
 
       testQuery = (driver) ->
         q = $q.defer()
-        driver.onError = (e) -> 
+        driver.onError = (e) ->
           if e instanceof Event and e.type is 'error'
             q.reject getSocketErrorObj()
           else if e.code and e.message # until Neo4jError is in drivers public API
@@ -66,11 +67,11 @@ angular.module('neo4jApp.services')
       testConnection = (withoutCredentials = no) ->
         q = $q.defer()
         driver = getDriverObj withoutCredentials
-        testQuery(driver).then((r) -> 
+        testQuery(driver).then((r) ->
           q.resolve r
           _errorStatus = null
           driver.close()
-        ).catch((e) -> 
+        ).catch((e) ->
           q.reject e
           _errorStatus = e
           driver.close()
@@ -82,7 +83,7 @@ angular.module('neo4jApp.services')
         _driver = getDriverObj withoutCredentials
         testQuery(_driver)
           .then((r) -> q.resolve r)
-          .catch((e) -> 
+          .catch((e) ->
             _driver = null unless e.fields[0].code is 'Neo.ClientError.Security.CredentialsExpired'
             q.reject e
           )
@@ -120,12 +121,12 @@ angular.module('neo4jApp.services')
         else
           if tx
             # We need to look for error messages from
-            # the commit() call even though run() 
+            # the commit() call even though run()
             # reported a successful operation
             p = tx.run statement, parameters
-            p.then((r) -> 
+            p.then((r) ->
               if tx # The tx might have been terminated
-                tx.commit().then((txr) -> 
+                tx.commit().then((txr) ->
                   session.close()
                   q.resolve r
                 ).catch((txe) ->
@@ -174,21 +175,20 @@ angular.module('neo4jApp.services')
 
       jmxResultToRESTResult = (r, whatToGet = []) ->
         return {data: []} unless r.records
-        r.records = itemIntToString r.records
         filtered = r.records.filter((record) -> whatToGet.indexOf(record.get('name')) > -1)
-          .map((record) -> 
+          .map((record) ->
             origAttributes = record.get('attributes')
             return {
-              name: record.get('name'), 
-              description: record.get('description'), 
+              name: record.get('name'),
+              description: record.get('description'),
               attributes: Object.keys(record.get('attributes')).map((attributeName) -> {
                 name: attributeName,
                 description: origAttributes[attributeName].description,
                 value: origAttributes[attributeName].value
               })
             }
           )
-        {data: filtered}
+        {data: BoltIntHelpers.mapBoltIntsToStrings filtered}
 
       schemaResultToRESTResult = (indexes, constraints) ->
         indexString = ""
@@ -234,7 +234,7 @@ angular.module('neo4jApp.services')
         obj.data.results[0].plan = boltPlanToRESTPlan result.summary.plan if result.summary and result.summary.plan
         obj.data.results[0].plan = boltPlanToRESTPlan result.summary.profile if result.summary and result.summary.profile
         obj.data.results[0].stats = boltStatsToRESTStats result.summary
-        res = itemIntToString res
+#        res = itemIntToString res
         rows = res.map((record) ->
           return {
             row: getRESTRowsFromBolt record, keys
@@ -282,6 +282,7 @@ angular.module('neo4jApp.services')
         return item.properties if item instanceof bolt.types.Relationship
         return [].concat.apply([], extractPathForRowsFormat(item)) if item instanceof bolt.types.Path
         return item if item is null
+        return item if bolt.isInt item
         return item.map((subitem) -> extractDataForRowsFormat subitem) if Array.isArray item
         if typeof item is 'object'
           out = {}
@@ -312,29 +313,14 @@ angular.module('neo4jApp.services')
         return item if item instanceof bolt.types.Relationship
         return [].concat.apply([], extractPathsForGraphFormat(item)) if item instanceof bolt.types.Path
         return no if item is null
+        return item if bolt.isInt item
         return item.map((subitem) -> extractDataForGraphFormat subitem).filter((i) -> i) if Array.isArray item
         if typeof item is 'object'
           out = Object.keys(item).map((key) -> extractDataForGraphFormat(item[key])).filter((i) -> i)
           return no if not out.length
           return out
         no
 
-      itemIntToString = (item) ->
-        return arrayIntToString item if Array.isArray(item)
-        return item if typeof item in ['number', 'string', 'boolean']
-        return item if item is null
-        return item.toString() if bolt.isInt item
-        return objIntToString item if typeof item is 'object'
-
-      arrayIntToString = (arr) ->
-       arr.map((item) -> itemIntToString item)
-
-      objIntToString = (obj) ->
-        Object.keys(obj).forEach((key) ->
-          obj[key] = itemIntToString obj[key]
-        )
-        obj
-
       boltPlanToRESTPlan = (plan) ->
         obj = boltPlanToRESTPlanShared plan
         obj['runtime-impl'] = plan.arguments['runtime-impl']

app/scripts/services/BoltIntHelpers.coffee

@@ -0,0 +1,26 @@
+###!
+Copyright (c) 2002-2016 "Neo Technology,"
+Network Engine for Objects in Lund AB [http://neotechnology.com]
+
+This file is part of Neo4j.
+
+Neo4j is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###
+
+'use strict'
+
+angular.module('neo.boltint', [])
+  .service 'BoltIntHelpers', [ ->
+    return new neo.boltIntHelpers()
+]

app/scripts/services/GraphStyle.coffee

@@ -112,6 +112,7 @@ angular.module('neo4jApp.services')
         @props[attr] or ''
 
     class GraphStyle
+      bolt = window.neo4j.v1
       constructor: (@storage) ->
         @rules = []
         try
@@ -327,6 +328,7 @@ angular.module('neo4jApp.services')
           /\{([^{}]*)\}/g,
           (a, b) ->
             r = item.propertyMap[b]
+            return r.toString() if bolt.isInt r
             if typeof r is 'object'
               r = r.join(', ')
             return if (typeof r is 'string' or typeof r is 'number') then r else ''
@@ -340,6 +342,7 @@ angular.module('neo4jApp.services')
           /^<(id|type)>$/,
           (a,b) ->
             r = item[b]
+            return r.toString() if bolt.isInt r
             return if (typeof r is 'string' or typeof r is 'number') then r else ''
         )
 

app/views/partials/frame-common-actions.jade

@@ -18,8 +18,8 @@
           a(exportable ng-click='exportPlanSVG()', ng-show='isActive("plan")') Export SVG
           a(exportable ng-click='exportGraphPNG()', ng-show='isActive("graph")') Export PNG
           a(exportable ng-click='exportPlanPNG()', ng-show='isActive("plan")') Export PNG
-          a(exportable ng-click='exportJSON(frame.response.raw.summary ? frame.response.raw : frame.response.table._response)') Export JSON
-          a(ng-hide="frame.response.protocol=='bolt'", exportable ng-click='exportCSV(frame.response.table)') Export CSV
+          a(exportable ng-click='exportJSON(frame.response.table._response)') Export JSON
+          a(exportable ng-click='exportCSV(frame.response.table)') Export CSV
     li
       a.button.sl.sl-pin(ng-click='pin(frame)', ng-class="{pinned: pinned}", tooltip-placement='bottom', tooltip='Pin at top')
     li

lib/boltIntHelpers.coffee

@@ -0,0 +1,58 @@
+###!
+Copyright (c) 2002-2016 "Neo Technology,"
+Network Engine for Objects in Lund AB [http://neotechnology.com]
+
+This file is part of Neo4j.
+
+Neo4j is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###
+
+'use strict'
+if global? then global.neo = global.neo || {};
+if window? then window.neo = window.neo || {};
+
+neo = global?.neo || window?.neo
+bolt = window.neo4j.v1
+
+class neo.boltIntHelpers
+  stringify = (val) ->
+    return val.toString() if bolt.isInt val
+    return "[" + val.map((item) -> stringify(item)).join() + "]" if Array.isArray(val)
+    return 'null' if val is null
+    if typeof val == 'object'
+      return "{" + Object.keys(val).map((key) ->  '"' + key + '"' + ":" + stringify(val[key])).join() + "}"
+    return '"' + val + '"' if typeof val == 'string'
+    return val.toString()
+
+
+  mapBoltIntsToStrings = (val) ->
+    return mapBoltInts(val, (boltInt) -> boltInt.toString())
+
+  mapBoltIntsToInts = (val) ->
+    return mapBoltInts(val, (boltInt) -> parseInt(boltInt.toString()))
+
+  mapBoltInts = (val, mappingFunc) ->
+    return mappingFunc val if bolt.isInt val
+    return val.map((item) -> mapBoltInts(item, mappingFunc)) if Array.isArray(val)
+    if typeof val == 'object' && val != null
+      out = {}
+      Object.keys(val).forEach((key) ->
+        out[key] = mapBoltInts(val[key], mappingFunc))
+      return out
+    return val
+
+  constructor: ->
+    @stringify = stringify
+    @mapBoltIntsToStrings = mapBoltIntsToStrings
+    @mapBoltIntsToInts = mapBoltIntsToInts