@ardimedia/angular-portal-azure 0.2.317 → 0.2.319

package/apn.d.ts

@@ -206,11 +206,22 @@ declare namespace angularportalazure {
         onNewItem(): void;
         /** Extension point */
         onNewedItem(): void;
+        /** Extension point */
+        onNewItemException(ex: angularportalazure.Exception): void;
         loadItem(func: () => Promise<any | angularportalazure.Exception>): void;
+        /** Extension point */
         onLoadItem(): void;
+        /** Extension point */
         onLoadedItem(): void;
+        /** Extension point */
+        onLoadItemException(ex: angularportalazure.Exception): void;
+        loadItems(func: () => Promise<any | angularportalazure.Exception>): void;
+        /** Extension point */
         onLoadItems(): void;
+        /** Extension point */
         onLoadedItems(): void;
+        /** Extension point */
+        onLoadItemsException(ex: angularportalazure.Exception): void;
         /**
          * Default behavior for saving an entity.
          * - call this.setStatusBarSaveData();
@@ -233,6 +244,8 @@ declare namespace angularportalazure {
         onSaveItem(): void;
         /** Extension point */
         onSavedItem(): void;
+        /** Extension point */
+        onSaveItemException(ex: angularportalazure.Exception): void;
         /**
          * Default behavior for saving any object.
          * - call this.setStatusBarSaveData();
@@ -247,17 +260,31 @@ declare namespace angularportalazure {
          * - call this.setStatusBarException
          */
         saveObject(func: () => Promise<any | angularportalazure.Exception> | angular.IPromise<any | angularportalazure.Exception>, ngForm?: any): (Promise<any | void> | angular.IPromise<any | void>);
+        /** Extension point */
+        onSaveObject(): void;
+        /** Extension point */
+        onSavedObject(): void;
+        /** Extension point */
+        onSaveObjectException(ex: angularportalazure.Exception): void;
         deleteItem(func: () => Promise<T | angularportalazure.Exception> | angular.IPromise<T | angularportalazure.Exception>, ngForm?: any): (Promise<T | void> | angular.IPromise<T | void>);
         /** Extension point */
         onDeleteItem(): void;
         /** Extension point */
-        onDeletedItem(): void;
+        onDeletedItem(): boolean;
+        /** Extension point */
+        onDeletedObjectException(ex: angularportalazure.Exception): void;
+        isFormValid(ngForm?: any): boolean;
+        /** Extension point */
+        onSaveItemFormValidation(): boolean;
+        /** Extension point */
+        onSaveObjectFormValidation(): boolean;
+        /** Extension point */
+        onDeleteItemFormValidation(): boolean;
     }
 }
 declare namespace angularportalazure {
-    class BladeNav extends angularportalazure.BladeData<any> {
+    class BladeNav extends angularportalazure.BladeData<BladeNavItem> {
         constructor($scope: angular.IScope, portalService: angularportalazure.PortalService, path: string, title?: string, subtitle?: string, width?: number);
-        items: Array<angularportalazure.BladeNavItem>;
         isNav: boolean;
         onNavigateTo(path: string): void;
     }
@@ -415,7 +442,6 @@ declare namespace angularportalazure {
 declare namespace angularportalazure {
     class BladeGrid extends angularportalazure.BladeData<any> {
         constructor($scope: angular.IScope, portalService: angularportalazure.PortalService, path: string, title: string, subtitle?: string, width?: number);
-        loadItems(func: () => any | angular.IPromise<any> | Promise<any>): void;
         onFilter(actual: Object, expected: string): boolean;
     }
 }

package/apn.js

@@ -704,6 +704,7 @@ var angularportalazure;
                 _this.onNewedItem();
             }).catch(function (ex) {
                 _this.setStatusBarException(ex);
+                _this.onNewItemException(ex);
             });
         };
         /** Extension point */
@@ -712,35 +713,60 @@ var angularportalazure;
         /** Extension point */
         BladeData.prototype.onNewedItem = function () {
         };
+        /** Extension point */
+        BladeData.prototype.onNewItemException = function (ex) {
+        };
         // #endregion
         // #region loadItem
         BladeData.prototype.loadItem = function (func) {
             var _this = this;
+            this.visibility = 'collapse';
+            this.setStatusBarLoadData();
             this.onLoadItem();
             func().then(function (data) {
+                _this.visibility = 'visible';
+                _this.clearStatusBar();
                 _this.item = data;
                 _this.onLoadedItem();
             }).catch(function (ex) {
                 _this.setStatusBarException(ex);
+                _this.onLoadItemException(ex);
             });
         };
+        /** Extension point */
         BladeData.prototype.onLoadItem = function () {
-            this.visibility = 'collapse';
-            this.setStatusBarLoadData();
         };
+        /** Extension point */
         BladeData.prototype.onLoadedItem = function () {
-            this.visibility = 'visible';
-            this.clearStatusBar();
+        };
+        /** Extension point */
+        BladeData.prototype.onLoadItemException = function (ex) {
         };
         // #endregion
         // #region loadItems
-        BladeData.prototype.onLoadItems = function () {
+        BladeData.prototype.loadItems = function (func) {
+            var _this = this;
             this.visibility = 'collapse';
             this.setStatusBarLoadData();
+            this.onLoadItems();
+            func().then(function (data) {
+                _this.visibility = 'visible';
+                _this.clearStatusBar();
+                _this.items = data;
+                _this.onLoadedItems();
+            }).catch(function (ex) {
+                _this.setStatusBarException(ex);
+                _this.onLoadItemsException(ex);
+            });
+        };
+        /** Extension point */
+        BladeData.prototype.onLoadItems = function () {
         };
+        /** Extension point */
         BladeData.prototype.onLoadedItems = function () {
-            this.visibility = 'visible';
-            this.clearStatusBar();
+        };
+        /** Extension point */
+        BladeData.prototype.onLoadItemsException = function (ex) {
         };
         // #endregion
         // #region saveItem
@@ -764,24 +790,12 @@ var angularportalazure;
         BladeData.prototype.saveItem = function (func, ngForm) {
             var _this = this;
             if (ngForm === void 0) { ngForm = undefined; }
-            this.setStatusBarSaveData();
-            this.onSaveItem();
-            // #region form valid?
-            // angularjs: if form valid
-            if (!this.formblade.$valid) {
-                this.statusBar = 'Speichern nicht möglich! [Console] enthält weitere Informationen.';
-                this.statusBarClass = 'apa-statusbar-error';
-                //console.log(this.formblade);
+            if (!this.isFormValid(ngForm) && this.onSaveItemFormValidation()) {
                 return;
             }
-            // angular: if form valid
-            if (ngForm !== undefined) {
-                if (!ngForm.valid) {
-                    return;
-                }
-            }
-            // #endregion
+            this.setStatusBarSaveData();
             this.isCommandSaveEnabled = false;
+            this.onSaveItem();
             return func().then(function (data) {
                 _this.clearStatusBar();
                 _this.isCommandSaveEnabled = true;
@@ -789,9 +803,10 @@ var angularportalazure;
                 _this.item = data;
                 _this.onSavedItem();
                 return data;
-            }).catch(function (exception) {
+            }).catch(function (ex) {
                 _this.isCommandSaveEnabled = true;
-                _this.setStatusBarException(exception);
+                _this.setStatusBarException(ex);
+                _this.onLoadItemsException(ex);
             });
         };
         /** Extension point */
@@ -800,6 +815,9 @@ var angularportalazure;
         /** Extension point */
         BladeData.prototype.onSavedItem = function () {
         };
+        /** Extension point */
+        BladeData.prototype.onSaveItemException = function (ex) {
+        };
         // #endregion
         // #region saveObject
         /**
@@ -818,64 +836,57 @@ var angularportalazure;
         BladeData.prototype.saveObject = function (func, ngForm) {
             var _this = this;
             if (ngForm === void 0) { ngForm = undefined; }
-            this.setStatusBarSaveData();
-            this.onSaveItem();
-            // #region form valid?
-            // angularjs: if form valid
-            if (!this.formblade.$valid) {
-                this.statusBar = 'Speichern nicht möglich! [Console] enthält weitere Informationen.';
-                this.statusBarClass = 'apa-statusbar-error';
-                //console.log(this.formblade);
+            if (!this.isFormValid(ngForm) && this.onSaveObjectFormValidation()) {
                 return;
             }
-            // angular: if form valid
-            if (ngForm !== undefined) {
-                if (!ngForm.valid) {
-                    return;
-                }
-            }
-            // #endregion
+            this.setStatusBarSaveData();
+            this.isCommandSaveEnabled = false;
+            this.onSaveObject();
             return func().then(function (data) {
                 _this.clearStatusBar();
-                _this.onSavedItem();
+                _this.isCommandSaveEnabled = true;
+                _this.isCommandDeleteEnabled = true;
+                _this.onSavedObject();
                 return data;
-            }).catch(function (exception) {
-                _this.setStatusBarException(exception);
+            }).catch(function (ex) {
+                _this.isCommandSaveEnabled = true;
+                _this.setStatusBarException(ex);
+                _this.onLoadItemsException(ex);
             });
         };
+        /** Extension point */
+        BladeData.prototype.onSaveObject = function () {
+        };
+        /** Extension point */
+        BladeData.prototype.onSavedObject = function () {
+        };
+        /** Extension point */
+        BladeData.prototype.onSaveObjectException = function (ex) {
+        };
         // #endregion
         // #region deleteItem
         BladeData.prototype.deleteItem = function (func, ngForm) {
             var _this = this;
             if (ngForm === void 0) { ngForm = undefined; }
-            this.setStatusBarDeleteData();
-            this.onDeleteItem();
-            // #region form valid?
-            // angularjs: if form valid
-            if (!this.formblade.$valid) {
-                this.statusBar = 'Löschen nicht möglich! [Console] enthält weitere Informationen.';
-                this.statusBarClass = 'apa-statusbar-error';
-                //console.log(this.formblade);
+            if (!this.isFormValid(ngForm) && this.onDeleteItemFormValidation()) {
                 return;
             }
-            // angular: if form valid
-            if (ngForm !== undefined) {
-                if (!ngForm.valid) {
-                    return;
-                }
-            }
-            // #endregion
+            this.setStatusBarDeleteData();
             this.isCommandDeleteEnabled = false;
+            this.onDeleteItem();
             return func().then(function (data) {
                 _this.clearStatusBar();
                 _this.isCommandDeleteEnabled = true;
                 _this.item = data;
-                _this.onDeletedItem();
-                _this.close();
+                if (_this.onDeletedItem()) {
+                    _this.close();
+                }
+                ;
                 return data;
-            }).catch(function (exception) {
+            }).catch(function (ex) {
                 _this.isCommandDeleteEnabled = true;
-                _this.setStatusBarException(exception);
+                _this.setStatusBarException(ex);
+                _this.onLoadItemsException(ex);
             });
         };
         /** Extension point */
@@ -883,6 +894,40 @@ var angularportalazure;
         };
         /** Extension point */
         BladeData.prototype.onDeletedItem = function () {
+            return true; // close the current blade
+        };
+        /** Extension point */
+        BladeData.prototype.onDeletedObjectException = function (ex) {
+        };
+        // #endregion
+        // #region Form Validation
+        BladeData.prototype.isFormValid = function (ngForm) {
+            if (ngForm === void 0) { ngForm = undefined; }
+            // angularjs
+            if (!this.formblade.$valid) {
+                this.setStatusBarError('Formular nicht gültig.');
+                //console.log(this.formblade);
+                return false;
+            }
+            // angular (2+)
+            if (ngForm !== undefined) {
+                if (!ngForm.valid) {
+                    return false;
+                }
+            }
+            return true;
+        };
+        /** Extension point */
+        BladeData.prototype.onSaveItemFormValidation = function () {
+            return true;
+        };
+        /** Extension point */
+        BladeData.prototype.onSaveObjectFormValidation = function () {
+            return true;
+        };
+        /** Extension point */
+        BladeData.prototype.onDeleteItemFormValidation = function () {
+            return true;
         };
         return BladeData;
     }(angularportalazure.Blade));
@@ -905,7 +950,7 @@ var angularportalazure;
             var _this = _super.call(this, $scope, portalService, path, title, subtitle, width) || this;
             // #endregion
             // #region Properties
-            _this.items = new Array();
+            //items: Array<angularportalazure.BladeNavItem> = new Array<angularportalazure.BladeNavItem>();
             _this.isNav = true;
             _this.isInnerHtml = false;
             return _this;
@@ -1407,16 +1452,15 @@ var angularportalazure;
         //items: T[] = [];
         // #endregion
         // #region Methods
-        BladeGrid.prototype.loadItems = function (func) {
-            var _this = this;
-            this.onLoadItems();
-            func().then(function (data) {
-                _this.items = data;
-                _this.onLoadedItems();
-            }).catch(function (exception) {
-                _this.setStatusBarException(exception);
-            });
-        };
+        //loadItems(func: () => any | angular.IPromise<any> | Promise<any>): void {
+        //    this.onLoadItems();
+        //    func().then((data: any) => {
+        //        this.items = data;
+        //        this.onLoadedItems();
+        //    }).catch((exception: angularportalazure.Exception) => {
+        //        this.setStatusBarException(exception);
+        //    });
+        //}
         // #region Filter
         BladeGrid.prototype.onFilter = function (actual, expected) {
             // #region Documentation
@@ -1426,7 +1470,7 @@ var angularportalazure;
             // > If the item is an object, the filter will also be called with the object in the parameter 'actual'
             // #endregion
             // #region Helper functions
-            // Implemenation detail:
+            // Implementation detail:
             // > We implemented the following functions with in-line-functions, since onFilter is not called within the scope of a class (this. not working).
             // Function to convert 'number' to 'string'
             var convertToString = function (value) {

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