@ardimedia/angular-portal-azure 0.2.193 → 0.2.195

package/apn.d.ts

@@ -389,30 +389,26 @@ declare namespace angularportalazure {
 }
 declare namespace angularportalazure {
     class ExceptionDotNet {
-        Data: {
-            key: number;
-            value: string;
-        }[];
-        HelpLink: string;
-        HResult: number;
-        InnerException: Exception;
-        Message: string;
-        Source: string;
-        StackTrace: string;
         ExceptionMessage: string;
         ExceptionType: string;
-        ClassName: string;
+        Message: string;
+        StackTrace: string;
     }
     class ValidationResultDotNet {
         ErrorMessage: string;
         MemberNames: string[];
     }
     class ValidationsExceptionDotNet extends ExceptionDotNet {
+        ClassName: string;
+        Data: {
+            key: number;
+            value: string;
+        }[];
         ValidationResults: ValidationResultDotNet[];
     }
 }
 declare namespace angularportalazure {
-    class Exception extends angularportalazure.ExceptionDotNet {
+    class Exception extends angularportalazure.ValidationsExceptionDotNet {
         ExceptionMessage: string;
         ExceptionType: string;
         Message: string;
@@ -423,8 +419,8 @@ declare namespace angularportalazure {
         Status: number | undefined;
         StatusText: string | undefined;
         Url: string;
-        processException(response: angular.IHttpPromiseCallbackArg<any>): void;
-        convertFromWebApiException(ex: angularportalazure.Exception): void;
+        static prepareException(response: angular.IHttpPromiseCallbackArg<angularportalazure.Exception>): angularportalazure.Exception;
+        private static processDotNetException(response);
     }
 }
 declare namespace angularportalazure {

package/apn.js

@@ -1377,49 +1377,57 @@ var angularportalazure;
             return _super.apply(this, arguments) || this;
         }
         //#endregion
-        Exception.prototype.processException = function (response) {
-            this.convertFromWebApiException(response.data);
-            this.ExceptionType = response.data.ExceptionType;
-            this.Type = response.data.Type;
-            this.Message = response.data.Message;
-            this.MessageDetail = response.data.MessageDetail;
-            this.Messages = response.data.Messages;
-            this.Url = response.config.url;
-            this.Status = response.status;
-            this.StatusText = response.statusText;
-            // Find a better way to log information, maybe to the database or to Google Analytics.
-            console.log('processException:');
+        //#region Methods
+        Exception.prepareException = function (response) {
+            console.log('convertException: input [angular.IHttpPromiseCallbackArg<angularportalazure.Exception>]');
             console.log(response);
-            console.log(this);
-        };
-        Exception.prototype.convertFromWebApiException = function (ex) {
+            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;
+            //// Find a better way to log information, maybe to the database or to Google Analytics.
+            //console.log('processException:');
+            //console.log(response);
+            //console.log(this);
+            console.log('convertException: output is converted [angularportalazure.Exception]');
+            console.log(exception);
+            return exception;
+        };
+        Exception.processDotNetException = function (response) {
+            var exception = new angularportalazure.Exception();
             //#region Process data to Messages
-            ex.Messages = [];
+            exception.Messages = [];
             var i = 1;
-            while (ex.Data[i + ''] !== undefined) {
-                ex.Messages.push(ex.Data[i + '']);
+            while (response.data[i + ''] !== undefined) {
+                exception.Messages.push(response.data[i + '']);
                 i++;
             }
             //#endregion
             //#region Process DbEntityValidationException
-            if (ex.ExceptionType === 'System.Data.Entity.Validation.DbEntityValidationException') {
-                ex.Type = 'DbEntityValidationException';
+            if (response.data.ExceptionType === 'System.Data.Entity.Validation.DbEntityValidationException') {
+                exception.Type = 'DbEntityValidationException';
             }
             //#endregion
             //#region Process DbUpdateConcurrencyException
-            if (ex.ExceptionType === 'System.Data.Entity.Infrastructure.DbUpdateConcurrencyException') {
-                ex.Type = 'DbUpdateConcurrencyException';
+            if (response.data.ExceptionType === 'System.Data.Entity.Infrastructure.DbUpdateConcurrencyException') {
+                exception.Type = 'DbUpdateConcurrencyException';
             }
             //#endregion
             //#region Process ValidationsException
             // ClassName should by ExceptionType
-            if (ex.ClassName.indexOf('ValidationsException') > 0) {
-                ex.Type = 'ValidationsException';
+            if (response.data.ClassName.indexOf('ValidationsException') > 0) {
+                exception.Type = 'ValidationsException';
             }
             //#endregion
+            return exception;
         };
         return Exception;
-    }(angularportalazure.ExceptionDotNet));
+    }(angularportalazure.ValidationsExceptionDotNet));
     angularportalazure.Exception = Exception;
 })(angularportalazure || (angularportalazure = {}));
 /// <reference types="angular" />

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.193",
+  "version": "0.2.195",
   "main": "index.js",
   "typings": "apn.d.ts",
   "dependencies": {