Impl/autologout

shesha-core/src/Shesha.Application/ConfigurationItems/ConfigurationItemAppService.cs

@@ -5,6 +5,7 @@
 using Abp.Runtime.Validation;
 using Abp.UI;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using Shesha.Application.Services.Dto;
 using Shesha.ConfigurationItems.Cache;
 using Shesha.ConfigurationItems.Distribution;
@@ -321,5 +322,91 @@ private async Task<ConfigurationItemBase> GetItemAsync(Guid id)
                 throw new EntityNotFoundException(typeof(ConfigurationItemBase), id);
             return item;
         }
+
+        public async Task<List<ExportTreeFlatItem>> GetExportFlatTreeAsync(ConfigurationItemViewMode mode) 
+        {
+            var query = Repository.GetAll();
+            switch (mode)
+            {
+                case ConfigurationItemViewMode.Live:
+                    query = query.Where(e => e.VersionStatus == ConfigurationItemVersionStatus.Live);
+                    break;
+                case ConfigurationItemViewMode.Ready:
+                    {
+                        var statuses = new ConfigurationItemVersionStatus[] {
+                            ConfigurationItemVersionStatus.Live,
+                            ConfigurationItemVersionStatus.Ready
+                        };
+                        query = query.Where(e => e.IsLast && statuses.Contains(e.VersionStatus));
+                        break;
+                    }
+                case ConfigurationItemViewMode.Latest:
+                    {
+                        var statuses = new ConfigurationItemVersionStatus[] {
+                            ConfigurationItemVersionStatus.Live,
+                            ConfigurationItemVersionStatus.Ready,
+                            ConfigurationItemVersionStatus.Draft
+                        };
+                        query = query.Where(e => e.IsLast && statuses.Contains(e.VersionStatus));
+                        break;
+                    }
+                default:
+                    break;
+            }
+            var items = await query
+                .OrderBy(e => e.Module!.Name)
+                .ThenBy(e => e.Name)
+                .Select(e => new ExportTreeFlatItem
+                    {
+                        Id = e.Id,
+                        ItemType = e.ItemType,
+                        Name = e.Name,
+                        Label = e.Label,
+                        Description = e.Description,
+                        Module = e.Module != null
+                            ? new ExportTreeFlatItemModule { 
+                                Id = e.Module.Id,
+                                Name = e.Module.Name,
+                                Description = e.Module.Description
+                            }
+                            : null,
+                        Application = e.Application != null
+                            ? new ExportTreeFlatItemApplication {
+                                Id = e.Application.Id,
+                                AppKey = e.Application.AppKey,
+                                Name = e.Application.Name,                        
+                            }
+                            : null,
+                    })
+                .ToListAsync();
+
+            return items;
+        }
+
+        public class ExportTreeFlatItem 
+        {
+            public Guid Id { get; set; }
+            public string Name { get; set; }
+            public string ItemType { get; set; }
+            public string? Label { get; set; }
+            public string? Description { get; set; }
+            public ExportTreeFlatItemModule? Module { get; set; }
+            public ExportTreeFlatItemApplication? Application { get; set; }            
+
+        }
+
+        public class ExportTreeFlatItemModule
+        {
+            public Guid Id { get; set; }
+            public string Name { get; set; }
+            public string? Description { get; set; }
+        }
+
+        public class ExportTreeFlatItemApplication
+        {
+            public Guid Id { get; set; }
+            public string AppKey { get; set; }
+            public string Name { get; set; }            
+        }
     }
 }

shesha-core/src/Shesha.Application/Shesha.Application.csproj

@@ -86,6 +86,7 @@
         <None Remove="ConfigMigrations\package20230411_1238.shaconfig" />
         <None Remove="ConfigMigrations\package20231105_1942.shaconfig" />
         <None Remove="ConfigMigrations\package20250805_1824.shaconfig" />
+        <None Remove="ConfigMigrations\package20250910_1513.shaconfig" />
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Include="ConfigMigrations\package20240201_1221.shaconfig" />
@@ -133,6 +134,7 @@
         <EmbeddedResource Include="ConfigMigrations\package20230324_1835.shaconfig" />
         <EmbeddedResource Include="ConfigMigrations\package20230411_1238.shaconfig" />
         <EmbeddedResource Include="ConfigMigrations\package20250805_1824.shaconfig" />
+        <EmbeddedResource Include="ConfigMigrations\package20250910_1513.shaconfig" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="AsyncFixer" Version="1.6.0">

shesha-core/src/Shesha.Framework/Configuration/Security/SecuritySettings.cs

@@ -12,7 +12,7 @@ namespace Shesha.Configuration.Security
     public class SecuritySettings
     {
         /// <summary>
-        /// Auto logoff timeout
+        /// Auto logoff timeout in minutes
         /// </summary>
         public int AutoLogoffTimeout { get; set; }
 
@@ -57,5 +57,20 @@ public class SecuritySettings
         [Display(Name = "Default endpoint access", Description = "Used for 'Inherited' endpoint access")]
         public RefListPermissionedAccess DefaultEndpointAccess { get; set; }
 
+        /// <summary>
+        /// Enable logout when user is inactive
+        /// </summary>
+        public bool LogoutWhenUserInactive { get; set; }
+
+        /// <summary>
+        /// Warning time before logout in seconds
+        /// </summary>
+        public int LogoutWarningSeconds { get; set; }
+
+        /// <summary>
+        /// Enable logout when browser is closed/hidden
+        /// </summary>
+        public bool LogoutWhenBrowserClosed { get; set; }
+
     }
 }

shesha-core/src/Shesha.Framework/SheshaFrameworkModule.cs

@@ -43,6 +43,8 @@ public class SheshaFrameworkModule : SheshaModule
 #endif
         };
 
+        public bool SkipAppWarmUp { get; set; }
+
         public SheshaFrameworkModule()
         {
         }
@@ -129,7 +131,10 @@ public override void Initialize()
                 s.DefaultAccountLockoutSeconds.WithDefaultValue(300 /* 5 minutes */);
                 s.SecuritySettings.WithDefaultValue(new SecuritySettings
                 {
-                    AutoLogoffTimeout = 0,
+                    AutoLogoffTimeout = 15, // 15 minutes default,
+                    LogoutWhenUserInactive = false,
+                    LogoutWarningSeconds = 60,
+                    LogoutWhenBrowserClosed = false,
                     UseResetPasswordViaEmailLink = true,
                     ResetPasswordEmailLinkLifetime = 60,
                     UseResetPasswordViaSmsOtp = true,

shesha-core/src/Shesha.Framework/Validations/EntityPropertyValidator.cs

@@ -4,6 +4,7 @@
 using Shesha.DynamicEntities.Dtos;
 using Shesha.Extensions;
 using Shesha.Metadata;
+using Shesha.Reflection;
 using Shesha.Utilities;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -158,8 +159,11 @@ public bool Validate(object obj, string propertyName, object? value, List<Valida
                     }
                     break;
                 case DataTypes.Number:
-                    var b = double.TryParse(value?.ToString(), out double val);
+                    var stringValue = value?.ToString();
+                    if (string.IsNullOrWhiteSpace(stringValue) && propInfo != null && propInfo.IsNullable())
+                        return true;
 
+                    var b = double.TryParse(stringValue, out double val);
                     if (!b)
                     {
                         validationResult.Add(new ValidationResult($"Property '{friendlyName}' should be in a number format"));

shesha-core/src/Shesha.Framework/Warmup/ApplicationWarmupService.cs

@@ -11,15 +11,20 @@ namespace Shesha.Warmup
     public class ApplicationWarmupService : IAsyncEventHandler<DatabaseInitializedEventData>, ITransientDependency
     {
         private readonly IModelConfigurationManager _entityConfigs;
-        public ILogger Logger = NullLogger.Instance;
+        private readonly SheshaFrameworkModule _frameworkModule;
+        public ILogger Logger = NullLogger.Instance;        
 
-        public ApplicationWarmupService(IModelConfigurationManager entityConfigs)
+        public ApplicationWarmupService(IModelConfigurationManager entityConfigs, SheshaFrameworkModule frameworkModule)
         {
             _entityConfigs = entityConfigs;
+            _frameworkModule = frameworkModule;
         }
 
         public Task HandleEventAsync(DatabaseInitializedEventData eventData)
         {
+            if (_frameworkModule.SkipAppWarmUp)
+                return Task.CompletedTask;
+
             var task = Task.Run(async () =>
             {
                 try

shesha-core/src/Shesha.Web.Host/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Data Source=.; Initial Catalog=function-shesha-test;Integrated Security=SSPI;TrustServerCertificate=True;"
+    "Default": "Server=localhost,1433;Initial Catalog=enterpriseproject;Persist Security Info=False;User ID=sa;Password=@123Shesha;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=True;Connection Timeout=60;"
   },
   "App": {
     "ServerRootAddress": "http://sheshacore-demo.boxfusion.co.za",

shesha-core/test/Shesha.Tests/SheshaTestModule.cs

@@ -40,9 +40,10 @@ namespace Shesha.Tests
         )]
     public class SheshaTestModule : AbpModule
     {
-        public SheshaTestModule(SheshaNHibernateModule nhModule)
+        public SheshaTestModule(SheshaNHibernateModule nhModule, SheshaFrameworkModule frwkModule)
         {
             nhModule.SkipDbSeed = false;    // Set to false to apply DB Migration files on start up
+            frwkModule.SkipAppWarmUp = true;
         }
 
         public override void PreInitialize()