From 042d1fb0e6d66100e79a49e31aaa066cde6c015d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 26 Jul 2019 15:04:08 +0300
Subject: [PATCH] Simplify to create a widget dashboard.

---
 .../jquery/widget-manager.js                  | 28 +++++++++++++++----
 .../Pages/MyDashboard.cshtml                  |  2 +-
 .../DashboardDemo.Web/Pages/MyDashboard.js    |  8 +-----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js
index 87dc9a1ed0..0b746b5e37 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js
@@ -16,11 +16,22 @@
             opts.wrapper = $(opts.wrapper);
         }
 
+        if (!opts.filterForm) {
+            var widgetFilterAttr = opts.wrapper.attr('data-widget-filter');
+            if (widgetFilterAttr) {
+                opts.filterForm = $(widgetFilterAttr);
+            }
+        } else if (typeof opts.filterForm === 'string') {
+            opts.filterForm = $(opts.filterForm);
+        }
+
         var getFilters = function ($widgetWrapperDiv) {
             var filters = {};
             
             if (opts.filterForm) {
-                filters = opts.filterForm.serializeFormToObject();
+                opts.filterForm.each(function() {
+                    filters = $.extend(filters, opts.filterForm.serializeFormToObject());
+                });
             }
 
             if (opts.filterCallback) {
@@ -75,15 +86,22 @@
         };
 
         if (opts.filterForm) {
-            opts.filterForm.submit(function (e) {
-                e.preventDefault();
-                refresh();
+            opts.filterForm.each(function() {
+                $(this).submit(function (e) {
+                    e.preventDefault();
+                    refresh();
+                });
             });
         }
 
-        return  {
+        var publicApi = {
             init: init,
             refresh: refresh
         };
+
+        opts.wrapper.data('abp-widget-manager', publicApi);
+
+        return publicApi;
     };
+
 })(jQuery);
\ No newline at end of file
diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml
index 414bd60500..fb48c277cd 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml
+++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml
@@ -23,7 +23,7 @@
     </abp-row>
 </form>
 
-<div id="MyDashboardWidgetsArea">
+<div id="MyDashboardWidgetsArea" data-widget-filter="#MyDashboardFilterForm">
     <abp-row>
         <abp-column>
             @await Component.InvokeAsync("CountersWidget", new
diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.js b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.js
index cdf16a8a43..656bcd8816 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.js
+++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.js
@@ -1,9 +1,3 @@
 (function () {
-
-    var myDashboard = new abp.WidgetManager({
-        wrapper: '#MyDashboardWidgetsArea',
-        filterForm: $('#MyDashboardFilterForm')
-    });
-
-    myDashboard.init();
+    new abp.WidgetManager('#MyDashboardWidgetsArea').init();
 })();
\ No newline at end of file