Merge branch 'dev' into dynamic-permissions

docs/en/UI/Angular/Theming.md

@@ -16,10 +16,11 @@ In order to accomplish these goals, ABP Framework;
 
 ### Current Themes
 
-Currently, two themes are **officially provided**:
+Currently, three themes are **officially provided**:
 
 * The [Basic Theme](Basic-Theme.md) is the minimalist theme with the plain Bootstrap style. It is **open source and free**.
 * The [Lepton Theme](https://commercial.abp.io/themes) is a **commercial** theme developed by the core ABP team and is a part of the [ABP Commercial](https://commercial.abp.io/) license.
+* The [LeptonX Theme](https://x.leptontheme.com/) is a theme that has both [commercial](https://docs.abp.io/en/commercial/latest/themes/lepton-x/commercial/angular) and [lite](../../Themes/LeptonXLite/Angular.md) choices.
 
 ## Overall
 

docs/en/UI/AspNetCore/Overall.md

@@ -32,10 +32,11 @@ ABP Framework provides a complete [Theming](Theming.md) system with the followin
 
 ### Current Themes
 
-Currently, two themes are **officially provided**:
+Currently, three themes are **officially provided**:
 
 * The [Basic Theme](Basic-Theme.md) is the minimalist theme with the plain Bootstrap style. It is **open source and free**.
 * The [Lepton Theme](https://commercial.abp.io/themes) is a **commercial** theme developed by the core ABP team and is a part of the [ABP Commercial](https://commercial.abp.io/) license.
+* The [LeptonX Theme](https://x.leptontheme.com/) is a theme that has both [commercial](https://docs.abp.io/en/commercial/latest/themes/lepton-x/commercial/mvc) and [lite](../../Themes/LeptonXLite/AspNetCore.md) choices.
 
 There are also some community-driven themes for the ABP Framework (you can search on the web).
 

docs/en/UI/AspNetCore/Page-Header.md

@@ -23,6 +23,8 @@ Page Title can be set as shown in the example below:
 ### Breadcrumb
 
 > **The [Basic Theme](Basic-Theme.md) currently doesn't implement the breadcrumbs.**
+> 
+> The [LeptonX Lite Theme](../../Themes/LeptonXLite/AspNetCore.md) supports breadcrumbs.
 
 Breadcrumb items can be added to the `PageLayout.Content.BreadCrumb`.
 
@@ -48,11 +50,13 @@ Any item that you add is inserted between Home and Current Page items. You can a
 ### The Selected Menu Item
 
 > **The [Basic Theme](Basic-Theme.md) currently doesn't implement the selected menu item since it is not applicable to the top menu which is the only option for the Basic Theme for now.**
+>
+> The [LeptonX Lite Theme](../../Themes/LeptonXLite/AspNetCore.md) supports selected menu item.
 
 You can set the Menu Item name related to this page:
 
-````csharp
+```csharp
 PageLayout.Content.MenuItemName = "BookStore.Books";
-````
+```
 
 Menu item name should match a unique menu item name defined using the [Navigation / Menu](Navigation-Menu.md) system. In this case, it is expected from the theme to make the menu item "active" in the main menu.

docs/en/UI/AspNetCore/Toolbars.md

@@ -8,6 +8,12 @@ There is only one **standard toolbar** named "Main" (defined as a constant: `Sta
 
 In the screenshot above, there are two items added to the main toolbar: Language switch component & user menu. You can add your own items here.
 
+Also, [LeptonX Lite Theme](../../Themes/LeptonXLite/AspNetCore.md) has 2 different toolbars for desktop and mobile views which defined as constants: `LeptonXLiteToolbars.Main`, `LeptonXLiteToolbars.MainMobile`.
+
+| LeptonXLiteToolbars.Main | LeptonXLiteToolbars.MainMobile |
+| :---: | :---: |
+| ![leptonx](../../images/leptonxlite-toolbar-main-example.png) | ![leptonx](../../images/leptonxlite-toolbar-mainmobile-example.png) |
+
 ## Example: Add a Notification Icon
 
 In this example, we will add a **notification (bell) icon** to the left of the language switch item. A item in the toolbar should be a **view component**. So, first, create a new view component in your project:

docs/en/UI/Blazor/Overall.md

@@ -75,10 +75,11 @@ ABP Framework provides a complete [Theming](Theming.md) system with the followin
 
 ### Current Themes
 
-Currently, two themes are **officially provided**:
+Currently, three themes are **officially provided**:
 
 * The [Basic Theme](Basic-Theme.md) is the minimalist theme with the plain Bootstrap style. It is **open source and free**.
 * The [Lepton Theme](https://commercial.abp.io/themes) is a **commercial** theme developed by the core ABP team and is a part of the [ABP Commercial](https://commercial.abp.io/) license.
+* The [LeptonX Theme](https://x.leptontheme.com/) is a theme that has both [commercial](https://docs.abp.io/en/commercial/latest/themes/lepton-x/commercial/blazor) and [lite](../../Themes/LeptonXLite/Blazor.md) choices.
 
 ### Base Libraries
 

docs/en/UI/Blazor/Page-Header.md

@@ -16,6 +16,8 @@ Once you add the `PageHeader` component to your page, you can control the relate
 ## Breadcrumb
 
 > **The [Basic Theme](Basic-Theme.md) currently doesn't implement the breadcrumbs.**
+> 
+> The [LeptonX Lite Theme](../../Themes/LeptonXLite/Blazor.md) supports breadcrumbs.
 
 Breadcrumbs can be added using the `BreadcrumbItems` property.
 

docs/en/UI/Blazor/Page-Layout.md

@@ -42,6 +42,10 @@ Menu item name can be set on runtime too.
 }
 ```
 
+
+![leptonx selected menu item](../../images/leptonx-selected-menu-item-example.gif)
+
+
 > Be aware, The [Basic Theme](../Blazor/Basic-Theme.md) currently doesn't support the selected menu item since it is not applicable to the top menu. 
 
 ## BreadCrumbs

docs/en/UI/Blazor/Toolbars.md

@@ -8,6 +8,12 @@ There is only one **standard toolbar** named "Main" (defined as a constant: `Sta
 
 In the screenshot above, there are two items added to the main toolbar: Language switch component & user menu. You can add your own items here.
 
+Also, [LeptonX Lite Theme](../../Themes/LeptonXLite/Blazor.md) has 2 different toolbars for desktop and mobile views which defined as constants: `LeptonXLiteToolbars.Main`, `LeptonXLiteToolbars.MainMobile`.
+
+| LeptonXLiteToolbars.Main | LeptonXLiteToolbars.MainMobile |
+| :---: | :---: |
+| ![leptonx](../../images/leptonxlite-toolbar-main-example.png) | ![leptonx](../../images/leptonxlite-toolbar-mainmobile-example.png) |
+
 ## Example: Add a Notification Icon
 
 In this example, we will add a **notification (bell) icon** to the left of the language switch item. A item in the toolbar should be a **Razor Component**. So, first, create a new razor component in your project (the location of the component doesn't matter):

framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs

@@ -15,18 +15,18 @@ namespace Volo.Abp.Caching.StackExchangeRedis;
 [DisableConventionalRegistration]
 public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems
 {
-    protected static readonly string SetScript;
     protected static readonly string AbsoluteExpirationKey;
     protected static readonly string SlidingExpirationKey;
     protected static readonly string DataKey;
     protected static readonly long NotPresent;
 
-    private static readonly FieldInfo RedisDatabaseField;
+    private readonly static FieldInfo SetScriptField;
-    private static readonly MethodInfo ConnectMethod;
+    private readonly static FieldInfo RedisDatabaseField;
-    private static readonly MethodInfo ConnectAsyncMethod;
+    private readonly static MethodInfo ConnectMethod;
-    private static readonly MethodInfo MapMetadataMethod;
+    private readonly static MethodInfo ConnectAsyncMethod;
-    private static readonly MethodInfo GetAbsoluteExpirationMethod;
+    private readonly static MethodInfo MapMetadataMethod;
-    private static readonly MethodInfo GetExpirationInSecondsMethod;
+    private readonly static MethodInfo GetAbsoluteExpirationMethod;
+    private readonly static MethodInfo GetExpirationInSecondsMethod;
 
     protected IDatabase RedisDatabase => GetRedisDatabase();
     private IDatabase _redisDatabase;
@@ -36,9 +36,11 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems
     static AbpRedisCache()
     {
         var type = typeof(RedisCache);
-
+        
         RedisDatabaseField = type.GetField("_cache", BindingFlags.Instance | BindingFlags.NonPublic);
 
+        SetScriptField = type.GetField("_setScript", BindingFlags.Instance | BindingFlags.NonPublic);
+
         ConnectMethod = type.GetMethod("Connect", BindingFlags.Instance | BindingFlags.NonPublic);
 
         ConnectAsyncMethod = type.GetMethod("ConnectAsync", BindingFlags.Instance | BindingFlags.NonPublic);
@@ -51,9 +53,6 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems
         GetExpirationInSecondsMethod =
             type.GetMethod("GetExpirationInSeconds", BindingFlags.Static | BindingFlags.NonPublic);
 
-        SetScript = type.GetField("SetScript", BindingFlags.Static | BindingFlags.NonPublic)?.GetValue(null)
-            .ToString();
-
         AbsoluteExpirationKey = type.GetField("AbsoluteExpirationKey", BindingFlags.Static | BindingFlags.NonPublic)
             ?.GetValue(null).ToString();
 
@@ -83,14 +82,14 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems
         ConnectMethod.Invoke(this, Array.Empty<object>());
     }
 
-    protected virtual Task ConnectAsync(CancellationToken token = default)
+    protected virtual async Task ConnectAsync(CancellationToken token = default)
     {
         if (GetRedisDatabase() != null)
         {
-            return Task.CompletedTask;
+            return;
         }
 
-        return (Task)ConnectAsyncMethod.Invoke(this, new object[] { token });
+        await (Task)ConnectAsyncMethod.Invoke(this, new object[] { token });
     }
 
     public byte[][] GetMany(
@@ -283,7 +282,7 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems
 
         for (var i = 0; i < itemArray.Length; i++)
         {
-            tasks[i] = RedisDatabase.ScriptEvaluateAsync(SetScript, new RedisKey[] { Instance + itemArray[i].Key },
+            tasks[i] = RedisDatabase.ScriptEvaluateAsync(GetSetScript(), new RedisKey[] { Instance + itemArray[i].Key },
                 new RedisValue[]
                 {
                         absoluteExpiration?.Ticks ?? NotPresent,
@@ -333,4 +332,9 @@ public class AbpRedisCache : RedisCache, ICacheSupportsMultipleItems
 
         return _redisDatabase;
     }
+
+    private string GetSetScript()
+    {
+        return SetScriptField?.GetValue(this).ToString();
+    }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

@@ -285,14 +285,12 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             {"Domain.Shared", "MyCompanyName.MyProjectName.Domain.Shared.csproj"},
             {"Application", "MyCompanyName.MyProjectName.Application.csproj"},
             {"Application.Contracts", "MyCompanyName.MyProjectName.Application.Contracts.csproj"},
-            {"Blazor.WebAssembly", "MyCompanyName.MyProjectName.Blazor.csproj"},
-            {"Blazor.Server", "MyCompanyName.MyProjectName.Blazor.Server.csproj"},
             {"HttpApi", "MyCompanyName.MyProjectName.HttpApi.csproj"},
-            {"HttpApi.Client", "MyCompanyName.MyProjectName.HttpApi.Client.csproj"},
+            {"HttpApi.Client", "MyCompanyName.MyProjectName.HttpApi.Client.csproj"}
-            {"Web.Host", "MyCompanyName.MyProjectName.Web.Host.csproj"},
-            {"Web", "MyCompanyName.MyProjectName.Web.csproj"},
         };
-
+        
+        AddUiProjectToProjects(projects, context);
+        
         foreach (var project in projects)
         {
             AddLeptonThemeManagementReference(context, project);
@@ -314,6 +312,28 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             AddLeptonThemeManagementReference(context, microserviceServiceProject);
         }
     }
+
+    private void AddUiProjectToProjects(Dictionary<string, string> projects, ProjectBuildContext context)
+    {
+        if (projects.IsNullOrEmpty())
+        {
+            return;
+        }
+        
+        switch (context.BuildArgs.UiFramework)
+        {
+            case UiFramework.Mvc:
+                projects["Web.Host"] = "MyCompanyName.MyProjectName.Web.Host.csproj";
+                projects["Web"] = "MyCompanyName.MyProjectName.Web.csproj";
+                break;
+            case UiFramework.Blazor:
+                projects["Blazor.WebAssembly"] = "MyCompanyName.MyProjectName.Blazor.csproj";
+                break;
+            case UiFramework.BlazorServer:
+                projects["Blazor.Server"] = "MyCompanyName.MyProjectName.Blazor.csproj";
+                break;
+        }
+    }
     
     private void AddLeptonThemeManagementReference(ProjectBuildContext context, KeyValuePair<string, string> projectInfo) 
     {

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalResources/GlobalResourceConsts.cs

@@ -1,6 +1,6 @@
 namespace Volo.CmsKit.GlobalResources;
 
-public class GlobalResourceConsts
+public static class GlobalResourceConsts
 {
     public const string GlobalStyleName = "GlobalStyle";
     

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/GlobalResources/GlobalResourceDto.cs

@@ -1,8 +1,12 @@
-namespace Volo.CmsKit.Public.GlobalResources;
+using System;
+using Volo.Abp.Application.Dtos;
 
-public class GlobalResourceDto
+namespace Volo.CmsKit.Public.GlobalResources;
+
+[Serializable]
+public class GlobalResourceDto : AuditedEntityDto
 {
     public string Name { get; set; }
-    
+
     public string Value { get; set; }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/GlobalResources/Handlers/GlobalResourceEventHandler.cs

@@ -5,11 +5,10 @@ using Volo.Abp.Domain.Entities.Events;
 using Volo.Abp.EventBus;
 using Volo.Abp.ObjectMapping;
 using Volo.CmsKit.GlobalResources;
-using Volo.CmsKit.Public.GlobalResources;
 
 namespace Volo.CmsKit.Public.GlobalResources.Handlers;
 
-public class GlobalResourceEventHandler: 
+public class GlobalResourceEventHandler :
     ILocalEventHandler<EntityUpdatedEventData<GlobalResource>>,
     ITransientDependency
 {
@@ -23,11 +22,11 @@ public class GlobalResourceEventHandler:
         ObjectMapper = objectMapper;
         _resourceCache = resourceCache;
     }
-    
+
     public async Task HandleEventAsync(EntityUpdatedEventData<GlobalResource> eventData)
     {
         await _resourceCache.SetAsync(
-            eventData.Entity.Name, 
+            eventData.Entity.Name,
             ObjectMapper.Map<GlobalResource, GlobalResourceDto>(eventData.Entity));
     }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml

@@ -1 +1,3 @@
-<link rel="stylesheet" href="/cms-kit/global-resources/style"/>
+@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Style.GlobalStyleModel
+
+<link rel="stylesheet" href="@("/cms-kit/global-resources/style?v=" + Model.LastModificationTimeTimestamp)"/>

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleModel.cs

@@ -0,0 +1,6 @@
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Style;
+
+public class GlobalStyleModel
+{
+    public long LastModificationTimeTimestamp { get; set; }
+}

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/GlobalResources/Style/GlobalStyleViewComponent.cs

@@ -1,13 +1,33 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.CmsKit.Public.GlobalResources;
 
 namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Style;
 
 public class GlobalStyleViewComponent : AbpViewComponent
 {
+    protected IGlobalResourcePublicAppService GlobalResourcePublicAppService { get; }
+
+    public GlobalStyleViewComponent(IGlobalResourcePublicAppService globalResourcePublicAppService)
+    {
+        GlobalResourcePublicAppService = globalResourcePublicAppService;
+    }
+
+    [BindProperty(SupportsGet = true)]
+    public DateTime? LastModificationTime { get; set; }
+
     public async Task<IViewComponentResult> InvokeAsync()
     {
-        return View("~/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml");
+        var lastModificationTime = (await GlobalResourcePublicAppService.GetGlobalStyleAsync())?.LastModificationTime;
+        var lastModificationTimeTimestamp = (long)(lastModificationTime.HasValue ? lastModificationTime.Value.Subtract(DateTime.UnixEpoch).TotalSeconds : 0);
+
+        return View("~/Pages/CmsKit/Shared/Components/GlobalResources/Style/Default.cshtml",
+            new GlobalStyleModel()
+            {
+                LastModificationTimeTimestamp = lastModificationTimeTimestamp
+            });
     }
+
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/AbpOpenIddictScopeCache.cs

@@ -9,11 +9,11 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.OpenIddict.Scopes;
 
-public class AbpOpenIddictScopeCacheAbpOpenIddictAuthorizationCache : AbpOpenIddictCacheBase<OpenIddictScope, OpenIddictScopeModel, IOpenIddictScopeStore<OpenIddictScopeModel>>,
+public class AbpOpenIddictScopeCache : AbpOpenIddictCacheBase<OpenIddictScope, OpenIddictScopeModel, IOpenIddictScopeStore<OpenIddictScopeModel>>,
     IOpenIddictScopeCache<OpenIddictScopeModel>,
     ITransientDependency
 {
-    public AbpOpenIddictScopeCacheAbpOpenIddictAuthorizationCache(
+    public AbpOpenIddictScopeCache(
         IDistributedCache<OpenIddictScopeModel> cache,
         IDistributedCache<OpenIddictScopeModel[]> arrayCache,
         IOpenIddictScopeStore<OpenIddictScopeModel> store)