From dd1898b5a659125c9b1c31e74cf1fd9989843ba6 Mon Sep 17 00:00:00 2001
From: Lupei Nicolae <nicolae.lupei@indrivo.com>
Date: Wed, 11 Mar 2020 16:52:14 +0200
Subject: [PATCH] feat: add menu initializer for reports module

---
 .../Helpers/DashboardRazorResources.cs        |  4 +-
 ...ortsController.cs => ReportsController.cs} | 15 ++++--
 .../Extensions/ServiceCollectionExtensions.cs | 14 +++--
 .../GR.Report.Dynamic.Razor.csproj            |  2 +
 .../Helpers/ReportRazorResources.cs           | 14 +++++
 .../Helpers/ReportsMenuInitializer.cs         | 52 +++++++++++++++++++
 .../CreateFolder.cshtml                       |  0
 .../{DynamicReports => Reports}/Index.cshtml  |  2 +-
 .../ManageDynamicReportFolders.cshtml         |  8 +--
 .../{DynamicReports => Reports}/Save.cshtml   | 16 +++---
 .../wwwroot/assets/ReportScripts/report.js    |  2 -
 11 files changed, 106 insertions(+), 23 deletions(-)
 rename src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Controllers/{DynamicReportsController.cs => ReportsController.cs} (96%)
 mode change 100755 => 100644
 create mode 100644 src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportRazorResources.cs
 create mode 100644 src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportsMenuInitializer.cs
 rename src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/{DynamicReports => Reports}/CreateFolder.cshtml (100%)
 mode change 100755 => 100644
 rename src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/{DynamicReports => Reports}/Index.cshtml (98%)
 mode change 100755 => 100644
 rename src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/{DynamicReports => Reports}/ManageDynamicReportFolders.cshtml (96%)
 mode change 100755 => 100644
 rename src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/{DynamicReports => Reports}/Save.cshtml (94%)
 mode change 100755 => 100644

diff --git a/src/GR.Extensions/GR.Dashboard.Extension/GR.Dashboard.Razor/Helpers/DashboardRazorResources.cs b/src/GR.Extensions/GR.Dashboard.Extension/GR.Dashboard.Razor/Helpers/DashboardRazorResources.cs
index 021e67a2..b2133c7d 100644
--- a/src/GR.Extensions/GR.Dashboard.Extension/GR.Dashboard.Razor/Helpers/DashboardRazorResources.cs
+++ b/src/GR.Extensions/GR.Dashboard.Extension/GR.Dashboard.Razor/Helpers/DashboardRazorResources.cs
@@ -8,8 +8,8 @@ public static class Menu
         {
             public static Guid DashboardConfiguration = Guid.Parse("52a430e6-c41b-4b73-8a23-95b22769894e");
             public static Guid AllDashboard = Guid.Parse("9448a77d-a90d-4461-9d78-1a4acd708dd3");
-            public static Guid WidgetGroups = Guid.Parse("");
-            public static Guid Widgets = Guid.Parse("");
+            public static Guid WidgetGroups = Guid.Parse("4d18d950-ac58-45c0-9b53-04a8533e287d");
+            public static Guid Widgets = Guid.Parse("dd8daaf3-f23e-46fc-a851-66ebf1cb7bfc");
         }
     }
 }
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Controllers/DynamicReportsController.cs b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Controllers/ReportsController.cs
old mode 100755
new mode 100644
similarity index 96%
rename from src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Controllers/DynamicReportsController.cs
rename to src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Controllers/ReportsController.cs
index 6cd477fd..0fcf6afa
--- a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Controllers/DynamicReportsController.cs
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Controllers/ReportsController.cs
@@ -12,21 +12,30 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using GR.Core.Razor.BaseControllers;
+using Microsoft.AspNetCore.Authorization;
 
 namespace GR.Report.Dynamic.Razor.Controllers
 {
-    public class DynamicReportsController : Controller
+    [Authorize]
+    public class ReportsController : BaseGearController
     {
+        #region Injectable
+
+        /// <summary>
+        /// Inject reports service
+        /// </summary>
         private readonly IDynamicReportsService _service;
 
-        public DynamicReportsController(IDynamicReportsService service)
+        #endregion
+
+        public ReportsController(IDynamicReportsService service)
         {
             _service = service;
         }
 
         #region ReportFolders
 
-
         [HttpGet]
         public IActionResult Index()
         {
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Extensions/ServiceCollectionExtensions.cs b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Extensions/ServiceCollectionExtensions.cs
index 85922335..3107cc6b 100755
--- a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Extensions/ServiceCollectionExtensions.cs
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Extensions/ServiceCollectionExtensions.cs
@@ -1,8 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using GR.Core;
+using GR.Core.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 using GR.Report.Dynamic.Razor.Helpers;
+using GR.UI.Menu.Abstractions;
+using GR.UI.Menu.Abstractions.Events;
 
 namespace GR.Report.Dynamic.Razor.Extensions
 {
@@ -16,6 +17,13 @@ public static class ServiceCollectionExtensions
         public static IServiceCollection AddReportUIModule(this IServiceCollection services)
         {
             services.ConfigureOptions(typeof(ReportFileConfiguration));
+            MenuEvents.Menu.OnMenuSeed += (sender, args) =>
+            {
+                GearApplication.BackgroundTaskQueue.PushBackgroundWorkItemInQueue(async x =>
+                {
+                    await x.InjectService<IMenuService>().AppendMenuItemsAsync(new ReportsMenuInitializer());
+                });
+            };
             return services;
         }
     }
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/GR.Report.Dynamic.Razor.csproj b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/GR.Report.Dynamic.Razor.csproj
index e3b7a034..f9b4b5d5 100644
--- a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/GR.Report.Dynamic.Razor.csproj
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/GR.Report.Dynamic.Razor.csproj
@@ -22,6 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\GR.Core.Extension\GR.Core.Razor\GR.Core.Razor.csproj" />
+    <ProjectReference Include="..\..\GR.UI.Menu.Extension\GR.UI.Menu.Abstractions\GR.UI.Menu.Abstractions.csproj" />
     <ProjectReference Include="..\GR.Report.Abstractions\GR.Report.Abstractions.csproj" />
   </ItemGroup>
 
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportRazorResources.cs b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportRazorResources.cs
new file mode 100644
index 00000000..1b90c1f2
--- /dev/null
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportRazorResources.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace GR.Report.Dynamic.Razor.Helpers
+{
+    public static class ReportRazorResources
+    {
+        public class Menu
+        {
+            public static Guid ReportsSection = Guid.Parse("379adac1-351c-41a9-a9fa-1b5275bc362f");
+            public static Guid Reports = Guid.Parse("0bf2560c-8ef2-4686-9f2e-1961d45ac4ea");
+            public static Guid Folders = Guid.Parse("d4d004ac-c065-4fd1-87ee-bfda1832d4d5");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportsMenuInitializer.cs b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportsMenuInitializer.cs
new file mode 100644
index 00000000..f8e3138b
--- /dev/null
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Helpers/ReportsMenuInitializer.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using GR.Core;
+using GR.Core.Attributes.Documentation;
+using GR.Core.Helpers.Global;
+using GR.UI.Menu.Abstractions.Helpers;
+
+namespace GR.Report.Dynamic.Razor.Helpers
+{
+    [Author(Authors.LUPEI_NICOLAE)]
+    public class ReportsMenuInitializer : BaseMenuInitializer
+    {
+        public override MenuInitBuilder Builder => new MenuInitBuilder
+        {
+            MenuGroup = MenuResources.AppMenuId,
+            Configs = new List<MenuItemConfig>
+            {
+                new MenuItemConfig(ReportRazorResources.Menu.ReportsSection)
+                {
+                    Name = "Reports",
+                    ParentMenuItemId = MenuResources.MenuItems.AdministrationItem,
+                    Href = MenuResources.MenuItems.None,
+                    Translate = "reports",
+                    AllowedRoles = new List<string>
+                    {
+                        GlobalResources.Roles.ADMINISTRATOR
+                    }
+                },
+                new MenuItemConfig(ReportRazorResources.Menu.Reports)
+                {
+                    Name = "Reports",
+                    ParentMenuItemId = ReportRazorResources.Menu.ReportsSection,
+                    Href = "/Reports",
+                    Translate = "reports",
+                    AllowedRoles = new List<string>
+                    {
+                        GlobalResources.Roles.ADMINISTRATOR
+                    }
+                },
+                new MenuItemConfig(ReportRazorResources.Menu.Folders)
+                {
+                    Name = "Report folders",
+                    ParentMenuItemId = ReportRazorResources.Menu.ReportsSection,
+                    Href = "/Reports/ManageDynamicReportFolders",
+                    AllowedRoles = new List<string>
+                    {
+                        GlobalResources.Roles.ADMINISTRATOR
+                    }
+                }
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/CreateFolder.cshtml b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/CreateFolder.cshtml
old mode 100755
new mode 100644
similarity index 100%
rename from src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/CreateFolder.cshtml
rename to src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/CreateFolder.cshtml
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/Index.cshtml b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/Index.cshtml
old mode 100755
new mode 100644
similarity index 98%
rename from src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/Index.cshtml
rename to src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/Index.cshtml
index 481f89c6..05a96c75
--- a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/Index.cshtml
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/Index.cshtml
@@ -119,7 +119,7 @@
 							return `<div class="btn-group" role="group" aria-label="Action buttons">
 									<a class="btn btn-warning btn-sm" onclick="GetReportDataById('@Url.Action("GetReportDataById")', '${row.id}', 'displayReportBox')" href="javascript:">Display</a>
 									<a class="btn btn-info btn-sm" href="@Url.Action("Save")?id=${row.id}">Edit</a>
-									<a class="btn btn-danger btn-sm deleteReport" data-request-url="@Url.Action("DeleteReport", "DynamicReports")" data-value="${row.id}" href="javascript:">Delete</a>
+									<a class="btn btn-danger btn-sm deleteReport" data-request-url="@Url.Action("DeleteReport", "Reports")" data-value="${row.id}" href="javascript:">Delete</a>
 									</div>`;
 						}
 					}
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/ManageDynamicReportFolders.cshtml b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/ManageDynamicReportFolders.cshtml
old mode 100755
new mode 100644
similarity index 96%
rename from src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/ManageDynamicReportFolders.cshtml
rename to src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/ManageDynamicReportFolders.cshtml
index b28c9190..9b3dfe6f
--- a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/ManageDynamicReportFolders.cshtml
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/ManageDynamicReportFolders.cshtml
@@ -1,6 +1,6 @@
 @model Microsoft.EntityFrameworkCore.Query.IIncludableQueryable<GR.Report.Abstractions.Models.DynamicReportFolder, IEnumerable<GR.Report.Abstractions.Models.DynamicReport>>
 @{
-    ViewData["Title"] = "Manage Dynamic Report Folders";
+    ViewData["Title"] = "Manage Report Folders";
 }
 
 <div class="col-md-12">
@@ -8,7 +8,7 @@
         <div class="card-body">
             <h4 class="card-title text-center">
                 Folder Management
-                <a class=" btn btn-info pull-right text-white" asp-action="CreateFolder" asp-controller="DynamicReports">Add</a>
+                <a class=" btn btn-info pull-right text-white" asp-action="CreateFolder" asp-controller="Reports">Add</a>
             </h4>
             <div class="table-responsive m-t-40">
                 <table class="table stylish-table">
@@ -165,10 +165,10 @@
     <script>
         $(".js-folder-edit-trigger").click(function () {
             editEntity($(this).attr('data-type-id'),'folderNameSave','folderNameInput',
-                '@Url.Action("EditFolder", "DynamicReports")');
+                '@Url.Action("EditFolder", "Reports")');
         });
         $(".js-folder-delete-trigger").click(function () {
-            deleteEntity($(this).attr('data-type-id'), '@Url.Action("DeleteReportFolder","DynamicReports")');
+            deleteEntity($(this).attr('data-type-id'), '@Url.Action("DeleteReportFolder","Reports")');
         });
     </script>
 }
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/Save.cshtml b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/Save.cshtml
old mode 100755
new mode 100644
similarity index 94%
rename from src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/Save.cshtml
rename to src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/Save.cshtml
index 02bf8725..ac40dddf
--- a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/DynamicReports/Save.cshtml
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/Views/Reports/Save.cshtml
@@ -68,7 +68,7 @@
                     <div class="card-body">
                         <div id="report_tables" class="collapse">
                             <div class="form-group mt-3">
-                                <select class="form-control tableSelect d-none" id="tableSelect" data-request-url="@Url.Action("GetTablesAjax", "DynamicReports")"></select>
+                                <select class="form-control tableSelect d-none" id="tableSelect" data-request-url="@Url.Action("GetTablesAjax", "Reports")"></select>
                             </div>
                         </div>
                     </div>
@@ -89,7 +89,7 @@
                     </div>
                     <div class="card-body">
                         <div id="report_relationships" class="collapse">
-                            <div class="mt-3" id="pnlRelationships" data-request-url="@Url.Action("GetTableColumnsAjax", "DynamicReports")"></div>
+                            <div class="mt-3" id="pnlRelationships" data-request-url="@Url.Action("GetTableColumnsAjax", "Reports")"></div>
                         </div>
                     </div>
                 </div>
@@ -112,7 +112,7 @@
         </div>
         <div class="card-body">
             <div id="display_options" class="collapse">
-                <div class="mt-3" id="pnlFields" data-request-url="@Url.Action("GetAggregateTypes", "DynamicReports")"></div>
+                <div class="mt-3" id="pnlFields" data-request-url="@Url.Action("GetAggregateTypes", "Reports")"></div>
             </div>
         </div>
     </div>
@@ -132,7 +132,7 @@
         </div>
         <div class="card-body">
             <div id="filters_group_options" class="collapse">
-                <div class="mt-3" id="pnlFilters" data-request-url="@Url.Action("GetFilterTypes", "DynamicReports")"></div>
+                <div class="mt-3" id="pnlFilters" data-request-url="@Url.Action("GetFilterTypes", "Reports")"></div>
             </div>
         </div>
     </div>
@@ -148,12 +148,12 @@
         <div class="card-body">
             <div id="report_charts" class="collapse">
                 <div class="row mt-3">
-                    <div class="col-9" id="pnlCharts" data-request-url="@Url.Action("GetChartFieldTypes", "DynamicReports")"></div>
+                    <div class="col-9" id="pnlCharts" data-request-url="@Url.Action("GetChartFieldTypes", "Reports")"></div>
                     <div class="col-3">
                         <div class="row">
                             <div class="col-6">
                                 <div class="form-group">
-                                    <select class="form-control chartSelector" id="chartSelector" data-request-url="@Url.Action("GetChartTypes", "DynamicReports")">
+                                    <select class="form-control chartSelector" id="chartSelector" data-request-url="@Url.Action("GetChartTypes", "Reports")">
                                     </select>
                                 </div>
                             </div>
@@ -178,7 +178,7 @@
             <i class="material-icons mr-2">save</i>
             @Localizer["save"]
         </button>
-        <button id="runReport" data-request-url="@Url.Action("GetReportData", "DynamicReports")" class="btn btn-block mt-0 ml-2 btn-primary d-flex align-items-center py-2 px-3">
+        <button id="runReport" data-request-url="@Url.Action("GetReportData", "Reports")" class="btn btn-block mt-0 ml-2 btn-primary d-flex align-items-center py-2 px-3">
             <svg class="mr-2" xmlns="http://www.w3.org/2000/svg" width="16.001" height="16" viewBox="0 0 16.001 16">
                 <path id="Icon" d="M8,16a8,8,0,1,1,8-8A8.009,8.009,0,0,1,8,16ZM8,1.6A6.4,6.4,0,1,0,14.4,8,6.407,6.407,0,0,0,8,1.6ZM6.4,12h0L3.2,8.8,4.328,7.672,6.4,9.736l5.272-5.272L12.8,5.6,6.4,12Z" transform="translate(0)" fill="#fff"></path>
             </svg>
@@ -214,7 +214,7 @@
                                 </div>
                             </div>
                             <div class="modal-footer">
-                                <a class="btn btn-success text-white" id="saveReport" data-request-url="@Url.Action("Save", "DynamicReports")">@Localizer["save"]</a>
+                                <a class="btn btn-success text-white" id="saveReport" data-request-url="@Url.Action("Save", "Reports")">@Localizer["save"]</a>
                                 <button type="button" class="btn btn-inverse " data-dismiss="modal">@Localizer["cancel"]</button>
                             </div>
                         </form>
diff --git a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/wwwroot/assets/ReportScripts/report.js b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/wwwroot/assets/ReportScripts/report.js
index 2b4e2484..bc63ff9b 100644
--- a/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/wwwroot/assets/ReportScripts/report.js
+++ b/src/GR.Extensions/GR.Report.Extension/GR.Report.Dynamic.Razor/wwwroot/assets/ReportScripts/report.js
@@ -441,7 +441,6 @@ function AddChart(chartType) {
     return dfd.promise();
 }
 
-
 function SetRelValues() {
     $('#pnlRelationships > .row').each(function () {
 
@@ -499,7 +498,6 @@ function prepareFields($n, option) {
     return dfd.promise();
 }
 
-
 function SetFieldValues(data) {
     if (data.length > 0) {
         $('#pnlFields > .row').each(function () {