diff --git a/WebDoorCreator.UI/Data/WDCUserService.cs b/WebDoorCreator.UI/Data/WDCUserService.cs index ceddf92..46c5973 100644 --- a/WebDoorCreator.UI/Data/WDCUserService.cs +++ b/WebDoorCreator.UI/Data/WDCUserService.cs @@ -304,6 +304,27 @@ namespace WebDoorCreator.UI.Data return dataResult; } + /// + /// Effettua reset dati utente... + /// + /// Indica reset completo (anche dati elenco di base) + /// + public async Task ResetUserDataCache(bool resetAll) + { + bool fatto = false; + RedisValue pattern = new RedisValue($"{Constants.rKeyUsersAll}"); + if (resetAll) + { + fatto = await ExecFlushRedisPattern(pattern); + } + // ora resetto il resto + pattern = new RedisValue($"{Constants.rKeyUsersDataId}:*"); + fatto = fatto && await ExecFlushRedisPattern(pattern); + pattern = new RedisValue($"{Constants.rKeyUsersDataSearch}:*"); + fatto = fatto && await ExecFlushRedisPattern(pattern); + return fatto; + } + #endregion Public Methods #region Protected Methods diff --git a/WebDoorCreator.UI/Pages/UserAdmin.razor b/WebDoorCreator.UI/Pages/UserAdmin.razor index 8b1784f..ee69762 100644 --- a/WebDoorCreator.UI/Pages/UserAdmin.razor +++ b/WebDoorCreator.UI/Pages/UserAdmin.razor @@ -8,8 +8,8 @@ Edit User - - X + + @@ -33,7 +33,7 @@ - + @foreach (var option in RolesList) { @@ -45,7 +45,7 @@ - + @foreach (var option in ClaimsList) { @@ -53,7 +53,7 @@ } - + --- Selezionare --- @foreach (var option in ClaimValList) { @@ -70,7 +70,7 @@ Save - Close + Close @@ -100,8 +100,8 @@ else User Administration - - + + --- ALL ROLES --- @@ -114,7 +114,7 @@ else @*ROLES*@ - + --- ALL COMPANIES --- @@ -146,8 +146,8 @@ else Id User / Email - Ruolo - Permessi + Role + Rights diff --git a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs index b1169fd..17d1c28 100644 --- a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs +++ b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs @@ -159,7 +159,6 @@ namespace WebDoorCreator.UI.Pages public string ShowClaims(List ClaimList) { - //string answ = string.Join(",", ClaimList); string answ = string.Join(",", ConvertClaim(ClaimList)); return answ; } @@ -212,11 +211,6 @@ namespace WebDoorCreator.UI.Pages #endregion Protected Properties -#if false - protected List? suppList { get; set; } = null; - protected List? transpList { get; set; } = null; -#endif - #region Protected Methods protected void ForceReload(int newNum) @@ -258,10 +252,6 @@ namespace WebDoorCreator.UI.Pages private string qrCodeVal = ""; - /// - /// Collezione utenti - /// - private List RawList = new List(); /// /// Elenco ROLES da mostrare in dropdown durante editing (1 solo? usare DB?!?) @@ -281,7 +271,7 @@ namespace WebDoorCreator.UI.Pages /// /// Collezione utenti - /// + /// filtrati/mostrati private List UsersList = new List(); #endregion Private Fields @@ -292,10 +282,8 @@ namespace WebDoorCreator.UI.Pages private int _currPage { get; set; } = 1; - private string _filtUserRole { get; set; } = "0"; - private string _filtCompanyId { get; set; } = "0"; - + private string _filtUserRole { get; set; } = "0"; private int _numRecord { get; set; } = 10; [CascadingParameter] @@ -350,25 +338,6 @@ namespace WebDoorCreator.UI.Pages } } - /// - /// Gestione filtraggio RUOLI utente - /// - private string FiltUserRole - { - get - { - return _filtUserRole; - } - set - { - if (_filtUserRole != value) - { - _filtUserRole = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); - } - } - } /// /// Gestione filtraggio COMPANY /// @@ -389,6 +358,26 @@ namespace WebDoorCreator.UI.Pages } } + /// + /// Gestione filtraggio RUOLI utente + /// + private string FiltUserRole + { + get + { + return _filtUserRole; + } + set + { + if (_filtUserRole != value) + { + _filtUserRole = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + } + private bool isLoading { get; set; } = false; private int numRecord @@ -482,6 +471,8 @@ namespace WebDoorCreator.UI.Pages { // Delete the user await _UserManager.DeleteAsync(user); + // reset cache! + await WDCUsrServ.ResetUserDataCache(true); } // Refresh Users await ReloadData(); @@ -497,7 +488,7 @@ namespace WebDoorCreator.UI.Pages #if false // Get the user - var user = await _UserManager.FindByIdAsync(objUser.Id); + var user = await _UserManager.FindByIdAsync(objUser.Id); #endif if (user != null) { @@ -732,6 +723,8 @@ namespace WebDoorCreator.UI.Pages } // Close the Popup ShowPopup = false; + // reset cache! + await WDCUsrServ.ResetUserDataCache(true); // Refresh page await ReloadData(); }