From a4731f76fb91b4126e4fd5251b6bcb167629a576 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Fri, 20 Mar 2020 15:56:23 +0300 Subject: [PATCH] refactor docs --- .../Documents/DocumentAdminAppService.cs | 18 ++++++-- .../Elastic/ElasticDocumentFullSearch.cs | 17 ++++--- .../Pages/Documents/Project/Index.cshtml | 44 ++++++++++++++----- 3 files changed, 54 insertions(+), 25 deletions(-) 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 4bc793f799..57ade1bb4b 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 @@ -23,8 +23,8 @@ namespace Volo.Docs.Admin.Documents public DocumentAdminAppService(IProjectRepository projectRepository, IDocumentRepository documentRepository, - IDocumentSourceFactory documentStoreFactory, - IDistributedCache documentUpdateCache, + IDocumentSourceFactory documentStoreFactory, + IDistributedCache documentUpdateCache, IDocumentFullSearch documentFullSearch) { _projectRepository = projectRepository; @@ -91,11 +91,21 @@ namespace Volo.Docs.Admin.Documents foreach (var doc in docs) { var project = projects.FirstOrDefault(x => x.Id == doc.ProjectId); - if (project != null && (doc.FileName == project.NavigationDocumentName || doc.FileName == project.ParametersDocumentName)) + if (project == null) { continue; } - + + if (doc.FileName == project.NavigationDocumentName) + { + continue; + } + + if (doc.FileName == project.ParametersDocumentName) + { + continue; + } + await _documentFullSearch.AddOrUpdateAsync(doc); } } diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/ElasticDocumentFullSearch.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/ElasticDocumentFullSearch.cs index 4574633318..51ecd817b5 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/ElasticDocumentFullSearch.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/ElasticDocumentFullSearch.cs @@ -23,7 +23,7 @@ namespace Volo.Docs.Documents.FullSearch.Elastic public async Task CreateIndexIfNeededAsync(CancellationToken cancellationToken = default) { - CheckEsEnabled(); + ValidateElasticSearchEnabled(); var client = _clientProvider.GetClient(); @@ -51,11 +51,11 @@ namespace Volo.Docs.Documents.FullSearch.Elastic public async Task AddOrUpdateAsync(Document document, CancellationToken cancellationToken = default) { - CheckEsEnabled(); + ValidateElasticSearchEnabled(); var client = _clientProvider.GetClient(); - var existsResponse = await client.DocumentExistsAsync(DocumentPath.Id(document.Id), + var existsResponse = await client.DocumentExistsAsync(DocumentPath.Id(document.Id), x => x.Index(_options.IndexName), cancellationToken); HandleError(existsResponse); @@ -73,12 +73,12 @@ namespace Volo.Docs.Documents.FullSearch.Elastic if (!existsResponse.Exists) { - HandleError(await client.IndexAsync(esDocument, + HandleError(await client.IndexAsync(esDocument, x => x.Id(document.Id).Index(_options.IndexName), cancellationToken)); } else { - HandleError(await client.UpdateAsync(DocumentPath.Id(document.Id), + HandleError(await client.UpdateAsync(DocumentPath.Id(document.Id), x => x.Doc(esDocument).Index(_options.IndexName), cancellationToken)); } @@ -86,7 +86,7 @@ namespace Volo.Docs.Documents.FullSearch.Elastic public async Task DeleteAsync(Guid id, CancellationToken cancellationToken = default) { - CheckEsEnabled(); + ValidateElasticSearchEnabled(); HandleError(await _clientProvider.GetClient() .DeleteAsync(DocumentPath.Id(id), x => x.Index(_options.IndexName), cancellationToken)); @@ -96,7 +96,7 @@ namespace Volo.Docs.Documents.FullSearch.Elastic string version, int? skipCount = null, int? maxResultCount = null, CancellationToken cancellationToken = default) { - CheckEsEnabled(); + ValidateElasticSearchEnabled(); var request = new SearchRequest { @@ -150,7 +150,6 @@ namespace Volo.Docs.Documents.FullSearch.Elastic } }; - //var json = _clientProvider.GetClient().RequestResponseSerializer.SerializeToString(request); var response = await _clientProvider.GetClient().SearchAsync(request, cancellationToken); HandleError(response); @@ -178,7 +177,7 @@ namespace Volo.Docs.Documents.FullSearch.Elastic } } - protected void CheckEsEnabled() + protected void ValidateElasticSearchEnabled() { if (!_options.Enable) { diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml index 68ba541938..67e5352e22 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml @@ -90,7 +90,10 @@ - + @@ -109,7 +112,10 @@ - + @@ -127,7 +133,10 @@ - + @@ -142,7 +151,12 @@ - + @@ -156,7 +170,12 @@ - + @@ -204,7 +223,9 @@
@if (!string.IsNullOrEmpty(Model.Document.EditLink)) { - @(L["Edit"]) (@L["LastEditTime"]: @Model.Document.LastUpdatedTime.ToShortDateString()) + + @(L["Edit"]) (@L["LastEditTime"]: @Model.Document.LastUpdatedTime.ToShortDateString()) + }
@@ -216,7 +237,11 @@ { + class="rounded-circle" + alt="Avatar" + height="21" + width="21" + title="@contributor.Username" /> } } @@ -290,9 +315,7 @@
-
-
@L["InThisDocument"]
@@ -302,10 +325,8 @@ @L["GoToTop"]
- - } else { @@ -318,7 +339,6 @@ } - }