diff --git a/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs b/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs index bac741bc..af54bc10 100644 --- a/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs +++ b/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs @@ -115,22 +115,22 @@ namespace MP.SPEC.Components.ProdKit } } - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { numRecord = 5; // gestione di base dei KIT - string rawVal = MDService.ConfigTryGet("OptAdmKitEnabled"); + string rawVal = await MDService.ConfigTryGetAsync("OptAdmKitEnabled"); if (!string.IsNullOrEmpty(rawVal)) { bool.TryParse(rawVal, out OptAdmKitEnabled); } // conf variabili decodifica - regExp_KO = MDService.ConfigTryGet("regExp_KO"); - regExp_OK = MDService.ConfigTryGet("regExp_OK"); - regExp_KitStart = MDService.ConfigTryGet("regExp_KitStart"); - regExp_KitSave = MDService.ConfigTryGet("regExp_KitSave"); + regExp_KO = await MDService.ConfigTryGetAsync("regExp_KO"); + regExp_OK = await MDService.ConfigTryGetAsync("regExp_OK"); + regExp_KitStart = await MDService.ConfigTryGetAsync("regExp_KitStart"); + regExp_KitSave = await MDService.ConfigTryGetAsync("regExp_KitSave"); // altre variabili - rawVal = MDService.ConfigTryGet("SPEC_nArtSearch"); + rawVal = await MDService.ConfigTryGetAsync("SPEC_nArtSearch"); if (!string.IsNullOrEmpty(rawVal)) { int.TryParse(rawVal, out minChar); diff --git a/MP.SPEC/Components/ProdKit/Manager.razor.cs b/MP.SPEC/Components/ProdKit/Manager.razor.cs index 73b7368f..543c26df 100644 --- a/MP.SPEC/Components/ProdKit/Manager.razor.cs +++ b/MP.SPEC/Components/ProdKit/Manager.razor.cs @@ -40,7 +40,7 @@ namespace MP.SPEC.Components.ProdKit isLoading = false; if (string.IsNullOrEmpty(padCodXdl)) { - padCodXdl = MDService.ConfigTryGet("padCodXdl"); + padCodXdl = await MDService.ConfigTryGetAsync("padCodXdl"); } currPodlRec = null; // recupero user... diff --git a/MP.SPEC/Components/ScratchPodlKit.razor.cs b/MP.SPEC/Components/ScratchPodlKit.razor.cs index aadf1a85..9f29a46f 100644 --- a/MP.SPEC/Components/ScratchPodlKit.razor.cs +++ b/MP.SPEC/Components/ScratchPodlKit.razor.cs @@ -123,23 +123,22 @@ namespace MP.SPEC.Components EditRecord = null; await ResetDataAsync(); } - - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { numRecord = 10; // gestione di base dei KIT - string rawVal = MDService.ConfigTryGet("OptAdmKitEnabled"); + string rawVal = await MDService.ConfigTryGetAsync("OptAdmKitEnabled"); if (!string.IsNullOrEmpty(rawVal)) { bool.TryParse(rawVal, out OptAdmKitEnabled); } // conf variabili decodifica - regExp_KO = MDService.ConfigTryGet("regExp_KO"); - regExp_OK = MDService.ConfigTryGet("regExp_OK"); - regExp_KitStart = MDService.ConfigTryGet("regExp_KitStart"); - regExp_KitSave = MDService.ConfigTryGet("regExp_KitSave"); + regExp_KO = await MDService.ConfigTryGetAsync("regExp_KO"); + regExp_OK = await MDService.ConfigTryGetAsync("regExp_OK"); + regExp_KitStart = await MDService.ConfigTryGetAsync("regExp_KitStart"); + regExp_KitSave = await MDService.ConfigTryGetAsync("regExp_KitSave"); // altre variabili - rawVal = MDService.ConfigTryGet("SPEC_nArtSearch"); + rawVal = await MDService.ConfigTryGetAsync("SPEC_nArtSearch"); if (!string.IsNullOrEmpty(rawVal)) { int.TryParse(rawVal, out minChar); diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 4becd8d6..aa03794f 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -441,40 +441,6 @@ namespace MP.SPEC.Data return result; } - /// - /// Recupero tab config in modalità Sincrona - /// - /// - public List ConfigGetAll() - { - using var activity = ActivitySource.StartActivity("ConfigGetAll"); - string source = "REDIS"; - List? result = new List(); - // cerco in redis... - RedisValue rawData = redisDb.StringGet($"{Utils.redisConfKey}_sync"); - if (!string.IsNullOrEmpty($"{rawData}")) - { - result = JsonConvert.DeserializeObject>($"{rawData}"); - } - else - { - source = "DB"; - result = dbController.ConfigGetAll(); - // serializzo e salvo... - rawData = JsonConvert.SerializeObject(result); - redisDb.StringSet($"{Utils.redisConfKey}_sync", rawData, getRandTOut(redisLongTimeCache)); - } - if (result == null) - { - result = new List(); - } - activity?.SetTag("data.source", source); - activity?.SetTag("result.count", result.Count); - activity?.Stop(); - LogTrace($"ConfigGetAll Read from {source}: {activity?.Duration.TotalMilliseconds}ms"); - return result; - } - /// /// Recupero tab config in modalità Asincrona /// @@ -504,29 +470,6 @@ namespace MP.SPEC.Data LogTrace($"ConfigResetCacheAsync Read from {source}: {activity?.Duration.TotalMilliseconds}ms"); } - /// - /// Restituisce valore della stringa (SE disponibile) - /// - /// - /// - public string ConfigTryGet(string keyName) - { - using var activity = ActivitySource.StartActivity("ConfigTryGet"); - string source = "MEMORY"; - - EnsureConfigLoaded(); - - _configData.TryGetValue(keyName, out var value); - - activity?.SetTag("data.source", source); - activity?.Stop(); - if (activity?.Duration.TotalMilliseconds > slowLogThresh) - { - LogTrace($"ConfigTryGet | {keyName} | {source} | {activity?.Duration.TotalMilliseconds}ms"); - } - return value ?? ""; - } - /// /// Restituisce valore della stringa (SE disponibile) - modalità async /// @@ -2608,18 +2551,6 @@ namespace MP.SPEC.Data } } - private void EnsureConfigLoaded() - { - if (_configData.Count == 0) - { - var list = ConfigGetAll(); - - _configData = list - .GroupBy(x => x.Chiave) - .ToDictionary(g => g.Key, g => g.First().Valore); - } - } - private async Task EnsureConfigLoadedAsync() { if (_configData.Count == 0) diff --git a/MP.SPEC/Pages/KIT.razor.cs b/MP.SPEC/Pages/KIT.razor.cs index 30eb1275..afc11b64 100644 --- a/MP.SPEC/Pages/KIT.razor.cs +++ b/MP.SPEC/Pages/KIT.razor.cs @@ -196,30 +196,30 @@ namespace MP.SPEC.Pages await ResetDataAsync(); } - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { numRecord = 10; - string rawVal = MDService.ConfigTryGet("SPEC_nArtSearch"); + string rawVal = await MDService.ConfigTryGetAsync("SPEC_nArtSearch"); if (!string.IsNullOrEmpty(rawVal)) { int.TryParse(rawVal, out minChar); } - rawVal = MDService.ConfigTryGet("AZIENDA"); + rawVal = await MDService.ConfigTryGetAsync("AZIENDA"); if (!string.IsNullOrEmpty(rawVal)) { CodAzienda = rawVal; } - rawVal = MDService.ConfigTryGet("SPEC_Kit_enabCount"); + rawVal = await MDService.ConfigTryGetAsync("SPEC_Kit_enabCount"); if (!string.IsNullOrEmpty(rawVal)) { bool.TryParse(rawVal, out enabKitCount); } - rawVal = MDService.ConfigTryGet("SPEC_Kit_enabSearch"); + rawVal = await MDService.ConfigTryGetAsync("SPEC_Kit_enabSearch"); if (!string.IsNullOrEmpty(rawVal)) { bool.TryParse(rawVal, out enabKitSearch); } - rawVal = MDService.ConfigTryGet("SPEC_Kit_enabFreeCodArt"); + rawVal = await MDService.ConfigTryGetAsync("SPEC_Kit_enabFreeCodArt"); if (!string.IsNullOrEmpty(rawVal)) { bool.TryParse(rawVal, out enabFreeCodArt); diff --git a/MP.SPEC/Pages/Podl2Kit.razor.cs b/MP.SPEC/Pages/Podl2Kit.razor.cs index f73d2fe0..ab58f170 100644 --- a/MP.SPEC/Pages/Podl2Kit.razor.cs +++ b/MP.SPEC/Pages/Podl2Kit.razor.cs @@ -146,22 +146,22 @@ namespace MP.SPEC.Pages await ResetDataAsync(); } - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { numRecord = 10; // gestione di base dei KIT - string rawVal = MDService.ConfigTryGet("OptAdmKitEnabled"); + string rawVal = await MDService.ConfigTryGetAsync("OptAdmKitEnabled"); if (!string.IsNullOrEmpty(rawVal)) { bool.TryParse(rawVal, out OptAdmKitEnabled); } // conf variabili decodifica - regExp_KO = MDService.ConfigTryGet("regExp_KO"); - regExp_OK = MDService.ConfigTryGet("regExp_OK"); - regExp_KitStart = MDService.ConfigTryGet("regExp_KitStart"); - regExp_KitSave = MDService.ConfigTryGet("regExp_KitSave"); + regExp_KO = await MDService.ConfigTryGetAsync("regExp_KO"); + regExp_OK = await MDService.ConfigTryGetAsync("regExp_OK"); + regExp_KitStart = await MDService.ConfigTryGetAsync("regExp_KitStart"); + regExp_KitSave = await MDService.ConfigTryGetAsync("regExp_KitSave"); // altre variabili - rawVal = MDService.ConfigTryGet("SPEC_nArtSearch"); + rawVal = await MDService.ConfigTryGetAsync("SPEC_nArtSearch"); if (!string.IsNullOrEmpty(rawVal)) { int.TryParse(rawVal, out minChar);