Merge branch 'dev' into dapr-integration

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json

@@ -565,7 +565,7 @@
     "PrePayment_IyzicoRedirectionInfo": "您将被重定向到 Iyzico 支付网关以安全地完成您的购买。",
     "PrePayment_IyzicoAcceptVisaAndMasterCard": "Iyzico 接受 Visa 和 MasterCard。",
     "Purchase": "购买",
-    "AcceptTermsAndConditions": "我已阅读、理解并接受<a href=\"{0}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">隐私政策</a>， <a href=\"{1}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">条款和条件</a>和<a href=\"{ 2}\" target=\"_blank\" class=\"text-primary\"> EULA。</a>",
+    "AcceptTermsAndConditions": "我已阅读、理解并接受<a href=\"{0}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">隐私政策</a>， <a href=\"{1}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">条款和条件</a>和<a href=\"{2}\" target=\"_blank\" class=\"text-primary\"> EULA。</a>",
     "AcceptTermsAndConditionsWarningMessage": "请接受隐私政策和条款和条件",
     "SelectGatewayToContinue": "请选择一个网关以继续！",
     "GatewaySelection_SelectGateway": "选择支付网关",

docs/en/Road-Map.md

@@ -4,18 +4,18 @@ This document provides a road map, release schedule and planned features for the
 
 ## Next Versions
 
-### v6.0
+### v7.0
 
-In [6.0 milestone](https://github.com/abpframework/abp/milestone/61), we will be mostly working on the following topics:
+In the [7.0 milestone](https://github.com/abpframework/abp/milestone/75), we will be mostly working on the following topics:
 
-* Providing an OpenIddict integration to replace current IdentityServer4 integration.
+* Dapr integration ([#13337](https://github.com/abpframework/abp/issues/13337))
+* Upgrade to .NET 7.0 ([#13336](https://github.com/abpframework/abp/issues/13336))
+* Integration Services ([#12470](https://github.com/abpframework/abp/issues/12470))
 * Maturing and documenting the [eShopOnAbp](https://github.com/abpframework/eShopOnAbp) project, writing a free e-book that explains the solution.
-* Working on the [LeptonX](https://blog.abp.io/abp/LeptonX-Theme-for-ABP-Framework-Alpha-Release) theme and making it as the default theme for the ABP Framework UI options.
+* Working on the [LeptonX](https://blog.abp.io/abp/LeptonX-Theme-for-ABP-Framework-Alpha-Release) theme.
 * Improvements on the existing features and providing more guides.
 
-The planned stable release date for v6.0 is **July, 2022**.
+The planned stable release date for v7.0 is **December, 2022**. We will be publishing more than one pre-release versions before that date.
-
-> After the version 6.0, we will be working for ABP 7.0 which will be released in the end of 2022 based on .NET 7.0.
 
 ## Backlog Items
 
@@ -23,7 +23,6 @@ The *Next Versions* section above shows the main focus of the planned versions.
 
 Here, a list of major items in the backlog we are considering to work on in the next versions.
 
-* [#2183](https://github.com/abpframework/abp/issues/2183) / Dapr integration
 * [#6655](https://github.com/abpframework/abp/pull/6655) / Use Typescript for the MVC UI
 * [#236](https://github.com/abpframework/abp/issues/236) / Resource based authorization system
 * [#2882](https://github.com/abpframework/abp/issues/2882) / Providing a gRPC integration infrastructure (while it is [already possible](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) to create or consume gRPC endpoints for your application, we plan to create endpoints for the [standard application modules](https://docs.abp.io/en/abp/latest/Modules/Index))

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs

@@ -1,6 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
@@ -20,6 +19,6 @@ public class AbpAspNetCoreMvcClientModule : AbpModule
 
     public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
     {
-        await context.ServiceProvider.GetRequiredService<IClientScopeServiceProviderAccessor>().ServiceProvider.GetRequiredService<MvcCachedApplicationConfigurationClient>().InitializeAsync();
+        await context.ServiceProvider.GetRequiredService<MvcCachedApplicationConfigurationClient>().InitializeAsync();
     }
 }

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs

@@ -9,7 +9,7 @@ public static class AbpHostingEnvironmentExtensions
         this IWebHostEnvironment env,
         AbpConfigurationBuilderOptions options = null)
     {
-        options = options ?? new AbpConfigurationBuilderOptions();
+        options ??= new AbpConfigurationBuilderOptions();
 
         if (options.BasePath.IsNullOrEmpty())
         {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

@@ -141,6 +141,13 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             "AbpAspNetCoreComponentsWebAssemblyLeptonThemeModule"
         );
 
+        ChangeNamespace(
+            context,
+            "/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXTheme",
+            "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonTheme"
+        );
+
         #endregion
 
         #region MyCompanyName.MyProjectName.Blazor.Server && MyCompanyName.MyProjectName.Blazor.Server.Tiered 
@@ -210,7 +217,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             }
             
             AddProjectReference(file, $@"..\..\..\..\lepton-theme\src\Volo.Abp.LeptonTheme.Management.{projectName}\Volo.Abp.LeptonTheme.Management.{projectName}.csproj");
-            AddModuleDependency(moduleFile, $"LeptonThemeManagement{ConvertProjectNameToModuleName($"{projectName}")}Module");
+            AddModuleDependency(moduleFile, projectName, $"LeptonThemeManagement{ConvertProjectNameToModuleName($"{projectName}")}Module");
         }
     }
 
@@ -325,21 +332,22 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             
         AddProjectReference(projectFile, reference);
 
-        AddModuleDependency(moduleFile, $"LeptonThemeManagement{ConvertProjectNameToModuleName(projectInfo.Key)}Module",
+        AddModuleDependency(moduleFile, projectInfo.Key, $"LeptonThemeManagement{ConvertProjectNameToModuleName(projectInfo.Key)}Module",
             underManagementFolder: projectInfo.Key != "HttpApi");
     }
 
-    private void AddModuleDependency(FileEntry moduleFile, string dependency, bool underManagementFolder = true)
+    private void AddModuleDependency(FileEntry moduleFile, string projectName, string dependency, bool underManagementFolder = true)
     {
-        var lines = moduleFile.GetLines();
+        var projectNames = new[] { "Blazor", "Blazor.Server", "Blazor.WebAssembly" };
 
+        var lines = moduleFile.GetLines();
         for (var i = 0; i < lines.Length; i++)
         {
             if (lines[i].Contains("namespace MyCompanyName.MyProjectName"))
             {
-                lines[i - 1] = lines[i - 1] + "using Volo.Abp.LeptonTheme" + (underManagementFolder ? ".Management" : "").EnsureEndsWith(';') + Environment.NewLine;
+                lines[i - 1] = lines[i - 1] + ("using Volo.Abp.LeptonTheme" + (underManagementFolder ? ".Management." : ".") + (projectNames.Any(p => p == projectName) ? projectName : "")).TrimEnd('.').EnsureEndsWith(';') + Environment.NewLine;
             }
-            
+
             if (lines[i].Contains("public class MyProjectName") && lines[i-1].Contains(")]"))
             {
                 lines[i - 2] = lines[i - 2] + "," + Environment.NewLine + $"\ttypeof({dependency})";
@@ -584,9 +592,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
             .Replace(".csproj", "Module")
             .Replace(".", "");
 
-        fileName = ConvertProjectNameToModuleName(fileName);
+        return context.Files.FirstOrDefault(f => f.Name.Contains(splittedProjectFileName.Last() + "/" + fileName) && f.Name.EndsWith("Module.cs"));
-        
-        return context.Files.FirstOrDefault(f => f.Name.Contains(splittedProjectFileName.Last() + "/" + fileName));
     }
     
     private static string ConvertProjectNameToModuleName(string moduleName)
@@ -796,6 +802,12 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
                 "BlazorLeptonXThemeBundles.Scripts.Global",
                 "BlazorLeptonThemeBundles.Scripts.Global"
             );
+
+            RemoveLinesByStatement(
+                context,
+                $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameBlazorModule.cs",
+                "Volo.Abp.LeptonX.Shared;"
+            );
         }
     }
 

framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs

@@ -9,7 +9,7 @@ public static class ConfigurationHelper
         AbpConfigurationBuilderOptions options = null,
         Action<IConfigurationBuilder> builderAction = null)
     {
-        options = options ?? new AbpConfigurationBuilderOptions();
+        options ??= new AbpConfigurationBuilderOptions();
 
         if (options.BasePath.IsNullOrEmpty())
         {

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml

@@ -37,7 +37,7 @@
     <abp-card-body>
         <div id="CmsKitCommentsWrapper">
             <form id="CmsKitCommentsFilterForm" method="post">
-                <abp-row>
+                <abp-row class="align-items-end">
                     <abp-column size-lg="_4" size-md="_12">
                         <abp-row class="input-daterange">
                             <abp-column size-lg="_6" size-md="_6">
@@ -58,11 +58,9 @@
                     </abp-column>
 
                     <abp-column size-lg="_2" size-md="_6">
-                        <div class="d-grid gap-2">
+                        <abp-button class="w-100 mb-3" button-type="Primary" type="submit">
-                            <abp-button class="mt-md-4" button-type="Primary" type="submit" style="margin-top: 1.75rem !important;">
+                            <i class="fa fa-search" aria-hidden="true"></i>
-                                <i class="fa fa-search" aria-hidden="true"></i>
+                        </abp-button>
-                            </abp-button>
-                        </div>
                     </abp-column>
                 </abp-row>
             </form>

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/ar.json

@@ -54,6 +54,7 @@
     "Version": "إصدار",
     "LanguageCode": "رمز اللغة",
     "FileName": "اسم الملف",
-    "LastCachedTime": "وقت ذاكرة التخزين"
+    "LastCachedTime": "وقت ذاكرة التخزين",
+    "Project": "مشروع "
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/cs.json

@@ -54,6 +54,7 @@
     "Version": "Verze",
     "LanguageCode": "Kód jazyka",
     "FileName": "Název souboru",
-    "LastCachedTime": "Čas uložení v mezipaměti"
+    "LastCachedTime": "Čas uložení v mezipaměti",
+    "Project": "Projekt"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/de-DE.json

@@ -54,6 +54,7 @@
     "Version": "Version",
     "LanguageCode": "Sprachcode",
     "FileName": "Dateiname",
-    "LastCachedTime": "Cache-Zeit"
+    "LastCachedTime": "Cache-Zeit",
+    "Project": "Projekt"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/de.json

@@ -32,6 +32,7 @@
     "DisplayName:GitHubUserAgent": "GitHub-Benutzer-Agent",
     "DisplayName:All": "Pull all",
     "DisplayName:LanguageCode": "Sprachcode",
-    "DisplayName:Version": "Version"
+    "DisplayName:Version": "Version",
+    "Project": "Projekt"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/el.json

@@ -54,6 +54,7 @@
     "Version": "Εκδοχή",
     "LanguageCode": "Κωδικός γλώσσας",
     "FileName": "Όνομα αρχείου",
-    "LastCachedTime": "Χρόνος προσωρινής αποθήκευσης"
+    "LastCachedTime": "Χρόνος προσωρινής αποθήκευσης",
+    "Project": "Εργο"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en-GB.json

@@ -54,6 +54,8 @@
     "Version": "Version",
     "LanguageCode": "Language code",
     "FileName": "File name",
-    "LastCachedTime": "Cache time"
+    "LastCachedTime": "Cache time",
+    "Project": "Project",
+    "AdvancedFilters": "Advanced Filters"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json

@@ -54,6 +54,8 @@
     "Version": "Version",
     "LanguageCode": "Language code",
     "FileName": "File name",
-    "LastCachedTime": "Cache time"
+    "LastCachedTime": "Cache time",
+    "Project": "Project",
+    "AdvancedFilters": "Advanced Filters"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/es.json

@@ -54,6 +54,7 @@
     "Version": "Versión",
     "LanguageCode": "Código de idioma",
     "FileName": "Nombre de fichero",
-    "LastCachedTime": "Última actualización de caché"
+    "LastCachedTime": "Última actualización de caché",
+    "Project": "Proyecto"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/fi.json

@@ -54,6 +54,7 @@
     "Version": "Versio",
     "LanguageCode": "Kielikoodi",
     "FileName": "Tiedoston nimi",
-    "LastCachedTime": "Välimuistin aika"
+    "LastCachedTime": "Välimuistin aika",
+    "Project": "Projekti"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/fr.json

@@ -54,6 +54,7 @@
     "Version": "Version",
     "LanguageCode": "Code de langue",
     "FileName": "Nom de fichier",
-    "LastCachedTime": "Temps de cache"
+    "LastCachedTime": "Temps de cache",
+    "Project": "Projet"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/hi.json

@@ -54,6 +54,7 @@
     "Version": "संस्करण",
     "LanguageCode": "भाषा कोड",
     "FileName": "फ़ाइल का नाम",
-    "LastCachedTime": "कैश समय"
+    "LastCachedTime": "कैश समय",
+    "Project": "परियोजना"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/hu.json

@@ -1,61 +1,61 @@
 {
-    "culture": "hu",
+  "culture": "hu",
-    "texts": {
+  "texts": {
-      "Permission:DocumentManagement": "Dokumentum kezelés",
+    "Permission:DocumentManagement": "Dokumentum kezelés",
-      "Permission:Projects": "Projektek",
+    "Permission:Projects": "Projektek",
-      "Permission:Edit": "Szerkesztés",
+    "Permission:Edit": "Szerkesztés",
-      "Permission:Delete": "Törlés",
+    "Permission:Delete": "Törlés",
-      "Permission:Create": "Létrehozás",
+    "Permission:Create": "Létrehozás",
-      "Permission:Documents": "Dokumentumok",
+    "Permission:Documents": "Dokumentumok",
-      "Menu:Documents": "Dokumentumok",
+    "Menu:Documents": "Dokumentumok",
-      "Menu:DocumentManagement": "Dokumentumok",
+    "Menu:DocumentManagement": "Dokumentumok",
-      "Menu:ProjectManagement": "Projektek",
+    "Menu:ProjectManagement": "Projektek",
-      "CreateANewProject": "Új projekt létrehozása",
+    "CreateANewProject": "Új projekt létrehozása",
-      "Edit": "Szerkesztés",
+    "Edit": "Szerkesztés",
-      "Create": "Létrehozás",
+    "Create": "Létrehozás",
-      "Pull": "Pull",
+    "Pull": "Pull",
-      "Projects": "Projektek",
+    "Projects": "Projektek",
-      "Name": "Név",
+    "Name": "Név",
-      "ShortName": "Rövid név",
+    "ShortName": "Rövid név",
-      "DocumentStoreType": "Dokumentumtároló típus",
+    "DocumentStoreType": "Dokumentumtároló típus",
-      "Format": "Formátum",
+    "Format": "Formátum",
-      "ShortNameInfoText": "Használjon egyedi URL-t.",
+    "ShortNameInfoText": "Használjon egyedi URL-t.",
-      "DisplayName:Name": "Név",
+    "DisplayName:Name": "Név",
-      "DisplayName:ShortName": "Rövid név",
+    "DisplayName:ShortName": "Rövid név",
-      "DisplayName:Format": "Formátum",
+    "DisplayName:Format": "Formátum",
-      "DisplayName:DefaultDocumentName": "Alapértlemezett dokumentum név",
+    "DisplayName:DefaultDocumentName": "Alapértlemezett dokumentum név",
-      "DisplayName:NavigationDocumentName": "Navigációs dokumentum neve",
+    "DisplayName:NavigationDocumentName": "Navigációs dokumentum neve",
-      "DisplayName:MinimumVersion": "Minimális verzió",
+    "DisplayName:MinimumVersion": "Minimális verzió",
-      "DisplayName:MainWebsiteUrl": "A fő webhely URL-je",
+    "DisplayName:MainWebsiteUrl": "A fő webhely URL-je",
-      "DisplayName:LatestVersionBranchName": "Az utolsó verzió branch neve",
+    "DisplayName:LatestVersionBranchName": "Az utolsó verzió branch neve",
-      "DisplayName:GitHubRootUrl": "GitHub root URL",
+    "DisplayName:GitHubRootUrl": "GitHub root URL",
-      "DisplayName:GitHubAccessToken": "GitHub access token",
+    "DisplayName:GitHubAccessToken": "GitHub access token",
-      "DisplayName:GitHubUserAgent": "GitHub user agent",
+    "DisplayName:GitHubUserAgent": "GitHub user agent",
-      "DisplayName:GithubVersionProviderSource": "GitHub version provider source",
+    "DisplayName:GithubVersionProviderSource": "GitHub version provider source",
-      "DisplayName:VersionBranchPrefix": "Version branch prefix",
+    "DisplayName:VersionBranchPrefix": "Version branch prefix",
-      "DisplayName:All": "Pull all",
+    "DisplayName:All": "Pull all",
-      "DisplayName:LanguageCode": "Nyelv kódja",
+    "DisplayName:LanguageCode": "Nyelv kódja",
-      "DisplayName:Version": "Verzió",
+    "DisplayName:Version": "Verzió",
-      "Documents": "Dokumentumok",
+    "Documents": "Dokumentumok",
-      "RemoveFromCache": "Távolítsa el a gyorsítótárból",
+    "RemoveFromCache": "Távolítsa el a gyorsítótárból",
-      "Reindex": "Újraindexálás",
+    "Reindex": "Újraindexálás",
-      "ReindexCompleted": "Újraindexálás teljes.",
+    "ReindexCompleted": "Újraindexálás teljes.",
-      "RemovedFromCache": "Távolítsa el a gyorsítótárból",
+    "RemovedFromCache": "Távolítsa el a gyorsítótárból",
-      "RemoveFromCacheConfirmation": "Biztosan eltávolítja ezt az elemet a gyorsítótárból?",
+    "RemoveFromCacheConfirmation": "Biztosan eltávolítja ezt az elemet a gyorsítótárból?",
-      "ReIndexDocumentConfirmation": "Biztosan újraindexeli ezt az elemet?",
+    "ReIndexDocumentConfirmation": "Biztosan újraindexeli ezt az elemet?",
-      "DeleteDocumentFromDbConfirmation": "Biztosan törli ezt az elemet az adatbázisból?",
+    "DeleteDocumentFromDbConfirmation": "Biztosan törli ezt az elemet az adatbázisból?",
-      "DeleteFromDatabase": "Törlés az adatbázisból",
+    "DeleteFromDatabase": "Törlés az adatbázisból",
-      "Deleted": "Törölt",
+    "Deleted": "Törölt",
-      "Search": "Keresés",
+    "Search": "Keresés",
-      "StartDate": "Indulási dátum",
+    "StartDate": "Indulási dátum",
-      "EndDate": "Befejezés dátuma",
+    "EndDate": "Befejezés dátuma",
-      "CreationTime": "Létrehozás ideje",
+    "CreationTime": "Létrehozás ideje",
-      "LastUpdateTime": "Utolsó módosítás ideje",
+    "LastUpdateTime": "Utolsó módosítás ideje",
-      "LastSignificantUpdateTime": "Utolsó jelentős frissítés",
+    "LastSignificantUpdateTime": "Utolsó jelentős frissítés",
-      "Version": "Verzió",
+    "Version": "Verzió",
-      "LanguageCode": "Nyelv kódja",
+    "LanguageCode": "Nyelv kódja",
-      "FileName": "Filenév",
+    "FileName": "File név",
-      "LastCachedTime": "Cache idő"
+    "LastCachedTime": "Cache idő",
-    }
+    "Project": "Projekt"
   }
-  
+}

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/is.json

@@ -54,6 +54,7 @@
     "Version": "Útgáfa",
     "LanguageCode": "Túngumála kóði",
     "FileName": "Skráar nafn",
-    "LastCachedTime": "Tími geymt í skyndiminni"
+    "LastCachedTime": "Tími geymt í skyndiminni",
+    "Project": "Verkefni"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/it.json

@@ -54,6 +54,7 @@
     "Version": "Versione",
     "LanguageCode": "Codice della lingua",
     "FileName": "Nome del file",
-    "LastCachedTime": "Tempo di cache"
+    "LastCachedTime": "Tempo di cache",
+    "Project": "Progetto"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/nl.json

@@ -54,6 +54,7 @@
     "Version": "Versie",
     "LanguageCode": "Taalcode",
     "FileName": "Bestandsnaam",
-    "LastCachedTime": "Cache tijd"
+    "LastCachedTime": "Cache tijd",
+    "Project": "Project"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pl-PL.json

@@ -54,6 +54,7 @@
     "Version": "Wersja",
     "LanguageCode": "Kod języka",
     "FileName": "Nazwa pliku",
-    "LastCachedTime": "Czas w pamięci podręcznej"
+    "LastCachedTime": "Czas w pamięci podręcznej",
+    "Project": "Projekt"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pt-BR.json

@@ -54,6 +54,7 @@
     "Version": "Versão",
     "LanguageCode": "Código de idioma",
     "FileName": "Nome do arquivo",
-    "LastCachedTime": "Tempo de cache"
+    "LastCachedTime": "Tempo de cache",
+    "Project": "Projeto"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/ro-RO.json

@@ -54,6 +54,7 @@
     "Version": "Versiune",
     "LanguageCode": "Codul limbii",
     "FileName": "Nume fişier",
-    "LastCachedTime": "Durată cache"
+    "LastCachedTime": "Durată cache",
+    "Project": "Proiect"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/ru.json

@@ -54,6 +54,7 @@
     "Version": "Версия",
     "LanguageCode": "Код языка",
     "FileName": "Имя файла",
-    "LastCachedTime": "Время кеширования"
+    "LastCachedTime": "Время кеширования",
+    "Project": "Проект"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/sk.json

@@ -54,6 +54,7 @@
     "Version": "Verzia",
     "LanguageCode": "Kód jazyka",
     "FileName": "Názov súboru",
-    "LastCachedTime": "Čas vyrovnávacej pamäte"
+    "LastCachedTime": "Čas vyrovnávacej pamäte",
+    "Project": "Projekt"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/sl.json

@@ -54,6 +54,7 @@
     "Version": "Različica",
     "LanguageCode": "Jezikovna koda",
     "FileName": "Ime datoteke",
-    "LastCachedTime": "Čas predpomnilnika"
+    "LastCachedTime": "Čas pred pomnilnika",
+    "Project": "Projekt"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json

@@ -51,9 +51,11 @@
     "CreationTime": "oluşturma zamanı",
     "LastUpdateTime": "Son Güncelleme",
     "LastSignificantUpdateTime": "Son önemli güncelleme",
-    "Version": "sürüm",
+    "Version": "Sürüm",
     "LanguageCode": "Dil kodu",
     "FileName": "Dosya adı",
-    "LastCachedTime": "Önbellek süresi"
+    "LastCachedTime": "Önbellek süresi",
+    "Project": "Proje",
+    "AdvancedFilters": "Gelişmiş Filtre"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/vi.json

@@ -54,6 +54,7 @@
     "Version": "Phiên bản",
     "LanguageCode": "Mật ngữ",
     "FileName": "Tên tệp",
-    "LastCachedTime": "Thời gian lưu vào bộ nhớ đệm"
+    "LastCachedTime": "Thời gian lưu vào bộ nhớ đệm",
+    "Project": "Dự án"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/zh-Hans.json

@@ -54,6 +54,7 @@
     "Version": "版本",
     "LanguageCode": "语言代码",
     "FileName": "文件名称",
-    "LastCachedTime": "缓存项"
+    "LastCachedTime": "缓存项",
+    "Project": "项目"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/zh-Hant.json

@@ -54,6 +54,7 @@
     "Version": "版本",
     "LanguageCode": "語言代碼",
     "FileName": "文檔名稱",
-    "LastCachedTime": "緩存時間"
+    "LastCachedTime": "緩存時間",
+    "Project": "项目"
   }
 }

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml

@@ -32,147 +32,150 @@
         <abp-card-header>
             <form autocomplete="off" id="FilterForm">
 
-                <div class="row">
+                <abp-row>
-                    <div class="col-auto">
-                        <div class="input-group mb-2">
-                            <div class="input-group-text">@L["Name"].Value</div>
-
-                            <input type="text"
-                                   id="Name"
-                                   name="Name"
-                                   class="form-control me-sm-2">
-                        </div>
-                    </div>
 
-                    <div class="col-auto">
+                    <abp-column size="_4">
                         <div class="input-group mb-2">
-                            <div class="input-group-text">@L["Version"].Value</div>
+                            <div class="input-group-text">@L["Project"].Value</div>
 
                             <input type="text"
-                                   id="Version"
+                               id="ProjectId"
-                                   name="Version"
+                               name="ProjectId"
-                                   class="form-control me-sm-2">
+                               class="form-control">
                         </div>
-                    </div>
+                    </abp-column>
 
-                    <div class="col-auto">
+                    <abp-column size="_4">
                         <div class="input-group mb-2">
-                            <div class="input-group-text">@L["LanguageCode"].Value</div>
+                            <div class="input-group-text">@L["Name"].Value</div>
 
                             <input type="text"
-                                   id="LanguageCode"
+                               id="Name"
-                                   name="LanguageCode"
+                               name="Name"
-                                   class="form-control me-sm-2">
+                               class="form-control">
                         </div>
-                    </div>
+                    </abp-column>
-
 
-                    <div class="col-auto">
+                    <abp-column size="_2">
                         <div class="input-group mb-2">
-                            <div class="input-group-text">@L["FileName"].Value</div>
+                            <div class="input-group-text">@L["Version"].Value</div>
 
                             <input type="text"
-                                   id="FileName"
+                               id="Version"
-                                   name="FileName"
+                               name="Version"
-                                   class="form-control me-sm-2">
+                               class="form-control">
                         </div>
-                    </div>
+                    </abp-column>
-
+                        
-                    <div class="col-auto">
+                    <abp-column size="_3">
                         <div class="input-group mb-2">
-                            <div class="input-group-text">@L["Format"].Value</div>
+                            <div class="input-group-text">@L["LanguageCode"].Value</div>
 
                             <input type="text"
-                                   id="Format"
+                               id="LanguageCode"
-                                   name="Format"
+                               name="LanguageCode"
-                                   class="form-control me-sm-2">
+                               class="form-control">
                         </div>
-                    </div>
+                    </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>
+                        </abp-column>
+                    </abp-row>
+                    <abp-row id="AdvancedFilterSection" style="display: none;">
 
-                    <div class="col-auto">
+                        <abp-column size="_4">
-                        <div class="input-group mb-2">
+                            <div class="input-group mb-2">
-                            <div class="input-group-text">@L["CreationTime"].Value</div>
+                                <div class="input-group-text">@L["CreationTime"].Value</div>
 
-                            <span>
+                                    <input type="date"
-                                <input type="date"
                                        id="CreationTimeMin"
                                        name="CreationTimeMin"
                                        class="form-control datepicker"
                                        placeholder="@L["StartDate"].Value">
-                                <span>-</span>
+                                    
-                                <input type="date"
+                                    <input type="date"
                                        id="CreationTimeMax"
                                        name="CreationTimeMax"
                                        placeholder="@L["EndDate"].Value"
                                        class="form-control datepicker">
-                            </span>
+                            </div>
-                        </div>
+                        </abp-column>
-                    </div>
 
-                    <div class="col-auto">
+                        <abp-column size="_4">
-                        <div class="input-group mb-2">
+                            <div class="input-group mb-2">
-                            <div class="input-group-text">@L["LastUpdateTime"].Value</div>
+                                <div class="input-group-text">@L["LastUpdateTime"].Value</div>
-                            <span>
+                                    <input type="date"
-                                <input type="date"
                                        id="LastUpdatedTimeMin"
                                        name="LastUpdatedTimeMin"
                                        class="form-control datepicker"
                                        placeholder="@L["StartDate"].Value">
-                                <span>-</span>
+                                    <span>-</span>
-                                <input type="date"
+                                    <input type="date"
                                        id="LastUpdatedTimeMax"
                                        name="LastUpdatedTimeMax"
                                        placeholder="@L["EndDate"].Value"
                                        class="form-control datepicker">
-                            </span>
+                            </div>
-                        </div>
+                        </abp-column>
-                    </div>
-
-                    <div class="col-auto">
-                        <div class="input-group mb-2">
-                            <div class="input-group-text">@L["LastSignificantUpdateTime"].Value</div>
-
-                            <span>
-                                <input type="date"
-                                       id="LastSignificantUpdateTimeMin"
-                                       name="LastSignificantUpdateTimeMin"
-                                       class="form-control datepicker"
-                                       placeholder="@L["StartDate"].Value">
-                                <span>-</span>
-                                <input type="date"
-                                       id="LastSignificantUpdateTimeMax"
-                                       name="LastSignificantUpdateTimeMax"
-                                       placeholder="@L["EndDate"].Value"
-                                       class="form-control datepicker">
-                            </span>
-                        </div>
-                    </div>
 
-                    <div class="col-auto">
+                        <abp-column size="_4">
-                        <div class="input-group mb-2">
+                            <div class="input-group mb-2">
-                            <div class="input-group-text">@L["LastCachedTime"].Value</div>
+                                <div class="input-group-text">@L["LastCachedTime"].Value</div>
 
-                            <span>
+                                    <input type="date"
-                                <input type="date"
                                        id="LastCachedTimeMin"
                                        name="LastCachedTimeMin"
                                        class="form-control datepicker"
                                        placeholder="@L["StartDate"].Value">
-                                <span>-</span>
+                                       
-                                <input type="date"
+                                    <input type="date"
                                        id="LastCachedTimeMax"
                                        name="LastCachedTimeMax"
                                        placeholder="@L["EndDate"].Value"
                                        class="form-control datepicker">
-                            </span>
+                            </div>
-                        </div>
+                        </abp-column>
-                    </div>
+                        
+                        <abp-column size="_2">
+                            <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">
+                            </div>
+                        </abp-column>
+
+                        <abp-column size="_2">
+                        </abp-column>
+                        
+                          <abp-column size="_5">
+                            <div class="input-group mb-2">
+                                <div class="input-group-text">@L["LastSignificantUpdateTime"].Value</div>
+
+                                    <input type="date"
+                                       id="LastSignificantUpdateTimeMin"
+                                       name="LastSignificantUpdateTimeMin"
+                                       class="form-control datepicker"
+                                       placeholder="@L["StartDate"].Value">
+                                       
+                                    <input type="date"
+                                       id="LastSignificantUpdateTimeMax"
+                                       name="LastSignificantUpdateTimeMax"
+                                       placeholder="@L["EndDate"].Value"
+                                       class="form-control datepicker">
+                            </div>
+                        </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>
-                </div>
+                </abp-row>
             </form>
         </abp-card-header>
         <abp-card-body>
@@ -186,7 +189,7 @@
                         <th>@L["FileName"]</th>
                         <th>@L["Format"]</th>
                         <th>@L["CreationTime"]</th>
-                        <th>@L["LastUpdatedTime"]</th>
+                        <th>@L["LastUpdateTime"]</th>
                         <th>@L["LastSignificantUpdateTime"]</th>
                         <th>@L["LastCachedTime"]</th>
                     </tr>

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml.cs

@@ -1,18 +1,14 @@
-using System;
-using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Docs.Documents;
 
-namespace Volo.Docs.Admin.Pages.Docs.Admin.Documents
+namespace Volo.Docs.Admin.Pages.Docs.Admin.Documents;
+
+[Authorize(DocsAdminPermissions.Projects.Default)]
+public class IndexModel : DocsAdminPageModel
 {
-    [Authorize(DocsAdminPermissions.Projects.Default)]
+    public virtual Task<IActionResult> OnGet()
-    public class IndexModel : DocsAdminPageModel
     {
-        public virtual Task<IActionResult> OnGet()
+        return Task.FromResult<IActionResult>(Page());
-        {
-            return Task.FromResult<IActionResult>(Page());
-        }
     }
 }

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js

@@ -12,7 +12,6 @@ $(function () {
             name: $('#Name').val(),
             version: $('#Version').val(),
             languageCode: $('#LanguageCode').val(),
-            fileName: $('#FileName').val(),
             format: $('#Format').val(),
             creationTimeMin: getFormattedDate($('#CreationTimeMin')),
             creationTimeMax: getFormattedDate($('#CreationTimeMax')),
@@ -158,4 +157,8 @@ $(function () {
         e.preventDefault();
         dataTable.ajax.reload();
     });
+
+    $("#AdvancedFilterSectionToggler").click(function (e) {
+        $("#AdvancedFilterSection").toggle();
+    });
 });