From a3c0e54a9a33a281f83e6df30508e0fd3144a442 Mon Sep 17 00:00:00 2001 From: ahmetfarukulu Date: Wed, 6 Mar 2024 08:52:44 +0300 Subject: [PATCH 1/7] Feature localizations added for audit log module --- .../Volo/Abp/AuditLogging/Localization/en.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json index 629710276a..1741a60297 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json @@ -78,6 +78,8 @@ "EndDate": "End date", "Feature:AuditLoggingGroup": "Audit logging", "Feature:AuditLoggingEnable": "Enabled audit logging page", - "Feature:AuditLoggingEnableDescription": "Enable audit logging page in the application." + "Feature:AuditLoggingEnableDescription": "Enable audit logging page in the application.", + "Feature:AuditLoggingSettingManagementEnable": "Enable audit log setting management", + "Feature:AuditLoggingSettingManagementEnableDescription": "Enable the configuration of the audit log setting management within the application." } } From e7afce98749972a2893aad53bdf001b25a204669 Mon Sep 17 00:00:00 2001 From: ahmetfarukulu Date: Wed, 6 Mar 2024 09:07:50 +0300 Subject: [PATCH 2/7] Localization added for audit log module --- .../Volo/Abp/AuditLogging/Localization/en.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json index 1741a60297..0d1d880cf2 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json @@ -80,6 +80,11 @@ "Feature:AuditLoggingEnable": "Enabled audit logging page", "Feature:AuditLoggingEnableDescription": "Enable audit logging page in the application.", "Feature:AuditLoggingSettingManagementEnable": "Enable audit log setting management", - "Feature:AuditLoggingSettingManagementEnableDescription": "Enable the configuration of the audit log setting management within the application." + "Feature:AuditLoggingSettingManagementEnableDescription": "Enable the configuration of the audit log setting management within the application.", + "DisplayName:IsExpiredDeleterEnabled": "Enable expired deleter", + "Description:IsExpiredDeleterEnabled": "Toggle to enable or disable the automatic deletion of expired items.", + "DisplayName:ExpiredDeleterPeriod": "Expired item deletion period", + "Description:ExpiredDeleterPeriod": "Set the period after which expired items will be automatically deleted.", + "InvalidAuditLogDeletionSettings": "Invalid audit log deletion settings. If deletion is enabled, the period should be greater than 0 days." } } From bd4621af27752fe783978556a08fb5ead8c62911 Mon Sep 17 00:00:00 2001 From: ahmetfarukulu Date: Tue, 5 Mar 2024 08:32:51 +0300 Subject: [PATCH 3/7] TenantStore list method added --- .../Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs | 6 ++++++ .../Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs | 6 ++++++ .../Volo/Abp/MultiTenancy/ITenantStore.cs | 3 +++ .../MultiTenancy/ConfigurationStore/DefaultTenantStore.cs | 6 ++++++ .../Volo/Abp/TenantManagement/TenantStore.cs | 7 +++++++ 5 files changed, 28 insertions(+) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs index 3873b48db3..73fe9e6999 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; using Pages.Abp.MultiTenancy.ClientProxies; @@ -57,6 +58,11 @@ public class MauiBlazorRemoteTenantStore : ITenantStore, ITransientDependency return tenantConfiguration; } + public Task> GetListAsync(bool includeDetails = false) + { + return Task.FromResult>(Array.Empty()); + } + public TenantConfiguration? Find(string normalizedName) { var cacheKey = CreateCacheKey(normalizedName); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs index dce80a3099..ed4739c93c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; @@ -79,6 +80,11 @@ public class MvcRemoteTenantStore : ITenantStore, ITransientDependency return tenantConfiguration?.Value; } + public Task> GetListAsync(bool includeDetails = false) + { + return Task.FromResult>(Array.Empty()); + } + public TenantConfiguration? Find(string normalizedName) { var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(normalizedName); diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs index d97d438b01..0e992211ca 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantStore.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Threading.Tasks; namespace Volo.Abp.MultiTenancy; @@ -9,6 +10,8 @@ public interface ITenantStore Task FindAsync(Guid id); + Task> GetListAsync(bool includeDetails = false); + [Obsolete("Use FindAsync method.")] TenantConfiguration? Find(string normalizedName); diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs index e91e749fe3..78e902bd06 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Options; @@ -26,6 +27,11 @@ public class DefaultTenantStore : ITenantStore, ITransientDependency return Task.FromResult(Find(id)); } + public Task> GetListAsync(bool includeDetails = false) + { + return Task.FromResult>(_options.Tenants); + } + public TenantConfiguration? Find(string normalizedName) { return _options.Tenants?.FirstOrDefault(t => t.NormalizedName == normalizedName); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs index 808a9684cd..8f494ff45c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Threading.Tasks; using JetBrains.Annotations; using Volo.Abp.Caching; @@ -37,6 +38,12 @@ public class TenantStore : ITenantStore, ITransientDependency return (await GetCacheItemAsync(id, null)).Value; } + public virtual async Task> GetListAsync(bool includeDetails = false) + { + return ObjectMapper.Map, List>( + await TenantRepository.GetListAsync(includeDetails)); + } + [Obsolete("Use FindAsync method.")] public virtual TenantConfiguration Find(string normalizedName) { From f1cbcbd5163a6fe4e5b7d71086d8612a6d16bde8 Mon Sep 17 00:00:00 2001 From: ahmetfarukulu Date: Wed, 6 Mar 2024 16:42:23 +0300 Subject: [PATCH 4/7] TenantStore object mapping null check added --- .../AbpTenantManagementDomainMappingProfile.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs index f2458b990c..496095c807 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs @@ -15,6 +15,11 @@ public class AbpTenantManagementDomainMappingProfile : Profile { var connStrings = new ConnectionStrings(); + if (tenant.ConnectionStrings == null) + { + return connStrings; + } + foreach (var connectionString in tenant.ConnectionStrings) { connStrings[connectionString.Name] = connectionString.Value; From db92372a1786694ef7ca4f15d0cd09ba28b5bbc6 Mon Sep 17 00:00:00 2001 From: ahmetfarukulu Date: Fri, 8 Mar 2024 16:33:57 +0300 Subject: [PATCH 5/7] Setting localization added for audit logging module --- .../Volo/Abp/AuditLogging/Localization/en.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json index 0d1d880cf2..38c4c3185e 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json @@ -85,6 +85,10 @@ "Description:IsExpiredDeleterEnabled": "Toggle to enable or disable the automatic deletion of expired items.", "DisplayName:ExpiredDeleterPeriod": "Expired item deletion period", "Description:ExpiredDeleterPeriod": "Set the period after which expired items will be automatically deleted.", - "InvalidAuditLogDeletionSettings": "Invalid audit log deletion settings. If deletion is enabled, the period should be greater than 0 days." + "InvalidAuditLogDeletionSettings": "Invalid audit log deletion settings. If deletion is enabled, the period should be greater than 0 days.", + "AuditLogSettingsGeneral": "General", + "AuditLogSettingsGlobal": "Global", + "DisplayName:IsPeriodicDeleterEnabled": "Enable periodic deleter", + "Description:IsPeriodicDeleterEnabled": "Toggle to enable or disable the periodically deletion of old items." } } From 03155544bfb0f975497078a4b8092236c57ab88c Mon Sep 17 00:00:00 2001 From: ahmetfarukulu Date: Mon, 11 Mar 2024 15:32:50 +0300 Subject: [PATCH 6/7] Audit log localization revised --- .../Volo/Abp/AuditLogging/Localization/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json index 38c4c3185e..ad1af567d3 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json @@ -89,6 +89,6 @@ "AuditLogSettingsGeneral": "General", "AuditLogSettingsGlobal": "Global", "DisplayName:IsPeriodicDeleterEnabled": "Enable periodic deleter", - "Description:IsPeriodicDeleterEnabled": "Toggle to enable or disable the periodically deletion of old items." + "Description:IsPeriodicDeleterEnabled": "Toggle to enable the periodic deletion worker. If this option disabled the periodic deleter will not work." } } From d99176fde01f65c73fd56eb56014f54eaf690c09 Mon Sep 17 00:00:00 2001 From: ahmetfarukulu Date: Mon, 11 Mar 2024 15:56:56 +0300 Subject: [PATCH 7/7] Audit log localization revised --- .../Volo/Abp/AuditLogging/Localization/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json index ad1af567d3..b19c040f9f 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json @@ -84,7 +84,7 @@ "DisplayName:IsExpiredDeleterEnabled": "Enable expired deleter", "Description:IsExpiredDeleterEnabled": "Toggle to enable or disable the automatic deletion of expired items.", "DisplayName:ExpiredDeleterPeriod": "Expired item deletion period", - "Description:ExpiredDeleterPeriod": "Set the period after which expired items will be automatically deleted.", + "Description:ExpiredDeleterPeriod": "Set the period of days after which expired items will be automatically deleted.", "InvalidAuditLogDeletionSettings": "Invalid audit log deletion settings. If deletion is enabled, the period should be greater than 0 days.", "AuditLogSettingsGeneral": "General", "AuditLogSettingsGlobal": "Global",