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] 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));
-        // }
     }
 }