Merge branch 'dev' into auto-rel-merge-pr-3

.github/workflows/auto-pr.yml

@@ -1,10 +1,10 @@
-name: Merge branch dev with rel-4.1
+name: Merge branch dev with rel-4.2
 on:
   push:
     branches:
-      - rel-4.1
+      - rel-4.2
 jobs:
-  merge-dev-with-rel-4-1:
+  merge-dev-with-rel:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         with:
           branch: auto-rel-merge-pr-${{github.run_number}}
-          title: Merge branch dev with rel-4.1
-          body: This PR generated automatically to merge dev with rel-4.1. Please review the changed files before merging to prevent any errors that may occur.
+          title: Merge branch dev with rel-4.2
+          body: This PR generated automatically to merge dev with rel-4.2. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: ${{github.actor}}
           token: ${{ github.token }}

docs/en/Community-Articles/2020-12-10-How-to-Integrate-the-Telerik-Blazor-Component/POST.md

@@ -52,7 +52,10 @@ abp new TelerikComponents --ui blazor --database-provider ef
 
 ```html
     ...
-        <link rel="stylesheet" href="https:unpkg.com/@progress/kendo-theme-default@latest/dist/all.css" />
+        <link rel="stylesheet" href="_content/Telerik.UI.for.Blazor/css/kendo-theme-default/all.css" />
+    <!-- For Trial licenses use
+        <link rel="stylesheet" href="_content/Telerik.UI.for.Blazor.Trial/css/kendo-theme-default/all.css" />
+    -->        
         <script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js" defer></script>
     <!-- For Trial licenses use
         <script src="_content/Telerik.UI.for.Blazor.Trial/js/telerik-blazor.js" defer></script>

docs/en/Samples/Microservice-Demo.md

@@ -19,7 +19,7 @@ This sample aims to demonstrate a simple yet complete microservice solution;
 * Has a **console application** to show the simplest way of using a service by authenticating.
 * Uses [Redis](https://redis.io/) for **distributed caching**.
 * Uses [RabbitMQ](https://www.rabbitmq.com/) for service-to-service **messaging**.
-* Uses [Docker](https://www.docker.com/) & [Kubernates](https://kubernetes.io/) to **deploy** & run all services and applications.
+* Uses [Docker](https://www.docker.com/) & [Kubernetes](https://kubernetes.io/) to **deploy** & run all services and applications.
 * Uses [Elasticsearch](https://www.elastic.co/products/elasticsearch) & [Kibana](https://www.elastic.co/products/kibana) to store and visualize the logs (written using [Serilog](https://serilog.net/)).
 
 The diagram below shows the system:
@@ -1416,4 +1416,4 @@ An Audit Log record has a `CorrelationId` property that can be used to track a r
 
 ### Multi-Tenancy
 
-The solution has been configured to provide a [multi-tenant](../Multi-Tenancy.md) system, where each tenant can have their isolated users, roles, permissions and other data.
+The solution has been configured to provide a [multi-tenant](../Multi-Tenancy.md) system, where each tenant can have their isolated users, roles, permissions and other data.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpIdNameTagHelper.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Options;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
+{
+    [HtmlTargetElement(Attributes = "abp-id-name")]
+    public class AbpIdNameTagHelper : AbpTagHelper
+    {
+        /// <summary>
+        /// Make sure this TagHelper is executed first.
+        /// </summary>
+        public override int Order => -1000 - 1;
+
+        [HtmlAttributeName("abp-id-name")]
+        public ModelExpression IdNameFor { get; set; }
+
+        private readonly MvcViewOptions _mvcViewOptions;
+
+        public AbpIdNameTagHelper(IOptions<MvcViewOptions> mvcViewOptions)
+        {
+            _mvcViewOptions = mvcViewOptions.Value;
+        }
+
+        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (IdNameFor != null)
+            {
+                if (!context.AllAttributes.Any(x => x.Name.Equals("id", StringComparison.OrdinalIgnoreCase)))
+                {
+                    var id = TagBuilder.CreateSanitizedId(IdNameFor.Name, _mvcViewOptions.HtmlHelperOptions.IdAttributeDotReplacement);
+                    output.Attributes.Add("id", id);
+                }
+
+                if (!context.AllAttributes.Any(x => x.Name.Equals("name", StringComparison.OrdinalIgnoreCase)))
+                {
+                    output.Attributes.Add("name", IdNameFor.Name);
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/AbpBackgroundJobsHangfireModule.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Hangfire;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -13,6 +14,12 @@ namespace Volo.Abp.BackgroundJobs.Hangfire
     )]
     public class AbpBackgroundJobsHangfireModule : AbpModule
     {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddTransient(serviceProvider =>
+                serviceProvider.GetRequiredService<AbpDashboardOptionsProvider>().Get());
+        }
+
         public override void OnPreApplicationInitialization(ApplicationInitializationContext context)
         {
             var options = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundJobOptions>>().Value;
@@ -29,4 +36,4 @@ namespace Volo.Abp.BackgroundJobs.Hangfire
             return null;
         }
     }
-}
+}

framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/AbpDashboardOptionsProvider.cs

@@ -0,0 +1,26 @@
+using System.Linq;
+using Hangfire;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.BackgroundJobs.Hangfire
+{
+    public class AbpDashboardOptionsProvider : ITransientDependency
+    {
+        protected AbpBackgroundJobOptions AbpBackgroundJobOptions { get; }
+
+        public AbpDashboardOptionsProvider(IOptions<AbpBackgroundJobOptions> abpBackgroundJobOptions)
+        {
+            AbpBackgroundJobOptions = abpBackgroundJobOptions.Value;
+        }
+
+        public virtual DashboardOptions Get()
+        {
+            return new DashboardOptions
+            {
+                DisplayNameFunc = (dashboardContext, job) =>
+                    AbpBackgroundJobOptions.GetJob(job.Args.First().GetType()).JobName
+            };
+        }
+    }
+}

modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js

@@ -66,9 +66,7 @@
                 {
                     target: 3,
                     data: 'creationTime',
-                    render: function (date) {
-                        return date;
-                    },
+                    dataFormat: "datetime"
                 },
                 {
                     target: 4,