From 5e551438e786e50ee397a5eff9725883dff0e760 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 25 Dec 2018 10:50:10 +0300 Subject: [PATCH 1/8] Fix value of StandardMenus.Shortcut --- .../Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml | 2 +- .../Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml | 3 +++ .../Volo/Abp/Ui/Navigation/StandardMenus.cs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml index c275048621..33419549f0 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/TenantSwitch/Default.cshtml @@ -1,7 +1,7 @@ @using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Components.TenantSwitch @model TenantSwitchViewComponent.TenantSwitchViewModel
  • - + @if (Model.Tenant == null) { @@host diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml new file mode 100644 index 0000000000..225780c2c2 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Components/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs index 68ceffe3c2..b8d63a104d 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs @@ -4,6 +4,6 @@ namespace Volo.Abp.UI.Navigation { public const string Main = "Main"; public const string User = "User"; - public const string Shortcut = "User"; + public const string Shortcut = "Shortcut"; } } \ No newline at end of file From 8d6cdd287c073d86746b3aec2e1fda917f34b3cd Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 25 Dec 2018 15:22:31 +0300 Subject: [PATCH 2/8] Resolved #629 : Project management UI for docs module --- .../Volo/Blogging/BlogsController.cs | 2 +- modules/docs/Volo.Docs.sln | 10 +- .../DocsTestAppDbContext.cs | 6 + .../DocsTestAppEntityFrameworkCoreModule.cs | 6 + .../20181225063242_Added_Identity.Designer.cs | 458 ++++++++++++++++++ .../20181225063242_Added_Identity.cs | 313 ++++++++++++ .../DocsTestAppDbContextModelSnapshot.cs | 392 ++++++++++++++- ...olo.DocsTestApp.EntityFrameworkCore.csproj | 5 +- .../Controllers/HomeController.cs | 4 +- .../app/Volo.DocsTestApp/DocsTestAppModule.cs | 25 +- .../app/Volo.DocsTestApp/Pages/Index.cshtml | 4 + .../Volo.DocsTestApp/Pages/Index.cshtml.cs | 16 + .../Pages/_ViewImports.cshtml | 4 +- .../Volo.DocsTestApp/Volo.DocsTestApp.csproj | 5 + ...lo.Docs.Admin.Application.Contracts.csproj | 10 + .../DocsAdminApplicationContractsModule.cs | 24 +- .../DocsAdminPermissionDefinitionProvider.cs | 24 + .../Volo/Docs/Admin/DocsAdminPermissions.cs | 31 ++ .../Docs/ApplicationContracts/en.json | 10 + .../Docs/ApplicationContracts/tr.json | 10 + .../Admin/Projects/ProjectAdminAppService.cs | 9 +- .../Projects/DocsAdminProjectController.cs | 50 -- .../Docs/Admin/ProjectsAdminController.cs | 57 +++ .../DocsAdminWebAutoMapperProfile.cs | 7 + .../Volo.Docs.Admin.Web/DocsAdminWebModule.cs | 19 + .../DocsMenuContributor.cs | 41 ++ .../Localization/Resources/Docs/Web/en.json | 25 + .../Localization/Resources/Docs/Web/tr.json | 26 + .../Pages/Docs/Admin/DocsAdminPage.cs | 13 + .../Pages/Docs/Admin/Projects/Create.cshtml | 22 + .../Docs/Admin/Projects/Create.cshtml.cs | 112 +++++ .../Pages/Docs/Admin/Projects/Edit.cshtml | 22 + .../Pages/Docs/Admin/Projects/Edit.cshtml.cs | 119 +++++ .../Pages/Docs/Admin/Projects/Index.cshtml | 49 ++ .../Pages/Docs/Admin/Projects/Index.cshtml.cs | 11 + .../Pages/Docs/Admin/Projects/create.js | 14 + .../Pages/Docs/Admin/Projects/edit.js | 14 + .../Pages/Docs/Admin/Projects/index.js | 98 ++++ .../Volo.Docs.Admin.Web.csproj | 22 +- 39 files changed, 2015 insertions(+), 74 deletions(-) create mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.Designer.cs create mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.cs create mode 100644 modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml create mode 100644 modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissionDefinitionProvider.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json create mode 100644 modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json delete mode 100644 modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/Projects/DocsAdminProjectController.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/DocsMenuContributor.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/DocsAdminPage.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs index 6e74d4f65b..90412d19f7 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs +++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs @@ -65,7 +65,7 @@ namespace Volo.Blogging [Route("{id}")] public async Task Update(Guid id, UpdateBlogDto input) { - throw new NotImplementedException(); + return await _blogAppService.Update(id, input); } [HttpDelete] diff --git a/modules/docs/Volo.Docs.sln b/modules/docs/Volo.Docs.sln index 3fe7cc736f..7e78d7432f 100644 --- a/modules/docs/Volo.Docs.sln +++ b/modules/docs/Volo.Docs.sln @@ -33,15 +33,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "admin-app", "admin-app", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "public-app", "public-app", "{8B0CDFC9-E313-4323-9390-59CFFAAC60B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.Admin.Application.Contracts", "src\Volo.Docs.Admin.Application.Contracts\Volo.Docs.Admin.Application.Contracts.csproj", "{37D483C8-400B-4127-A6D0-2EE4E80CB696}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.Admin.Application.Contracts", "src\Volo.Docs.Admin.Application.Contracts\Volo.Docs.Admin.Application.Contracts.csproj", "{37D483C8-400B-4127-A6D0-2EE4E80CB696}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.Admin.Application", "src\Volo.Docs.Admin.Application\Volo.Docs.Admin.Application.csproj", "{823C51A7-40AB-45D8-8FB8-F212AF7E45F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.Admin.Application", "src\Volo.Docs.Admin.Application\Volo.Docs.Admin.Application.csproj", "{823C51A7-40AB-45D8-8FB8-F212AF7E45F2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.Admin.HttpApi", "src\Volo.Docs.Admin.HttpApi\Volo.Docs.Admin.HttpApi.csproj", "{262F38DB-62AF-427F-96E2-C6385C5AB695}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.Admin.HttpApi", "src\Volo.Docs.Admin.HttpApi\Volo.Docs.Admin.HttpApi.csproj", "{262F38DB-62AF-427F-96E2-C6385C5AB695}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.Admin.HttpApi.Client", "src\Volo.Docs.Admin.HttpApi.Client\Volo.Docs.Admin.HttpApi.Client.csproj", "{81EE378A-0DE1-47BA-86D9-08EF6317BB95}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.Admin.HttpApi.Client", "src\Volo.Docs.Admin.HttpApi.Client\Volo.Docs.Admin.HttpApi.Client.csproj", "{81EE378A-0DE1-47BA-86D9-08EF6317BB95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.Admin.Web", "src\Volo.Docs.Admin.Web\Volo.Docs.Admin.Web.csproj", "{116A6145-9D66-4867-B3EF-A464FAC47946}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.Admin.Web", "src\Volo.Docs.Admin.Web\Volo.Docs.Admin.Web.csproj", "{116A6145-9D66-4867-B3EF-A464FAC47946}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppDbContext.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppDbContext.cs index d983c156f5..78843aed64 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppDbContext.cs +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppDbContext.cs @@ -1,5 +1,8 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.Identity.EntityFrameworkCore; +using Volo.Abp.PermissionManagement.EntityFrameworkCore; +using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Docs.EntityFrameworkCore; namespace Volo.DocsTestApp.EntityFrameworkCore @@ -16,6 +19,9 @@ namespace Volo.DocsTestApp.EntityFrameworkCore { base.OnModelCreating(modelBuilder); + modelBuilder.ConfigurePermissionManagement(); + modelBuilder.ConfigureSettingManagement(); + modelBuilder.ConfigureIdentity(); modelBuilder.ConfigureDocs(); } } diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppEntityFrameworkCoreModule.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppEntityFrameworkCoreModule.cs index 96c30adf11..f380f6b9d5 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppEntityFrameworkCoreModule.cs +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/DocsTestAppEntityFrameworkCoreModule.cs @@ -1,11 +1,17 @@ using Volo.Abp.EntityFrameworkCore.SqlServer; +using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement.EntityFrameworkCore; +using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Docs.EntityFrameworkCore; namespace Volo.DocsTestApp.EntityFrameworkCore { [DependsOn( typeof(DocsEntityFrameworkCoreModule), + typeof(AbpIdentityEntityFrameworkCoreModule), + typeof(AbpPermissionManagementEntityFrameworkCoreModule), + typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreSqlServerModule))] public class DocsTestAppEntityFrameworkCoreModule : AbpModule { diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.Designer.cs new file mode 100644 index 0000000000..8a4137a48f --- /dev/null +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.Designer.cs @@ -0,0 +1,458 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Volo.DocsTestApp.EntityFrameworkCore; + +namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations +{ + [DbContext(typeof(DocsTestAppDbContext))] + [Migration("20181225063242_Added_Identity")] + partial class Added_Identity + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.1.1-rtm-30846") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("Description") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("Regex") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasMaxLength(128); + + b.Property("Required"); + + b.Property("ValueType"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDefault") + .HasColumnName("IsDefault"); + + b.Property("IsPublic") + .HasColumnName("IsPublic"); + + b.Property("IsStatic") + .HasColumnName("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(256); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("CreationTime"); + + b.Property("CreatorId"); + + b.Property("DeleterId"); + + b.Property("DeletionTime"); + + b.Property("Email") + .HasColumnName("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierId"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasDefaultValue(false); + + b.Property("LockoutEnd"); + + b.Property("Name") + .HasColumnName("Name") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .HasColumnName("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(196); + + b.Property("TenantId"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("TenantId"); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasMaxLength(64); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Volo.Docs.Projects.Project", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp"); + + b.Property("DefaultDocumentName") + .IsRequired() + .HasMaxLength(128); + + b.Property("DocumentStoreType"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("Format"); + + b.Property("LatestVersionBranchName") + .HasMaxLength(128); + + b.Property("MainWebsiteUrl"); + + b.Property("MinimumVersion"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("NavigationDocumentName") + .IsRequired() + .HasMaxLength(128); + + b.Property("ShortName") + .IsRequired() + .HasMaxLength(32); + + b.HasKey("Id"); + + b.ToTable("DocsProjects"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.cs new file mode 100644 index 0000000000..59e3de3d39 --- /dev/null +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.cs @@ -0,0 +1,313 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations +{ + public partial class Added_Identity : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AbpClaimTypes", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(maxLength: 256, nullable: false), + Name = table.Column(maxLength: 256, nullable: false), + Required = table.Column(nullable: false), + IsStatic = table.Column(nullable: false), + Regex = table.Column(maxLength: 512, nullable: true), + RegexDescription = table.Column(maxLength: 128, nullable: true), + Description = table.Column(maxLength: 256, nullable: true), + ValueType = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpClaimTypes", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpPermissionGrants", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + Name = table.Column(maxLength: 128, nullable: false), + ProviderName = table.Column(maxLength: 64, nullable: false), + ProviderKey = table.Column(maxLength: 64, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpRoles", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(maxLength: 256, nullable: false), + TenantId = table.Column(nullable: true), + Name = table.Column(maxLength: 256, nullable: false), + NormalizedName = table.Column(maxLength: 256, nullable: false), + IsDefault = table.Column(nullable: false), + IsStatic = table.Column(nullable: false), + IsPublic = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpRoles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpSettings", + columns: table => new + { + Id = table.Column(nullable: false), + Name = table.Column(maxLength: 128, nullable: false), + Value = table.Column(maxLength: 2048, nullable: false), + ProviderName = table.Column(maxLength: 64, nullable: true), + ProviderKey = table.Column(maxLength: 64, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpSettings", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpUsers", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(maxLength: 256, nullable: false), + CreationTime = table.Column(nullable: false), + CreatorId = table.Column(nullable: true), + LastModificationTime = table.Column(nullable: true), + LastModifierId = table.Column(nullable: true), + IsDeleted = table.Column(nullable: false), + DeleterId = table.Column(nullable: true), + DeletionTime = table.Column(nullable: true), + TenantId = table.Column(nullable: true), + UserName = table.Column(maxLength: 256, nullable: false), + NormalizedUserName = table.Column(maxLength: 256, nullable: false), + Name = table.Column(maxLength: 64, nullable: true), + Surname = table.Column(maxLength: 64, nullable: true), + Email = table.Column(maxLength: 256, nullable: true), + NormalizedEmail = table.Column(maxLength: 256, nullable: true), + EmailConfirmed = table.Column(nullable: false, defaultValue: false), + PasswordHash = table.Column(maxLength: 256, nullable: true), + SecurityStamp = table.Column(maxLength: 256, nullable: false), + PhoneNumber = table.Column(maxLength: 16, nullable: true), + PhoneNumberConfirmed = table.Column(nullable: false, defaultValue: false), + TwoFactorEnabled = table.Column(nullable: false, defaultValue: false), + LockoutEnd = table.Column(nullable: true), + LockoutEnabled = table.Column(nullable: false, defaultValue: false), + AccessFailedCount = table.Column(nullable: false, defaultValue: 0) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUsers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpRoleClaims", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + ClaimType = table.Column(maxLength: 256, nullable: false), + ClaimValue = table.Column(maxLength: 1024, nullable: true), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AbpRoleClaims_AbpRoles_RoleId", + column: x => x.RoleId, + principalTable: "AbpRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserClaims", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + ClaimType = table.Column(maxLength: 256, nullable: false), + ClaimValue = table.Column(maxLength: 1024, nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AbpUserClaims_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserLogins", + columns: table => new + { + TenantId = table.Column(nullable: true), + UserId = table.Column(nullable: false), + LoginProvider = table.Column(maxLength: 64, nullable: false), + ProviderKey = table.Column(maxLength: 196, nullable: false), + ProviderDisplayName = table.Column(maxLength: 128, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserLogins", x => new { x.UserId, x.LoginProvider }); + table.ForeignKey( + name: "FK_AbpUserLogins_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserRoles", + columns: table => new + { + TenantId = table.Column(nullable: true), + UserId = table.Column(nullable: false), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AbpUserRoles_AbpRoles_RoleId", + column: x => x.RoleId, + principalTable: "AbpRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AbpUserRoles_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserTokens", + columns: table => new + { + TenantId = table.Column(nullable: true), + UserId = table.Column(nullable: false), + LoginProvider = table.Column(maxLength: 64, nullable: false), + Name = table.Column(maxLength: 128, nullable: false), + Value = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + table.ForeignKey( + name: "FK_AbpUserTokens_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey", + table: "AbpPermissionGrants", + columns: new[] { "Name", "ProviderName", "ProviderKey" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpRoleClaims_RoleId", + table: "AbpRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpRoles_NormalizedName", + table: "AbpRoles", + column: "NormalizedName"); + + migrationBuilder.CreateIndex( + name: "IX_AbpSettings_Name_ProviderName_ProviderKey", + table: "AbpSettings", + columns: new[] { "Name", "ProviderName", "ProviderKey" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpUserClaims_UserId", + table: "AbpUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUserLogins_LoginProvider_ProviderKey", + table: "AbpUserLogins", + columns: new[] { "LoginProvider", "ProviderKey" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpUserRoles_RoleId_UserId", + table: "AbpUserRoles", + columns: new[] { "RoleId", "UserId" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_Email", + table: "AbpUsers", + column: "Email"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_NormalizedEmail", + table: "AbpUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_NormalizedUserName", + table: "AbpUsers", + column: "NormalizedUserName"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_UserName", + table: "AbpUsers", + column: "UserName"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AbpClaimTypes"); + + migrationBuilder.DropTable( + name: "AbpPermissionGrants"); + + migrationBuilder.DropTable( + name: "AbpRoleClaims"); + + migrationBuilder.DropTable( + name: "AbpSettings"); + + migrationBuilder.DropTable( + name: "AbpUserClaims"); + + migrationBuilder.DropTable( + name: "AbpUserLogins"); + + migrationBuilder.DropTable( + name: "AbpUserRoles"); + + migrationBuilder.DropTable( + name: "AbpUserTokens"); + + migrationBuilder.DropTable( + name: "AbpRoles"); + + migrationBuilder.DropTable( + name: "AbpUsers"); + } + } +} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs index a568d3ef13..b1ee9d3e2f 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs @@ -19,12 +19,357 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("Description") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("Regex") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasMaxLength(128); + + b.Property("Required"); + + b.Property("ValueType"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDefault") + .HasColumnName("IsDefault"); + + b.Property("IsPublic") + .HasColumnName("IsPublic"); + + b.Property("IsStatic") + .HasColumnName("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(256); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("CreationTime"); + + b.Property("CreatorId"); + + b.Property("DeleterId"); + + b.Property("DeletionTime"); + + b.Property("Email") + .HasColumnName("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierId"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasDefaultValue(false); + + b.Property("LockoutEnd"); + + b.Property("Name") + .HasColumnName("Name") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .HasColumnName("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(196); + + b.Property("TenantId"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("TenantId"); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasMaxLength(64); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + modelBuilder.Entity("Volo.Docs.Projects.Project", b => { b.Property("Id") .ValueGeneratedOnAdd(); - b.Property("ConcurrencyStamp"); + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp"); b.Property("DefaultDocumentName") .IsRequired() @@ -60,6 +405,51 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations b.ToTable("DocsProjects"); }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); #pragma warning restore 612, 618 } } diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj index 1ae23682c5..b458a273e0 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj @@ -5,7 +5,7 @@ - + @@ -17,6 +17,9 @@ + + + diff --git a/modules/docs/app/Volo.DocsTestApp/Controllers/HomeController.cs b/modules/docs/app/Volo.DocsTestApp/Controllers/HomeController.cs index 00259a0400..a80cc2dfeb 100644 --- a/modules/docs/app/Volo.DocsTestApp/Controllers/HomeController.cs +++ b/modules/docs/app/Volo.DocsTestApp/Controllers/HomeController.cs @@ -5,9 +5,9 @@ namespace Volo.DocsTestApp.Controllers { public class HomeController : AbpController { - public ActionResult Index() + public void Index() { - return Redirect("/Documents/"); + } } } diff --git a/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs b/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs index 4458a443ec..ff5589e192 100644 --- a/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs +++ b/modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Linq; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Localization; @@ -9,6 +10,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; +using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Modularity; using Volo.Abp.AspNetCore.Mvc.UI; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; @@ -18,19 +20,28 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theming; using Volo.Abp.Autofac; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.Identity; +using Volo.Abp.Identity.Web; using Volo.Abp.Modularity; +using Volo.Abp.Threading; using Volo.Abp.UI; using Volo.Abp.VirtualFileSystem; using Volo.Docs; +using Volo.Docs.Admin; using Volo.DocsTestApp.EntityFrameworkCore; namespace Volo.DocsTestApp { [DependsOn( typeof(DocsWebModule), + typeof(DocsAdminWebModule), typeof(DocsApplicationModule), + typeof(DocsAdminApplicationModule), typeof(DocsTestAppEntityFrameworkCoreModule), typeof(AbpAutofacModule), + typeof(AbpAccountWebModule), + typeof(AbpIdentityWebModule), + typeof(AbpIdentityApplicationModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule) )] public class DocsTestAppModule : AbpModule @@ -62,6 +73,7 @@ namespace Volo.DocsTestApp options.FileSets.ReplaceEmbeddedByPyhsical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPyhsical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.Docs.Domain", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPyhsical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.Docs.Web", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPyhsical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.Docs.Admin.Web", Path.DirectorySeparatorChar))); }); } @@ -72,7 +84,6 @@ namespace Volo.DocsTestApp options.DocInclusionPredicate((docName, description) => true); }); - var cultures = new List { new CultureInfo("en"), new CultureInfo("tr") }; Configure(options => { @@ -94,7 +105,7 @@ namespace Volo.DocsTestApp app.UseDeveloperExceptionPage(); app.UseVirtualFiles(); - + app.UseSwagger(); app.UseSwaggerUI(options => { @@ -115,6 +126,16 @@ namespace Volo.DocsTestApp name: "default", template: "{controller=Home}/{action=Index}/{id?}"); }); + + AsyncHelper.RunSync(async () => + { + await context.ServiceProvider + .GetRequiredService() + .SeedAsync( + "1q2w3E*", + IdentityPermissions.GetAll().Union(DocsAdminPermissions.GetAll()) + ); + }); } } } diff --git a/modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml b/modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml new file mode 100644 index 0000000000..f47edcbd98 --- /dev/null +++ b/modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml @@ -0,0 +1,4 @@ +@page +@model Volo.DocsTestApp.Pages.IndexModel +

    Welcome to the Docs demo application.

    +    Go to Docs \ No newline at end of file diff --git a/modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml.cs b/modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml.cs new file mode 100644 index 0000000000..c1600215d5 --- /dev/null +++ b/modules/docs/app/Volo.DocsTestApp/Pages/Index.cshtml.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Volo.DocsTestApp.Pages +{ + public class IndexModel : PageModel + { + public void OnGet() + { + } + } +} \ No newline at end of file diff --git a/modules/docs/app/Volo.DocsTestApp/Pages/_ViewImports.cshtml b/modules/docs/app/Volo.DocsTestApp/Pages/_ViewImports.cshtml index 5f6b33c1a3..e4a3ba9471 100644 --- a/modules/docs/app/Volo.DocsTestApp/Pages/_ViewImports.cshtml +++ b/modules/docs/app/Volo.DocsTestApp/Pages/_ViewImports.cshtml @@ -1,4 +1,6 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap -@addTagHelper *, Volo.Docs.Web \ No newline at end of file +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling +@addTagHelper *, Volo.Docs.Web +@addTagHelper *, Volo.Docs.Admin.Web \ No newline at end of file diff --git a/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj b/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj index 584c380ff3..87d314b454 100644 --- a/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj +++ b/modules/docs/app/Volo.DocsTestApp/Volo.DocsTestApp.csproj @@ -18,10 +18,15 @@ + + + + + diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj index 0835730d57..46a7df4293 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo.Docs.Admin.Application.Contracts.csproj @@ -9,6 +9,16 @@ + + + + + + + + + + diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs index 547fb6bf71..545fcb25b8 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs @@ -1,5 +1,9 @@ using Volo.Abp.Application; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; +using Volo.Docs.Localization; namespace Volo.Docs.Admin { @@ -9,6 +13,24 @@ namespace Volo.Docs.Admin )] public class DocsAdminApplicationContractsModule : AbpModule { - + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.DefinitionProviders.Add(); + }); + + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + + Configure(options => + { + options.Resources + .Get() + .AddVirtualJson("Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts"); + }); + } } } diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissionDefinitionProvider.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissionDefinitionProvider.cs new file mode 100644 index 0000000000..9ad0411d15 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissionDefinitionProvider.cs @@ -0,0 +1,24 @@ +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Localization; +using Volo.Docs.Localization; + +namespace Volo.Docs.Admin +{ + public class DocsAdminPermissionDefinitionProvider : PermissionDefinitionProvider + { + public override void Define(IPermissionDefinitionContext context) + { + var group = context.AddGroup(DocsAdminPermissions.GroupName, L("Permission:DocumentManagement")); + + var projects = group.AddPermission(DocsAdminPermissions.Projects.Default, L("Permission:Projects")); + projects.AddChild(DocsAdminPermissions.Projects.Update, L("Permission:Edit")); + projects.AddChild(DocsAdminPermissions.Projects.Delete, L("Permission:Delete")); + projects.AddChild(DocsAdminPermissions.Projects.Create, L("Permission:Create")); + } + + private static LocalizableString L(string name) + { + return LocalizableString.Create(name); + } + } +} diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs new file mode 100644 index 0000000000..7865c14aa3 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Volo.Docs.Admin +{ + public class DocsAdminPermissions + { + public const string GroupName = "Docs.Admin"; + + public static class Projects + { + public const string Default = GroupName + ".Projects"; + public const string Delete = Default + ".Delete"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + } + + public static string[] GetAll() + { + return new[] + { + GroupName, + Projects.Default, + Projects.Delete, + Projects.Update, + Projects.Create, + }; + } + } +} diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json new file mode 100644 index 0000000000..1a6ab2e154 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json @@ -0,0 +1,10 @@ +{ + "culture": "en", + "texts": { + "Permission:DocumentManagement": "Document Management", + "Permission:Projects": "Projects", + "Permission:Edit": "Edit", + "Permission:Delete": "Delete", + "Permission:Create": "Create" + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json new file mode 100644 index 0000000000..0e1601f486 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json @@ -0,0 +1,10 @@ +{ + "culture": "tr", + "texts": { + "Permission:DocumentManagement": "Döküman yönetimi", + "Permission:Projects": "Projeler", + "Permission:Edit": "Düzenle", + "Permission:Delete": "Sil", + "Permission:Create": "Oluştur" + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs index 25e9754140..ec84824d24 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Guids; @@ -8,6 +9,7 @@ using Volo.Docs.Projects; namespace Volo.Docs.Admin.Projects { + [Authorize(DocsAdminPermissions.Projects.Default)] public class ProjectAdminAppService : ApplicationService, IProjectAdminAppService { private readonly IProjectRepository _projectRepository; @@ -22,11 +24,11 @@ namespace Volo.Docs.Admin.Projects public async Task> GetListAsync(PagedAndSortedResultRequestDto input) { - var blogs = await _projectRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount); + var projects = await _projectRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount); var totalCount = await _projectRepository.GetTotalProjectCount(); - var dtos = ObjectMapper.Map, List>(blogs); + var dtos = ObjectMapper.Map, List>(projects); return new PagedResultDto(totalCount, dtos); } @@ -38,6 +40,7 @@ namespace Volo.Docs.Admin.Projects return ObjectMapper.Map(project); } + [Authorize(DocsAdminPermissions.Projects.Create)] public async Task CreateAsync(CreateProjectDto input) { var project = new Project(_guidGenerator.Create(), @@ -64,6 +67,7 @@ namespace Volo.Docs.Admin.Projects return ObjectMapper.Map(project); } + [Authorize(DocsAdminPermissions.Projects.Update)] public async Task UpdateAsync(Guid id, UpdateProjectDto input) { var project = await _projectRepository.GetAsync(id); @@ -87,6 +91,7 @@ namespace Volo.Docs.Admin.Projects return ObjectMapper.Map(project); } + [Authorize(DocsAdminPermissions.Projects.Delete)] public async Task DeleteAsync(Guid id) { await _projectRepository.DeleteAsync(id); diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/Projects/DocsAdminProjectController.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/Projects/DocsAdminProjectController.cs deleted file mode 100644 index 58f3f23758..0000000000 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/Projects/DocsAdminProjectController.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.AspNetCore.Mvc; - -namespace Volo.Docs.Admin.Projects -{ - [RemoteService] - [Area("docs")] - [ControllerName("Project")] - [Route("api/docs/admin/projects")] - public class DocsAdminProjectController : AbpController, IProjectAdminAppService - { - protected IProjectAdminAppService ProjectAppService { get; } - - public DocsAdminProjectController(IProjectAdminAppService projectAppService) - { - ProjectAppService = projectAppService; - } - - public Task> GetListAsync(PagedAndSortedResultRequestDto input) - { - return ProjectAppService.GetListAsync(input); - } - - [HttpGet] - [Route("{id}")] - public Task GetAsync(Guid id) - { - return ProjectAppService.GetAsync(id); - } - - public Task CreateAsync(CreateProjectDto input) - { - return ProjectAppService.CreateAsync(input); - } - - public Task UpdateAsync(Guid id, UpdateProjectDto input) - { - return ProjectAppService.UpdateAsync(id, input); - } - - public Task DeleteAsync(Guid id) - { - return ProjectAppService.DeleteAsync(id); - } - } -} diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs new file mode 100644 index 0000000000..ed46afe944 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs @@ -0,0 +1,57 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp; +using Volo.Abp.Application.Dtos; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Docs.Admin.Projects; + +namespace Volo.Docs.Admin +{ + [RemoteService] + [Area("docs")] + [ControllerName("ProjectsAdmin")] + [Route("api/docs/admin/projects")] + public class ProjectsAdminController : AbpController, IProjectAdminAppService + { + private readonly IProjectAdminAppService _projectAppService; + + public ProjectsAdminController(IProjectAdminAppService projectAdminAppService) + { + _projectAppService = projectAdminAppService; + } + + [HttpGet] + [Route("")] + public Task> GetListAsync(PagedAndSortedResultRequestDto input) + { + return _projectAppService.GetListAsync(input); + } + + [HttpGet] + [Route("{id}")] + public Task GetAsync(Guid id) + { + return _projectAppService.GetAsync(id); + } + + [HttpPost] + public Task CreateAsync(CreateProjectDto input) + { + return _projectAppService.CreateAsync(input); + } + + [HttpPut] + [Route("{id}")] + public Task UpdateAsync(Guid id, UpdateProjectDto input) + { + return _projectAppService.UpdateAsync(id, input); + } + + [HttpDelete] + public Task DeleteAsync(Guid id) + { + return _projectAppService.DeleteAsync(id); + } + } +} diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs index 0b9d5ebd3b..1105fe94aa 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs @@ -1,5 +1,7 @@ using AutoMapper; using Volo.Abp.AutoMapper; +using Volo.Docs.Admin.Pages.Docs.Admin.Projects; +using Volo.Docs.Admin.Projects; namespace Volo.Docs.Admin { @@ -7,7 +9,12 @@ namespace Volo.Docs.Admin { public DocsAdminWebAutoMapperProfile() { + CreateMap().Ignore(x => x.ExtraProperties); + CreateMap().Ignore(x => x.ExtraProperties); + + CreateMap () + .Ignore(x => x.GitHubAccessToken).Ignore(x => x.GitHubRootUrl); } } } diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs index a443865676..d0baaea58f 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs @@ -1,7 +1,11 @@ using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.AutoMapper; +using Volo.Abp.Localization; +using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; +using Volo.Abp.UI; +using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; using Volo.Docs.Localization; @@ -23,11 +27,26 @@ namespace Volo.Docs.Admin public override void ConfigureServices(ServiceConfigurationContext context) { + + Configure(options => + { + options.MenuContributors.Add(new DocsMenuContributor()); + }); + Configure(options => { options.FileSets.AddEmbedded("Volo.Docs.Admin"); }); + Configure(options => + { + options.Resources + .Get() + .AddBaseTypes(typeof(AbpValidationResource)) + .AddBaseTypes(typeof(AbpUiModule)) + .AddVirtualJson("/Localization/Resources/Docs/Web"); + }); + Configure(options => { options.AddProfile(validate: true); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsMenuContributor.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsMenuContributor.cs new file mode 100644 index 0000000000..6af722dd96 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsMenuContributor.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using Volo.Abp.UI.Navigation; +using Volo.Docs.Localization; + +namespace Volo.Docs.Admin +{ + public class DocsMenuContributor : IMenuContributor + { + public async Task ConfigureMenuAsync(MenuConfigurationContext context) + { + if (context.Menu.Name == StandardMenus.Main) + { + await ConfigureMainMenu(context); + } + } + + private async Task ConfigureMainMenu(MenuConfigurationContext context) + { + var authorizationService = context.ServiceProvider.GetRequiredService(); + var l = context.ServiceProvider.GetRequiredService>(); + + //if (await authorizationService.IsGrantedAsync(DocsAdminPermissions.GroupName)) + { + var rootMenuItem = new ApplicationMenuItem("DocumentManagement", l["Menu:DocumentManagement"], "/Docs/Admin"); + + if (await authorizationService.IsGrantedAsync(DocsAdminPermissions.Projects.Default)) + { + rootMenuItem.AddItem(new ApplicationMenuItem("ProjectManagement", l["Menu:ProjectManagement"], "/Docs/Admin/Projects")); + } + + context.Menu.AddItem(rootMenuItem); + } + } + } +} diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json new file mode 100644 index 0000000000..fb52d8d431 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json @@ -0,0 +1,25 @@ +{ + "culture": "en", + "texts": { + "Menu:DocumentManagement": "Documents", + "Menu:ProjectManagement": "Projects", + "CreateANewProject": "Create new project", + "Edit": "Edit", + "Create": "Create", + "Projects": "Projects", + "Name": "Name", + "ShortName": "ShortName", + "DocumentStoreType": "DocumentStoreType", + "Format": "Format", + "DisplayName:Name": "Name", + "DisplayName:ShortName": "Short name", + "DisplayName:Format": "Format", + "DisplayName:DefaultDocumentName": "Default documentName", + "DisplayName:NavigationDocumentName": "Navigation document name", + "DisplayName:MinimumVersion": "Minimum version", + "DisplayName:MainWebsiteUrl": "Main web site url", + "DisplayName:LatestVersionBranchName": "Latest version branch name", + "DisplayName:GitHubRootUrl": "GitHub root url", + "DisplayName:GitHubAccessToken": "GitHub access token" + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json new file mode 100644 index 0000000000..b12bc7f0b4 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json @@ -0,0 +1,26 @@ +{ + "culture": "tr", + "texts": { + "Menu:DocumentManagement": "Dökümanlar", + "Menu:ProjectManagement": "Projeler", + "CreateANewProject": "Yeni proje oluştur", + "Edit": "Düzenle", + "Create": "Yeni oluştur", + "Projects": "Projeler", + "Name": "İsim", + "ShortName": "Kısa isim", + "DocumentStoreType": "Döküman saklama tipi", + "Format": "Format", + "Actions": "İşlemler", + "DisplayName:Name": "Adı", + "DisplayName:ShortName": "Kısa adı", + "DisplayName:Format": "Format", + "DisplayName:DefaultDocumentName": "Varsayılan döküman adı", + "DisplayName:NavigationDocumentName": "Navigasyon dökümanı adı", + "DisplayName:MinimumVersion": "Minimum versiyon", + "DisplayName:MainWebsiteUrl": "Ana web site url'i", + "DisplayName:LatestVersionBranchName": "Son versiyon Branch adı", + "DisplayName:GitHubRootUrl": "GitHub kök url'i", + "DisplayName:GitHubAccessToken": "GitHub erişim jetonu" + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/DocsAdminPage.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/DocsAdminPage.cs new file mode 100644 index 0000000000..7fb608e7f4 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/DocsAdminPage.cs @@ -0,0 +1,13 @@ +using Microsoft.AspNetCore.Mvc.Localization; +using Microsoft.AspNetCore.Mvc.Razor.Internal; +using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; +using Volo.Docs.Localization; + +namespace Volo.Docs.Admin.Pages.Docs.Admin +{ + public abstract class DocsAdminPage : AbpPage + { + [RazorInject] + public IHtmlLocalizer L { get; set; } + } +} diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml new file mode 100644 index 0000000000..62177fc030 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml @@ -0,0 +1,22 @@ +@page +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal +@using Volo.Docs.Admin.Pages.Docs.Admin.Projects +@inherits Volo.Docs.Admin.Pages.Docs.Admin.DocsAdminPage +@model Volo.Docs.Admin.Pages.Docs.Admin.Projects.CreateModel +@{ + Layout = null; +} + +@if (Model.GithubProject != null) +{ + + + + + + + + + + +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs new file mode 100644 index 0000000000..74ce091141 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs @@ -0,0 +1,112 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Volo.Abp; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; +using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; +using Volo.Docs.Admin.Projects; +using Volo.Docs.Projects; + +namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects +{ + public class CreateModel : AbpPageModel + { + [BindProperty] + public CreateGithubProjectViewModel GithubProject { get; set; } + + private readonly IProjectAdminAppService _projectAppService; + + public List FormatTypes { get; set; } + = new List {new SelectListItem("markdown", "md")}; + + public CreateModel(IProjectAdminAppService projectAppService) + { + _projectAppService = projectAppService; + } + + public async Task OnGetAsync(string source) + { + if (source == "GitHub") + { + GithubProject = new CreateGithubProjectViewModel(); + return Page(); + } + else + { + throw new BusinessException("UnknowDocumentSourceExceptionMessage"); + } + } + + public async void OnPostAsync() + { + if (GithubProject != null) + { + var dto = GetGithubProjectAsDto(); + await _projectAppService.CreateAsync(dto); + } + } + + public CreateProjectDto GetGithubProjectAsDto() + { + var dto = ObjectMapper.Map(GithubProject); + + dto.ExtraProperties = new Dictionary + { + {nameof(GithubProject.GitHubRootUrl), GithubProject.GitHubRootUrl}, + {nameof(GithubProject.GitHubAccessToken), GithubProject.GitHubAccessToken} + }; + + return dto; + } + + public abstract class CreateProjectViewModelBase + { + [Required] + [StringLength(ProjectConsts.MaxNameLength)] + public string Name { get; set; } + + [Required] + [StringLength(ProjectConsts.MaxShortNameLength)] + public string ShortName { get; set; } + + [Required] + [SelectItems(nameof(FormatTypes))] + public string Format { get; set; } + + [StringLength(ProjectConsts.MaxDefaultDocumentNameLength)] + public string DefaultDocumentName { get; set; } + + [StringLength(ProjectConsts.MaxNavigationDocumentNameLength)] + public string NavigationDocumentName { get; set; } + + [StringLength(ProjectConsts.MaxVersionNameLength)] + public string MinimumVersion { get; set; } + + public string MainWebsiteUrl { get; set; } + + [StringLength(ProjectConsts.MaxLatestVersionBranchNameLength)] + public string LatestVersionBranchName { get; set; } + + [HiddenInput] + public string DocumentStoreType { get; set; } = "GitHub"; + } + + public class CreateGithubProjectViewModel : CreateProjectViewModelBase + { + [DisplayOrder(10001)] + [Required] + [StringLength(256)] + public string GitHubRootUrl { get; set; } + + + [DisplayOrder(10001)] + [StringLength(512)] + public string GitHubAccessToken { get; set; } + } + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml new file mode 100644 index 0000000000..a8ad2848b1 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml @@ -0,0 +1,22 @@ +@page +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal +@using Volo.Docs.Admin.Pages.Docs.Admin.Projects +@inherits Volo.Docs.Admin.Pages.Docs.Admin.DocsAdminPage +@model Volo.Docs.Admin.Pages.Docs.Admin.Projects.EditModel +@{ + Layout = null; +} + +@if (Model.GithubProject != null) +{ + + + + + + + + + + +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs new file mode 100644 index 0000000000..99a47feffa --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Volo.Abp; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; +using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; +using Volo.Docs.Admin.Projects; +using Volo.Docs.Projects; + +namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects +{ + public class EditModel : AbpPageModel + { + [BindProperty] + public EditGithubProjectViewModel GithubProject { get; set; } + + private readonly IProjectAdminAppService _projectAppService; + + public List FormatTypes { get; set; } + = new List { new SelectListItem("markdown", "md") }; + + public EditModel(IProjectAdminAppService projectAppService) + { + _projectAppService = projectAppService; + } + + public async Task OnGetAsync(Guid id) + { + var project = await _projectAppService.GetAsync(id); + + if (project.DocumentStoreType == "GitHub") + { + SetGithubProjectFromDto(project); + return Page(); + } + else + { + throw new BusinessException("UnknowDocumentSourceExceptionMessage"); + } + } + + public async void OnPostAsync() + { + if (GithubProject != null) + { + var dto = GetGithubProjectAsDto(); + await _projectAppService.UpdateAsync(GithubProject.Id, dto); + } + } + + public UpdateProjectDto GetGithubProjectAsDto() + { + var dto = ObjectMapper.Map(GithubProject); + + dto.ExtraProperties = new Dictionary + { + {nameof(GithubProject.GitHubRootUrl), GithubProject.GitHubRootUrl}, + {nameof(GithubProject.GitHubAccessToken), GithubProject.GitHubAccessToken} + }; + + return dto; + } + + public void SetGithubProjectFromDto(ProjectDto dto) + { + GithubProject = ObjectMapper.Map(dto); + + GithubProject.GitHubAccessToken = (string) dto.ExtraProperties[nameof(GithubProject.GitHubAccessToken)]; + GithubProject.GitHubRootUrl = (string) dto.ExtraProperties[nameof(GithubProject.GitHubRootUrl)]; + } + + public abstract class EditProjectViewModelBase + { + [Required] + [HiddenInput] + public Guid Id { get; set; } + + [Required] + [StringLength(ProjectConsts.MaxNameLength)] + public string Name { get; set; } + + [Required] + [SelectItems(nameof(FormatTypes))] + public string Format { get; set; } + + [StringLength(ProjectConsts.MaxDefaultDocumentNameLength)] + public string DefaultDocumentName { get; set; } + + [StringLength(ProjectConsts.MaxNavigationDocumentNameLength)] + public string NavigationDocumentName { get; set; } + + [StringLength(ProjectConsts.MaxVersionNameLength)] + public string MinimumVersion { get; set; } + + public string MainWebsiteUrl { get; set; } + + [StringLength(ProjectConsts.MaxLatestVersionBranchNameLength)] + public string LatestVersionBranchName { get; set; } + } + + public class EditGithubProjectViewModel : EditProjectViewModelBase + { + [DisplayOrder(10001)] + [Required] + [StringLength(256)] + public string GitHubRootUrl { get; set; } + + + [DisplayOrder(10001)] + [StringLength(512)] + public string GitHubAccessToken { get; set; } + } + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml new file mode 100644 index 0000000000..5b6a0df977 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml @@ -0,0 +1,49 @@ +@page +@using Microsoft.AspNetCore.Authorization +@using Volo.Docs.Admin +@inherits Volo.Docs.Admin.Pages.Docs.Admin.DocsAdminPage +@model Volo.Docs.Admin.Pages.Docs.Admin.Projects.IndexModel +@inject IAuthorizationService Authorization +@{ + ViewBag.PageTitle = "Projects"; +} + +@section scripts { + + + +} + + + + + +

    @L["Projects"]

    +     + + @if (await Authorization.IsGrantedAsync(DocsAdminPermissions.Projects.Create)) + { + + + + Github + + + } + +     +     + + + + + @L["Actions"] + @L["Name"] + @L["ShortName"] + @L["DocumentStoreType"] + @L["Format"] + + + + +     diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs new file mode 100644 index 0000000000..66a7008a1f --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs @@ -0,0 +1,11 @@ +using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; + +namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects +{ + public class IndexModel : AbpPageModel + { + public void OnGet() + { + } + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js new file mode 100644 index 0000000000..bf06d0750d --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js @@ -0,0 +1,14 @@ +var abp = abp || {}; +$(function () { + abp.modals.projectCreate = function () { + var initModal = function (publicApi, args) { + var $form = publicApi.getForm(); + + + }; + + return { + initModal: initModal + } + }; +}); \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js new file mode 100644 index 0000000000..14987552fb --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js @@ -0,0 +1,14 @@ +var abp = abp || {}; +$(function () { + abp.modals.projectEdit = function () { + var initModal = function (publicApi, args) { + var $form = publicApi.getForm(); + + + }; + + return { + initModal: initModal + } + }; +}); \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js new file mode 100644 index 0000000000..46962ddb83 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js @@ -0,0 +1,98 @@ +$(function () { + + var l = abp.localization.getResource('Docs'); + + var _createModal = new abp.ModalManager({ + viewUrl: abp.appPath + 'Docs/Admin/Projects/Create', + modalClass: 'projectCreate' + }); + + var _editModal = new abp.ModalManager({ + viewUrl: abp.appPath + 'Docs/Admin/Projects/Edit', + modalClass: 'projectEdit' + }); + + + var _dataTable = $('#ProjectsTable').DataTable(abp.libs.datatables.normalizeConfiguration({ + processing: true, + serverSide: true, + paging: true, + searching: false, + autoWidth: false, + scrollCollapse: true, + order: [[2, "desc"]], + ajax: abp.libs.datatables.createAjax(volo.docs.admin.projectsAdmin.getList), + columnDefs: [ + { + rowAction: { + items: + [ + { + text: l('Edit'), + visible: function () { + return true; //TODO: Check permission + }, + action: function (data) { + _editModal.open({ + Id: data.record.id + }); + } + }, + { + text: l('Delete'), + visible: function () { + return true; //TODO: Check permission + }, + confirmMessage: function (data) { return l('ProjectDeletionWarningMessage') }, + action: function (data) { + volo.docs.admin.projectsAdmin + .delete(data.record.id) + .then(function () { + _dataTable.ajax.reload(); + }); + } + } + ] + } + }, + { + target: 1, + data: "name" + }, + { + target: 2, + data: "shortName" + }, + { + target: 3, + data: "documentStoreType" + }, + { + target: 4, + data: "format", + render: function (data) { + if (data === 'md') { + return 'markdown'; + } + + return data; + } + } + ] + })); + + + $("#CreateNewGithubProjectButtonId").click(function (event) { + event.preventDefault(); + _createModal.open({source:"GitHub"}); + }); + + _createModal.onClose(function () { + _dataTable.ajax.reload(); + }); + + _editModal.onResult(function () { + _dataTable.ajax.reload(); + }); + +}); \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj index b5b4569789..912bef3034 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj +++ b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj @@ -33,17 +33,17 @@ - - - - + + + + + - - - - + + + @@ -52,4 +52,10 @@     + + + Edit.cshtml + + + From ab07c2bff92d084816f1670528b79b8c7a889a9b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 25 Dec 2018 15:46:56 +0300 Subject: [PATCH 3/8] Add AbpTypeExtensions.IsAssignableTo. --- .../Volo.Abp.Core/System/AbpTypeExtensions.cs | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/framework/src/Volo.Abp.Core/System/AbpTypeExtensions.cs b/framework/src/Volo.Abp.Core/System/AbpTypeExtensions.cs index 7742998c13..a90e4212e1 100644 --- a/framework/src/Volo.Abp.Core/System/AbpTypeExtensions.cs +++ b/framework/src/Volo.Abp.Core/System/AbpTypeExtensions.cs @@ -6,5 +6,30 @@ { return type.FullName + ", " + type.Assembly.GetName().Name; } + + /// + /// Determines whether an instance of this type can be assigned to + /// an instance of the . + /// + /// Internally uses . + /// + /// Target type (as reverse). + public static bool IsAssignableTo(this Type type) + { + return type.IsAssignableTo(typeof(TTarget)); + } + + /// + /// Determines whether an instance of this type can be assigned to + /// an instance of the . + /// + /// Internally uses (as reverse). + /// + /// this type + /// Target type + public static bool IsAssignableTo(this Type type, Type targetType) + { + return targetType.IsAssignableFrom(type); + } } } From 219fba719df982a277dcdb219e17bfea6416d072 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 25 Dec 2018 15:47:29 +0300 Subject: [PATCH 4/8] Resolved #684: Automatically configure audit and other interfaces for EF core model. --- .../Abp/EntityFrameworkCore/AbpDbContext.cs | 112 +++++++++++++++++- .../AbpEntityTypeBuilderExtensions.cs | 41 +++++-- 2 files changed, 138 insertions(+), 15 deletions(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs index 1f39d94774..06c5cb4ff4 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Newtonsoft.Json; @@ -315,15 +316,17 @@ namespace Volo.Abp.EntityFrameworkCore protected virtual void ConfigureBaseProperties(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) where TEntity : class { - ConfigureConcurrencyStamp(modelBuilder, mutableEntityType); + ConfigureConcurrencyStampProperty(modelBuilder, mutableEntityType); ConfigureExtraProperties(modelBuilder, mutableEntityType); + ConfigureAuditProperties(modelBuilder, mutableEntityType); + ConfigureTenantIdProperty(modelBuilder, mutableEntityType); ConfigureGlobalFilters(modelBuilder, mutableEntityType); } - protected virtual void ConfigureConcurrencyStamp(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) + protected virtual void ConfigureConcurrencyStampProperty(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) where TEntity : class { - if (!typeof(IHasConcurrencyStamp).GetTypeInfo().IsAssignableFrom(typeof(TEntity))) + if (!typeof(IHasConcurrencyStamp).IsAssignableFrom(typeof(TEntity))) { return; } @@ -339,7 +342,7 @@ namespace Volo.Abp.EntityFrameworkCore protected virtual void ConfigureExtraProperties(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) where TEntity : class { - if (!typeof(IHasExtraProperties).GetTypeInfo().IsAssignableFrom(typeof(TEntity))) + if (!typeof(IHasExtraProperties).IsAssignableFrom(typeof(TEntity))) { return; } @@ -355,6 +358,107 @@ namespace Volo.Abp.EntityFrameworkCore }); } + protected virtual void ConfigureAuditProperties(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) + where TEntity : class + { + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((IHasCreationTime)x).CreationTime) + .IsRequired() + .HasColumnName(nameof(IHasCreationTime.CreationTime)); + }); + } + + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((IMayHaveCreator)x).CreatorId) + .IsRequired(false) + .HasColumnName(nameof(IMayHaveCreator.CreatorId)); + }); + } + + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((IMustHaveCreator)x).CreatorId) + .IsRequired() + .HasColumnName(nameof(IMustHaveCreator.CreatorId)); + }); + } + + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((IHasModificationTime)x).LastModificationTime) + .IsRequired(false) + .HasColumnName(nameof(IHasModificationTime.LastModificationTime)); + }); + } + + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((IModificationAuditedObject)x).LastModifierId) + .IsRequired(false) + .HasColumnName(nameof(IModificationAuditedObject.LastModifierId)); + }); + } + + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((ISoftDelete) x).IsDeleted) + .IsRequired() + .HasDefaultValue(false) + .HasColumnName(nameof(ISoftDelete.IsDeleted)); + }); + } + + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((IHasDeletionTime)x).DeletionTime) + .IsRequired(false) + .HasColumnName(nameof(IHasDeletionTime.DeletionTime)); + }); + } + + if (typeof(TEntity).IsAssignableTo()) + { + modelBuilder.Entity(b => + { + b.Property(x => ((IDeletionAuditedObject)x).DeleterId) + .IsRequired(false) + .HasColumnName(nameof(IDeletionAuditedObject.DeleterId)); + }); + } + } + + protected virtual void ConfigureTenantIdProperty(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) + where TEntity : class + { + if (!typeof(TEntity).IsAssignableTo()) + { + return; + } + + modelBuilder.Entity(b => + { + b.Property(x => ((IMultiTenant)x).TenantId) + .IsRequired(false) + .HasColumnName(nameof(IMultiTenant.TenantId)); + }); + } + protected virtual void ConfigureGlobalFilters(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) where TEntity : class { diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs index 200e7a707c..9bb2f9018d 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs @@ -33,59 +33,76 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling public static void ConfigureSoftDelete(this EntityTypeBuilder b) where T : class, ISoftDelete { - b.Property(x => x.IsDeleted).IsRequired().HasDefaultValue(false).HasColumnName(nameof(ISoftDelete.IsDeleted)); + b.Property(x => x.IsDeleted) + .IsRequired() + .HasDefaultValue(false) + .HasColumnName(nameof(ISoftDelete.IsDeleted)); } public static void ConfigureDeletionTime(this EntityTypeBuilder b) where T : class, IHasDeletionTime { b.ConfigureSoftDelete(); - b.Property(x => x.DeletionTime).IsRequired(false).HasColumnName(nameof(IHasDeletionTime.DeletionTime)); + b.Property(x => x.DeletionTime) + .IsRequired(false) + .HasColumnName(nameof(IHasDeletionTime.DeletionTime)); } public static void ConfigureMayHaveCreator(this EntityTypeBuilder b) where T : class, IMayHaveCreator { - b.Property(x => x.CreatorId).IsRequired(false).HasColumnName(nameof(IMayHaveCreator.CreatorId)); + b.Property(x => x.CreatorId) + .IsRequired(false) + .HasColumnName(nameof(IMayHaveCreator.CreatorId)); } public static void ConfigureMustHaveCreator(this EntityTypeBuilder b) where T : class, IMustHaveCreator { - b.Property(x => x.CreatorId).IsRequired().HasColumnName(nameof(IMustHaveCreator.CreatorId)); + b.Property(x => x.CreatorId) + .IsRequired() + .HasColumnName(nameof(IMustHaveCreator.CreatorId)); } public static void ConfigureDeletionAudited(this EntityTypeBuilder b) where T : class, IDeletionAuditedObject { b.ConfigureDeletionTime(); - b.Property(x => x.DeleterId).IsRequired(false).HasColumnName(nameof(IDeletionAuditedObject.DeleterId)); + b.Property(x => x.DeleterId) + .IsRequired(false) + .HasColumnName(nameof(IDeletionAuditedObject.DeleterId)); } public static void ConfigureCreationTime(this EntityTypeBuilder b) where T : class, IHasCreationTime { - b.Property(x => x.CreationTime).IsRequired().HasColumnName(nameof(IHasCreationTime.CreationTime)); + b.Property(x => x.CreationTime) + .IsRequired() + .HasColumnName(nameof(IHasCreationTime.CreationTime)); } public static void ConfigureCreationAudited(this EntityTypeBuilder b) where T : class, ICreationAuditedObject { b.ConfigureCreationTime(); - b.Property(x => x.CreatorId).IsRequired(false).HasColumnName(nameof(ICreationAuditedObject.CreatorId)); + b.ConfigureMayHaveCreator(); } public static void ConfigureLastModificationTime(this EntityTypeBuilder b) where T : class, IHasModificationTime { - b.Property(x => x.LastModificationTime).IsRequired(false).HasColumnName(nameof(IHasModificationTime.LastModificationTime)); + b.Property(x => x.LastModificationTime) + .IsRequired(false) + .HasColumnName(nameof(IHasModificationTime.LastModificationTime)); } public static void ConfigureModificationAudited(this EntityTypeBuilder b) where T : class, IModificationAuditedObject { b.ConfigureLastModificationTime(); - b.Property(x => x.LastModifierId).IsRequired(false).HasColumnName(nameof(IModificationAuditedObject.LastModifierId)); + b.Property(x => x.LastModifierId) + .IsRequired(false) + .HasColumnName(nameof(IModificationAuditedObject.LastModifierId)); } public static void ConfigureAudited(this EntityTypeBuilder b) @@ -105,9 +122,11 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling public static void ConfigureMultiTenant(this EntityTypeBuilder b) where T : class, IMultiTenant { - b.Property(x => x.TenantId).IsRequired(false).HasColumnName(nameof(IMultiTenant.TenantId)); + b.Property(x => x.TenantId) + .IsRequired(false) + .HasColumnName(nameof(IMultiTenant.TenantId)); } - //TODO: Add other interfaces (IMultiTenant, IAuditedObject...) + //TODO: Add other interfaces (IAuditedObject...) } } From 037d1a062a804e60d0c24acc47a9ff51ba49e105 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 25 Dec 2018 16:17:01 +0300 Subject: [PATCH 5/8] Auto configure BsonClassMap for IHasExtraProperties --- .../Volo/Abp/MongoDB/AbpGlobalBsonClassMap.cs | 60 +++++++++++++++++++ .../Volo/Abp/MongoDB/MongoModelSource.cs | 2 + 2 files changed, 62 insertions(+) create mode 100644 framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpGlobalBsonClassMap.cs diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpGlobalBsonClassMap.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpGlobalBsonClassMap.cs new file mode 100644 index 0000000000..db74e1dae8 --- /dev/null +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpGlobalBsonClassMap.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using MongoDB.Bson.Serialization; +using Volo.Abp.Data; + +namespace Volo.Abp.MongoDB +{ + public static class AbpGlobalBsonClassMap + { + private static readonly HashSet PreConfiguredTypes = new HashSet(); + + /// + /// Configure default/base properties for the entity using . + /// This method runs single time for an for the application lifetime. + /// Subsequent calls has no effect for the same . + /// + public static void ConfigureDefaults() + { + ConfigureDefaults(typeof(TEntity)); + } + + /// + /// Configure default/base properties for the entity using . + /// This method runs single time for an for the application lifetime. + /// Subsequent calls has no effect for the same . + /// + public static void ConfigureDefaults(Type entityType) + { + lock (PreConfiguredTypes) + { + if (PreConfiguredTypes.Contains(entityType)) + { + return; + } + + ConfigureDefaultsInternal(entityType); + PreConfiguredTypes.Add(entityType); + } + } + + private static void ConfigureDefaultsInternal(Type entityType) + { + var map = new BsonClassMap(entityType); + + map.AutoMap(); + + if (entityType.IsAssignableTo()) + { + map.SetExtraElementsMember( + new BsonMemberMap( + map, + entityType.GetMember(nameof(IHasExtraProperties.ExtraProperties))[0] + ) + ); + } + + BsonClassMap.RegisterClassMap(map); + } + } +} diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs index c5cb0da1c8..1ae6aeb124 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs @@ -58,6 +58,8 @@ namespace Volo.Abp.MongoDB { b.CollectionName = collectionAttribute?.CollectionName ?? collectionProperty.Name; }); + + AbpGlobalBsonClassMap.ConfigureDefaults(entityType); } protected virtual void BuildModelFromDbContextInstance(IMongoModelBuilder modelBuilder, AbpMongoDbContext dbContext) From 0a5a3133e07e8b03d8092bd2ae025315e2e322b5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 25 Dec 2018 16:33:34 +0300 Subject: [PATCH 6/8] Resolved #686 #687 --- .../AbpIdentityWebMainMenuContributor.cs | 6 +-- .../Navigation/IdentityMenuNames.cs | 10 +++++ .../Pages/Identity/Roles/Index.cshtml | 10 ++++- .../Pages/Identity/Users/Index.cshtml | 30 +++++++++------ .../SettingManagementMainMenuContributor.cs | 2 +- .../Navigation/SettingManagementMenuNames.cs | 14 +++++++ .../Pages/SettingManagement/Index.cshtml | 38 ++++++++++++++----- ...pTenantManagementWebMainMenuContributor.cs | 4 +- .../Navigation/TenantManagementMenuNames.cs | 9 +++++ .../TenantManagement/Tenants/Index.cshtml | 10 ++++- 10 files changed, 104 insertions(+), 29 deletions(-) create mode 100644 modules/identity/src/Volo.Abp.Identity.Web/Navigation/IdentityMenuNames.cs create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMenuNames.cs create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs index 8a7f5200b9..22581401be 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs @@ -19,17 +19,17 @@ namespace Volo.Abp.Identity.Web.Navigation var authorizationService = context.ServiceProvider.GetRequiredService(); var l = context.ServiceProvider.GetRequiredService>(); - var identityMenuItem = new ApplicationMenuItem("Identity", l["Menu:IdentityManagement"], icon: "fa fa-id-card-o"); + var identityMenuItem = new ApplicationMenuItem(IdentityMenuNames.GroupName, l["Menu:IdentityManagement"], icon: "fa fa-id-card-o"); context.Menu.AddItem(identityMenuItem); if (await authorizationService.IsGrantedAsync(IdentityPermissions.Roles.Default)) { - identityMenuItem.AddItem(new ApplicationMenuItem("Roles", l["Roles"], url: "/Identity/Roles")); + identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Roles, l["Roles"], url: "/Identity/Roles")); } if (await authorizationService.IsGrantedAsync(IdentityPermissions.Users.Default)) { - identityMenuItem.AddItem(new ApplicationMenuItem("Users", l["Users"], url: "/Identity/Users")); + identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "/Identity/Users")); } } } diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/IdentityMenuNames.cs b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/IdentityMenuNames.cs new file mode 100644 index 0000000000..61a503f457 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/IdentityMenuNames.cs @@ -0,0 +1,10 @@ +namespace Volo.Abp.Identity.Web.Navigation +{ + public class IdentityMenuNames + { + public const string GroupName = "AbpIdentity"; + + public const string Roles = GroupName + ".Roles"; + public const string Users = GroupName + ".Users"; + } +} diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml index a93b66895e..1979c87bb2 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml @@ -1,9 +1,17 @@ @page @using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.Abp.Identity.Localization +@using Volo.Abp.Identity.Web.Navigation @using Volo.Abp.Identity.Web.Pages.Identity.Roles @model IndexModel @inject IHtmlLocalizer L +@inject IPageLayout PageLayout +@{ + PageLayout.Content.Title = L["Roles"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value); + PageLayout.Content.MenuItemName = IdentityMenuNames.Roles; +} @section scripts { @@ -14,7 +22,7 @@ -

    @L["Roles"]

    + @L["Roles"]     diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml index 37db6f2123..bcef02cc72 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml @@ -1,12 +1,20 @@ @page @using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.Abp.Identity @using Volo.Abp.Identity.Localization +@using Volo.Abp.Identity.Web.Navigation @using Volo.Abp.Identity.Web.Pages.Identity.Users @model IndexModel @inject IHtmlLocalizer L @inject IAuthorizationService Authorization +@inject IPageLayout PageLayout +@{ + PageLayout.Content.Title = L["Users"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value); + PageLayout.Content.MenuItemName = IdentityMenuNames.Users; +} @section scripts { @@ -18,26 +26,26 @@ -

    @L["Users"]

    + @L["Users"]     - + @if (await Authorization.IsGrantedAsync(IdentityPermissions.Users.Create)) { - + }     - - - @L["Actions"] - @L["UserName"] - @L["EmailAddress"] - @L["PhoneNumber"] - - + + + @L["Actions"] + @L["UserName"] + @L["EmailAddress"] + @L["PhoneNumber"] + + \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs index 9706ec4d15..c6ff751d57 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs @@ -25,7 +25,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation //TODO: Localize //var l = context.ServiceProvider.GetRequiredService>(); - context.Menu.AddItem(new ApplicationMenuItem("Volo.Abp.SettingManagement", "Settings", "/SettingManagement", icon: "fa fa-cog", order: int.MaxValue - 1000)); + context.Menu.AddItem(new ApplicationMenuItem(SettingManagementMenuNames.GroupName, "Settings", "/SettingManagement", icon: "fa fa-cog", order: int.MaxValue - 1000)); return Task.CompletedTask; } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMenuNames.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMenuNames.cs new file mode 100644 index 0000000000..67678f5b9e --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMenuNames.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Volo.Abp.SettingManagement.Web.Navigation +{ + public class SettingManagementMenuNames + { + public const string GroupName = "SettingManagement"; + + public const string Settings = GroupName + ".Settings"; + } +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml index 37beb37169..0e7a9a70bf 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml @@ -1,19 +1,37 @@ @page +@using Volo.Abp.AspNetCore.Mvc.UI.Layout +@using Volo.Abp.SettingManagement.Web.Navigation @using Volo.Abp.SettingManagement.Web.Pages.SettingManagement @model IndexModel +@inject IPageLayout PageLayout +@{ + PageLayout.Content.Title = /*L["Settings"].Value*/ "Settings"; + PageLayout.Content.MenuItemName = SettingManagementMenuNames.GroupName; +} @section scripts { } - -@foreach (var group in Model.SettingPageCreationContext.Groups) -{ - - -

    @group.DisplayName

    - @await Component.InvokeAsync(group.ComponentType) -     -} -     \ No newline at end of file + + + + + @*@L["Settings"]*@Settings + + + + + + @foreach (var group in Model.SettingPageCreationContext.Groups) + { + + +

    @group.DisplayName

    + @await Component.InvokeAsync(group.ComponentType) +     + } +     +     +     \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs index 5726df320e..63dee4f7f7 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs @@ -19,12 +19,12 @@ namespace Volo.Abp.TenantManagement.Web.Navigation var authorizationService = context.ServiceProvider.GetRequiredService(); var l = context.ServiceProvider.GetRequiredService>(); - var tenantManagementMenuItem = new ApplicationMenuItem("TenantManagement", l["Menu:TenantManagement"]); + var tenantManagementMenuItem = new ApplicationMenuItem(TenantManagementMenuNames.GroupName, l["Menu:TenantManagement"], icon: "fa fa-users"); context.Menu.AddItem(tenantManagementMenuItem); if (await authorizationService.IsGrantedAsync(TenantManagementPermissions.Tenants.Default)) { - tenantManagementMenuItem.AddItem(new ApplicationMenuItem("Tenants", l["Tenants"], url: "/TenantManagement/Tenants")); + tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "/TenantManagement/Tenants")); } } } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs new file mode 100644 index 0000000000..8ca753d0b0 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs @@ -0,0 +1,9 @@ +namespace Volo.Abp.TenantManagement.Web.Navigation +{ + public class TenantManagementMenuNames + { + public const string GroupName = "TenantManagement"; + + public const string Tenants = GroupName + ".Tenants"; + } +} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml index 37e9d6eec9..a5a7bf4a90 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml @@ -1,9 +1,17 @@ @page @using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.Abp.TenantManagement.Localization +@using Volo.Abp.TenantManagement.Web.Navigation @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants @model IndexModel @inject IHtmlLocalizer L +@inject IPageLayout PageLayout +@{ + PageLayout.Content.Title = L["Tenants"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:TenantManagement"].Value); + PageLayout.Content.MenuItemName = TenantManagementMenuNames.Tenants; +} @section scripts { } @@ -11,7 +19,7 @@ -

    @L["Tenants"]

    + @L["Tenants"]     From 1ba615359b91389f048195dba520622e4f826612 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 25 Dec 2018 17:15:41 +0300 Subject: [PATCH 7/8] Regenerate migrations for docs --- .../20180530161822_Create_Project.Designer.cs | 39 ----------- .../20180530161822_Create_Project.cs | 30 -------- ...d_DocumentStoreType_To_Project.Designer.cs | 45 ------------ ...rtName_And_DocumentStoreType_To_Project.cs | 35 ---------- ...ded_ExtraProperties_To_Project.Designer.cs | 50 -------------- ...125653_Added_ExtraProperties_To_Project.cs | 24 ------- ...DefaultDocumentName_To_Project.Designer.cs | 54 --------------- ...53_Added_DefaultDocumentName_To_Project.cs | 26 ------- ...igationDocumentName_To_Project.Designer.cs | 58 ---------------- ...Added_NavigationDocumentName_To_Project.cs | 26 ------- ...oogleCustomSearchId_To_Project.Designer.cs | 59 ---------------- ...5_Added_GoogleCustomSearchId_To_Project.cs | 22 ------ ...212013_Added_Format_To_Project.Designer.cs | 61 ----------------- .../20180605212013_Added_Format_To_Project.cs | 22 ------ ...925162715_Added_MainWebsiteUrl.Designer.cs | 63 ----------------- .../20180925162715_Added_MainWebsiteUrl.cs | 22 ------ ...3_Added_Project_MinimumVersion.Designer.cs | 68 ------------------- ...1030125213_Added_Project_MinimumVersion.cs | 32 --------- ...3_Removed_GoogleCustomSearchId.Designer.cs | 66 ------------------ ...1205154143_Removed_GoogleCustomSearchId.cs | 22 ------ ...11141818_AggregateRoot_Changes.Designer.cs | 68 ------------------- .../20181211141818_AggregateRoot_Changes.cs | 22 ------ ...0181225134002_Initial20181225.Designer.cs} | 31 +++++---- ...y.cs => 20181225134002_Initial20181225.cs} | 31 ++++++++- .../DocsTestAppDbContextModelSnapshot.cs | 27 +++++--- ...olo.DocsTestApp.EntityFrameworkCore.csproj | 4 -- ...IdentityDbContextModelBuilderExtensions.cs | 7 +- .../MongoDB/AbpIdentityBsonClassMap.cs | 1 + 28 files changed, 69 insertions(+), 946 deletions(-) delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.Designer.cs delete mode 100644 modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.cs rename modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/{20181225063242_Added_Identity.Designer.cs => 20181225134002_Initial20181225.Designer.cs} (93%) rename modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/{20181225063242_Added_Identity.cs => 20181225134002_Initial20181225.cs} (90%) diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.Designer.cs deleted file mode 100644 index 93e5e0ddba..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; -using Microsoft.EntityFrameworkCore.Migrations; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180530161822_Create_Project")] - partial class Create_Project - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-preview2-30571") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.cs deleted file mode 100644 index 745f513108..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180530161822_Create_Project.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Create_Project : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "DocsProjects", - columns: table => new - { - Id = table.Column(nullable: false), - Name = table.Column(maxLength: 128, nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_DocsProjects", x => x.Id); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.Designer.cs deleted file mode 100644 index 496c6f52d1..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.Designer.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; -using Microsoft.EntityFrameworkCore.Migrations; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180531111707_Added_ShortName_And_DocumentStoreType_To_Project")] - partial class Added_ShortName_And_DocumentStoreType_To_Project - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-preview2-30571") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DocumentStoreType"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.cs deleted file mode 100644 index ae15dcc969..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531111707_Added_ShortName_And_DocumentStoreType_To_Project.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_ShortName_And_DocumentStoreType_To_Project : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "DocumentStoreType", - table: "DocsProjects", - nullable: true); - - migrationBuilder.AddColumn( - name: "ShortName", - table: "DocsProjects", - maxLength: 32, - nullable: false, - defaultValue: ""); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "DocumentStoreType", - table: "DocsProjects"); - - migrationBuilder.DropColumn( - name: "ShortName", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.Designer.cs deleted file mode 100644 index b917f0818d..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.Designer.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180531125653_Added_ExtraProperties_To_Project")] - partial class Added_ExtraProperties_To_Project - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-preview2-30571") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.cs deleted file mode 100644 index 84b7f75fae..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531125653_Added_ExtraProperties_To_Project.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_ExtraProperties_To_Project : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "ExtraProperties", - table: "DocsProjects", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "ExtraProperties", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.Designer.cs deleted file mode 100644 index 12d21840db..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.Designer.cs +++ /dev/null @@ -1,54 +0,0 @@ -// -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180531130753_Added_DefaultDocumentName_To_Project")] - partial class Added_DefaultDocumentName_To_Project - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-preview2-30571") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.cs deleted file mode 100644 index 3c07b53686..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531130753_Added_DefaultDocumentName_To_Project.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_DefaultDocumentName_To_Project : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "DefaultDocumentName", - table: "DocsProjects", - maxLength: 128, - nullable: false, - defaultValue: ""); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "DefaultDocumentName", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.Designer.cs deleted file mode 100644 index a24a2650b1..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.Designer.cs +++ /dev/null @@ -1,58 +0,0 @@ -// -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180531134117_Added_NavigationDocumentName_To_Project")] - partial class Added_NavigationDocumentName_To_Project - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-preview2-30571") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("NavigationDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.cs deleted file mode 100644 index 1f632f5a82..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180531134117_Added_NavigationDocumentName_To_Project.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_NavigationDocumentName_To_Project : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "NavigationDocumentName", - table: "DocsProjects", - maxLength: 128, - nullable: false, - defaultValue: ""); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "NavigationDocumentName", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.Designer.cs deleted file mode 100644 index 83ec517f2d..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.Designer.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180601150905_Added_GoogleCustomSearchId_To_Project")] - partial class Added_GoogleCustomSearchId_To_Project - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-rtm-30799") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("GoogleCustomSearchId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("NavigationDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.cs deleted file mode 100644 index 8ffcb80a5f..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180601150905_Added_GoogleCustomSearchId_To_Project.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_GoogleCustomSearchId_To_Project : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "GoogleCustomSearchId", - table: "DocsProjects", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "GoogleCustomSearchId", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.Designer.cs deleted file mode 100644 index 6469322509..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.Designer.cs +++ /dev/null @@ -1,61 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180605212013_Added_Format_To_Project")] - partial class Added_Format_To_Project - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-rtm-30799") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Format"); - - b.Property("GoogleCustomSearchId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("NavigationDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.cs deleted file mode 100644 index d60c6407fa..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180605212013_Added_Format_To_Project.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_Format_To_Project : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "Format", - table: "DocsProjects", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Format", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.Designer.cs deleted file mode 100644 index b633007f70..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20180925162715_Added_MainWebsiteUrl")] - partial class Added_MainWebsiteUrl - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.3-rtm-32065") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Format"); - - b.Property("GoogleCustomSearchId"); - - b.Property("MainWebsiteUrl"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("NavigationDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.cs deleted file mode 100644 index 1923f5ae7a..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20180925162715_Added_MainWebsiteUrl.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_MainWebsiteUrl : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "MainWebsiteUrl", - table: "DocsProjects", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "MainWebsiteUrl", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.Designer.cs deleted file mode 100644 index 2a6665b2e5..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.Designer.cs +++ /dev/null @@ -1,68 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20181030125213_Added_Project_MinimumVersion")] - partial class Added_Project_MinimumVersion - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.4-rtm-31024") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Format"); - - b.Property("GoogleCustomSearchId"); - - b.Property("LatestVersionBranchName") - .HasMaxLength(128); - - b.Property("MainWebsiteUrl"); - - b.Property("MinimumVersion"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("NavigationDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.cs deleted file mode 100644 index d369013fad..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Added_Project_MinimumVersion : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "LatestVersionBranchName", - table: "DocsProjects", - maxLength: 128, - nullable: true); - - migrationBuilder.AddColumn( - name: "MinimumVersion", - table: "DocsProjects", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "LatestVersionBranchName", - table: "DocsProjects"); - - migrationBuilder.DropColumn( - name: "MinimumVersion", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.Designer.cs deleted file mode 100644 index 5a94075bd6..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.Designer.cs +++ /dev/null @@ -1,66 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20181205154143_Removed_GoogleCustomSearchId")] - partial class Removed_GoogleCustomSearchId - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.1-rtm-30846") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Format"); - - b.Property("LatestVersionBranchName") - .HasMaxLength(128); - - b.Property("MainWebsiteUrl"); - - b.Property("MinimumVersion"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("NavigationDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.cs deleted file mode 100644 index 577b28bda1..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181205154143_Removed_GoogleCustomSearchId.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class Removed_GoogleCustomSearchId : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "GoogleCustomSearchId", - table: "DocsProjects"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "GoogleCustomSearchId", - table: "DocsProjects", - nullable: true); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.Designer.cs deleted file mode 100644 index 3465acc006..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.Designer.cs +++ /dev/null @@ -1,68 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.DocsTestApp.EntityFrameworkCore; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20181211141818_AggregateRoot_Changes")] - partial class AggregateRoot_Changes - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.1-rtm-30846") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Docs.Projects.Project", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp"); - - b.Property("DefaultDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("DocumentStoreType"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Format"); - - b.Property("LatestVersionBranchName") - .HasMaxLength(128); - - b.Property("MainWebsiteUrl"); - - b.Property("MinimumVersion"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("NavigationDocumentName") - .IsRequired() - .HasMaxLength(128); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(32); - - b.HasKey("Id"); - - b.ToTable("DocsProjects"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.cs deleted file mode 100644 index cfc39411b1..0000000000 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181211141818_AggregateRoot_Changes.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations -{ - public partial class AggregateRoot_Changes : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "ConcurrencyStamp", - table: "DocsProjects", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "ConcurrencyStamp", - table: "DocsProjects"); - } - } -} diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.Designer.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.Designer.cs similarity index 93% rename from modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.Designer.cs rename to modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.Designer.cs index 8a4137a48f..cfa52c4ddc 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.Designer.cs +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.Designer.cs @@ -10,8 +10,8 @@ using Volo.DocsTestApp.EntityFrameworkCore; namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations { [DbContext(typeof(DocsTestAppDbContext))] - [Migration("20181225063242_Added_Identity")] - partial class Added_Identity + [Migration("20181225134002_Initial20181225")] + partial class Initial20181225 { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -134,17 +134,19 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); + .HasColumnName("ConcurrencyStamp"); - b.Property("CreationTime"); + b.Property("CreationTime") + .HasColumnName("CreationTime"); - b.Property("CreatorId"); + b.Property("CreatorId") + .HasColumnName("CreatorId"); - b.Property("DeleterId"); + b.Property("DeleterId") + .HasColumnName("DeleterId"); - b.Property("DeletionTime"); + b.Property("DeletionTime") + .HasColumnName("DeletionTime"); b.Property("Email") .HasColumnName("Email") @@ -158,11 +160,16 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations b.Property("ExtraProperties") .HasColumnName("ExtraProperties"); - b.Property("IsDeleted"); + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasDefaultValue(false); - b.Property("LastModificationTime"); + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime"); - b.Property("LastModifierId"); + b.Property("LastModifierId") + .HasColumnName("LastModifierId"); b.Property("LockoutEnabled") .ValueGeneratedOnAdd() diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.cs similarity index 90% rename from modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.cs rename to modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.cs index 59e3de3d39..5675fc708e 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225063242_Added_Identity.cs +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181225134002_Initial20181225.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations { - public partial class Added_Identity : Migration + public partial class Initial20181225 : Migration { protected override void Up(MigrationBuilder migrationBuilder) { @@ -82,12 +82,12 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations { Id = table.Column(nullable: false), ExtraProperties = table.Column(nullable: true), - ConcurrencyStamp = table.Column(maxLength: 256, nullable: false), + ConcurrencyStamp = table.Column(nullable: true), CreationTime = table.Column(nullable: false), CreatorId = table.Column(nullable: true), LastModificationTime = table.Column(nullable: true), LastModifierId = table.Column(nullable: true), - IsDeleted = table.Column(nullable: false), + IsDeleted = table.Column(nullable: false, defaultValue: false), DeleterId = table.Column(nullable: true), DeletionTime = table.Column(nullable: true), TenantId = table.Column(nullable: true), @@ -112,6 +112,28 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations table.PrimaryKey("PK_AbpUsers", x => x.Id); }); + migrationBuilder.CreateTable( + name: "DocsProjects", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + Name = table.Column(maxLength: 128, nullable: false), + ShortName = table.Column(maxLength: 32, nullable: false), + Format = table.Column(nullable: true), + DefaultDocumentName = table.Column(maxLength: 128, nullable: false), + NavigationDocumentName = table.Column(maxLength: 128, nullable: false), + MinimumVersion = table.Column(nullable: true), + DocumentStoreType = table.Column(nullable: true), + MainWebsiteUrl = table.Column(nullable: true), + LatestVersionBranchName = table.Column(maxLength: 128, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_DocsProjects", x => x.Id); + }); + migrationBuilder.CreateTable( name: "AbpRoleClaims", columns: table => new @@ -303,6 +325,9 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations migrationBuilder.DropTable( name: "AbpUserTokens"); + migrationBuilder.DropTable( + name: "DocsProjects"); + migrationBuilder.DropTable( name: "AbpRoles"); diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs index b1ee9d3e2f..0037d0cf90 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs @@ -132,17 +132,19 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); + .HasColumnName("ConcurrencyStamp"); - b.Property("CreationTime"); + b.Property("CreationTime") + .HasColumnName("CreationTime"); - b.Property("CreatorId"); + b.Property("CreatorId") + .HasColumnName("CreatorId"); - b.Property("DeleterId"); + b.Property("DeleterId") + .HasColumnName("DeleterId"); - b.Property("DeletionTime"); + b.Property("DeletionTime") + .HasColumnName("DeletionTime"); b.Property("Email") .HasColumnName("Email") @@ -156,11 +158,16 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations b.Property("ExtraProperties") .HasColumnName("ExtraProperties"); - b.Property("IsDeleted"); + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasDefaultValue(false); - b.Property("LastModificationTime"); + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime"); - b.Property("LastModifierId"); + b.Property("LastModifierId") + .HasColumnName("LastModifierId"); b.Property("LockoutEnabled") .ValueGeneratedOnAdd() diff --git a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj index b458a273e0..83d1523df9 100644 --- a/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj +++ b/modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Volo.DocsTestApp.EntityFrameworkCore.csproj @@ -4,10 +4,6 @@ netstandard2.0 - - - - diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs index 27727da177..ce8e1e47d5 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs @@ -22,15 +22,15 @@ namespace Volo.Abp.Identity.EntityFrameworkCore { b.ToTable(options.TablePrefix + "Users", options.Schema); - b.ConfigureAbpUser(options); - + b.ConfigureFullAudited(); b.ConfigureExtraProperties(); + b.ConfigureConcurrencyStamp(); + b.ConfigureAbpUser(options); b.Property(u => u.NormalizedUserName).IsRequired().HasMaxLength(IdentityUserConsts.MaxNormalizedUserNameLength).HasColumnName(nameof(IdentityUser.NormalizedUserName)); b.Property(u => u.NormalizedEmail).HasMaxLength(IdentityUserConsts.MaxNormalizedEmailLength).HasColumnName(nameof(IdentityUser.NormalizedEmail)); b.Property(u => u.PasswordHash).HasMaxLength(IdentityUserConsts.MaxPasswordHashLength).HasColumnName(nameof(IdentityUser.PasswordHash)); b.Property(u => u.SecurityStamp).IsRequired().HasMaxLength(IdentityUserConsts.MaxSecurityStampLength).HasColumnName(nameof(IdentityUser.SecurityStamp)); - b.Property(u => u.ConcurrencyStamp).IsRequired().IsConcurrencyToken().HasMaxLength(IdentityUserConsts.MaxConcurrencyStampLength).HasColumnName(nameof(IdentityUser.ConcurrencyStamp)); b.Property(u => u.TwoFactorEnabled).HasDefaultValue(false).HasColumnName(nameof(IdentityUser.TwoFactorEnabled)); b.Property(u => u.LockoutEnabled).HasDefaultValue(false).HasColumnName(nameof(IdentityUser.LockoutEnabled)); b.Property(u => u.AccessFailedCount).HasDefaultValue(0).HasColumnName(nameof(IdentityUser.AccessFailedCount)); @@ -95,6 +95,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore { b.ToTable(options.TablePrefix + "Roles", options.Schema); + b.ConfigureConcurrencyStamp(); b.ConfigureExtraProperties(); b.Property(r => r.Name).IsRequired().HasMaxLength(IdentityRoleConsts.MaxNameLength); diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityBsonClassMap.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityBsonClassMap.cs index 6bd6ff8623..d55ad6ee41 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityBsonClassMap.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityBsonClassMap.cs @@ -27,6 +27,7 @@ namespace Volo.Abp.Identity.MongoDB BsonClassMap.RegisterClassMap(map => { map.AutoMap(); + map.ConfigureExtraProperties(); }); }); } From d7ec9a44f6f37d86c247ca4163a3c720a08fd040 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 25 Dec 2018 17:48:36 +0300 Subject: [PATCH 8/8] Resolved #689 --- .../TagHelpers/Form/AbpInputTagHelperService.cs | 8 +++++++- .../TagHelpers/Form/AbpSelectTagHelperService.cs | 15 +++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs index a4a0193e97..df5d8d73b6 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text.Encodings.Web; using Microsoft.AspNetCore.Mvc.TagHelpers; @@ -60,7 +61,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form var inputTag = GetInputTagHelperOutput(context, output, out isCheckbox); var inputHtml = RenderTagHelperOutput(inputTag, _encoder); - var label = GetLabelAsHtml(context, output, inputTag, isCheckbox); + var label = GetLabelAsHtml(context, output, inputTag, isCheckbox) + GetRequiredSymbol(context, output); var info = GetInfoAsHtml(context, output, inputTag, isCheckbox); var validation = isCheckbox ? "" : GetValidationAsHtml(context, output, inputTag); @@ -251,6 +252,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form ""; } + protected virtual string GetRequiredSymbol(TagHelperContext context, TagHelperOutput output) + { + return GetAttribute(TagHelper.AspFor.ModelExplorer) != null ? " (*) ":""; + } + protected virtual string GetInfoAsHtml(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag, bool isCheckbox) { if (isCheckbox) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index 5437cf0bc8..441e6dcb9c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; using System.Text.Encodings.Web; @@ -56,11 +57,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form { var selectTag = GetSelectTag(context, output); var selectAsHtml = RenderTagHelperOutput(selectTag, _encoder); - var label = GetLabelAsHtml(context, output, selectTag); - var validation = GetValidationAsHtml(context, output, selectTag); + var label = GetLabelAsHtml(context, output, selectTag) + GetRequiredSymbol(context, output); + var validation = GetValidationAsHtml(context, output, selectTag); var infoText = GetInfoAsHtml(context, output, selectTag); - return label + Environment.NewLine + selectAsHtml + Environment.NewLine + infoText+ Environment.NewLine + validation; + return label + Environment.NewLine + selectAsHtml + Environment.NewLine + infoText + Environment.NewLine + validation; } protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml) @@ -80,7 +81,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form var selectTagHelperOutput = GetInnerTagHelper(GetInputAttributes(context, output), context, selectTagHelper, "select", TagMode.StartTagAndEndTag); selectTagHelperOutput.Attributes.AddClass("form-control"); - selectTagHelperOutput.Attributes.AddClass(GetSize(context,output)); + selectTagHelperOutput.Attributes.AddClass(GetSize(context, output)); AddDisabledAttribute(selectTagHelperOutput); AddInfoTextId(selectTagHelperOutput); @@ -121,6 +122,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form return GetLabelAsHtmlUsingTagHelper(context, output); } + + protected virtual string GetRequiredSymbol(TagHelperContext context, TagHelperOutput output) + { + return GetAttribute(TagHelper.AspFor.ModelExplorer) != null ? " (*) " : ""; + } + protected virtual void AddInfoTextId(TagHelperOutput inputTagHelperOutput) { if (GetAttribute(TagHelper.AspFor.ModelExplorer) == null)