@schneideress/dashboardframework 0.0.269 → 0.0.271

package/bundles/schneideress-dashboardframework.umd.js

@@ -228,6 +228,7 @@
         function RaDashboardService(injector) {
             var _this = _super.call(this, injector, '') || this;
             _this.loadedScripts = [];
+            _this.clientId = undefined;
             return _this;
         }
         /*
@@ -280,12 +281,6 @@
         /**To Update widgetInfo in database */
         RaDashboardService.prototype.updateWidget = function (widgetInfo, appConfig) {
             this.baseUrl = appConfig.apiBaseUrl;
-            var info = {};
-            info.widgetConfigInfo = widgetInfo.widgetConfigInfo;
-            info.widgetInstanceId = widgetInfo.widgetInstanceId;
-            info.widgetTitle = widgetInfo.widgetTitle;
-            info.widgetType = widgetInfo.widgetType;
-            info.widgetId = widgetInfo.widgetId;
             return this.post('widget/UpdateUserWidget', widgetInfo);
         };
         /** To Move or change position if current widget container*/
@@ -401,12 +396,6 @@
         RAEvent["UpdateAppledFiterForInapplicableFilter"] = "UpdateAppledFiterForInapplicableFilter";
         /**show inapplicable filter message in global filter flyout */
         RAEvent["ShowInapplicableFilterMessage"] = "ShowInapplicableFilterMessage";
-        /** Bulk Action Clicked */
-        RAEvent["BulkActionClick"] = "BulkActionClick";
-        /** Global Filter Clicked */
-        /** When user change the curated filter(eg:data streams), system will create/delete widgets */
-        RAEvent["CuratedFilterChange"] = "CuratedFilterChange";
-        RAEvent["GlobalFilterClick"] = "GlobalFilterClick";
     })(exports.RAEvent || (exports.RAEvent = {}));
 
     (function (RAEventKey) {
@@ -420,9 +409,9 @@
         margin: 10,
         outerMargin: true,
         outerMarginTop: 10,
-        outerMarginRight: 0,
+        outerMarginRight: 10,
         outerMarginBottom: 30,
-        outerMarginLeft: 0,
+        outerMarginLeft: 10,
         useTransformPositioning: true,
         mobileBreakpoint: 640,
         minCols: 10,
@@ -537,7 +526,7 @@
             enumerable: true,
             configurable: true
         });
-        RADashboardResponsiveService.prototype.getGridsterConfig = function (isWidgetMgmnt, resize, canMove) {
+        RADashboardResponsiveService.prototype.getGridsterConfig = function (isWidgetMgmnt) {
             var config = GridsterConfigDefaultSettings;
             config.minCols = this.currentResInfo.maxCols;
             config.maxCols = this.currentResInfo.maxCols;
@@ -559,13 +548,6 @@
                 config.swap = true;
                 config.draggable.enabled = true;
             }
-            if (!resize) {
-                config.resizable.enabled = false;
-                config.swap = false;
-            }
-            if (!canMove) {
-                config.draggable.enabled = false;
-            }
             return config;
         };
         /**To map IwidgetInfo object to gridsterItem */
@@ -573,9 +555,6 @@
             if (widget.widgetSettings) {
                 widget.settings = JSON.parse(widget.widgetSettings);
             }
-            if (widget.templateSettings) {
-                widget.templateWidgetSettings = JSON.parse(widget.templateSettings);
-            }
             var gridsterItem = {
                 cols: this.getWidth(widget.width),
                 rows: this.getHeight(widget.height),
@@ -643,7 +622,6 @@
             this.domResized = false;
             this.showEmptyDashboard = false;
             this.isWidgetMgmnt = false;
-            this.initialWidgetCount = 10;
             this.widgetHeight = 2;
             this.widgetWidth = 4;
             this.hideDashboardBanner = new core.EventEmitter();
@@ -652,7 +630,6 @@
             var _this = this;
             this.isWidgetMgmnt = this.permissionService.hasPermission('ra.widgetmanagement');
             this.initiateGridsterConfig();
-            this.setEmptyDashboardConfig();
             this.lastViewType = this.responsiveService.IsDesktopView ? 'desktop' : 'mobile';
             this.responsiveService.resized.subscribe(function (isDesktop) {
                 if (_this.lastViewType != (isDesktop ? 'desktop' : 'mobile') || !isDesktop) {
@@ -681,11 +658,6 @@
                     }, 100);
                 }
             });
-            setTimeout(function () {
-                _this.bulkActionClick = _this.raDashboardEventBus.subscribe(exports.RAEvent.BulkActionClick).subscribe(function (data) {
-                    _this.bulkActionData = JSON.parse(JSON.stringify(data)); // To create a new reference;
-                });
-            });
         };
         RADashboardArea.prototype.ngOnChanges = function (changes) {
             this.isWidgetMgmnt = this.permissionService.hasPermission('ra.widgetmanagement');
@@ -693,41 +665,28 @@
                 this.isWidgetLoaded = true;
                 this.loadWidgets(this.userDashboardId, this.areaKey);
             }
-            this.initiateGridsterConfig();
             if (changes.raDashboardEventBus && changes.raDashboardEventBus.currentValue != changes.raDashboardEventBus.previousValue) {
                 this.inititateEventBusSubscritions();
             }
         };
-        RADashboardArea.prototype.setEmptyDashboardConfig = function () {
-            if (this.dashboardInfo && this.dashboardInfo.templateConfig.emptyDashboardHeader) {
-                this.emptyDashboardTitle = this.translateService.translate("dashboard." + this.dashboardInfo.templateConfig.emptyDashboardHeader.titleKey);
-                this.emptyDashboardMsg1 = this.translateService.translate("dashboard." + this.dashboardInfo.templateConfig.emptyDashboardHeader.descriptionKey1);
-                this.emptyDashboardMsg2 = (this.dashboardInfo.templateConfig.emptyDashboardHeader.descriptionKey2) ? this.translateService.translate("dashboard." + this.dashboardInfo.templateConfig.emptyDashboardHeader.descriptionKey2) : '';
-                this.emptyDashboardButtonText = this.translateService.translate("dashboard." + this.dashboardInfo.templateConfig.emptyDashboardHeader.buttonTextKey);
-                this.emptyDashboardButtonIcon = this.dashboardInfo.templateConfig.emptyDashboardHeader.buttonIcon ? this.dashboardInfo.templateConfig.emptyDashboardHeader.buttonIcon : '';
-                this.emptyDashboardButtonAction = this.dashboardInfo.templateConfig.emptyDashboardHeader.buttonAction ? this.dashboardInfo.templateConfig.emptyDashboardHeader.buttonAction : '';
-            }
-        };
         /**To set GridsterConfig */
         RADashboardArea.prototype.initiateGridsterConfig = function () {
             var _this = this;
-            if (this.dashboardInfo) {
-                /**To override default configuration values to the gridster control */
-                this.options = this.responsiveService.getGridsterConfig(this.isWidgetMgmnt, this.dashboardInfo.templateConfig.widget.canResize, this.dashboardInfo.templateConfig.widget.canMove);
-                this.options.initCallback = function (gridster) {
-                    if (_this.options.api) {
-                        _this.gridcellHeight = _this.options.api.getCurrentRowHeight();
-                    }
-                };
-                this.options.itemChangeCallback = function (item) {
-                    if (_this.responsiveService.IsDesktopView) {
-                        if (item.widgetInfo && item.widgetInfo.widgetInstanceId) {
-                            _this.updateWidgetPosition(item.widgetInfo.widgetInstanceId);
-                        }
+            /**To override default configuration values to the gridster control */
+            this.options = this.responsiveService.getGridsterConfig(this.isWidgetMgmnt);
+            this.options.initCallback = function (gridster) {
+                if (_this.options.api) {
+                    _this.gridcellHeight = _this.options.api.getCurrentRowHeight();
+                }
+            };
+            this.options.itemChangeCallback = function (item) {
+                if (_this.responsiveService.IsDesktopView) {
+                    if (item.widgetInfo && item.widgetInfo.widgetInstanceId) {
+                        _this.updateWidgetPosition(item.widgetInfo.widgetInstanceId);
                     }
-                    _this.setAreaHeight();
-                };
-            }
+                }
+                _this.setAreaHeight();
+            };
         };
         /** To initiate eventbus subsctiptions */
         RADashboardArea.prototype.inititateEventBusSubscritions = function () {
@@ -747,11 +706,6 @@
                     _this.addWidget(e);
                 });
             });
-            this.curatedFilterChange = this.raDashboardEventBus.subscribe(exports.RAEvent.CuratedFilterChange).subscribe(function (e) {
-                _this.ngZone.run(function () {
-                    _this.loadWidgets(_this.userDashboardId, _this.areaKey);
-                });
-            });
             this.rearrangeWidgetClick = this.raDashboardEventBus.subscribe(exports.RAEvent.RearrangeClicked).subscribe(function (e) {
                 _this.ngZone.run(function () {
                     _this.rearrangeWidgets();
@@ -800,10 +754,6 @@
                 this.widgetLibraryDoneClick.unsubscribe();
             if (this.rearrangeWidgetClick)
                 this.rearrangeWidgetClick.unsubscribe();
-            if (this.curatedFilterChange)
-                this.curatedFilterChange.unsubscribe();
-            if (this.bulkActionClick)
-                this.bulkActionClick.unsubscribe();
         };
         /**To update position/dimention of all widgets in the area */
         RADashboardArea.prototype.updateWidgets = function () {
@@ -840,8 +790,6 @@
         /** To retrieve widgets based on userDashboardid and area name */
         RADashboardArea.prototype.loadWidgets = function (userDashboarId, areaKey) {
             var _this = this;
-            if (this.templateConfig && this.templateConfig.initialWidgetCount)
-                this.initialWidgetCount = this.templateConfig.initialWidgetCount;
             var widgetInfo = {
                 dashboardId: userDashboarId.toString(),
                 dashboardAreaKey: areaKey
@@ -849,6 +797,7 @@
             this.widgetList = [];
             this.dashboardService.getWidgetsByDashboardArea(widgetInfo, this.appConfig).subscribe(function (widgets) {
                 _this.userWidgets = widgets;
+                _this.dashboardService.clientId = widgets[0].clientId;
                 _this.PAMWidgets = [];
                 widgets.forEach(function (element) {
                     var settings = undefined;
@@ -870,52 +819,6 @@
                 }
             });
         };
-        RADashboardArea.prototype.widgetLoaded = function (widget) {
-            var lst = this.widgetList.filter(function (item) {
-                return item.widgetLoaded == true;
-            });
-            widget.widgetLoaded = true;
-            if (lst.length == 0) {
-                this.startLoadWidgetData(this.widgetList);
-            }
-            if (widget.dataTriggered) {
-                this.loadWidgetData(widget);
-            }
-        };
-        RADashboardArea.prototype.startLoadWidgetData = function (lst) {
-            if (lst) {
-                if (lst.length < this.initialWidgetCount) {
-                    for (var i = 0; i < lst.length; i++)
-                        this.loadWidgetData(lst[i]);
-                }
-                else
-                    for (var i = 0; i < this.initialWidgetCount; i++)
-                        this.loadWidgetData(lst[i]);
-            }
-        };
-        RADashboardArea.prototype.loadWidgetData = function (widget) {
-            widget.dataTriggered = true;
-            if (widget.widgetLoaded) {
-                widget.canLoadData = true;
-            }
-        };
-        RADashboardArea.prototype.dataLoaded = function () {
-            var _this = this;
-            var _loop_1 = function (i) {
-                if (!this_1.widgetList[i].dataTriggered) {
-                    setTimeout(function () {
-                        _this.loadWidgetData(_this.widgetList[i]);
-                    });
-                    return "break";
-                }
-            };
-            var this_1 = this;
-            for (var i = 0; i < this.widgetList.length; i++) {
-                var state_1 = _loop_1(i);
-                if (state_1 === "break")
-                    break;
-            }
-        };
         /** To set Area(Gridster) height dynamically as widgets are added/removed */
         RADashboardArea.prototype.setAreaHeight = function () {
             var _this = this;
@@ -1112,11 +1015,8 @@
             });
             return widgetListArray;
         };
-        RADashboardArea.prototype.buttonClick = function () {
-            if (this.emptyDashboardButtonAction == "widgets")
-                this.raDashboardEventBus.publish(exports.RAEvent.AddNewWidgetToDashboard, null);
-            else if (this.emptyDashboardButtonAction == "filter")
-                this.raDashboardEventBus.publish(exports.RAEvent.GlobalFilterClick, null);
+        RADashboardArea.prototype.addNewWidget = function () {
+            this.raDashboardEventBus.publish(exports.RAEvent.AddNewWidgetToDashboard, null);
         };
         RADashboardArea.prototype.updateAppliedFilters = function (data) {
             this.raDashboardEventBus.publish(exports.RAEvent.UpdateAppledFiterForInapplicableFilter, data);
@@ -1166,14 +1066,6 @@
             core.Input('app-config'),
             __metadata("design:type", Object)
         ], RADashboardArea.prototype, "appConfig", void 0);
-        __decorate([
-            core.Input('dashboard-info'),
-            __metadata("design:type", Object)
-        ], RADashboardArea.prototype, "dashboardInfo", void 0);
-        __decorate([
-            core.Input(),
-            __metadata("design:type", Object)
-        ], RADashboardArea.prototype, "templateConfig", void 0);
         __decorate([
             core.Output(),
             __metadata("design:type", Object)
@@ -1185,8 +1077,8 @@
         RADashboardArea = __decorate([
             core.Component({
                 selector: 'ra-dashboard-area',
-                template: "<div #gridWrapper class=\"wrap gridster gridster-mobile\" [ngStyle]=\"{'height': userWidgets.length > 0 ? (gridheight + 'px') : 'unset'}\">\r\n  <!-- <div #gridWrapper class=\"wrap gridster\"> -->\r\n  <gridster [options]=\"options\" style=\"height:100%;\" *ngIf=\"userWidgets.length > 0\">\r\n    <gridster-item [item]=\"item\" *ngFor=\"let item of widgetList\">\r\n      <ra-widget-container (widgetLoaded)=\"widgetLoaded(item)\" (dataLoaded)=\"dataLoaded()\" [canLoadData]=\"item.canLoadData\" [bulk-action-data]=\"bulkActionData\" [dashboard-info]=\"dashboardInfo\" [app-config]=\"appConfig\" [event-bus]=\"raDashboardEventBus\"\r\n        (widgetDeleted)=\"deleteWidget($event)\" [data]=\"item\" [global-filter]=\"globalFilter\"\r\n        [grid-cell-height]=\"gridcellHeight\" *ngIf=\"gridcellHeight && gridcellHeight > 0\" [widget-width]=\"item.cols\"\r\n        [widget-height]=\"item.rows\" [widget-instance-id]=\"item.widgetInstanceId\" [dom-resized]=\"domResized\"\r\n        (updateAppliedFilters)=\"updateAppliedFilters($event)\">\r\n      </ra-widget-container>\r\n    </gridster-item>\r\n  </gridster>\r\n\r\n  <div class=\"empty-padding kiosk-hide\" *ngIf=\"showEmptyDashboard\">\r\n    <div class=\"empty-wrapper\">\r\n      <div></div>\r\n      <div class=\"empty-prefix\">\r\n        <!-- <i class=\"fal fa-edit edit-icon\"></i> -->\r\n        <span>{{emptyDashboardTitle}}</span>\r\n      </div>\r\n      <hr class=\"horizontalLine-solid\" />\r\n      <div class=\"empty-content light\">\r\n        <div>\r\n          <div class=\"col-sm-12 empty-msg\">\r\n            {{emptyDashboardMsg1}} <br />\r\n            {{emptyDashboardMsg2}}\r\n          </div>\r\n          <button *ngIf=\"isWidgetMgmnt\" class=\"btn btnLib btn-sm dashboard-button light\" (click)=\"buttonClick()\">\r\n            <i class=\"{{emptyDashboardButtonIcon}}\"></i>{{emptyDashboardButtonText}}</button>\r\n        </div>\r\n      </div>\r\n    </div>\r\n  </div>\r\n\r\n  <notifier-container></notifier-container>\r\n</div>",
-                styles: ["gridster{width:inherit;resize:height;display:flex;background-color:#fff;overflow-y:hidden!important}.dvheader{width:100%;height:35px;background:#000;color:#fff;padding:7px 3px 5px 6px;text-transform:uppercase}gridster-item{box-sizing:border-box;z-index:1;position:absolute;overflow:hidden;transition:.3s;display:none;background:#fff;-webkit-user-select:text;-moz-user-select:text;user-select:text;box-shadow:none}gridster-item:hover{box-shadow:0 1px 10px rgba(0,0,0,.15)!important}@media screen and (max-width:685px){.gridster-mobile{height:auto!important;margin-bottom:50px!important}}@media screen and (max-width:350px){.gridster-mobile{min-height:330px!important;margin-bottom:0!important}}.empty-padding{padding:15px 0;background-color:#fff;display:flex}.empty-wrapper{background-color:#fff;border:1px solid #9fa0a4;min-height:125px;width:100%}.empty-prefix{color:#32ad3c;font-size:18px;padding:15px}.empty-content{color:#626469;width:100%;padding:15px}.empty-msg{padding:0 0 15px;font-size:16px}.horizontalLine-solid{border-top:1px solid #cbcbcb;margin:0 15px}.dashboard-button{padding:5px 10px 5px 5px!important}.btnLib{background-color:#ededed;color:#333!important}.btn-group-sm>.btn,.btn-sm{padding:5px 20px 5px 5px}.edit-icon{color:#32ad3c;font-size:24px;margin-right:15px}.empty-title{margin-top:10px}@media screen and (max-width:600px){.empty-padding{padding:15px 0;background-color:#fff;width:100%;display:block}.empty-wrapper{display:flex;background-color:#fff;border:1px solid #9fa0a4;min-height:125px;width:100%}.empty-prefix{color:#32ad3c;font-size:16px;display:flex;height:40px;padding:15px}.empty-content{color:#333;display:flex;padding:15px}.empty-msg{padding:0 0 15px;font-size:14px}.edit-icon{color:#32ad3c;font-size:20px;margin-right:6px}.empty-title{margin-top:6px}}"]
+                template: "<div #gridWrapper class=\"wrap gridster gridster-mobile\" [ngStyle]=\"{'height': userWidgets.length > 0 ? (gridheight + 'px') : 'unset'}\">\r\n  <!-- <div #gridWrapper class=\"wrap gridster\"> -->\r\n  <gridster [options]=\"options\" style=\"height:100%;\" *ngIf=\"userWidgets.length > 0\">\r\n    <gridster-item [item]=\"item\" *ngFor=\"let item of widgetList\">\r\n      <ra-widget-container [app-config]=\"appConfig\" [event-bus]=\"raDashboardEventBus\"\r\n        (widgetDeleted)=\"deleteWidget($event)\" [data]=\"item\" [global-filter]=\"globalFilter\"\r\n        [grid-cell-height]=\"gridcellHeight\" *ngIf=\"gridcellHeight && gridcellHeight > 0\" [widget-width]=\"item.cols\"\r\n        [widget-height]=\"item.rows\" [widget-instance-id]=\"item.widgetInstanceId\" [dom-resized]=\"domResized\"\r\n        (updateAppliedFilters)=\"updateAppliedFilters($event)\">\r\n      </ra-widget-container>\r\n    </gridster-item>\r\n  </gridster>\r\n\r\n  <div class=\"empty-padding kiosk-hide\" *ngIf=\"showEmptyDashboard\">\r\n    <div class=\"empty-wrapper\">\r\n      <div></div>\r\n      <div class=\"m-1 empty-prefix\">\r\n        <i class=\"fal fa-edit edit-icon\"></i>\r\n        <span class=\"empty-title\">{{'dashboard.emptydashboard'|translate}}</span>\r\n      </div>\r\n      <div class=\"empty-content light\">\r\n        <div>\r\n          <div class=\"col-sm-12 empty-msg\">\r\n            {{'dashboard.emptydashboardmessage'|translate}} <br />\r\n            {{'dashboard.emptydashboardmessage2'|translate}}\r\n          </div>\r\n          <button *ngIf=\"isWidgetMgmnt\" class=\"btn btnLib btn-sm m-1 dashboard-button light\" (click)=\"addNewWidget()\">\r\n            <i class=\"fal fa-plus m-1\"></i>{{'dashboard.addawidgets'|translate}}</button>\r\n        </div>\r\n      </div>\r\n    </div>\r\n  </div>\r\n\r\n  <notifier-container></notifier-container>\r\n</div>",
+                styles: ["gridster{width:inherit;resize:height;display:flex;background-color:#ededed;overflow-y:hidden!important}.dvheader{width:100%;height:35px;background:#000;color:#fff;padding:7px 3px 5px 6px;text-transform:uppercase}gridster-item{box-sizing:border-box;z-index:1;position:absolute;overflow:hidden;transition:.3s;display:none;background:#fff;-webkit-user-select:text;-moz-user-select:text;user-select:text;box-shadow:0 1px 10px rgba(0,0,0,.05)}gridster-item:hover{box-shadow:0 1px 10px rgba(0,0,0,.15)}@media screen and (max-width:685px){.gridster-mobile{height:auto!important;margin-bottom:50px!important}}@media screen and (max-width:350px){.gridster-mobile{min-height:330px!important;margin-bottom:0!important}}.empty-padding{padding:40px 20px 20px;background-color:#ededed;display:flex;justify-content:center;align-content:center}.empty-wrapper{display:flex;background-color:#fff;border-radius:8px;min-height:125px;width:72%}.empty-prefix{color:#32ad3c;font-size:18px;display:flex;align-items:center;padding:10px 30px;min-width:-webkit-max-content;min-width:max-content;min-width:-moz-max-content}.empty-content{color:#333;border-left:1px solid #a9afb1;width:100%;display:flex;align-items:center;padding:15px 30px 10px 40px}.empty-msg{padding:0 0 5px;font-size:16px}.dashboard-button{padding:5px 10px 5px 5px!important}.btnLib{background-color:#ededed;color:#333!important}.btn-group-sm>.btn,.btn-sm{padding:5px 20px 5px 5px}.edit-icon{color:#32ad3c;font-size:24px;margin-right:15px}.empty-title{margin-top:10px}@media screen and (max-width:600px){.empty-padding{padding:10px;background-color:#ededed;width:100%;display:block}.empty-wrapper{display:flex;background-color:#fff;border-radius:8px;min-height:125px;width:100%}.empty-prefix{color:#32ad3c;font-size:16px;display:flex;height:40px;padding:6px 10px 8px}.empty-content{color:#333;display:flex;padding:5px 10px 10px;margin-top:44px;margin-left:-185px;border-left:none}.empty-msg{padding:12px 10px 10px 5px;font-size:14px;border-top:1px solid #a9afb1}.edit-icon{color:#32ad3c;font-size:20px;margin-right:6px}.empty-title{margin-top:6px}}"]
             }),
             __metadata("design:paramtypes", [RaDashboardService,
                 core.NgZone,
@@ -1289,11 +1181,8 @@
             this.showExcell = true;
             this.hideTitle = false;
             this.inapplicableFilters = [];
-            this.canLoadData = false;
             this.widgetDeleted = new core.EventEmitter();
             this.updateAppliedFilters = new core.EventEmitter();
-            this.dataLoaded = new core.EventEmitter();
-            this.widgetLoaded = new core.EventEmitter();
             this.isWidgetStateApplicable = false;
             this.widgetEmptyState = '';
             this.lockVisible = false;
@@ -1318,7 +1207,7 @@
             configurable: true
         });
         RAWidgetContainer.prototype.ngOnInit = function () {
-            this.WidgetDisplayName = this.translateService.translate('Common.' + this.data.widgetInfo.widgetTitle, true);
+            this.WidgetDisplayName = this.getwidgetTitleTranslation(this.data.widgetInfo.widgetTitle);
             this.lockIconTitle = this.translateService.translate('Common.lockedfields');
             this.lockIconFooter = this.translateService.translate('Common.lockedfieldseditinfo');
             this.inapplicableIconTitle = this.translateService.translate('Common.InapplicableFilters');
@@ -1339,32 +1228,19 @@
                     });
                 });
             }
-            if (this.widgetElement) {
-                if (changes.bulkActionData && changes.bulkActionData.currentValue != changes.bulkActionData.previousValue) {
-                    if (typeof this.widgetElement.bulkActionClicked === "function") {
-                        this.widgetElement.bulkActionClicked(this.bulkActionData);
-                    }
-                }
-                if (changes.globalFilter && changes.globalFilter.currentValue != changes.globalFilter.previousValue) {
-                    if (!this.dashboardInfo.curatedFilters) {
-                        var filterObj = this.getParsedConfig(this.globalFilter);
-                        if (filterObj.WidgetInstanceId) {
-                            if (this.data.widgetInfo.widgetInstanceId != filterObj.WidgetInstanceId)
-                                this.refreshWidget(this.data.widgetInfo);
-                        }
-                        else {
-                            //this.refreshWidget(this.data.widgetInfo);
-                        }
-                    }
+            if (this.widgetElement && changes.globalFilter && changes.globalFilter.currentValue != changes.globalFilter.previousValue) {
+                var filterObj = this.getParsedConfig(this.globalFilter);
+                if (filterObj.WidgetInstanceId) {
+                    if (this.data.widgetInfo.widgetInstanceId != filterObj.WidgetInstanceId)
+                        this.refreshWidget(this.data.widgetInfo);
                 }
-                if (changes.width && changes.width.currentValue != changes.width.previousValue ||
-                    (changes.height && changes.height.currentValue != changes.height.previousValue)) {
-                    this.invokeWidgetResizedEvent();
+                else {
+                    this.refreshWidget(this.data.widgetInfo);
                 }
             }
-            if (changes.canLoadData && changes.canLoadData.currentValue != changes.canLoadData.previousValue) {
-                if (this.canLoadData)
-                    this.refreshWidget(this.data.widgetInfo);
+            if (changes.width && changes.width.currentValue != changes.width.previousValue ||
+                (changes.height && changes.height.currentValue != changes.height.previousValue)) {
+                this.invokeWidgetResizedEvent();
             }
         };
         RAWidgetContainer.prototype.invokeWidgetResizedEvent = function () {
@@ -1556,10 +1432,6 @@
                                                                 _this.showPanel = true;
                                                             else
                                                                 _this.showPanel = false;
-                                                            if (!_this.data.dataLoaded) {
-                                                                _this.data.dataLoaded = true;
-                                                                _this.dataLoaded.emit();
-                                                            }
                                                             break;
                                                         case 'onConfigEditClicked':
                                                             _this.editWidget();
@@ -1632,9 +1504,7 @@
                                                 widgetConfigFilter.configChanges = this.getConfigChanges(false);
                                                 widgetConfigFilter.widgetInfo.widgetName = widgetInfo.widgetName;
                                                 widgetConfigFilter.globalFilter = this.globalFilter;
-                                                widgetConfigFilter.dashboardInfo = me.dashboardInfo;
-                                                // this.widgetElement.loadContent(widgetConfigFilter);
-                                                this.widgetLoaded.emit();
+                                                this.widgetElement.loadContent(widgetConfigFilter);
                                                 return [4 /*yield*/, this.setLock(widgetConfigFilter.config)];
                                             case 1:
                                                 _a.sent();
@@ -1904,12 +1774,9 @@
             var html = '<div id="ra-db-widget-menu"' + 'style="' + style + '" class="download-content dropdown-content widget-config-item dropdown-click" style="z-index: 1002;">';
             var settings = '';
             if (this.isWidgetMgmnt) {
-                if (!this.data.widgetInfo.templateWidgetSettings || !this.data.widgetInfo.templateWidgetSettings.hideEdit)
-                    settings += this.getHtmlForButton('wcEditWidget', 'fal fa-edit', this.editText);
-                if (!this.data.widgetInfo.templateWidgetSettings || !this.data.widgetInfo.templateWidgetSettings.hideCopy)
-                    settings += this.getHtmlForButton('wcCopyWidget', 'fal fa-copy', this.copyText);
-                if (!this.data.widgetInfo.templateWidgetSettings || !this.data.widgetInfo.templateWidgetSettings.hideMove)
-                    settings += this.getHtmlForButton('wcMoveWidget', 'fal fa-arrows-alt', this.moveText);
+                settings += this.getHtmlForButton('wcEditWidget', 'fal fa-edit', this.editText);
+                settings += this.getHtmlForButton('wcCopyWidget', 'fal fa-copy', this.copyText);
+                settings += this.getHtmlForButton('wcMoveWidget', 'fal fa-arrows-alt', this.moveText);
             }
             var customPageParams = false;
             if (this.data.widgetInfo && this.data.widgetInfo.widgetSettings) {
@@ -1918,14 +1785,14 @@
                     customPageParams = true;
                 }
             }
-            if (!this.data.widgetInfo.templateWidgetSettings || !this.data.widgetInfo.templateWidgetSettings.hideVisitPage && (this.detailPageUrl || customPageParams) && this.checkVisitLinkVisiblity()) {
+            if ((this.detailPageUrl || customPageParams) && this.checkVisitLinkVisiblity()) {
                 settings += '<a style="max-height: 30px;align-items: center;align-content: center; display: flex;" id="wcVisitWidget">';
                 settings += '<i style="padding-left: 4px;font-size: 27px !important;" class="fal fa-angle-right"></i> ';
                 settings += '<span style="padding-left: 11px;margin-top: 2px;" style="padding-left: 6px;">';
                 settings += this.translateService.translate('Common.visitpage');
                 settings += '</span></a>';
             }
-            if (!this.data.widgetInfo.templateWidgetSettings || !this.data.widgetInfo.templateWidgetSettings.hideVisitPage && (this.detailPageUrl && this.checkVisitLinkVisiblity()) || this.isWidgetMgmnt) {
+            if ((this.detailPageUrl && this.checkVisitLinkVisiblity()) || this.isWidgetMgmnt) {
                 html += '<div style="color: #9FA0A4;font-size: 12px;padding-top: 8px;padding-left: 12px;">';
                 html += this.translateService.translate('Common.settings') + '</div>';
                 html += settings;
@@ -1957,7 +1824,7 @@
             if (this.isDownloadIconVisible && this.isWidgetMgmnt && this.showExcell) {
                 html += this.getHr();
             }
-            if (this.isWidgetMgmnt && !this.data.widgetInfo.templateWidgetSettings || !this.data.widgetInfo.templateWidgetSettings.hideDelete) {
+            if (this.isWidgetMgmnt) {
                 html += '<a id="wcWidgetDelete"><i class="fal fa-times" style="padding-left: 3px;color: red;"></i><span>';
                 html += this.deleteText;
                 html += '</span></a>';
@@ -2038,6 +1905,18 @@
             if (this.currentComponent)
                 this.popupInstance.removeMe(this.currentComponent);
         };
+        RAWidgetContainer.prototype.getwidgetTitleTranslation = function (item) {
+            var rKey = 'DBW_' + this.translateService.makeCode(item);
+            var translatedString = '';
+            var translationModule = this.dashboardService.clientId + '_DBW';
+            translatedString = this.translateService.translate(translationModule + '.' + rKey);
+            if (translatedString.toLowerCase() === rKey.toLowerCase()) {
+                return item;
+            }
+            else {
+                return translatedString;
+            }
+        };
         RAWidgetContainer.ctorParameters = function () { return [
             { type: RaDashboardService },
             { type: ngxUiLoader.NgxUiLoaderService },
@@ -2080,10 +1959,6 @@
             core.Input('global-filter'),
             __metadata("design:type", Object)
         ], RAWidgetContainer.prototype, "globalFilter", void 0);
-        __decorate([
-            core.Input('dashboard-info'),
-            __metadata("design:type", Object)
-        ], RAWidgetContainer.prototype, "dashboardInfo", void 0);
         __decorate([
             core.Input('data'),
             __metadata("design:type", Object)
@@ -2108,14 +1983,6 @@
             core.Input('grid-cell-height'),
             __metadata("design:type", Number)
         ], RAWidgetContainer.prototype, "gridCellHeight", void 0);
-        __decorate([
-            core.Input('bulk-action-data'),
-            __metadata("design:type", Object)
-        ], RAWidgetContainer.prototype, "bulkActionData", void 0);
-        __decorate([
-            core.Input(),
-            __metadata("design:type", Boolean)
-        ], RAWidgetContainer.prototype, "canLoadData", void 0);
         __decorate([
             core.Output(),
             __metadata("design:type", Object)
@@ -2124,14 +1991,6 @@
             core.Output(),
             __metadata("design:type", Object)
         ], RAWidgetContainer.prototype, "updateAppliedFilters", void 0);
-        __decorate([
-            core.Output(),
-            __metadata("design:type", Object)
-        ], RAWidgetContainer.prototype, "dataLoaded", void 0);
-        __decorate([
-            core.Output(),
-            __metadata("design:type", Object)
-        ], RAWidgetContainer.prototype, "widgetLoaded", void 0);
         __decorate([
             core.Input('dom-resized'),
             __metadata("design:type", Boolean),
@@ -5130,13 +4989,11 @@
         function RaBaseDashboardTemplate(ngZone) {
             var _this = this;
             this.ngZone = ngZone;
-            this.initialize = function (eventBus, userDashboardId, appConfig, dashboardInfo, templateConfig) {
+            this.initialize = function (eventBus, userDashboardId, appConfig) {
                 _this.ngZone.run(function () {
                     _this.userDashboardId = userDashboardId;
                     _this.appConfig = appConfig;
                     _this.raDashboardEventBus = eventBus;
-                    _this.dashboardInfo = dashboardInfo;
-                    _this.templateConfig = templateConfig;
                 });
                 _this.init();
             };