@schneideress/dashboardframework 0.0.146 → 0.0.147

package/fesm2015/schneideress-dashboardframework.js

@@ -254,6 +254,8 @@ const RAEvent = {
     ConfigAddClick: "configAddClick",
     /** triggers when a user click on the save button in widget configuration window */
     ConfigChanged: "configChanged",
+    /**To rearrange widgets in a dashboard */
+    RearrangeClicked: "rearrangeClicked",
     /**dashboard customize button click */
     DashboardCustomizeClick: "dashboardCustomizeClick",
     /**triggers when user clicks on the dashboard change icon in header section */
@@ -618,15 +620,6 @@ class RADashboardArea {
      */
     ngOnInit() {
         this.initiateGridsterConfig();
-        this.widgetRearrangeSubject.subscribe((/**
-         * @param {?} event
-         * @return {?}
-         */
-        event => {
-            console.log('in subscribe subject & value is');
-            console.log(event);
-            this.rearrangeWidgets();
-        }));
     }
     /**
      * @param {?} changes
@@ -660,8 +653,11 @@ class RADashboardArea {
          * @return {?}
          */
         function (item) {
+            console.log('in  item change clal back');
+            if (item.widgetInfo && item.widgetInfo.widgetInstanceId) {
+                areaContext.updateWidgetPosition(item.widgetInfo.widgetInstanceId);
+            }
             areaContext.setAreaHeight();
-            areaContext.updateWidgets();
         });
     }
     /**
@@ -705,6 +701,19 @@ class RADashboardArea {
                 this.addWidget(e);
             }));
         }));
+        this.rearrangeWidgetClick = this.raDashboardEventBus.subscribe(RAEvent.RearrangeClicked).subscribe((/**
+         * @param {?} e
+         * @return {?}
+         */
+        (e) => {
+            this.ngZone.run((/**
+             * @return {?}
+             */
+            () => {
+                console.log('rearrange event bus triggered');
+                this.rearrangeWidgets();
+            }));
+        }));
         this.widgetLibraryDoneClick = this.raDashboardEventBus.subscribe(RAEvent.widgetLibraryDoneClick).subscribe((/**
          * @param {?} widgetList
          * @return {?}
@@ -765,8 +774,8 @@ class RADashboardArea {
             this.widgetDeleteEvent.unsubscribe();
         if (this.widgetLibraryDoneClick)
             this.widgetLibraryDoneClick.unsubscribe();
-        if (this.widgetRearrangeSubject)
-            this.widgetRearrangeSubject.unsubscribe();
+        if (this.rearrangeWidgetClick)
+            this.rearrangeWidgetClick.unsubscribe();
     }
     /**
      * To update position/dimention of all widgets in the area
@@ -781,6 +790,57 @@ class RADashboardArea {
         }));
         return true;
     }
+    /**
+     * To update widget dimensions
+     * @param {?} widgetInstanceId
+     * @return {?}
+     */
+    updateWidgetPosition(widgetInstanceId) {
+        /** @type {?} */
+        let widgetFilteredList = [];
+        /** @type {?} */
+        let widget = this.widgetList.filter((/**
+         * @param {?} filtered
+         * @return {?}
+         */
+        filtered => filtered.widgetInfo && filtered.widgetInfo.widgetInstanceId == widgetInstanceId));
+        if (widget && widget.length > 0) {
+            widgetFilteredList.push(widget[0]);
+            /** @type {?} */
+            let widgetList = this.mapGridsterListToObject(widgetFilteredList);
+            this.dashboardService.updateWidgets(this.formatWidgetDataForPositionDetails(widgetList), this.appConfig).subscribe((/**
+             * @param {?} widgets
+             * @return {?}
+             */
+            widgets => {
+            }));
+        }
+        return true;
+    }
+    /**
+     * To restrict request payload to be of min size (position & size details)
+     * @param {?} widgetItemList
+     * @return {?}
+     */
+    formatWidgetDataForPositionDetails(widgetItemList) {
+        /** @type {?} */
+        let itemList = [];
+        widgetItemList.forEach((/**
+         * @param {?} widgetItem
+         * @return {?}
+         */
+        function (widgetItem) {
+            /** @type {?} */
+            let item = (/** @type {?} */ ({}));
+            item.widgetInstanceId = widgetItem.widgetInstanceId;
+            item.position_x = widgetItem.position_x;
+            item.position_y = widgetItem.position_y;
+            item.width = widgetItem.width;
+            item.height = widgetItem.height;
+            itemList.push(item);
+        }));
+        return itemList;
+    }
     /**
      * To retrieve widgets based on userDashboardid and area name
      * @param {?} userDashboarId
@@ -885,7 +945,6 @@ class RADashboardArea {
      * @return {?}
      */
     rearrangeWidgets() {
-        console.log('in rearrange widgets methd');
         this.options.compactType = 'compactUp&Left';
         this.options.api.optionsChanged();
         this.options.compactType = 'none';
@@ -931,13 +990,18 @@ class RADashboardArea {
                     this.gridcellHeight = curRowHeight;
                 }
             }
-            /**To save added widget position in db */
-            setTimeout((/**
-             * @return {?}
-             */
-            () => {
-                this.updateWidgets();
-            }), 1000);
+            /** @type {?} */
+            var widgetInstanceId = 0;
+            if (widget && widget.widgetInstanceId) {
+                widgetInstanceId = widget.widgetInstanceId;
+                /**To save added widget position in db */
+                setTimeout((/**
+                 * @return {?}
+                 */
+                () => {
+                    this.updateWidgetPosition(widgetInstanceId);
+                }), 1000);
+            }
             this.raDashboardEventBus.publish(RAEvent.WidgetAdded, widget);
         }));
     }
@@ -1045,7 +1109,6 @@ RADashboardArea.propDecorators = {
     widgetHeight: [{ type: Input, args: ['widget-height',] }],
     widgetWidth: [{ type: Input, args: ['widget-width',] }],
     appConfig: [{ type: Input, args: ['app-config',] }],
-    widgetRearrangeSubject: [{ type: Input }],
     gridWrapper: [{ type: ViewChild, args: ['gridWrapper', { static: false },] }],
     onResize: [{ type: HostListener, args: ['window:resize', ['$event'],] }]
 };
@@ -1063,6 +1126,11 @@ if (false) {
      * @private
      */
     RADashboardArea.prototype.conifgAddClick;
+    /**
+     * @type {?}
+     * @private
+     */
+    RADashboardArea.prototype.rearrangeWidgetClick;
     /**
      * @type {?}
      * @private
@@ -1100,8 +1168,6 @@ if (false) {
     /** @type {?} */
     RADashboardArea.prototype.appConfig;
     /** @type {?} */
-    RADashboardArea.prototype.widgetRearrangeSubject;
-    /** @type {?} */
     RADashboardArea.prototype.gridWrapper;
     /**
      * @type {?}
@@ -6437,7 +6503,6 @@ class RaBaseDashboardTemplate {
      */
     constructor(ngZone) {
         this.ngZone = ngZone;
-        this.widgetRearrangeSubject = new Subject();
         this.initialize = (/**
          * @param {?} eventBus
          * @param {?} userDashboardId
@@ -6455,17 +6520,6 @@ class RaBaseDashboardTemplate {
             }));
             this.init();
         });
-        this.rearrangeWidgets = (/**
-         * @return {?}
-         */
-        () => {
-            this.ngZone.run((/**
-             * @return {?}
-             */
-            () => {
-                this.widgetRearrangeSubject.next(true);
-            }));
-        });
     }
     /**
      * @return {?}
@@ -6479,8 +6533,7 @@ class RaBaseDashboardTemplate {
 RaBaseDashboardTemplate.propDecorators = {
     dashboardId: [{ type: Input, args: ['dashboard-id',] }],
     globalFilter: [{ type: Input, args: ['global-filter',] }],
-    initialize: [{ type: Input }],
-    rearrangeWidgets: [{ type: Input }]
+    initialize: [{ type: Input }]
 };
 if (false) {
     /** @type {?} */
@@ -6490,15 +6543,11 @@ if (false) {
     /** @type {?} */
     RaBaseDashboardTemplate.prototype.appConfig;
     /** @type {?} */
-    RaBaseDashboardTemplate.prototype.widgetRearrangeSubject;
-    /** @type {?} */
     RaBaseDashboardTemplate.prototype.dashboardId;
     /** @type {?} */
     RaBaseDashboardTemplate.prototype.globalFilter;
     /** @type {?} */
     RaBaseDashboardTemplate.prototype.initialize;
-    /** @type {?} */
-    RaBaseDashboardTemplate.prototype.rearrangeWidgets;
     /**
      * @type {?}
      * @private