From 312490c728c354719783a8ccc4827f476d6fa5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SAL=C4=B0H=20=C3=96ZKARA?= Date: Fri, 27 Dec 2024 16:11:25 +0300 Subject: [PATCH] Fix permission problem --- modules/docs/.abpstudio/state.json | 16 +++++++++++++ modules/docs/Default.abprun.json | 11 +++++++++ modules/docs/Volo.Docs.abpsln | 6 +++++ .../Documents/IDocumentAdminAppService.cs | 3 +++ .../Documents/DocumentAdminAppService.cs | 7 ++++++ .../DocumentsAdminClientProxy.Generated.cs | 6 +++++ .../Admin}/docs-admin-generate-proxy.json | 23 +++++++++++++++++++ .../Volo.Docs.Admin.HttpApi.Client.abppkg | 14 ++++++++++- .../Docs/Admin/DocumentsAdminController.cs | 8 +++++++ .../Docs/Admin/Documents/Index.cshtml.cs | 11 +++++---- .../Volo.Docs.Admin.Web.abppkg | 13 ++++++++++- .../client-proxies/docs-admin-proxy.js | 7 ++++++ 12 files changed, 118 insertions(+), 7 deletions(-) create mode 100644 modules/docs/.abpstudio/state.json create mode 100644 modules/docs/Default.abprun.json rename modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/{ => Volo/Docs/Admin}/docs-admin-generate-proxy.json (97%) diff --git a/modules/docs/.abpstudio/state.json b/modules/docs/.abpstudio/state.json new file mode 100644 index 0000000000..fefde3c294 --- /dev/null +++ b/modules/docs/.abpstudio/state.json @@ -0,0 +1,16 @@ +{ + "selectedKubernetesProfile": null, + "solutionRunner": { + "selectedProfile": "Default", + "targetFrameworks": [], + "applicationsStartingWithoutBuild": [], + "applicationBatchStartStates": [ + { + "profile": "Default", + "applicationOrFolder": "VoloDocs.Web", + "value": 0 + } + ], + "folderBatchStartStates": [] + } +} \ No newline at end of file diff --git a/modules/docs/Default.abprun.json b/modules/docs/Default.abprun.json new file mode 100644 index 0000000000..f9b4dd4507 --- /dev/null +++ b/modules/docs/Default.abprun.json @@ -0,0 +1,11 @@ +{ + "metadata": {}, + "applications": { + "VoloDocs.Web": { + "type": "dotnet-project", + "path": "app/VoloDocs.Web/VoloDocs.Web.csproj", + "launchUrl": "https://localhost:5001", + "kubernetesService": null + } + } +} \ No newline at end of file diff --git a/modules/docs/Volo.Docs.abpsln b/modules/docs/Volo.Docs.abpsln index 688fe0befa..44288f9b36 100644 --- a/modules/docs/Volo.Docs.abpsln +++ b/modules/docs/Volo.Docs.abpsln @@ -3,5 +3,11 @@ "Volo.Docs": { "path": "Volo.Docs.abpmdl" } + }, + "id": "c1d848e0-0b53-461b-824a-8533ba1fd82b", + "runProfiles": { + "Default": { + "path": "Default.abprun.json" + } } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/IDocumentAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/IDocumentAdminAppService.cs index 12bdbc87be..8931cfa5fd 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/IDocumentAdminAppService.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/IDocumentAdminAppService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Docs.Admin.Projects; namespace Volo.Docs.Admin.Documents { @@ -21,5 +22,7 @@ namespace Volo.Docs.Admin.Documents Task ReindexAsync(Guid documentId); Task> GetFilterItemsAsync(); + + Task> GetProjectsAsync(); } } diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs index 8e70be19e4..a6359c2c9b 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs @@ -8,6 +8,7 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Caching; +using Volo.Docs.Admin.Projects; using Volo.Docs.Caching; using Volo.Docs.Documents; using Volo.Docs.Documents.FullSearch.Elastic; @@ -220,6 +221,12 @@ namespace Volo.Docs.Admin.Documents return ObjectMapper.Map, List>(documents); } + public virtual async Task> GetProjectsAsync() + { + var projects = await _projectRepository.GetListWithoutDetailsAsync(); + return ObjectMapper.Map, List>(projects); + } + private async Task UpdateDocumentUpdateInfoCache(Document document) { diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/Volo/Docs/Admin/DocumentsAdminClientProxy.Generated.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/Volo/Docs/Admin/DocumentsAdminClientProxy.Generated.cs index 8a6e2b7173..b113d74451 100644 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/Volo/Docs/Admin/DocumentsAdminClientProxy.Generated.cs +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/Volo/Docs/Admin/DocumentsAdminClientProxy.Generated.cs @@ -9,6 +9,7 @@ using Volo.Abp.Http.Client; using Volo.Abp.Http.Client.ClientProxying; using Volo.Abp.Http.Modeling; using Volo.Docs.Admin.Documents; +using Volo.Docs.Admin.Projects; // ReSharper disable once CheckNamespace namespace Volo.Docs.Admin; @@ -69,4 +70,9 @@ public partial class DocumentsAdminClientProxy : ClientProxyBase>(nameof(GetFilterItemsAsync)); } + + public virtual async Task> GetProjectsAsync() + { + return await RequestAsync>(nameof(GetProjectsAsync)); + } } diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/docs-admin-generate-proxy.json b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/Volo/Docs/Admin/docs-admin-generate-proxy.json similarity index 97% rename from modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/docs-admin-generate-proxy.json rename to modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/Volo/Docs/Admin/docs-admin-generate-proxy.json index 7875b68b43..e433e06ef9 100644 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/docs-admin-generate-proxy.json +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/Volo/Docs/Admin/docs-admin-generate-proxy.json @@ -125,6 +125,14 @@ "type": "System.Collections.Generic.List", "typeSimple": "[Volo.Docs.Admin.Documents.DocumentInfoDto]" } + }, + { + "name": "GetProjectsAsync", + "parametersOnMethod": [], + "returnValue": { + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.Docs.Admin.Projects.ProjectWithoutDetailsDto]" + } } ] } @@ -558,6 +566,21 @@ }, "allowAnonymous": null, "implementFrom": "Volo.Docs.Admin.Documents.IDocumentAdminAppService" + }, + "GetProjectsAsync": { + "uniqueName": "GetProjectsAsync", + "name": "GetProjectsAsync", + "httpMethod": "GET", + "url": "api/docs/admin/documents/GetProjects", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.Collections.Generic.List", + "typeSimple": "[Volo.Docs.Admin.Projects.ProjectWithoutDetailsDto]" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Docs.Admin.Documents.IDocumentAdminAppService" } } }, diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg index 7deef5e383..c78fc5b9ee 100644 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg @@ -1,3 +1,15 @@ { - "role": "lib.http-api-client" + "role": "lib.http-api-client", + "proxies": { + "csharp": { + "VoloDocs.Web-docs-admin": { + "applicationName": "VoloDocs.Web", + "module": "docs-admin", + "url": "https://localhost:5001", + "folder": "ClientProxies\\Volo\\Docs\\Admin", + "serviceType": "application", + "withoutContracts": true + } + } + } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs index eb78095bf2..ddf303ffaf 100644 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs @@ -7,6 +7,7 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc; using Volo.Docs.Admin.Documents; +using Volo.Docs.Admin.Projects; namespace Volo.Docs.Admin { @@ -71,5 +72,12 @@ namespace Volo.Docs.Admin { return await _documentAdminAppService.GetFilterItemsAsync(); } + + [HttpGet] + [Route("GetProjects")] + public virtual Task> GetProjectsAsync() + { + return _documentAdminAppService.GetProjectsAsync(); + } } } diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs index 194ad6780f..53d78baf39 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs @@ -2,23 +2,24 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Volo.Docs.Admin.Documents; using Volo.Docs.Admin.Projects; namespace Volo.Docs.Admin.Pages.Docs.Admin.Documents; -[Authorize(DocsAdminPermissions.Projects.Default)] +[Authorize(DocsAdminPermissions.Documents.Default)] public class IndexModel : DocsAdminPageModel { - private readonly IProjectAdminAppService _projectAdminAppService; + private readonly IDocumentAdminAppService _documentAdminAppService; public List Projects { get; set; } - public IndexModel(IProjectAdminAppService projectAdminAppService) + public IndexModel(IDocumentAdminAppService documentAdminAppService) { - _projectAdminAppService = projectAdminAppService; + _documentAdminAppService = documentAdminAppService; } public virtual async Task OnGet() { - Projects = await _projectAdminAppService.GetListWithoutDetailsAsync(); + Projects = await _documentAdminAppService.GetProjectsAsync(); return Page(); } } diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg index 930c4018b3..4e12d28da1 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg +++ b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg @@ -1,3 +1,14 @@ { - "role": "lib.mvc" + "role": "lib.mvc", + "proxies": { + "Javascript": { + "VoloDocs.Web-docs-admin": { + "applicationName": "VoloDocs.Web", + "module": "docs-admin", + "url": "https://localhost:5001", + "output": "wwwroot/client-proxies", + "serviceType": "application" + } + } + } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/wwwroot/client-proxies/docs-admin-proxy.js b/modules/docs/src/Volo.Docs.Admin.Web/wwwroot/client-proxies/docs-admin-proxy.js index 303ca5fdb0..3a1c6930cf 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/wwwroot/client-proxies/docs-admin-proxy.js +++ b/modules/docs/src/Volo.Docs.Admin.Web/wwwroot/client-proxies/docs-admin-proxy.js @@ -68,6 +68,13 @@ }, ajaxParams)); }; + volo.docs.admin.documentsAdmin.getProjects = function(ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/docs/admin/documents/GetProjects', + type: 'GET' + }, ajaxParams)); + }; + })(); // controller volo.docs.admin.projectsAdmin