From 8cc3ece256a775bee78c86979a46b20cc66e160a Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Fri, 19 Aug 2022 15:31:32 +0300
Subject: [PATCH 01/10] Added project column

---
 .../Volo/Docs/Admin/Documents/DocumentDto.cs  |  2 +
 .../DocsAdminApplicationAutoMapperProfile.cs  |  3 +-
 .../Pages/Docs/Admin/Documents/Index.cshtml   |  1 +
 .../Pages/Docs/Admin/Documents/index.js       |  4 ++
 .../Docs/Documents/DocumentWithoutContent.cs  |  2 +
 .../Documents/EFCoreDocumentRepository.cs     | 45 +++++++++---------
 .../Docs/Documents/MongoDocumentRepository.cs | 47 ++++++++++---------
 7 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentDto.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentDto.cs
index c415efa860..b574870fd8 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentDto.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentDto.cs
@@ -8,6 +8,8 @@ namespace Volo.Docs.Admin.Documents
     public class DocumentDto : EntityDto<Guid>
     {
         public virtual Guid ProjectId { get; set; }
+        
+        public virtual string ProjectName { get; set; }
 
         public virtual string Name { get; set; }
 
diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs
index 86e6d46e0c..eaeb59cabb 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using Volo.Abp.AutoMapper;
 using Volo.Docs.Admin.Documents;
 using Volo.Docs.Admin.Projects;
 using Volo.Docs.Documents;
@@ -11,7 +12,7 @@ namespace Volo.Docs.Admin
         public DocsAdminApplicationAutoMapperProfile()
         {
             CreateMap<Project, ProjectDto>();
-            CreateMap<Document, DocumentDto>();
+            CreateMap<Document, DocumentDto>().Ignore(x => x.ProjectName);
             CreateMap<DocumentWithoutContent, DocumentDto>();
         }
     }
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
index 738327def9..776d504395 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
@@ -183,6 +183,7 @@
                 <thead>
                     <tr>
                         <th>@L["Actions"]</th>
+                        <th>@L["ProjectName"]</th>
                         <th>@L["Name"]</th>
                         <th>@L["Version"]</th>
                         <th>@L["LanguageCode"]</th>
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index 5f4dc9b8d7..d85676e3f3 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -79,6 +79,10 @@ $(function () {
                         ],
                     },
                 },
+                {
+                    target: 0,
+                    data: 'projectName',
+                },
                 {
                     target: 1,
                     data: 'name',
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentWithoutContent.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentWithoutContent.cs
index cde44614ae..4ef9c0e232 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentWithoutContent.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentWithoutContent.cs
@@ -7,6 +7,8 @@ namespace Volo.Docs.Documents
         public Guid Id { get; set; }
         
         public virtual Guid ProjectId { get; set; }
+        
+        public virtual string ProjectName { get; set; }
 
         public virtual string Name { get; set; }
 
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
index 7656975f16..1de28f537c 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
@@ -67,23 +67,21 @@ namespace Volo.Docs.Documents
             int skipCount = 0,
             CancellationToken cancellationToken = default)
         {
-            var query = ApplyFilterForGetAll(
+            var query =await ApplyFilterForGetAll(
                 await GetDbSetAsync(),
                 projectId: projectId,
                 name: name,
                 version: version,
                 languageCode: languageCode,
-                format: format,
                 fileName: fileName,
+                format: format,
                 creationTimeMin: creationTimeMin,
                 creationTimeMax: creationTimeMax,
                 lastUpdatedTimeMin: lastUpdatedTimeMin,
                 lastUpdatedTimeMax: lastUpdatedTimeMax,
                 lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
                 lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
-                lastCachedTimeMin: lastCachedTimeMin,
-                lastCachedTimeMax: lastCachedTimeMax
-            );
+                lastCachedTimeMin: lastCachedTimeMin, lastCachedTimeMax: lastCachedTimeMax);
 
             query = query.OrderBy(string.IsNullOrWhiteSpace(sorting) ? nameof(Document.Name) : sorting);
             return await query.PageBy(skipCount, maxResultCount).ToListAsync(GetCancellationToken(cancellationToken));
@@ -109,23 +107,21 @@ namespace Volo.Docs.Documents
             int skipCount = 0,
             CancellationToken cancellationToken = default)
         {
-            var query = ApplyFilterForGetAll(
+            var query = await ApplyFilterForGetAll(
                 await GetDbSetAsync(),
                 projectId: projectId,
                 name: name,
                 version: version,
                 languageCode: languageCode,
-                format: format,
                 fileName: fileName,
+                format: format,
                 creationTimeMin: creationTimeMin,
                 creationTimeMax: creationTimeMax,
                 lastUpdatedTimeMin: lastUpdatedTimeMin,
                 lastUpdatedTimeMax: lastUpdatedTimeMax,
                 lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
                 lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
-                lastCachedTimeMin: lastCachedTimeMin,
-                lastCachedTimeMax: lastCachedTimeMax
-            );
+                lastCachedTimeMin: lastCachedTimeMin, lastCachedTimeMax: lastCachedTimeMax);
 
             return await query.LongCountAsync(GetCancellationToken(cancellationToken));
         }
@@ -153,7 +149,7 @@ namespace Volo.Docs.Documents
             return await (await GetDbSetAsync()).Where(x => x.Id == id).SingleAsync(cancellationToken: GetCancellationToken(cancellationToken));
         }
 
-        protected virtual IQueryable<DocumentWithoutContent> ApplyFilterForGetAll(
+        protected virtual async Task<IQueryable<DocumentWithoutContent>> ApplyFilterForGetAll(
             IQueryable<Document> query,
             Guid? projectId,
             string name,
@@ -200,19 +196,24 @@ namespace Volo.Docs.Documents
                     d => d.LastCachedTime.Date >= lastCachedTimeMin.Value.Date)
                 .WhereIf(lastCachedTimeMax.HasValue,
                     d => d.LastCachedTime.Date <= lastCachedTimeMax.Value.Date)
+                .Join( (await GetDbContextAsync()).Projects,
+                    d => d.ProjectId,
+                    p => p.Id,
+                    (d, p) => new { d, p })
                 .Select(x => new DocumentWithoutContent
                 {
-                    Id = x.Id,
-                    ProjectId = x.ProjectId,
-                    Name = x.Name,
-                    Version = x.Version,
-                    LanguageCode = x.LanguageCode,
-                    FileName = x.FileName,
-                    Format = x.Format,
-                    CreationTime = x.CreationTime,
-                    LastUpdatedTime = x.LastUpdatedTime,
-                    LastSignificantUpdateTime = x.LastSignificantUpdateTime,
-                    LastCachedTime = x.LastCachedTime
+                    Id = x.d.Id,
+                    ProjectId = x.d.ProjectId,
+                    ProjectName = x.p.Name,
+                    Name = x.d.Name,
+                    Version = x.d.Version,
+                    LanguageCode = x.d.LanguageCode,
+                    FileName = x.d.FileName,
+                    Format = x.d.Format,
+                    CreationTime = x.d.CreationTime,
+                    LastUpdatedTime = x.d.LastUpdatedTime,
+                    LastSignificantUpdateTime = x.d.LastSignificantUpdateTime,
+                    LastCachedTime = x.d.LastCachedTime
                 });
         }
     }
diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
index 0086624d43..88c7514ae4 100644
--- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
@@ -88,22 +88,21 @@ namespace Volo.Docs.Documents
         {
 
             return await
-                ApplyFilterForGetAll(
+                (await ApplyFilterForGetAll(
                         await GetMongoQueryableAsync(cancellationToken),
                         projectId: projectId,
                         name: name,
                         version: version,
                         languageCode: languageCode,
-                        format: format,
                         fileName: fileName,
+                        format: format,
                         creationTimeMin: creationTimeMin,
                         creationTimeMax: creationTimeMax,
                         lastUpdatedTimeMin: lastUpdatedTimeMin,
                         lastUpdatedTimeMax: lastUpdatedTimeMax,
                         lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
                         lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
-                        lastCachedTimeMin: lastCachedTimeMin,
-                        lastCachedTimeMax: lastCachedTimeMax)
+                        lastCachedTimeMin: lastCachedTimeMin, lastCachedTimeMax: lastCachedTimeMax))
                     .OrderBy(string.IsNullOrWhiteSpace(sorting) ? "name asc" : sorting).As<IMongoQueryable<DocumentWithoutContent>>()
                     .PageBy<DocumentWithoutContent, IMongoQueryable<DocumentWithoutContent>>(skipCount, maxResultCount)
                     .ToListAsync(GetCancellationToken(cancellationToken));
@@ -132,22 +131,21 @@ namespace Volo.Docs.Documents
 
 
             return await
-                ApplyFilterForGetAll(
+                (await ApplyFilterForGetAll(
                         await GetMongoQueryableAsync(cancellationToken),
                         projectId: projectId,
                         name: name,
                         version: version,
                         languageCode: languageCode,
-                        format: format,
                         fileName: fileName,
+                        format: format,
                         creationTimeMin: creationTimeMin,
                         creationTimeMax: creationTimeMax,
                         lastUpdatedTimeMin: lastUpdatedTimeMin,
                         lastUpdatedTimeMax: lastUpdatedTimeMax,
                         lastSignificantUpdateTimeMin: lastSignificantUpdateTimeMin,
                         lastSignificantUpdateTimeMax: lastSignificantUpdateTimeMax,
-                        lastCachedTimeMin: lastCachedTimeMin,
-                        lastCachedTimeMax: lastCachedTimeMax)
+                        lastCachedTimeMin: lastCachedTimeMin, lastCachedTimeMax: lastCachedTimeMax))
                     .OrderBy(string.IsNullOrWhiteSpace(sorting) ? "name asc" : sorting).As<IMongoQueryable<Document>>()
                     .PageBy<Document, IMongoQueryable<Document>>(skipCount, maxResultCount)
                     .LongCountAsync(GetCancellationToken(cancellationToken));
@@ -158,7 +156,7 @@ namespace Volo.Docs.Documents
             return await (await GetMongoQueryableAsync(cancellationToken)).Where(x => x.Id == id).SingleAsync(GetCancellationToken(cancellationToken));
         }
 
-        protected virtual IMongoQueryable<DocumentWithoutContent> ApplyFilterForGetAll(
+        protected virtual async Task<IMongoQueryable<DocumentWithoutContent>> ApplyFilterForGetAll(
             IMongoQueryable<Document> query,
             Guid? projectId,
             string name,
@@ -240,20 +238,25 @@ namespace Volo.Docs.Documents
             {
                 query = query.Where(d => d.LastCachedTime.Date <= lastCachedTimeMax.Value.Date);
             }
-
-            return query.Select(x => new DocumentWithoutContent
+            var join = query.Join(
+                (await GetDbContextAsync(cancellationToken)).Projects,
+                d => d.ProjectId,
+                p => p.Id,
+                (d, p) => new { Document = d, Project = p });
+            return join.Select(x => new DocumentWithoutContent
             {
-                Id = x.Id,
-                ProjectId = x.ProjectId,
-                Name = x.Name,
-                Version = x.Version,
-                LanguageCode = x.LanguageCode,
-                FileName = x.FileName,
-                Format = x.Format,
-                CreationTime = x.CreationTime,
-                LastUpdatedTime = x.LastUpdatedTime,
-                LastSignificantUpdateTime = x.LastSignificantUpdateTime,
-                LastCachedTime = x.LastCachedTime
+                Id = x.Document.Id,
+                ProjectId = x.Document.ProjectId,
+                ProjectName = x.Project.Name,
+                Name = x.Document.Name,
+                Version = x.Document.Version,
+                LanguageCode = x.Document.LanguageCode,
+                FileName = x.Document.FileName,
+                Format = x.Document.Format,
+                CreationTime = x.Document.CreationTime,
+                LastUpdatedTime = x.Document.LastUpdatedTime,
+                LastSignificantUpdateTime = x.Document.LastSignificantUpdateTime,
+                LastCachedTime = x.Document.LastCachedTime
             });
         }
     }

From 5664a988a109fc50c0d1428cc1dc33ef7b28c289 Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Fri, 19 Aug 2022 15:39:06 +0300
Subject: [PATCH 02/10] dash removed

---
 .../Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
index 776d504395..2fab21f615 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
@@ -111,7 +111,6 @@
                                        name="LastUpdatedTimeMin"
                                        class="form-control datepicker"
                                        placeholder="@L["StartDate"].Value">
-                                    <span>-</span>
                                     <input type="date"
                                        id="LastUpdatedTimeMax"
                                        name="LastUpdatedTimeMax"

From 2864f9f30ebd8c87d566f328ffb432c42805cca7 Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Fri, 19 Aug 2022 15:59:42 +0300
Subject: [PATCH 03/10] search button moved next to language code input

---
 .../Pages/Docs/Admin/Documents/Index.cshtml   | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
index 2fab21f615..36e0c82462 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
@@ -34,7 +34,7 @@
 
                 <abp-row>
 
-                    <abp-column size="_4">
+                    <abp-column size="Auto">
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["Project"].Value</div>
 
@@ -45,7 +45,7 @@
                         </div>
                     </abp-column>
 
-                    <abp-column size="_4">
+                    <abp-column size="Auto">
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["Name"].Value</div>
 
@@ -56,7 +56,7 @@
                         </div>
                     </abp-column>
 
-                    <abp-column size="_2">
+                    <abp-column size="Auto">
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["Version"].Value</div>
 
@@ -67,17 +67,19 @@
                         </div>
                     </abp-column>
                         
-                    <abp-column size="_3">
+                    <abp-column size="Auto">
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["LanguageCode"].Value</div>
 
                             <input type="text"
-                               id="LanguageCode"
-                               name="LanguageCode"
-                               class="form-control">
+                                   id="LanguageCode"
+                                   name="LanguageCode"
+                                   class="form-control">
                         </div>
                     </abp-column>
-
+                    <abp-column size="Auto">
+                        <abp-button button-type="Primary" icon="search" id="SearchButton" style="line-height: 25px;" text="@L["Search"].Value"></abp-button>
+                    </abp-column>
                     <abp-row class="mt-3 mb-3">
                         <abp-column size-md="_12">
                             <a href="javascript:;" id="AdvancedFilterSectionToggler" class="text-decoration-none">@L["AdvancedFilters"]</a>
@@ -85,7 +87,7 @@
                     </abp-row>
                     <abp-row id="AdvancedFilterSection" style="display: none;">
 
-                        <abp-column size="_4">
+                        <abp-column size="Auto">
                             <div class="input-group mb-2">
                                 <div class="input-group-text">@L["CreationTime"].Value</div>
 
@@ -103,7 +105,7 @@
                             </div>
                         </abp-column>
 
-                        <abp-column size="_4">
+                        <abp-column size="Auto">
                             <div class="input-group mb-2">
                                 <div class="input-group-text">@L["LastUpdateTime"].Value</div>
                                     <input type="date"
@@ -119,7 +121,7 @@
                             </div>
                         </abp-column>
 
-                        <abp-column size="_4">
+                        <abp-column size="Auto">
                             <div class="input-group mb-2">
                                 <div class="input-group-text">@L["LastCachedTime"].Value</div>
 
@@ -137,7 +139,7 @@
                             </div>
                         </abp-column>
                         
-                        <abp-column size="_2">
+                        <abp-column size="Auto">
                             <div class="input-group mb-2">
                                 <div class="input-group-text">@L["Format"].Value</div>
 
@@ -148,10 +150,10 @@
                             </div>
                         </abp-column>
 
-                        <abp-column size="_2">
+                        <abp-column size="Auto">
                         </abp-column>
                         
-                          <abp-column size="_5">
+                          <abp-column size="Auto">
                             <div class="input-group mb-2">
                                 <div class="input-group-text">@L["LastSignificantUpdateTime"].Value</div>
 
@@ -170,10 +172,6 @@
                         </abp-column>
                         
                     </abp-row>
-
-                    <div class="col-auto">
-                        <abp-button button-type="Primary" icon="search" id="SearchButton" style="line-height: 25px;" text="@L["Search"].Value"></abp-button>
-                    </div>
                 </abp-row>
             </form>
         </abp-card-header>

From 012fb23533c499032a32a271ce40ff961586358f Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Fri, 19 Aug 2022 16:03:04 +0300
Subject: [PATCH 04/10] Version input and name input changed location

---
 .../Pages/Docs/Admin/Documents/Index.cshtml      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
index 36e0c82462..ca33d2e298 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
@@ -47,26 +47,26 @@
 
                     <abp-column size="Auto">
                         <div class="input-group mb-2">
-                            <div class="input-group-text">@L["Name"].Value</div>
+                            <div class="input-group-text">@L["Version"].Value</div>
 
                             <input type="text"
-                               id="Name"
-                               name="Name"
+                               id="Version"
+                               name="Version"
                                class="form-control">
                         </div>
                     </abp-column>
-
+                    
                     <abp-column size="Auto">
                         <div class="input-group mb-2">
-                            <div class="input-group-text">@L["Version"].Value</div>
+                            <div class="input-group-text">@L["Name"].Value</div>
 
                             <input type="text"
-                               id="Version"
-                               name="Version"
+                               id="Name"
+                               name="Name"
                                class="form-control">
                         </div>
                     </abp-column>
-                        
+
                     <abp-column size="Auto">
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["LanguageCode"].Value</div>

From 5a84785fdc113ccec6bda8dc3dca32774327bb0e Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Mon, 22 Aug 2022 20:09:47 +0300
Subject: [PATCH 05/10] Project input , version input , language code input ,
 format input converted to Combobox

---
 .../Documents/IDocumentAdminAppService.cs     |  3 +
 .../Documents/DocumentAdminAppService.cs      | 37 +++++++++++
 .../DocumentsAdminClientProxy.Generated.cs    |  6 ++
 .../ClientProxies/ProjectsAdminClientProxy.cs |  9 +++
 .../Docs/Admin/DocumentsAdminController.cs    |  8 +++
 .../Pages/Docs/Admin/Documents/Index.cshtml   | 56 +++++++++++-----
 .../Docs/Admin/Documents/Index.cshtml.cs      | 27 +++++++-
 .../Pages/Docs/Admin/Documents/index.js       | 66 +++++++++++++++++++
 .../Volo/Docs/Documents/Filter/a.cs           | 29 ++++++++
 .../Docs/Documents/IDocumentRepository.cs     |  3 +
 .../Documents/EFCoreDocumentRepository.cs     | 43 ++++++++++++
 .../Docs/Documents/MongoDocumentRepository.cs |  6 ++
 12 files changed, 274 insertions(+), 19 deletions(-)
 create mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs

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 0770ec5d72..daf2f87a86 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,8 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Volo.Docs.Admin.Projects;
+using Volo.Docs.Documents.Filter;
 
 namespace Volo.Docs.Admin.Documents
 {
@@ -19,5 +21,6 @@ namespace Volo.Docs.Admin.Documents
         Task RemoveFromCacheAsync(Guid documentId);
 
         Task ReindexAsync(Guid documentId);
+        Task<FilterItems> GetFilterItemsAsync();
     }
 }
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 af515b4be7..1150af8ea4 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
@@ -11,6 +11,7 @@ using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
 using Volo.Docs.Caching;
 using Volo.Docs.Documents;
+using Volo.Docs.Documents.Filter;
 using Volo.Docs.Documents.FullSearch.Elastic;
 using Volo.Docs.Localization;
 using Volo.Docs.Projects;
@@ -217,6 +218,42 @@ namespace Volo.Docs.Admin.Documents
             await _elasticSearchService.AddOrUpdateAsync(document);
         }
 
+        public Task<FilterItems> GetFilterItemsAsync()
+        {
+            // return _filterItemsCache.GetAsync(
+            //     CacheKeyGenerator.GenerateFilterItemsCacheKey(),
+            //     async () =>
+            //     {
+            //         var filterItems = new FilterItems();
+            //         var projects = await _projectRepository.GetListAsync();
+            //         foreach (var project in projects)
+            //         {
+            //             var projectFilterItems = new FilterItems();
+            //             var documents = await _documentRepository.GetListByProjectId(project.Id);
+            //             foreach (var document in documents)
+            //             {
+            //                 projectFilterItems.Add(new FilterItem
+            //                 {
+            //                     Name = document.Name,
+            //                     Value = document.Name
+            //                 });
+            //             }
+            //
+            //             filterItems.Add(new FilterItem
+            //             {
+            //                 Name = project.Name,
+            //                 Value = project.Name,
+            //                 Items = projectFilterItems
+            //             });
+            //         }
+            //
+            //         return filterItems;
+            //     }
+            // );
+            
+            return _documentRepository.GetFilterItemsAsync();
+        }
+
         private async Task UpdateDocumentUpdateInfoCache(Document document)
         {
             var cacheKey = $"DocumentUpdateInfo{document.ProjectId}#{document.Name}#{document.LanguageCode}#{document.Version}";
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
index 7bb1ef0e87..df33e23374 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
@@ -7,6 +7,7 @@ using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.ClientProxying;
 using Volo.Docs.Admin.Documents;
+using Volo.Docs.Documents.Filter;
 
 // ReSharper disable once CheckNamespace
 namespace Volo.Docs.Admin.ClientProxies;
@@ -62,4 +63,9 @@ public partial class DocumentsAdminClientProxy : ClientProxyBase<IDocumentAdminA
             { typeof(Guid), documentId }
         });
     }
+
+    public Task<FilterItems> GetFilterItemsAsync()
+    {
+        throw new NotImplementedException();
+    }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
index c9584cffbf..9cd3e6df1b 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
@@ -1,7 +1,16 @@
 // This file is part of ProjectsAdminClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Docs.Admin.Projects;
+
 namespace Volo.Docs.Admin.ClientProxies;
 
 public partial class ProjectsAdminClientProxy
 {
+    public async Task<FilterComboboxValuesDto> GetFilterComboboxAsync()
+    {
+        return await this.RequestAsync<FilterComboboxValuesDto>(nameof(GetFilterComboboxAsync));
+    }
 }
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 9404ac0bde..1a58ab9d02 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
@@ -6,6 +6,7 @@ using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Docs.Admin.Documents;
+using Volo.Docs.Documents.Filter;
 
 namespace Volo.Docs.Admin
 {
@@ -63,5 +64,12 @@ namespace Volo.Docs.Admin
         {
             await _documentAdminAppService.ReindexAsync(documentId);
         }
+
+        [HttpGet]
+        [Route("GetFilterItems")]
+        public Task<FilterItems> GetFilterItemsAsync()
+        {
+            return _documentAdminAppService.GetFilterItemsAsync();
+        }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
index ca33d2e298..0d979ffd0d 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
@@ -38,10 +38,16 @@
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["Project"].Value</div>
 
-                            <input type="text"
-                               id="ProjectId"
-                               name="ProjectId"
-                               class="form-control">
+                            <select
+                                id="ProjectId"
+                                name="ProjectId"
+                                class="form-select">
+                                <option></option>
+                                @foreach (var project in Model.FilterItems.Projects)
+                                {
+                                    <option value="@project.Id">@project.Name</option>
+                                }
+                            </select>
                         </div>
                     </abp-column>
 
@@ -49,10 +55,16 @@
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["Version"].Value</div>
 
-                            <input type="text"
-                               id="Version"
-                               name="Version"
-                               class="form-control">
+                            <select
+                                id="Version"
+                                name="Version"
+                                class="form-select">
+                                <option></option>
+                                @foreach (var version in Model.FilterItems.Versions)
+                                {
+                                    <option value="@version.Version" data-version="@Model.ToJson(version)">@version.Version</option>
+                                }
+                            </select>
                         </div>
                     </abp-column>
                     
@@ -71,10 +83,16 @@
                         <div class="input-group mb-2">
                             <div class="input-group-text">@L["LanguageCode"].Value</div>
 
-                            <input type="text"
-                                   id="LanguageCode"
-                                   name="LanguageCode"
-                                   class="form-control">
+                            <select
+                                id="LanguageCode"
+                                name="LanguageCode"
+                                class="form-select">
+                                <option></option>
+                                @foreach (var language in Model.FilterItems.Languages)
+                                {
+                                    <option value="@language.Code" data-language="@Model.ToJson(language)">@language.Code</option>
+                                }
+                            </select>
                         </div>
                     </abp-column>
                     <abp-column size="Auto">
@@ -143,10 +161,16 @@
                             <div class="input-group mb-2">
                                 <div class="input-group-text">@L["Format"].Value</div>
 
-                                <input type="text"
-                                   id="Format"
-                                   name="Format"
-                                   class="form-control">
+                                <select
+                                    id="Format"
+                                    name="Format"
+                                    class="form-select">
+                                    <option></option>
+                                    @foreach (var format in Model.FilterItems.Formats)
+                                    {
+                                        <option value="@format">@format</option>
+                                    }
+                                </select>
                             </div>
                         </abp-column>
 
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 5c45d1a9a7..34d4b9b578 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
@@ -1,14 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Volo.Docs.Admin.Documents;
+using Volo.Docs.Admin.Projects;
+using Volo.Docs.Documents.Filter;
 
 namespace Volo.Docs.Admin.Pages.Docs.Admin.Documents;
 
 [Authorize(DocsAdminPermissions.Projects.Default)]
 public class IndexModel : DocsAdminPageModel
 {
-    public virtual Task<IActionResult> OnGet()
+    private readonly IDocumentAdminAppService _documentAdminAppService;
+    public FilterItems FilterItems { get; set; }
+
+    public IndexModel(IDocumentAdminAppService documentAdminAppService)
+    {
+        _documentAdminAppService = documentAdminAppService;
+    }
+    
+
+    public string ToJson(object obj)
+    {
+        return JsonConvert.SerializeObject(obj);
+    }
+    public virtual async Task<IActionResult> OnGet()
     {
-        return Task.FromResult<IActionResult>(Page());
+        FilterItems = await _documentAdminAppService.GetFilterItemsAsync();
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index d85676e3f3..d891b61b29 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -5,7 +5,73 @@ $(function () {
     var getFormattedDate = function ($datePicker) {
         return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd');
     };
+    
+    var $projectId = $('#ProjectId');
+    var $version = $('#Version');
+    var $languageCode = $('#LanguageCode');
 
+    function $getOptions($select){
+        var select = $select.get(0);
+        return $(select.options)
+    }
+
+    function showLanguages(){
+        var selectedProjectId = $projectId.val();
+        var selectedVersion = $version.val();
+        var languages = $getOptions($languageCode);
+        languages.each(function(){
+            var language = $(this);
+            var languageCodeDto = language.attr('data-language');
+            if(!languageCodeDto) return;
+            languageCodeDto = JSON.parse(languageCodeDto);
+            if((!selectedVersion || languageCodeDto.Versions.includes(selectedVersion)) 
+                && (!selectedProjectId || languageCodeDto.ProjectIds.includes(selectedProjectId)))
+            {
+                language.show();
+            }
+            else{
+                language.hide();
+                if(language.is(':selected')){
+                    $languageCode.val('');
+                }
+            }
+        });
+    }
+    function showVersions(){
+        var selectedProjectId = $projectId.val();
+        var selectedLanguageCode = $languageCode.val();
+        var versions = $getOptions($version);
+        versions.each(function(){
+            var version = $(this);
+            var verisonDto = version.attr('data-version');
+            if(!verisonDto) return;
+            verisonDto = JSON.parse(verisonDto);
+            if((!selectedLanguageCode || verisonDto.Languages.includes(selectedLanguageCode)) 
+                && (!selectedProjectId || verisonDto.ProjectIds.includes(selectedProjectId)))
+            {
+                version.show();
+            }
+            else{
+                version.hide();
+                if(version.is(':selected')){
+                    $version.val('');
+                }
+            }
+        });
+    }
+    $projectId.on('change', function () {
+        showVersions();
+        showLanguages();
+    });
+
+    $version.on('change', function () {
+        showLanguages();
+    });
+    
+    $languageCode.on('change', function () {
+        showVersions();
+    });
+    
     var getFilter = function () {
         return {
             projectId: $('#ProjectId').val(),
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs
new file mode 100644
index 0000000000..989eeea266
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Docs.Documents.Filter;
+
+public class FilterItems
+{
+    public IEnumerable<FilterProjectItem> Projects { get; set; }
+    public IEnumerable<FilterVersionItem> Versions { get; set; }
+    public IEnumerable<FilterLanguageCodeItem> Languages { get; set; }
+    public IEnumerable<string> Formats { get; set; }
+}
+public class FilterProjectItem
+{
+    public Guid Id { get; set; }
+    public string Name { get; set; }
+}
+public class FilterVersionItem
+{
+    public string Version { get; set; }
+    public IEnumerable<Guid> ProjectIds { get; set; }
+    public IEnumerable<string> Languages { get; set; }
+}
+public class FilterLanguageCodeItem
+{
+    public string Code { get; set; }
+    public IEnumerable<Guid> ProjectIds { get; set; }
+    public IEnumerable<string> Versions { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
index 740d6921b3..dea331d72c 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
+using Volo.Docs.Documents.Filter;
+using Volo.Docs.Projects;
 
 namespace Volo.Docs.Documents
 {
@@ -73,5 +75,6 @@ namespace Volo.Docs.Documents
             CancellationToken cancellationToken = default);
 
         Task<Document> GetAsync(Guid id, CancellationToken cancellationToken = default);
+        Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default);
     }
 }
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
index 1de28f537c..98c46d7d3d 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
+using Volo.Docs.Documents.Filter;
 using Volo.Docs.EntityFrameworkCore;
 
 namespace Volo.Docs.Documents
@@ -216,5 +217,47 @@ namespace Volo.Docs.Documents
                     LastCachedTime = x.d.LastCachedTime
                 });
         }
+        public async Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default)
+        {
+            var dbContext = await GetDbContextAsync();
+            
+            var filterItems = new FilterItems();
+            
+            filterItems.Formats = await dbContext.Documents.Select(x => x.Format).Distinct().ToListAsync(cancellationToken);
+
+            filterItems.Projects = await dbContext.Projects
+                .Select(x=>new FilterProjectItem() 
+                {
+                    Id = x.Id,
+                    Name = x.Name
+                })
+                .OrderBy(x=>x.Name)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+
+            filterItems.Versions = await dbContext.Documents
+                .GroupBy(x => x.Version)
+                .Select(x => new FilterVersionItem 
+                {
+                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
+                    Version = x.Key,
+                    Languages = x.Select(x2 => x2.LanguageCode).Distinct()
+                })
+                .OrderByDescending(x => x.Version)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+
+            filterItems.Languages = await dbContext.Documents
+                .GroupBy(x => x.LanguageCode)
+                .Select(x => new FilterLanguageCodeItem 
+                {
+                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
+                    Code = x.Key,
+                    Versions = x.Select(x2 => x2.Version).Distinct()
+                })
+                .OrderBy(x=>x.Code)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+
+
+            return filterItems;
+        }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
index 88c7514ae4..38ed1ddd6d 100644
--- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
@@ -8,6 +8,7 @@ using Volo.Abp.Domain.Repositories.MongoDB;
 using Volo.Abp.MongoDB;
 using MongoDB.Driver.Linq;
 using MongoDB.Driver;
+using Volo.Docs.Documents.Filter;
 using Volo.Docs.MongoDB;
 
 
@@ -156,6 +157,11 @@ namespace Volo.Docs.Documents
             return await (await GetMongoQueryableAsync(cancellationToken)).Where(x => x.Id == id).SingleAsync(GetCancellationToken(cancellationToken));
         }
 
+        public Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default)
+        {
+            throw new NotImplementedException();
+        }
+
         protected virtual async Task<IMongoQueryable<DocumentWithoutContent>> ApplyFilterForGetAll(
             IMongoQueryable<Document> query,
             Guid? projectId,

From 7aafc65af29be65129bcc0c87bfd3cd1ce58a3ed Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Tue, 23 Aug 2022 09:14:31 +0300
Subject: [PATCH 06/10] Refactored #13585

---
 .../Documents/DocumentAdminAppService.cs      | 31 ---------
 .../DocumentsAdminClientProxy.Generated.cs    |  6 +-
 .../DocumentsAdminClientProxy.cs              |  5 ++
 .../ClientProxies/ProjectsAdminClientProxy.cs |  5 +-
 .../Volo/Docs/Documents/Filter/FilterItems.cs | 11 ++++
 .../Filter/FilterLanguageCodeItem.cs          | 11 ++++
 .../Documents/Filter/FilterProjectItem.cs     |  9 +++
 .../Documents/Filter/FilterVersionItem.cs     | 11 ++++
 .../Volo/Docs/Documents/Filter/a.cs           | 29 ---------
 .../Documents/EFCoreDocumentRepository.cs     | 56 ++++++++++------
 .../Docs/Documents/MongoDocumentRepository.cs | 65 ++++++++++++++++++-
 11 files changed, 151 insertions(+), 88 deletions(-)
 create mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs
 create mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
 create mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs
 create mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
 delete mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs

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 1150af8ea4..848805d09e 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
@@ -220,37 +220,6 @@ namespace Volo.Docs.Admin.Documents
 
         public Task<FilterItems> GetFilterItemsAsync()
         {
-            // return _filterItemsCache.GetAsync(
-            //     CacheKeyGenerator.GenerateFilterItemsCacheKey(),
-            //     async () =>
-            //     {
-            //         var filterItems = new FilterItems();
-            //         var projects = await _projectRepository.GetListAsync();
-            //         foreach (var project in projects)
-            //         {
-            //             var projectFilterItems = new FilterItems();
-            //             var documents = await _documentRepository.GetListByProjectId(project.Id);
-            //             foreach (var document in documents)
-            //             {
-            //                 projectFilterItems.Add(new FilterItem
-            //                 {
-            //                     Name = document.Name,
-            //                     Value = document.Name
-            //                 });
-            //             }
-            //
-            //             filterItems.Add(new FilterItem
-            //             {
-            //                 Name = project.Name,
-            //                 Value = project.Name,
-            //                 Items = projectFilterItems
-            //             });
-            //         }
-            //
-            //         return filterItems;
-            //     }
-            // );
-            
             return _documentRepository.GetFilterItemsAsync();
         }
 
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
index df33e23374..9dd8495dd6 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
@@ -63,9 +63,9 @@ public partial class DocumentsAdminClientProxy : ClientProxyBase<IDocumentAdminA
             { typeof(Guid), documentId }
         });
     }
-
-    public Task<FilterItems> GetFilterItemsAsync()
+    
+    public async Task<FilterItems> GetFilterItemsAsync()
     {
-        throw new NotImplementedException();
+        return await RequestAsync<FilterItems>(nameof(GetFilterItemsAsync));
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs
index 34899f1c49..7c6806b4a8 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs
@@ -1,7 +1,12 @@
 // This file is part of DocumentsAdminClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
+
+using System.Threading.Tasks;
+using Volo.Docs.Documents.Filter;
+
 namespace Volo.Docs.Admin.ClientProxies;
 
 public partial class DocumentsAdminClientProxy
 {
+    
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
index 9cd3e6df1b..e226d8cf6b 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
@@ -9,8 +9,5 @@ namespace Volo.Docs.Admin.ClientProxies;
 
 public partial class ProjectsAdminClientProxy
 {
-    public async Task<FilterComboboxValuesDto> GetFilterComboboxAsync()
-    {
-        return await this.RequestAsync<FilterComboboxValuesDto>(nameof(GetFilterComboboxAsync));
-    }
+    
 }
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs
new file mode 100644
index 0000000000..f446d8bcc4
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Volo.Docs.Documents.Filter;
+
+public class FilterItems
+{
+    public IEnumerable<FilterProjectItem> Projects { get; set; }
+    public IEnumerable<FilterVersionItem> Versions { get; set; }
+    public IEnumerable<FilterLanguageCodeItem> Languages { get; set; }
+    public IEnumerable<string> Formats { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
new file mode 100644
index 0000000000..5cdda57af6
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Docs.Documents.Filter;
+
+public class FilterLanguageCodeItem
+{
+    public string Code { get; set; }
+    public IEnumerable<Guid> ProjectIds { get; set; }
+    public IEnumerable<string> Versions { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs
new file mode 100644
index 0000000000..a4dc668255
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Volo.Docs.Documents.Filter;
+
+public class FilterProjectItem
+{
+    public Guid Id { get; set; }
+    public string Name { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
new file mode 100644
index 0000000000..02dc9de8e2
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Docs.Documents.Filter;
+
+public class FilterVersionItem
+{
+    public string Version { get; set; }
+    public IEnumerable<Guid> ProjectIds { get; set; }
+    public IEnumerable<string> Languages { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs
deleted file mode 100644
index 989eeea266..0000000000
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/a.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Volo.Docs.Documents.Filter;
-
-public class FilterItems
-{
-    public IEnumerable<FilterProjectItem> Projects { get; set; }
-    public IEnumerable<FilterVersionItem> Versions { get; set; }
-    public IEnumerable<FilterLanguageCodeItem> Languages { get; set; }
-    public IEnumerable<string> Formats { get; set; }
-}
-public class FilterProjectItem
-{
-    public Guid Id { get; set; }
-    public string Name { get; set; }
-}
-public class FilterVersionItem
-{
-    public string Version { get; set; }
-    public IEnumerable<Guid> ProjectIds { get; set; }
-    public IEnumerable<string> Languages { get; set; }
-}
-public class FilterLanguageCodeItem
-{
-    public string Code { get; set; }
-    public IEnumerable<Guid> ProjectIds { get; set; }
-    public IEnumerable<string> Versions { get; set; }
-}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
index 98c46d7d3d..ceb2415ea4 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
@@ -219,33 +219,40 @@ namespace Volo.Docs.Documents
         }
         public async Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default)
         {
-            var dbContext = await GetDbContextAsync();
-            
             var filterItems = new FilterItems();
             
-            filterItems.Formats = await dbContext.Documents.Select(x => x.Format).Distinct().ToListAsync(cancellationToken);
+            filterItems.Formats = await GetFormats(cancellationToken);
+
+            filterItems.Projects = await GetFilterProjectItems(cancellationToken);
+
+            filterItems.Versions = await GetFilterVersionItems(cancellationToken);
+
+            filterItems.Languages = await GetFilterLanguageCodeItems(cancellationToken);
+            
+            return filterItems;
+        }
+
+        private async Task<List<string>> GetFormats(CancellationToken cancellationToken)
+        {
+            return await (await GetDbSetAsync()).Select(x => x.Format).Distinct().ToListAsync(cancellationToken);
+        }
 
-            filterItems.Projects = await dbContext.Projects
-                .Select(x=>new FilterProjectItem() 
+        private async Task<List<FilterProjectItem>> GetFilterProjectItems(CancellationToken cancellationToken)
+        {
+            return await (await GetDbContextAsync())
+                .Projects
+                .Select(x=>new FilterProjectItem
                 {
                     Id = x.Id,
                     Name = x.Name
                 })
                 .OrderBy(x=>x.Name)
                 .ToListAsync(GetCancellationToken(cancellationToken));
+        }
 
-            filterItems.Versions = await dbContext.Documents
-                .GroupBy(x => x.Version)
-                .Select(x => new FilterVersionItem 
-                {
-                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
-                    Version = x.Key,
-                    Languages = x.Select(x2 => x2.LanguageCode).Distinct()
-                })
-                .OrderByDescending(x => x.Version)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-
-            filterItems.Languages = await dbContext.Documents
+        private async Task<List<FilterLanguageCodeItem>> GetFilterLanguageCodeItems(CancellationToken cancellationToken)
+        {
+            return await (await GetDbSetAsync())
                 .GroupBy(x => x.LanguageCode)
                 .Select(x => new FilterLanguageCodeItem 
                 {
@@ -255,9 +262,20 @@ namespace Volo.Docs.Documents
                 })
                 .OrderBy(x=>x.Code)
                 .ToListAsync(GetCancellationToken(cancellationToken));
+        }
 
-
-            return filterItems;
+        private async Task<List<FilterVersionItem>> GetFilterVersionItems(CancellationToken cancellationToken)
+        {
+            return await (await GetDbSetAsync())
+                .GroupBy(x => x.Version)
+                .Select(x => new FilterVersionItem 
+                {
+                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
+                    Version = x.Key,
+                    Languages = x.Select(x2 => x2.LanguageCode).Distinct()
+                })
+                .OrderByDescending(x => x.Version)
+                .ToListAsync(GetCancellationToken(cancellationToken));
         }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
index 38ed1ddd6d..529f4cb4c4 100644
--- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
@@ -10,6 +10,7 @@ using MongoDB.Driver.Linq;
 using MongoDB.Driver;
 using Volo.Docs.Documents.Filter;
 using Volo.Docs.MongoDB;
+using Volo.Docs.Projects;
 
 
 namespace Volo.Docs.Documents
@@ -157,9 +158,64 @@ namespace Volo.Docs.Documents
             return await (await GetMongoQueryableAsync(cancellationToken)).Where(x => x.Id == id).SingleAsync(GetCancellationToken(cancellationToken));
         }
 
-        public Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default)
+        public async Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default)
         {
-            throw new NotImplementedException();
+            var filterItems = new FilterItems();
+            
+            filterItems.Formats = await GetFormats(cancellationToken);
+
+            filterItems.Projects = await GetFilterProjectItems(cancellationToken);
+
+            filterItems.Versions = await GetFilterVersionItems(cancellationToken);
+
+            filterItems.Languages = await GetFilterLanguageCodeItems(cancellationToken);
+            
+            return filterItems;
+        }
+
+        private async Task<List<string>> GetFormats(CancellationToken cancellationToken)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken)).Select(x => x.Format).Distinct().ToListAsync(cancellationToken);
+        }
+
+        private async Task<List<FilterProjectItem>> GetFilterProjectItems(CancellationToken cancellationToken)
+        {
+            return await (await GetMongoQueryableAsync<Project>(cancellationToken))
+                .Select(x=>new FilterProjectItem
+                {
+                    Id = x.Id,
+                    Name = x.Name
+                })
+                .OrderBy(x=>x.Name)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+
+        private async Task<List<FilterLanguageCodeItem>> GetFilterLanguageCodeItems(CancellationToken cancellationToken)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .GroupBy(x => x.LanguageCode)
+                .Select(x => new FilterLanguageCodeItem 
+                {
+                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
+                    Code = x.Key,
+                    Versions = x.Select(x2 => x2.Version).Distinct()
+                })
+                .OrderBy(x=>x.Code)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+
+        private async Task<List<FilterVersionItem>> GetFilterVersionItems(CancellationToken cancellationToken)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .GroupBy(x => x.Version)
+                .Select(x => new FilterVersionItem 
+                {
+                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
+                    Version = x.Key,
+                    Languages = x.Select(x2 => x2.LanguageCode).Distinct()
+                })
+                .OrderByDescending(x => x.Version)
+                .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
         protected virtual async Task<IMongoQueryable<DocumentWithoutContent>> ApplyFilterForGetAll(
@@ -204,6 +260,11 @@ namespace Volo.Docs.Documents
             {
                 query = query.Where(d => d.FileName != null && d.FileName.Contains(fileName));
             }
+            
+            if (format != null)
+            {
+                query = query.Where(d => d.Format != null && d.Format == format);
+            }
 
             if (creationTimeMin.HasValue)
             {

From 3f147bb047aba087f4337f2f063ca1381c9db008 Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Wed, 24 Aug 2022 11:25:19 +0300
Subject: [PATCH 07/10] Combobox fill method changed

---
 .../Docs/Admin/Documents/DocumentInfoDto.cs   |  11 ++
 .../Documents/IDocumentAdminAppService.cs     |   3 +-
 .../Admin/Projects/IProjectAdminAppService.cs |   2 +
 .../Projects/ProjectWithoutDetailsDto.cs      |   9 ++
 .../DocsAdminApplicationAutoMapperProfile.cs  |   2 +
 .../Documents/DocumentAdminAppService.cs      |   6 +-
 .../Admin/Projects/ProjectAdminAppService.cs  |   6 +
 .../DocumentsAdminClientProxy.Generated.cs    |   7 +-
 .../ProjectsAdminClientProxy.Generated.cs     |   6 +
 .../Docs/Admin/DocumentsAdminController.cs    |   6 +-
 .../Docs/Admin/ProjectsAdminController.cs     |   8 +
 .../Pages/Docs/Admin/Documents/Index.cshtml   |  23 ++-
 .../Docs/Admin/Documents/Index.cshtml.cs      |  21 +--
 .../Pages/Docs/Admin/Documents/index.js       | 144 ++++++++++++------
 .../Filter/FilterLanguageCodeItem.cs          |   5 +-
 .../Documents/Filter/FilterVersionItem.cs     |   5 +-
 .../Volo/Docs/Documents/DocumentInfo.cs       |  11 ++
 .../Docs/Documents/IDocumentRepository.cs     |   2 +-
 .../Volo/Docs/Projects/IProjectRepository.cs  |   1 +
 .../Docs/Projects/ProjectWithoutDetails.cs    |   9 ++
 .../Documents/EFCoreDocumentRepository.cs     |  84 +++-------
 .../Docs/Projects/EfCoreProjectRepository.cs  |  11 ++
 .../Docs/Documents/MongoDocumentRepository.cs |  67 +-------
 .../Docs/DocumentAdminAppService_Tests.cs     |  18 ++-
 .../Volo/Docs/DocsTestData.cs                 |   1 +
 .../Volo/Docs/DocsTestDataBuilder.cs          |  46 ++++++
 26 files changed, 301 insertions(+), 213 deletions(-)
 create mode 100644 modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentInfoDto.cs
 create mode 100644 modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectWithoutDetailsDto.cs
 create mode 100644 modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentInfo.cs
 create mode 100644 modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/ProjectWithoutDetails.cs

diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentInfoDto.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentInfoDto.cs
new file mode 100644
index 0000000000..545e665869
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/DocumentInfoDto.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Volo.Docs.Admin.Documents;
+
+public class DocumentInfoDto
+{
+    public string Version { get; set; }
+    public string Format { get; set; }
+    public string LanguageCode { get; set; }
+    public Guid ProjectId { get; set; }
+}
\ 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 daf2f87a86..79e3b5fc88 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
@@ -21,6 +21,7 @@ namespace Volo.Docs.Admin.Documents
         Task RemoveFromCacheAsync(Guid documentId);
 
         Task ReindexAsync(Guid documentId);
-        Task<FilterItems> GetFilterItemsAsync();
+
+        Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails();
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/IProjectAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/IProjectAdminAppService.cs
index 9b832165d1..6f3d503f44 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/IProjectAdminAppService.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/IProjectAdminAppService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
@@ -20,5 +21,6 @@ namespace Volo.Docs.Admin.Projects
         Task ReindexAsync(ReindexInput input);
 
         Task ReindexAllAsync();
+        Task<List<ProjectWithoutDetailsDto>> GetListWithoutDetailsAsync();
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectWithoutDetailsDto.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectWithoutDetailsDto.cs
new file mode 100644
index 0000000000..b6e6a301cb
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectWithoutDetailsDto.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Volo.Docs.Admin.Projects;
+
+public class ProjectWithoutDetailsDto
+{
+    public Guid Id { get; set; }
+    public string Name { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs
index eaeb59cabb..01a7250ce5 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs
@@ -14,6 +14,8 @@ namespace Volo.Docs.Admin
             CreateMap<Project, ProjectDto>();
             CreateMap<Document, DocumentDto>().Ignore(x => x.ProjectName);
             CreateMap<DocumentWithoutContent, DocumentDto>();
+            CreateMap<ProjectWithoutDetails, ProjectWithoutDetailsDto>();
+            CreateMap<DocumentInfo, DocumentInfoDto>();
         }
     }
 }
\ No newline at end of file
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 848805d09e..51e7297487 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
@@ -218,11 +218,13 @@ namespace Volo.Docs.Admin.Documents
             await _elasticSearchService.AddOrUpdateAsync(document);
         }
 
-        public Task<FilterItems> GetFilterItemsAsync()
+        public async Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails()
         {
-            return _documentRepository.GetFilterItemsAsync();
+            var documents = await _documentRepository.GetUniqueListWithoutDetails();
+            return ObjectMapper.Map<List<DocumentInfo>, List<DocumentInfoDto>>(documents);
         }
 
+
         private async Task UpdateDocumentUpdateInfoCache(Document document)
         {
             var cacheKey = $"DocumentUpdateInfo{document.ProjectId}#{document.Name}#{document.LanguageCode}#{document.Version}";
diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs
index 14833cd3e4..540ecfe275 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs
@@ -156,5 +156,11 @@ namespace Volo.Docs.Admin.Projects
                 await ReindexProjectAsync(project.Id);
             }
         }
+        
+        public async Task<List<ProjectWithoutDetailsDto>> GetListWithoutDetailsAsync()
+        {
+            var projects = await _projectRepository.GetListWithoutDetailsAsync();
+            return ObjectMapper.Map<List<ProjectWithoutDetails>, List<ProjectWithoutDetailsDto>>(projects);
+        }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
index 9dd8495dd6..099047438a 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
@@ -1,5 +1,6 @@
 // This file is automatically generated by ABP framework to use MVC Controllers from CSharp
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Http.Client;
@@ -63,9 +64,9 @@ public partial class DocumentsAdminClientProxy : ClientProxyBase<IDocumentAdminA
             { typeof(Guid), documentId }
         });
     }
-    
-    public async Task<FilterItems> GetFilterItemsAsync()
+
+    public Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails()
     {
-        return await RequestAsync<FilterItems>(nameof(GetFilterItemsAsync));
+        return RequestAsync<List<DocumentInfoDto>>(nameof(GetUniqueListWithoutDetails));
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs
index cb8d5c3947..3ab665159e 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs
@@ -1,5 +1,6 @@
 // This file is automatically generated by ABP framework to use MVC Controllers from CSharp
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Http.Client;
@@ -61,6 +62,11 @@ public partial class ProjectsAdminClientProxy : ClientProxyBase<IProjectAdminApp
         await RequestAsync(nameof(ReindexAllAsync));
     }
 
+    public Task<List<ProjectWithoutDetailsDto>> GetListWithoutDetailsAsync()
+    {
+        return RequestAsync<List<ProjectWithoutDetailsDto>>(nameof(GetListWithoutDetailsAsync));
+    }
+
     public virtual async Task ReindexAsync(ReindexInput input)
     {
         await RequestAsync(nameof(ReindexAsync), new ClientProxyRequestTypeValue
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 1a58ab9d02..c321b76614 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
@@ -66,10 +66,10 @@ namespace Volo.Docs.Admin
         }
 
         [HttpGet]
-        [Route("GetFilterItems")]
-        public Task<FilterItems> GetFilterItemsAsync()
+        [Route("GetUniqueListDocumentWithoutDetails")]
+        public Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails()
         {
-            return _documentAdminAppService.GetFilterItemsAsync();
+            return _documentAdminAppService.GetUniqueListWithoutDetails();
         }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs
index 1696229bf8..ea0c7f1afd 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
@@ -61,6 +62,13 @@ namespace Volo.Docs.Admin
             return _projectAppService.ReindexAllAsync();
         }
 
+        [HttpGet]
+        [Route("GetListProjectWithoutDetailsAsync")]
+        public Task<List<ProjectWithoutDetailsDto>> GetListWithoutDetailsAsync()
+        {
+            return _projectAppService.GetListWithoutDetailsAsync();
+        }
+
         [HttpPost]
         [Route("Reindex")]
         public Task ReindexAsync(ReindexInput input)
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
index 0d979ffd0d..c740a7ab07 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
@@ -43,7 +43,7 @@
                                 name="ProjectId"
                                 class="form-select">
                                 <option></option>
-                                @foreach (var project in Model.FilterItems.Projects)
+                                @foreach (var project in Model.Projects)
                                 {
                                     <option value="@project.Id">@project.Name</option>
                                 }
@@ -60,10 +60,10 @@
                                 name="Version"
                                 class="form-select">
                                 <option></option>
-                                @foreach (var version in Model.FilterItems.Versions)
-                                {
-                                    <option value="@version.Version" data-version="@Model.ToJson(version)">@version.Version</option>
-                                }
+                                @* @foreach (var version in Model.FilterItems.Versions) *@
+                                @* { *@
+                                @*     <option value="@version.Version" style="display: none;" data-project-id="@version.ProjectId" data-language-code="@version.LanguageCode">@version.Version</option> *@
+                                @* } *@
                             </select>
                         </div>
                     </abp-column>
@@ -88,10 +88,10 @@
                                 name="LanguageCode"
                                 class="form-select">
                                 <option></option>
-                                @foreach (var language in Model.FilterItems.Languages)
-                                {
-                                    <option value="@language.Code" data-language="@Model.ToJson(language)">@language.Code</option>
-                                }
+                                @* @foreach (var language in Model.FilterItems.Versions) *@
+                                @* { *@
+                                @*     <option value="@language.LanguageCode" style="display: none;" data-project-id="@language.ProjectId" d>@language.LanguageCode</option> *@
+                                @* } *@
                             </select>
                         </div>
                     </abp-column>
@@ -165,11 +165,6 @@
                                     id="Format"
                                     name="Format"
                                     class="form-select">
-                                    <option></option>
-                                    @foreach (var format in Model.FilterItems.Formats)
-                                    {
-                                        <option value="@format">@format</option>
-                                    }
                                 </select>
                             </div>
                         </abp-column>
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 34d4b9b578..194ad6780f 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
@@ -1,35 +1,24 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-using Volo.Docs.Admin.Documents;
 using Volo.Docs.Admin.Projects;
-using Volo.Docs.Documents.Filter;
 
 namespace Volo.Docs.Admin.Pages.Docs.Admin.Documents;
 
 [Authorize(DocsAdminPermissions.Projects.Default)]
 public class IndexModel : DocsAdminPageModel
 {
-    private readonly IDocumentAdminAppService _documentAdminAppService;
-    public FilterItems FilterItems { get; set; }
+    private readonly IProjectAdminAppService _projectAdminAppService;
+    public List<ProjectWithoutDetailsDto> Projects { get; set; }
 
-    public IndexModel(IDocumentAdminAppService documentAdminAppService)
+    public IndexModel(IProjectAdminAppService projectAdminAppService)
     {
-        _documentAdminAppService = documentAdminAppService;
-    }
-    
-
-    public string ToJson(object obj)
-    {
-        return JsonConvert.SerializeObject(obj);
+        _projectAdminAppService = projectAdminAppService;
     }
     public virtual async Task<IActionResult> OnGet()
     {
-        FilterItems = await _documentAdminAppService.GetFilterItemsAsync();
+        Projects = await _projectAdminAppService.GetListWithoutDetailsAsync();
         return Page();
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index d891b61b29..8a7bdc6fb6 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -6,70 +6,120 @@ $(function () {
         return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd');
     };
     
+    var comboboxItems = [];
+    abp.ajax({
+        url: abp.appPath + 'api/docs/admin/documents/GetUniqueListDocumentWithoutDetails',
+        type: 'GET',
+        dataType: 'json',
+        success: function (data) {
+            comboboxItems = data;
+            fillOptions();
+        }
+    });
+    
+    
     var $projectId = $('#ProjectId');
     var $version = $('#Version');
     var $languageCode = $('#LanguageCode');
+    var $format = $('#Format');
+    
+    function fillOptions() {
+        var selectedVersion = $version.val();
+        var selectedLanguageCode = $languageCode.val();
+        var selectedFormat = $format.val();
+        var selectedProjectId = $projectId.val();
 
-    function $getOptions($select){
-        var select = $select.get(0);
-        return $(select.options)
-    }
+        $version.empty();
+        $languageCode.empty();
+        $format.empty();
+        
+        $version.append($('<option/>').val(''));
+        $languageCode.append($('<option/>').val(''));
+        $format.append($('<option/>').val(''));
 
-    function showLanguages(){
-        var selectedProjectId = $projectId.val();
-        var selectedVersion = $version.val();
-        var languages = $getOptions($languageCode);
-        languages.each(function(){
-            var language = $(this);
-            var languageCodeDto = language.attr('data-language');
-            if(!languageCodeDto) return;
-            languageCodeDto = JSON.parse(languageCodeDto);
-            if((!selectedVersion || languageCodeDto.Versions.includes(selectedVersion)) 
-                && (!selectedProjectId || languageCodeDto.ProjectIds.includes(selectedProjectId)))
-            {
-                language.show();
-            }
-            else{
-                language.hide();
-                if(language.is(':selected')){
-                    $languageCode.val('');
-                }
+        
+        comboboxItems.forEach(function (item) {
+            if (!selectedProjectId || item.projectId === selectedProjectId) {
+                appendVersion(item,selectedVersion,selectedLanguageCode,selectedFormat);
+                appendLanguageCode(item,selectedLanguageCode,selectedVersion,selectedFormat);
+                appendFormat(item,selectedFormat,selectedVersion,selectedLanguageCode);
             }
         });
+        
     }
-    function showVersions(){
-        var selectedProjectId = $projectId.val();
-        var selectedLanguageCode = $languageCode.val();
-        var versions = $getOptions($version);
-        versions.each(function(){
-            var version = $(this);
-            var verisonDto = version.attr('data-version');
-            if(!verisonDto) return;
-            verisonDto = JSON.parse(verisonDto);
-            if((!selectedLanguageCode || verisonDto.Languages.includes(selectedLanguageCode)) 
-                && (!selectedProjectId || verisonDto.ProjectIds.includes(selectedProjectId)))
-            {
-                version.show();
+    function appendFormat(item,selectedFormat,selectedVersion,selectedLanguageCode) {
+        if(selectedVersion && selectedVersion !== item.version) {
+            return;
+        }
+        if(selectedLanguageCode && selectedLanguageCode !== item.languageCode) {
+            return;
+        }
+
+        if($format.find('option[value="' + item.format + '"]').length === 0) {
+            var formatOption = $('<option>',{
+                value: item.format,
+                text: item.format
+            });
+            if(selectedFormat === item.format) {
+                formatOption.attr('selected', 'selected');
             }
-            else{
-                version.hide();
-                if(version.is(':selected')){
-                    $version.val('');
-                }
+            $format.append(formatOption);
+        }
+    }
+    
+    function appendLanguageCode(item,selectedLanguageCode,selectedVersion,selectedFormat) {
+        if(selectedVersion && selectedVersion !== item.version) {
+            return;
+        }
+        if(selectedFormat && selectedFormat !== item.format) {
+            return;
+        }
+        
+        if($languageCode.find('option[value="' + item.languageCode + '"]').length === 0) {
+            var languageCodeOption = $('<option>',{
+                value: item.languageCode,
+                text: item.languageCode
+            });
+            if(selectedLanguageCode === item.languageCode) {
+                languageCodeOption.attr('selected', 'selected');
             }
-        });
+            $languageCode.append(languageCodeOption);
+        }
     }
+    function appendVersion(item,selectedVersion,selectedLanguageCode,selectedFormat) {
+        if(selectedLanguageCode && item.languageCode !== selectedLanguageCode) {
+            return;
+        }
+        if(selectedFormat && selectedFormat !== item.format) {
+            return;
+        }
+        
+        if($version.find('option[value="' + item.version + '"]').length === 0) {
+            var versionOption = $('<option>', {
+                value: item.version,
+                text: item.version
+            })
+            if(selectedVersion === item.version) {
+                versionOption.attr('selected', 'selected');
+            }
+            $version.append(versionOption);
+        }
+    }
+
     $projectId.on('change', function () {
-        showVersions();
-        showLanguages();
+        fillOptions();
     });
-
+    
     $version.on('change', function () {
-        showLanguages();
+        fillOptions();
     });
     
     $languageCode.on('change', function () {
-        showVersions();
+        fillOptions();
+    });
+    
+    $format.on('change', function () {
+        fillOptions();
     });
     
     var getFilter = function () {
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
index 5cdda57af6..b38c4ace7d 100644
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
@@ -5,7 +5,6 @@ namespace Volo.Docs.Documents.Filter;
 
 public class FilterLanguageCodeItem
 {
-    public string Code { get; set; }
-    public IEnumerable<Guid> ProjectIds { get; set; }
-    public IEnumerable<string> Versions { get; set; }
+    public string LanguageCode { get; set; }
+    public Guid ProjectId { get; set; }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
index 02dc9de8e2..2db5469ed9 100644
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
@@ -6,6 +6,7 @@ namespace Volo.Docs.Documents.Filter;
 public class FilterVersionItem
 {
     public string Version { get; set; }
-    public IEnumerable<Guid> ProjectIds { get; set; }
-    public IEnumerable<string> Languages { get; set; }
+    public string Format { get; set; }
+    public string LanguageCode { get; set; }
+    public Guid ProjectId { get; set; }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentInfo.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentInfo.cs
new file mode 100644
index 0000000000..944a139338
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentInfo.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Volo.Docs.Documents;
+
+public class DocumentInfo
+{
+    public string Version { get; set; }
+    public string Format { get; set; }
+    public string LanguageCode { get; set; }
+    public Guid ProjectId { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
index dea331d72c..732d7a3fcd 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
@@ -11,6 +11,7 @@ namespace Volo.Docs.Documents
     public interface IDocumentRepository : IBasicRepository<Document>
     {
         Task<List<DocumentWithoutDetails>> GetListWithoutDetailsByProjectId(Guid projectId, CancellationToken cancellationToken = default);
+        Task<List<DocumentInfo>> GetUniqueListWithoutDetails(CancellationToken cancellationToken = default);
 
         Task<List<Document>> GetListByProjectId(Guid projectId, CancellationToken cancellationToken = default);
 
@@ -75,6 +76,5 @@ namespace Volo.Docs.Documents
             CancellationToken cancellationToken = default);
 
         Task<Document> GetAsync(Guid id, CancellationToken cancellationToken = default);
-        Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default);
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/IProjectRepository.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/IProjectRepository.cs
index 4893ab4114..db13ea2c8a 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/IProjectRepository.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/IProjectRepository.cs
@@ -9,6 +9,7 @@ namespace Volo.Docs.Projects
     public interface IProjectRepository : IBasicRepository<Project, Guid>
     {
         Task<List<Project>> GetListAsync(string sorting, int maxResultCount, int skipCount, CancellationToken cancellationToken = default);
+        Task<List<ProjectWithoutDetails>> GetListWithoutDetailsAsync(CancellationToken cancellationToken = default);
 
         Task<Project> GetByShortNameAsync(string shortName, CancellationToken cancellationToken = default);
 
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/ProjectWithoutDetails.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/ProjectWithoutDetails.cs
new file mode 100644
index 0000000000..018dc5ff8f
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/ProjectWithoutDetails.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Volo.Docs.Projects;
+
+public class ProjectWithoutDetails
+{
+    public Guid Id { get; set; }
+    public string Name { get; set; }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
index ceb2415ea4..995ac9dd04 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
@@ -33,6 +33,23 @@ namespace Volo.Docs.Documents
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<List<DocumentInfo>> GetUniqueListWithoutDetails(CancellationToken cancellationToken = default)
+        {
+            // Todo : add project id to query
+            return await (await GetDbSetAsync())
+                .Select(x=> new DocumentInfo
+                {
+                    ProjectId = x.ProjectId,
+                    Version = x.Version,
+                    LanguageCode = x.LanguageCode,
+                    Format = x.Format,
+                })
+                .Distinct()
+                .OrderByDescending(x=>x.Version)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+
+
         public async Task<List<Document>> GetListByProjectId(Guid projectId,
             CancellationToken cancellationToken = default)
         {
@@ -217,65 +234,14 @@ namespace Volo.Docs.Documents
                     LastCachedTime = x.d.LastCachedTime
                 });
         }
-        public async Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default)
-        {
-            var filterItems = new FilterItems();
-            
-            filterItems.Formats = await GetFormats(cancellationToken);
-
-            filterItems.Projects = await GetFilterProjectItems(cancellationToken);
-
-            filterItems.Versions = await GetFilterVersionItems(cancellationToken);
-
-            filterItems.Languages = await GetFilterLanguageCodeItems(cancellationToken);
-            
-            return filterItems;
-        }
 
-        private async Task<List<string>> GetFormats(CancellationToken cancellationToken)
-        {
-            return await (await GetDbSetAsync()).Select(x => x.Format).Distinct().ToListAsync(cancellationToken);
-        }
-
-        private async Task<List<FilterProjectItem>> GetFilterProjectItems(CancellationToken cancellationToken)
-        {
-            return await (await GetDbContextAsync())
-                .Projects
-                .Select(x=>new FilterProjectItem
-                {
-                    Id = x.Id,
-                    Name = x.Name
-                })
-                .OrderBy(x=>x.Name)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-        }
-
-        private async Task<List<FilterLanguageCodeItem>> GetFilterLanguageCodeItems(CancellationToken cancellationToken)
-        {
-            return await (await GetDbSetAsync())
-                .GroupBy(x => x.LanguageCode)
-                .Select(x => new FilterLanguageCodeItem 
-                {
-                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
-                    Code = x.Key,
-                    Versions = x.Select(x2 => x2.Version).Distinct()
-                })
-                .OrderBy(x=>x.Code)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-        }
-
-        private async Task<List<FilterVersionItem>> GetFilterVersionItems(CancellationToken cancellationToken)
-        {
-            return await (await GetDbSetAsync())
-                .GroupBy(x => x.Version)
-                .Select(x => new FilterVersionItem 
-                {
-                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
-                    Version = x.Key,
-                    Languages = x.Select(x2 => x2.LanguageCode).Distinct()
-                })
-                .OrderByDescending(x => x.Version)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-        }
+        // private async Task<List<FilterVersionItem>> GetFilterVersionItems(CancellationToken cancellationToken)
+        // {
+        //     var q =  (await GetDbSetAsync());
+        //    return await q.Select(x => new FilterVersionItem { Version  = x.Version, ProjectId  = x.ProjectId, LanguageCode = x.LanguageCode , Format = x.Format })
+        //         .Distinct()
+        //         .OrderByDescending(x=>x.Version)
+        //         .ToListAsync(GetCancellationToken(cancellationToken));
+        // }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs
index ed3ffe9922..f08e4b77af 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Projects/EfCoreProjectRepository.cs
@@ -28,6 +28,17 @@ namespace Volo.Docs.Projects
             return projects;
         }
 
+        public async Task<List<ProjectWithoutDetails>> GetListWithoutDetailsAsync(CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .Select(x=> new ProjectWithoutDetails() {
+                    Id = x.Id,
+                    Name = x.Name,
+                })
+                .OrderBy(x=>x.Name)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+
         public async Task<Project> GetByShortNameAsync(string shortName, CancellationToken cancellationToken = default)
         {
             var normalizeShortName = NormalizeShortName(shortName);
diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
index 529f4cb4c4..d27e57b622 100644
--- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
@@ -36,6 +36,11 @@ namespace Volo.Docs.Documents
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public Task<List<DocumentWithoutDetails>> GetUniqueListWithoutDetails(CancellationToken cancellationToken = default)
+        {
+            throw new NotImplementedException();
+        }
+
         public async Task<List<Document>> GetListByProjectId(Guid projectId, CancellationToken cancellationToken = default)
         {
             return await (await GetMongoQueryableAsync(cancellationToken)).Where(d => d.ProjectId == projectId).ToListAsync(GetCancellationToken(cancellationToken));
@@ -157,67 +162,7 @@ namespace Volo.Docs.Documents
         {
             return await (await GetMongoQueryableAsync(cancellationToken)).Where(x => x.Id == id).SingleAsync(GetCancellationToken(cancellationToken));
         }
-
-        public async Task<FilterItems> GetFilterItemsAsync(CancellationToken cancellationToken = default)
-        {
-            var filterItems = new FilterItems();
-            
-            filterItems.Formats = await GetFormats(cancellationToken);
-
-            filterItems.Projects = await GetFilterProjectItems(cancellationToken);
-
-            filterItems.Versions = await GetFilterVersionItems(cancellationToken);
-
-            filterItems.Languages = await GetFilterLanguageCodeItems(cancellationToken);
-            
-            return filterItems;
-        }
-
-        private async Task<List<string>> GetFormats(CancellationToken cancellationToken)
-        {
-            return await (await GetMongoQueryableAsync(cancellationToken)).Select(x => x.Format).Distinct().ToListAsync(cancellationToken);
-        }
-
-        private async Task<List<FilterProjectItem>> GetFilterProjectItems(CancellationToken cancellationToken)
-        {
-            return await (await GetMongoQueryableAsync<Project>(cancellationToken))
-                .Select(x=>new FilterProjectItem
-                {
-                    Id = x.Id,
-                    Name = x.Name
-                })
-                .OrderBy(x=>x.Name)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-        }
-
-        private async Task<List<FilterLanguageCodeItem>> GetFilterLanguageCodeItems(CancellationToken cancellationToken)
-        {
-            return await (await GetMongoQueryableAsync(cancellationToken))
-                .GroupBy(x => x.LanguageCode)
-                .Select(x => new FilterLanguageCodeItem 
-                {
-                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
-                    Code = x.Key,
-                    Versions = x.Select(x2 => x2.Version).Distinct()
-                })
-                .OrderBy(x=>x.Code)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-        }
-
-        private async Task<List<FilterVersionItem>> GetFilterVersionItems(CancellationToken cancellationToken)
-        {
-            return await (await GetMongoQueryableAsync(cancellationToken))
-                .GroupBy(x => x.Version)
-                .Select(x => new FilterVersionItem 
-                {
-                    ProjectIds = x.Select(x2 => x2.ProjectId).Distinct(),
-                    Version = x.Key,
-                    Languages = x.Select(x2 => x2.LanguageCode).Distinct()
-                })
-                .OrderByDescending(x => x.Version)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-        }
-
+        
         protected virtual async Task<IMongoQueryable<DocumentWithoutContent>> ApplyFilterForGetAll(
             IMongoQueryable<Document> query,
             Guid? projectId,
diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs
index a969e3390a..098047b219 100644
--- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs
+++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using Shouldly;
 using Volo.Docs.Admin.Documents;
 using Volo.Docs.Documents;
@@ -51,5 +52,20 @@ namespace Volo.Docs
             (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldNotBeNull();
             (await _documentRepository.FindAsync(_testData.PorjectId, "Part-II.md", "en", "1.0.0")).ShouldNotBeNull();
         }
+
+        [Fact]
+        public async Task GetFilterItemsAsync()
+        {
+            var filterItems = await _documentAdminAppService.GetFilterItemsAsync();
+            filterItems.Projects.ShouldNotBeEmpty();
+            filterItems.Languages.ShouldNotBeEmpty();
+            filterItems.Versions.ShouldNotBeEmpty();
+
+            filterItems.Projects.ShouldContain(p => p.Id == _testData.PorjectId);
+            filterItems.Versions.ShouldContain(p => p.Version == "2.0.0" && p.ProjectId == _testData.PorjectId);
+            filterItems.Languages.ShouldContain(p => p.LanguageCode == "en" && p.ProjectId == _testData.PorjectId);
+            filterItems.Formats.ShouldContain(p => p == "md");
+            
+        }
     }
 }
diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs
index 829195efe6..f7cfaf9508 100644
--- a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs
+++ b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs
@@ -6,5 +6,6 @@ namespace Volo.Docs
     public class DocsTestData : ISingletonDependency
     {
         public Guid PorjectId { get; } = Guid.NewGuid();
+        public Guid PorjectId2 { get; set; } = Guid.NewGuid();
     }
 }
diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs
index e7eadd7562..3504d1a819 100644
--- a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs
+++ b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs
@@ -49,6 +49,52 @@ namespace Volo.Docs
                 "https://github.com/abpframework/abp/tree/2.0.0/docs/",
                 "https://raw.githubusercontent.com/abpframework/abp/2.0.0/docs/en/", "", DateTime.Now, DateTime.Now,
                 DateTime.Now));
+            
+            
+            var project2 = new Project(
+                _testData.PorjectId2,
+                "ABP vNext2",
+                "ABP2",
+                GithubDocumentSource.Type,
+                "md",
+                "index2",
+                "docs-nav.json",
+                "docs-params.json"
+            );
+
+            project2
+                .SetProperty("GitHubRootUrl", "https://github.com/abpframework/abp/tree/{version}/docs/en/")
+                .SetProperty("GitHubAccessToken", "123456")
+                .SetProperty("GitHubUserAgent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
+
+            await _projectRepository.InsertAsync(project2);
+
+            await _documentRepository.InsertAsync(new Document(Guid.NewGuid(), project2.Id, "CLI.md", "4.0.0", "en", "CLI.md",
+                "this is abp cli", "md", "https://github.com/abpframework/abp/blob/2.0.0/docs/en/CLI.md",
+                "https://github.com/abpframework/abp/tree/2.0.0/docs/",
+                "https://raw.githubusercontent.com/abpframework/abp/2.0.0/docs/en/", "", DateTime.Now, DateTime.Now,
+                DateTime.Now));
+            
+            
+            await _documentRepository.InsertAsync(new Document(Guid.NewGuid(), project2.Id, "CLI.md", "4.0.0", "tr", "CLI.md",
+                "this is abp cli", "md", "https://github.com/abpframework/abp/blob/2.0.0/docs/en/CLI.md",
+                "https://github.com/abpframework/abp/tree/2.0.0/docs/",
+                "https://raw.githubusercontent.com/abpframework/abp/2.0.0/docs/en/", "", DateTime.Now, DateTime.Now,
+                DateTime.Now));
+            
+            await _documentRepository.InsertAsync(new Document(Guid.NewGuid(), project2.Id, "CLI.md", "4.0.0", "en", "CLI2.md",
+                "this is abp cli", "md", "https://github.com/abpframework/abp/blob/2.0.0/docs/en/CLI.md",
+                "https://github.com/abpframework/abp/tree/2.0.0/docs/",
+                "https://raw.githubusercontent.com/abpframework/abp/2.0.0/docs/en/", "", DateTime.Now, DateTime.Now,
+                DateTime.Now));
+            
+            
+            await _documentRepository.InsertAsync(new Document(Guid.NewGuid(), project2.Id, "CLI.md", "4.1.0", "en", "CLI.md",
+                "this is abp cli", "md", "https://github.com/abpframework/abp/blob/2.0.0/docs/en/CLI.md",
+                "https://github.com/abpframework/abp/tree/2.0.0/docs/",
+                "https://raw.githubusercontent.com/abpframework/abp/2.0.0/docs/en/", "", DateTime.Now, DateTime.Now,
+                DateTime.Now));
+            
         }
     }
 }
\ No newline at end of file

From 55c003da3911a33900b94040e10ff3ad5f71ea80 Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Wed, 24 Aug 2022 13:35:32 +0300
Subject: [PATCH 08/10] Refactored #13585

---
 .../Documents/IDocumentAdminAppService.cs     |  4 +-
 .../Documents/DocumentAdminAppService.cs      |  6 +-
 .../DocumentsAdminClientProxy.Generated.cs    |  7 +-
 .../DocumentsAdminClientProxy.cs              |  5 --
 .../ProjectsAdminClientProxy.Generated.cs     |  6 +-
 .../ClientProxies/ProjectsAdminClientProxy.cs |  6 --
 .../docs-admin-generate-proxy.json            | 34 ++++++++
 .../Docs/Admin/DocumentsAdminController.cs    |  5 +-
 .../Pages/Docs/Admin/Documents/index.js       | 11 +--
 .../client-proxies/docs-admin-proxy.js        | 14 +++
 .../Volo/Docs/Documents/Filter/FilterItems.cs | 11 ---
 .../Filter/FilterLanguageCodeItem.cs          | 10 ---
 .../Documents/Filter/FilterProjectItem.cs     |  9 --
 .../Documents/Filter/FilterVersionItem.cs     | 12 ---
 .../Docs/Documents/IDocumentRepository.cs     |  4 +-
 .../Documents/EFCoreDocumentRepository.cs     |  5 +-
 .../ClientProxies/docs-generate-proxy.json    | 87 +++++++++++++++++++
 .../Docs/Documents/MongoDocumentRepository.cs | 15 +++-
 .../Docs/Projects/MongoProjectRepository.cs   | 11 +++
 .../Docs/DocumentAdminAppService_Tests.cs     | 12 ++-
 20 files changed, 177 insertions(+), 97 deletions(-)
 delete mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs
 delete mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
 delete mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs
 delete mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs

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 79e3b5fc88..12bdbc87be 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,8 +3,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
-using Volo.Docs.Admin.Projects;
-using Volo.Docs.Documents.Filter;
 
 namespace Volo.Docs.Admin.Documents
 {
@@ -22,6 +20,6 @@ namespace Volo.Docs.Admin.Documents
 
         Task ReindexAsync(Guid documentId);
 
-        Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails();
+        Task<List<DocumentInfoDto>> GetFilterItemsAsync();
     }
 }
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 51e7297487..7d68681b1d 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
@@ -5,13 +5,11 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
 using Volo.Abp;
-using Volo.Abp.Uow;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
 using Volo.Docs.Caching;
 using Volo.Docs.Documents;
-using Volo.Docs.Documents.Filter;
 using Volo.Docs.Documents.FullSearch.Elastic;
 using Volo.Docs.Localization;
 using Volo.Docs.Projects;
@@ -218,9 +216,9 @@ namespace Volo.Docs.Admin.Documents
             await _elasticSearchService.AddOrUpdateAsync(document);
         }
 
-        public async Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails()
+        public async Task<List<DocumentInfoDto>> GetFilterItemsAsync()
         {
-            var documents = await _documentRepository.GetUniqueListWithoutDetails();
+            var documents = await _documentRepository.GetUniqueListDocumentInfoAsync();
             return ObjectMapper.Map<List<DocumentInfo>, List<DocumentInfoDto>>(documents);
         }
 
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
index 099047438a..e2b9fa2783 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.Generated.cs
@@ -1,6 +1,5 @@
 // This file is automatically generated by ABP framework to use MVC Controllers from CSharp
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Http.Client;
@@ -8,7 +7,7 @@ using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.ClientProxying;
 using Volo.Docs.Admin.Documents;
-using Volo.Docs.Documents.Filter;
+using System.Collections.Generic;
 
 // ReSharper disable once CheckNamespace
 namespace Volo.Docs.Admin.ClientProxies;
@@ -65,8 +64,8 @@ public partial class DocumentsAdminClientProxy : ClientProxyBase<IDocumentAdminA
         });
     }
 
-    public Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails()
+    public virtual async Task<List<DocumentInfoDto>> GetFilterItemsAsync()
     {
-        return RequestAsync<List<DocumentInfoDto>>(nameof(GetUniqueListWithoutDetails));
+        return await RequestAsync<List<DocumentInfoDto>>(nameof(GetFilterItemsAsync));
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs
index 7c6806b4a8..34899f1c49 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/DocumentsAdminClientProxy.cs
@@ -1,12 +1,7 @@
 // This file is part of DocumentsAdminClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
-
-using System.Threading.Tasks;
-using Volo.Docs.Documents.Filter;
-
 namespace Volo.Docs.Admin.ClientProxies;
 
 public partial class DocumentsAdminClientProxy
 {
-    
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs
index 3ab665159e..072106df0e 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.Generated.cs
@@ -1,6 +1,5 @@
 // This file is automatically generated by ABP framework to use MVC Controllers from CSharp
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Http.Client;
@@ -8,6 +7,7 @@ using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.ClientProxying;
 using Volo.Docs.Admin.Projects;
+using System.Collections.Generic;
 
 // ReSharper disable once CheckNamespace
 namespace Volo.Docs.Admin.ClientProxies;
@@ -62,9 +62,9 @@ public partial class ProjectsAdminClientProxy : ClientProxyBase<IProjectAdminApp
         await RequestAsync(nameof(ReindexAllAsync));
     }
 
-    public Task<List<ProjectWithoutDetailsDto>> GetListWithoutDetailsAsync()
+    public virtual async Task<List<ProjectWithoutDetailsDto>> GetListWithoutDetailsAsync()
     {
-        return RequestAsync<List<ProjectWithoutDetailsDto>>(nameof(GetListWithoutDetailsAsync));
+        return await RequestAsync<List<ProjectWithoutDetailsDto>>(nameof(GetListWithoutDetailsAsync));
     }
 
     public virtual async Task ReindexAsync(ReindexInput input)
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
index e226d8cf6b..c9584cffbf 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/ClientProxies/ProjectsAdminClientProxy.cs
@@ -1,13 +1,7 @@
 // This file is part of ProjectsAdminClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Volo.Docs.Admin.Projects;
-
 namespace Volo.Docs.Admin.ClientProxies;
 
 public partial class ProjectsAdminClientProxy
 {
-    
 }
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/docs-admin-generate-proxy.json
index e85e6fbb43..fc82ef8a41 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/docs-admin-generate-proxy.json
@@ -7,6 +7,8 @@
         "Volo.Docs.Admin.DocumentsAdminController": {
           "controllerName": "DocumentsAdmin",
           "controllerGroupName": "DocumentsAdmin",
+          "isRemoteService": true,
+          "apiVersion": null,
           "type": "Volo.Docs.Admin.DocumentsAdminController",
           "interfaces": [
             {
@@ -427,12 +429,29 @@
               },
               "allowAnonymous": null,
               "implementFrom": "Volo.Docs.Admin.Documents.IDocumentAdminAppService"
+            },
+            "GetFilterItemsAsync": {
+              "uniqueName": "GetFilterItemsAsync",
+              "name": "GetFilterItemsAsync",
+              "httpMethod": "GET",
+              "url": "api/docs/admin/documents/GetUniqueListDocumentWithoutDetails",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Docs.Admin.Documents.DocumentInfoDto>",
+                "typeSimple": "[Volo.Docs.Admin.Documents.DocumentInfoDto]"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Docs.Admin.Documents.IDocumentAdminAppService"
             }
           }
         },
         "Volo.Docs.Admin.ProjectsAdminController": {
           "controllerName": "ProjectsAdmin",
           "controllerGroupName": "ProjectsAdmin",
+          "isRemoteService": true,
+          "apiVersion": null,
           "type": "Volo.Docs.Admin.ProjectsAdminController",
           "interfaces": [
             {
@@ -684,6 +703,21 @@
               "allowAnonymous": null,
               "implementFrom": "Volo.Docs.Admin.Projects.IProjectAdminAppService"
             },
+            "GetListWithoutDetailsAsync": {
+              "uniqueName": "GetListWithoutDetailsAsync",
+              "name": "GetListWithoutDetailsAsync",
+              "httpMethod": "GET",
+              "url": "api/docs/admin/projects/GetListProjectWithoutDetailsAsync",
+              "supportedVersions": [],
+              "parametersOnMethod": [],
+              "parameters": [],
+              "returnValue": {
+                "type": "System.Collections.Generic.List<Volo.Docs.Admin.Projects.ProjectWithoutDetailsDto>",
+                "typeSimple": "[Volo.Docs.Admin.Projects.ProjectWithoutDetailsDto]"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Docs.Admin.Projects.IProjectAdminAppService"
+            },
             "ReindexAsyncByInput": {
               "uniqueName": "ReindexAsyncByInput",
               "name": "ReindexAsync",
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 c321b76614..d966aca62d 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
@@ -6,7 +6,6 @@ using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Docs.Admin.Documents;
-using Volo.Docs.Documents.Filter;
 
 namespace Volo.Docs.Admin
 {
@@ -67,9 +66,9 @@ namespace Volo.Docs.Admin
 
         [HttpGet]
         [Route("GetUniqueListDocumentWithoutDetails")]
-        public Task<List<DocumentInfoDto>> GetUniqueListWithoutDetails()
+        public async Task<List<DocumentInfoDto>> GetFilterItemsAsync()
         {
-            return _documentAdminAppService.GetUniqueListWithoutDetails();
+            return await _documentAdminAppService.GetFilterItemsAsync();
         }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index 8a7bdc6fb6..af79c9c566 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -6,16 +6,7 @@ $(function () {
         return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd');
     };
     
-    var comboboxItems = [];
-    abp.ajax({
-        url: abp.appPath + 'api/docs/admin/documents/GetUniqueListDocumentWithoutDetails',
-        type: 'GET',
-        dataType: 'json',
-        success: function (data) {
-            comboboxItems = data;
-            fillOptions();
-        }
-    });
+    var comboboxItems = service.getFilterItems();
     
     
     var $projectId = $('#ProjectId');
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 e2bd498398..c22938b314 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
@@ -61,6 +61,13 @@
       }, ajaxParams));
     };
 
+    volo.docs.admin.documentsAdmin.getFilterItems = function(ajaxParams) {
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/docs/admin/documents/GetUniqueListDocumentWithoutDetails',
+        type: 'GET'
+      }, ajaxParams));
+    };
+
   })();
 
   // controller volo.docs.admin.projectsAdmin
@@ -115,6 +122,13 @@
       }, ajaxParams));
     };
 
+    volo.docs.admin.projectsAdmin.getListWithoutDetails = function(ajaxParams) {
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/docs/admin/projects/GetListProjectWithoutDetailsAsync',
+        type: 'GET'
+      }, ajaxParams));
+    };
+
     volo.docs.admin.projectsAdmin.reindex = function(input, ajaxParams) {
       return abp.ajax($.extend(true, {
         url: abp.appPath + 'api/docs/admin/projects/Reindex',
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs
deleted file mode 100644
index f446d8bcc4..0000000000
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterItems.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Volo.Docs.Documents.Filter;
-
-public class FilterItems
-{
-    public IEnumerable<FilterProjectItem> Projects { get; set; }
-    public IEnumerable<FilterVersionItem> Versions { get; set; }
-    public IEnumerable<FilterLanguageCodeItem> Languages { get; set; }
-    public IEnumerable<string> Formats { get; set; }
-}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
deleted file mode 100644
index b38c4ace7d..0000000000
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterLanguageCodeItem.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Volo.Docs.Documents.Filter;
-
-public class FilterLanguageCodeItem
-{
-    public string LanguageCode { get; set; }
-    public Guid ProjectId { get; set; }
-}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs
deleted file mode 100644
index a4dc668255..0000000000
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterProjectItem.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Volo.Docs.Documents.Filter;
-
-public class FilterProjectItem
-{
-    public Guid Id { get; set; }
-    public string Name { get; set; }
-}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
deleted file mode 100644
index 2db5469ed9..0000000000
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Filter/FilterVersionItem.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Volo.Docs.Documents.Filter;
-
-public class FilterVersionItem
-{
-    public string Version { get; set; }
-    public string Format { get; set; }
-    public string LanguageCode { get; set; }
-    public Guid ProjectId { get; set; }
-}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
index 732d7a3fcd..b1580f379a 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentRepository.cs
@@ -3,15 +3,13 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
-using Volo.Docs.Documents.Filter;
-using Volo.Docs.Projects;
 
 namespace Volo.Docs.Documents
 {
     public interface IDocumentRepository : IBasicRepository<Document>
     {
         Task<List<DocumentWithoutDetails>> GetListWithoutDetailsByProjectId(Guid projectId, CancellationToken cancellationToken = default);
-        Task<List<DocumentInfo>> GetUniqueListWithoutDetails(CancellationToken cancellationToken = default);
+        Task<List<DocumentInfo>> GetUniqueListDocumentInfoAsync(CancellationToken cancellationToken = default);
 
         Task<List<Document>> GetListByProjectId(Guid projectId, CancellationToken cancellationToken = default);
 
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
index 995ac9dd04..69ea76a360 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
-using Volo.Docs.Documents.Filter;
 using Volo.Docs.EntityFrameworkCore;
 
 namespace Volo.Docs.Documents
@@ -33,9 +32,9 @@ namespace Volo.Docs.Documents
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<DocumentInfo>> GetUniqueListWithoutDetails(CancellationToken cancellationToken = default)
+        public async Task<List<DocumentInfo>> GetUniqueListDocumentInfoAsync(CancellationToken cancellationToken = default)
         {
-            // Todo : add project id to query
+            
             return await (await GetDbSetAsync())
                 .Select(x=> new DocumentInfo
                 {
diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/ClientProxies/docs-generate-proxy.json b/modules/docs/src/Volo.Docs.HttpApi.Client/ClientProxies/docs-generate-proxy.json
index aaae46ef73..019b508956 100644
--- a/modules/docs/src/Volo.Docs.HttpApi.Client/ClientProxies/docs-generate-proxy.json
+++ b/modules/docs/src/Volo.Docs.HttpApi.Client/ClientProxies/docs-generate-proxy.json
@@ -7,6 +7,8 @@
         "Volo.Docs.Projects.DocsProjectController": {
           "controllerName": "DocsProject",
           "controllerGroupName": "Project",
+          "isRemoteService": true,
+          "apiVersion": null,
           "type": "Volo.Docs.Projects.DocsProjectController",
           "interfaces": [
             {
@@ -222,6 +224,8 @@
         "Volo.Docs.Documents.DocsDocumentController": {
           "controllerName": "DocsDocument",
           "controllerGroupName": "Document",
+          "isRemoteService": true,
+          "apiVersion": null,
           "type": "Volo.Docs.Documents.DocsDocumentController",
           "interfaces": [
             {
@@ -648,6 +652,89 @@
               "implementFrom": "Volo.Docs.Documents.IDocumentAppService"
             }
           }
+        },
+        "Volo.Docs.Areas.Documents.DocumentResourceController": {
+          "controllerName": "DocumentResource",
+          "controllerGroupName": "DocumentResource",
+          "isRemoteService": true,
+          "apiVersion": null,
+          "type": "Volo.Docs.Areas.Documents.DocumentResourceController",
+          "interfaces": [],
+          "actions": {
+            "GetResourceByInput": {
+              "uniqueName": "GetResourceByInput",
+              "name": "GetResource",
+              "httpMethod": "GET",
+              "url": "document-resources",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Docs.Documents.GetDocumentResourceInput, Volo.Docs.Application.Contracts",
+                  "type": "Volo.Docs.Documents.GetDocumentResourceInput",
+                  "typeSimple": "Volo.Docs.Documents.GetDocumentResourceInput",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "ProjectId",
+                  "jsonName": null,
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Name",
+                  "jsonName": null,
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Version",
+                  "jsonName": null,
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "LanguageCode",
+                  "jsonName": null,
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Microsoft.AspNetCore.Mvc.FileResult",
+                "typeSimple": "Microsoft.AspNetCore.Mvc.FileResult"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Docs.Areas.Documents.DocumentResourceController"
+            }
+          }
         }
       }
     }
diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
index d27e57b622..75e1fe9276 100644
--- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
@@ -8,9 +8,7 @@ using Volo.Abp.Domain.Repositories.MongoDB;
 using Volo.Abp.MongoDB;
 using MongoDB.Driver.Linq;
 using MongoDB.Driver;
-using Volo.Docs.Documents.Filter;
 using Volo.Docs.MongoDB;
-using Volo.Docs.Projects;
 
 
 namespace Volo.Docs.Documents
@@ -36,9 +34,18 @@ namespace Volo.Docs.Documents
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public Task<List<DocumentWithoutDetails>> GetUniqueListWithoutDetails(CancellationToken cancellationToken = default)
+        public async Task<List<DocumentInfo>> GetUniqueListDocumentInfoAsync(CancellationToken cancellationToken = default)
         {
-            throw new NotImplementedException();
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .Select(x=> new DocumentInfo {
+                    ProjectId = x.ProjectId,
+                    Version = x.Version,
+                    LanguageCode = x.LanguageCode,
+                    Format = x.Format
+                })
+                .Distinct()
+                .OrderByDescending(x=>x.Version)
+                .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
         public async Task<List<Document>> GetListByProjectId(Guid projectId, CancellationToken cancellationToken = default)
diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs
index ffcff56055..0562452a2f 100644
--- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs
+++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Projects/MongoProjectRepository.cs
@@ -29,6 +29,17 @@ namespace Volo.Docs.Projects
             return projects;
         }
 
+        public async Task<List<ProjectWithoutDetails>> GetListWithoutDetailsAsync(CancellationToken cancellationToken = default)
+        {
+            return await (await GetMongoQueryableAsync(cancellationToken))
+                .Select(x=> new ProjectWithoutDetails {
+                    Id = x.Id,
+                    Name = x.Name,
+                })
+                .OrderBy(x=>x.Name)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+
         public async Task<Project> GetByShortNameAsync(string shortName, CancellationToken cancellationToken = default)
         {
             var normalizeShortName = NormalizeShortName(shortName);
diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs
index 098047b219..15d7477887 100644
--- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs
+++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs
@@ -57,14 +57,12 @@ namespace Volo.Docs
         public async Task GetFilterItemsAsync()
         {
             var filterItems = await _documentAdminAppService.GetFilterItemsAsync();
-            filterItems.Projects.ShouldNotBeEmpty();
-            filterItems.Languages.ShouldNotBeEmpty();
-            filterItems.Versions.ShouldNotBeEmpty();
+            filterItems.ShouldNotBeEmpty();
 
-            filterItems.Projects.ShouldContain(p => p.Id == _testData.PorjectId);
-            filterItems.Versions.ShouldContain(p => p.Version == "2.0.0" && p.ProjectId == _testData.PorjectId);
-            filterItems.Languages.ShouldContain(p => p.LanguageCode == "en" && p.ProjectId == _testData.PorjectId);
-            filterItems.Formats.ShouldContain(p => p == "md");
+            filterItems.ShouldContain(p => p.ProjectId == _testData.PorjectId);
+            filterItems.ShouldContain(p => p.Version == "2.0.0" && p.ProjectId == _testData.PorjectId);
+            filterItems.ShouldContain(p => p.LanguageCode == "en" && p.ProjectId == _testData.PorjectId);
+            filterItems.ShouldContain(p => p.Format == "md");
             
         }
     }

From d8c7c5d3ebe62c1e5ba3c3823711e9b745d73522 Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Wed, 24 Aug 2022 13:47:08 +0300
Subject: [PATCH 09/10] combobox error fixed

---
 .../ClientProxies/docs-admin-generate-proxy.json       |  2 +-
 .../Volo/Docs/Admin/DocumentsAdminController.cs        |  2 +-
 .../Pages/Docs/Admin/Documents/index.js                | 10 +++++++++-
 .../wwwroot/client-proxies/docs-admin-proxy.js         |  2 +-
 .../Volo/Docs/Documents/EFCoreDocumentRepository.cs    |  9 ---------
 5 files changed, 12 insertions(+), 13 deletions(-)

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/docs-admin-generate-proxy.json
index fc82ef8a41..c6cf885b09 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/docs-admin-generate-proxy.json
@@ -434,7 +434,7 @@
               "uniqueName": "GetFilterItemsAsync",
               "name": "GetFilterItemsAsync",
               "httpMethod": "GET",
-              "url": "api/docs/admin/documents/GetUniqueListDocumentWithoutDetails",
+              "url": "api/docs/admin/documents/GetFilterItems",
               "supportedVersions": [],
               "parametersOnMethod": [],
               "parameters": [],
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 d966aca62d..c0586ed699 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
@@ -65,7 +65,7 @@ namespace Volo.Docs.Admin
         }
 
         [HttpGet]
-        [Route("GetUniqueListDocumentWithoutDetails")]
+        [Route("GetFilterItems")]
         public async Task<List<DocumentInfoDto>> GetFilterItemsAsync()
         {
             return await _documentAdminAppService.GetFilterItemsAsync();
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index af79c9c566..cbebb280cb 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -6,7 +6,15 @@ $(function () {
         return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd');
     };
     
-    var comboboxItems = service.getFilterItems();
+    var comboboxItems = [];
+    service.getFilterItems()
+        .then(function (result) {
+        comboboxItems = result;
+        fillOptions();
+        }).catch(function (error) {
+            abp.message.error(error);
+        });
+    
     
     
     var $projectId = $('#ProjectId');
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 c22938b314..a39386aa3b 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
@@ -63,7 +63,7 @@
 
     volo.docs.admin.documentsAdmin.getFilterItems = function(ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/docs/admin/documents/GetUniqueListDocumentWithoutDetails',
+        url: abp.appPath + 'api/docs/admin/documents/GetFilterItems',
         type: 'GET'
       }, ajaxParams));
     };
diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
index 69ea76a360..d90b74a20f 100644
--- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
+++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
@@ -233,14 +233,5 @@ namespace Volo.Docs.Documents
                     LastCachedTime = x.d.LastCachedTime
                 });
         }
-
-        // private async Task<List<FilterVersionItem>> GetFilterVersionItems(CancellationToken cancellationToken)
-        // {
-        //     var q =  (await GetDbSetAsync());
-        //    return await q.Select(x => new FilterVersionItem { Version  = x.Version, ProjectId  = x.ProjectId, LanguageCode = x.LanguageCode , Format = x.Format })
-        //         .Distinct()
-        //         .OrderByDescending(x=>x.Version)
-        //         .ToListAsync(GetCancellationToken(cancellationToken));
-        // }
     }
 }

From 73086ba2486f02b6094dd9969389dbf9132020ff Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Mon, 29 Aug 2022 11:21:43 +0300
Subject: [PATCH 10/10] Filter error fixed

---
 .../Pages/Docs/Admin/Documents/index.js       | 171 ++++++++----------
 1 file changed, 78 insertions(+), 93 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
index cbebb280cb..85c1ebc7be 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
@@ -5,122 +5,107 @@ $(function () {
     var getFormattedDate = function ($datePicker) {
         return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd');
     };
-    
+
     var comboboxItems = [];
+    
     service.getFilterItems()
         .then(function (result) {
-        comboboxItems = result;
-        fillOptions();
+            comboboxItems = result;
+            fillOptions();
         }).catch(function (error) {
-            abp.message.error(error);
-        });
+        abp.message.error(error);
+    });
+
+
+    var $projectId = $('#ProjectId');
+
+    $projectId.on('change', function () {
+        fillOptions();
+    });
+    
+    var comboboxs = {
+        version: $('#Version'),
+        languageCode: $('#LanguageCode'),
+        format: $('#Format')
+    };
     
+    for (var key in comboboxs) {
+        comboboxs[key].on('change', function () {
+            fillOptions();
+        });
+    }
+
+
+    var selectedItem = getSelectedItem();
+
+    function emptyComboboxs() {
+        for (var key in comboboxs) {
+            comboboxs[key].empty();
+        }
+    }
     
+    function getSelectedItem() {
+        var item = {};
+        for (var key in comboboxs) {
+            item[key] = comboboxs[key].val();
+        }
+        return item;
+    }
     
-    var $projectId = $('#ProjectId');
-    var $version = $('#Version');
-    var $languageCode = $('#LanguageCode');
-    var $format = $('#Format');
+    function SetComboboxsValues(item) {
+        for (var key in comboboxs) {
+            comboboxs[key].val(item[key]);
+        }
+    }
     
+    function addComboboxsEmptyItem() {
+        for (var key in comboboxs) {
+            comboboxs[key].append($('<option/>').val('').text(''));
+        }
+    }
+
     function fillOptions() {
-        var selectedVersion = $version.val();
-        var selectedLanguageCode = $languageCode.val();
-        var selectedFormat = $format.val();
+        
+        selectedItem = getSelectedItem();
+        
         var selectedProjectId = $projectId.val();
 
-        $version.empty();
-        $languageCode.empty();
-        $format.empty();
+        emptyComboboxs();
         
-        $version.append($('<option/>').val(''));
-        $languageCode.append($('<option/>').val(''));
-        $format.append($('<option/>').val(''));
+        addComboboxsEmptyItem();
 
+        var selectedProjectItems = comboboxItems.filter((item) => !selectedProjectId || item.projectId === selectedProjectId);
         
-        comboboxItems.forEach(function (item) {
-            if (!selectedProjectId || item.projectId === selectedProjectId) {
-                appendVersion(item,selectedVersion,selectedLanguageCode,selectedFormat);
-                appendLanguageCode(item,selectedLanguageCode,selectedVersion,selectedFormat);
-                appendFormat(item,selectedFormat,selectedVersion,selectedLanguageCode);
+        for (var key in selectedItem) {
+            var item = selectedProjectItems.find((item) => item[key] === selectedItem[key]);
+            if (item) {
+                selectedItem[key] = item[key];
+            }else {
+                selectedItem[key] = '';
             }
-        });
-        
-    }
-    function appendFormat(item,selectedFormat,selectedVersion,selectedLanguageCode) {
-        if(selectedVersion && selectedVersion !== item.version) {
-            return;
-        }
-        if(selectedLanguageCode && selectedLanguageCode !== item.languageCode) {
-            return;
         }
+        
 
-        if($format.find('option[value="' + item.format + '"]').length === 0) {
-            var formatOption = $('<option>',{
-                value: item.format,
-                text: item.format
-            });
-            if(selectedFormat === item.format) {
-                formatOption.attr('selected', 'selected');
+        selectedProjectItems.forEach(function (item) {
+            for (var key in comboboxs) {
+                appendComboboxItem(comboboxs[key], item, key);
             }
-            $format.append(formatOption);
-        }
-    }
-    
-    function appendLanguageCode(item,selectedLanguageCode,selectedVersion,selectedFormat) {
-        if(selectedVersion && selectedVersion !== item.version) {
-            return;
-        }
-        if(selectedFormat && selectedFormat !== item.format) {
-            return;
-        }
+        });
         
-        if($languageCode.find('option[value="' + item.languageCode + '"]').length === 0) {
-            var languageCodeOption = $('<option>',{
-                value: item.languageCode,
-                text: item.languageCode
-            });
-            if(selectedLanguageCode === item.languageCode) {
-                languageCodeOption.attr('selected', 'selected');
-            }
-            $languageCode.append(languageCodeOption);
-        }
+        SetComboboxsValues(selectedItem);
     }
-    function appendVersion(item,selectedVersion,selectedLanguageCode,selectedFormat) {
-        if(selectedLanguageCode && item.languageCode !== selectedLanguageCode) {
-            return;
-        }
-        if(selectedFormat && selectedFormat !== item.format) {
-            return;
-        }
-        
-        if($version.find('option[value="' + item.version + '"]').length === 0) {
-            var versionOption = $('<option>', {
-                value: item.version,
-                text: item.version
-            })
-            if(selectedVersion === item.version) {
-                versionOption.attr('selected', 'selected');
-            }
-            $version.append(versionOption);
+    function appendComboboxItem($combobox, item , key) {
+        $.each(item, function (index, value) {
+            if(index !== key) {
+                if(selectedItem[index] && selectedItem[index] !== value) {
+                    return ;
+                }}
+        });
+        if($combobox.find('option[value="' + item[key] + '"]').length === 0){
+            $combobox.append($('<option/>').val(item[key]).text(item[key]));
         }
     }
 
-    $projectId.on('change', function () {
-        fillOptions();
-    });
-    
-    $version.on('change', function () {
-        fillOptions();
-    });
-    
-    $languageCode.on('change', function () {
-        fillOptions();
-    });
-    
-    $format.on('change', function () {
-        fillOptions();
-    });
-    
     var getFilter = function () {
         return {
             projectId: $('#ProjectId').val(),