diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index 2a5aabfe8d..47fac0a124 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -40,10 +40,6 @@
RequiredPolicy="@UpdatePolicyName"
Clicked="() => OpenEditModalAsync(context)"
Text="@L["Edit"]">
-
}
-@* ************************* EDIT CONNECTION STRING MODAL ************************* *@
-@if (HasManageConnectionStringsPermission)
-{
-
-
-
-
-
-
-}
-
@if (HasManageFeaturesPermission)
{
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index 1bc3ce7cd1..72c5d4e589 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -13,16 +13,11 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
{
protected const string FeatureProviderName = "T";
- protected bool HasManageConnectionStringsPermission;
protected bool HasManageFeaturesPermission;
- protected string ManageConnectionStringsPolicyName;
protected string ManageFeaturesPolicyName;
protected FeatureManagementModal FeatureManagementModal;
- protected Modal ManageConnectionStringModal;
- protected Validations ManageConnectionStringValidations;
-
protected TenantInfoModel TenantInfo;
public TenantManagement()
@@ -33,7 +28,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
CreatePolicyName = TenantManagementPermissions.Tenants.Create;
UpdatePolicyName = TenantManagementPermissions.Tenants.Update;
DeletePolicyName = TenantManagementPermissions.Tenants.Delete;
- ManageConnectionStringsPolicyName = TenantManagementPermissions.Tenants.ManageConnectionStrings;
+
ManageFeaturesPolicyName = TenantManagementPermissions.Tenants.ManageFeatures;
TenantInfo = new TenantInfoModel();
@@ -43,51 +38,9 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
{
await base.SetPermissionsAsync();
- HasManageConnectionStringsPermission = await AuthorizationService.IsGrantedAsync(ManageConnectionStringsPolicyName);
HasManageFeaturesPermission = await AuthorizationService.IsGrantedAsync(ManageFeaturesPolicyName);
}
- protected virtual async Task OpenEditConnectionStringModalAsync(TenantDto entity)
- {
- ManageConnectionStringValidations.ClearAll();
-
- var tenantConnectionString = await AppService.GetDefaultConnectionStringAsync(entity.Id);
-
- TenantInfo = new TenantInfoModel
- {
- Id = entity.Id,
- DefaultConnectionString = tenantConnectionString,
- UseSharedDatabase = tenantConnectionString.IsNullOrWhiteSpace()
- };
-
- ManageConnectionStringModal.Show();
- }
-
- protected virtual Task CloseEditConnectionStringModal()
- {
- ManageConnectionStringModal.Hide();
- return Task.CompletedTask;
- }
-
- protected virtual async Task UpdateConnectionStringAsync()
- {
- if (ManageConnectionStringValidations.ValidateAll())
- {
- await CheckPolicyAsync(ManageConnectionStringsPolicyName);
-
- if (TenantInfo.UseSharedDatabase || TenantInfo.DefaultConnectionString.IsNullOrWhiteSpace())
- {
- await AppService.DeleteDefaultConnectionStringAsync(TenantInfo.Id);
- }
- else
- {
- await AppService.UpdateDefaultConnectionStringAsync(TenantInfo.Id, TenantInfo.DefaultConnectionString);
- }
-
- ManageConnectionStringModal.Hide();
- }
- }
-
protected override string GetDeleteConfirmationMessage(TenantDto entity)
{
return string.Format(L["TenantDeletionConfirmationMessage"], entity.Name);
@@ -97,10 +50,5 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
public class TenantInfoModel
{
public Guid Id { get; set; }
-
- public bool UseSharedDatabase { get; set; }
-
- [Required]
- public string DefaultConnectionString { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs
index e03a7ec2a2..02433ff1c0 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs
@@ -61,7 +61,6 @@ namespace Volo.Abp.TenantManagement.Web
options.Conventions.AuthorizePage("/TenantManagement/Tenants/Index", TenantManagementPermissions.Tenants.Default);
options.Conventions.AuthorizePage("/TenantManagement/Tenants/CreateModal", TenantManagementPermissions.Tenants.Create);
options.Conventions.AuthorizePage("/TenantManagement/Tenants/EditModal", TenantManagementPermissions.Tenants.Update);
- options.Conventions.AuthorizePage("/TenantManagement/Tenants/ConnectionStrings", TenantManagementPermissions.Tenants.ManageConnectionStrings);
});
Configure(options =>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml
deleted file mode 100644
index 6b6e33ed55..0000000000
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml
+++ /dev/null
@@ -1,26 +0,0 @@
-@page
-@using Microsoft.Extensions.Localization
-@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
-@using Volo.Abp.TenantManagement.Localization
-@using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
-@model ConnectionStringsModal
-@inject IStringLocalizer L
-@{
- Layout = null;
-}
-
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
deleted file mode 100644
index 45a36060e0..0000000000
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Validation;
-
-namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
-{
- public class ConnectionStringsModal : TenantManagementPageModel
- {
- [BindProperty]
- public TenantInfoModel Tenant { get; set; }
-
- protected ITenantAppService TenantAppService { get; }
-
- public ConnectionStringsModal(ITenantAppService tenantAppService)
- {
- TenantAppService = tenantAppService;
- }
-
- public virtual async Task OnGetAsync(Guid id)
- {
- var defaultConnectionString = await TenantAppService.GetDefaultConnectionStringAsync(id);
- Tenant = new TenantInfoModel
- {
- Id = id,
- DefaultConnectionString = defaultConnectionString,
- UseSharedDatabase = defaultConnectionString.IsNullOrWhiteSpace()
- };
-
- return Page();
- }
-
- public virtual async Task OnPostAsync()
- {
- ValidateModel();
-
- if (Tenant.UseSharedDatabase || Tenant.DefaultConnectionString.IsNullOrWhiteSpace())
- {
- await TenantAppService.DeleteDefaultConnectionStringAsync(Tenant.Id);
- }
- else
- {
- await TenantAppService.UpdateDefaultConnectionStringAsync(Tenant.Id, Tenant.DefaultConnectionString);
- }
-
- return NoContent();
- }
-
- public class TenantInfoModel
- {
- [HiddenInput]
- public Guid Id { get; set; }
-
- public bool UseSharedDatabase { get; set; }
-
- [DynamicStringLength(typeof(TenantConnectionStringConsts), nameof(TenantConnectionStringConsts.MaxValueLength))]
- public string DefaultConnectionString { get; set; }
- }
- }
-}
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js
deleted file mode 100644
index de01d1cfdd..0000000000
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function ($) {
- abp.modals.TenantConnectionStringManagement = function () {
- var initModal = function (publicApi, args) {
- publicApi
- .getModal()
- .find('input[name="Tenant.UseSharedDatabase"]')
- .change(function () {
- var $this = $(this);
- $('#Tenant_DefaultConnectionString_Wrap').toggleClass(
- 'd-none'
- );
- $this.val($this.prop('checked'));
- });
- };
-
- return {
- initModal: initModal,
- };
- };
-})(jQuery);
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 67fd507bcc..12857a7efb 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
@@ -20,7 +20,6 @@
@section scripts {
-
}
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
index 69bbb0b955..9f61ffdcfc 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
@@ -11,11 +11,6 @@
var _featuresModal = new abp.ModalManager(
abp.appPath + 'FeatureManagement/FeatureManagementModal'
);
- var _connectionStringsModal = new abp.ModalManager({
- viewUrl:
- abp.appPath + 'TenantManagement/Tenants/ConnectionStringsModal',
- modalClass: 'TenantConnectionStringManagement',
- });
var _dataTable = null;
@@ -34,17 +29,6 @@
});
},
},
- {
- text: l('ConnectionStrings'),
- visible: abp.auth.isGranted(
- 'AbpTenantManagement.Tenants.ManageConnectionStrings'
- ),
- action: function (data) {
- _connectionStringsModal.open({
- id: data.record.id,
- });
- },
- },
{
text: l('Features'),
visible: abp.auth.isGranted(