Better error reporting on instantiate page
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 18 May 2017 12:17:15 +0000 (08:17 -0400)
committerkashalkar <kiran.kashalkar@riftio.com>
Thu, 18 May 2017 13:52:46 +0000 (14:52 +0100)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
(cherry picked from commit c09a6948835c9e519829e44f20d649a0dc555f3e)

Change-Id: I3ddc199db649edb6cbac4ca5ec2a032575a8567f

skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
skyquake/plugins/launchpad/src/instantiate/launchNetworkServiceSource.js

index b673e3a..0d9e1b6 100644 (file)
@@ -191,6 +191,9 @@ class LaunchNetworkServiceStore {
     }
     launchNSRError(data) {
         var msg = 'Something went wrong while trying to instantiate. Check the error logs for more information';
+        if(data) {
+            msg = data;
+        }
         if (data.error) {
             msg = data.error;
         }
index 6c5daaa..d5c33c1 100644 (file)
@@ -128,7 +128,7 @@ export default function(Alt){
           }).fail(function(xhr){
             //Authentication and the handling of fail states should be wrapped up into a connection class.
             Utils.checkAuthentication(xhr.status);
-            var error;
+            var error = null;
             if(xhr.responseText) {
               try {
                 error = JSON.parse(xhr.responseText);