@schneideress/dashboardframework 0.0.183 → 0.0.184

package/fesm5/schneideress-dashboardframework.js

@@ -1,5 +1,5 @@
 import { __extends, __awaiter, __generator, __assign } from 'tslib';
-import { Injectable, Injector, ɵɵdefineInjectable, ɵɵinject, INJECTOR, Component, NgZone, Input, ViewChild, HostListener, EventEmitter, Renderer2, Output, ViewEncapsulation, ElementRef, ChangeDetectorRef, Host, NgModule } from '@angular/core';
+import { Injectable, Injector, ɵɵdefineInjectable, ɵɵinject, INJECTOR, Component, NgZone, Input, ViewChild, EventEmitter, Renderer2, Output, ViewEncapsulation, ElementRef, ChangeDetectorRef, Host, NgModule } from '@angular/core';
 import { of, Subject } from 'rxjs';
 import { BaseService, RATranslateService, RAPermissionService, RACommonModule } from '@schneideress/ra-common';
 import { filter, map } from 'rxjs/operators';
@@ -475,11 +475,13 @@ var GridsterConfigDefaultSettings = {
 var RADashboardResponsiveService = /** @class */ (function () {
     function RADashboardResponsiveService() {
         var _this = this;
+        this.resized = new Subject();
+        this.maxColsDesktop = 8;
         this.resInfo = [
-            { 'start': 0, 'end': 767, 'minCols': 1, 'maxCols': 1 },
-            { 'start': 768, 'end': 1024, 'minCols': 1, 'maxCols': 2 },
-            { 'start': 1025, 'end': 1366, 'minCols': 1, 'maxCols': 6 },
-            { 'start': 1367, 'end': 9999999999, 'minCols': 1, 'maxCols': 8 }
+            { 'id': 1, 'start': 0, 'end': 767, 'minCols': 1, 'maxCols': 1 },
+            { 'id': 2, 'start': 768, 'end': 1024, 'minCols': 1, 'maxCols': 2 },
+            { 'id': 3, 'start': 1025, 'end': 1366, 'minCols': 1, 'maxCols': 6 },
+            { 'id': 4, 'start': 1367, 'end': 9999999999, 'minCols': 1, 'maxCols': this.maxColsDesktop }
         ];
         this.setScreenWidth();
         window.addEventListener('resize', (/**
@@ -504,13 +506,18 @@ var RADashboardResponsiveService = /** @class */ (function () {
             this.currentResInfo = this.resInfo[3];
         }
         else {
-            this.currentResInfo = this.resInfo.filter((/**
+            /** @type {?} */
+            var resInfo = this.resInfo.filter((/**
              * @param {?} item
              * @return {?}
              */
             function (item) {
                 return item.end >= _this.screenWidth && item.start <= _this.screenWidth;
             }))[0];
+            if (!this.currentResInfo || this.currentResInfo.id != resInfo.id) {
+                this.currentResInfo = resInfo;
+                this.resized.next();
+            }
         }
     };
     Object.defineProperty(RADashboardResponsiveService.prototype, "IsDesktopView", {
@@ -588,13 +595,18 @@ var RADashboardResponsiveService = /** @class */ (function () {
      * @return {?}
      */
     function (widget) {
+        if (widget.widgetSettings && typeof widget.widgetSettings === 'string') {
+            widget.widgetSettings = JSON.parse(widget.widgetSettings);
+        }
         /** @type {?} */
         var gridsterItem = (/** @type {?} */ ({
             cols: this.getWidth(widget.width),
             rows: this.getHeight(widget.height),
             x: this.IsDesktopView ? widget.position_x : 0,
             y: this.IsDesktopView ? widget.position_y : 0,
-            widgetInfo: widget
+            widgetInfo: widget,
+            minItemRows: this.getMinItemRows(widget),
+            minItemCols: this.getMinItemCols(widget)
         }));
         return gridsterItem;
     };
@@ -610,12 +622,46 @@ var RADashboardResponsiveService = /** @class */ (function () {
      */
     function (width) {
         if (!this.IsDesktopView) {
-            width = Math.floor(width / 10 * this.currentResInfo.maxCols);
+            width = Math.floor(width / this.maxColsDesktop * this.currentResInfo.maxCols);
             if (width < this.currentResInfo.minCols)
                 width = this.currentResInfo.minCols;
         }
         return width;
     };
+    /**
+     * @private
+     * @param {?} widget
+     * @return {?}
+     */
+    RADashboardResponsiveService.prototype.getMinItemRows = /**
+     * @private
+     * @param {?} widget
+     * @return {?}
+     */
+    function (widget) {
+        if (this.IsDesktopView) {
+            if (widget.widgetSettings && widget.widgetSettings.minRows) {
+                return widget.widgetSettings.minRows;
+            }
+        }
+    };
+    /**
+     * @private
+     * @param {?} widget
+     * @return {?}
+     */
+    RADashboardResponsiveService.prototype.getMinItemCols = /**
+     * @private
+     * @param {?} widget
+     * @return {?}
+     */
+    function (widget) {
+        if (this.IsDesktopView) {
+            if (widget.widgetSettings && widget.widgetSettings.minCols) {
+                return widget.widgetSettings.minCols;
+            }
+        }
+    };
     /**
      * @private
      * @param {?} height
@@ -628,7 +674,7 @@ var RADashboardResponsiveService = /** @class */ (function () {
      */
     function (height) {
         if (!this.IsDesktopView) {
-            height = Math.floor(height / 10 * this.currentResInfo.maxCols);
+            height = Math.floor(height / this.maxColsDesktop * this.currentResInfo.maxCols);
             if (height < this.currentResInfo.minCols)
                 height = this.currentResInfo.minCols;
         }
@@ -643,6 +689,10 @@ var RADashboardResponsiveService = /** @class */ (function () {
     return RADashboardResponsiveService;
 }());
 if (false) {
+    /** @type {?} */
+    RADashboardResponsiveService.prototype.resized;
+    /** @type {?} */
+    RADashboardResponsiveService.prototype.maxColsDesktop;
     /**
      * @type {?}
      * @private
@@ -682,46 +732,41 @@ var RADashboardArea = /** @class */ (function () {
         this.widgetWidth = 4;
     }
     /**
-     * @param {?} event
      * @return {?}
      */
-    RADashboardArea.prototype.onResize = /**
-     * @param {?} event
+    RADashboardArea.prototype.ngOnInit = /**
      * @return {?}
      */
-    function (event) {
+    function () {
         var _this = this;
-        this.widgetList = [];
-        setTimeout((/**
+        this.initiateGridsterConfig();
+        this.responsiveService.resized.subscribe((/**
          * @return {?}
          */
         function () {
-            _this.initiateGridsterConfig();
-            _this.options.api.optionsChanged();
-            if (_this.userWidgets) {
-                _this.widgetList = _this.mapObjectListToGridsterItemList(_this.userWidgets);
-                setTimeout((/**
-                 * @return {?}
-                 */
-                function () {
-                    _this.setAreaHeight();
-                }));
-            }
-            else {
-                _this.loadWidgets(_this.userDashboardId, _this.areaKey);
-            }
-            _this.domResized = !_this.domResized;
+            _this.widgetList = [];
+            setTimeout((/**
+             * @return {?}
+             */
+            function () {
+                _this.initiateGridsterConfig();
+                _this.options.api.optionsChanged();
+                if (_this.userWidgets) {
+                    _this.widgetList = _this.mapObjectListToGridsterItemList(_this.userWidgets);
+                    setTimeout((/**
+                     * @return {?}
+                     */
+                    function () {
+                        _this.setAreaHeight();
+                    }));
+                }
+                else {
+                    _this.loadWidgets(_this.userDashboardId, _this.areaKey);
+                }
+                _this.domResized = !_this.domResized;
+            }));
         }));
     };
-    /**
-     * @return {?}
-     */
-    RADashboardArea.prototype.ngOnInit = /**
-     * @return {?}
-     */
-    function () {
-        this.initiateGridsterConfig();
-    };
     /**
      * @param {?} changes
      * @return {?}
@@ -757,11 +802,8 @@ var RADashboardArea = /** @class */ (function () {
          * @return {?}
          */
         function (gridster) {
-            console.log('grid inititalized');
-            console.log(_this.options.api);
             if (_this.options.api) {
                 _this.gridcellHeight = _this.options.api.getCurrentRowHeight();
-                console.log('cell height is' + _this.gridcellHeight);
             }
         });
         this.options.itemChangeCallback = (/**
@@ -1133,10 +1175,18 @@ var RADashboardArea = /** @class */ (function () {
      * @return {?}
      */
     function () {
-        this.options.compactType = 'compactUp&Left';
-        this.options.api.optionsChanged();
-        this.options.compactType = 'none';
-        this.options.api.optionsChanged();
+        var _this = this;
+        for (var i = 0; i < this.userWidgets.length; i++) {
+            this.userWidgets[i].position_x = 0;
+            this.userWidgets[i].position_y = 0;
+            this.widgetList = this.mapObjectListToGridsterItemList(this.userWidgets);
+            setTimeout((/**
+             * @return {?}
+             */
+            function () {
+                _this.setAreaHeight();
+            }));
+        }
     };
     /**To add widget instance to the database with the next available position and to make changes in
      * dashboard area.
@@ -1157,6 +1207,17 @@ var RADashboardArea = /** @class */ (function () {
         var _this = this;
         data.height = this.widgetHeight;
         data.width = this.widgetWidth;
+        if (data.widgetSettings) {
+            if (typeof data.widgetSettings === 'string')
+                data.widgetSettings = JSON.parse(data.widgetSettings);
+            if (data.widgetSettings.defaultCols) {
+                data.width = data.widgetSettings.defaultCols;
+            }
+            if (data.widgetSettings.defaultRows) {
+                data.height = data.widgetSettings.defaultRows;
+            }
+            data.widgetSettings = null;
+        }
         data = this.setPositions(data);
         /** to find the available position in gridster, temp commenting the code-returning higher y value than normal */
         data.dashboardAreaKey = this.areaKey;
@@ -1214,12 +1275,12 @@ var RADashboardArea = /** @class */ (function () {
             if (this.userWidgets.length > 0) {
                 /** @type {?} */
                 var widget = this.userWidgets[this.userWidgets.length - 1];
-                if (widget.position_x + widget.width > 5) {
+                if (widget.position_x + widget.width > (this.responsiveService.maxColsDesktop / 2)) {
                     data.position_y = widget.position_y + 1;
                 }
                 else {
                     data.position_y = widget.position_y;
-                    data.position_x = 10 - (widget.position_x + widget.width);
+                    data.position_x = this.responsiveService.maxColsDesktop - (widget.position_x + widget.width);
                 }
             }
         }
@@ -1337,8 +1398,7 @@ var RADashboardArea = /** @class */ (function () {
         widgetHeight: [{ type: Input, args: ['widget-height',] }],
         widgetWidth: [{ type: Input, args: ['widget-width',] }],
         appConfig: [{ type: Input, args: ['app-config',] }],
-        gridWrapper: [{ type: ViewChild, args: ['gridWrapper', { static: false },] }],
-        onResize: [{ type: HostListener, args: ['window:resize', ['$event'],] }]
+        gridWrapper: [{ type: ViewChild, args: ['gridWrapper', { static: false },] }]
     };
     return RADashboardArea;
 }());
@@ -1799,7 +1859,7 @@ var RAWidgetContainer = /** @class */ (function () {
                     globalFilter: this.globalFilter,
                     configChanges: this.getConfigChanges(false)
                 }));
-                if (widgetInfo.widgetSettings && widgetInfo.widgetSettings.length > 0) {
+                if (widgetInfo.widgetSettings) {
                     this.widgetSettings = this.getParsedConfig(widgetInfo.widgetSettings);
                     this.applayWidgetSettings(this.widgetSettings);
                 }
@@ -1893,7 +1953,6 @@ var RAWidgetContainer = /** @class */ (function () {
                                                 widgetConfigFilter.widgetInfo = widgetInfo;
                                                 widgetConfigFilter.configChanges = this.getConfigChanges(false);
                                                 widgetConfigFilter.widgetInfo.widgetName = widgetInfo.widgetName;
-                                                console.log(widgetConfigFilter);
                                                 widgetContainer.widgetElement.loadContent(widgetConfigFilter);
                                                 return [4 /*yield*/, widgetContainer.setLock(widgetConfigFilter.config)];
                                             case 1: