Merge pull request abpframework#2850 from abpframework/maliming/Docs_new_Label

Docs module "new" label improvement

Author: hikalkan

…grations/20200212135141_init.Designer.cs …grations/20200218014727_init.Designer.csmodules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200212135141_init.Designer.cs renamed to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.Designer.cs modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200212135141_init.Designer.cs renamed to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.Designer.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 =>

…rkCore/Migrations/20200212135141_init.cs …rkCore/Migrations/20200218014727_init.csmodules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200212135141_init.cs renamed to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.cs modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200212135141_init.cs renamed to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.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/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.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.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.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.Contracts/Volo/Docs/Documents/DocumentWithDetailsDto.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.Application/Volo/Docs/Documents/DocumentAppService.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/DocumentUpdateInfo.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.Shared/Volo/Docs/Documents/NavigationNode.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/Documents/Document.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);
  }