@ardimedia/angular-portal-azure 0.2.196 → 0.2.198

package/apn.d.ts

@@ -420,7 +420,9 @@ declare namespace angularportalazure {
         StatusText: string | undefined;
         Url: string;
         static prepareException(response: angular.IHttpPromiseCallbackArg<angularportalazure.Exception> | any): angularportalazure.Exception;
-        private static processDotNetException(response);
+        private static processDotNetException1(response);
+        private static processDotNetException2(response);
+        private static setExceptionType(response, exception);
     }
 }
 declare namespace angularportalazure {

package/apn.js

@@ -1378,19 +1378,37 @@ var angularportalazure;
         }
         //#endregion
         //#region Methods
-        // [any] will be [Response] in angular2
+        // TODO:2017-01-09/hp: [any] will be [Response] in angular2
         Exception.prepareException = function (response) {
             console.log('convertException: input [angular.IHttpPromiseCallbackArg<angularportalazure.Exception>]');
             console.log(response);
-            var exception = Exception.processDotNetException(response.data);
-            exception.ExceptionType = response.data.ExceptionType;
-            exception.Type = response.data.Type;
-            exception.Message = response.data.Message;
-            exception.MessageDetail = response.data.MessageDetail;
-            exception.Messages = response.data.Messages;
-            exception.Url = response.config.url;
-            exception.Status = response.status;
-            exception.StatusText = response.statusText;
+            var exception = new angularportalazure.Exception();
+            if (response.headers === undefined) {
+                exception = Exception.processDotNetException1(response.data);
+                exception.ExceptionMessage = response.data.ExceptionMessage;
+                exception.StackTrace = response.data.StackTrace;
+                exception.ExceptionType = response.data.ExceptionType;
+                exception.Type = response.data.Type;
+                exception.Message = response.data.Message;
+                exception.MessageDetail = response.data.MessageDetail;
+                exception.Messages = response.data.Messages;
+                exception.Url = response.config.url;
+                exception.Status = response.status;
+                exception.StatusText = response.statusText;
+            }
+            else {
+                exception = Exception.processDotNetException2(response.data);
+                exception.ExceptionMessage = response.json().ExceptionMessage;
+                exception.StackTrace = response.json().StackTrace;
+                Exception.setExceptionType(response, exception);
+                exception.Type = response.json().Type;
+                exception.Message = response.json().Message;
+                exception.MessageDetail = response.json().MessageDetail;
+                exception.Messages = response.json().Messages;
+                exception.Url = response.url;
+                exception.Status = response.status;
+                exception.StatusText = response.statusText;
+            }
             //// Find a better way to log information, maybe to the database or to Google Analytics.
             //console.log('processException:');
             //console.log(response);
@@ -1399,9 +1417,9 @@ var angularportalazure;
             console.log(exception);
             return exception;
         };
-        Exception.processDotNetException = function (response) {
+        Exception.processDotNetException1 = function (response) {
             var exception = new angularportalazure.Exception();
-            //#region Process data to Messages
+            //#region Convert data to Messages
             exception.Messages = [];
             var i = 1;
             while (response.data[i + ''] !== undefined) {
@@ -1411,22 +1429,44 @@ var angularportalazure;
             //#endregion
             //#region Process DbEntityValidationException
             if (response.data.ExceptionType === 'System.Data.Entity.Validation.DbEntityValidationException') {
-                exception.Type = 'DbEntityValidationException';
+                exception.ExceptionType = 'DbEntityValidationException';
             }
             //#endregion
             //#region Process DbUpdateConcurrencyException
             if (response.data.ExceptionType === 'System.Data.Entity.Infrastructure.DbUpdateConcurrencyException') {
-                exception.Type = 'DbUpdateConcurrencyException';
+                exception.ExceptionType = 'DbUpdateConcurrencyException';
             }
             //#endregion
             //#region Process ValidationsException
             // ClassName should by ExceptionType
             if (response.data.ClassName.indexOf('ValidationsException') > 0) {
-                exception.Type = 'ValidationsException';
+                exception.ExceptionType = 'ValidationsException';
             }
             //#endregion
             return exception;
         };
+        // TODO:2017-01-09/hp: Implement this function for angular2
+        Exception.processDotNetException2 = function (response) {
+            var exception = new angularportalazure.Exception();
+            console.log('[angularportalazure.Exception.processDotNetException2] not yet implemented.');
+            return exception;
+        };
+        Exception.setExceptionType = function (response, exception) {
+            if (response.data.ExceptionType === 'System.Data.Entity.Validation.DbEntityValidationException') {
+                exception.ExceptionType = 'DbEntityValidationException';
+                return;
+            }
+            else if (response.data.ExceptionType === 'System.Data.Entity.Infrastructure.DbUpdateConcurrencyException') {
+                exception.ExceptionType = 'DbUpdateConcurrencyException';
+                return;
+            }
+            else if (response.data.ClassName.indexOf('ValidationsException') > 0) {
+                // ClassName should by ExceptionType
+                exception.ExceptionType = 'ValidationsException';
+                return;
+            }
+            exception.ExceptionType = response.data.ExceptionType;
+        };
         return Exception;
     }(angularportalazure.ValidationsExceptionDotNet));
     angularportalazure.Exception = Exception;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@ardimedia/angular-portal-azure",
   "description": "Angular Portal Azure - GUI Framework.",
   "author": "Ardimedia Anstalt <info@ardimedia.com> (http://www.ardimedia.com)",
-  "version": "0.2.196",
+  "version": "0.2.198",
   "main": "index.js",
   "typings": "apn.d.ts",
   "dependencies": {