@schneideress/dashboardframework 0.0.146 → 0.0.147

package/bundles/schneideress-dashboardframework.umd.js

@@ -579,6 +579,8 @@
         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 */
@@ -942,17 +944,7 @@
          * @return {?}
          */
         function () {
-            var _this = this;
             this.initiateGridsterConfig();
-            this.widgetRearrangeSubject.subscribe((/**
-             * @param {?} event
-             * @return {?}
-             */
-            function (event) {
-                console.log('in subscribe subject & value is');
-                console.log(event);
-                _this.rearrangeWidgets();
-            }));
         };
         /**
          * @param {?} changes
@@ -1006,8 +998,11 @@
              * @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();
             });
         };
         /** To initiate eventbus subsctiptions */
@@ -1057,6 +1052,19 @@
                     _this.addWidget(e);
                 }));
             }));
+            this.rearrangeWidgetClick = this.raDashboardEventBus.subscribe(RAEvent.RearrangeClicked).subscribe((/**
+             * @param {?} e
+             * @return {?}
+             */
+            function (e) {
+                _this.ngZone.run((/**
+                 * @return {?}
+                 */
+                function () {
+                    console.log('rearrange event bus triggered');
+                    _this.rearrangeWidgets();
+                }));
+            }));
             this.widgetLibraryDoneClick = this.raDashboardEventBus.subscribe(RAEvent.widgetLibraryDoneClick).subscribe((/**
              * @param {?} widgetList
              * @return {?}
@@ -1133,8 +1141,8 @@
                 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 */
         /**
@@ -1154,6 +1162,69 @@
             }));
             return true;
         };
+        /**To update widget dimensions */
+        /**
+         * To update widget dimensions
+         * @param {?} widgetInstanceId
+         * @return {?}
+         */
+        RADashboardArea.prototype.updateWidgetPosition = /**
+         * To update widget dimensions
+         * @param {?} widgetInstanceId
+         * @return {?}
+         */
+        function (widgetInstanceId) {
+            /** @type {?} */
+            var widgetFilteredList = [];
+            /** @type {?} */
+            var widget = this.widgetList.filter((/**
+             * @param {?} filtered
+             * @return {?}
+             */
+            function (filtered) { return filtered.widgetInfo && filtered.widgetInfo.widgetInstanceId == widgetInstanceId; }));
+            if (widget && widget.length > 0) {
+                widgetFilteredList.push(widget[0]);
+                /** @type {?} */
+                var widgetList = this.mapGridsterListToObject(widgetFilteredList);
+                this.dashboardService.updateWidgets(this.formatWidgetDataForPositionDetails(widgetList), this.appConfig).subscribe((/**
+                 * @param {?} widgets
+                 * @return {?}
+                 */
+                function (widgets) {
+                }));
+            }
+            return true;
+        };
+        /**To restrict request payload to be of min size (position & size details) */
+        /**
+         * To restrict request payload to be of min size (position & size details)
+         * @param {?} widgetItemList
+         * @return {?}
+         */
+        RADashboardArea.prototype.formatWidgetDataForPositionDetails = /**
+         * To restrict request payload to be of min size (position & size details)
+         * @param {?} widgetItemList
+         * @return {?}
+         */
+        function (widgetItemList) {
+            /** @type {?} */
+            var itemList = [];
+            widgetItemList.forEach((/**
+             * @param {?} widgetItem
+             * @return {?}
+             */
+            function (widgetItem) {
+                /** @type {?} */
+                var 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 */
         /**
          * To retrieve widgets based on userDashboardid and area name
@@ -1285,7 +1356,6 @@
          * @return {?}
          */
         function () {
-            console.log('in rearrange widgets methd');
             this.options.compactType = 'compactUp&Left';
             this.options.api.optionsChanged();
             this.options.compactType = 'none';
@@ -1341,13 +1411,18 @@
                         _this.gridcellHeight = curRowHeight;
                     }
                 }
-                /**To save added widget position in db */
-                setTimeout((/**
-                 * @return {?}
-                 */
-                function () {
-                    _this.updateWidgets();
-                }), 1000);
+                /** @type {?} */
+                var widgetInstanceId = 0;
+                if (widget && widget.widgetInstanceId) {
+                    widgetInstanceId = widget.widgetInstanceId;
+                    /**To save added widget position in db */
+                    setTimeout((/**
+                     * @return {?}
+                     */
+                    function () {
+                        _this.updateWidgetPosition(widgetInstanceId);
+                    }), 1000);
+                }
                 _this.raDashboardEventBus.publish(RAEvent.WidgetAdded, widget);
             }));
         };
@@ -1480,7 +1555,6 @@
             widgetHeight: [{ type: core.Input, args: ['widget-height',] }],
             widgetWidth: [{ type: core.Input, args: ['widget-width',] }],
             appConfig: [{ type: core.Input, args: ['app-config',] }],
-            widgetRearrangeSubject: [{ type: core.Input }],
             gridWrapper: [{ type: core.ViewChild, args: ['gridWrapper', { static: false },] }],
             onResize: [{ type: core.HostListener, args: ['window:resize', ['$event'],] }]
         };
@@ -1500,6 +1574,11 @@
          * @private
          */
         RADashboardArea.prototype.conifgAddClick;
+        /**
+         * @type {?}
+         * @private
+         */
+        RADashboardArea.prototype.rearrangeWidgetClick;
         /**
          * @type {?}
          * @private
@@ -1537,8 +1616,6 @@
         /** @type {?} */
         RADashboardArea.prototype.appConfig;
         /** @type {?} */
-        RADashboardArea.prototype.widgetRearrangeSubject;
-        /** @type {?} */
         RADashboardArea.prototype.gridWrapper;
         /**
          * @type {?}
@@ -7620,7 +7697,6 @@
         function RaBaseDashboardTemplate(ngZone) {
             var _this = this;
             this.ngZone = ngZone;
-            this.widgetRearrangeSubject = new rxjs.Subject();
             this.initialize = (/**
              * @param {?} eventBus
              * @param {?} userDashboardId
@@ -7638,17 +7714,6 @@
                 }));
                 _this.init();
             });
-            this.rearrangeWidgets = (/**
-             * @return {?}
-             */
-            function () {
-                _this.ngZone.run((/**
-                 * @return {?}
-                 */
-                function () {
-                    _this.widgetRearrangeSubject.next(true);
-                }));
-            });
         }
         /**
          * @return {?}
@@ -7664,8 +7729,7 @@
         RaBaseDashboardTemplate.propDecorators = {
             dashboardId: [{ type: core.Input, args: ['dashboard-id',] }],
             globalFilter: [{ type: core.Input, args: ['global-filter',] }],
-            initialize: [{ type: core.Input }],
-            rearrangeWidgets: [{ type: core.Input }]
+            initialize: [{ type: core.Input }]
         };
         return RaBaseDashboardTemplate;
     }());
@@ -7677,15 +7741,11 @@
         /** @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