@ardimedia/angular-portal-azure 0.2.216 → 0.2.218

package/apn.d.ts

@@ -48,7 +48,7 @@ declare namespace angularportalazure {
         We don't know how to provide [this] to the directive.
         So we came up with this [vm] property.*/
         vm: any;
-        isVisible: boolean;
+        visibility: string;
         private watcherTitle;
         bladeContentHeight: number;
         bladeContentHeightInner: number;
@@ -391,6 +391,7 @@ declare namespace angularportalazure {
     class ExceptionDotNet {
         ExceptionMessage: string;
         ExceptionType: string;
+        InnerException: ExceptionDotNet;
         Message: string;
         StackTrace: string;
     }
@@ -405,14 +406,13 @@ declare namespace angularportalazure {
             value: string;
         }[];
         ValidationResults: ValidationResultDotNet[];
+        convertResponse(response: any): void;
+        private static convertResponse(exception, responseData);
+        private static convertExceptionType(exception, responseData);
     }
 }
 declare namespace angularportalazure {
     class Exception extends angularportalazure.ValidationsExceptionDotNet {
-        ExceptionMessage: string;
-        ExceptionType: string;
-        Message: string;
-        StackTrace: string;
         Type: string;
         MessageDetail: string;
         Messages: string[];
@@ -423,8 +423,6 @@ declare namespace angularportalazure {
         static getOneLineMessage(exception: angularportalazure.Exception): string;
         private static processDotNetException1(response);
         private static processDotNetException2(response);
-        private static setExceptionType1(response, exception);
-        private static setExceptionType2(response, exception);
     }
 }
 declare namespace angularportalazure {

package/apn.js

@@ -160,7 +160,7 @@ var angularportalazure;
             We don't know how to provide [this] to the directive.
             So we came up with this [vm] property.*/
             _this.vm = {};
-            _this.isVisible = true;
+            _this.visibility = 'collapse';
             _this.title = '';
             _this.subTitle = '';
             _this.width = { 'width': '0' };
@@ -630,19 +630,19 @@ var angularportalazure;
         }
         //#endregion
         BladeData.prototype.onLoadItem = function () {
-            this.isVisible = false;
+            this.visibility = 'collapse';
             this.setStatusBarLoadData();
         };
         BladeData.prototype.onLoadItems = function () {
-            this.isVisible = false;
+            this.visibility = 'collapse';
             this.setStatusBarLoadData();
         };
         BladeData.prototype.onLoadedItem = function () {
-            this.isVisible = true;
+            this.visibility = 'visible';
             this.clearStatusBar();
         };
         BladeData.prototype.onLoadedItems = function () {
-            this.isVisible = true;
+            this.visibility = 'visible';
             this.clearStatusBar();
         };
         return BladeData;
@@ -1351,6 +1351,48 @@ var angularportalazure;
         function ValidationsExceptionDotNet() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        ValidationsExceptionDotNet.prototype.convertResponse = function (response) {
+            if (response.headers === undefined) {
+                ValidationsExceptionDotNet.convertResponse(this, response.data);
+                ValidationsExceptionDotNet.convertExceptionType(this, response.data);
+            }
+            else {
+                ValidationsExceptionDotNet.convertResponse(this, response.json());
+                ValidationsExceptionDotNet.convertExceptionType(this, response.json());
+            }
+        };
+        ValidationsExceptionDotNet.convertResponse = function (exception, responseData) {
+            // ExceptionDotNet
+            exception.ExceptionMessage = responseData.ExceptionMessage;
+            exception.Message = responseData.Message;
+            exception.StackTrace = responseData.StackTrace;
+            exception.InnerException = responseData.InnerException;
+            // ValidationsExceptionDotNet
+            exception.ClassName = 'Not yet implemented';
+            exception.Data = [{ key: 0, value: 'Not yet implemented' }];
+            // ValidationResultDotNet
+            exception.ValidationResults = [{ ErrorMessage: 'Not yet implemented', MemberNames: [] }];
+        };
+        ValidationsExceptionDotNet.convertExceptionType = function (exception, responseData) {
+            if (responseData.ExceptionType === undefined) {
+                return;
+            }
+            if (responseData.ExceptionType === 'System.Data.Entity.Validation.DbEntityValidationException') {
+                exception.ExceptionType = 'DbEntityValidationException';
+                return;
+            }
+            else if (responseData.ExceptionType === 'System.Data.Entity.Infrastructure.DbUpdateConcurrencyException') {
+                exception.ExceptionType = 'DbUpdateConcurrencyException';
+                return;
+            }
+            // ClassName should by ExceptionType
+            if (responseData.ClassName !== undefined && responseData.ClassName.indexOf('ValidationsException') > 0) {
+                console.log('[angularportalazure.Exception.setExceptionType2] Why is this in ClassName? Can this be changed?');
+                exception.ExceptionType = 'ValidationsException';
+                return;
+            }
+            exception.ExceptionType = responseData.ExceptionType;
+        };
         return ValidationsExceptionDotNet;
     }(ExceptionDotNet));
     angularportalazure.ValidationsExceptionDotNet = ValidationsExceptionDotNet;
@@ -1368,34 +1410,21 @@ var angularportalazure;
         //#region Static Methods
         // TODO:2017-01-09/hp: [any] will be [Response] in angular2
         Exception.prepareException = function (response) {
-            console.log('angularportalazure.Exception.prepareException - Logging Exception: Find more information in [Responsee] and [Exception] below. [Exception] does contain data from [Response.]');
+            console.log('angularportalazure.Exception.prepareException - Logging Exception: Find more information in following [Responsee] and [Exception].');
             var exception = new angularportalazure.Exception();
             if (response.headers === undefined) {
+                console.log('> response.headers === undefined. Get information from [.data].');
                 exception = Exception.processDotNetException1(response);
-                exception.ExceptionMessage = response.data.ExceptionMessage;
-                exception.StackTrace = response.data.StackTrace;
-                Exception.setExceptionType1(response, exception);
-                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;
+                exception.convertResponse(response.data);
             }
             else {
+                console.log('> response.headers !== undefined. Get information from [.json()].');
                 exception = Exception.processDotNetException2(response);
-                exception.ExceptionMessage = response.json().ExceptionMessage;
-                exception.StackTrace = response.json().StackTrace;
-                Exception.setExceptionType2(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;
+                exception.convertResponse(response.json());
             }
+            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(response);
             console.log(exception);
@@ -1436,43 +1465,6 @@ var angularportalazure;
             }
             return exception;
         };
-        Exception.setExceptionType1 = 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;
-        };
-        // TODO:2017-01-09/hp: Implement this function for angular2
-        Exception.setExceptionType2 = function (response, exception) {
-            if (response.json().ExceptionType === undefined) {
-                return;
-            }
-            if (response.json().ExceptionType === 'System.Data.Entity.Validation.DbEntityValidationException') {
-                exception.ExceptionType = 'DbEntityValidationException';
-                return;
-            }
-            else if (response.json().ExceptionType === 'System.Data.Entity.Infrastructure.DbUpdateConcurrencyException') {
-                exception.ExceptionType = 'DbUpdateConcurrencyException';
-                return;
-            }
-            // ClassName should by ExceptionType
-            if (response.json().ClassName !== undefined && response.json().ClassName.indexOf('ValidationsException') > 0) {
-                console.log('[angularportalazure.Exception.setExceptionType2] Why is this in ClassName? Can this be changed?');
-                exception.ExceptionType = 'ValidationsException';
-                return;
-            }
-            exception.ExceptionType = response.json().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.216",
+  "version": "0.2.218",
   "main": "index.js",
   "typings": "apn.d.ts",
   "dependencies": {