Merge pull request #2850 from abpframework/maliming/Docs_new_Label

Docs module "new" label improvement

modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200212135141_init.cs → modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.cs

@@ -130,8 +130,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     RootUrl = table.Column<string>(maxLength: 2048, nullable: true),
                     RawRootUrl = table.Column<string>(maxLength: 2048, nullable: true),
                     LocalDirectory = table.Column<string>(maxLength: 512, nullable: true),
+                    CreationTime = table.Column<DateTime>(nullable: false),
                     LastUpdatedTime = table.Column<DateTime>(nullable: false),
-                    UpdatedCount = table.Column<int>(nullable: false),
                     LastCachedTime = table.Column<DateTime>(nullable: false)
                 },
                 constraints: table =>

modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs

@@ -462,6 +462,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2");
+
                     b.Property<string>("EditLink")
                         .HasColumnType("nvarchar(2048)")
                         .HasMaxLength(2048);
@@ -510,9 +513,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("nvarchar(2048)")
                         .HasMaxLength(2048);
 
-                    b.Property<int>("UpdatedCount")
-                        .HasColumnType("int");
-
                     b.Property<string>("Version")
                         .IsRequired()
                         .HasColumnType("nvarchar(128)")

modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs

@@ -86,8 +86,8 @@ private async Task UpdateDocumentUpdateInfoCache(Document document)
             await _documentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
             {
                 Name = document.Name,
-                LastUpdatedTime = document.LastUpdatedTime,
-                UpdatedCount = document.UpdatedCount
+                CreationTime = document.CreationTime,
+                LastUpdatedTime = document.LastUpdatedTime
             });
         }
 

modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/DocumentWithDetailsDto.cs

@@ -27,9 +27,9 @@ public class DocumentWithDetailsDto
 
         public virtual string LocalDirectory { get; set; }
 
-        public virtual DateTime LastUpdatedTime { get; set; }
+        public virtual DateTime CreationTime { get; set; }
 
-        public virtual int UpdatedCount { get; set; }
+        public virtual DateTime LastUpdatedTime { get; set; }
 
         public virtual DateTime LastCachedTime { get; set; }
 

modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs

@@ -85,8 +85,8 @@ public virtual async Task<NavigationNode> GetNavigationAsync(GetNavigationDocume
                 var documentUpdateInfo = await DocumentUpdateCache.GetAsync(cacheKey);
                 if (documentUpdateInfo != null)
                 {
+                    leaf.CreationTime = documentUpdateInfo.CreationTime;
                     leaf.LastUpdatedTime = documentUpdateInfo.LastUpdatedTime;
-                    leaf.UpdatedCount = documentUpdateInfo.UpdatedCount;
                 }
             }
 
@@ -175,8 +175,8 @@ async Task<DocumentWithDetailsDto> GetDocumentAsync()
                 await DocumentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
                 {
                     Name = sourceDocument.Name,
-                    LastUpdatedTime = sourceDocument.LastUpdatedTime,
-                    UpdatedCount = sourceDocument.UpdatedCount
+                    CreationTime = sourceDocument.CreationTime,
+                    LastUpdatedTime = sourceDocument.LastUpdatedTime
                 });
 
                 return CreateDocumentWithDetailsDto(project, sourceDocument);
@@ -206,8 +206,8 @@ async Task<DocumentWithDetailsDto> GetDocumentAsync()
             await DocumentUpdateCache.SetAsync(cacheKey, new DocumentUpdateInfo
             {
                 Name = document.Name,
+                CreationTime = document.CreationTime,
                 LastUpdatedTime = document.LastUpdatedTime,
-                UpdatedCount = document.UpdatedCount
             });
 
             return CreateDocumentWithDetailsDto(project, document);

modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs

@@ -7,8 +7,8 @@ public class DocumentUpdateInfo
     {
         public virtual string Name { get; set; }
 
-        public virtual DateTime LastUpdatedTime { get; set; }
+        public virtual DateTime CreationTime { get; set; }
 
-        public virtual int UpdatedCount { get; set; }
+        public virtual DateTime LastUpdatedTime { get; set; }
     }
 }

modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs

@@ -22,9 +22,9 @@ public class NavigationNode
 
         public bool IsEmpty => Text == null && Path == null;
 
-        public DateTime? LastUpdatedTime { get; set; }
+        public virtual DateTime? CreationTime { get; set; }
 
-        public int UpdatedCount { get; set; }
+        public virtual DateTime? LastUpdatedTime { get; set; }
 
         public bool IsSelected(string documentName)
         {

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs

@@ -31,10 +31,10 @@ public class Document : AggregateRoot<Guid>
 
         public virtual string LocalDirectory { get; set; }
 
+        public virtual DateTime CreationTime { get; set; }
+
         public virtual DateTime LastUpdatedTime { get; set; }
 
-        public virtual int UpdatedCount { get; set; }
-
         public virtual DateTime LastCachedTime { get; set; }
 
         public virtual List<DocumentContributor> Contributors { get; set; }
@@ -58,8 +58,8 @@ public Document(
             [NotNull] string rootUrl,
             [NotNull] string rawRootUrl,
             [NotNull] string localDirectory,
+            DateTime creationTime,
             DateTime lastUpdatedTime,
-            int updatedCount,
             DateTime lastCachedTime
         )
         {
@@ -76,8 +76,9 @@ DateTime lastCachedTime
             RootUrl = Check.NotNullOrWhiteSpace(rootUrl, nameof(rootUrl));
             RawRootUrl = Check.NotNullOrWhiteSpace(rawRootUrl, nameof(rawRootUrl));
             LocalDirectory = Check.NotNull(localDirectory, nameof(localDirectory));
+
+            CreationTime = creationTime;
             LastUpdatedTime = lastUpdatedTime;
-            UpdatedCount = updatedCount;
             LastCachedTime = lastCachedTime;
 
             Contributors = new List<DocumentContributor>();

modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs

@@ -43,8 +43,8 @@ public async Task<Document> GetDocumentAsync(Project project, string documentNam
                 "/",
                 $"/document-resources?projectId={project.Id.ToString()}&version={version}&languageCode={languageCode}&name=",
                 localDirectory,
+                File.GetCreationTime(path),
                 File.GetLastWriteTime(path),
-                File.GetLastWriteTime(path) == File.GetCreationTime(path) ? 1 : 2,
                 DateTime.Now);
         }
 

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs

@@ -60,8 +60,8 @@ await DownloadWebContentAsStringAsync(rawDocumentUrl, token, userAgent),
                 rootUrl,
                 rawRootUrl, 
                 localDirectory,
+                fileCommits.LastOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue,
                 fileCommits.FirstOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue,
-                fileCommits.Count,
                 DateTime.Now);
 
             var authors =  fileCommits

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/zh-Hans.json

@@ -18,6 +18,8 @@
     "DocumentNotFoundInSelectedLanguage": "本文档不适用于所选语言, 将以默认语言显示文档.",
     "FilterTopics": "过滤主题",
     "New": "新文档",
-    "Upd": "更新"
+    "Upd": "更新",
+    "NewExplanation": "在最近两周内创建.",
+    "UpdatedExplanation": "在最近两周内更新."
   }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/zh-Hant.json

@@ -18,6 +18,8 @@
     "DocumentNotFoundInSelectedLanguage": "本文件不適用於所選語系，將以預設語系顯示.",
     "FilterTopics": "過濾主題",
     "New": "新文檔",
-    "Upd": "更新"
+    "Upd": "更新",
+    "NewExplanation": "在最近兩周內創建.",
+    "UpdatedExplanation": "在最近兩周內更新."
   }
 }

modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs

@@ -125,15 +125,18 @@ private string GetLeafNode(NavigationNode node, string content)
             {
                 var badge = "";
 
-                if (!node.Path.IsNullOrWhiteSpace() && node.LastUpdatedTime.HasValue && node.LastUpdatedTime + TimeSpan.FromDays(14) > DateTime.Now)
+                if (!node.Path.IsNullOrWhiteSpace() && node.CreationTime.HasValue && node.LastUpdatedTime.HasValue)
                 {
-                    if (node.UpdatedCount > 1)
+                    var newBadge = "<span class='badge badge-primary ml-2' title=\"" + _localizer["NewExplanation"] + "\">" + _localizer["New"] + "</span>";
+                    var updBadge = "<span class='badge badge-light ml-2' title=\"" + _localizer["UpdatedExplanation"] + "\">" + _localizer["Upd"] + "</span>";
+
+                    if(node.CreationTime + TimeSpan.FromDays(14) > DateTime.Now)
                     {
-                        badge = "<span class='badge badge-light ml-2' title=\"" + _localizer["UpdatedExplanation"] + "\">" + _localizer["Upd"] + "</span>";
+                        badge = newBadge;
                     }
-                    else
+                    else if (node.LastUpdatedTime + TimeSpan.FromDays(14) > DateTime.Now)
                     {
-                        badge = "<span class='badge badge-primary ml-2' title=\"" + _localizer["NewExplanation"] + "\">" + _localizer["New"] + "</span>";
+                        badge = updBadge;
                     }
                 }
 

modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs

@@ -47,7 +47,7 @@ public async Task BuildAsync()
             await _documentRepository.InsertAsync(new Document(Guid.NewGuid(), project.Id, "CLI.md", "2.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, 1,
+                "https://raw.githubusercontent.com/abpframework/abp/2.0.0/docs/en/", "", DateTime.Now, DateTime.Now,
                 DateTime.Now));
         }
     }