@ardimedia/angular-portal-azure 0.2.300 → 0.2.301

package/apn.d.ts

@@ -463,9 +463,6 @@ declare namespace angularportalazure {
             value: string;
         }[];
         ValidationResults: ValidationResultDotNet[];
-        convertResponse(response: any): void;
-        protected static convertResponse(exceptionTo: EntityValidationException | ValidationsExceptionDotNet, responseDataFrom: ExceptionDotNet): void;
-        protected static convertExceptionType(exception: EntityValidationException | ValidationsExceptionDotNet, responseData: any): void;
     }
     /**
      *  @deprecated ValidationsExceptionDotNet should be replaced by EntityValidationException
@@ -484,8 +481,6 @@ declare namespace angularportalazure {
         static getOneLineMessage(exception: angularportalazure.Exception): string;
         static prepareException(response: angular.IHttpPromiseCallbackArg<angularportalazure.Exception> | any): angularportalazure.Exception;
         private static createException;
-        private static processResponseWithData;
         private static processResponseData;
-        private static processDotNetException2;
     }
 }

package/apn.js

@@ -1524,50 +1524,6 @@ var angularportalazure;
         function EntityValidationException() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        EntityValidationException.prototype.convertResponse = function (response) {
-            if (response.headers === undefined) {
-                console.debug('angularportalazure.EntityValidationException.convertResponse - response.data');
-                ValidationsExceptionDotNet.convertResponse(this, response.data);
-                ValidationsExceptionDotNet.convertExceptionType(this, response.data);
-            }
-            else {
-                console.debug('angularportalazure.EntityValidationException.convertResponse - response.json()');
-                ValidationsExceptionDotNet.convertResponse(this, response.json());
-                ValidationsExceptionDotNet.convertExceptionType(this, response.json());
-            }
-        };
-        EntityValidationException.convertResponse = function (exceptionTo, responseDataFrom) {
-            console.debug('angularportalazure.EntityValidationException.convertResponse');
-            exceptionTo.ExceptionMessage = responseDataFrom.ExceptionMessage;
-            exceptionTo.Message = responseDataFrom.Message;
-            exceptionTo.StackTrace = responseDataFrom.StackTrace;
-            exceptionTo.InnerException = responseDataFrom.InnerException;
-        };
-        EntityValidationException.convertExceptionType = function (exception, responseData) {
-            if (responseData.ExceptionType === undefined) {
-                console.debug('angularportalazure.EntityValidationException.convertExceptionType - undefined');
-                return;
-            }
-            else if (responseData.ExceptionType === 'System.Data.Entity.Validation.DbEntityValidationException') {
-                console.debug('angularportalazure.EntityValidationException.convertExceptionType - DbEntityValidationException');
-                exception.ExceptionType = 'DbEntityValidationException';
-                return;
-            }
-            else if (responseData.ExceptionType === 'System.Data.Entity.Infrastructure.DbUpdateConcurrencyException') {
-                console.debug('angularportalazure.EntityValidationException.convertExceptionType - DbUpdateConcurrencyException');
-                exception.ExceptionType = 'DbUpdateConcurrencyException';
-                return;
-            }
-            else if (responseData.ClassName !== undefined && responseData.ClassName.indexOf('ValidationsException') > 0) {
-                console.debug('angularportalazure.EntityValidationException.convertExceptionType - ValidationsException');
-                exception.ExceptionType = 'ValidationsException';
-                return;
-            }
-            else {
-                console.debug('angularportalazure.EntityValidationException.convertExceptionType - else');
-                exception.ExceptionType = responseData.ExceptionType;
-            }
-        };
         return EntityValidationException;
     }(ExceptionDotNet));
     angularportalazure.EntityValidationException = EntityValidationException;
@@ -1596,14 +1552,26 @@ var angularportalazure;
         // #endregion
         // #region Static Methods
         Exception.getOneLineMessage = function (exception) {
-            var message = 'FEHLER ';
+            var message = '';
+            // Add Messages, if available
+            if (exception.Messages !== undefined) {
+                exception.Messages.forEach(function (item, index) {
+                    if (index > 0) {
+                        message = message + ' - ';
+                    }
+                    message = message + item;
+                });
+            }
+            else {
+                message = 'FEHLER ';
+            }
             if (exception.Message !== undefined) {
                 message = message + ': ' + exception.Message + ' ';
             }
-            if (exception.ExceptionMessage !== undefined && exception.ExceptionMessage.toLowerCase().indexOf('see the inner exception for details') === -1) {
+            if (exception.ExceptionMessage !== undefined && exception.ExceptionMessage.toLowerCase().indexOf('see the inner exception for details') < 0) {
                 message = message + ': ' + exception.ExceptionMessage + ' ';
             }
-            if (exception.ExceptionMessage !== undefined && exception.ExceptionMessage.toLowerCase().indexOf('see the inner exception for details') > 0) {
+            if (exception.ExceptionMessage !== undefined && exception.ExceptionMessage.toLowerCase().indexOf('see the inner exception for details') >= 0) {
                 if (exception.InnerException !== undefined) {
                     if (exception.InnerException.InnerException !== undefined) {
                         message = message + ': ' + exception.InnerException.InnerException.ExceptionMessage + ' ';
@@ -1613,38 +1581,28 @@ var angularportalazure;
                     }
                 }
             }
-            if (exception.Messages !== undefined) {
-                exception.Messages.forEach(function (item) {
-                    message = message + '- ' + item + ' ';
-                });
-            }
             if (message === 'FEHLER ') {
                 console.debug(exception);
-                message = message + ' : JavaScript-Fehler oder Probleme mit der Internetverbindung. Ggf. weitere Informationen im Log. ' + exception;
+                message = message + ': JavaScript-Fehler oder Probleme mit der Internetverbindung. Weitere Informationen im Log. ' + exception;
             }
             return message;
         };
-        // TODO:2017-01-09/hp: [any] will be [Response] in angular2
+        // TODO:2018-10-10/hp: [angular.IHttpPromiseCallbackArg<angularportalazure.Exception>] should be Response
         Exception.prepareException = function (response) {
             console.debug('angularportalazure.Exception.prepareException');
             console.debug(response);
             var exception = angularportalazure.Exception.createException();
-            // #region Process EntityValidationException, etc.
-            if (response.json().Data != undefined) {
-                exception = angularportalazure.Exception.processResponseData(exception, response.json().Data);
-            }
-            // #endregion
-            // #region Process Angular 1?
-            else if (response.headers === undefined) {
-                exception = angularportalazure.Exception.processResponseWithData(exception, response);
+            // #region Process (Angular 1) response.data.Data
+            if (response.data !== undefined && response.data.Data !== undefined) {
+                exception = angularportalazure.Exception.processResponseData(exception, response.data.Data);
             }
             // #endregion
-            // #region Process Angular 2?
-            else {
-                exception = angularportalazure.Exception.processDotNetException2(exception, response);
+            // #region Process (Angular 2) response.json().Data (EntityValidationException, etc.)
+            else if (response.json !== undefined && response.json().Data != undefined) {
+                exception = angularportalazure.Exception.processResponseData(exception, response.json().Data);
             }
             // #endregion
-            exception.convertResponse(response);
+            //exception.convertResponse(response);
             exception.Url = response.url;
             exception.Status = response.status;
             exception.StatusText = response.statusText;
@@ -1656,24 +1614,23 @@ var angularportalazure;
             exception.Messages = [];
             return exception;
         };
-        Exception.processResponseWithData = function (exception, response) {
-            console.debug('angularportalazure.Exception.processResponseWithData');
-            // #region Convert data to Messages
-            if (response.data.Data === undefined) {
-                exception.Messages.push('No further information found in [response.data.Data].');
-                exception.Messages.push('No further information found in [response.data.Data].');
-            }
-            else {
-                var i = 1;
-                while (response.data.Data[i + ''] !== undefined) {
-                    console.debug('Add to exception.Messages : ' + response.data.Data[i + '']);
-                    exception.Messages.push(response.data.Data[i + '']);
-                    i++;
-                }
-            }
-            // #endregion
-            return exception;
-        };
+        //private static processResponseWithData(exception: angularportalazure.Exception, response: angular.IHttpPromiseCallbackArg<angularportalazure.Exception>): angularportalazure.Exception {
+        //    console.debug('angularportalazure.Exception.processResponseWithData');
+        //    // #region Convert data to Messages
+        //    if (response.data.Data === undefined) {
+        //        exception.Messages.push('No further information found in [response.data.Data].');
+        //        exception.Messages.push('No further information found in [response.data.Data].');
+        //    } else {
+        //        let i = 1;
+        //        while (response.data.Data[i + ''] !== undefined) {
+        //            console.debug('Add to exception.Messages : ' + response.data.Data[i + '']);
+        //            exception.Messages.push(response.data.Data[i + '']);
+        //            i++;
+        //        }
+        //    }
+        //    // #endregion
+        //    return exception;
+        //}
         Exception.processResponseData = function (exception, data) {
             console.debug('angularportalazure.Exception.processResponseData');
             var i = 1;
@@ -1684,14 +1641,6 @@ var angularportalazure;
             }
             return exception;
         };
-        // TODO:2017-01-09/hp: Implement this function for angular2
-        Exception.processDotNetException2 = function (exception, response) {
-            console.debug('angularportalazure.Exception.processDotNetException2');
-            if (response.json().data !== undefined) {
-                console.debug('[angularportalazure.Exception.processDotNetException2] not implemented. Implement it to get proper exception data.');
-            }
-            return exception;
-        };
         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.300",
+  "version": "0.2.301",
   "main": "index.js",
   "typings": "apn.d.ts",
   "dependencies": {