Skip to content

Draft feature added to the pages. #24053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
+1,977 −34
Open

Draft feature added to the pages. #24053

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
caf4ae7
Add PageStatus support to Page entities and repositories
MansurBesleney Oct 23, 2025
4ab7185
Add PageStatus support to page DTOs and services
MansurBesleney Oct 23, 2025
6340cf7
Add page status field to create and update forms
MansurBesleney Oct 24, 2025
7680c86
Add page status check for public page access
MansurBesleney Oct 24, 2025
04ee51a
Add status field to Pages and update migrations
MansurBesleney Oct 27, 2025
df517e5
Add Save as Draft and Publish actions to page forms
MansurBesleney Oct 27, 2025
7e751aa
proxies regenerated
MansurBesleney Oct 27, 2025
30bb18b
Add page status column to CMS pages list
MansurBesleney Oct 27, 2025
2a51a84
Merge branch 'dev' into issue-#23616
MansurBesleney Oct 30, 2025
11e60db
regenerate proxies
MansurBesleney Nov 3, 2025
9c8e7e2
Merge branch 'dev' into issue-#23616
MansurBesleney Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
999 changes: 999 additions & 0 deletions ...olo.CmsKit.HttpApi.Host/Migrations/20251024065316_Status_Field_Added_To_Pages.Designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

632 changes: 632 additions & 0 deletions ...it/host/Volo.CmsKit.HttpApi.Host/Migrations/20251024065316_Status_Field_Added_To_Pages.cs
View file
Open in desktop

Large diffs are not rendered by default.

93 changes: 91 additions & 2 deletions .../Volo.CmsKit.HttpApi.Host/Migrations/CmsKitHttpApiHostMigrationsDbContextModelSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("ProductVersion", "6.0.0")
.HasAnnotation("ProductVersion", "10.0.0-rc.2.25502.107")
.HasAnnotation("Relational:MaxIdentifierLength", 128);

SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);

modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
{
Expand All @@ -32,6 +32,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -44,6 +45,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("varbinary(max)");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -73,11 +75,13 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -105,6 +109,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -126,6 +131,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnName("DeletionTime");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -173,6 +179,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -194,6 +201,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnName("DeletionTime");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -238,6 +246,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand Down Expand Up @@ -265,7 +274,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");

b.Property<int>("EntityVersion")
.HasColumnType("int");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -321,6 +334,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -344,9 +358,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("nvarchar(64)");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

b.Property<string>("IdempotencyToken")
.HasMaxLength(32)
.HasColumnType("nvarchar(32)");

b.Property<bool?>("IsApproved")
.HasColumnType("bit");

b.Property<Guid?>("RepliedCommentId")
.HasColumnType("uniqueidentifier");

Expand All @@ -359,6 +381,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasMaxLength(512)
.HasColumnType("nvarchar(512)");

b.Property<string>("Url")
.HasMaxLength(512)
.HasColumnType("nvarchar(512)");

b.HasKey("Id");

b.HasIndex("TenantId", "RepliedCommentId");
Expand All @@ -376,6 +402,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -389,6 +416,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnName("CreatorId");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -419,6 +447,41 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.ToTable("CmsGlobalResources", (string)null);
});

modelBuilder.Entity("Volo.CmsKit.MarkedItems.UserMarkedItem", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");

b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");

b.Property<Guid>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");

b.Property<string>("EntityId")
.IsRequired()
.HasColumnType("nvarchar(450)");

b.Property<string>("EntityType")
.IsRequired()
.HasColumnType("nvarchar(450)");

b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");

b.HasKey("Id");

b.HasIndex("TenantId", "EntityType", "EntityId");

b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId");

b.ToTable("CmsUserMarkedItems", (string)null);
});

modelBuilder.Entity("Volo.CmsKit.MediaDescriptors.MediaDescriptor", b =>
{
b.Property<Guid>("Id")
Expand All @@ -427,6 +490,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -453,6 +517,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("nvarchar(64)");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -501,6 +566,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -525,6 +591,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("nvarchar(max)");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand All @@ -551,6 +618,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<Guid?>("ParentId")
.HasColumnType("uniqueidentifier");

b.Property<string>("RequiredPermissionName")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");

b.Property<string>("Target")
.HasColumnType("nvarchar(max)");

Expand All @@ -576,6 +647,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -600,7 +672,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");

b.Property<int>("EntityVersion")
.HasColumnType("int");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand All @@ -610,6 +686,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasDefaultValue(false)
.HasColumnName("IsDeleted");

b.Property<bool>("IsHomePage")
.HasColumnType("bit");

b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
Expand All @@ -618,6 +697,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");

b.Property<string>("LayoutName")
.HasColumnType("nvarchar(max)");

b.Property<string>("Script")
.HasColumnType("nvarchar(max)");

Expand All @@ -626,6 +708,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");

b.Property<int>("Status")
.HasColumnType("int");

b.Property<string>("Style")
.HasColumnType("nvarchar(max)");

Expand Down Expand Up @@ -751,6 +836,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -777,6 +863,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("nvarchar(64)");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down Expand Up @@ -818,6 +905,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
Expand All @@ -835,6 +923,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnName("EmailConfirmed");

b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");

Expand Down
3 changes: 3 additions & 0 deletions ...src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Menus/PageLookupInputDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
using System;
using Volo.Abp.Application.Dtos;
using Volo.CmsKit.Pages;

namespace Volo.CmsKit.Admin.Menus;

[Serializable]
public class PageLookupInputDto : PagedAndSortedResultRequestDto
{
public string Filter { get; set; }

public PageStatus? Status { get; set; }
}
2 changes: 2 additions & 0 deletions ...src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ public class CreatePageInputDto: ExtensibleObject

[DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxStyleLength))]
public string Style { get; set; }

public PageStatus Status { get; set; } = PageStatus.Draft;
}
3 changes: 3 additions & 0 deletions ...t/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/GetPagesInputDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
using System;
using Volo.Abp.Application.Dtos;
using Volo.CmsKit.Pages;

namespace Volo.CmsKit.Admin.Pages;

[Serializable]
public class GetPagesInputDto : PagedAndSortedResultRequestDto
{
public string Filter { get; set; }

public PageStatus? Status { get; set; } = null;
}
3 changes: 3 additions & 0 deletions ...es/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
using Volo.CmsKit.Pages;

namespace Volo.CmsKit.Admin.Pages;

Expand All @@ -21,5 +22,7 @@ public class PageDto : ExtensibleAuditedEntityDto<Guid>, IHasConcurrencyStamp

public bool IsHomePage { get; set; }

public PageStatus Status { get; set; }

public string ConcurrencyStamp { get; set; }
}
2 changes: 2 additions & 0 deletions ...src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@ public class UpdatePageInputDto : ExtensibleObject, IHasConcurrencyStamp
[DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxStyleLength))]
public string Style { get; set; }

public PageStatus Status { get; set; }

public string ConcurrencyStamp { get; set; }
}
1 change: 1 addition & 0 deletions ...-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public virtual async Task<PagedResultDto<PageLookupDto>> GetPageLookupAsync(Page

var pages = await PageRepository.GetListAsync(
input.Filter,
input.Status,
input.MaxResultCount,
input.SkipCount,
input.Sorting
Expand Down
Loading
Loading