CmsKit: Requested changes for GlobalResources

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourceUpdateDto.cs

@@ -1,6 +0,0 @@
-namespace Volo.CmsKit.Admin.GlobalResources;
-
-public class GlobalResourceUpdateDto
-{
-    public string Value { get; set; }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/GlobalResourcesUpdateDto.cs

@@ -0,0 +1,8 @@
+namespace Volo.CmsKit.Admin.GlobalResources;
+
+public class GlobalResourcesUpdateDto
+{
+    public string Style { get; set; }
+    
+    public string Script { get; set; }
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/GlobalResources/IGlobalResourceAdminAppService.cs

@@ -7,7 +7,5 @@ public interface IGlobalResourceAdminAppService : IApplicationService
 {
     Task<GlobalResourcesDto> GetAsync();
 
-    Task SetGlobalStyleAsync(GlobalResourceUpdateDto input);
-    
-    Task SetGlobalScriptAsync(GlobalResourceUpdateDto input);
+    Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input);
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs

@@ -65,6 +65,9 @@ public class CmsKitAdminPermissionDefinitionProvider : PermissionDefinitionProvi
             .RequireGlobalFeatures(typeof(MenuFeature));
         menuManagement.AddChild(CmsKitAdminPermissions.Menus.Delete, L("Permission:MenuManagement.Delete"))
             .RequireGlobalFeatures(typeof(MenuFeature));
+
+        cmsGroup.AddPermission(CmsKitAdminPermissions.GlobalResources.Default, L("Permission:GlobalResources"))
+            .RequireGlobalFeatures(typeof(GlobalResourcesFeature));
     }
 
     private static LocalizableString L(string name)

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs

@@ -63,6 +63,6 @@ public class CmsKitAdminPermissions
 
     public static class GlobalResources
     {
-        public const string Default = GroupName + ".Menus";
+        public const string Default = GroupName + ".GlobalResources";
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminAppService.cs

@@ -27,13 +27,9 @@ public class GlobalResourceAdminAppService : ApplicationService, IGlobalResource
         };
     }
 
-    public async Task SetGlobalStyleAsync(GlobalResourceUpdateDto input)
+    public async Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input)
     {
-        await GlobalResourceManager.SetGlobalStyleAsync(input.Value);
-    }
-
-    public async Task SetGlobalScriptAsync(GlobalResourceUpdateDto input)
-    {
-        await GlobalResourceManager.SetGlobalScriptAsync(input.Value);
+        await GlobalResourceManager.SetGlobalStyleAsync(input.Style);
+        await GlobalResourceManager.SetGlobalScriptAsync(input.Script);
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourceAdminClientProxy.Generated.cs

@@ -20,19 +20,11 @@ public partial class GlobalResourceAdminClientProxy : ClientProxyBase<IGlobalRes
         return await RequestAsync<GlobalResourcesDto>(nameof(GetAsync));
     }
 
-    public virtual async Task SetGlobalStyleAsync(GlobalResourceUpdateDto input)
+    public virtual async Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input)
     {
-        await RequestAsync(nameof(SetGlobalStyleAsync), new ClientProxyRequestTypeValue
+        await RequestAsync(nameof(SetGlobalResourcesAsync), new ClientProxyRequestTypeValue
         {
-            { typeof(GlobalResourceUpdateDto), input }
-        });
-    }
-
-    public virtual async Task SetGlobalScriptAsync(GlobalResourceUpdateDto input)
-    {
-        await RequestAsync(nameof(SetGlobalScriptAsync), new ClientProxyRequestTypeValue
-        {
-            { typeof(GlobalResourceUpdateDto), input }
+            { typeof(GlobalResourcesUpdateDto), input }
         });
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/GlobalResourcesAdminClientProxy.cs

@@ -1,7 +0,0 @@
-// This file is part of GlobalResourcesAdminClientProxy, you can customize it here
-// ReSharper disable once CheckNamespace
-namespace Volo.CmsKit.Admin.Menus.ClientProxies;
-
-public partial class GlobalResourcesAdminClientProxy
-{
-}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json

@@ -1140,55 +1140,18 @@
               "allowAnonymous": false,
               "implementFrom": "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService"
             },
-            "SetGlobalStyleAsyncByInput": {
-              "uniqueName": "SetGlobalStyleAsyncByInput",
-              "name": "SetGlobalStyleAsync",
+            "SetGlobalResourcesAsyncByInput": {
+              "uniqueName": "SetGlobalResourcesAsyncByInput",
+              "name": "SetGlobalResourcesAsync",
               "httpMethod": "POST",
-              "url": "api/cms-kit-admin/global-resources/style",
-              "supportedVersions": [],
-              "parametersOnMethod": [
-                {
-                  "name": "input",
-                  "typeAsString": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto, Volo.CmsKit.Admin.Application.Contracts",
-                  "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
-                  "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
-                  "isOptional": false,
-                  "defaultValue": null
-                }
-              ],
-              "parameters": [
-                {
-                  "nameOnMethod": "input",
-                  "name": "input",
-                  "jsonName": null,
-                  "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
-                  "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
-                  "isOptional": false,
-                  "defaultValue": null,
-                  "constraintTypes": null,
-                  "bindingSourceId": "Body",
-                  "descriptorName": ""
-                }
-              ],
-              "returnValue": {
-                "type": "System.Void",
-                "typeSimple": "System.Void"
-              },
-              "allowAnonymous": false,
-              "implementFrom": "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService"
-            },
-            "SetGlobalScriptAsyncByInput": {
-              "uniqueName": "SetGlobalScriptAsyncByInput",
-              "name": "SetGlobalScriptAsync",
-              "httpMethod": "POST",
-              "url": "api/cms-kit-admin/global-resources/script",
+              "url": "api/cms-kit-admin/global-resources",
               "supportedVersions": [],
               "parametersOnMethod": [
                 {
                   "name": "input",
-                  "typeAsString": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto, Volo.CmsKit.Admin.Application.Contracts",
-                  "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
-                  "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
+                  "typeAsString": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto, Volo.CmsKit.Admin.Application.Contracts",
+                  "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto",
+                  "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto",
                   "isOptional": false,
                   "defaultValue": null
                 }
@@ -1198,8 +1161,8 @@
                   "nameOnMethod": "input",
                   "name": "input",
                   "jsonName": null,
-                  "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
-                  "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourceUpdateDto",
+                  "type": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto",
+                  "typeSimple": "Volo.CmsKit.Admin.GlobalResources.GlobalResourcesUpdateDto",
                   "isOptional": false,
                   "defaultValue": null,
                   "constraintTypes": null,

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/GlobalResources/GlobalResourceAdminController.cs

@@ -29,16 +29,8 @@ public class GlobalResourceAdminController: CmsKitAdminController, IGlobalResour
     }
 
     [HttpPost]
-    [Route("style")]
-    public Task SetGlobalStyleAsync(GlobalResourceUpdateDto input)
+    public Task SetGlobalResourcesAsync(GlobalResourcesUpdateDto input)
     {
-        return _globalResourceAdminAppService.SetGlobalStyleAsync(input);
-    }
-
-    [HttpPost]
-    [Route("script")]
-    public Task SetGlobalScriptAsync(GlobalResourceUpdateDto input)
-    {
-        return _globalResourceAdminAppService.SetGlobalScriptAsync(input);
+        return _globalResourceAdminAppService.SetGlobalResourcesAsync(input);
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/GlobalResources/index.js

@@ -4,10 +4,13 @@ $(function (){
     var service = volo.cmsKit.admin.globalResources.globalResourceAdmin;
 
     $('#SaveResourcesButton').on('click','',function(){
-        service.setGlobalStyle({value:$('#StyleContent').val()}).then(function () {
-            service.setGlobalScript({value:$('#ScriptContent').val()}).then(function () {
-                abp.message.success(l("SavedSuccessfully"));
-            });
+        service.setGlobalResources(
+            {
+                style: $('#StyleContent').val(),
+                script: $('#ScriptContent').val()
+            }
+        ).then(function () {
+            abp.message.success(l("SavedSuccessfully"));
         });
     });
 });

modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js

@@ -236,18 +236,9 @@
       }, ajaxParams));
     };
 
-    volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalStyle = function(input, ajaxParams) {
+    volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalResources = function(input, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/cms-kit-admin/global-resources/style',
-        type: 'POST',
-        dataType: null,
-        data: JSON.stringify(input)
-      }, ajaxParams));
-    };
-
-    volo.cmsKit.admin.globalResources.globalResourceAdmin.setGlobalScript = function(input, ajaxParams) {
-      return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/cms-kit-admin/global-resources/script',
+        url: abp.appPath + 'api/cms-kit-admin/global-resources',
         type: 'POST',
         dataType: null,
         data: JSON.stringify(input)

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json

@@ -115,6 +115,7 @@
     "Permission:TagManagement.Create": "Create",
     "Permission:TagManagement.Delete": "Delete",
     "Permission:TagManagement.Update": "Update",
+    "Permission:GlobalResources": "Global Resources",
     "PickYourReaction": "Pick your reaction",
     "Rating": "Rating",
     "RatingUndoMessage": "Your rating will be undo.",

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

@@ -34,7 +34,7 @@ public class GlobalResourceManager : DomainService
 
     protected virtual async Task<GlobalResource> SetGlobalResourceAsync(string name, string value)
     {
-        var resource = await _globalResourceRepository.FindByName(name);
+        var resource = await _globalResourceRepository.FindByNameAsync(name);
 
         if (resource == null)
         {
@@ -50,7 +50,7 @@ public class GlobalResourceManager : DomainService
 
     protected virtual async Task<GlobalResource> GetOrCreateResourceAsync(string name)
     {
-        var resource = await _globalResourceRepository.FindByName(name);
+        var resource = await _globalResourceRepository.FindByNameAsync(name);
         
         if (resource == null)
         {

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

@@ -8,5 +8,5 @@ namespace Volo.CmsKit.GlobalResources;
 
 public interface IGlobalResourceRepository: IBasicRepository<GlobalResource, Guid>
 {
-    Task<GlobalResource> FindByName([NotNull] string name, CancellationToken cancellationToken = default);
+    Task<GlobalResource> FindByNameAsync([NotNull] string name, CancellationToken cancellationToken = default);
 }

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/GlobalResources/EfCoreGlobalResourceRepository.cs

@@ -15,7 +15,7 @@ public class EfCoreGlobalResourceRepository: EfCoreRepository<ICmsKitDbContext,
         
     }
 
-    public Task<GlobalResource> FindByName(string name,
+    public Task<GlobalResource> FindByNameAsync(string name,
         CancellationToken cancellationToken = default)
     {
         Check.NotNullOrEmpty(name, nameof(name));

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/GlobalResources/MongoGlobalResourceRepository.cs

@@ -16,7 +16,7 @@ public class MongoGlobalResourceRepository: MongoDbRepository<ICmsKitMongoDbCont
     {
     }
 
-    public Task<GlobalResource> FindByName(string name,
+    public Task<GlobalResource> FindByNameAsync(string name,
         CancellationToken cancellationToken = default)
     {
         Check.NotNullOrEmpty(name, nameof(name));

modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicGlobalResourcesController.cs

@@ -10,7 +10,7 @@ using Volo.CmsKit.Public.GlobalResources;
 
 namespace Volo.CmsKit.Public.Web.Controllers;
 
-[Route("global-resources")]
+[Route("cms-kit/global-resources")]
 public class CmsKitPublicGlobalResourcesController: AbpController
 {
     private readonly IGlobalResourcePublicAppService _globalResourcePublicAppService;

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

@@ -1 +1 @@
-<script src="/global-resources/script"></script>
+<script src="/cms-kit/global-resources/script"></script>

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

@@ -1 +1 @@
-<link rel="stylesheet" href="/global-resources/style"/>
+<link rel="stylesheet" href="/cms-kit/global-resources/style"/>