From 3747b2b57983d0a250d625981c7a594919a93b48 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 16 Jul 2020 14:36:43 +0300
Subject: [PATCH] docs module: set latest stable version as latest when there
 is a prerelease

---
 .../Pages/Documents/Project/Index.cshtml      | 10 +++---
 .../Pages/Documents/Project/Index.cshtml.cs   | 32 ++++++++++---------
 .../Pages/Documents/Search.cshtml.cs          |  3 +-
 .../src/Volo.Docs.Web/Utils/VersionHelper.cs  | 11 +++++++
 4 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 modules/docs/src/Volo.Docs.Web/Utils/VersionHelper.cs

diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
index 90a754b1a9..71c7d4790c 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
@@ -53,7 +53,7 @@
                         <nav class="navbar navbar-logo">
                             @if (!Model.Project.Name.IsNullOrWhiteSpace())
                             {
-                                <a class="navbar-brand w-100" href="@Model.CreateVersionLink(Model.LatestVersionInfo, Model.GetSpecificVersionOrLatest())">
+                                <a class="navbar-brand w-100" href="@Model.CreateVersionLink(Model.LatestStableVersionInfo, Model.GetSpecificVersionOrLatest())">
                                     <span id="ProjectName">@Model.Project.Name</span><br>
                                     <strong class="display-block">
                                         @L["Documents"]
@@ -173,7 +173,7 @@
                         else
                         {
                             <ul root-node="@Model.Navigation"
-                                version="@(Model.LatestVersionInfo == null || Model.LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Model.Version)"
+                                version="@(Model.LatestStableVersionInfo == null || Model.LatestStableVersionInfo.IsSelected ? DocsAppConsts.Latest : Model.Version)"
                                 project-name="@Model.ProjectName"
                                 project-format="@Model.Project.Format"
                                 selected-document-name="@Model.DocumentNameWithExtension"
@@ -242,8 +242,8 @@
                                 }
 
                             </div>
-                        </div> 
-                         
+                        </div>
+
 
                     </div>
 
@@ -374,7 +374,7 @@ else
               model = new ErrorPageModel
               {
                   RedirectUrl = Model.DocumentsUrlPrefix + Model.LanguageCode + "/" + Model.ProjectName + "/"
-                                + (Model.LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Model.Version),
+                                + (Model.LatestStableVersionInfo.IsSelected ? DocsAppConsts.Latest : Model.Version),
                   ErrorCode = "404",
                   ErrorMessage = L.GetString("DocumentNotFound"),
                   AutoRedirect = !Model.DocumentName.IsNullOrWhiteSpace()
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
index a86d895c90..e7bc6154fa 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
@@ -16,6 +16,7 @@ using Volo.Docs.Documents;
 using Volo.Docs.HtmlConverting;
 using Volo.Docs.Models;
 using Volo.Docs.Projects;
+using Volo.Docs.Utils;
 
 namespace Volo.Docs.Pages.Documents.Project
 {
@@ -57,7 +58,7 @@ namespace Volo.Docs.Pages.Documents.Project
 
         public NavigationNode Navigation { get; private set; }
 
-        public VersionInfoViewModel LatestVersionInfo { get; private set; }
+        public VersionInfoViewModel LatestStableVersionInfo { get; private set; }
 
         public string DocumentsUrlPrefix { get; set; }
 
@@ -201,7 +202,7 @@ namespace Volo.Docs.Pages.Documents.Project
         private IActionResult ReloadPageWithCulture()
         {
             var returnUrl = DocumentsUrlPrefix + LanguageCode + "/" + ProjectName + "/"
-                            + (LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Version) + "/" +
+                            + (LatestStableVersionInfo.IsSelected ? DocsAppConsts.Latest : Version) + "/" +
                             DocumentName;
 
             return Redirect("/Abp/Languages/Switch?culture=" + LanguageCode + "&uiCulture=" + LanguageCode + "&returnUrl=" + returnUrl);
@@ -212,7 +213,7 @@ namespace Volo.Docs.Pages.Documents.Project
             return RedirectToPage(new
             {
                 projectName = ProjectName,
-                version = (LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Version),
+                version = (LatestStableVersionInfo.IsSelected ? DocsAppConsts.Latest : Version),
                 languageCode = DefaultLanguageCode,
                 documentName = DocumentName
             });
@@ -223,7 +224,7 @@ namespace Volo.Docs.Pages.Documents.Project
             return RedirectToPage(new
             {
                 projectName = ProjectName,
-                version = (LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Version),
+                version = (LatestStableVersionInfo.IsSelected ? DocsAppConsts.Latest : Version),
                 documentName = "",
                 languageCode = DefaultLanguageCode
             });
@@ -256,13 +257,14 @@ namespace Volo.Docs.Pages.Documents.Project
 
             if (versions.Any())
             {
-                LatestVersionInfo = versions.First();
-                LatestVersionInfo.DisplayText = $"{LatestVersionInfo.DisplayText} ({DocsAppConsts.Latest})";
+                LatestStableVersionInfo = versions.FirstOrDefault(v => !VersionHelper.IsPreRelease(v.Version)) ?? versions.First();
+
+                LatestStableVersionInfo.DisplayText = $"{LatestStableVersionInfo.DisplayText} ({DocsAppConsts.Latest})";
 
                 if (string.Equals(Version, DocsAppConsts.Latest, StringComparison.OrdinalIgnoreCase))
                 {
-                    LatestVersionInfo.IsSelected = true;
-                    Version = LatestVersionInfo.Version;
+                    LatestStableVersionInfo.IsSelected = true;
+                    Version = LatestStableVersionInfo.Version;
                 }
                 else
                 {
@@ -274,14 +276,14 @@ namespace Volo.Docs.Pages.Documents.Project
                     }
                     else
                     {
-                        versions.First().IsSelected = true;
-                        Version = versions.First().Version;
+                        LatestStableVersionInfo.IsSelected = true;
+                        Version = LatestStableVersionInfo.Version;
                     }
                 }
             }
             else
             {
-                LatestVersionInfo = new VersionInfoViewModel(
+                LatestStableVersionInfo = new VersionInfoViewModel(
                     $"{DocsAppConsts.Latest}",
                     DocsAppConsts.Latest,
                     true);
@@ -290,7 +292,7 @@ namespace Volo.Docs.Pages.Documents.Project
             VersionSelectItems = versions.Select(v => new SelectListItem
             {
                 Text = v.DisplayText,
-                Value = CreateVersionLink(LatestVersionInfo, v.Version, DocumentName),
+                Value = CreateVersionLink(LatestStableVersionInfo, v.Version, DocumentName),
                 Selected = v.IsSelected
             }).ToList();
         }
@@ -338,7 +340,7 @@ namespace Volo.Docs.Pages.Documents.Project
                 return DocsAppConsts.Latest;
             }
 
-            return Document.Version == LatestVersionInfo.Version ?
+            return Document.Version == LatestStableVersionInfo.Version ?
                 DocsAppConsts.Latest :
                 Document.Version;
         }
@@ -377,7 +379,7 @@ namespace Volo.Docs.Pages.Documents.Project
                 LanguageSelectListItems.Add(
                     new SelectListItem(
                         language.DisplayName,
-                        DocumentsUrlPrefix + language.Code + "/" + Project.ShortName + "/" + (LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Version) + "/" + DocumentName,
+                        DocumentsUrlPrefix + language.Code + "/" + Project.ShortName + "/" + (LatestStableVersionInfo.IsSelected ? DocsAppConsts.Latest : Version) + "/" + DocumentName,
                         language.Code == LanguageCode
                         )
                     );
@@ -546,7 +548,7 @@ namespace Volo.Docs.Pages.Documents.Project
             }
         }
 
-        public async Task SetDocumentPreferencesAsync()
+        private async Task SetDocumentPreferencesAsync()
         {
             var projectParameters = await _documentAppService.GetParametersAsync(
                     new GetParametersDocumentInput
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs
index 1e4e797e73..b8e6dc6d00 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs
@@ -10,6 +10,7 @@ using Volo.Docs.Documents;
 using Volo.Docs.HtmlConverting;
 using Volo.Docs.Models;
 using Volo.Docs.Projects;
+using Volo.Docs.Utils;
 
 namespace Volo.Docs.Pages.Documents
 {
@@ -61,7 +62,7 @@ namespace Volo.Docs.Pages.Documents
 
             if (versions.Any() && string.Equals(Version, DocsAppConsts.Latest, StringComparison.OrdinalIgnoreCase))
             {
-                Version = versions.First().Name;
+                Version = (versions.FirstOrDefault(v=> !VersionHelper.IsPreRelease(v.Name)) ?? versions.First()).Name;
             }
 
             SearchOutputs = await _documentAppService.SearchAsync(new DocumentSearchInput
diff --git a/modules/docs/src/Volo.Docs.Web/Utils/VersionHelper.cs b/modules/docs/src/Volo.Docs.Web/Utils/VersionHelper.cs
new file mode 100644
index 0000000000..aea42f8c58
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Web/Utils/VersionHelper.cs
@@ -0,0 +1,11 @@
+namespace Volo.Docs.Utils
+{
+    public static class VersionHelper
+    {
+
+        public static bool IsPreRelease(string version)
+        {
+            return (version?.Split("-").Length ?? 0) > 1;
+        }
+    }
+}