Merge pull request #98 from neo-technology/error-in-message-bar-on-auth-if-connection-error

oskarhane · oskarhane · commit 11dbeddf1105 · 2016-04-21T13:27:07.000+02:00
Use editor message bar for connection errors (http and bolt)
diff --git a/app/scripts/controllers/Main.coffee b/app/scripts/controllers/Main.coffee
@@ -121,8 +121,9 @@ angular.module('neo4jApp.controllers')
           if (serverIsOffline?)
             if not serverIsOffline
               UDC.trackConnectEvent()
+              $scope.bolt_connection_failure = no
             else
-              $scope.errorMessage = motdService.pickRandomlyFromChoiceName('disconnected')
+              $scope.bolt_connection_failure = yes
 
         $scope.$on 'auth:status_updated', (e, is_connected) ->
           $scope.check()
diff --git a/app/scripts/controllers/SettingsController.coffee b/app/scripts/controllers/SettingsController.coffee
@@ -28,15 +28,17 @@ angular.module('neo4jApp.controllers')
     'SettingsStore'
     'Bolt'
     '$location'
-    ($scope, Frame, Settings, SettingsStore, Bolt, $location) ->
+    '$rootScope'
+    ($scope, Frame, Settings, SettingsStore, Bolt, $location, $rootScope) ->
       $scope.settings = Settings
       $scope.save = () ->
         SettingsStore.save()
       $scope.openBoltHelp = () ->
         Frame.create({input: Settings.cmdchar + 'help bolt encryption'})
       $scope.toggleBoltUsage = () ->
-        return unless Settings.useBolt
-        Bolt.connect()
+        $rootScope.bolt_connection_failure = no
+        if Settings.useBolt
+          Bolt.connect()
       $scope.updateBoltConnection = () ->
         Bolt.connect()
       $scope.defaultBoltHost = $location.host()
diff --git a/app/scripts/services/CypherTransactionBolt.coffee b/app/scripts/services/CypherTransactionBolt.coffee
@@ -27,7 +27,8 @@ angular.module('neo4jApp.services')
     'Bolt'
     'UsageDataCollectionService'
     'Timer'
-    ($q, CypherResult, Bolt, UDC, Timer) ->
+    '$rootScope'
+    ($q, CypherResult, Bolt, UDC, Timer, $rootScope) ->
       parseId = (resource = "") ->
         id = resource.split('/').slice(-2, -1)
         return parseInt(id, 10)
@@ -54,8 +55,8 @@ angular.module('neo4jApp.services')
         (res) ->
           remapped = res.remapped
           q.reject({
-            protocol: 'bolt', 
-            raw: res.original, 
+            protocol: 'bolt',
+            raw: res.original,
             errors: remapped.data.errors,
             notifications: remapped.data.notifications
           })
@@ -91,7 +92,7 @@ angular.module('neo4jApp.services')
           q = $q.defer()
           q.resolve()
           q.promise
-          
+
         commit: (query) ->
           that = @
           statements = if query then [{statement:query}] else []
@@ -101,11 +102,13 @@ angular.module('neo4jApp.services')
           @tx = tx
           @session = session
           timer = Timer.start()
-          promise.then((r) -> 
+          promise.then((r) ->
+            $rootScope.bolt_connection_failure = no
             r.responseTime = timer.stop().time()
             q.resolve({original: r, remapped: Bolt.constructResult(r)})
             that._reset()
           ).catch((r) -> 
+            $rootScope.bolt_connection_failure = yes
             r.responseTime = timer.stop().time()
             q.reject({original: r, remapped: Bolt.constructResult(r)})
             that._reset()
diff --git a/app/scripts/services/UtilityBolt.coffee b/app/scripts/services/UtilityBolt.coffee
@@ -25,7 +25,8 @@ angular.module('neo4jApp.services')
     'Bolt'
     'Settings'
     '$q'
-    (Bolt, Settings, $q) ->
+    '$rootScope'
+    (Bolt, Settings, $q, $rootScope) ->
       {
         clearConnection: -> Bolt.clearConnection()
         getSchema: ->
@@ -67,19 +68,23 @@ angular.module('neo4jApp.services')
         makeRequest: (withoutCredentials, retainConnection) ->
           q = $q.defer()
           r = Bolt.testConnection withoutCredentials
-          r.then((r) -> 
+          r.then((r) ->
             res = Bolt.constructResult r
             Bolt.connect() if retainConnection
-            return q.resolve({}) unless res.data.errors.length
-            return q.reject({status: 401, data: res})
-          ).catch((err) -> 
+            if not res.data.errors.length
+              $rootScope.bolt_connection_failure = no
+              return q.resolve({})
+            else
+              return q.reject({status: 401, data: res})
+          ).catch((err) ->
             errObj = Bolt.constructResult err
             if errObj.data.errors[0].code is 'Neo.ClientError.Security.CredentialsExpired'
               errObj.data.password_change = 'true'
               errObj.status = 403
               Bolt.connect() if retainConnection
-            else if errObj.data.errors[0].code is 'Socket.Error'
+            else if errObj.data.errors[0].code is 'Socket.Error' || errObj.data.errors[0].message.indexOf('WebSocket connection failure') == 0
               errObj.status = 0
+              $rootScope.bolt_connection_failure = yes
             else
               errObj.status = 401
             q.reject errObj
diff --git a/app/views/main.jade b/app/views/main.jade
@@ -11,4 +11,3 @@
 #diagnostics(ng-show='showVizDiagnostics')
   include partials/visualization-diagnostics
 
-#error {{errorMessage}}
diff --git a/app/views/partials/editor.jade b/app/views/partials/editor.jade
@@ -27,33 +27,40 @@
         )
     ul.controls.list-inline(ng-if="!(settings.filemode && editor.document.id)")
       li
-        a.circled.favorites.sl.sl-star-circle(ng-class="{'sl-star-filled': !editor.hasChanged() && hoveringStar, 'sl-pencil-circle': editor.hasChanged() && !hoveringStar, 'sl-pencil-filled':editor.hasChanged() && hoveringStar, active: editorHasContent, 'enabled': editor.document.id, 'changed': editor.hasChanged()}", 
+        a.circled.favorites.sl.sl-star-circle(ng-class="{'sl-star-filled': !editor.hasChanged() && hoveringStar, 'sl-pencil-circle': editor.hasChanged() && !hoveringStar, 'sl-pencil-filled':editor.hasChanged() && hoveringStar, active: editorHasContent, 'enabled': editor.document.id, 'changed': editor.hasChanged()}",
           ng-mouseenter="hoveringStar=true",
           ng-mouseleave="hoveringStar=false",
-          ng-click='star()', 
-          tooltip='Favorite', 
+          ng-click='star()',
+          tooltip='Favorite',
           tooltip-placement='left')
       li(ng-if="!settings.filemode")
-        a.circled.delete.sl.sl-delete-circle(ng-click='editor.setContent("")', 
-          ng-class="{active: editorHasContent, 'sl-delete-filled': hoveringDelete}", 
+        a.circled.delete.sl.sl-delete-circle(ng-click='editor.setContent("")',
+          ng-class="{active: editorHasContent, 'sl-delete-filled': hoveringDelete}",
           ng-mouseenter="hoveringDelete=true",
           ng-mouseleave="hoveringDelete=false",
-          tooltip='Clear', 
+          tooltip='Clear',
           tooltip-placement='left')
       li
-        a.circled.play.sl.sl-play(ng-click = 'editor.execScript(editor.content)', 
+        a.circled.play.sl.sl-play(ng-click = 'editor.execScript(editor.content)',
           ng-mouseenter='hoveringPlay=true',
           ng-mouseleave='hoveringPlay=false',
-          ng-class="{active: editorHasContent, 'sl-play-filled': hoveringPlay}", 
-          tooltip='Play', 
+          ng-class="{active: editorHasContent, 'sl-play-filled': hoveringPlay}",
+          tooltip='Play',
           tooltip-placement='left')
 
     .message-bar.error.slide-down(ng-if='editor.showMessage', ng-class="editor.errorCode")
       span(ng-bind-html-unsafe="editor.errorMessage")
       |  Type <code click-to-code="':help commands'">:help commands</code> for a list of available commands.
       .actions
         a.fa.fa-times-circle(ng-click='editor.showMessage = null')
-    .message-bar.info(ng-if='unauthorized', ng-class="editor.errorCode")
+    .message-bar.info(ng-if='unauthorized && !bolt_connection_failure', ng-class="editor.errorCode")
       span
         | Database access not available. Please use <code click-to-code="':server connect'">:server connect</code>
         | to establish connection. There's a graph waiting for you.
+    .message-bar.error.slide-down(ng-if='bolt_connection_failure', ng-class="editor.errorCode")
+      span
+        | Can not connect to Neo4j. Please check your Network Connection
+        a(ng-click="toggleDrawer('preferences')") &nbsp;
+          code settings
+        |.
+

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,3 @@`
`11`	`11`	`#diagnostics(ng-show='showVizDiagnostics')`
`12`	`12`	`include partials/visualization-diagnostics`
`13`	`13`
`14`		`-#error {{errorMessage}}`