From 82e100f64f09a369e9e6857583dd634b1ef3f48a Mon Sep 17 00:00:00 2001 From: RGrabichler Date: Fri, 22 Sep 2023 12:41:03 +0000 Subject: [PATCH 01/13] Create draft PR for #519 From e72c683192d880c9018417705067b63e2e363699 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 25 Sep 2023 18:42:30 +0200 Subject: [PATCH 02/13] TcoDiagnosticsAlternative from test project copied over, gets with time very slow, i do not know why and how --- global.json | 5 + .../Pages/DiagnosticsAlternative.razor | 15 + .../Pages/DiagnosticsFromLogger.razor | 15 + .../PlcHammer.Hmi.Blazor/Shared/NavMenu.razor | 10 + .../PlcHammer.Hmi.Blazor/Startup.cs | 17 +- .../appsettings.Development.json | 19 +- src/TcOpen.Hammer/PlcHammerConnector/Entry.cs | 4 +- src/TcOpen.Hammer/docker-compose.yml | 22 ++ .../LoggingToDb/IMongoLogger.cs | 16 + .../LoggingToDb/MongoLogger.cs | 196 +++++++++++++ .../Mapping/PlainTcoMessageExtended.cs | 15 + .../Services/LibraryServiceConfiguration.cs | 15 + .../TcoDiagnosticsAlternativeView.cs | 179 ++++++++++++ .../TcoDiagnosticsAlternativeView.razor | 78 +++++ .../TcoDiagnosticsAlternativeView.razor.css | 56 ++++ .../TcoDiagnosticsAlternativeViewModel.cs | 275 ++++++++++++++++++ .../TcoObjectDiagnostics.cs | 19 ++ 17 files changed, 943 insertions(+), 13 deletions(-) create mode 100644 global.json create mode 100644 src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor create mode 100644 src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs diff --git a/global.json b/global.json new file mode 100644 index 000000000..4aaf97081 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "5.0.408" + } +} diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor new file mode 100644 index 000000000..5044615ff --- /dev/null +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor @@ -0,0 +1,15 @@ +@page "/diagnostics-alternative" + +@* +*@ + +@code { + + protected override void OnInitialized() + { +@* TcoDiagnosticsViewModel.SetDefaultCategory(eMessageCategory.Trace); + TcoDiagnosticsView.SetDefaultDepth(7); + TcoDiagnosticsView.SetDiagnosticsUpdateInterval(2500);*@ + base.OnInitialized(); + } +} diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor new file mode 100644 index 000000000..ee14e7289 --- /dev/null +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor @@ -0,0 +1,15 @@ +@page "/diagnostics-from-logger" + + +tag + +@code { + + protected override void OnInitialized() + { + @* TcoDiagnosticsViewModel.SetDefaultCategory(eMessageCategory.Trace); + TcoDiagnosticsView.SetDefaultDepth(7); + TcoDiagnosticsView.SetDiagnosticsUpdateInterval(2500);*@ + base.OnInitialized(); + } +} diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor index 18c6b73fd..aa857c001 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor @@ -32,6 +32,16 @@ Diagnostics +
  • + + Diagnostics Alternative + +
    • +
  • + + Diagnostics Logger! + +
  • Security diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs index ede5a8ff9..2f7ea1d1d 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs @@ -41,10 +41,16 @@ public class Startup public Startup(IConfiguration configuration) { Configuration = configuration; + MongoUri = Configuration["MongoDbSettings:MongoUri"]; + DatabaseName = Configuration["MongoDbSettings:DatabaseName"]; } public IConfiguration Configuration { get; } + //Uses Config from appsetings.Development.json, there the connection String etc. is configured + public static string MongoUri { get; private set; } + public static string DatabaseName { get; private set; } + public static StringWriter logMessages = new StringWriter(); // This method gets called by the runtime. Use this method to add services to the container. @@ -63,7 +69,7 @@ public void ConfigureServices(IServiceCollection services) services.AddTcoCoreExtensions(); - if (true)/*Mongo database*/ + if (false)/*Mongo database*/ { (userRepo, groupRepo) = SetUpMongoDatabase(); } @@ -84,7 +90,10 @@ public void ConfigureServices(IServiceCollection services) .WriteTo.Notepad() // This will write logs to first instance of notepad program. // uncomment this to send logs over MQTT, to receive the data run MQTTTestClient from this solution. // .WriteTo.MQTT(new MQTTnet.Client.Options.MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io").Build(), "fun_with_TcOpen_Hammer") - .Enrich.WithProperty("user",SecurityManager.Manager.Principal.Identity.Name) + .WriteTo.MongoDBBson( + databaseUrl: $"{MongoUri}/{DatabaseName}", + collectionName: "log" + ).Enrich.WithProperty("user",SecurityManager.Manager.Principal.Identity.Name) .Enrich.With(new Serilog.Enrichers.EnvironmentNameEnricher()) .Enrich.With(new Serilog.Enrichers.EnvironmentUserNameEnricher()) .Enrich.With(new Serilog.Enrichers.MachineNameEnricher()) @@ -168,8 +177,8 @@ private static (IRepository userRepo, IRepository groupRepo private static (IRepository userRepo, IRepository groupRepo) SetUpMongoDatabase() { - var mongoUri = "mongodb://localhost:27017"; - var databaseName = "Hammer"; + var mongoUri = MongoUri; + var databaseName = DatabaseName; /*Data*/ var processRecipiesRepository = new MongoDbRepository(new MongoDbRepositorySettings(mongoUri, databaseName, "ProcessSettings")); diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json index 51737579e..d44d361a0 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json @@ -1,10 +1,15 @@ { - "DetailedErrors": true, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "DetailedErrors": true, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "MongoDbSettings": { + "MongoUri": "mongodb://localhost:27017", + "DatabaseName": "Hammer" } - } + } diff --git a/src/TcOpen.Hammer/PlcHammerConnector/Entry.cs b/src/TcOpen.Hammer/PlcHammerConnector/Entry.cs index d0c5f0f5e..4939390d4 100644 --- a/src/TcOpen.Hammer/PlcHammerConnector/Entry.cs +++ b/src/TcOpen.Hammer/PlcHammerConnector/Entry.cs @@ -5,8 +5,8 @@ namespace PlcHammerConnector { public class Entry - { - public static readonly string AmsId = Environment.GetEnvironmentVariable("Tc3Target"); + { + public static readonly string AmsId = "5.107.180.64.1.1"; public static PlcHammer.PlcHammerTwinController PlcHammer { get; } = new PlcHammer.PlcHammerTwinController(Tc3ConnectorAdapter.Create(AmsId, 851, true)); diff --git a/src/TcOpen.Hammer/docker-compose.yml b/src/TcOpen.Hammer/docker-compose.yml index 08ffd9237..fda7d39b0 100644 --- a/src/TcOpen.Hammer/docker-compose.yml +++ b/src/TcOpen.Hammer/docker-compose.yml @@ -1,3 +1,4 @@ + version: "3.9" services: mongodb: @@ -7,5 +8,26 @@ services: - HammerData:/data/db ports: - 27017:27017 + healthcheck: + test: ["CMD", "mongo", "--eval", "db.adminCommand('ping')"] + interval: 30s + timeout: 10s + retries: 3 + + mongo-express: + image: mongo-express + container_name: mexpress + environment: + - ME_CONFIG_MONGODB_URL=mongodb://mongodb:27017/ + links: + - mongodb + restart: unless-stopped + ports: + - "8081:8081" + depends_on: + mongodb: + condition: service_healthy + volumes: HammerData: + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs new file mode 100644 index 000000000..f9f83424f --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcoCore.TcoDiagnosticsAlternative.LoggingToDb +{ + public interface IMongoLogger + { + void LogMessage(PlainTcoMessage message); + bool MessageExistsInDatabase(PlainTcoMessage message); + List ReadMessages(); + PlainTcoMessage GetSimilarMessage(PlainTcoMessage message); + void UpdateMessages(ulong identity, DateTime timeStamp, DateTime timeStampAcknowledged, bool pinned); + } +} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs new file mode 100644 index 000000000..68f88a07a --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs @@ -0,0 +1,196 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using MongoDB.Bson; +using MongoDB.Driver; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcoCore.TcoDiagnosticsAlternative.LoggingToDb +{ + public class MongoLogger: IMongoLogger + { + private readonly IMongoClient _client; + private readonly IMongoCollection _collection; + public int MaxEntries { get; set; } + + public MongoLogger() + { + MaxEntries = TcoDiagnosticsAlternativeView.MaxDatabaseEntries; + _client = new MongoClient("mongodb://localhost:27017"); + var database = _client.GetDatabase("mydatabase"); + _collection = database.GetCollection("mycollection"); + + EnsureIndexes(); + } + + private void EnsureIndexes() + { + var indexExists = _collection.Indexes.List().ToList().Any(index => index["name"] == "Text_Source_Category_TimeStampAcknowledged"); + if (!indexExists) + { + var keys = Builders.IndexKeys + .Ascending("Text") + .Ascending("Source") + .Ascending("Category") + .Ascending("TimeStampAcknowledged"); + + _collection.Indexes.CreateOne(new CreateIndexModel(keys)); + } + } + + private FilterDefinition GetMessageFilter(PlainTcoMessage message) + { + return Builders.Filter.And( + Builders.Filter.Eq("TimeStamp", BsonValue.Create(message.TimeStamp)), + Builders.Filter.Eq("Raw", BsonValue.Create(message.Raw)), + Builders.Filter.Eq("Source", BsonValue.Create(message.Source)), + Builders.Filter.Eq("TimeStampAcknowledged", BsonNull.Value), + Builders.Filter.Eq("Identity", BsonValue.Create(message.Identity)), + Builders.Filter.Eq("Cycle", BsonValue.Create(message.Cycle)), + Builders.Filter.Eq("Category", BsonValue.Create(message.Category)) + ); + } + + public bool MessageExistsInDatabase(PlainTcoMessage message) + { + var filter = GetMessageFilter(message); + var result = _collection.Find(filter).FirstOrDefault(); + return result != null; + } + + + private void InsertMessage(PlainTcoMessage message) + { + // If the message doesn't exist, then proceed with saving it + var update = Builders.Update + .Set("Text", BsonValue.Create(message.Text)) + .Set("TimeStamp", BsonValue.Create(message.TimeStamp)) + .Set("TimeStampAcknowledged", BsonNull.Value) + .Set("Identity", BsonValue.Create(message.Identity)) + .Set("Text", BsonValue.Create(message.Text)) + .Set("Category", BsonValue.Create(message.Category)) + .Set("Cycle", BsonValue.Create(message.Cycle)) + .Set("PerCycleCount", BsonValue.Create(message.PerCycleCount)) + .Set("ExpectDequeing", BsonValue.Create(message.ExpectDequeing)) + .Set("Pinned", BsonValue.Create(message.Pinned)) + .Set("Location", BsonValue.Create(message.Location)) + .Set("Source", BsonValue.Create(message.Source)) + .Set("ParentsHumanReadable", BsonValue.Create(message.ParentsHumanReadable)) + .Set("Raw", BsonValue.Create(message.Raw)) + .Set("MessageDigest", BsonValue.Create((ulong)(message.MessageDigest))) + .Set("ParentsObjectSymbol", BsonValue.Create(message.ParentsObjectSymbol)); + + UpdateOptions options = new UpdateOptions { IsUpsert = true }; + var filter = GetMessageFilter(message); + _collection.UpdateOne(filter, update, options); + } + + + public void LogMessage(PlainTcoMessage message) + { + + if (string.IsNullOrEmpty(message.Text) || string.IsNullOrEmpty(message.Source)) + { + // Don't log the message + return; + } + + var existingMessage = GetSimilarMessage(message); + + if (existingMessage == null) + { + InsertMessage(message); + EnsureMaxEntries(); + } + } + + + public void UpdateMessages(ulong identity, DateTime timeStamp, DateTime timeStampAcknowledged, bool pinned) + { + // Define a filter to find messages with the given identity and where TimeStampAcknowledged is older than 1980 + var filter = Builders.Filter.And( + Builders.Filter.Eq("TimeStamp", BsonValue.Create(timeStamp)), + Builders.Filter.Eq("TimeStampAcknowledged", BsonNull.Value) + ); + + // Define the update operation + var update = Builders.Update + .Set("TimeStampAcknowledged", BsonValue.Create(timeStampAcknowledged.AddHours(1))) + .Set("Pinned", BsonValue.Create(pinned)); + + // Update all matching documents + _collection.UpdateMany(filter, update); + } + + private PlainTcoMessageExtended MapBsonToPlainTcoMessage(BsonDocument bsonMessage) + { + return new PlainTcoMessageExtended + { + TimeStamp = bsonMessage["TimeStamp"].IsBsonNull ? DateTime.MinValue : bsonMessage["TimeStamp"].ToUniversalTime(), + TimeStampAcknowledged = bsonMessage["TimeStampAcknowledged"].IsBsonNull ? (DateTime?)null : bsonMessage["TimeStampAcknowledged"].ToUniversalTime(), + Identity = (ulong)bsonMessage["Identity"].AsInt64, + Text = bsonMessage["Text"].AsString, + Category = (short)bsonMessage["Category"].AsInt32, + Cycle = (ulong)bsonMessage["Cycle"].AsInt64, + PerCycleCount = (byte)bsonMessage["PerCycleCount"].AsInt32, + ExpectDequeing = bsonMessage["ExpectDequeing"].AsBoolean, + Pinned = bsonMessage["Pinned"].AsBoolean, + Location = bsonMessage["Location"].AsString, + Source = bsonMessage["Source"].AsString, + ParentsHumanReadable = bsonMessage["ParentsHumanReadable"].AsString, + Raw = bsonMessage["Raw"].AsString, + MessageDigest = (uint)bsonMessage["MessageDigest"].AsInt64, + ParentsObjectSymbol = bsonMessage["ParentsObjectSymbol"].AsString + }; + } + + + public PlainTcoMessage GetSimilarMessage(PlainTcoMessage message) + { + var filter = Builders.Filter.And( + Builders.Filter.Eq("Text", BsonValue.Create(message.Text)), + Builders.Filter.Eq("Source", BsonValue.Create(message.Source)), + Builders.Filter.Eq("Category", BsonValue.Create(message.Category)), + Builders.Filter.Eq("TimeStampAcknowledged", BsonNull.Value) + ); + + var existingMessageBson = _collection.Find(filter).FirstOrDefault(); + return existingMessageBson != null ? MapBsonToPlainTcoMessage(existingMessageBson) : null; + } + + + public List ReadMessages() + { + var sort = Builders.Sort.Descending("TimeStamp"); + var messages = _collection.Find(new BsonDocument()).Sort(sort).Limit(1000).ToList(); + return messages.Select(MapBsonToPlainTcoMessage).ToList(); + } + + private void EnsureMaxEntries() + { + var currentCount = _collection.CountDocuments(new BsonDocument()); + + if (currentCount > MaxEntries) + { + var excessCount = currentCount - MaxEntries; + + // Find the oldest entries based on TimeStamp or any other relevant field + var oldestEntries = _collection.Find(new BsonDocument()) + .Sort(Builders.Sort.Ascending("TimeStamp")) // Assuming TimeStamp is the field you want to sort by + .Limit((int)excessCount) + .ToList(); + + foreach (var entry in oldestEntries) + { + _collection.DeleteOne(Builders.Filter.Eq("_id", entry["_id"])); + } + } + } + + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs new file mode 100644 index 000000000..4983d3437 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using TcoCore; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping +{ + public class PlainTcoMessageExtended : PlainTcoMessage + { + public DateTime? TimeStampAcknowledged { get; set; } + } + } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs new file mode 100644 index 000000000..70d17efe5 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs @@ -0,0 +1,15 @@ +using Microsoft.Extensions.DependencyInjection; + +using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; + +namespace TcoCore.TcoDiagnosticsAlternative.Services +{ + public static class LibraryServiceConfiguration + { + public static void AddLibraryServices(this IServiceCollection services) + { + services.AddSingleton(); + // Register other services + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs new file mode 100644 index 000000000..0ff359d7d --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -0,0 +1,179 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Timers; + +using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcoCore +{ + public partial class TcoDiagnosticsAlternativeView + { + public static int MaxDatabaseEntries { get; set; } = 1000; + public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; + private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); + private static int _diagnosticsUpdateInterval { get; set; } = 500; + private Timer messageUpdateTimer; + private static int itemsPerPage { get; set; } = 15; + private int currentPage = 1; + private List uniqueMessages; + private int totalPages => (uniqueMessages.Count + itemsPerPage - 1) / itemsPerPage; + + + protected override void OnInitialized() + { + // If ViewModel is null, initialize it here + var logger = new MongoLogger(); + ViewModel = new TcoDiagnosticsAlternativeViewModel(logger, ViewModel._tcoObject); + + SetDefaultCategory(eMessageCategory.Warning); + UpdateValuesOnChange(ViewModel._tcoObject); + DiagnosticsUpdateTimer(); + StateHasChanged(); + AckMessages(); + uniqueMessages = UniqueMessages().ToList(); + } + + public static void SetMaxDatabaseEntries ( int value) + { + MaxDatabaseEntries = value; + } + + private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) + { + await InvokeAsync(() => + { + ViewModel.UpdateAndFetchMessages(); + uniqueMessages = UniqueMessages().ToList(); + StateHasChanged(); + }); + } + + public static void SetItemsPerPage(int value) + { + itemsPerPage = value; + } + + private void PreviousPage() + { + if (currentPage > 1) + { + currentPage--; + } + } + + private void NextPage() + { + if (currentPage < totalPages) + { + currentPage++; + } + } + + public void FirstPage() + { + currentPage = 1; + } + + public void LastPage() + { + currentPage = totalPages; + } + + public bool IsFirstDisabled => currentPage == 1; + + public bool IsLastDisabled => currentPage == totalPages; + + private void DiagnosticsUpdateTimer() + { + if (messageUpdateTimer == null) + { + Console.WriteLine("Initializing timer."); + messageUpdateTimer = new Timer(_diagnosticsUpdateInterval); + messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed; + messageUpdateTimer.AutoReset = true; + messageUpdateTimer.Enabled = true; + } + else + { + Console.WriteLine("Timer already initialized."); + } + } + + private List messages = new List(); + + private void OnNewMessageReceived(PlainTcoMessage newMessage) + { + // Add the new message to the list and re-render the component + messages.Add(newMessage); + StateHasChanged(); + } + + // Unsubscribe from the event when the component is disposed of + public void Dispose() + { + ViewModel.NewMessageReceived -= OnNewMessageReceived; + } + + private void AckMessages() + { + ViewModel.AcknowledgeMessages(); + StateHasChanged(); + } + + public IEnumerable UniqueMessages() + { + return ViewModel.DbMessageDisplay + .Where(m => m.CategoryAsEnum >= MinMessageCategoryFilter) + .GroupBy(m => new { m.Identity, m.Text, m.TimeStamp, m.Cycle }) + .Select(g => g.FirstOrDefault()) + .OrderByDescending(m => m.TimeStamp) + .ThenByDescending(m => m.TimeStampAcknowledged.HasValue ? m.TimeStampAcknowledged.Value : DateTime.MinValue); + } + + public string DiagnosticsMessage() => "Diag depth : " + DepthValue; + public int MaxDiagnosticsDepth { get; set; } = 20; + public static int _depthValue; + public static int SetDefaultDepth(int item) => _depthValue = item; + + public int DepthValue + { + get + { + if (_depthValue == 0) + _depthValue = ViewModel._tcoObject.MessageHandler.DiagnosticsDepth; + return _depthValue; + } + set + { + _depthValue = value; + ViewModel._tcoObject.MessageHandler.DiagnosticsDepth = value; + } + } + + public eMessageCategory MinMessageCategoryFilter + { + get + { + return _minMessageCategoryFilter; + } + set + { + _minMessageCategoryFilter = value; + ViewModel.MinMessageCategoryFilter = value; // Update the ViewModel's property + } + } + private eMessageCategory _minMessageCategoryFilter = DefaultCategory; + + + public static eMessageCategory SetDefaultCategory(eMessageCategory item) => DefaultCategory = item; + public static eMessageCategory DefaultCategory { get; set; } = eMessageCategory.Info; + + public int UniqueMessagesCount => uniqueMessages?.Count ?? 0; + + public int DbMessageDisplayCount => ViewModel.DbMessageDisplay?.Count() ?? 0; + + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor new file mode 100644 index 000000000..3900a9949 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -0,0 +1,78 @@ +@inherits RenderableViewModelComponentBase +@using Blazm.Components +@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping +@using Vortex.Presentation.Controls.Blazor.RenderableContent +@namespace TcoCore + + +
    +

    Count of Unique Messages: @UniqueMessagesCount

    +

    Count of DbMessageDisplay: @DbMessageDisplayCount

    +
    + +
    +
    + +
    +
    + +
    +
    + + @DiagnosticsMessage() +
    +
    + +@if (ViewModel.DbMessageDisplay != null && ViewModel.DbMessageDisplay.Any()) +{ + + + + + + + + + + + + + + @foreach (var message in uniqueMessages.Skip((currentPage - 1) * itemsPerPage).Take(itemsPerPage)) + { + + + + + + + + + + } + +
    TimestampTimestamp AcknowledgedTextCategoryPfadPinnedAction
    @message.TimeStamp.ToString("yyyy-MM-dd HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")@message.Text@message.CategoryAsEnum@message.ParentsObjectSymbol@message.Pinned + +
    + +
    + + + Page @currentPage of @totalPages + + +
    + + +} +else +{ +

    No database messages found.

    +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css new file mode 100644 index 000000000..48cac384d --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css @@ -0,0 +1,56 @@ +/* Base style for all rows */ +.table tbody tr { + background-color: #ffffff; /* White background for all rows */ +} + + /* Style for every second row */ + .table tbody tr:nth-child(even) { + background-color: #f2f2f2; /* Light grey background for every second row */ + } + +/* Button styling */ +button { + background-color: #004a8f; /* Darker blue color */ + color: #ffffff; /* White text color */ + padding: 5px 20px; /* Padding for top/bottom and left/right */ + border: none; /* Remove default border */ + border-radius: 5px; /* Subtly rounded corners */ + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); /* Shadow effect */ + cursor: pointer; /* Hand cursor on hover */ + transition: all 0.3s ease; /* Transition effect for hover state */ +} + + /* Hover effect for the button */ + button:hover { + background-color: #003366; /* Even darker blue color on hover */ + box-shadow: 0 6px 8px rgba(0, 0, 0, 0.2); /* Increased shadow on hover */ + } + + button:focus { + outline: none; + box-shadow: none; + background-color: #004a8f; + color: #ffffff; /* White text color */ + } + + button:active { + transform: scale(0.98); /* Slightly reduce the size of the button */ + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15); /* Reduced shadow when pressed */ + } + +.disabled-button { + background-color: #cccccc; /* Grey background */ + color: #666666; /* Darker grey text */ + cursor: not-allowed; /* No action cursor */ + pointer-events: none; /* Disable click events */ +} + +.custom-dropdown::after { + content: '\25BC'; /* Unicode character for a small black down-pointing triangle */ + position: absolute; + right: 10px; + top: 50%; + transform: translateY(-50%); + pointer-events: none; /* Ensures the pseudo-element doesn't interfere with dropdown interactions */ +} + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs new file mode 100644 index 000000000..ab91fdfbc --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs @@ -0,0 +1,275 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +using PlcDocu.TcoCore; + +using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; + +using TcOpen.Inxton; +using TcOpen.Inxton.Input; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +using Vortex.Presentation; + + +namespace TcoCore +{ + public class TcoDiagnosticsAlternativeViewModel : RenderableViewModelBase + { + private readonly IMongoLogger _logger; + + public TcoDiagnosticsAlternativeViewModel() + { + // Default constructor + } + + public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger) + { + _logger = logger; + } + + public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject) + { + _tcoObject = tcoObject; + } + + public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger, IsTcoObject tcoObject) + { + _logger = logger; + _tcoObject = tcoObject; + } + + public RelayCommand UpdateMessagesCommand { get; private set; } + + internal IsTcoObject _tcoObject { get; set; } + + public override object Model { get => this._tcoObject; set => this._tcoObject = value as IsTcoObject; } + + public object Categories + { + get + { + return Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); + } + } + bool diagnosticsRunning; + + public bool DiagnosticsRunning + { + get => diagnosticsRunning; + internal set + { + if (diagnosticsRunning == value) + { + return; + } + SetProperty(ref diagnosticsRunning, value); + } + } + + //======================== + public event Action NewMessageReceived; + private volatile object updatemutex = new object(); + private HashSet activeMessages = new HashSet(); + + internal void LogMesssages() + { + if (DiagnosticsRunning) + { + return; + } + + lock (updatemutex) + { + DiagnosticsRunning = true; + + // Fetch the active messages + var newMessageDisplay = _tcoObject.MessageHandler.GetActiveMessages() + .Where(p => p.CategoryAsEnum >= MinMessageCategoryFilter) + .OrderByDescending(p => p.Category) + .ThenBy(p => p.TimeStamp) + .ToList(); + + // Create a set of message identities for easier lookup + var newMessageIdentities = new HashSet(newMessageDisplay.Select(m => m.Identity)); + + foreach (var message in (newMessageDisplay)) + { + if (_logger != null) + { + _logger.LogMessage(message); + } + + activeMessages.Add(message.Identity); + } + + // Remove or acknowledge messages that are no longer active + var messagesToRemove = activeMessages.Where(id => !newMessageIdentities.Contains(id)).ToList(); + foreach (var id in messagesToRemove) + { + //AcknowledgeMessages(); + AcknowledgeMessage(id); + activeMessages.Remove(id); + } + + // Update the MessageDisplay + MessageDisplay = newMessageDisplay; + + DiagnosticsRunning = false; + } + + } + + public void AcknowledgeMessages() + { + try + { + lock (updatemutex) + { + TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); + + foreach (var item in DbMessageDisplay.Where(p => p.TimeStampAcknowledged == null)) + + { + DateTime currentDateTime = DateTime.UtcNow; + // Check the MessageDisplay for the same identity + var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == item.Identity); + bool isActive = false; + + if (activeMessage != null) + { + activeMessage.OnlinerMessage.Pinned.Cyclic = false; + Thread.Sleep(100); + isActive = activeMessage.OnlinerMessage.IsActive; + } + + if (!isActive) + { + _logger.UpdateMessages(item.Identity, item.TimeStamp, currentDateTime, false); + } + else + { + TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); + } + + TcoAppDomain.Current.Logger.Information("Message acknowledged {@message}", new { Text = item.Text, Category = item.CategoryAsEnum }); + } + } + } + catch (Exception ex) + { + // Log the exception here + TcoAppDomain.Current.Logger.Error("An error occurred while acknowledging messages: {@error}", ex); + } + } + + public void AcknowledgeMessage(ulong identity) + { + try + { + lock (updatemutex) + { + // Find all messages with the given identity and where TimeStampAcknowledged is null + var messagesToAcknowledge = DbMessageDisplay.Where(m => m.Identity == identity && m.TimeStampAcknowledged == null).ToList(); + + if (messagesToAcknowledge.Any()) + { + DateTime currentDateTime = DateTime.UtcNow; + + foreach (var messageToAcknowledge in messagesToAcknowledge) + { + // Check the MessageDisplay for the same identity + var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Identity); + bool isActive = false; + + if (activeMessage != null) + { + activeMessage.OnlinerMessage.Pinned.Cyclic = false; + Thread.Sleep(100); + isActive = activeMessage.OnlinerMessage.IsActive; + } + + if (!isActive) + { + _logger.UpdateMessages(messageToAcknowledge.Identity, messageToAcknowledge.TimeStamp, currentDateTime, false); + TcoAppDomain.Current.Logger.Information("Message with identity {@identity} acknowledged", identity); + } + else + { + TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); + } + } + } + else + { + TcoAppDomain.Current.Logger.Warning("No message found with identity: {@identity} that has a null TimeStampAcknowledged", identity); + } + } + } + catch (Exception ex) + { + Console.WriteLine(ex.ToString()); + } + } + + public void RefreshMessageDisplay() + { + //AcknowledgeMessages(); + Console.WriteLine($"Refresh"); + MessageDisplay = _logger.ReadMessages(); + } + + public List Messages { get; private set; } = new List(); + + IEnumerable messageDisplay = new List(); + + public IEnumerable MessageDisplay + { + get => messageDisplay; + + private set + { + if (messageDisplay == value) + { + return; + } + + SetProperty(ref messageDisplay, value); + } + } + + IEnumerable dbMessageDisplay = new List(); + public IEnumerable DbMessageDisplay + { + get => dbMessageDisplay; + + private set + { + if (dbMessageDisplay == value) + { + return; + } + + SetProperty(ref dbMessageDisplay, value); + } + } + + public void FetchMessagesFromDb() + { + var latestMessages = _logger.ReadMessages(); + DbMessageDisplay = latestMessages; + } + + public void UpdateAndFetchMessages() + { + LogMesssages(); + FetchMessagesFromDb(); + } + public eMessageCategory MinMessageCategoryFilter { get; set; } + + } +} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs new file mode 100644 index 000000000..0d0a56ea3 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; + +namespace TcoCore +{ + public class TcoObjectDiagnosticsAlternativeView : TcoDiagnosticsAlternativeView { } + + public class TcoObjectDiagnosticsAlternativeViewModel : TcoDiagnosticsAlternativeViewModel + { + public TcoObjectDiagnosticsAlternativeViewModel() : base() { } + + public TcoObjectDiagnosticsAlternativeViewModel(IMongoLogger logger) : base(logger) { } + } +} From 1226d3f1c9b0c860dbde663efe1068b5fd0ccacf Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 27 Sep 2023 17:05:38 +0200 Subject: [PATCH 03/13] logging from Logger, displays values, Schema works CleanupService for DB with 5000 entries. ToDo, Retrieve active Msgs, Compare to Logged Msgs, Acknowledge and Update Db Entries --- .../Pages/DiagnosticsAlternative.razor | 4 +- .../PlcHammer.Hmi.Blazor/Shared/NavMenu.razor | 4 +- .../PlcHammer.Hmi.Blazor/Startup.cs | 12 +- .../appsettings.Development.json | 3 +- .../Configure/MongoDbSettings.cs | 16 + .../Mapping/MongoDbLogItem.cs | 146 +++++++ .../Services/DataCleanupService.cs | 66 +++ .../Services/DataService.cs | 76 ++++ .../Services/LibraryServiceConfiguration.cs | 15 - .../TcoDiagnosticsAlternativeView.cs | 281 +++++++------ .../TcoDiagnosticsAlternativeView.razor | 39 +- .../TcoDiagnosticsAlternativeViewModel.cs | 378 ++++++++---------- .../TcoObjectDiagnostics.cs | 5 +- .../pex/TcoLogger/TcoLogger.cs | 4 +- 14 files changed, 679 insertions(+), 370 deletions(-) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs delete mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor index 5044615ff..9dfb869c5 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsAlternative.razor @@ -1,7 +1,7 @@ @page "/diagnostics-alternative" -@* -*@ + + @code { diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor index aa857c001..054cbaa45 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor @@ -37,11 +37,11 @@ Diagnostics Alternative
    • -
  • + @*
  • Diagnostics Logger! -
    • + *@
  • Security diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs index 2f7ea1d1d..bb3c3d5f3 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs @@ -31,9 +31,13 @@ using TcOpen.Inxton.Local.Security.Blazor.Services; using TcOpen.Inxton.Local.Security.Blazor.Users; using TcOpen.Inxton.TcoCore.Blazor.Extensions; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Configure; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; using TcOpen.Inxton.TcoCore.Blazor.TcoDialog.Hubs; using Vortex.Presentation.Blazor.Services; +using static TcoCore.TcoDiagnosticsAlternativeViewModel; + namespace PlcHammer.Hmi.Blazor { public class Startup @@ -43,6 +47,7 @@ public Startup(IConfiguration configuration) Configuration = configuration; MongoUri = Configuration["MongoDbSettings:MongoUri"]; DatabaseName = Configuration["MongoDbSettings:DatabaseName"]; + CollectionName = Configuration["MongoDbSettings:CollectionName"]; } public IConfiguration Configuration { get; } @@ -50,6 +55,7 @@ public Startup(IConfiguration configuration) //Uses Config from appsetings.Development.json, there the connection String etc. is configured public static string MongoUri { get; private set; } public static string DatabaseName { get; private set; } + public static string CollectionName { get; set; } public static StringWriter logMessages = new StringWriter(); @@ -92,7 +98,7 @@ public void ConfigureServices(IServiceCollection services) // .WriteTo.MQTT(new MQTTnet.Client.Options.MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io").Build(), "fun_with_TcOpen_Hammer") .WriteTo.MongoDBBson( databaseUrl: $"{MongoUri}/{DatabaseName}", - collectionName: "log" + collectionName: $"{CollectionName}" ).Enrich.WithProperty("user",SecurityManager.Manager.Principal.Identity.Name) .Enrich.With(new Serilog.Enrichers.EnvironmentNameEnricher()) .Enrich.With(new Serilog.Enrichers.EnvironmentUserNameEnricher()) @@ -101,6 +107,10 @@ public void ConfigureServices(IServiceCollection services) .SetSecurity(SecurityManager.Manager.Service) .SetEditValueChangeLogging(Entry.PlcHammer.Connector); + services.Configure(Configuration.GetSection("MongoDbSettings")); + services.AddTransient(); + services.AddSingleton< DataCleanupService>(); + services.AddTransient(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json index d44d361a0..5a2a999eb 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/appsettings.Development.json @@ -9,7 +9,8 @@ }, "MongoDbSettings": { "MongoUri": "mongodb://localhost:27017", - "DatabaseName": "Hammer" + "DatabaseName": "Hammer", + "CollectionName": "log" } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs new file mode 100644 index 000000000..dcb1ace8f --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Configure +{ + public class MongoDbSettings + { + public string MongoUri { get; set; } + public string DatabaseName { get; set; } + public string CollectionName { get; set; } + } + +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs new file mode 100644 index 000000000..2161a80ca --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs @@ -0,0 +1,146 @@ +using MongoDB.Bson; +using MongoDB.Bson.Serialization; +using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Serializers; + +using System; +using System.Collections.Generic; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping +{ + public class MongoDbLogItem + { + [BsonId] + public ObjectId Id { get; set; } + + public string Level { get; set; } + + [BsonElement("UtcTimeStamp")] + public DateTime UtcTimeStamp { get; set; } + + [BsonElement("UtcTimeStampAcknowledged")] + public DateTime? TimeStampAcknowledged { get; set; } = null; + + public MessageTemplate MessageTemplate { get; set; } + + public string RenderedMessage { get; set; } + + public Properties Properties { get; set; } + + public Exception Exception { get; set; } + } + + public class MessageTemplate + { + public string Text { get; set; } + + public List Tokens { get; set; } + } + + public class Token + { + [BsonElement("_t")] + public string Type { get; set; } + + public int StartIndex { get; set; } + + public string Text { get; set; } // This property is only for TextToken + } + + public class Properties + { + //public string? payload { get; set; } + + public MessageProperties message { get; set; } + + [BsonSerializer(typeof(PayloadDeserializer))] + public PayloadProperties payload { get; set; } + + //public PayloadProperties payload { get; set; } + + public SenderProperties sender { get; set; } + + public string user { get; set; } + + public string EnvironmentName { get; set; } + + public string EnvironmentUserName { get; set; } + + public string MachineName { get; set; } + + public ulong? ExtractedIdentity { get; set; } + + public string? UserName { get; set; } + } + + public class MessageProperties + { + public string Text { get; set; } + + public int Category { get; set; } + } + + public class PayloadProperties + { + public string rootObject { get; set; } + + public string rootSymbol { get; set; } + } + + public class SenderProperties + { + public bool ControllerLogger { get; set; } + + public Payload Payload { get; set; } + } + + public class Payload + { + public string PlcLogger { get; set; } + + public string ParentSymbol { get; set; } + + public string ParentName { get; set; } + + public int Cycle { get; set; } + + [BsonElement("PlcTimeStamp")] + public DateTime PlcTimeStamp { get; set; } + + public string Raw { get; set; } + + public int Pcc { get; set; } + + public long Identity { get; set; } // Adding Identity property + + public int MessageDigest { get; set; } // Adding MessageDigest property + } + + public class Exception + { + [BsonElement("_csharpnull")] + public bool CSharpNull { get; set; } + } + + public class PayloadDeserializer : SerializerBase + { + public override PayloadProperties Deserialize(BsonDeserializationContext context, BsonDeserializationArgs args) + { + var bsonType = context.Reader.CurrentBsonType; + if (bsonType == BsonType.String) + { + context.Reader.SkipValue(); // Skip the string value as it's not needed + return null; // or return a new PayloadProperties with default values if needed + } + else if (bsonType == BsonType.Document) + { + var serializer = BsonSerializer.LookupSerializer(); + return serializer.Deserialize(context, args); + } + else + { + throw new BsonSerializationException($"Cannot deserialize 'payload' from BsonType {bsonType}."); + } + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs new file mode 100644 index 000000000..bcbd77446 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs @@ -0,0 +1,66 @@ +using System; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +using Microsoft.Extensions.Options; + +using MongoDB.Bson; +using MongoDB.Driver; + + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services +{ + public class DataCleanupService : IDisposable + { + private readonly IMongoCollection _collection; + private readonly Timer _timer; + + private int cycleToDeleteInHour { get; set; } = 1; + private int maxNumber { get; set; } = 5000; + + private readonly IMongoDatabase _database; + private readonly string _collectionName; + + public DataCleanupService(IOptions settings) + { + var client = new MongoClient(settings.Value.MongoUri); + _database = client.GetDatabase(settings.Value.DatabaseName); + _collectionName = settings.Value.CollectionName; + _collection = _database.GetCollection(_collectionName); + + _timer = new Timer(Cleanup, null, TimeSpan.Zero, TimeSpan.FromHours(cycleToDeleteInHour)); // Adjust the interval as needed + Console.WriteLine($"Cleanup busy"); // Debug log + } + + private async void Cleanup(object state) + { + try + { + Console.WriteLine($"Cleanup started at {DateTime.UtcNow}"); + var count = await _collection.CountDocumentsAsync(new BsonDocument()); + + if (count > maxNumber) // Adjust the threshold as needed + { + var oldestLogs = await _collection.Find(new BsonDocument()) + .Sort(Builders.Sort.Ascending("timestamp")) // Assuming your documents have a "timestamp" field + .Limit((int)(count - maxNumber)) // Keep the newest 10000 documents + .ToListAsync(); + + var deleteFilter = Builders.Filter.In("_id", oldestLogs.Select(log => log["_id"])); + await _collection.DeleteManyAsync(deleteFilter); + Console.WriteLine($"Cleanup Done"); // Debug log + } + } + catch(System.Exception ex) + { + Console.WriteLine($"Cleanup failed: {ex.Message}"); + } + } + + public void Dispose() + { + _timer?.Dispose(); + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs new file mode 100644 index 000000000..5766fd8c4 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +using Microsoft.Extensions.Options; + +using MongoDB.Bson; +using MongoDB.Driver; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services +{ + public class DataService + { + private readonly IMongoDatabase _database; + private readonly string _collectionName; + + public DataService(IOptions settings) + { + var client = new MongoClient(settings.Value.MongoUri); + _database = client.GetDatabase(settings.Value.DatabaseName); + _collectionName = settings.Value.CollectionName; + } + + public IEnumerable CachedData { get; set; } + + private async Task> GetDataAsync() + { + var collection = _database.GetCollection(_collectionName); + return await collection.Find(new BsonDocument()).ToListAsync(); + } + + public async Task RefreshDataAsync() + { + CachedData = await GetDataAsync(); + } + + public void ExtractIdentity() + { + var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); + foreach (var item in CachedData) + { + var match = regex.Match(item.RenderedMessage); + if (match.Success) + { + var identityString = match.Groups[1].Value; + if (ulong.TryParse(identityString, out ulong identity)) + { + item.Properties.ExtractedIdentity = (ulong)identity; // Cast to long if necessary + } + else + { + Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log + } + } + } + } + + + public void OrderData() + { + CachedData = CachedData + .OrderByDescending(item => item.TimeStampAcknowledged.HasValue ? 0 : 1) // Nulls first + .ThenByDescending(item => item.UtcTimeStamp) + .ThenByDescending(item => item.TimeStampAcknowledged) + .ToList(); + } + + + } + +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs deleted file mode 100644 index 70d17efe5..000000000 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/LibraryServiceConfiguration.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; - -using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; - -namespace TcoCore.TcoDiagnosticsAlternative.Services -{ - public static class LibraryServiceConfiguration - { - public static void AddLibraryServices(this IServiceCollection services) - { - services.AddSingleton(); - // Register other services - } - } -} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index 0ff359d7d..2bc95fad0 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -1,96 +1,61 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using System.Timers; -using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; +using Microsoft.AspNetCore.Components; + +using MongoDB.Bson.Serialization; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; + namespace TcoCore { public partial class TcoDiagnosticsAlternativeView { + + [Inject] + public DataService DataService { get; set; } + + [Inject] + public DataCleanupService DataCleanupService { get; set; } + public static int MaxDatabaseEntries { get; set; } = 1000; public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); - private static int _diagnosticsUpdateInterval { get; set; } = 500; + private static int _diagnosticsUpdateInterval { get; set; } = 100; private Timer messageUpdateTimer; - private static int itemsPerPage { get; set; } = 15; + private static int itemsPerPage { get; set; } = 20; private int currentPage = 1; - private List uniqueMessages; - private int totalPages => (uniqueMessages.Count + itemsPerPage - 1) / itemsPerPage; - - - protected override void OnInitialized() - { - // If ViewModel is null, initialize it here - var logger = new MongoLogger(); - ViewModel = new TcoDiagnosticsAlternativeViewModel(logger, ViewModel._tcoObject); - SetDefaultCategory(eMessageCategory.Warning); - UpdateValuesOnChange(ViewModel._tcoObject); - DiagnosticsUpdateTimer(); - StateHasChanged(); - AckMessages(); - uniqueMessages = UniqueMessages().ToList(); - } + private IEnumerable MyData { get; set; } = new List(); - public static void SetMaxDatabaseEntries ( int value) - { - MaxDatabaseEntries = value; - } - private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) + protected override async Task OnInitializedAsync() { - await InvokeAsync(() => + if (!BsonClassMap.IsClassMapRegistered(typeof(SenderProperties))) + { + BsonClassMap.RegisterClassMap(cm => { - ViewModel.UpdateAndFetchMessages(); - uniqueMessages = UniqueMessages().ToList(); - StateHasChanged(); + cm.AutoMap(); + cm.SetIgnoreExtraElements(true); }); - } - - public static void SetItemsPerPage(int value) - { - itemsPerPage = value; - } - - private void PreviousPage() - { - if (currentPage > 1) - { - currentPage--; } - } - private void NextPage() - { - if (currentPage < totalPages) - { - currentPage++; - } - } - public void FirstPage() - { - currentPage = 1; - } + UpdateValuesOnChange(ViewModel._tcoObject); - public void LastPage() - { - currentPage = totalPages; + DiagnosticsUpdateTimer(); } - public bool IsFirstDisabled => currentPage == 1; - - public bool IsLastDisabled => currentPage == totalPages; - private void DiagnosticsUpdateTimer() { if (messageUpdateTimer == null) { - Console.WriteLine("Initializing timer."); + //Console.WriteLine("Initializing timer."); messageUpdateTimer = new Timer(_diagnosticsUpdateInterval); messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed; messageUpdateTimer.AutoReset = true; @@ -102,78 +67,138 @@ private void DiagnosticsUpdateTimer() } } - private List messages = new List(); - - private void OnNewMessageReceived(PlainTcoMessage newMessage) - { - // Add the new message to the list and re-render the component - messages.Add(newMessage); - StateHasChanged(); - } - - // Unsubscribe from the event when the component is disposed of - public void Dispose() - { - ViewModel.NewMessageReceived -= OnNewMessageReceived; - } - - private void AckMessages() - { - ViewModel.AcknowledgeMessages(); - StateHasChanged(); - } - - public IEnumerable UniqueMessages() - { - return ViewModel.DbMessageDisplay - .Where(m => m.CategoryAsEnum >= MinMessageCategoryFilter) - .GroupBy(m => new { m.Identity, m.Text, m.TimeStamp, m.Cycle }) - .Select(g => g.FirstOrDefault()) - .OrderByDescending(m => m.TimeStamp) - .ThenByDescending(m => m.TimeStampAcknowledged.HasValue ? m.TimeStampAcknowledged.Value : DateTime.MinValue); - } - - public string DiagnosticsMessage() => "Diag depth : " + DepthValue; - public int MaxDiagnosticsDepth { get; set; } = 20; - public static int _depthValue; - public static int SetDefaultDepth(int item) => _depthValue = item; - - public int DepthValue - { - get - { - if (_depthValue == 0) - _depthValue = ViewModel._tcoObject.MessageHandler.DiagnosticsDepth; - return _depthValue; - } - set - { - _depthValue = value; - ViewModel._tcoObject.MessageHandler.DiagnosticsDepth = value; - } - } - - public eMessageCategory MinMessageCategoryFilter + private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) { - get - { - return _minMessageCategoryFilter; - } - set + await InvokeAsync(async () => { - _minMessageCategoryFilter = value; - ViewModel.MinMessageCategoryFilter = value; // Update the ViewModel's property - } + await DataService.RefreshDataAsync(); + DataService.ExtractIdentity(); + DataService.OrderData(); + MyData = DataService.CachedData + .Where(m => m.Properties?.sender?.Payload != null) + .OrderByDescending(m => m.TimeStampAcknowledged.HasValue ? 0 : 1) + .ThenByDescending(m => m.TimeStampAcknowledged) + .ThenByDescending(m => m.UtcTimeStamp); + + StateHasChanged(); + }); } - private eMessageCategory _minMessageCategoryFilter = DefaultCategory; - - - public static eMessageCategory SetDefaultCategory(eMessageCategory item) => DefaultCategory = item; - public static eMessageCategory DefaultCategory { get; set; } = eMessageCategory.Info; - - public int UniqueMessagesCount => uniqueMessages?.Count ?? 0; - public int DbMessageDisplayCount => ViewModel.DbMessageDisplay?.Count() ?? 0; + //public static void SetMaxDatabaseEntries ( int value) + //{ + // MaxDatabaseEntries = value; + //} + + + //public static void SetItemsPerPage(int value) + //{ + // itemsPerPage = value; + //} + + //private void PreviousPage() + //{ + // if (currentPage > 1) + // { + // currentPage--; + // } + //} + + //private void NextPage() + //{ + // if (currentPage < totalPages) + // { + // currentPage++; + // } + //} + + //public void FirstPage() + //{ + // currentPage = 1; + //} + + //public void LastPage() + //{ + // currentPage = totalPages; + //} + + //public bool IsFirstDisabled => currentPage == 1; + + //public bool IsLastDisabled => currentPage == totalPages; + + + + //private List messages = new List(); + + //private void OnNewMessageReceived(PlainTcoMessage newMessage) + //{ + // // Add the new message to the list and re-render the component + // messages.Add(newMessage); + // StateHasChanged(); + //} + + //// Unsubscribe from the event when the component is disposed of + //public void Dispose() + //{ + // ViewModel.NewMessageReceived -= OnNewMessageReceived; + //} + + //private void AckMessages() + //{ + // ViewModel.AcknowledgeMessages(); + // StateHasChanged(); + //} + + //public IEnumerable UniqueMessages() + //{ + // return ViewModel.DbMessageDisplay + // .Where(m => m.CategoryAsEnum >= MinMessageCategoryFilter) + // .GroupBy(m => new { m.Identity, m.Text, m.TimeStamp, m.Cycle }) + // .Select(g => g.FirstOrDefault()) + // .OrderByDescending(m => m.TimeStamp) + // .ThenByDescending(m => m.TimeStampAcknowledged.HasValue ? m.TimeStampAcknowledged.Value : DateTime.MinValue); + //} + + //public string DiagnosticsMessage() => "Diag depth : " + DepthValue; + //public int MaxDiagnosticsDepth { get; set; } = 20; + //public static int _depthValue; + //public static int SetDefaultDepth(int item) => _depthValue = item; + + //public int DepthValue + //{ + // get + // { + // if (_depthValue == 0) + // _depthValue = ViewModel._tcoObject.MessageHandler.DiagnosticsDepth; + // return _depthValue; + // } + // set + // { + // _depthValue = value; + // ViewModel._tcoObject.MessageHandler.DiagnosticsDepth = value; + // } + //} + + //public eMessageCategory MinMessageCategoryFilter + //{ + // get + // { + // return _minMessageCategoryFilter; + // } + // set + // { + // _minMessageCategoryFilter = value; + // ViewModel.MinMessageCategoryFilter = value; // Update the ViewModel's property + // } + //} + //private eMessageCategory _minMessageCategoryFilter = DefaultCategory; + + + //public static eMessageCategory SetDefaultCategory(eMessageCategory item) => DefaultCategory = item; + //public static eMessageCategory DefaultCategory { get; set; } = eMessageCategory.All; + + //public int UniqueMessagesCount => uniqueMessages?.Count ?? 0; + + //public int DbMessageDisplayCount => ViewModel.DbMessageDisplay?.Count() ?? 0; } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index 3900a9949..99a062328 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -2,10 +2,46 @@ @using Blazm.Components @using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping @using Vortex.Presentation.Controls.Blazor.RenderableContent +@using static TcoCore.TcoDiagnosticsAlternativeViewModel @namespace TcoCore +@inject TcoDiagnosticsAlternativeViewModel ViewModel -
    + + + + + + + + + + + + + + + @foreach (var message in MyData) + { + + + + + + + + + + } + +
    PLC TimestampTimestamp AcknowledgedFehler CategoryRendered MessagePLC LoggerMessage Digest (Unique Hash)Idendity
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")@message.Level@message.Properties.sender.Payload.Raw@message.Properties.sender.Payload.ParentSymbol@message.Properties.sender.Payload.MessageDigest@message.Properties.ExtractedIdentity
    + + + + + + +@*

    Count of Unique Messages: @UniqueMessagesCount

    Count of DbMessageDisplay: @DbMessageDisplayCount

    @@ -76,3 +112,4 @@ else {

    No database messages found.

    } +*@ diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs index ab91fdfbc..59a424046 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs @@ -1,17 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading; using System.Threading.Tasks; -using PlcDocu.TcoCore; +using MongoDB.Bson.Serialization; +using MongoDB.Driver; -using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; - -using TcOpen.Inxton; using TcOpen.Inxton.Input; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; using Vortex.Presentation; @@ -20,29 +17,36 @@ namespace TcoCore { public class TcoDiagnosticsAlternativeViewModel : RenderableViewModelBase { - private readonly IMongoLogger _logger; + private readonly DataService _dataService; public TcoDiagnosticsAlternativeViewModel() { - // Default constructor + } - public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger) + public TcoDiagnosticsAlternativeViewModel(DataService dataService) { - _logger = logger; + _dataService = dataService; } - public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject) - { - _tcoObject = tcoObject; - } + //public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger) + //{ + // _logger = logger; + //} - public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger, IsTcoObject tcoObject) + public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject, DataService dataService) { - _logger = logger; _tcoObject = tcoObject; + _dataService = dataService; } + //public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger, IsTcoObject tcoObject) + //{ + // _logger = logger; + // _tcoObject = tcoObject; + //} + + public RelayCommand UpdateMessagesCommand { get; private set; } internal IsTcoObject _tcoObject { get; set; } @@ -71,205 +75,147 @@ internal set } } - //======================== - public event Action NewMessageReceived; - private volatile object updatemutex = new object(); - private HashSet activeMessages = new HashSet(); - - internal void LogMesssages() - { - if (DiagnosticsRunning) - { - return; - } - - lock (updatemutex) - { - DiagnosticsRunning = true; - - // Fetch the active messages - var newMessageDisplay = _tcoObject.MessageHandler.GetActiveMessages() - .Where(p => p.CategoryAsEnum >= MinMessageCategoryFilter) - .OrderByDescending(p => p.Category) - .ThenBy(p => p.TimeStamp) - .ToList(); - - // Create a set of message identities for easier lookup - var newMessageIdentities = new HashSet(newMessageDisplay.Select(m => m.Identity)); - - foreach (var message in (newMessageDisplay)) - { - if (_logger != null) - { - _logger.LogMessage(message); - } - - activeMessages.Add(message.Identity); - } - - // Remove or acknowledge messages that are no longer active - var messagesToRemove = activeMessages.Where(id => !newMessageIdentities.Contains(id)).ToList(); - foreach (var id in messagesToRemove) - { - //AcknowledgeMessages(); - AcknowledgeMessage(id); - activeMessages.Remove(id); - } - - // Update the MessageDisplay - MessageDisplay = newMessageDisplay; - - DiagnosticsRunning = false; - } - - } - - public void AcknowledgeMessages() - { - try - { - lock (updatemutex) - { - TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); - - foreach (var item in DbMessageDisplay.Where(p => p.TimeStampAcknowledged == null)) - - { - DateTime currentDateTime = DateTime.UtcNow; - // Check the MessageDisplay for the same identity - var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == item.Identity); - bool isActive = false; - - if (activeMessage != null) - { - activeMessage.OnlinerMessage.Pinned.Cyclic = false; - Thread.Sleep(100); - isActive = activeMessage.OnlinerMessage.IsActive; - } - - if (!isActive) - { - _logger.UpdateMessages(item.Identity, item.TimeStamp, currentDateTime, false); - } - else - { - TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); - } - - TcoAppDomain.Current.Logger.Information("Message acknowledged {@message}", new { Text = item.Text, Category = item.CategoryAsEnum }); - } - } - } - catch (Exception ex) - { - // Log the exception here - TcoAppDomain.Current.Logger.Error("An error occurred while acknowledging messages: {@error}", ex); - } - } - - public void AcknowledgeMessage(ulong identity) - { - try - { - lock (updatemutex) - { - // Find all messages with the given identity and where TimeStampAcknowledged is null - var messagesToAcknowledge = DbMessageDisplay.Where(m => m.Identity == identity && m.TimeStampAcknowledged == null).ToList(); - - if (messagesToAcknowledge.Any()) - { - DateTime currentDateTime = DateTime.UtcNow; - - foreach (var messageToAcknowledge in messagesToAcknowledge) - { - // Check the MessageDisplay for the same identity - var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Identity); - bool isActive = false; - - if (activeMessage != null) - { - activeMessage.OnlinerMessage.Pinned.Cyclic = false; - Thread.Sleep(100); - isActive = activeMessage.OnlinerMessage.IsActive; - } - - if (!isActive) - { - _logger.UpdateMessages(messageToAcknowledge.Identity, messageToAcknowledge.TimeStamp, currentDateTime, false); - TcoAppDomain.Current.Logger.Information("Message with identity {@identity} acknowledged", identity); - } - else - { - TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); - } - } - } - else - { - TcoAppDomain.Current.Logger.Warning("No message found with identity: {@identity} that has a null TimeStampAcknowledged", identity); - } - } - } - catch (Exception ex) - { - Console.WriteLine(ex.ToString()); - } - } - - public void RefreshMessageDisplay() - { - //AcknowledgeMessages(); - Console.WriteLine($"Refresh"); - MessageDisplay = _logger.ReadMessages(); - } - - public List Messages { get; private set; } = new List(); - - IEnumerable messageDisplay = new List(); - - public IEnumerable MessageDisplay - { - get => messageDisplay; - - private set - { - if (messageDisplay == value) - { - return; - } - - SetProperty(ref messageDisplay, value); - } - } - - IEnumerable dbMessageDisplay = new List(); - public IEnumerable DbMessageDisplay - { - get => dbMessageDisplay; - - private set - { - if (dbMessageDisplay == value) - { - return; - } - - SetProperty(ref dbMessageDisplay, value); - } - } - - public void FetchMessagesFromDb() - { - var latestMessages = _logger.ReadMessages(); - DbMessageDisplay = latestMessages; - } - - public void UpdateAndFetchMessages() - { - LogMesssages(); - FetchMessagesFromDb(); - } - public eMessageCategory MinMessageCategoryFilter { get; set; } - + ////======================== + //public event Action NewMessageReceived; + //private volatile object updatemutex = new object(); + //private HashSet activeMessages = new HashSet(); + + + + //public void AcknowledgeMessages() + //{ + // try + // { + // lock (updatemutex) + // { + // TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); + + // foreach (var item in DbMessageDisplay.Where(p => p.TimeStampAcknowledged == null)) + + // { + // DateTime currentDateTime = DateTime.UtcNow; + // // Check the MessageDisplay for the same identity + // var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == item.Identity); + // bool isActive = false; + + // if (activeMessage != null) + // { + // activeMessage.OnlinerMessage.Pinned.Cyclic = false; + // Thread.Sleep(100); + // isActive = activeMessage.OnlinerMessage.IsActive; + // } + + // if (!isActive) + // { + // _logger.UpdateMessages(item.Identity, item.TimeStamp, currentDateTime, false); + // } + // else + // { + // TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); + // } + + // TcoAppDomain.Current.Logger.Information("Message acknowledged {@message}", new { Text = item.Text, Category = item.CategoryAsEnum }); + // } + // } + // } + // catch (Exception ex) + // { + // // Log the exception here + // TcoAppDomain.Current.Logger.Error("An error occurred while acknowledging messages: {@error}", ex); + // } + //} + + //public void AcknowledgeMessage(ulong identity) + //{ + // try + // { + // lock (updatemutex) + // { + // // Find all messages with the given identity and where TimeStampAcknowledged is null + // var messagesToAcknowledge = DbMessageDisplay.Where(m => m.Identity == identity && m.TimeStampAcknowledged == null).ToList(); + + // if (messagesToAcknowledge.Any()) + // { + // DateTime currentDateTime = DateTime.UtcNow; + + // foreach (var messageToAcknowledge in messagesToAcknowledge) + // { + // // Check the MessageDisplay for the same identity + // var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Identity); + // bool isActive = false; + + // if (activeMessage != null) + // { + // activeMessage.OnlinerMessage.Pinned.Cyclic = false; + // Thread.Sleep(100); + // isActive = activeMessage.OnlinerMessage.IsActive; + // } + + // if (!isActive) + // { + // _logger.UpdateMessages(messageToAcknowledge.Identity, messageToAcknowledge.TimeStamp, currentDateTime, false); + // TcoAppDomain.Current.Logger.Information("Message with identity {@identity} acknowledged", identity); + // } + // else + // { + // TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); + // } + // } + // } + // else + // { + // TcoAppDomain.Current.Logger.Warning("No message found with identity: {@identity} that has a null TimeStampAcknowledged", identity); + // } + // } + // } + // catch (Exception ex) + // { + // Console.WriteLine(ex.ToString()); + // } + //} + + //public void RefreshMessageDisplay() + //{ + // //AcknowledgeMessages(); + // Console.WriteLine($"Refresh"); + // MessageDisplay = _logger.ReadMessages(); + //} + + //public List Messages { get; private set; } = new List(); + + //IEnumerable messageDisplay = new List(); + + //public IEnumerable MessageDisplay + //{ + // get => messageDisplay; + + // private set + // { + // if (messageDisplay == value) + // { + // return; + // } + + // SetProperty(ref messageDisplay, value); + // } + //} + + //IEnumerable dbMessageDisplay = new List(); + //public IEnumerable DbMessageDisplay + //{ + // get => dbMessageDisplay; + + // private set + // { + // if (dbMessageDisplay == value) + // { + // return; + // } + + // SetProperty(ref dbMessageDisplay, value); + // } + //} + + } } \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs index 0d0a56ea3..f1b9bd458 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs @@ -3,8 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; - -using TcoCore.TcoDiagnosticsAlternative.LoggingToDb; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; namespace TcoCore { @@ -14,6 +13,6 @@ public class TcoObjectDiagnosticsAlternativeViewModel : TcoDiagnosticsAlternativ { public TcoObjectDiagnosticsAlternativeViewModel() : base() { } - public TcoObjectDiagnosticsAlternativeViewModel(IMongoLogger logger) : base(logger) { } + public TcoObjectDiagnosticsAlternativeViewModel(DataService dataService) : base(dataService) { } } } diff --git a/src/TcoCore/src/TcoCoreConnector/pex/TcoLogger/TcoLogger.cs b/src/TcoCore/src/TcoCoreConnector/pex/TcoLogger/TcoLogger.cs index d2e923e22..77bedb330 100644 --- a/src/TcoCore/src/TcoCoreConnector/pex/TcoLogger/TcoLogger.cs +++ b/src/TcoCore/src/TcoCoreConnector/pex/TcoLogger/TcoLogger.cs @@ -131,7 +131,9 @@ public void LogMessages(IEnumerable messages) Cycle = plain.Cycle, PlcTimeStamp = plain.TimeStamp, Raw = plain.Raw, - Pcc = plain.PerCycleCount + Pcc = plain.PerCycleCount, + Identity = plain.Identity, + MessageDigest = plain.MessageDigest } }); } From 3a6cc0970c2c109083c4d84714acaa4b6c6e928f Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 28 Sep 2023 08:46:32 +0200 Subject: [PATCH 04/13] wip --- .../TcOpen.Inxton.TcoCore.Blazor.csproj | 2 + .../LoggingToDb/IMongoLogger.cs | 16 -- .../LoggingToDb/MongoLogger.cs | 196 ------------------ .../Mapping/PlainTcoMessageExtended.cs | 15 -- .../Services/DataService.cs | 8 +- .../TcoDiagnosticsAlternativeView.cs | 194 ++++++++--------- .../TcoDiagnosticsAlternativeView.razor | 64 +++++- .../TcoDiagnosticsAlternativeViewModel.cs | 134 +++++++++--- 8 files changed, 268 insertions(+), 361 deletions(-) delete mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs delete mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs delete mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcOpen.Inxton.TcoCore.Blazor.csproj b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcOpen.Inxton.TcoCore.Blazor.csproj index 56c193ff5..4a2d528a8 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcOpen.Inxton.TcoCore.Blazor.csproj +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcOpen.Inxton.TcoCore.Blazor.csproj @@ -24,6 +24,8 @@ + + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs deleted file mode 100644 index f9f83424f..000000000 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/IMongoLogger.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; - -using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; - -namespace TcoCore.TcoDiagnosticsAlternative.LoggingToDb -{ - public interface IMongoLogger - { - void LogMessage(PlainTcoMessage message); - bool MessageExistsInDatabase(PlainTcoMessage message); - List ReadMessages(); - PlainTcoMessage GetSimilarMessage(PlainTcoMessage message); - void UpdateMessages(ulong identity, DateTime timeStamp, DateTime timeStampAcknowledged, bool pinned); - } -} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs deleted file mode 100644 index 68f88a07a..000000000 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/LoggingToDb/MongoLogger.cs +++ /dev/null @@ -1,196 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using MongoDB.Bson; -using MongoDB.Driver; - -using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; - -namespace TcoCore.TcoDiagnosticsAlternative.LoggingToDb -{ - public class MongoLogger: IMongoLogger - { - private readonly IMongoClient _client; - private readonly IMongoCollection _collection; - public int MaxEntries { get; set; } - - public MongoLogger() - { - MaxEntries = TcoDiagnosticsAlternativeView.MaxDatabaseEntries; - _client = new MongoClient("mongodb://localhost:27017"); - var database = _client.GetDatabase("mydatabase"); - _collection = database.GetCollection("mycollection"); - - EnsureIndexes(); - } - - private void EnsureIndexes() - { - var indexExists = _collection.Indexes.List().ToList().Any(index => index["name"] == "Text_Source_Category_TimeStampAcknowledged"); - if (!indexExists) - { - var keys = Builders.IndexKeys - .Ascending("Text") - .Ascending("Source") - .Ascending("Category") - .Ascending("TimeStampAcknowledged"); - - _collection.Indexes.CreateOne(new CreateIndexModel(keys)); - } - } - - private FilterDefinition GetMessageFilter(PlainTcoMessage message) - { - return Builders.Filter.And( - Builders.Filter.Eq("TimeStamp", BsonValue.Create(message.TimeStamp)), - Builders.Filter.Eq("Raw", BsonValue.Create(message.Raw)), - Builders.Filter.Eq("Source", BsonValue.Create(message.Source)), - Builders.Filter.Eq("TimeStampAcknowledged", BsonNull.Value), - Builders.Filter.Eq("Identity", BsonValue.Create(message.Identity)), - Builders.Filter.Eq("Cycle", BsonValue.Create(message.Cycle)), - Builders.Filter.Eq("Category", BsonValue.Create(message.Category)) - ); - } - - public bool MessageExistsInDatabase(PlainTcoMessage message) - { - var filter = GetMessageFilter(message); - var result = _collection.Find(filter).FirstOrDefault(); - return result != null; - } - - - private void InsertMessage(PlainTcoMessage message) - { - // If the message doesn't exist, then proceed with saving it - var update = Builders.Update - .Set("Text", BsonValue.Create(message.Text)) - .Set("TimeStamp", BsonValue.Create(message.TimeStamp)) - .Set("TimeStampAcknowledged", BsonNull.Value) - .Set("Identity", BsonValue.Create(message.Identity)) - .Set("Text", BsonValue.Create(message.Text)) - .Set("Category", BsonValue.Create(message.Category)) - .Set("Cycle", BsonValue.Create(message.Cycle)) - .Set("PerCycleCount", BsonValue.Create(message.PerCycleCount)) - .Set("ExpectDequeing", BsonValue.Create(message.ExpectDequeing)) - .Set("Pinned", BsonValue.Create(message.Pinned)) - .Set("Location", BsonValue.Create(message.Location)) - .Set("Source", BsonValue.Create(message.Source)) - .Set("ParentsHumanReadable", BsonValue.Create(message.ParentsHumanReadable)) - .Set("Raw", BsonValue.Create(message.Raw)) - .Set("MessageDigest", BsonValue.Create((ulong)(message.MessageDigest))) - .Set("ParentsObjectSymbol", BsonValue.Create(message.ParentsObjectSymbol)); - - UpdateOptions options = new UpdateOptions { IsUpsert = true }; - var filter = GetMessageFilter(message); - _collection.UpdateOne(filter, update, options); - } - - - public void LogMessage(PlainTcoMessage message) - { - - if (string.IsNullOrEmpty(message.Text) || string.IsNullOrEmpty(message.Source)) - { - // Don't log the message - return; - } - - var existingMessage = GetSimilarMessage(message); - - if (existingMessage == null) - { - InsertMessage(message); - EnsureMaxEntries(); - } - } - - - public void UpdateMessages(ulong identity, DateTime timeStamp, DateTime timeStampAcknowledged, bool pinned) - { - // Define a filter to find messages with the given identity and where TimeStampAcknowledged is older than 1980 - var filter = Builders.Filter.And( - Builders.Filter.Eq("TimeStamp", BsonValue.Create(timeStamp)), - Builders.Filter.Eq("TimeStampAcknowledged", BsonNull.Value) - ); - - // Define the update operation - var update = Builders.Update - .Set("TimeStampAcknowledged", BsonValue.Create(timeStampAcknowledged.AddHours(1))) - .Set("Pinned", BsonValue.Create(pinned)); - - // Update all matching documents - _collection.UpdateMany(filter, update); - } - - private PlainTcoMessageExtended MapBsonToPlainTcoMessage(BsonDocument bsonMessage) - { - return new PlainTcoMessageExtended - { - TimeStamp = bsonMessage["TimeStamp"].IsBsonNull ? DateTime.MinValue : bsonMessage["TimeStamp"].ToUniversalTime(), - TimeStampAcknowledged = bsonMessage["TimeStampAcknowledged"].IsBsonNull ? (DateTime?)null : bsonMessage["TimeStampAcknowledged"].ToUniversalTime(), - Identity = (ulong)bsonMessage["Identity"].AsInt64, - Text = bsonMessage["Text"].AsString, - Category = (short)bsonMessage["Category"].AsInt32, - Cycle = (ulong)bsonMessage["Cycle"].AsInt64, - PerCycleCount = (byte)bsonMessage["PerCycleCount"].AsInt32, - ExpectDequeing = bsonMessage["ExpectDequeing"].AsBoolean, - Pinned = bsonMessage["Pinned"].AsBoolean, - Location = bsonMessage["Location"].AsString, - Source = bsonMessage["Source"].AsString, - ParentsHumanReadable = bsonMessage["ParentsHumanReadable"].AsString, - Raw = bsonMessage["Raw"].AsString, - MessageDigest = (uint)bsonMessage["MessageDigest"].AsInt64, - ParentsObjectSymbol = bsonMessage["ParentsObjectSymbol"].AsString - }; - } - - - public PlainTcoMessage GetSimilarMessage(PlainTcoMessage message) - { - var filter = Builders.Filter.And( - Builders.Filter.Eq("Text", BsonValue.Create(message.Text)), - Builders.Filter.Eq("Source", BsonValue.Create(message.Source)), - Builders.Filter.Eq("Category", BsonValue.Create(message.Category)), - Builders.Filter.Eq("TimeStampAcknowledged", BsonNull.Value) - ); - - var existingMessageBson = _collection.Find(filter).FirstOrDefault(); - return existingMessageBson != null ? MapBsonToPlainTcoMessage(existingMessageBson) : null; - } - - - public List ReadMessages() - { - var sort = Builders.Sort.Descending("TimeStamp"); - var messages = _collection.Find(new BsonDocument()).Sort(sort).Limit(1000).ToList(); - return messages.Select(MapBsonToPlainTcoMessage).ToList(); - } - - private void EnsureMaxEntries() - { - var currentCount = _collection.CountDocuments(new BsonDocument()); - - if (currentCount > MaxEntries) - { - var excessCount = currentCount - MaxEntries; - - // Find the oldest entries based on TimeStamp or any other relevant field - var oldestEntries = _collection.Find(new BsonDocument()) - .Sort(Builders.Sort.Ascending("TimeStamp")) // Assuming TimeStamp is the field you want to sort by - .Limit((int)excessCount) - .ToList(); - - foreach (var entry in oldestEntries) - { - _collection.DeleteOne(Builders.Filter.Eq("_id", entry["_id"])); - } - } - } - - } -} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs deleted file mode 100644 index 4983d3437..000000000 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/PlainTcoMessageExtended.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using TcoCore; - -namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping -{ - public class PlainTcoMessageExtended : PlainTcoMessage - { - public DateTime? TimeStampAcknowledged { get; set; } - } - } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 5766fd8c4..685d2009d 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -14,7 +14,7 @@ namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services { - public class DataService + public class DataService { private readonly IMongoDatabase _database; private readonly string _collectionName; @@ -60,7 +60,6 @@ public void ExtractIdentity() } } - public void OrderData() { CachedData = CachedData @@ -71,6 +70,11 @@ public void OrderData() } + public int GetCachedDataCount() + { + return CachedData?.Count() ?? 0; + } + } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index 2bc95fad0..f239773e5 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -5,12 +5,19 @@ using System.Timers; using Microsoft.AspNetCore.Components; - +using Vortex.Presentation; using MongoDB.Bson.Serialization; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; +using PlcDocu.TcoCore; + + +using TcOpen.Inxton; +using TcOpen.Inxton.Input; + + namespace TcoCore { @@ -23,19 +30,17 @@ public partial class TcoDiagnosticsAlternativeView [Inject] public DataCleanupService DataCleanupService { get; set; } - public static int MaxDatabaseEntries { get; set; } = 1000; - public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; - private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); - private static int _diagnosticsUpdateInterval { get; set; } = 100; - private Timer messageUpdateTimer; - private static int itemsPerPage { get; set; } = 20; - private int currentPage = 1; - - private IEnumerable MyData { get; set; } = new List(); - + //protected override void OnInitialized() + //{ + // ViewModel = new TcoDiagnosticsAlternativeViewModel(ViewModel._tcoObject, DataService); + // UpdateValuesOnChange(ViewModel._tcoObject); + // DiagnosticsUpdateTimer(); + //} protected override async Task OnInitializedAsync() { + //ViewModel = new TcoDiagnosticsAlternativeViewModel(ViewModel._tcoObject, DataService); + if (!BsonClassMap.IsClassMapRegistered(typeof(SenderProperties))) { BsonClassMap.RegisterClassMap(cm => @@ -45,36 +50,50 @@ protected override async Task OnInitializedAsync() }); } - UpdateValuesOnChange(ViewModel._tcoObject); DiagnosticsUpdateTimer(); } - private void DiagnosticsUpdateTimer() - { - if (messageUpdateTimer == null) - { - //Console.WriteLine("Initializing timer."); - messageUpdateTimer = new Timer(_diagnosticsUpdateInterval); - messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed; - messageUpdateTimer.AutoReset = true; - messageUpdateTimer.Enabled = true; - } - else - { - Console.WriteLine("Timer already initialized."); - } - } + //SetsUpdate Intervall via Consuming App + public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; + private static int _diagnosticsUpdateInterval { get; set; } = 100; + private Timer messageUpdateTimer; + + //private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); + public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; + + //Paging and Navigation + private static int itemsPerPage { get; set; } = 15; + private int currentPage = 1; + private int totalPages => (CachedDataCount + itemsPerPage - 1) / itemsPerPage; + public bool IsFirstDisabled => currentPage == 1; + public bool IsLastDisabled => currentPage == totalPages; + + //Data and Lists, Logs from db, Messages from Plc + private IEnumerable MongdoDbLogItemFiltered { get; set; } = new List(); + private List messages = new List(); + public int CachedDataCount { get; private set; } + + + //public string DiagnosticsMessage() => "Diag depth : " + DepthValue; + //public int MaxDiagnosticsDepth { get; set; } = 20; + //public static int _depthValue; + //public static int SetDefaultDepth(int item) => _depthValue = item; private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) { await InvokeAsync(async () => { + //DB Action await DataService.RefreshDataAsync(); + //Update plc Data + ViewModel.UpdateMessages(); + + CachedDataCount = DataService.GetCachedDataCount(); DataService.ExtractIdentity(); DataService.OrderData(); - MyData = DataService.CachedData + MongdoDbLogItemFiltered = DataService.CachedData .Where(m => m.Properties?.sender?.Payload != null) .OrderByDescending(m => m.TimeStampAcknowledged.HasValue ? 0 : 1) .ThenByDescending(m => m.TimeStampAcknowledged) @@ -83,86 +102,51 @@ await InvokeAsync(async () => StateHasChanged(); }); } + + public static void SetItemsPerPage(int value) + { + itemsPerPage = value; + } - //public static void SetMaxDatabaseEntries ( int value) - //{ - // MaxDatabaseEntries = value; - //} - - - //public static void SetItemsPerPage(int value) - //{ - // itemsPerPage = value; - //} - - //private void PreviousPage() - //{ - // if (currentPage > 1) - // { - // currentPage--; - // } - //} - - //private void NextPage() - //{ - // if (currentPage < totalPages) - // { - // currentPage++; - // } - //} - - //public void FirstPage() - //{ - // currentPage = 1; - //} - - //public void LastPage() - //{ - // currentPage = totalPages; - //} - - //public bool IsFirstDisabled => currentPage == 1; + private void PreviousPage() + { + if (currentPage > 1) + { + currentPage--; + } + } - //public bool IsLastDisabled => currentPage == totalPages; + private void NextPage() + { + if (currentPage < totalPages) + { + currentPage++; + } + } - + public void FirstPage() + { + currentPage = 1; + } - //private List messages = new List(); + public void LastPage() + { + currentPage = totalPages; + } - //private void OnNewMessageReceived(PlainTcoMessage newMessage) - //{ - // // Add the new message to the list and re-render the component - // messages.Add(newMessage); - // StateHasChanged(); - //} + private void OnNewMessageReceived(PlainTcoMessage newMessage) + { + // Add the new message to the list and re-render the component + messages.Add(newMessage); + StateHasChanged(); + } - //// Unsubscribe from the event when the component is disposed of + // Unsubscribe from the event when the component is disposed of //public void Dispose() //{ // ViewModel.NewMessageReceived -= OnNewMessageReceived; //} - //private void AckMessages() - //{ - // ViewModel.AcknowledgeMessages(); - // StateHasChanged(); - //} - - //public IEnumerable UniqueMessages() - //{ - // return ViewModel.DbMessageDisplay - // .Where(m => m.CategoryAsEnum >= MinMessageCategoryFilter) - // .GroupBy(m => new { m.Identity, m.Text, m.TimeStamp, m.Cycle }) - // .Select(g => g.FirstOrDefault()) - // .OrderByDescending(m => m.TimeStamp) - // .ThenByDescending(m => m.TimeStampAcknowledged.HasValue ? m.TimeStampAcknowledged.Value : DateTime.MinValue); - //} - - //public string DiagnosticsMessage() => "Diag depth : " + DepthValue; - //public int MaxDiagnosticsDepth { get; set; } = 20; - //public static int _depthValue; - //public static int SetDefaultDepth(int item) => _depthValue = item; - //public int DepthValue //{ // get @@ -200,5 +184,21 @@ await InvokeAsync(async () => //public int DbMessageDisplayCount => ViewModel.DbMessageDisplay?.Count() ?? 0; + private void DiagnosticsUpdateTimer() + { + if (messageUpdateTimer == null) + { + //Console.WriteLine("Initializing timer."); + messageUpdateTimer = new Timer(_diagnosticsUpdateInterval); + messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed; + messageUpdateTimer.AutoReset = true; + messageUpdateTimer.Enabled = true; + } + else + { + Console.WriteLine("Timer already initialized."); + } + } + } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index 99a062328..5b57e1037 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -1,12 +1,55 @@ @inherits RenderableViewModelComponentBase @using Blazm.Components -@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping @using Vortex.Presentation.Controls.Blazor.RenderableContent -@using static TcoCore.TcoDiagnosticsAlternativeViewModel @namespace TcoCore -@inject TcoDiagnosticsAlternativeViewModel ViewModel +@*@inject TcoDiagnosticsAlternativeViewModel ViewModel*@ +@ViewModel._tcoObject.MessageHandler.ActiveMessagesCount + + + + No messages found. + + + No messages found. + + + + + + + + + + + + + + + + @@ -18,10 +61,11 @@ + - @foreach (var message in MyData) + @foreach (var message in MongdoDbLogItemFiltered.Skip((currentPage -1)* itemsPerPage).Take(itemsPerPage).Take(itemsPerPage)) { @@ -31,11 +75,23 @@ + }
    PLC Logger Message Digest (Unique Hash) IdendityAction
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@message.Properties.sender.Payload.ParentSymbol @message.Properties.sender.Payload.MessageDigest @message.Properties.ExtractedIdentity + +
    +
    + + + Page @currentPage of @totalPages + + +
    diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs index 59a424046..97fb2b3cc 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs @@ -3,13 +3,14 @@ using System.Linq; using System.Threading.Tasks; -using MongoDB.Bson.Serialization; using MongoDB.Driver; using TcOpen.Inxton.Input; -using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; +using PlcDocu.TcoCore; +using Vortex.Connector; using Vortex.Presentation; @@ -17,11 +18,12 @@ namespace TcoCore { public class TcoDiagnosticsAlternativeViewModel : RenderableViewModelBase { - private readonly DataService _dataService; + + + IEnumerable messageDisplay = new List(); public TcoDiagnosticsAlternativeViewModel() { - } public TcoDiagnosticsAlternativeViewModel(DataService dataService) @@ -29,10 +31,11 @@ public TcoDiagnosticsAlternativeViewModel(DataService dataService) _dataService = dataService; } - //public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger) - //{ - // _logger = logger; - //} + public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject) + { + _tcoObject = tcoObject; + } + public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject, DataService dataService) { @@ -40,19 +43,17 @@ public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject, DataService dat _dataService = dataService; } - //public TcoDiagnosticsAlternativeViewModel(IMongoLogger logger, IsTcoObject tcoObject) - //{ - // _logger = logger; - // _tcoObject = tcoObject; - //} - - - public RelayCommand UpdateMessagesCommand { get; private set; } + //injected Service for Mongo Interaction + public readonly DataService _dataService; + private volatile object updatemutex = new object(); internal IsTcoObject _tcoObject { get; set; } - public override object Model { get => this._tcoObject; set => this._tcoObject = value as IsTcoObject; } + //public event Action NewMessageReceived; + + //public IVortexObject AffectedObject { get; set; } + public object Categories { get @@ -60,29 +61,81 @@ public object Categories return Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); } } - bool diagnosticsRunning; - public bool DiagnosticsRunning + /// + /// Gets list of messages to be displayed in message list of the view. + /// + public IEnumerable MessageDisplay { - get => diagnosticsRunning; - internal set + get => messageDisplay; + + private set { - if (diagnosticsRunning == value) + if (messageDisplay == value) { return; } - SetProperty(ref diagnosticsRunning, value); + + SetProperty(ref messageDisplay, value); } + } - ////======================== - //public event Action NewMessageReceived; - //private volatile object updatemutex = new object(); - //private HashSet activeMessages = new HashSet(); + /// + /// Updates messages of diagnostics view. + /// + internal void UpdateMessages() + { + if (DiagnosticsRunning) + { + return; + } + + lock (updatemutex) + { + DiagnosticsRunning = true; - + Task.Run(() => + { + if (_tcoObject != null && _tcoObject.MessageHandler != null) + { + MessageDisplay = _tcoObject.MessageHandler.GetActiveMessages(); + } + else + { + // Log an error or throw an exception indicating that _tcoObject or MessageHandler is null + } + }).Wait(); + + DiagnosticsRunning = false; + } + } + + public void RogerMessage(PlainTcoMessage msg) + { + if (msg != null) + { + msg.OnlinerMessage.Pinned.Cyclic = false; + } + } - //public void AcknowledgeMessages() + public void RogerAllMessages() + { + lock (updatemutex) + { + { + + foreach (var item in MessageDisplay.Where(p => p.Pinned)) + { + item.OnlinerMessage.Pinned.Cyclic = false; + } + + } + + } + } + public void AcknowledgeMessages() + { } //{ // try // { @@ -125,7 +178,8 @@ internal set // } //} - //public void AcknowledgeMessage(ulong identity) + public void AcknowledgeMessage(ulong? identity) + { } //{ // try // { @@ -216,6 +270,24 @@ internal set // } //} - + + bool diagnosticsRunning; + + /// + /// Gets or sets whether the diagnostic loop in running. + /// + public bool DiagnosticsRunning + { + get => diagnosticsRunning; + internal set + { + if (diagnosticsRunning == value) + { + return; + } + SetProperty(ref diagnosticsRunning, value); + } + } + } } \ No newline at end of file From 0892751aa2e8d27063e0821eb65129cd3dd04cff Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 4 Oct 2023 16:06:15 +0200 Subject: [PATCH 05/13] wip CheckActive Messages() needs work Acknowledge and Auto Ack if not active anymore --- .gitignore | 1 + .../Pages/DiagnosticsFromLogger.razor | 15 ---- .../PlcHammer.Hmi.Blazor.csproj | 1 + .../PlcHammer.Hmi.Blazor/Shared/NavMenu.razor | 5 -- .../PlcHammer.Hmi.Blazor/Startup.cs | 8 +- .../TcoDiagnostics/TcoDiagnosticsViewModel.cs | 13 ++-- .../Configure/MongoDbSettings.cs | 4 + .../Services/DataService.cs | 62 ++++++++++++++-- .../TcoDiagnosticsAlternativeView.cs | 73 ++++++++++++++----- .../TcoDiagnosticsAlternativeView.razor | 35 +++++++-- .../TcoDiagnosticsAlternativeViewModel.cs | 35 ++------- .../TcoObjectDiagnostics.cs | 1 - 12 files changed, 165 insertions(+), 88 deletions(-) delete mode 100644 src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor diff --git a/.gitignore b/.gitignore index 1aadab1dc..2978f2085 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,4 @@ nugets/ # VSCode .vscode/ +src/TcOpen.Hammer/Logs/log20230925.txt diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor deleted file mode 100644 index ee14e7289..000000000 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/DiagnosticsFromLogger.razor +++ /dev/null @@ -1,15 +0,0 @@ -@page "/diagnostics-from-logger" - - -tag - -@code { - - protected override void OnInitialized() - { - @* TcoDiagnosticsViewModel.SetDefaultCategory(eMessageCategory.Trace); - TcoDiagnosticsView.SetDefaultDepth(7); - TcoDiagnosticsView.SetDiagnosticsUpdateInterval(2500);*@ - base.OnInitialized(); - } -} diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/PlcHammer.Hmi.Blazor.csproj b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/PlcHammer.Hmi.Blazor.csproj index 936cf4542..5596bef9e 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/PlcHammer.Hmi.Blazor.csproj +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/PlcHammer.Hmi.Blazor.csproj @@ -14,6 +14,7 @@ + diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor index 054cbaa45..6b74a494c 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Shared/NavMenu.razor @@ -37,11 +37,6 @@ Diagnostics Alternative
    • - @*
  • - - Diagnostics Logger! - -
    • *@
  • Security diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs index bb3c3d5f3..55b10a093 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs @@ -99,7 +99,7 @@ public void ConfigureServices(IServiceCollection services) .WriteTo.MongoDBBson( databaseUrl: $"{MongoUri}/{DatabaseName}", collectionName: $"{CollectionName}" - ).Enrich.WithProperty("user",SecurityManager.Manager.Principal.Identity.Name) + ).Enrich.WithProperty("user", SecurityManager.Manager.Principal.Identity.Name) .Enrich.With(new Serilog.Enrichers.EnvironmentNameEnricher()) .Enrich.With(new Serilog.Enrichers.EnvironmentUserNameEnricher()) .Enrich.With(new Serilog.Enrichers.MachineNameEnricher()) @@ -109,9 +109,9 @@ public void ConfigureServices(IServiceCollection services) services.Configure(Configuration.GetSection("MongoDbSettings")); services.AddTransient(); - services.AddSingleton< DataCleanupService>(); - services.AddTransient(); + services.AddSingleton(); } + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) @@ -145,7 +145,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) }); Entry.PlcHammer.Connector.BuildAndStart(); - Entry.PlcHammer.TECH_MAIN._app._logger.StartLoggingMessages(TcoCore.eMessageCategory.Info); + Entry.PlcHammer.TECH_MAIN._app._logger.StartLoggingMessages(TcoCore.eMessageCategory.All); } private static void SetUpRepositories(IRepository processRecipiesRepository, diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs index 769594568..959f5fb3e 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs @@ -18,14 +18,17 @@ public class TcoDiagnosticsViewModel : RenderableViewModelBase public TcoDiagnosticsViewModel() { + Console.WriteLine("Default constructor called TcoDiagnosticsViewModel"); this.UpdateMessagesCommand = new RelayCommand(a => this.UpdateMessages(), (x) => !this.DiagnosticsRunning); } - public TcoDiagnosticsViewModel(IsTcoObject tcoObject) - { - _tcoObject = tcoObject; - this.UpdateMessagesCommand = new RelayCommand(a => this.UpdateMessages(), (x) => !this.DiagnosticsRunning); - } + //This is actually never called, so we could remove it + //public TcoDiagnosticsViewModel(IsTcoObject tcoObject) + //{ + // _tcoObject = tcoObject; + // Console.WriteLine("tcoObject constructor called TcoDiagnosticsViewModel"); + // this.UpdateMessagesCommand = new RelayCommand(a => this.UpdateMessages(), (x) => !this.DiagnosticsRunning); + //} /// /// Gets the command that executes update of messages on demand. /// diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs index dcb1ace8f..a8159b902 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Configure/MongoDbSettings.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,8 +9,11 @@ namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Configure { public class MongoDbSettings { + [Required] public string MongoUri { get; set; } + [Required] public string DatabaseName { get; set; } + [Required] public string CollectionName { get; set; } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 685d2009d..07f6afc28 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -27,6 +27,7 @@ public DataService(IOptions settings) } public IEnumerable CachedData { get; set; } + public IEnumerable CachedDataEntriesToUpdate { get; set; } private async Task> GetDataAsync() { @@ -39,6 +40,13 @@ public async Task RefreshDataAsync() CachedData = await GetDataAsync(); } + private void FilterDataEntriesToUpdate() + { + CachedDataEntriesToUpdate = CachedData + .Where(item => item.TimeStampAcknowledged == null) + .ToList(); + } + public void ExtractIdentity() { var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); @@ -60,16 +68,58 @@ public void ExtractIdentity() } } - public void OrderData() + public async Task UpdateAllMessagesInDb() { - CachedData = CachedData - .OrderByDescending(item => item.TimeStampAcknowledged.HasValue ? 0 : 1) // Nulls first - .ThenByDescending(item => item.UtcTimeStamp) - .ThenByDescending(item => item.TimeStampAcknowledged) - .ToList(); + // Filter the CachedData for entries where TimeStampAcknowledged is null + FilterDataEntriesToUpdate(); + + DateTime timeStampAcknowledged = DateTime.UtcNow; + + // Get the collection + var collection = _database.GetCollection(_collectionName); + + // Build the update definition + var update = Builders.Update + .Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + + // Apply the update to all matching documents in the database + var filter = Builders.Filter.Eq(item => item.TimeStampAcknowledged, null); + await collection.UpdateManyAsync(filter, update); } + + public async Task UpdateMessageInDb(ulong? identity, int messageDigest) + { + FilterDataEntriesToUpdate(); + + var entriesToUpdate = CachedDataEntriesToUpdate + .Where(item => item.Properties.ExtractedIdentity == identity + && item.Properties.sender.Payload.MessageDigest == messageDigest) + .ToList(); + + DateTime timeStampAcknowledged = DateTime.UtcNow; + // Update the TimeStampAcknowledged field for each matching entry + foreach (var entry in entriesToUpdate) + { + entry.TimeStampAcknowledged = timeStampAcknowledged; + } + + // Get the collection + var collection = _database.GetCollection(_collectionName); + + // Build the update definition + var update = Builders.Update + .Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + + // Apply the update to each matching document in the database + foreach (var entry in entriesToUpdate) + { + var filter = Builders.Filter.Eq(item => item.Id, entry.Id); + await collection.UpdateOneAsync(filter, update); + } + } + public int GetCachedDataCount() { return CachedData?.Count() ?? 0; diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index f239773e5..8eba8b5a0 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -30,17 +30,11 @@ public partial class TcoDiagnosticsAlternativeView [Inject] public DataCleanupService DataCleanupService { get; set; } - //protected override void OnInitialized() - //{ - // ViewModel = new TcoDiagnosticsAlternativeViewModel(ViewModel._tcoObject, DataService); - // UpdateValuesOnChange(ViewModel._tcoObject); - // DiagnosticsUpdateTimer(); - //} - protected override async Task OnInitializedAsync() { - //ViewModel = new TcoDiagnosticsAlternativeViewModel(ViewModel._tcoObject, DataService); - + // IsTcoObject tcoObject; + //ViewModel = new TcoObjectDiagnosticsAlternativeViewModel(tcoObject, DataService); + if (!BsonClassMap.IsClassMapRegistered(typeof(SenderProperties))) { BsonClassMap.RegisterClassMap(cm => @@ -55,6 +49,7 @@ protected override async Task OnInitializedAsync() DiagnosticsUpdateTimer(); } + public DateTime timetest { get; set; } = DateTime.UtcNow; //SetsUpdate Intervall via Consuming App public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; private static int _diagnosticsUpdateInterval { get; set; } = 100; @@ -75,7 +70,6 @@ protected override async Task OnInitializedAsync() private List messages = new List(); public int CachedDataCount { get; private set; } - //public string DiagnosticsMessage() => "Diag depth : " + DepthValue; //public int MaxDiagnosticsDepth { get; set; } = 20; //public static int _depthValue; @@ -92,17 +86,50 @@ await InvokeAsync(async () => CachedDataCount = DataService.GetCachedDataCount(); DataService.ExtractIdentity(); - DataService.OrderData(); - MongdoDbLogItemFiltered = DataService.CachedData - .Where(m => m.Properties?.sender?.Payload != null) - .OrderByDescending(m => m.TimeStampAcknowledged.HasValue ? 0 : 1) - .ThenByDescending(m => m.TimeStampAcknowledged) - .ThenByDescending(m => m.UtcTimeStamp); - + MongdoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData); StateHasChanged(); }); } - + + public async Task AcknowledgeAllMessages() + { + try + { + + await DataService.UpdateAllMessagesInDb(); + + foreach (var item in DataService.CachedDataEntriesToUpdate) + { + TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = ViewModel._tcoObject.HumanReadable, rootSymbol = ViewModel._tcoObject.Symbol }); + } + //await DataService.UpdateMessageInDb(identity, messageDigest); + } + catch (System.Exception ex) + { + Console.WriteLine(ex.ToString()); + } + } + + public async Task AcknowledgeMessage(ulong? identity, int messageDigest) + { + try + { + await DataService.UpdateMessageInDb(identity, messageDigest); + } + catch (System.Exception ex) + { + Console.WriteLine(ex.ToString()); + } + } + + private IEnumerable CheckActiveMessages() + { + foreach (var item in DataService.CachedDataEntriesToUpdate + .Where(item => item.Properties.ExtractedIdentity == ViewModel.MessageDisplay.Identity && item.MessageDig){ + + } + } + public static void SetItemsPerPage(int value) { itemsPerPage = value; @@ -141,6 +168,16 @@ private void OnNewMessageReceived(PlainTcoMessage newMessage) StateHasChanged(); } + private IEnumerable OrderMongoDbLogItems(IEnumerable items) + { + return items + .Where(m => m.Properties?.sender?.Payload != null) + .OrderByDescending(m => m.TimeStampAcknowledged.HasValue ? 0 : 1) + .ThenByDescending(m => m.UtcTimeStamp) + .ThenByDescending(m => m.TimeStampAcknowledged); + } + + // Unsubscribe from the event when the component is disposed of //public void Dispose() //{ diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index 5b57e1037..e5c6fd841 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -1,13 +1,15 @@ -@inherits RenderableViewModelComponentBase +@*@inherits RenderableViewModelComponentBase*@ +@inherits RenderableViewModelComponentBase + @using Blazm.Components @using Vortex.Presentation.Controls.Blazor.RenderableContent @namespace TcoCore -@*@inject TcoDiagnosticsAlternativeViewModel ViewModel*@ @ViewModel._tcoObject.MessageHandler.ActiveMessagesCount +

    The current time is: @timetest.ToString(("MM/dd/yyyy HH:mm:ss"))

    - +@* No messages found. @@ -49,7 +51,25 @@ - +*@ + +
    + @*
    + +
    *@ +
    + +
    + @*
    + + @DiagnosticsMessage() +
    *@ +
    @@ -60,7 +80,7 @@ - + @@ -68,15 +88,16 @@ @foreach (var message in MongdoDbLogItemFiltered.Skip((currentPage -1)* itemsPerPage).Take(itemsPerPage).Take(itemsPerPage)) { + @*1h behind date in summertime, 12.51 displayed, time shows on PC 13.51, utcnow 11.51*@ - + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs index 97fb2b3cc..264f39167 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs @@ -12,40 +12,19 @@ using PlcDocu.TcoCore; using Vortex.Connector; using Vortex.Presentation; - +using Microsoft.AspNetCore.Components; namespace TcoCore { public class TcoDiagnosticsAlternativeViewModel : RenderableViewModelBase { - - IEnumerable messageDisplay = new List(); public TcoDiagnosticsAlternativeViewModel() { + //Console.WriteLine("Default constructor called"); } - public TcoDiagnosticsAlternativeViewModel(DataService dataService) - { - _dataService = dataService; - } - - public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject) - { - _tcoObject = tcoObject; - } - - - public TcoDiagnosticsAlternativeViewModel(IsTcoObject tcoObject, DataService dataService) - { - _tcoObject = tcoObject; - _dataService = dataService; - } - - //injected Service for Mongo Interaction - public readonly DataService _dataService; - private volatile object updatemutex = new object(); internal IsTcoObject _tcoObject { get; set; } public override object Model { get => this._tcoObject; set => this._tcoObject = value as IsTcoObject; } @@ -134,8 +113,8 @@ public void RogerAllMessages() } } - public void AcknowledgeMessages() - { } + //public void AcknowledgeMessages() + //{ } //{ // try // { @@ -178,8 +157,10 @@ public void AcknowledgeMessages() // } //} - public void AcknowledgeMessage(ulong? identity) - { } + //public void AcknowledgeMessage(ulong? identity, int messageDigest) + //{ + // //_dataService.UpdateMessage(identity, messageDigest); + //} //{ // try // { diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs index f1b9bd458..eba2e60a5 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoObjectDiagnostics.cs @@ -13,6 +13,5 @@ public class TcoObjectDiagnosticsAlternativeViewModel : TcoDiagnosticsAlternativ { public TcoObjectDiagnosticsAlternativeViewModel() : base() { } - public TcoObjectDiagnosticsAlternativeViewModel(DataService dataService) : base(dataService) { } } } From dd6735d5e9a2222bf643db43b4629d105007e053 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 9 Oct 2023 12:06:43 +0200 Subject: [PATCH 06/13] wip --- .../TcoDiagnostics/TcoDiagnosticsViewModel.cs | 1 - .../Mapping/MongoDbLogItem.cs | 3 +- .../Services/DataService.cs | 204 ++++++++++++++---- .../TcoDiagnosticsAlternativeView.cs | 68 +++--- .../TcoDiagnosticsAlternativeView.razor | 10 +- 5 files changed, 211 insertions(+), 75 deletions(-) diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs index 959f5fb3e..c185c8daf 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs @@ -18,7 +18,6 @@ public class TcoDiagnosticsViewModel : RenderableViewModelBase public TcoDiagnosticsViewModel() { - Console.WriteLine("Default constructor called TcoDiagnosticsViewModel"); this.UpdateMessagesCommand = new RelayCommand(a => this.UpdateMessages(), (x) => !this.DiagnosticsRunning); } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs index 2161a80ca..0f6ee7e29 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs @@ -83,8 +83,9 @@ public class MessageProperties public class PayloadProperties { public string rootObject { get; set; } - public string rootSymbol { get; set; } + [BsonExtraElements] + public IDictionary ExtraElements { get; set; } } public class SenderProperties diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 07f6afc28..39d41730c 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -10,6 +10,8 @@ using MongoDB.Bson; using MongoDB.Driver; +using TcoCore; + using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services @@ -40,54 +42,66 @@ public async Task RefreshDataAsync() CachedData = await GetDataAsync(); } - private void FilterDataEntriesToUpdate() + public async Task UpdateAllMessagesInDb(List msg) { - CachedDataEntriesToUpdate = CachedData - .Where(item => item.TimeStampAcknowledged == null) - .ToList(); - } + DateTime timeStampAcknowledged = DateTime.UtcNow; - public void ExtractIdentity() - { - var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); - foreach (var item in CachedData) + var collection = _database.GetCollection(_collectionName); + + var update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + + var bulkOps = new List>(); + + foreach (var item in CategorizedMessages.NonActiveMessages) { - var match = regex.Match(item.RenderedMessage); - if (match.Success) - { - var identityString = match.Groups[1].Value; - if (ulong.TryParse(identityString, out ulong identity)) - { - item.Properties.ExtractedIdentity = (ulong)identity; // Cast to long if necessary - } - else - { - Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log - } - } + var filter = Builders.Filter.Eq(i => i.Id, item.Id); + var updateOne = new UpdateOneModel(filter, update); + bulkOps.Add(updateOne); } - } - public async Task UpdateAllMessagesInDb() + if (bulkOps.Any()) + { + await collection.BulkWriteAsync(bulkOps); + } + } + public async Task TryAcknowledgeAllMessages(IEnumerable messageDisplay) { - // Filter the CachedData for entries where TimeStampAcknowledged is null - FilterDataEntriesToUpdate(); - - DateTime timeStampAcknowledged = DateTime.UtcNow; + if (CategorizedMessages == null) + { + CategorizeMessages(messageDisplay.ToList()); + } - // Get the collection - var collection = _database.GetCollection(_collectionName); + List messagesToUpdate = new List(); - // Build the update definition - var update = Builders.Update - .Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + foreach (var messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) + { + // Check the messageDisplay for the same identity + var activeMessage = messageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Properties?.ExtractedIdentity); + bool isActive = false; - // Apply the update to all matching documents in the database - var filter = Builders.Filter.Eq(item => item.TimeStampAcknowledged, null); - await collection.UpdateManyAsync(filter, update); - } + if (activeMessage != null) + { + activeMessage.OnlinerMessage.Pinned.Cyclic = false; + await PurgeNewerSimilarMessages(); + await Task.Delay(1); // Replacing Thread.Sleep with Task.Delay for async methods + isActive = activeMessage.OnlinerMessage.IsActive; + } + if (!isActive) + { + messagesToUpdate.Add(activeMessage); + } + else + { + Console.WriteLine($"Message Still Active {activeMessage}"); + } + } + if (messagesToUpdate.Any()) + { + await UpdateAllMessagesInDb(messagesToUpdate); + } + } public async Task UpdateMessageInDb(ulong? identity, int messageDigest) { @@ -98,7 +112,8 @@ public async Task UpdateMessageInDb(ulong? identity, int messageDigest) && item.Properties.sender.Payload.MessageDigest == messageDigest) .ToList(); - DateTime timeStampAcknowledged = DateTime.UtcNow; + //Problems with Dotnet5 and Logging + DateTime timeStampAcknowledged = DateTime.UtcNow.AddHours(1); // Update the TimeStampAcknowledged field for each matching entry foreach (var entry in entriesToUpdate) { @@ -120,6 +135,119 @@ public async Task UpdateMessageInDb(ulong? identity, int messageDigest) } } + public async Task AutoAckNonPinnedMessages(IEnumerable messages) + { + foreach (var message in CategorizedMessages.NonActiveMessages.Where(m => m != null)) + { + ulong? identity = message.Properties?.ExtractedIdentity; + int? messageDigest = message.Properties?.sender?.Payload?.MessageDigest; + if (identity.HasValue && messageDigest.HasValue) + { + await UpdateMessageInDb(identity, messageDigest.Value); + } + } + } + + public async Task PurgeNewerSimilarMessages() + { + var collection = _database.GetCollection(_collectionName); + + foreach (var unacknowledgedMessage in CachedDataEntriesToUpdate) + { + // 2. For each of these messages, find newer similar messages based on identity and digest in the cache + var newerIdenticalMessages = CachedDataEntriesToUpdate.Where(m => + m.Properties.ExtractedIdentity == unacknowledgedMessage.Properties.ExtractedIdentity && + m.Properties.sender.Payload.MessageDigest == unacknowledgedMessage.Properties.sender.Payload.MessageDigest && + m.UtcTimeStamp > unacknowledgedMessage.UtcTimeStamp).ToList(); + + if (newerIdenticalMessages.Any()) + { + // 3. Delete these newer similar messages from the database + var filter = Builders.Filter.In(m => m.Id, newerIdenticalMessages.Select(x => x.Id)); + await collection.DeleteManyAsync(filter); + Console.WriteLine($"Purged {newerIdenticalMessages.Count} duplicates for {unacknowledgedMessage.MessageTemplate.Text}"); + } + } + } + + public async void FilterDataEntriesToUpdate() + { + CachedDataEntriesToUpdate = CachedData + .Where(item => item.TimeStampAcknowledged == null) + .ToList(); + await PurgeNewerSimilarMessages(); + } + + public void ExtractIdentity() + { + var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); + foreach (var item in CachedData) + { + var match = regex.Match(item.RenderedMessage); + if (match.Success) + { + var identityString = match.Groups[1].Value; + if (ulong.TryParse(identityString, out ulong identity)) + { + item.Properties.ExtractedIdentity = (ulong)identity; // Cast to long if necessary + } + else + { + Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log + } + } + } + } + + public class MessageResult + { + public IEnumerable NonActiveMessages { get; set; } + //public IEnumerable NonActiveMessagesPinned { get; set; } + public IEnumerable ActiveMessages { get; set; } + public IEnumerable ActiveMessagesPinned { get; set; } + } + + public MessageResult CategorizedMessages { get; set; } + + //Categorizes Messages depending on + // if active in DB, and not in Plc => it shall Acknowledge them + // if active in DB and in PLC => Ignore + // if Pinned or not + public void CategorizeMessages(List msg) + { + var nonActiveInMessages = new List(); + var activeInMessages = new List(); + var activeInMessagesPinned = new List(); + + foreach (var item in CachedDataEntriesToUpdate) + { + var matchingMessage = msg.FirstOrDefault(m => + m.Identity == item.Properties?.ExtractedIdentity && + m.MessageDigest == item.Properties?.sender?.Payload?.MessageDigest); + + if (matchingMessage == null) + { + nonActiveInMessages.Add(item); + } + else if (matchingMessage.OnlinerMessage.Pinned.Cyclic == true) + { + activeInMessagesPinned.Add(item); + } + else + { + activeInMessages.Add(item); + } + } + + CategorizedMessages = new MessageResult + { + NonActiveMessages = nonActiveInMessages, + ActiveMessages = activeInMessages, + ActiveMessagesPinned = activeInMessagesPinned + }; + } + + public int GetCachedDataCount() { return CachedData?.Count() ?? 0; diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index 8eba8b5a0..b3cfa6ad6 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -23,18 +23,23 @@ namespace TcoCore { public partial class TcoDiagnosticsAlternativeView { - + /// + /// DataService connects to the Mongo Database, given from the Blazor Context Manager + /// It is responsible for Fetching, Updating, Filtering and so on + /// [Inject] public DataService DataService { get; set; } + /// + /// DataCleanupService is responsible for limiting the entries to 5000 logs + /// [Inject] public DataCleanupService DataCleanupService { get; set; } protected override async Task OnInitializedAsync() { - // IsTcoObject tcoObject; - //ViewModel = new TcoObjectDiagnosticsAlternativeViewModel(tcoObject, DataService); - + //Necessary for the Deserialization of the BSON Log Entries, + //because there are different structures of Json Objects, which are handled differently if (!BsonClassMap.IsClassMapRegistered(typeof(SenderProperties))) { BsonClassMap.RegisterClassMap(cm => @@ -49,17 +54,20 @@ protected override async Task OnInitializedAsync() DiagnosticsUpdateTimer(); } - public DateTime timetest { get; set; } = DateTime.UtcNow; - //SetsUpdate Intervall via Consuming App + public DateTime timetest { get; set; } = DateTime.Now; + + /// + /// SetsUpdate Intervall via Consuming App + /// public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; - private static int _diagnosticsUpdateInterval { get; set; } = 100; + private static int _diagnosticsUpdateInterval { get; set; } = 300; private Timer messageUpdateTimer; //private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; //Paging and Navigation - private static int itemsPerPage { get; set; } = 15; + private static int itemsPerPage { get; set; } = 20; private int currentPage = 1; private int totalPages => (CachedDataCount + itemsPerPage - 1) / itemsPerPage; public bool IsFirstDisabled => currentPage == 1; @@ -85,24 +93,35 @@ await InvokeAsync(async () => ViewModel.UpdateMessages(); CachedDataCount = DataService.GetCachedDataCount(); - DataService.ExtractIdentity(); MongdoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData); + DataService.ExtractIdentity(); + DataService.FilterDataEntriesToUpdate(); + DataService.CategorizeMessages(ViewModel.MessageDisplay.ToList()); + await DataService.PurgeNewerSimilarMessages(); + await DataService.AutoAckNonPinnedMessages(ViewModel.MessageDisplay); + StateHasChanged(); }); } + //there is a big problem, which leads to alot of complicated stuff that + // there is not real possibility of knowing, when a Message is still active. + // Not the Property IsActive or anything else, in the TcoDiagnostics Component it gets solved without + // just setting Pinned to false, and displaying the new Message. + // i do not like that, several reasons. => then the origin Timestamp is wrong, Cycle is wrong. + // but my understanding is, as long as the Error Cause is active, the Messages shall remain untouched. + // Problem now, when i set pinned to false, and check which Messages still occur, the Logger creates new Logs. + // => my Solution is, to have a Purge Method(), which purges from my DB newer Messages, when the Origin Error Message is not Acknowledged + public async Task AcknowledgeAllMessages() { try { - - await DataService.UpdateAllMessagesInDb(); - - foreach (var item in DataService.CachedDataEntriesToUpdate) - { - TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = ViewModel._tcoObject.HumanReadable, rootSymbol = ViewModel._tcoObject.Symbol }); - } - //await DataService.UpdateMessageInDb(identity, messageDigest); + await DataService.TryAcknowledgeAllMessages(ViewModel.MessageDisplay); + //foreach (var item in DataService.CachedDataEntriesToUpdate) + //{ + //TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = ViewModel._tcoObject.HumanReadable, rootSymbol = ViewModel._tcoObject.Symbol }); + //} } catch (System.Exception ex) { @@ -122,14 +141,6 @@ public async Task AcknowledgeMessage(ulong? identity, int messageDigest) } } - private IEnumerable CheckActiveMessages() - { - foreach (var item in DataService.CachedDataEntriesToUpdate - .Where(item => item.Properties.ExtractedIdentity == ViewModel.MessageDisplay.Identity && item.MessageDig){ - - } - } - public static void SetItemsPerPage(int value) { itemsPerPage = value; @@ -178,7 +189,7 @@ private IEnumerable OrderMongoDbLogItems(IEnumerable OrderMongoDbLogItems(IEnumerable DefaultCategory = item; //public static eMessageCategory DefaultCategory { get; set; } = eMessageCategory.All; - //public int UniqueMessagesCount => uniqueMessages?.Count ?? 0; - - //public int DbMessageDisplayCount => ViewModel.DbMessageDisplay?.Count() ?? 0; - + private void DiagnosticsUpdateTimer() { if (messageUpdateTimer == null) diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index e5c6fd841..3c6cdc5a1 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -63,7 +63,7 @@ *@
    - +
    @*
    @@ -79,8 +79,8 @@
    - - + @* + *@ @@ -94,8 +94,8 @@ - - + @* + *@ - + @@ -40,6 +48,9 @@ + } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs index ef0391af1..5234ae9a7 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs @@ -15,13 +15,15 @@ public partial class ActiveMessages [Parameter] public int MaxDiagnosticsDepth { get; set; } - - //[Parameter] - //public string DiagnosticsMessage { get; set; } + + [Parameter] + public int InitalDepthValue { get; set; } [Parameter] public int DepthValue { get; set; } + [Parameter] + public int DepthValueThreshold { get; set; } //[Parameter] //public Func AcknowledgeMessageCallback { get; set; } @@ -37,14 +39,8 @@ public partial class ActiveMessages [Parameter] public eMessageCategory InitialCategory { get; set; } - public eMessageCategory DropdownSelectedCategory - { - get => _dropdownSelectedCategory; - set => _dropdownSelectedCategory = value; - } + private eMessageCategory DropDownSelectedCategory { get; set; } - - private eMessageCategory _dropdownSelectedCategory; private int _itemsPerPage = 6; int _currentPage = 1; int _totalPages = 10; @@ -52,29 +48,29 @@ public eMessageCategory DropdownSelectedCategory protected override async Task OnInitializedAsync() { - if (_dropdownSelectedCategory == default(eMessageCategory)) - { - _dropdownSelectedCategory = InitialCategory; - } + + DropDownSelectedCategory = InitialCategory; + DepthValue = InitalDepthValue; await GetDataFilteredAsync(); } - // Called from Parent? protected override async Task OnParametersSetAsync() { await GetDataFilteredAsync(); + await AutoAcknowledgeMessages(_messagesToDisplay); } public async Task GetDataFilteredAsync() { DateTime? startDate = DateTime.Now.AddDays(-7); // Example: 7 days ago - DateTime? endDate = DateTime.Now; + DateTime? endDate = DateTime.Now; string keyword = ""; - eMessageCategory category = _dropdownSelectedCategory; // Example category + eMessageCategory category = DropDownSelectedCategory; // Example category + int _depthValue = DepthValue; - var result = await DataService.GetDataGetDataAsyncForActive(_itemsPerPage,_currentPage, category,startDate, endDate, keyword); + var result = await DataService.GetDataAsycForActive(_itemsPerPage, _currentPage, category, _depthValue, startDate, endDate, keyword); List filteredItems = result.messages; long totalCount = result.count; @@ -82,5 +78,26 @@ public async Task GetDataFilteredAsync() _messagesToDisplay = result.messages; } + private async Task AutoAcknowledgeMessages(IEnumerable messages) + { + await DataService.TryAutoAcknowledgeMessages(messages); + } + + private async Task AcknowledgeMessages(IEnumerable messages) + { + await DataService.AcknowledgeAllMessages(messages); + } + + public async Task AcknowledgeMessage(ulong? identity, int messageDigest) + { + try + { + //await DataService.AcknowledgeSingleMessage(identity, messageDigest, ViewModel.MessageDisplay); + } + catch (System.Exception ex) + { + Console.WriteLine(ex.ToString()); + } + } } } \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css new file mode 100644 index 000000000..0cad5670b --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css @@ -0,0 +1,37 @@ +/* Button styling */ +/*button { + background-color: #004a8f;*/ /* Darker blue color */ + /*color: #ffffff;*/ /* White text color */ + /*padding: 5px 10px;*/ /* Padding for top/bottom and left/right */ + /*border: none;*/ /* Remove default border */ + /*border-radius: 5px;*/ /* Subtly rounded corners */ + /*box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);*/ /* Shadow effect */ + /*cursor: pointer;*/ /* Hand cursor on hover */ + /*transition: all 0.3s ease;*/ /* Transition effect for hover state */ +/*}*/ + + /* Hover effect for the button */ + /*button:hover { + background-color: #003366;*/ /* Even darker blue color on hover */ + /*box-shadow: 0 6px 8px rgba(0, 0, 0, 0.2);*/ /* Increased shadow on hover */ + /*} + + button:focus { + outline: none; + box-shadow: none; + background-color: #004a8f; + color: #ffffff;*/ /* White text color */ + /*} + + button:active { + transform: scale(0.98);*/ /* Slightly reduce the size of the button */ + /*box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);*/ /* Reduced shadow when pressed */ + /*} + +.disabled-button { + background-color: #cccccc;*/ /* Grey background */ + /*color: #666666;*/ /* Darker grey text */ + /*cursor: not-allowed;*/ /* No action cursor */ + /*pointer-events: none;*/ /* Disable click events */ +/*}*/ + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor index 0918d5e36..90db1e9f7 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor @@ -1,86 +1,62 @@ -@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping + +@using MongoDB.Bson +@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping @using global::TcoCore -

    ArchivedMessages

    +@using BlazorStrap + +

    ArchiveMessages

    + + + + + + + @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) + { + + } + + + + Depth Value: @DepthValue + + + + + + + +     + + + + + + + + + + + @if (_messagesToDisplayArchive != null) + { + @foreach (var message in _messagesToDisplayArchive) + { + + + + + + + + + } + } + + + + -
    - @ActiveMessagesCount -
    - -
    -
    - -
    -
    - - @DiagnosticsMessage -
    -
    -
    Archive
    -
    Rendered Message PLC Logger Message Digest (Unique Hash)IdendityIdentity Action
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString(("MM/dd/yyyy HH:mm:ss")) : "") @message.Level @message.Properties.sender.Payload.Raw @message.Properties.sender.Payload.ParentSymbol @message.Properties.sender.Payload.MessageDigest @message.Properties.ExtractedIdentity - Fehler Category Rendered Message PLC LoggerMessage Digest (Unique Hash)IdentityMessage Digest (Unique Hash)IdentityAction
    @message.Level @message.Properties.sender.Payload.Raw @message.Properties.sender.Payload.ParentSymbol@message.Properties.sender.Payload.MessageDigest@message.Properties.ExtractedIdentity@message.Properties.sender.Payload.MessageDigest@message.Properties.ExtractedIdentity + +
    + + @DiagnosticsMessage +
    + + + + + + + + + + + + + + + + @foreach (var message in MongoDbLogItemsFiltered.Where(m => !m.TimeStampAcknowledged.HasValue)) + { + string rowColorClass = MessageCategoryMapper.GetBackgroundColorForCategory(message?.Level ?? default); + + + + + + + + + + } + +
    PLC TimestampTimestamp AcknowledgedFehler CategoryRendered MessagePLC LoggerFixiertAction
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : "")@((MarkupString)MessageCategoryMapper.GetIconForLevel(message.Level))@message.Properties.sender.Payload.Raw@message.Properties.sender.Payload.ParentSymbol@GetMessageStatusPinned(message) + +
    + +@code { + [Parameter] public IEnumerable MongoDbLogItemsFiltered { get; set; } + [Parameter] public int MaxDiagnosticsDepth { get; set; } + [Parameter] public IEnumerable EMessageCategories { get; set; } + [Parameter] public string DiagnosticsMessage { get; set; } + [Parameter] public int DepthValue { get; set; } + [Parameter] public Func AcknowledgeMessageCallback { get; set; } + [Parameter] public Func AcknowledgeAllMessages { get; set; } + [Parameter] public string ActiveMessagesCount { get; set; } + [Parameter] public Func GetMessageStatusPinned { get; set; } + + [Parameter] public eMessageCategory MinMessageCategoryFilter { get; set; } + [Parameter] public EventCallback MinMessageCategoryFilterChanged { get; set; } + + private async Task OnMinMessageCategoryFilterChanged(eMessageCategory newValue) + { + MinMessageCategoryFilter = newValue; + await MinMessageCategoryFilterChanged.InvokeAsync(newValue); + } + +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor new file mode 100644 index 000000000..0918d5e36 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor @@ -0,0 +1,86 @@ +@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping +@using global::TcoCore +

    ArchivedMessages

    + + + +
    + @ActiveMessagesCount +
    + +
    +
    + +
    +
    + + @DiagnosticsMessage +
    +
    + +
    Archive
    + + + + + + + + + + + + @foreach (var message in MongoDbLogItemsFiltered.Where(m => m.TimeStampAcknowledged.HasValue)) + { + + + + + + + + } + +
    PLC TimestampTimestamp AcknowledgedFehler CategoryRendered MessagePLC Logger
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString(("MM/dd/yyyy HH:mm:ss")) : "")@((MarkupString)MessageCategoryMapper.GetIconForLevel(message.Level))@message.Properties.sender.Payload.Raw@message.Properties.sender.Payload.ParentSymbol
    + +
    + + + Page @CurrentPage of @TotalPages + + +
    + + +@code { + [Parameter] public IEnumerable MongoDbLogItemsFiltered { get; set; } + [Parameter] public int CurrentPage { get; set; } + [Parameter] public int TotalPages { get; set; } + [Parameter] public bool IsFirstDisabled { get; set; } + [Parameter] public bool IsLastDisabled { get; set; } + [Parameter] public Func FirstPage { get; set; } + [Parameter] public Func PreviousPage { get; set; } + [Parameter] public Func NextPage { get; set; } + [Parameter] public Func LastPage { get; set; } + [Parameter] public Func AcknowledgeMessageCallback { get; set; } + [Parameter] public Func AcknowledgeAllMessages { get; set; } + [Parameter] public string ActiveMessagesCount { get; set; } + [Parameter] public int MaxDiagnosticsDepth { get; set; } + [Parameter] public IEnumerable EMessageCategories { get; set; } + [Parameter] public eMessageCategory MinMessageCategoryFilter { get; set; } + [Parameter] public string DiagnosticsMessage { get; set; } + [Parameter] public int DepthValue { get; set; } + [Parameter] public EventCallback MinMessageCategoryFilterChanged { get; set; } + + private async Task OnMinMessageCategoryFilterChanged(eMessageCategory newValue) + { + MinMessageCategoryFilter = newValue; + await MinMessageCategoryFilterChanged.InvokeAsync(newValue); + } + +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs index bcbd77446..fc2feacc9 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs @@ -17,7 +17,7 @@ public class DataCleanupService : IDisposable private readonly Timer _timer; private int cycleToDeleteInHour { get; set; } = 1; - private int maxNumber { get; set; } = 5000; + private int maxNumber { get; set; } = 10_000; private readonly IMongoDatabase _database; private readonly string _collectionName; @@ -44,7 +44,7 @@ private async void Cleanup(object state) { var oldestLogs = await _collection.Find(new BsonDocument()) .Sort(Builders.Sort.Ascending("timestamp")) // Assuming your documents have a "timestamp" field - .Limit((int)(count - maxNumber)) // Keep the newest 10000 documents + .Limit((int)(count - maxNumber)) .ToListAsync(); var deleteFilter = Builders.Filter.In("_id", oldestLogs.Select(log => log["_id"])); diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 39d41730c..8a061510e 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -31,40 +31,61 @@ public DataService(IOptions settings) public IEnumerable CachedData { get; set; } public IEnumerable CachedDataEntriesToUpdate { get; set; } - private async Task> GetDataAsync() + + public async Task> GetDataAsync(int itemsPerPage, eMessageCategory? category, int currentPage) { var collection = _database.GetCollection(_collectionName); - return await collection.Find(new BsonDocument()).ToListAsync(); - } - public async Task RefreshDataAsync() - { - CachedData = await GetDataAsync(); + var filterBuilder = Builders.Filter; + var filter = filterBuilder.Empty; + + if (category.HasValue) + { + int categoryValue = (int)category.Value; + var correspondingLevel = MessageCategoryMapper.MapMessageCategoryToLevel((eMessageCategory)categoryValue); + var correspondingCategory = MessageCategoryMapper.MapLevelToMessageCategory(correspondingLevel); + var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(correspondingCategory); + filter &= filterBuilder.In(item => item.Level, levelsToInclude); + } + + return await collection.Find(filter) + .Skip((currentPage - 1) * itemsPerPage) + .Limit(itemsPerPage) + .ToListAsync(); } + + public async Task RefreshDataAsync( int itemsPerPage, eMessageCategory? category, int currentPage) + => CachedData = (await GetDataAsync( itemsPerPage, category, currentPage)).ToList(); + public async Task UpdateAllMessagesInDb(List msg) { DateTime timeStampAcknowledged = DateTime.UtcNow; - var collection = _database.GetCollection(_collectionName); + var _collection = _database.GetCollection(_collectionName); - var update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + var _update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); - var bulkOps = new List>(); + var _bulkops = new List>(); - foreach (var item in CategorizedMessages.NonActiveMessages) + foreach (var _item in msg) { - var filter = Builders.Filter.Eq(i => i.Id, item.Id); - var updateOne = new UpdateOneModel(filter, update); - bulkOps.Add(updateOne); + var _filter = Builders.Filter.And( + Builders.Filter.Eq("Properties.ExtractedIdentity", _item.Identity), + Builders.Filter.Eq("Properties.sender.Payload.MessageDigest", _item.MessageDigest) + ); + + var _updateOne = new UpdateOneModel(_filter, _update); + _bulkops.Add(_updateOne); } - if (bulkOps.Any()) + if (_bulkops.Any()) { - await collection.BulkWriteAsync(bulkOps); + await _collection.BulkWriteAsync(_bulkops); } } - public async Task TryAcknowledgeAllMessages(IEnumerable messageDisplay) + + public async Task AcknowledgeAllMessages(IEnumerable messageDisplay) { if (CategorizedMessages == null) { @@ -73,39 +94,70 @@ public async Task TryAcknowledgeAllMessages(IEnumerable message List messagesToUpdate = new List(); - foreach (var messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) + foreach (var _messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) { - // Check the messageDisplay for the same identity - var activeMessage = messageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Properties?.ExtractedIdentity); - bool isActive = false; - - if (activeMessage != null) + var _resultMessage = await TryAcknowledgeMessageInternal(_messageToAcknowledge, messageDisplay); + if (_resultMessage != null) { - activeMessage.OnlinerMessage.Pinned.Cyclic = false; - await PurgeNewerSimilarMessages(); - await Task.Delay(1); // Replacing Thread.Sleep with Task.Delay for async methods - isActive = activeMessage.OnlinerMessage.IsActive; + messagesToUpdate.Add(_resultMessage); } + } + + if (messagesToUpdate.Any()) + { + await UpdateAllMessagesInDb(messagesToUpdate); + } + } + + public async Task AcknowledgeSingleMessage(ulong? identity, int messageDigest, IEnumerable messageDisplay) + { + if (CategorizedMessages == null) + { + CategorizeMessages(messageDisplay.ToList()); + } + + List messagesToUpdate = new List(); - if (!isActive) + foreach (var messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned.Where(m => + m.Properties?.ExtractedIdentity == identity && + m.Properties?.sender?.Payload?.MessageDigest == messageDigest)) + { + var _resultMessage = await TryAcknowledgeMessageInternal(messageToAcknowledge, messageDisplay); + if (_resultMessage != null) { - messagesToUpdate.Add(activeMessage); + messagesToUpdate.Add(_resultMessage); } - else + + if (messagesToUpdate.Any()) { - Console.WriteLine($"Message Still Active {activeMessage}"); + await UpdateAllMessagesInDb(messagesToUpdate); } } + } - if (messagesToUpdate.Any()) + private async Task TryAcknowledgeMessageInternal(MongoDbLogItem messageToAcknowledge, IEnumerable messageDisplay) + { + var _activeMessage = messageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Properties?.ExtractedIdentity); + if (_activeMessage != null) { - await UpdateAllMessagesInDb(messagesToUpdate); + _activeMessage.OnlinerMessage.Pinned.Cyclic = false; + await PurgeNewerSimilarMessages(); + await Task.Delay(2); + if (!_activeMessage.OnlinerMessage.IsActive) + { + return _activeMessage; + } + else + { + Console.WriteLine($"Message Still Active {_activeMessage}"); + } } + return null; } public async Task UpdateMessageInDb(ulong? identity, int messageDigest) { - FilterDataEntriesToUpdate(); + await FilterDataEntriesToUpdate(); var entriesToUpdate = CachedDataEntriesToUpdate .Where(item => item.Properties.ExtractedIdentity == identity @@ -150,27 +202,39 @@ public async Task AutoAckNonPinnedMessages(IEnumerable messages public async Task PurgeNewerSimilarMessages() { + if (_database == null || string.IsNullOrEmpty(_collectionName)) + { + Console.WriteLine("Database or collection name is not initialized."); + return; + } + + if (CachedDataEntriesToUpdate == null) + { + Console.WriteLine("CachedDataEntriesToUpdate is not initialized."); + return; + } + var collection = _database.GetCollection(_collectionName); foreach (var unacknowledgedMessage in CachedDataEntriesToUpdate) { // 2. For each of these messages, find newer similar messages based on identity and digest in the cache var newerIdenticalMessages = CachedDataEntriesToUpdate.Where(m => - m.Properties.ExtractedIdentity == unacknowledgedMessage.Properties.ExtractedIdentity && - m.Properties.sender.Payload.MessageDigest == unacknowledgedMessage.Properties.sender.Payload.MessageDigest && - m.UtcTimeStamp > unacknowledgedMessage.UtcTimeStamp).ToList(); + m?.Properties?.ExtractedIdentity == unacknowledgedMessage?.Properties?.ExtractedIdentity && + m?.Properties?.sender?.Payload?.MessageDigest == unacknowledgedMessage?.Properties?.sender?.Payload?.MessageDigest && + m?.UtcTimeStamp > unacknowledgedMessage?.UtcTimeStamp).ToList(); if (newerIdenticalMessages.Any()) { // 3. Delete these newer similar messages from the database var filter = Builders.Filter.In(m => m.Id, newerIdenticalMessages.Select(x => x.Id)); await collection.DeleteManyAsync(filter); - Console.WriteLine($"Purged {newerIdenticalMessages.Count} duplicates for {unacknowledgedMessage.MessageTemplate.Text}"); + //Console.WriteLine($"Purged {newerIdenticalMessages.Count} duplicates for {unacknowledgedMessage?.MessageTemplate?.Text}"); } } } - public async void FilterDataEntriesToUpdate() + public async Task FilterDataEntriesToUpdate() { CachedDataEntriesToUpdate = CachedData .Where(item => item.TimeStampAcknowledged == null) @@ -189,7 +253,7 @@ public void ExtractIdentity() var identityString = match.Groups[1].Value; if (ulong.TryParse(identityString, out ulong identity)) { - item.Properties.ExtractedIdentity = (ulong)identity; // Cast to long if necessary + item.Properties.ExtractedIdentity = identity; } else { @@ -202,7 +266,6 @@ public void ExtractIdentity() public class MessageResult { public IEnumerable NonActiveMessages { get; set; } - //public IEnumerable NonActiveMessagesPinned { get; set; } public IEnumerable ActiveMessages { get; set; } public IEnumerable ActiveMessagesPinned { get; set; } } @@ -247,12 +310,27 @@ public void CategorizeMessages(List msg) }; } - - public int GetCachedDataCount() + public async Task GetTotalPagesAsync(int itemsPerPage, eMessageCategory? category) { - return CachedData?.Count() ?? 0; + var collection = _database.GetCollection(_collectionName); + + var filterBuilder = Builders.Filter; + var filter = filterBuilder.Empty; + + if (category.HasValue) + { + int categoryValue = (int)category.Value; + var correspondingLevel = MessageCategoryMapper.MapMessageCategoryToLevel((eMessageCategory)categoryValue); + var correspondingCategory = MessageCategoryMapper.MapLevelToMessageCategory(correspondingLevel); + var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(correspondingCategory); + filter &= filterBuilder.In(item => item.Level, levelsToInclude); + } + + var totalCount = await collection.CountDocumentsAsync(filter); + var totalPages = (int)Math.Ceiling((double)totalCount / itemsPerPage); + + return totalPages; } } - } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index b3cfa6ad6..eb718a280 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -5,23 +5,17 @@ using System.Timers; using Microsoft.AspNetCore.Components; -using Vortex.Presentation; + using MongoDB.Bson.Serialization; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; -using PlcDocu.TcoCore; - - -using TcOpen.Inxton; -using TcOpen.Inxton.Input; - namespace TcoCore { - public partial class TcoDiagnosticsAlternativeView + public partial class TcoDiagnosticsAlternativeView : IDisposable { /// /// DataService connects to the Mongo Database, given from the Blazor Context Manager @@ -36,6 +30,45 @@ public partial class TcoDiagnosticsAlternativeView [Inject] public DataCleanupService DataCleanupService { get; set; } + private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); + public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; + + private int _totalPages; + public int TotalPages => _totalPages; + private static int _itemsPerPage = 20; + private int _currentPage = 1; + public bool IsFirstDisabled => _currentPage == 1; + public bool IsLastDisabled => _currentPage == TotalPages; + + //Data and Lists, Logs from db, Messages from Plc + private IEnumerable _mongoDbLogItemFiltered = new List(); + private List _messagesPlc = new List(); + public int CachedDataCount { get; private set; } + + private string ActiveMessagesCount() => "Aktive Messages : " + ViewModel._tcoObject.MessageHandler.ActiveMessagesCount; + private string DiagnosticsMessage() => "Diag depth : " + DepthValue; + private int _maxDiagnosticsDepth = 20; + private static int _depthValue; + public static int SetDefaultDepth(int item) => _depthValue = item; + + public eMessageCategory MinMessageCategoryFilter { get; set; } = DefaultCategory; + public static eMessageCategory DefaultCategory { get; set; } = eMessageCategory.Info; + + public bool GetMessageStatusPinned(MongoDbLogItem message) + { + var matchingMessage = ViewModel.MessageDisplay.FirstOrDefault( + m => m.Identity == message.Properties?.ExtractedIdentity && + m.MessageDigest == message.Properties?.sender?.Payload.MessageDigest); + return matchingMessage?.Pinned ?? false; + } + + /// + /// SetsUpdate Intervall via Consuming App + /// + public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; + private static int _diagnosticsUpdateInterval = 200; + private Timer _messageUpdateTimer; + protected override async Task OnInitializedAsync() { //Necessary for the Deserialization of the BSON Log Entries, @@ -49,59 +82,26 @@ protected override async Task OnInitializedAsync() }); } + _totalPages = await DataService.GetTotalPagesAsync(_itemsPerPage, MinMessageCategoryFilter); + UpdateValuesOnChange(ViewModel._tcoObject); - DiagnosticsUpdateTimer(); + InitializeDiagnosticsUpdateTimer(); } - public DateTime timetest { get; set; } = DateTime.Now; - - /// - /// SetsUpdate Intervall via Consuming App - /// - public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; - private static int _diagnosticsUpdateInterval { get; set; } = 300; - private Timer messageUpdateTimer; - - //private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); - public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; - - //Paging and Navigation - private static int itemsPerPage { get; set; } = 20; - private int currentPage = 1; - private int totalPages => (CachedDataCount + itemsPerPage - 1) / itemsPerPage; - public bool IsFirstDisabled => currentPage == 1; - public bool IsLastDisabled => currentPage == totalPages; - - //Data and Lists, Logs from db, Messages from Plc - private IEnumerable MongdoDbLogItemFiltered { get; set; } = new List(); - private List messages = new List(); - public int CachedDataCount { get; private set; } - - //public string DiagnosticsMessage() => "Diag depth : " + DepthValue; - //public int MaxDiagnosticsDepth { get; set; } = 20; - //public static int _depthValue; - //public static int SetDefaultDepth(int item) => _depthValue = item; - - private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) + public void InitializeDiagnosticsUpdateTimer() { - await InvokeAsync(async () => + if (_messageUpdateTimer == null) { - //DB Action - await DataService.RefreshDataAsync(); - //Update plc Data - ViewModel.UpdateMessages(); - - CachedDataCount = DataService.GetCachedDataCount(); - MongdoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData); - DataService.ExtractIdentity(); - DataService.FilterDataEntriesToUpdate(); - DataService.CategorizeMessages(ViewModel.MessageDisplay.ToList()); - await DataService.PurgeNewerSimilarMessages(); - await DataService.AutoAckNonPinnedMessages(ViewModel.MessageDisplay); - - StateHasChanged(); - }); + _messageUpdateTimer = new Timer(_diagnosticsUpdateInterval); + _messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed; + _messageUpdateTimer.AutoReset = true; + _messageUpdateTimer.Enabled = true; + } + else + { + Console.WriteLine("Timer already initialized."); + } } //there is a big problem, which leads to alot of complicated stuff that @@ -117,11 +117,7 @@ public async Task AcknowledgeAllMessages() { try { - await DataService.TryAcknowledgeAllMessages(ViewModel.MessageDisplay); - //foreach (var item in DataService.CachedDataEntriesToUpdate) - //{ - //TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = ViewModel._tcoObject.HumanReadable, rootSymbol = ViewModel._tcoObject.Symbol }); - //} + await DataService.AcknowledgeAllMessages(ViewModel.MessageDisplay); } catch (System.Exception ex) { @@ -133,7 +129,7 @@ public async Task AcknowledgeMessage(ulong? identity, int messageDigest) { try { - await DataService.UpdateMessageInDb(identity, messageDigest); + await DataService.AcknowledgeSingleMessage(identity, messageDigest, ViewModel.MessageDisplay); } catch (System.Exception ex) { @@ -141,42 +137,70 @@ public async Task AcknowledgeMessage(ulong? identity, int messageDigest) } } + public static void SetDefaultCategoryFilter(eMessageCategory category) + { + DefaultCategory = category; + } + public static void SetItemsPerPage(int value) { - itemsPerPage = value; + _itemsPerPage = value; } - private void PreviousPage() + public void Dispose() + { + _messageUpdateTimer?.Dispose(); + } + private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) { - if (currentPage > 1) + await InvokeAsync(async () => { - currentPage--; - } + //DB Action + await DataService.RefreshDataAsync( _itemsPerPage, MinMessageCategoryFilter, _currentPage); + //Update plc Data + await ViewModel.UpdateMessagesAsync(); + + _mongoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData) + .Where(x => ViewModel.CalculateDepth(x) <= DepthValue); + DataService.ExtractIdentity(); + await DataService.FilterDataEntriesToUpdate(); + DataService.CategorizeMessages(ViewModel.MessageDisplay.ToList()); + + await DataService.PurgeNewerSimilarMessages(); + //await DataService.AutoAckNonPinnedMessages(ViewModel.MessageDisplay); + + StateHasChanged(); + }); } - private void NextPage() + private async Task PreviousPage() { - if (currentPage < totalPages) + if (_currentPage > 1) { - currentPage++; + _currentPage--; + _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); } } - public void FirstPage() + private async Task NextPage() { - currentPage = 1; + if (_currentPage < TotalPages) + { + _currentPage++; + _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); + } } - public void LastPage() + public async Task FirstPage() { - currentPage = totalPages; + _currentPage = 1; + _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); } - private void OnNewMessageReceived(PlainTcoMessage newMessage) + public async Task LastPage() { - // Add the new message to the list and re-render the component - messages.Add(newMessage); - StateHasChanged(); + _currentPage = TotalPages; + _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); } private IEnumerable OrderMongoDbLogItems(IEnumerable items) @@ -188,60 +212,18 @@ private IEnumerable OrderMongoDbLogItems(IEnumerable m.TimeStampAcknowledged); } - - //Unsubscribe from the event when the component is disposed of - //public void Dispose() - //{ - // ViewModel.NewMessageReceived -= OnNewMessageReceived; - //} - - //public int DepthValue - //{ - // get - // { - // if (_depthValue == 0) - // _depthValue = ViewModel._tcoObject.MessageHandler.DiagnosticsDepth; - // return _depthValue; - // } - // set - // { - // _depthValue = value; - // ViewModel._tcoObject.MessageHandler.DiagnosticsDepth = value; - // } - //} - - //public eMessageCategory MinMessageCategoryFilter - //{ - // get - // { - // return _minMessageCategoryFilter; - // } - // set - // { - // _minMessageCategoryFilter = value; - // ViewModel.MinMessageCategoryFilter = value; // Update the ViewModel's property - // } - //} - //private eMessageCategory _minMessageCategoryFilter = DefaultCategory; - - - //public static eMessageCategory SetDefaultCategory(eMessageCategory item) => DefaultCategory = item; - //public static eMessageCategory DefaultCategory { get; set; } = eMessageCategory.All; - - - private void DiagnosticsUpdateTimer() + public int DepthValue { - if (messageUpdateTimer == null) + get { - //Console.WriteLine("Initializing timer."); - messageUpdateTimer = new Timer(_diagnosticsUpdateInterval); - messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed; - messageUpdateTimer.AutoReset = true; - messageUpdateTimer.Enabled = true; + if (_depthValue == 0) + _depthValue = ViewModel._tcoObject.MessageHandler.DiagnosticsDepth; + return _depthValue; } - else + set { - Console.WriteLine("Timer already initialized."); + _depthValue = value; + ViewModel._tcoObject.MessageHandler.DiagnosticsDepth = value; } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index 3c6cdc5a1..a533f7d8f 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -1,13 +1,60 @@ -@*@inherits RenderableViewModelComponentBase*@ -@inherits RenderableViewModelComponentBase +@inherits RenderableViewModelComponentBase -@using Blazm.Components +@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.MessagesTabs @using Vortex.Presentation.Controls.Blazor.RenderableContent +@using Blazm.Components @namespace TcoCore +@using BlazorStrap.V5 + + + + Active Messages + + + + + + + Archived Messages + + + + + + + + -@ViewModel._tcoObject.MessageHandler.ActiveMessagesCount -

    The current time is: @timetest.ToString(("MM/dd/yyyy HH:mm:ss"))

    @* @@ -52,7 +99,7 @@ *@ - +@*
    @*
    *@ -
    + @*
    -
    +
    *@ @*
    @DiagnosticsMessage() -
    *@ -
    +@* *@ +@* @@ -79,23 +126,21 @@ - @* - *@ + - @foreach (var message in MongdoDbLogItemFiltered.Skip((currentPage -1)* itemsPerPage).Take(itemsPerPage).Take(itemsPerPage)) + @foreach (var message in _mongoDbLogItemFiltered.Skip((_currentPage -1)* _itemsPerPage).Take(_itemsPerPage).Take(_itemsPerPage)) { - @*1h behind date in summertime, 12.51 displayed, time shows on PC 13.51, utcnow 11.51*@ + @*1h behind date in summertime, 12.51 displayed, time shows on PC 13.51, utcnow 11.51 - @* - *@ + + @if (_messagesToDisplay != null) + { + @foreach (var message in _messagesToDisplay) + { + + + + + + + + + } + } + + + + + -@code { - [Parameter] public IEnumerable MongoDbLogItemsFiltered { get; set; } - [Parameter] public int MaxDiagnosticsDepth { get; set; } - [Parameter] public IEnumerable EMessageCategories { get; set; } - [Parameter] public string DiagnosticsMessage { get; set; } - [Parameter] public int DepthValue { get; set; } - [Parameter] public Func AcknowledgeMessageCallback { get; set; } - [Parameter] public Func AcknowledgeAllMessages { get; set; } - [Parameter] public string ActiveMessagesCount { get; set; } - [Parameter] public Func GetMessageStatusPinned { get; set; } - [Parameter] public eMessageCategory MinMessageCategoryFilter { get; set; } - [Parameter] public EventCallback MinMessageCategoryFilterChanged { get; set; } - private async Task OnMinMessageCategoryFilterChanged(eMessageCategory newValue) - { - MinMessageCategoryFilter = newValue; - await MinMessageCategoryFilterChanged.InvokeAsync(newValue); - } -} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs new file mode 100644 index 000000000..ef0391af1 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; +using global::TcoCore; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.MessagesTabs +{ + public partial class ActiveMessages + { + [Parameter] + public IDataService DataService { get; set; } + + [Parameter] + public int MaxDiagnosticsDepth { get; set; } + + //[Parameter] + //public string DiagnosticsMessage { get; set; } + + [Parameter] + public int DepthValue { get; set; } + + //[Parameter] + //public Func AcknowledgeMessageCallback { get; set; } + + //[Parameter] + //public Func AcknowledgeAllMessages { get; set; } + + //[Parameter] + //public string ActiveMessagesCount { get; set; } + + [Parameter] + public Func GetMessageStatusPinned { get; set; } + + [Parameter] + public eMessageCategory InitialCategory { get; set; } + + public eMessageCategory DropdownSelectedCategory + { + get => _dropdownSelectedCategory; + set => _dropdownSelectedCategory = value; + } + + + private eMessageCategory _dropdownSelectedCategory; + private int _itemsPerPage = 6; + int _currentPage = 1; + int _totalPages = 10; + private IEnumerable _messagesToDisplay = new List(); + + protected override async Task OnInitializedAsync() + { + if (_dropdownSelectedCategory == default(eMessageCategory)) + { + _dropdownSelectedCategory = InitialCategory; + } + + await GetDataFilteredAsync(); + } + + // Called from Parent? + protected override async Task OnParametersSetAsync() + { + await GetDataFilteredAsync(); + } + + public async Task GetDataFilteredAsync() + { + + DateTime? startDate = DateTime.Now.AddDays(-7); // Example: 7 days ago + DateTime? endDate = DateTime.Now; + string keyword = ""; + eMessageCategory category = _dropdownSelectedCategory; // Example category + + var result = await DataService.GetDataGetDataAsyncForActive(_itemsPerPage,_currentPage, category,startDate, endDate, keyword); + + List filteredItems = result.messages; + long totalCount = result.count; + _totalPages = (int)Math.Ceiling((double)totalCount / _itemsPerPage); + _messagesToDisplay = result.messages; + } + + } +} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 8a061510e..05ecd07f6 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -4,9 +4,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; - using Microsoft.Extensions.Options; - using MongoDB.Bson; using MongoDB.Driver; @@ -16,7 +14,7 @@ namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services { - public class DataService + public class DataService : IDataService { private readonly IMongoDatabase _database; private readonly string _collectionName; @@ -28,309 +26,361 @@ public DataService(IOptions settings) _collectionName = settings.Value.CollectionName; } - public IEnumerable CachedData { get; set; } - public IEnumerable CachedDataEntriesToUpdate { get; set; } - - - public async Task> GetDataAsync(int itemsPerPage, eMessageCategory? category, int currentPage) + //public IEnumerable CachedData { get; set; } + //public IEnumerable CachedDataEntriesToUpdate { get; set; } + + //set this by the Plc via the View.cs + public IEnumerable ActiveMessage { get; set; } + + public async Task<(List messages, long count)> GetDataGetDataAsyncForActive( + int itemsPerPage, + int currentPage, + eMessageCategory category = eMessageCategory.All, + DateTime? startDate = null, + DateTime? endDate = null, + string? keyword = null) { var collection = _database.GetCollection(_collectionName); - var filterBuilder = Builders.Filter; - var filter = filterBuilder.Empty; - - if (category.HasValue) - { - int categoryValue = (int)category.Value; - var correspondingLevel = MessageCategoryMapper.MapMessageCategoryToLevel((eMessageCategory)categoryValue); - var correspondingCategory = MessageCategoryMapper.MapLevelToMessageCategory(correspondingLevel); - var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(correspondingCategory); - filter &= filterBuilder.In(item => item.Level, levelsToInclude); - } - - return await collection.Find(filter) - .Skip((currentPage - 1) * itemsPerPage) - .Limit(itemsPerPage) - .ToListAsync(); - } - - - public async Task RefreshDataAsync( int itemsPerPage, eMessageCategory? category, int currentPage) - => CachedData = (await GetDataAsync( itemsPerPage, category, currentPage)).ToList(); - - public async Task UpdateAllMessagesInDb(List msg) - { - DateTime timeStampAcknowledged = DateTime.UtcNow; - - var _collection = _database.GetCollection(_collectionName); - - var _update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); - - var _bulkops = new List>(); - - foreach (var _item in msg) - { - var _filter = Builders.Filter.And( - Builders.Filter.Eq("Properties.ExtractedIdentity", _item.Identity), - Builders.Filter.Eq("Properties.sender.Payload.MessageDigest", _item.MessageDigest) - ); - - var _updateOne = new UpdateOneModel(_filter, _update); - _bulkops.Add(_updateOne); - } - - if (_bulkops.Any()) - { - await _collection.BulkWriteAsync(_bulkops); - } - } - - public async Task AcknowledgeAllMessages(IEnumerable messageDisplay) - { - if (CategorizedMessages == null) - { - CategorizeMessages(messageDisplay.ToList()); - } - - List messagesToUpdate = new List(); + var dateFilter = BuildDateFilter(startDate, endDate); + var keywordFilter = BuildKeywordFilter(keyword); + var categoryFilter = BuildCategoryFilter(category); - foreach (var _messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) - { - var _resultMessage = await TryAcknowledgeMessageInternal(_messageToAcknowledge, messageDisplay); - if (_resultMessage != null) - { - messagesToUpdate.Add(_resultMessage); - } - } + var combinedFilter = Builders.Filter.And(dateFilter, keywordFilter, categoryFilter); - if (messagesToUpdate.Any()) - { - await UpdateAllMessagesInDb(messagesToUpdate); - } - } - - public async Task AcknowledgeSingleMessage(ulong? identity, int messageDigest, IEnumerable messageDisplay) - { - if (CategorizedMessages == null) - { - CategorizeMessages(messageDisplay.ToList()); - } - - List messagesToUpdate = new List(); - - foreach (var messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned.Where(m => - m.Properties?.ExtractedIdentity == identity && - m.Properties?.sender?.Payload?.MessageDigest == messageDigest)) - { - var _resultMessage = await TryAcknowledgeMessageInternal(messageToAcknowledge, messageDisplay); - if (_resultMessage != null) - { - messagesToUpdate.Add(_resultMessage); - } - - if (messagesToUpdate.Any()) - { - await UpdateAllMessagesInDb(messagesToUpdate); - } - } - } + var messages = await collection.Find(combinedFilter) + .Skip((currentPage - 1) * itemsPerPage) + .Limit(itemsPerPage) + .ToListAsync(); + var count = await collection.CountDocumentsAsync(combinedFilter); - private async Task TryAcknowledgeMessageInternal(MongoDbLogItem messageToAcknowledge, IEnumerable messageDisplay) - { - var _activeMessage = messageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Properties?.ExtractedIdentity); - if (_activeMessage != null) - { - _activeMessage.OnlinerMessage.Pinned.Cyclic = false; - await PurgeNewerSimilarMessages(); - await Task.Delay(2); - if (!_activeMessage.OnlinerMessage.IsActive) - { - return _activeMessage; - } - else - { - Console.WriteLine($"Message Still Active {_activeMessage}"); - } - } - return null; + return (messages, count); } - public async Task UpdateMessageInDb(ulong? identity, int messageDigest) - { - await FilterDataEntriesToUpdate(); - - var entriesToUpdate = CachedDataEntriesToUpdate - .Where(item => item.Properties.ExtractedIdentity == identity - && item.Properties.sender.Payload.MessageDigest == messageDigest) - .ToList(); - //Problems with Dotnet5 and Logging - DateTime timeStampAcknowledged = DateTime.UtcNow.AddHours(1); - // Update the TimeStampAcknowledged field for each matching entry - foreach (var entry in entriesToUpdate) - { - entry.TimeStampAcknowledged = timeStampAcknowledged; - } + public Task> GetDataGetDataAsyncForArchive(int itemsPerPage, eMessageCategory category, int currentPage) => throw new NotImplementedException(); + + + + public Task AcknowledgeAllMessages() => throw new NotImplementedException(); + public Task AcknowledgeMessage(ulong identity, int messageDigest) => throw new NotImplementedException(); - // Get the collection - var collection = _database.GetCollection(_collectionName); - // Build the update definition - var update = Builders.Update - .Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); - // Apply the update to each matching document in the database - foreach (var entry in entriesToUpdate) - { - var filter = Builders.Filter.Eq(item => item.Id, entry.Id); - await collection.UpdateOneAsync(filter, update); - } - } - public async Task AutoAckNonPinnedMessages(IEnumerable messages) + private FilterDefinition BuildDateFilter(DateTime? startDate, DateTime? endDate) { - foreach (var message in CategorizedMessages.NonActiveMessages.Where(m => m != null)) - { - ulong? identity = message.Properties?.ExtractedIdentity; - int? messageDigest = message.Properties?.sender?.Payload?.MessageDigest; - if (identity.HasValue && messageDigest.HasValue) - { - await UpdateMessageInDb(identity, messageDigest.Value); - } - } - } - - public async Task PurgeNewerSimilarMessages() - { - if (_database == null || string.IsNullOrEmpty(_collectionName)) - { - Console.WriteLine("Database or collection name is not initialized."); - return; - } - - if (CachedDataEntriesToUpdate == null) - { - Console.WriteLine("CachedDataEntriesToUpdate is not initialized."); - return; - } - - var collection = _database.GetCollection(_collectionName); + var filterBuilder = Builders.Filter; + var filter = filterBuilder.Empty; - foreach (var unacknowledgedMessage in CachedDataEntriesToUpdate) + if (startDate.HasValue) { - // 2. For each of these messages, find newer similar messages based on identity and digest in the cache - var newerIdenticalMessages = CachedDataEntriesToUpdate.Where(m => - m?.Properties?.ExtractedIdentity == unacknowledgedMessage?.Properties?.ExtractedIdentity && - m?.Properties?.sender?.Payload?.MessageDigest == unacknowledgedMessage?.Properties?.sender?.Payload?.MessageDigest && - m?.UtcTimeStamp > unacknowledgedMessage?.UtcTimeStamp).ToList(); - - if (newerIdenticalMessages.Any()) - { - // 3. Delete these newer similar messages from the database - var filter = Builders.Filter.In(m => m.Id, newerIdenticalMessages.Select(x => x.Id)); - await collection.DeleteManyAsync(filter); - //Console.WriteLine($"Purged {newerIdenticalMessages.Count} duplicates for {unacknowledgedMessage?.MessageTemplate?.Text}"); - } + filter &= filterBuilder.Gte(item => item.UtcTimeStamp, startDate.Value); } - } - - public async Task FilterDataEntriesToUpdate() - { - CachedDataEntriesToUpdate = CachedData - .Where(item => item.TimeStampAcknowledged == null) - .ToList(); - await PurgeNewerSimilarMessages(); - } - - public void ExtractIdentity() - { - var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); - foreach (var item in CachedData) + if (endDate.HasValue) { - var match = regex.Match(item.RenderedMessage); - if (match.Success) - { - var identityString = match.Groups[1].Value; - if (ulong.TryParse(identityString, out ulong identity)) - { - item.Properties.ExtractedIdentity = identity; - } - else - { - Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log - } - } + filter &= filterBuilder.Lte(item => item.UtcTimeStamp, endDate.Value); } - } - public class MessageResult - { - public IEnumerable NonActiveMessages { get; set; } - public IEnumerable ActiveMessages { get; set; } - public IEnumerable ActiveMessagesPinned { get; set; } + return filter; } - public MessageResult CategorizedMessages { get; set; } - - //Categorizes Messages depending on - // if active in DB, and not in Plc => it shall Acknowledge them - // if active in DB and in PLC => Ignore - // if Pinned or not - public void CategorizeMessages(List msg) + private FilterDefinition BuildKeywordFilter(string keyword) { - var nonActiveInMessages = new List(); - var activeInMessages = new List(); - var activeInMessagesPinned = new List(); - - foreach (var item in CachedDataEntriesToUpdate) - { - var matchingMessage = msg.FirstOrDefault(m => - m.Identity == item.Properties?.ExtractedIdentity && - m.MessageDigest == item.Properties?.sender?.Payload?.MessageDigest); - - if (matchingMessage == null) - { - nonActiveInMessages.Add(item); - } - else if (matchingMessage.OnlinerMessage.Pinned.Cyclic == true) - { - activeInMessagesPinned.Add(item); - } - else - { - activeInMessages.Add(item); - } - } + var filterBuilder = Builders.Filter; - CategorizedMessages = new MessageResult - { - NonActiveMessages = nonActiveInMessages, - ActiveMessages = activeInMessages, - ActiveMessagesPinned = activeInMessagesPinned - }; + return !string.IsNullOrEmpty(keyword) + ? filterBuilder.Regex(item => item.RenderedMessage, new BsonRegularExpression(keyword, "i")) + : filterBuilder.Empty; } - public async Task GetTotalPagesAsync(int itemsPerPage, eMessageCategory? category) + private FilterDefinition BuildCategoryFilter(eMessageCategory? category) { - var collection = _database.GetCollection(_collectionName); - var filterBuilder = Builders.Filter; - var filter = filterBuilder.Empty; if (category.HasValue) { - int categoryValue = (int)category.Value; - var correspondingLevel = MessageCategoryMapper.MapMessageCategoryToLevel((eMessageCategory)categoryValue); - var correspondingCategory = MessageCategoryMapper.MapLevelToMessageCategory(correspondingLevel); - var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(correspondingCategory); - filter &= filterBuilder.In(item => item.Level, levelsToInclude); + var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(category.Value); + return filterBuilder.In(item => item.Level, levelsToInclude); } - var totalCount = await collection.CountDocumentsAsync(filter); - var totalPages = (int)Math.Ceiling((double)totalCount / itemsPerPage); - - return totalPages; + return filterBuilder.Empty; } + + + //public async Task UpdateAllMessagesInDb(List msg) + //{ + // DateTime timeStampAcknowledged = DateTime.UtcNow; + + // var _collection = _database.GetCollection(_collectionName); + + // var _update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + + // var _bulkops = new List>(); + + // foreach (var _item in msg) + // { + // var _filter = Builders.Filter.And( + // Builders.Filter.Eq("Properties.ExtractedIdentity", _item.Identity), + // Builders.Filter.Eq("Properties.sender.Payload.MessageDigest", _item.MessageDigest) + // ); + + // var _updateOne = new UpdateOneModel(_filter, _update); + // _bulkops.Add(_updateOne); + // } + + // if (_bulkops.Any()) + // { + // await _collection.BulkWriteAsync(_bulkops); + // } + //} + + //public async Task AcknowledgeAllMessages(IEnumerable messageDisplay) + //{ + // if (CategorizedMessages == null) + // { + // CategorizeMessages(messageDisplay.ToList()); + // } + + // List messagesToUpdate = new List(); + + // foreach (var _messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) + // { + // var _resultMessage = await TryAcknowledgeMessageInternal(_messageToAcknowledge, messageDisplay); + // if (_resultMessage != null) + // { + // messagesToUpdate.Add(_resultMessage); + // } + // } + + // if (messagesToUpdate.Any()) + // { + // await UpdateAllMessagesInDb(messagesToUpdate); + // } + //} + + //public async Task AcknowledgeSingleMessage(ulong? identity, int messageDigest, IEnumerable messageDisplay) + //{ + // if (CategorizedMessages == null) + // { + // CategorizeMessages(messageDisplay.ToList()); + // } + + // List messagesToUpdate = new List(); + + // foreach (var messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned.Where(m => + // m.Properties?.ExtractedIdentity == identity && + // m.Properties?.sender?.Payload?.MessageDigest == messageDigest)) + // { + // var _resultMessage = await TryAcknowledgeMessageInternal(messageToAcknowledge, messageDisplay); + // if (_resultMessage != null) + // { + // messagesToUpdate.Add(_resultMessage); + // } + + // if (messagesToUpdate.Any()) + // { + // await UpdateAllMessagesInDb(messagesToUpdate); + // } + // } + //} + + //private async Task TryAcknowledgeMessageInternal(MongoDbLogItem messageToAcknowledge, IEnumerable messageDisplay) + //{ + // var _activeMessage = messageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Properties?.ExtractedIdentity); + // if (_activeMessage != null) + // { + // _activeMessage.OnlinerMessage.Pinned.Cyclic = false; + // await PurgeNewerSimilarMessages(); + // await Task.Delay(2); + // if (!_activeMessage.OnlinerMessage.IsActive) + // { + // return _activeMessage; + // } + // else + // { + // Console.WriteLine($"Message Still Active {_activeMessage}"); + // } + // } + // return null; + //} + + //public async Task UpdateMessageInDb(ulong? identity, int messageDigest) + //{ + // await FilterDataEntriesToUpdate(); + + // var entriesToUpdate = CachedDataEntriesToUpdate + // .Where(item => item.Properties.ExtractedIdentity == identity + // && item.Properties.sender.Payload.MessageDigest == messageDigest) + // .ToList(); + + // //Problems with Dotnet5 and Logging + // DateTime timeStampAcknowledged = DateTime.UtcNow.AddHours(1); + // // Update the TimeStampAcknowledged field for each matching entry + // foreach (var entry in entriesToUpdate) + // { + // entry.TimeStampAcknowledged = timeStampAcknowledged; + // } + + // // Get the collection + // var collection = _database.GetCollection(_collectionName); + + // // Build the update definition + // var update = Builders.Update + // .Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + + // // Apply the update to each matching document in the database + // foreach (var entry in entriesToUpdate) + // { + // var filter = Builders.Filter.Eq(item => item.Id, entry.Id); + // await collection.UpdateOneAsync(filter, update); + // } + //} + + //public async Task AutoAckNonPinnedMessages(IEnumerable messages) + //{ + // foreach (var message in CategorizedMessages.NonActiveMessages.Where(m => m != null)) + // { + // ulong? identity = message.Properties?.ExtractedIdentity; + // int? messageDigest = message.Properties?.sender?.Payload?.MessageDigest; + // if (identity.HasValue && messageDigest.HasValue) + // { + // await UpdateMessageInDb(identity, messageDigest.Value); + // } + // } + //} + + //public async Task PurgeNewerSimilarMessages() + //{ + // if (_database == null || string.IsNullOrEmpty(_collectionName)) + // { + // Console.WriteLine("Database or collection name is not initialized."); + // return; + // } + + // if (CachedDataEntriesToUpdate == null) + // { + // Console.WriteLine("CachedDataEntriesToUpdate is not initialized."); + // return; + // } + + // var collection = _database.GetCollection(_collectionName); + + // foreach (var unacknowledgedMessage in CachedDataEntriesToUpdate) + // { + // // 2. For each of these messages, find newer similar messages based on identity and digest in the cache + // var newerIdenticalMessages = CachedDataEntriesToUpdate.Where(m => + // m?.Properties?.ExtractedIdentity == unacknowledgedMessage?.Properties?.ExtractedIdentity && + // m?.Properties?.sender?.Payload?.MessageDigest == unacknowledgedMessage?.Properties?.sender?.Payload?.MessageDigest && + // m?.UtcTimeStamp > unacknowledgedMessage?.UtcTimeStamp).ToList(); + + // if (newerIdenticalMessages.Any()) + // { + // // 3. Delete these newer similar messages from the database + // var filter = Builders.Filter.In(m => m.Id, newerIdenticalMessages.Select(x => x.Id)); + // await collection.DeleteManyAsync(filter); + // //Console.WriteLine($"Purged {newerIdenticalMessages.Count} duplicates for {unacknowledgedMessage?.MessageTemplate?.Text}"); + // } + // } + //} + + //public async Task FilterDataEntriesToUpdate() + //{ + // CachedDataEntriesToUpdate = CachedData + // .Where(item => item.TimeStampAcknowledged == null) + // .ToList(); + // await PurgeNewerSimilarMessages(); + //} + + //public void ExtractIdentity() + //{ + // var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); + // foreach (var item in CachedData) + // { + // var match = regex.Match(item.RenderedMessage); + // if (match.Success) + // { + // var identityString = match.Groups[1].Value; + // if (ulong.TryParse(identityString, out ulong identity)) + // { + // item.Properties.ExtractedIdentity = identity; + // } + // else + // { + // Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log + // } + // } + // } + //} + + //public class MessageResult + //{ + // public IEnumerable NonActiveMessages { get; set; } + // public IEnumerable ActiveMessages { get; set; } + // public IEnumerable ActiveMessagesPinned { get; set; } + //} + + //public MessageResult CategorizedMessages { get; set; } + + ////Categorizes Messages depending on + //// if active in DB, and not in Plc => it shall Acknowledge them + //// if active in DB and in PLC => Ignore + //// if Pinned or not + //public void CategorizeMessages(List msg) + //{ + // var nonActiveInMessages = new List(); + // var activeInMessages = new List(); + // var activeInMessagesPinned = new List(); + + // foreach (var item in CachedDataEntriesToUpdate) + // { + // var matchingMessage = msg.FirstOrDefault(m => + // m.Identity == item.Properties?.ExtractedIdentity && + // m.MessageDigest == item.Properties?.sender?.Payload?.MessageDigest); + + // if (matchingMessage == null) + // { + // nonActiveInMessages.Add(item); + // } + // else if (matchingMessage.OnlinerMessage.Pinned.Cyclic == true) + // { + // activeInMessagesPinned.Add(item); + // } + // else + // { + // activeInMessages.Add(item); + // } + // } + + // CategorizedMessages = new MessageResult + // { + // NonActiveMessages = nonActiveInMessages, + // ActiveMessages = activeInMessages, + // ActiveMessagesPinned = activeInMessagesPinned + // }; + //} + + //public async Task GetTotalPagesAsync(int itemsPerPage, eMessageCategory? category) + //{ + // var collection = _database.GetCollection(_collectionName); + + // var filterBuilder = Builders.Filter; + // var filter = filterBuilder.Empty; + + // if (category.HasValue) + // { + // int categoryValue = (int)category.Value; + // var correspondingLevel = MessageCategoryMapper.MapMessageCategoryToLevel((eMessageCategory)categoryValue); + // var correspondingCategory = MessageCategoryMapper.MapLevelToMessageCategory(correspondingLevel); + // var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(correspondingCategory); + // filter &= filterBuilder.In(item => item.Level, levelsToInclude); + // } + + // var totalCount = await collection.CountDocumentsAsync(filter); + // var totalPages = (int)Math.Ceiling((double)totalCount / itemsPerPage); + + // return totalPages; } + } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs new file mode 100644 index 000000000..599282244 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +using TcoCore; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services +{ + public interface IDataService + { + public IEnumerable ActiveMessage { get; set; } + public Task> GetDataGetDataAsyncForArchive(int itemsPerPage, eMessageCategory category, int currentPage); + public Task<(List messages, long count)> GetDataGetDataAsyncForActive(int itemsPerPage, int currentPage, eMessageCategory category = eMessageCategory.All, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); + + public Task AcknowledgeAllMessages(); + public Task AcknowledgeMessage(ulong identity, int messageDigest); + } +} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index eb718a280..4467eb41e 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -22,7 +22,7 @@ public partial class TcoDiagnosticsAlternativeView : IDisposable /// It is responsible for Fetching, Updating, Filtering and so on /// [Inject] - public DataService DataService { get; set; } + public IDataService DataService { get; set; } /// /// DataCleanupService is responsible for limiting the entries to 5000 logs @@ -33,15 +33,8 @@ public partial class TcoDiagnosticsAlternativeView : IDisposable private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; - private int _totalPages; - public int TotalPages => _totalPages; - private static int _itemsPerPage = 20; - private int _currentPage = 1; - public bool IsFirstDisabled => _currentPage == 1; - public bool IsLastDisabled => _currentPage == TotalPages; - - //Data and Lists, Logs from db, Messages from Plc - private IEnumerable _mongoDbLogItemFiltered = new List(); + ////Data and Lists, Logs from db, Messages from Plc + //private IEnumerable _mongoDbLogItemFiltered = new List(); private List _messagesPlc = new List(); public int CachedDataCount { get; private set; } @@ -51,8 +44,22 @@ public partial class TcoDiagnosticsAlternativeView : IDisposable private static int _depthValue; public static int SetDefaultDepth(int item) => _depthValue = item; - public eMessageCategory MinMessageCategoryFilter { get; set; } = DefaultCategory; - public static eMessageCategory DefaultCategory { get; set; } = eMessageCategory.Info; + private static eMessageCategory _minMessageCategoryFilter; + + //public static eMessageCategory MinMessageCategoryFilter + //{ + // get => _minMessageCategoryFilter; + // set => _minMessageCategoryFilter = value; + //} + public static eMessageCategory MinMessageCategoryFilter { get; set; } + + public static void SetMinMessageCategoryFilter(eMessageCategory category) + { + MinMessageCategoryFilter = category; + } + + + public bool GetMessageStatusPinned(MongoDbLogItem message) { @@ -80,9 +87,8 @@ protected override async Task OnInitializedAsync() cm.AutoMap(); cm.SetIgnoreExtraElements(true); }); - } - _totalPages = await DataService.GetTotalPagesAsync(_itemsPerPage, MinMessageCategoryFilter); + } UpdateValuesOnChange(ViewModel._tcoObject); @@ -117,7 +123,7 @@ public async Task AcknowledgeAllMessages() { try { - await DataService.AcknowledgeAllMessages(ViewModel.MessageDisplay); + //await DataService.AcknowledgeAllMessages(ViewModel.MessageDisplay); } catch (System.Exception ex) { @@ -129,7 +135,7 @@ public async Task AcknowledgeMessage(ulong? identity, int messageDigest) { try { - await DataService.AcknowledgeSingleMessage(identity, messageDigest, ViewModel.MessageDisplay); + //await DataService.AcknowledgeSingleMessage(identity, messageDigest, ViewModel.MessageDisplay); } catch (System.Exception ex) { @@ -137,80 +143,71 @@ public async Task AcknowledgeMessage(ulong? identity, int messageDigest) } } - public static void SetDefaultCategoryFilter(eMessageCategory category) - { - DefaultCategory = category; - } - - public static void SetItemsPerPage(int value) - { - _itemsPerPage = value; - } - public void Dispose() { _messageUpdateTimer?.Dispose(); } + private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) { await InvokeAsync(async () => { //DB Action - await DataService.RefreshDataAsync( _itemsPerPage, MinMessageCategoryFilter, _currentPage); + //await DataService.RefreshDataForDisplayAsync( _itemsPerPage, MinMessageCategoryFilter, _currentPage); //Update plc Data - await ViewModel.UpdateMessagesAsync(); + //await ViewModel.UpdateMessagesAsync(); - _mongoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData) - .Where(x => ViewModel.CalculateDepth(x) <= DepthValue); - DataService.ExtractIdentity(); - await DataService.FilterDataEntriesToUpdate(); - DataService.CategorizeMessages(ViewModel.MessageDisplay.ToList()); + //_mongoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData) + // .Where(x => ViewModel.CalculateDepth(x) <= DepthValue); + //DataService.ExtractIdentity(); + //await DataService.FilterDataEntriesToUpdate(); + //DataService.CategorizeMessages(ViewModel.MessageDisplay.ToList()); - await DataService.PurgeNewerSimilarMessages(); - //await DataService.AutoAckNonPinnedMessages(ViewModel.MessageDisplay); + //await DataService.PurgeNewerSimilarMessages(); + ////await DataService.AutoAckNonPinnedMessages(ViewModel.MessageDisplay); StateHasChanged(); }); } - private async Task PreviousPage() - { - if (_currentPage > 1) - { - _currentPage--; - _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - } - } - - private async Task NextPage() - { - if (_currentPage < TotalPages) - { - _currentPage++; - _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - } - } - - public async Task FirstPage() - { - _currentPage = 1; - _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - } - - public async Task LastPage() - { - _currentPage = TotalPages; - _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - } - - private IEnumerable OrderMongoDbLogItems(IEnumerable items) - { - return items - .Where(m => m.Properties?.sender?.Payload != null) - .OrderByDescending(m => m.TimeStampAcknowledged.HasValue ? 0 : 1) - .ThenByDescending(m => m.UtcTimeStamp) - .ThenByDescending(m => m.TimeStampAcknowledged); - } + //private async Task PreviousPage() + //{ + // if (_currentPage > 1) + // { + // _currentPage--; + // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); + // } + //} + + //private async Task NextPage() + //{ + // if (_currentPage < TotalPages) + // { + // _currentPage++; + // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); + // } + //} + + //public async Task FirstPage() + //{ + // _currentPage = 1; + // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); + //} + + //public async Task LastPage() + //{ + // _currentPage = TotalPages; + // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); + //} + + //private IEnumerable OrderMongoDbLogItems(IEnumerable items) + //{ + // return items + // .Where(m => m.Properties?.sender?.Payload != null) + // .OrderByDescending(m => m.TimeStampAcknowledged.HasValue ? 0 : 1) + // .ThenByDescending(m => m.UtcTimeStamp) + // .ThenByDescending(m => m.TimeStampAcknowledged); + //} public int DepthValue { diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index a533f7d8f..32d1ccc85 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -11,17 +11,12 @@ Active Messages - @@ -29,218 +24,20 @@ Archived Messages - + />*@ - - - - -@* - - No messages found. - - - No messages found. - - - - - - - - - - - - - - - -*@ -@* -
    - @*
    - -
    *@ - @*
    - -
    *@ - @*
    - - @DiagnosticsMessage() -@*
    *@ -@*
    - -
    Fehler Category Rendered Message PLC LoggerMessage Digest (Unique Hash)IdentityAction
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss") @(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString(("MM/dd/yyyy HH:mm:ss")) : "") @message.Level @message.Properties.sender.Payload.Raw @message.Properties.sender.Payload.ParentSymbol@message.Properties.sender.Payload.MessageDigest@message.Properties.ExtractedIdentity - Page @currentPage of @totalPages + Page @_currentPage of @TotalPages - +*@ @@ -190,3 +235,17 @@ else

    No database messages found.

    } *@ + + + + + + +@code { + private string _activeTab = "activeMessages"; // Default active tab + + private void SwitchTab(string tabName) + { + _activeTab = tabName; + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css index 48cac384d..bb401fd5b 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css @@ -12,7 +12,7 @@ button { background-color: #004a8f; /* Darker blue color */ color: #ffffff; /* White text color */ - padding: 5px 20px; /* Padding for top/bottom and left/right */ + padding: 5px 10px; /* Padding for top/bottom and left/right */ border: none; /* Remove default border */ border-radius: 5px; /* Subtly rounded corners */ box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); /* Shadow effect */ @@ -45,6 +45,11 @@ button { pointer-events: none; /* Disable click events */ } +.custom-dropdown { + padding: 5px 10px 5px 10px; /* Adjust padding: top, right, bottom, left */ + max-width : 15rem; +} + .custom-dropdown::after { content: '\25BC'; /* Unicode character for a small black down-pointing triangle */ position: absolute; @@ -52,5 +57,52 @@ button { top: 50%; transform: translateY(-50%); pointer-events: none; /* Ensures the pseudo-element doesn't interfere with dropdown interactions */ + right: 5px; /* Adjust the position of the dropdown arrow */ +} + +.icon-container { + font-size: 1.4rem; +} +.bg-trace { + background-color: rgba(155, 198, 245, 0.5) !important; /* Very light gray with opacity */ +} + +.bg-debug { + background-color: rgba(155, 198, 245, 0.5) !important; /* Soft blue with opacity */ +} + +.bg-info { + background-color: rgba(138, 176, 211, 0.5)!important; /* Soft green with opacity */ +} + +.bg-timedout { + background-color: rgba(64, 108, 158, 0.5)!important; /* Soft yellow with opacity */ +} + +.bg-notification { + background-color: rgba(255, 230, 204, 0.5)!important; /* Soft orange with opacity */ +} + +.bg-warning { + background-color: rgba(228, 146, 58, 0.5) !important; /* Soft peach with opacity */ +} + +.bg-error { + background-color: rgba(245, 145, 145, 0.9) !important; /* Soft red with opacity */ +} + +.bg-programmingerror { + background-color: rgba(255, 179, 179, 0.5)!important; /* Lighter red with opacity */ +} + +.bg-critical { + background-color: rgba(184, 53, 53, 0.5)!important; /* Light crimson with opacity */ } +.bg-fatal { + background-color: rgba(131, 38, 38, 0.5)!important; /* Moderate red with opacity */ +} + +.bg-catastrophic { + background-color: rgba(151, 30, 30, 0.5)!important; /* Slightly deep red with opacity */ +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs index 264f39167..9dcff682c 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs @@ -1,18 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; -using MongoDB.Driver; - -using TcOpen.Inxton.Input; -using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; -using PlcDocu.TcoCore; -using Vortex.Connector; using Vortex.Presentation; -using Microsoft.AspNetCore.Components; namespace TcoCore { @@ -25,250 +17,67 @@ public TcoDiagnosticsAlternativeViewModel() //Console.WriteLine("Default constructor called"); } - private volatile object updatemutex = new object(); + private object updatemutex = new object(); internal IsTcoObject _tcoObject { get; set; } public override object Model { get => this._tcoObject; set => this._tcoObject = value as IsTcoObject; } - //public event Action NewMessageReceived; - - //public IVortexObject AffectedObject { get; set; } - - public object Categories - { - get - { - return Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); - } - } - - /// - /// Gets list of messages to be displayed in message list of the view. - /// public IEnumerable MessageDisplay { get => messageDisplay; - private set { if (messageDisplay == value) { return; } - SetProperty(ref messageDisplay, value); } - } - /// - /// Updates messages of diagnostics view. - /// - internal void UpdateMessages() + internal async Task UpdateMessagesAsync() { if (DiagnosticsRunning) { return; } - lock (updatemutex) - { - DiagnosticsRunning = true; - - Task.Run(() => - { - if (_tcoObject != null && _tcoObject.MessageHandler != null) - { - MessageDisplay = _tcoObject.MessageHandler.GetActiveMessages(); - } - else - { - // Log an error or throw an exception indicating that _tcoObject or MessageHandler is null - } - }).Wait(); + DiagnosticsRunning = true; - DiagnosticsRunning = false; - } - } - - public void RogerMessage(PlainTcoMessage msg) - { - if (msg != null) - { - msg.OnlinerMessage.Pinned.Cyclic = false; - } - } - - public void RogerAllMessages() - { - lock (updatemutex) + await Task.Run(() => { + MessageDisplay = _tcoObject?.MessageHandler?.GetActiveMessages(); + if (MessageDisplay == null) { - - foreach (var item in MessageDisplay.Where(p => p.Pinned)) - { - item.OnlinerMessage.Pinned.Cyclic = false; - } - + throw new InvalidOperationException("The _tcoObject or MessageHandler is null."); } - - } - } - //public void AcknowledgeMessages() - //{ } - //{ - // try - // { - // lock (updatemutex) - // { - // TcoAppDomain.Current.Logger.Information("All message acknowledged {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); + }); - // foreach (var item in DbMessageDisplay.Where(p => p.TimeStampAcknowledged == null)) - - // { - // DateTime currentDateTime = DateTime.UtcNow; - // // Check the MessageDisplay for the same identity - // var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == item.Identity); - // bool isActive = false; - - // if (activeMessage != null) - // { - // activeMessage.OnlinerMessage.Pinned.Cyclic = false; - // Thread.Sleep(100); - // isActive = activeMessage.OnlinerMessage.IsActive; - // } - - // if (!isActive) - // { - // _logger.UpdateMessages(item.Identity, item.TimeStamp, currentDateTime, false); - // } - // else - // { - // TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); - // } - - // TcoAppDomain.Current.Logger.Information("Message acknowledged {@message}", new { Text = item.Text, Category = item.CategoryAsEnum }); - // } - // } - // } - // catch (Exception ex) - // { - // // Log the exception here - // TcoAppDomain.Current.Logger.Error("An error occurred while acknowledging messages: {@error}", ex); - // } - //} - - //public void AcknowledgeMessage(ulong? identity, int messageDigest) - //{ - // //_dataService.UpdateMessage(identity, messageDigest); - //} - //{ - // try - // { - // lock (updatemutex) - // { - // // Find all messages with the given identity and where TimeStampAcknowledged is null - // var messagesToAcknowledge = DbMessageDisplay.Where(m => m.Identity == identity && m.TimeStampAcknowledged == null).ToList(); - - // if (messagesToAcknowledge.Any()) - // { - // DateTime currentDateTime = DateTime.UtcNow; - - // foreach (var messageToAcknowledge in messagesToAcknowledge) - // { - // // Check the MessageDisplay for the same identity - // var activeMessage = MessageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Identity); - // bool isActive = false; - - // if (activeMessage != null) - // { - // activeMessage.OnlinerMessage.Pinned.Cyclic = false; - // Thread.Sleep(100); - // isActive = activeMessage.OnlinerMessage.IsActive; - // } - - // if (!isActive) - // { - // _logger.UpdateMessages(messageToAcknowledge.Identity, messageToAcknowledge.TimeStamp, currentDateTime, false); - // TcoAppDomain.Current.Logger.Information("Message with identity {@identity} acknowledged", identity); - // } - // else - // { - // TcoAppDomain.Current.Logger.Information("Fehler scheint noch aktiv {@payload}", new { rootObject = _tcoObject.HumanReadable, rootSymbol = _tcoObject.Symbol }); - // } - // } - // } - // else - // { - // TcoAppDomain.Current.Logger.Warning("No message found with identity: {@identity} that has a null TimeStampAcknowledged", identity); - // } - // } - // } - // catch (Exception ex) - // { - // Console.WriteLine(ex.ToString()); - // } - //} - - //public void RefreshMessageDisplay() - //{ - // //AcknowledgeMessages(); - // Console.WriteLine($"Refresh"); - // MessageDisplay = _logger.ReadMessages(); - //} - - //public List Messages { get; private set; } = new List(); - - //IEnumerable messageDisplay = new List(); - - //public IEnumerable MessageDisplay - //{ - // get => messageDisplay; - - // private set - // { - // if (messageDisplay == value) - // { - // return; - // } - - // SetProperty(ref messageDisplay, value); - // } - //} - - //IEnumerable dbMessageDisplay = new List(); - //public IEnumerable DbMessageDisplay - //{ - // get => dbMessageDisplay; - - // private set - // { - // if (dbMessageDisplay == value) - // { - // return; - // } - - // SetProperty(ref dbMessageDisplay, value); - // } - //} - - - bool diagnosticsRunning; + DiagnosticsRunning = false; + } - /// - /// Gets or sets whether the diagnostic loop in running. - /// + bool _diagnosticsRunning; public bool DiagnosticsRunning { - get => diagnosticsRunning; + get => _diagnosticsRunning; internal set { - if (diagnosticsRunning == value) + if (_diagnosticsRunning == value) { return; } - SetProperty(ref diagnosticsRunning, value); + SetProperty(ref _diagnosticsRunning, value); } } + public int CalculateDepth(MongoDbLogItem msg) + { + if (string.IsNullOrEmpty(msg.Properties.sender.Payload.ParentSymbol)) + { + return 1; + } + + int depth = msg.Properties.sender.Payload.ParentSymbol.Split('.').Length; + return depth; + } } -} \ No newline at end of file +} diff --git a/src/TcoDrivesBeckhoff/src/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor.csproj b/src/TcoDrivesBeckhoff/src/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor.csproj index e494ef5c9..0244b8b17 100644 --- a/src/TcoDrivesBeckhoff/src/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor.csproj +++ b/src/TcoDrivesBeckhoff/src/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/TcoElements/src/TcOpen.Inxton.TcoElements.Blazor/TcOpen.Inxton.TcoElements.Blazor.csproj b/src/TcoElements/src/TcOpen.Inxton.TcoElements.Blazor/TcOpen.Inxton.TcoElements.Blazor.csproj index dc24cbdb5..fe6adc939 100644 --- a/src/TcoElements/src/TcOpen.Inxton.TcoElements.Blazor/TcOpen.Inxton.TcoElements.Blazor.csproj +++ b/src/TcoElements/src/TcOpen.Inxton.TcoElements.Blazor/TcOpen.Inxton.TcoElements.Blazor.csproj @@ -22,7 +22,7 @@ - + From 01894074cc5c357351d55d4e4cea8513f02bb5b7 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 16 Oct 2023 08:48:24 +0200 Subject: [PATCH 08/13] messages are displayed, filtering works, default value in work --- .../PlcHammer.Hmi.Blazor/Startup.cs | 2 +- .../MessagesTabs/ActiveMessages.razor | 113 ++-- .../MessagesTabs/ActiveMessages.razor.cs | 86 +++ .../Services/DataService.cs | 594 ++++++++++-------- .../Services/IDataService.cs | 20 + .../TcoDiagnosticsAlternativeView.cs | 143 +++-- .../TcoDiagnosticsAlternativeView.razor | 215 +------ 7 files changed, 549 insertions(+), 624 deletions(-) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs index 885587805..e3f444745 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs @@ -110,7 +110,7 @@ public void ConfigureServices(IServiceCollection services) .SetEditValueChangeLogging(Entry.PlcHammer.Connector); services.Configure(Configuration.GetSection("MongoDbSettings")); - services.AddTransient(); + services.AddTransient(); services.AddSingleton(); services.AddBlazorStrap(); } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor index e3fab5c32..279a745a7 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor @@ -1,79 +1,54 @@ -@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping +@using MongoDB.Bson +@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping @using global::TcoCore +@using BlazorStrap

    ActiveMessages

    -
    - @ActiveMessagesCount -
    - -
    -
    - -
    -
    - - @DiagnosticsMessage -
    -
    - - - - - - - - - - - - - - @foreach (var message in MongoDbLogItemsFiltered.Where(m => !m.TimeStampAcknowledged.HasValue)) - { - string rowColorClass = MessageCategoryMapper.GetBackgroundColorForCategory(message?.Level ?? default); - - - - - - - - + + + @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) + { + + } + + + + + + + + + + + + + + - } - -
    PLC TimestampTimestamp AcknowledgedFehler CategoryRendered MessagePLC LoggerFixiertAction
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : "")@((MarkupString)MessageCategoryMapper.GetIconForLevel(message.Level))@message.Properties.sender.Payload.Raw@message.Properties.sender.Payload.ParentSymbol@GetMessageStatusPinned(message) - -
    UTC TimestampTimestamp AcknowledgedRendered MessageLevelMessage Template TextSender Parent Symbol
    + +
    @message.UtcTimeStamp@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : " ")@message.RenderedMessage@message.Level@message.MessageTemplate?.Text@message.Properties?.sender?.Payload?.ParentSymbol
    - - - - - - - - - - - - - @foreach (var message in _mongoDbLogItemFiltered.Skip((_currentPage -1)* _itemsPerPage).Take(_itemsPerPage).Take(_itemsPerPage)) - { - - @*1h behind date in summertime, 12.51 displayed, time shows on PC 13.51, utcnow 11.51 - - - - - - - - - } - -
    PLC TimestampTimestamp AcknowledgedFehler CategoryRendered MessagePLC LoggerAction
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString(("MM/dd/yyyy HH:mm:ss")) : "")@message.Level@message.Properties.sender.Payload.Raw@message.Properties.sender.Payload.ParentSymbol - -
    - -
    - - - Page @_currentPage of @TotalPages - - -
    -*@ - - - - -@*
    -

    Count of Unique Messages: @UniqueMessagesCount

    -

    Count of DbMessageDisplay: @DbMessageDisplayCount

    -
    - -
    -
    - -
    -
    - -
    -
    - - @DiagnosticsMessage() -
    -
    - -@if (ViewModel.DbMessageDisplay != null && ViewModel.DbMessageDisplay.Any()) -{ - - - - - - - - - - - - - - @foreach (var message in uniqueMessages.Skip((currentPage - 1) * itemsPerPage).Take(itemsPerPage)) - { - - - - - - - - - - } - -
    TimestampTimestamp AcknowledgedTextCategoryPfadPinnedAction
    @message.TimeStamp.ToString("yyyy-MM-dd HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")@message.Text@message.CategoryAsEnum@message.ParentsObjectSymbol@message.Pinned - -
    - -
    - - - Page @currentPage of @totalPages - - -
    - - -} -else -{ -

    No database messages found.

    -} -*@ - - - - - - @code { private string _activeTab = "activeMessages"; // Default active tab From 3645a28cff62621d33db622ce90793a6db8789b8 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 17 Oct 2023 09:52:57 +0200 Subject: [PATCH 09/13] wip --- .../MessagesTabs/ActiveMessages.razor | 25 +- .../MessagesTabs/ActiveMessages.razor.cs | 53 ++- .../MessagesTabs/ActiveMessages.razor.css | 37 ++ .../MessagesTabs/ArchivedMessages.razor | 136 +++--- .../MessagesTabs/ArchivedMessages.razor.cs | 81 ++++ .../Services/DataService.cs | 421 +++++++++--------- .../Services/IDataService.cs | 7 +- .../TcoDiagnosticsAlternativeView.cs | 60 +-- .../TcoDiagnosticsAlternativeView.razor | 20 +- .../TcoDiagnosticsAlternativeViewModel.cs | 11 +- 10 files changed, 455 insertions(+), 396 deletions(-) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor index 279a745a7..f75063f16 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor @@ -7,12 +7,20 @@ - - @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) - { - - } - + + + + @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) + { + + } + + + + Depth Value: @DepthValue + + + @@ -25,7 +33,7 @@     		Level Message Template Text Sender Parent SymbolAction
    @message.Level @message.MessageTemplate?.Text @message.Properties?.sender?.Payload?.ParentSymbol
    UTC TimestampTimestamp AcknowledgedRendered MessageLevelMessage Template TextSender Parent Symbol
    @message.UtcTimeStamp@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : " ")@message.RenderedMessage@message.Level@message.MessageTemplate?.Text@message.Properties?.sender?.Payload?.ParentSymbol
    - - - - - - - - - - - @foreach (var message in MongoDbLogItemsFiltered.Where(m => m.TimeStampAcknowledged.HasValue)) - { - - - - - - - - } - -
    PLC TimestampTimestamp AcknowledgedFehler CategoryRendered MessagePLC Logger
    @message.Properties.sender.Payload.PlcTimeStamp.ToString("MM/dd/yyyy HH:mm:ss")@(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString(("MM/dd/yyyy HH:mm:ss")) : "")@((MarkupString)MessageCategoryMapper.GetIconForLevel(message.Level))@message.Properties.sender.Payload.Raw@message.Properties.sender.Payload.ParentSymbol
    -
    - - - Page @CurrentPage of @TotalPages - - -
    - - -@code { - [Parameter] public IEnumerable MongoDbLogItemsFiltered { get; set; } - [Parameter] public int CurrentPage { get; set; } - [Parameter] public int TotalPages { get; set; } - [Parameter] public bool IsFirstDisabled { get; set; } - [Parameter] public bool IsLastDisabled { get; set; } - [Parameter] public Func FirstPage { get; set; } - [Parameter] public Func PreviousPage { get; set; } - [Parameter] public Func NextPage { get; set; } - [Parameter] public Func LastPage { get; set; } - [Parameter] public Func AcknowledgeMessageCallback { get; set; } - [Parameter] public Func AcknowledgeAllMessages { get; set; } - [Parameter] public string ActiveMessagesCount { get; set; } - [Parameter] public int MaxDiagnosticsDepth { get; set; } - [Parameter] public IEnumerable EMessageCategories { get; set; } - [Parameter] public eMessageCategory MinMessageCategoryFilter { get; set; } - [Parameter] public string DiagnosticsMessage { get; set; } - [Parameter] public int DepthValue { get; set; } - [Parameter] public EventCallback MinMessageCategoryFilterChanged { get; set; } - - private async Task OnMinMessageCategoryFilterChanged(eMessageCategory newValue) - { - MinMessageCategoryFilter = newValue; - await MinMessageCategoryFilterChanged.InvokeAsync(newValue); - } - -} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs new file mode 100644 index 000000000..b7a346569 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; +using global::TcoCore; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.MessagesTabs +{ + public partial class ArchivedMessages + { + [Parameter] + public IDataService DataService { get; set; } + + [Parameter] + public int MaxDiagnosticsDepth { get; set; } + + [Parameter] + public int InitalDepthValue { get; set; } + + [Parameter] + public int DepthValue { get; set; } + + [Parameter] + public int DepthValueThreshold { get; set; } + //[Parameter] + //public Func AcknowledgeMessageCallback { get; set; } + + //[Parameter] + //public Func AcknowledgeAllMessages { get; set; } + + //[Parameter] + //public string ActiveMessagesCount { get; set; } + + [Parameter] + public Func GetMessageStatusPinned { get; set; } + + [Parameter] + public eMessageCategory InitialCategory { get; set; } + + private eMessageCategory DropDownSelectedCategory { get; set; } + + private int _itemsPerPage = 6; + int _currentPage = 1; + int _totalPages = 10; + private IEnumerable _messagesToDisplayArchive = new List(); + + protected override async Task OnInitializedAsync() + { + + DropDownSelectedCategory = InitialCategory; + DepthValue = InitalDepthValue; + + await GetDataFilteredAsyncForArchive(); + } + + protected override async Task OnParametersSetAsync() + { + await GetDataFilteredAsyncForArchive(); + } + + public async Task GetDataFilteredAsyncForArchive() + { + + DateTime? startDate = DateTime.Now.AddDays(-7); // Example: 7 days ago + DateTime? endDate = DateTime.Now; + string keyword = ""; + eMessageCategory category = DropDownSelectedCategory; // Example category + int _depthValue = DepthValue; + + var result = await DataService.GetDataAsyncForArchive(_itemsPerPage, _currentPage, category, _depthValue, startDate, endDate, keyword); + + List filteredItems = result.messages; + long totalCount = result.count; + _totalPages = (int)Math.Ceiling((double)totalCount / _itemsPerPage); + _messagesToDisplayArchive = result.messages; + } + + } +} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 05ecd07f6..1338ee3f8 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -26,139 +26,179 @@ public DataService(IOptions settings) _collectionName = settings.Value.CollectionName; } - //public IEnumerable CachedData { get; set; } - //public IEnumerable CachedDataEntriesToUpdate { get; set; } - //set this by the Plc via the View.cs public IEnumerable ActiveMessage { get; set; } - - public async Task<(List messages, long count)> GetDataGetDataAsyncForActive( - int itemsPerPage, - int currentPage, - eMessageCategory category = eMessageCategory.All, - DateTime? startDate = null, - DateTime? endDate = null, - string? keyword = null) + //Query from Db, used for AutoAcknow + private List MessagesReadyToAck { get; set; } + private List MessagesUnAckedInDb { get; set; } + + public async Task<(List messages, long count)> GetDataAsycForActive( + int itemsPerPage, + int currentPage, + eMessageCategory category, + int? depthValue, + DateTime? startDate = null, + DateTime? endDate = null, + string? keyword = null) { var collection = _database.GetCollection(_collectionName); - var dateFilter = BuildDateFilter(startDate, endDate); - var keywordFilter = BuildKeywordFilter(keyword); - var categoryFilter = BuildCategoryFilter(category); - - var combinedFilter = Builders.Filter.And(dateFilter, keywordFilter, categoryFilter); + var combinedFilter = BuildDateFilter(startDate, endDate) + & BuildKeywordFilter(keyword) + & BuildCategoryFilter(category) + & BuildTimeStampAcknowledgedFilter(); var messages = await collection.Find(combinedFilter) .Skip((currentPage - 1) * itemsPerPage) .Limit(itemsPerPage) + .SortByDescending(item => item.UtcTimeStamp) .ToListAsync(); var count = await collection.CountDocumentsAsync(combinedFilter); + MessagesUnAckedInDb = messages; return (messages, count); } + public async Task<(List messages, long count)> GetDataAsyncForArchive( + int itemsPerPage, + int currentPage, + eMessageCategory category, + int? depthValue, + DateTime? startDate = null, + DateTime? endDate = null, + string? keyword = null) + { + var collection = _database.GetCollection(_collectionName); + + var combinedFilter = BuildDateFilter(startDate, endDate) + & BuildKeywordFilter(keyword) + & BuildCategoryFilter(category) + & BuildTimeStampAcknowledgedForArchiveFilter(); + + var messages = await collection.Find(combinedFilter) + .Skip((currentPage - 1) * itemsPerPage) + .Limit(itemsPerPage) + .SortByDescending(item => item.UtcTimeStamp) + .ToListAsync(); + + var count = await collection.CountDocumentsAsync(combinedFilter); + return (messages, count); + } - public Task> GetDataGetDataAsyncForArchive(int itemsPerPage, eMessageCategory category, int currentPage) => throw new NotImplementedException(); - - - public Task AcknowledgeAllMessages() => throw new NotImplementedException(); public Task AcknowledgeMessage(ulong identity, int messageDigest) => throw new NotImplementedException(); + + //private FilterDefinition BuildDepthValueFilter(int? depthValue, int? depthValueThreshold) + //{ + // var filterBuilder = Builders.Filter; + // if (depthValue.HasValue) + // { + // return filterBuilder.Gte(depthValueThreshold.Value, depthValue.Value); + // } - - private FilterDefinition BuildDateFilter(DateTime? startDate, DateTime? endDate) + // return filterBuilder.Empty; + //} + //} + public async Task TryAutoAcknowledgeMessages(IEnumerable msg) { - var filterBuilder = Builders.Filter; - var filter = filterBuilder.Empty; + var unAcknowledgedMessages = await QueryDb(); + // Step 2: Filter these entries based on the ActiveMessage list + var filteredActiveMessages = ActiveMessage.ToList(); + //.Where(x => !x.Pinned); - if (startDate.HasValue) - { - filter &= filterBuilder.Gte(item => item.UtcTimeStamp, startDate.Value); - } - if (endDate.HasValue) + // Step 3: Compare each unacknowledged message with the PlainTcoMessage list + var messagesToAck = new List(unAcknowledgedMessages); // Start with all unacknowledged messages + + foreach (var message in unAcknowledgedMessages) { - filter &= filterBuilder.Lte(item => item.UtcTimeStamp, endDate.Value); + var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); + if (!identity.HasValue) continue; // If identity is null, skip to the next iteration + + bool isMessageAcknowledged = filteredActiveMessages.Any(x => + x.Identity == (ulong)identity.Value && + x.MessageDigest == message.Properties.sender.Payload.MessageDigest + ); + + if (isMessageAcknowledged) + { + messagesToAck.Remove(message); + } } - - return filter; + await BulkUpdateTimestampAcknowledgedAsync(messagesToAck); } - private FilterDefinition BuildKeywordFilter(string keyword) - { - var filterBuilder = Builders.Filter; - return !string.IsNullOrEmpty(keyword) - ? filterBuilder.Regex(item => item.RenderedMessage, new BsonRegularExpression(keyword, "i")) - : filterBuilder.Empty; - } - - private FilterDefinition BuildCategoryFilter(eMessageCategory? category) + public async Task BulkUpdateTimestampAcknowledgedAsync(List messagesToUpdate) { - var filterBuilder = Builders.Filter; + var _collection = _database.GetCollection(_collectionName); - if (category.HasValue) + var timeStampAcknowledged = DateTime.UtcNow; + var bulkOps = new List>(); + + foreach (var message in messagesToUpdate) { - var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(category.Value); - return filterBuilder.In(item => item.Level, levelsToInclude); + var filter = Builders.Filter.Eq(item => item.Id, message.Id); + var update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + + var upsertOne = new UpdateOneModel(filter, update); + bulkOps.Add(upsertOne); } - return filterBuilder.Empty; + if (bulkOps.Any()) + { + await _collection.BulkWriteAsync(bulkOps); + } } - - - //public async Task UpdateAllMessagesInDb(List msg) + //private FilterDefinition BuildDepthValueFilter(int? depthValue, int? depthValueThreshold) //{ - // DateTime timeStampAcknowledged = DateTime.UtcNow; - - // var _collection = _database.GetCollection(_collectionName); + // var filterBuilder = Builders.Filter; - // var _update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + // if (depthValue.HasValue) + // { + // return filterBuilder.Gte(depthValueThreshold.Value, depthValue.Value); + // } - // var _bulkops = new List>(); + // return filterBuilder.Empty; - // foreach (var _item in msg) - // { - // var _filter = Builders.Filter.And( - // Builders.Filter.Eq("Properties.ExtractedIdentity", _item.Identity), - // Builders.Filter.Eq("Properties.sender.Payload.MessageDigest", _item.MessageDigest) - // ); + public async Task AcknowledgeAllMessages(IEnumerable msg) + { - // var _updateOne = new UpdateOneModel(_filter, _update); - // _bulkops.Add(_updateOne); - // } + // List messagesToUpdate = new List(); + + // foreach (var _messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) + // { + // var _resultMessage = await TryAcknowledgeMessageInternal(_messageToAcknowledge, messageDisplay); + // if (_resultMessage != null) + // { + // messagesToUpdate.Add(_resultMessage); + // } + // } + + // if (messagesToUpdate.Any()) + // { + // await UpdateAllMessagesInDb(messagesToUpdate); + // } + } - // if (_bulkops.Any()) - // { - // await _collection.BulkWriteAsync(_bulkops); - // } - //} + public async Task> QueryDb() + { + var _collection = _database.GetCollection(_collectionName); - //public async Task AcknowledgeAllMessages(IEnumerable messageDisplay) - //{ - // if (CategorizedMessages == null) - // { - // CategorizeMessages(messageDisplay.ToList()); - // } + // Step 1: Query for entries with TimestampAcknowledged == null + var filter = BuildTimeStampAcknowledgedFilter(); + var projection = Builders.Projection + .Include(item => item.TimeStampAcknowledged) + .Include(item => item.Properties.sender.Payload.MessageDigest) + .Include(item => item.RenderedMessage); - // List messagesToUpdate = new List(); + var unAcknowledgedMessages = await _collection.Find(filter).Project(projection).ToListAsync(); - // foreach (var _messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) - // { - // var _resultMessage = await TryAcknowledgeMessageInternal(_messageToAcknowledge, messageDisplay); - // if (_resultMessage != null) - // { - // messagesToUpdate.Add(_resultMessage); - // } - // } + return unAcknowledgedMessages; + } - // if (messagesToUpdate.Any()) - // { - // await UpdateAllMessagesInDb(messagesToUpdate); - // } - //} //public async Task AcknowledgeSingleMessage(ulong? identity, int messageDigest, IEnumerable messageDisplay) //{ @@ -206,50 +246,8 @@ private FilterDefinition BuildCategoryFilter(eMessageCategory? c // return null; //} - //public async Task UpdateMessageInDb(ulong? identity, int messageDigest) - //{ - // await FilterDataEntriesToUpdate(); - - // var entriesToUpdate = CachedDataEntriesToUpdate - // .Where(item => item.Properties.ExtractedIdentity == identity - // && item.Properties.sender.Payload.MessageDigest == messageDigest) - // .ToList(); - - // //Problems with Dotnet5 and Logging - // DateTime timeStampAcknowledged = DateTime.UtcNow.AddHours(1); - // // Update the TimeStampAcknowledged field for each matching entry - // foreach (var entry in entriesToUpdate) - // { - // entry.TimeStampAcknowledged = timeStampAcknowledged; - // } - - // // Get the collection - // var collection = _database.GetCollection(_collectionName); - - // // Build the update definition - // var update = Builders.Update - // .Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); - // // Apply the update to each matching document in the database - // foreach (var entry in entriesToUpdate) - // { - // var filter = Builders.Filter.Eq(item => item.Id, entry.Id); - // await collection.UpdateOneAsync(filter, update); - // } - //} - //public async Task AutoAckNonPinnedMessages(IEnumerable messages) - //{ - // foreach (var message in CategorizedMessages.NonActiveMessages.Where(m => m != null)) - // { - // ulong? identity = message.Properties?.ExtractedIdentity; - // int? messageDigest = message.Properties?.sender?.Payload?.MessageDigest; - // if (identity.HasValue && messageDigest.HasValue) - // { - // await UpdateMessageInDb(identity, messageDigest.Value); - // } - // } - //} //public async Task PurgeNewerSimilarMessages() //{ @@ -285,102 +283,99 @@ private FilterDefinition BuildCategoryFilter(eMessageCategory? c // } //} - //public async Task FilterDataEntriesToUpdate() - //{ - // CachedDataEntriesToUpdate = CachedData - // .Where(item => item.TimeStampAcknowledged == null) - // .ToList(); - // await PurgeNewerSimilarMessages(); - //} - //public void ExtractIdentity() - //{ - // var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); - // foreach (var item in CachedData) - // { - // var match = regex.Match(item.RenderedMessage); - // if (match.Success) - // { - // var identityString = match.Groups[1].Value; - // if (ulong.TryParse(identityString, out ulong identity)) - // { - // item.Properties.ExtractedIdentity = identity; - // } - // else - // { - // Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log - // } - // } - // } - //} - //public class MessageResult - //{ - // public IEnumerable NonActiveMessages { get; set; } - // public IEnumerable ActiveMessages { get; set; } - // public IEnumerable ActiveMessagesPinned { get; set; } - //} + private FilterDefinition BuildDateFilter(DateTime? startDate, DateTime? endDate) + { + var filterBuilder = Builders.Filter; + var filter = filterBuilder.Empty; - //public MessageResult CategorizedMessages { get; set; } + if (startDate.HasValue) + { + filter &= filterBuilder.Gte(item => item.UtcTimeStamp, startDate.Value); + } + if (endDate.HasValue) + { + filter &= filterBuilder.Lte(item => item.UtcTimeStamp, endDate.Value); + } - ////Categorizes Messages depending on - //// if active in DB, and not in Plc => it shall Acknowledge them - //// if active in DB and in PLC => Ignore - //// if Pinned or not - //public void CategorizeMessages(List msg) - //{ - // var nonActiveInMessages = new List(); - // var activeInMessages = new List(); - // var activeInMessagesPinned = new List(); + return filter; + } - // foreach (var item in CachedDataEntriesToUpdate) - // { - // var matchingMessage = msg.FirstOrDefault(m => - // m.Identity == item.Properties?.ExtractedIdentity && - // m.MessageDigest == item.Properties?.sender?.Payload?.MessageDigest); + private FilterDefinition BuildKeywordFilter(string keyword) + { + var filterBuilder = Builders.Filter; - // if (matchingMessage == null) - // { - // nonActiveInMessages.Add(item); - // } - // else if (matchingMessage.OnlinerMessage.Pinned.Cyclic == true) - // { - // activeInMessagesPinned.Add(item); - // } - // else - // { - // activeInMessages.Add(item); - // } - // } + return !string.IsNullOrEmpty(keyword) + ? filterBuilder.Regex(item => item.RenderedMessage, new BsonRegularExpression(keyword, "i")) + : filterBuilder.Empty; + } - // CategorizedMessages = new MessageResult - // { - // NonActiveMessages = nonActiveInMessages, - // ActiveMessages = activeInMessages, - // ActiveMessagesPinned = activeInMessagesPinned - // }; - //} + private FilterDefinition BuildCategoryFilter(eMessageCategory? category) + { + var filterBuilder = Builders.Filter; + + if (category.HasValue) + { + var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(category.Value); + return filterBuilder.In(item => item.Level, levelsToInclude); + } + + return filterBuilder.Empty; + } + + public ulong? ExtractIdentityFromRenderedMessage(string renderedMessage) + { + var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); + var match = regex.Match(renderedMessage); + if (match.Success) + { + var identityString = match.Groups[1].Value; + if (ulong.TryParse(identityString, out ulong identity)) + { + return identity; + } + else + { + Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log + return null; + } + } + return null; + } - //public async Task GetTotalPagesAsync(int itemsPerPage, eMessageCategory? category) + //private FilterDefinition BuildIdentityFilter(List identities) //{ - // var collection = _database.GetCollection(_collectionName); + // return Builders.Filter.In(item => ExtractIdentityFromRenderedMessage(item.RenderedMessage).Value, identities); + //} - // var filterBuilder = Builders.Filter; - // var filter = filterBuilder.Empty; + private FilterDefinition BuildMessageDigestFilter(List messageDigests) + { + return Builders.Filter.In(item => item.Properties.sender.Payload.MessageDigest, messageDigests); + } - // if (category.HasValue) - // { - // int categoryValue = (int)category.Value; - // var correspondingLevel = MessageCategoryMapper.MapMessageCategoryToLevel((eMessageCategory)categoryValue); - // var correspondingCategory = MessageCategoryMapper.MapLevelToMessageCategory(correspondingLevel); - // var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(correspondingCategory); - // filter &= filterBuilder.In(item => item.Level, levelsToInclude); - // } + private FilterDefinition BuildTimeStampAcknowledgedFilter() + { + return Builders.Filter.Eq(item => item.TimeStampAcknowledged, null); + } + + private FilterDefinition BuildTimeStampAcknowledgedForArchiveFilter() + { + var filterBuilder = Builders.Filter; + return filterBuilder.Ne(item => item.TimeStampAcknowledged, null); + } - // var totalCount = await collection.CountDocumentsAsync(filter); - // var totalPages = (int)Math.Ceiling((double)totalCount / itemsPerPage); + public int CalculateDepth(MongoDbLogItem msg) + { + if (string.IsNullOrEmpty(msg.Properties.sender.Payload.ParentSymbol)) + { + return 1; + } + + int depth = msg.Properties.sender.Payload.ParentSymbol.Split('.').Length; + return depth; + } - // return totalPages; } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs index 599282244..985e86746 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs @@ -11,10 +11,11 @@ namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services public interface IDataService { public IEnumerable ActiveMessage { get; set; } - public Task> GetDataGetDataAsyncForArchive(int itemsPerPage, eMessageCategory category, int currentPage); - public Task<(List messages, long count)> GetDataGetDataAsyncForActive(int itemsPerPage, int currentPage, eMessageCategory category = eMessageCategory.All, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); + public Task<(List messages, long count)> GetDataAsycForActive(int itemsPerPage, int currentPage, eMessageCategory category, int? depthValue, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); + public Task<(List messages, long count)> GetDataAsyncForArchive (int itemsPerPage, int currentPage, eMessageCategory category, int? depthValue, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); + public Task AcknowledgeAllMessages(IEnumerable msg); - public Task AcknowledgeAllMessages(); public Task AcknowledgeMessage(ulong identity, int messageDigest); + Task TryAutoAcknowledgeMessages(IEnumerable msg); } } \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index 4467eb41e..7f3bcaaed 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -40,27 +40,20 @@ public partial class TcoDiagnosticsAlternativeView : IDisposable private string ActiveMessagesCount() => "Aktive Messages : " + ViewModel._tcoObject.MessageHandler.ActiveMessagesCount; private string DiagnosticsMessage() => "Diag depth : " + DepthValue; + private int _maxDiagnosticsDepth = 20; private static int _depthValue; - public static int SetDefaultDepth(int item) => _depthValue = item; + //public static int SetDefaultDepth(int item) => _depthValue = item; - private static eMessageCategory _minMessageCategoryFilter; + //private static eMessageCategory _minMessageCategoryFilter; - //public static eMessageCategory MinMessageCategoryFilter - //{ - // get => _minMessageCategoryFilter; - // set => _minMessageCategoryFilter = value; - //} - public static eMessageCategory MinMessageCategoryFilter { get; set; } + public static eMessageCategory MinMessageCategoryFilter{ get; set; } public static void SetMinMessageCategoryFilter(eMessageCategory category) { MinMessageCategoryFilter = category; } - - - public bool GetMessageStatusPinned(MongoDbLogItem message) { var matchingMessage = ViewModel.MessageDisplay.FirstOrDefault( @@ -91,7 +84,7 @@ protected override async Task OnInitializedAsync() } UpdateValuesOnChange(ViewModel._tcoObject); - + DataService.ActiveMessage = ViewModel.MessageDisplay; InitializeDiagnosticsUpdateTimer(); } @@ -155,8 +148,8 @@ await InvokeAsync(async () => //DB Action //await DataService.RefreshDataForDisplayAsync( _itemsPerPage, MinMessageCategoryFilter, _currentPage); //Update plc Data - //await ViewModel.UpdateMessagesAsync(); - + await ViewModel.UpdateMessagesAsync(); + DataService.ActiveMessage = ViewModel.MessageDisplay; //_mongoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData) // .Where(x => ViewModel.CalculateDepth(x) <= DepthValue); //DataService.ExtractIdentity(); @@ -170,45 +163,6 @@ await InvokeAsync(async () => }); } - //private async Task PreviousPage() - //{ - // if (_currentPage > 1) - // { - // _currentPage--; - // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - // } - //} - - //private async Task NextPage() - //{ - // if (_currentPage < TotalPages) - // { - // _currentPage++; - // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - // } - //} - - //public async Task FirstPage() - //{ - // _currentPage = 1; - // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - //} - - //public async Task LastPage() - //{ - // _currentPage = TotalPages; - // _mongoDbLogItemFiltered = await DataService.GetDataAsync(_itemsPerPage, MinMessageCategoryFilter, _currentPage); - //} - - //private IEnumerable OrderMongoDbLogItems(IEnumerable items) - //{ - // return items - // .Where(m => m.Properties?.sender?.Payload != null) - // .OrderByDescending(m => m.TimeStampAcknowledged.HasValue ? 0 : 1) - // .ThenByDescending(m => m.UtcTimeStamp) - // .ThenByDescending(m => m.TimeStampAcknowledged); - //} - public int DepthValue { get diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index 32d1ccc85..354491f2c 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -2,7 +2,6 @@ @using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.MessagesTabs @using Vortex.Presentation.Controls.Blazor.RenderableContent -@using Blazm.Components @namespace TcoCore @using BlazorStrap.V5 @@ -14,9 +13,9 @@ @@ -24,16 +23,13 @@ Archived Messages - @**@ + GetMessageStatusPinned="GetMessageStatusPinned" + DepthValue="@DepthValue" + InitialCategory="@MinMessageCategoryFilter" + /> diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs index 9dcff682c..5a436bd41 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs @@ -69,15 +69,6 @@ internal set } } - public int CalculateDepth(MongoDbLogItem msg) - { - if (string.IsNullOrEmpty(msg.Properties.sender.Payload.ParentSymbol)) - { - return 1; - } - - int depth = msg.Properties.sender.Payload.ParentSymbol.Split('.').Length; - return depth; - } + } } From bfb79b3e10ca89f712877cf3a9c7dc9031492afa Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 17 Oct 2023 18:06:01 +0200 Subject: [PATCH 10/13] wroking on pruging sometimes standing messages from the plc not showing when deleting duplicate, it deleetes or timestamp all --- .../Filter/FilterHelper.cs | 61 +++ .../Mapping/MongoDbLogItem.cs | 3 +- .../MessagesTabs/ActiveMessages.razor | 7 +- .../MessagesTabs/ActiveMessages.razor.cs | 23 +- .../MessagesTabs/ActiveMessages.razor.css | 38 +- .../MessagesTabs/ArchivedMessages.razor | 2 +- .../MessagesTabs/ArchivedMessages.razor.cs | 4 + .../Services/DataService.cs | 354 +++++++++--------- .../Services/IDataService.cs | 7 +- .../TcoDiagnosticsAlternativeView.cs | 57 +-- 10 files changed, 273 insertions(+), 283 deletions(-) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Filter/FilterHelper.cs diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Filter/FilterHelper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Filter/FilterHelper.cs new file mode 100644 index 000000000..b320fab4c --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Filter/FilterHelper.cs @@ -0,0 +1,61 @@ +using System; + +using MongoDB.Bson; +using MongoDB.Driver; + +using TcoCore; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +public class FilterHelper +{ + public static FilterDefinition BuildDateFilter(DateTime? startDate, DateTime? endDate) + { + var filterBuilder = Builders.Filter; + var filter = filterBuilder.Empty; + + if (startDate.HasValue) + { + filter &= filterBuilder.Gte(item => item.UtcTimeStamp, startDate.Value); + } + if (endDate.HasValue) + { + filter &= filterBuilder.Lte(item => item.UtcTimeStamp, endDate.Value); + } + + return filter; + } + + public static FilterDefinition BuildKeywordFilter(string keyword) + { + var filterBuilder = Builders.Filter; + + return !string.IsNullOrEmpty(keyword) + ? filterBuilder.Regex(item => item.RenderedMessage, new BsonRegularExpression(keyword, "i")) + : filterBuilder.Empty; + } + + public static FilterDefinition BuildCategoryFilter(eMessageCategory? category) + { + var filterBuilder = Builders.Filter; + + if (category.HasValue) + { + var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(category.Value); + return filterBuilder.In(item => item.Level, levelsToInclude); + } + + return filterBuilder.Empty; + } + + public static FilterDefinition BuildTimeStampAcknowledgedFilter() + { + return Builders.Filter.Eq(item => item.TimeStampAcknowledged, null); + } + + public static FilterDefinition BuildTimeStampAcknowledgedForArchiveFilter() + { + var filterBuilder = Builders.Filter; + return filterBuilder.Ne(item => item.TimeStampAcknowledged, null); + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs index 9a8cb2b77..0767bbe37 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs @@ -131,8 +131,7 @@ public class Payload public ulong Identity { get; set; } - - public int MessageDigest { get; set; } // Adding MessageDigest property + public int MessageDigest { get; set; } } public class Exception diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor index f75063f16..f4e3b10f6 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor @@ -56,10 +56,5 @@ } - + - - - - - diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs index 5234ae9a7..ed407b855 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs @@ -24,14 +24,6 @@ public partial class ActiveMessages [Parameter] public int DepthValueThreshold { get; set; } - //[Parameter] - //public Func AcknowledgeMessageCallback { get; set; } - - //[Parameter] - //public Func AcknowledgeAllMessages { get; set; } - - //[Parameter] - //public string ActiveMessagesCount { get; set; } [Parameter] public Func GetMessageStatusPinned { get; set; } @@ -41,12 +33,12 @@ public partial class ActiveMessages private eMessageCategory DropDownSelectedCategory { get; set; } - private int _itemsPerPage = 6; + private int _itemsPerPage = 5; int _currentPage = 1; int _totalPages = 10; private IEnumerable _messagesToDisplay = new List(); - protected override async Task OnInitializedAsync() + protected override async Task OnInitializedAsync() { DropDownSelectedCategory = InitialCategory; @@ -63,7 +55,6 @@ protected override async Task OnParametersSetAsync() public async Task GetDataFilteredAsync() { - DateTime? startDate = DateTime.Now.AddDays(-7); // Example: 7 days ago DateTime? endDate = DateTime.Now; string keyword = ""; @@ -75,17 +66,21 @@ public async Task GetDataFilteredAsync() List filteredItems = result.messages; long totalCount = result.count; _totalPages = (int)Math.Ceiling((double)totalCount / _itemsPerPage); + if (_totalPages < 1) + { + _totalPages = 1; + } _messagesToDisplay = result.messages; } private async Task AutoAcknowledgeMessages(IEnumerable messages) { - await DataService.TryAutoAcknowledgeMessages(messages); + await DataService.AutoAcknowledgeMessages(messages); } - private async Task AcknowledgeMessages(IEnumerable messages) + private async Task AcknowledgeMessages() { - await DataService.AcknowledgeAllMessages(messages); + await DataService.AcknowledgeAllMessages(); } public async Task AcknowledgeMessage(ulong? identity, int messageDigest) diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css index 0cad5670b..5f282702b 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css @@ -1,37 +1 @@ -/* Button styling */ -/*button { - background-color: #004a8f;*/ /* Darker blue color */ - /*color: #ffffff;*/ /* White text color */ - /*padding: 5px 10px;*/ /* Padding for top/bottom and left/right */ - /*border: none;*/ /* Remove default border */ - /*border-radius: 5px;*/ /* Subtly rounded corners */ - /*box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);*/ /* Shadow effect */ - /*cursor: pointer;*/ /* Hand cursor on hover */ - /*transition: all 0.3s ease;*/ /* Transition effect for hover state */ -/*}*/ - - /* Hover effect for the button */ - /*button:hover { - background-color: #003366;*/ /* Even darker blue color on hover */ - /*box-shadow: 0 6px 8px rgba(0, 0, 0, 0.2);*/ /* Increased shadow on hover */ - /*} - - button:focus { - outline: none; - box-shadow: none; - background-color: #004a8f; - color: #ffffff;*/ /* White text color */ - /*} - - button:active { - transform: scale(0.98);*/ /* Slightly reduce the size of the button */ - /*box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);*/ /* Reduced shadow when pressed */ - /*} - -.disabled-button { - background-color: #cccccc;*/ /* Grey background */ - /*color: #666666;*/ /* Darker grey text */ - /*cursor: not-allowed;*/ /* No action cursor */ - /*pointer-events: none;*/ /* Disable click events */ -/*}*/ - + \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor index 90db1e9f7..184357853 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor @@ -53,7 +53,7 @@ } - + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs index b7a346569..11faad53b 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs @@ -74,6 +74,10 @@ public async Task GetDataFilteredAsyncForArchive() List filteredItems = result.messages; long totalCount = result.count; _totalPages = (int)Math.Ceiling((double)totalCount / _itemsPerPage); + if (_totalPages < 1) + { + _totalPages = 1; + } _messagesToDisplayArchive = result.messages; } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 1338ee3f8..ed29acf24 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -26,27 +26,27 @@ public DataService(IOptions settings) _collectionName = settings.Value.CollectionName; } - //set this by the Plc via the View.cs - public IEnumerable ActiveMessage { get; set; } - //Query from Db, used for AutoAcknow - private List MessagesReadyToAck { get; set; } - private List MessagesUnAckedInDb { get; set; } + //set viwa the view.cs, gets it from ViewModel.cs via Plc + public IEnumerable MessageDisplay { get; set; } + private List StillActiveMessagesAfterPinnedTest { get; set; } public async Task<(List messages, long count)> GetDataAsycForActive( - int itemsPerPage, - int currentPage, - eMessageCategory category, - int? depthValue, - DateTime? startDate = null, - DateTime? endDate = null, - string? keyword = null) + int itemsPerPage, + int currentPage, + eMessageCategory category, + int? depthValue, + DateTime? startDate = null, + DateTime? endDate = null, + string? keyword = null) { var collection = _database.GetCollection(_collectionName); - var combinedFilter = BuildDateFilter(startDate, endDate) - & BuildKeywordFilter(keyword) - & BuildCategoryFilter(category) - & BuildTimeStampAcknowledgedFilter(); + await CheckForDuplication(collection); + + var combinedFilter = FilterHelper.BuildDateFilter(startDate, endDate) + & FilterHelper.BuildKeywordFilter(keyword) + & FilterHelper.BuildCategoryFilter(category) + & FilterHelper.BuildTimeStampAcknowledgedFilter(); var messages = await collection.Find(combinedFilter) .Skip((currentPage - 1) * itemsPerPage) @@ -54,26 +54,73 @@ public DataService(IOptions settings) .SortByDescending(item => item.UtcTimeStamp) .ToListAsync(); var count = await collection.CountDocumentsAsync(combinedFilter); - MessagesUnAckedInDb = messages; + return (messages, count); } + private async Task CheckForDuplication(IMongoCollection collection) + { + Console.WriteLine("Starting CheckForDuplication..."); + + var filter = FilterHelper.BuildTimeStampAcknowledgedFilter(); + var messages = await collection.Find(filter).ToListAsync(); + + Console.WriteLine($"Total messages fetched: {messages.Count}"); + + var distinctCombinations = messages + .Where(m => ExtractIdentityFromRenderedMessage(m.RenderedMessage).HasValue && m.Properties.sender.Payload.MessageDigest != 0) + .Select(m => new + { + Identity = ExtractIdentityFromRenderedMessage(m.RenderedMessage), + Digest = m.Properties.sender.Payload.MessageDigest + }) + .Distinct(); + + Console.WriteLine($"Distinct combinations found: {distinctCombinations.Count()}"); + + foreach (var combo in distinctCombinations) + { + var similarMessages = messages.Where(m => + ExtractIdentityFromRenderedMessage(m.RenderedMessage) == combo.Identity && + m.Properties.sender.Payload.MessageDigest == combo.Digest ) + .ToList(); + + Console.WriteLine($"For combo (Identity: {combo.Identity}, Digest: {combo.Digest}), found {similarMessages.Count} similar messages."); + + if (similarMessages.Count > 1) + { + Console.WriteLine($"Purging {similarMessages.Count - 1} duplicate messages for combo (Identity: {combo.Identity}, Digest: {combo.Digest})"); + await PurgeMultipleEntriesAsync(collection, similarMessages); + } + } + } + + private async Task PurgeMultipleEntriesAsync(IMongoCollection collection, List messagesToPurge) + { + var idsToDelete = messagesToPurge.Select(m => m.Id).ToList(); + var deleteFilter = Builders.Filter.In("_id", idsToDelete); + await collection.DeleteManyAsync(deleteFilter); + } + + + public async Task<(List messages, long count)> GetDataAsyncForArchive( - int itemsPerPage, - int currentPage, - eMessageCategory category, + int itemsPerPage, + int currentPage, + eMessageCategory category, int? depthValue, - DateTime? startDate = null, - DateTime? endDate = null, + DateTime? startDate = null, + DateTime? endDate = null, string? keyword = null) { var collection = _database.GetCollection(_collectionName); - var combinedFilter = BuildDateFilter(startDate, endDate) - & BuildKeywordFilter(keyword) - & BuildCategoryFilter(category) - & BuildTimeStampAcknowledgedForArchiveFilter(); + var combinedFilter = FilterHelper.BuildDateFilter(startDate, endDate) + & FilterHelper.BuildKeywordFilter(keyword) + & FilterHelper.BuildCategoryFilter(category) + & FilterHelper.BuildTimeStampAcknowledgedForArchiveFilter(); + var messages = await collection.Find(combinedFilter) .Skip((currentPage - 1) * itemsPerPage) @@ -85,61 +132,90 @@ public DataService(IOptions settings) return (messages, count); } - public Task AcknowledgeAllMessages() => throw new NotImplementedException(); public Task AcknowledgeMessage(ulong identity, int messageDigest) => throw new NotImplementedException(); - - //private FilterDefinition BuildDepthValueFilter(int? depthValue, int? depthValueThreshold) + + + //public async Task AutoAcknowledgeMessages(IEnumerable msg) //{ - // var filterBuilder = Builders.Filter; + // var messagesInDb = await QueryDb(); + // var messagesFromPlc = MessageDisplay.ToList(); + + // var messageToAck = new List(); - // if (depthValue.HasValue) + // if (messagesInDb != null) // { - // return filterBuilder.Gte(depthValueThreshold.Value, depthValue.Value); - // } + // messageToAck = messagesInDb; + // foreach (var message in messagesInDb) + // { + // var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); + // if (!identity.HasValue) continue; + + // bool isActive = messagesFromPlc.Any(x => + // x.Identity == (ulong)identity.Value && + // x.MessageDigest == message.Properties.sender.Payload.MessageDigest + // ); + + // if (!isActive && message != null) + // { + // messageToAck.Remove(message); + // } + // } - // return filterBuilder.Empty; - //} + // await BulkUpdateTimestampAcknowledgedAsync(messageToAck); + // } //} - public async Task TryAutoAcknowledgeMessages(IEnumerable msg) - { - var unAcknowledgedMessages = await QueryDb(); - // Step 2: Filter these entries based on the ActiveMessage list - var filteredActiveMessages = ActiveMessage.ToList(); - //.Where(x => !x.Pinned); - // Step 3: Compare each unacknowledged message with the PlainTcoMessage list - var messagesToAck = new List(unAcknowledgedMessages); // Start with all unacknowledged messages + public async Task AutoAcknowledgeMessages(IEnumerable msg) + { + var messagesInDbNoTimeStampAck = await QueryDb(); + var messagesFromPlc = MessageDisplay.ToList(); + var messageToAck = new List(); - foreach (var message in unAcknowledgedMessages) + if (messagesInDbNoTimeStampAck != null) { - var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); - if (!identity.HasValue) continue; // If identity is null, skip to the next iteration - - bool isMessageAcknowledged = filteredActiveMessages.Any(x => - x.Identity == (ulong)identity.Value && - x.MessageDigest == message.Properties.sender.Payload.MessageDigest - ); - - if (isMessageAcknowledged) + foreach (var message in messagesInDbNoTimeStampAck) { - messagesToAck.Remove(message); + var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); + + bool isInActive; + + if (identity.HasValue) + { + isInActive = !messagesFromPlc.Any(x => + x.Identity == (ulong)identity.Value && + x.MessageDigest == message.Properties.sender.Payload.MessageDigest + ); + } + else + { + isInActive = true; + } + + if (isInActive && message != null) + { + messageToAck.Add(message); + } } + await BulkUpdateTimestampAcknowledgedAsync(messageToAck); // Update the timestamps for messages to acknowledge. } - await BulkUpdateTimestampAcknowledgedAsync(messagesToAck); } - - public async Task BulkUpdateTimestampAcknowledgedAsync(List messagesToUpdate) + public async Task BulkUpdateTimestampAcknowledgedAsync(IEnumerable messageToAck) { var _collection = _database.GetCollection(_collectionName); var timeStampAcknowledged = DateTime.UtcNow; var bulkOps = new List>(); - foreach (var message in messagesToUpdate) + if (messageToAck == null || !messageToAck.Any()) + { + return; + } + + foreach (var message in messageToAck) { - var filter = Builders.Filter.Eq(item => item.Id, message.Id); + var filter = Builders.Filter.Eq(item => item.Id, message.Id); var update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); var upsertOne = new UpdateOneModel(filter, update); @@ -152,43 +228,44 @@ public async Task BulkUpdateTimestampAcknowledgedAsync(List mess } } - //private FilterDefinition BuildDepthValueFilter(int? depthValue, int? depthValueThreshold) - //{ - // var filterBuilder = Builders.Filter; - - // if (depthValue.HasValue) - // { - // return filterBuilder.Gte(depthValueThreshold.Value, depthValue.Value); - // } - - // return filterBuilder.Empty; - - public async Task AcknowledgeAllMessages(IEnumerable msg) + public async Task AcknowledgeAllMessages() { + //List messagesToUpdate = new List(); - // List messagesToUpdate = new List(); - - // foreach (var _messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned) + //foreach (var message in MessageDisplay.Where(m => m.Pinned)) + //{ + // if (message != null) // { - // var _resultMessage = await TryAcknowledgeMessageInternal(_messageToAcknowledge, messageDisplay); - // if (_resultMessage != null) - // { - // messagesToUpdate.Add(_resultMessage); - // } + // await GetListofStillActiveMessages(message); // } + //} + + //var filteredActiveMessages = StillActiveMessagesAfterPinnedTest; - // if (messagesToUpdate.Any()) + //foreach (var message in MessagesInDbFiltered) + //{ + // var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); + // if (!identity.HasValue) continue; + + // bool isMessageAcknowledged = filteredActiveMessages.Any(x => + // x.Identity == (ulong)identity.Value && + // x.MessageDigest == message.Properties.sender.Payload.MessageDigest + // ); + + // if (isMessageAcknowledged && MessagesReadyToAck != null) // { - // await UpdateAllMessagesInDb(messagesToUpdate); + // MessagesReadyToAck.Remove(message); // } - } + //} + //await BulkUpdateTimestampAcknowledgedAsync(); + } - public async Task> QueryDb() + public async Task> QueryDb() { var _collection = _database.GetCollection(_collectionName); // Step 1: Query for entries with TimestampAcknowledged == null - var filter = BuildTimeStampAcknowledgedFilter(); + var filter = FilterHelper.BuildTimeStampAcknowledgedFilter(); var projection = Builders.Projection .Include(item => item.TimeStampAcknowledged) .Include(item => item.Properties.sender.Payload.MessageDigest) @@ -196,6 +273,10 @@ public async Task> QueryDb() var unAcknowledgedMessages = await _collection.Find(filter).Project(projection).ToListAsync(); + if (!unAcknowledgedMessages.Any()) + { + return new List(); + } return unAcknowledgedMessages; } @@ -226,28 +307,23 @@ public async Task> QueryDb() // } //} - //private async Task TryAcknowledgeMessageInternal(MongoDbLogItem messageToAcknowledge, IEnumerable messageDisplay) - //{ - // var _activeMessage = messageDisplay.FirstOrDefault(m => m.Identity == messageToAcknowledge.Properties?.ExtractedIdentity); - // if (_activeMessage != null) - // { - // _activeMessage.OnlinerMessage.Pinned.Cyclic = false; - // await PurgeNewerSimilarMessages(); - // await Task.Delay(2); - // if (!_activeMessage.OnlinerMessage.IsActive) - // { - // return _activeMessage; - // } - // else - // { - // Console.WriteLine($"Message Still Active {_activeMessage}"); - // } - // } - // return null; - //} + private async Task GetListofStillActiveMessages(PlainTcoMessage message) + { + if (message == null) + { + return; + } + message.OnlinerMessage.Pinned.Cyclic = false; + //await PurgeNewerSimilarMessages(); + await Task.Delay(2); + if (message.OnlinerMessage.IsActive) + { + StillActiveMessagesAfterPinnedTest.Add(message); + } + } //public async Task PurgeNewerSimilarMessages() //{ @@ -284,44 +360,15 @@ public async Task> QueryDb() //} - - private FilterDefinition BuildDateFilter(DateTime? startDate, DateTime? endDate) - { - var filterBuilder = Builders.Filter; - var filter = filterBuilder.Empty; - - if (startDate.HasValue) - { - filter &= filterBuilder.Gte(item => item.UtcTimeStamp, startDate.Value); - } - if (endDate.HasValue) - { - filter &= filterBuilder.Lte(item => item.UtcTimeStamp, endDate.Value); - } - - return filter; - } - - private FilterDefinition BuildKeywordFilter(string keyword) - { - var filterBuilder = Builders.Filter; - - return !string.IsNullOrEmpty(keyword) - ? filterBuilder.Regex(item => item.RenderedMessage, new BsonRegularExpression(keyword, "i")) - : filterBuilder.Empty; - } - - private FilterDefinition BuildCategoryFilter(eMessageCategory? category) + public int CalculateDepth(MongoDbLogItem msg) { - var filterBuilder = Builders.Filter; - - if (category.HasValue) + if (string.IsNullOrEmpty(msg.Properties.sender.Payload.ParentSymbol)) { - var levelsToInclude = MessageCategoryMapper.GetAllLevelsGreaterThanOrEqualTo(category.Value); - return filterBuilder.In(item => item.Level, levelsToInclude); + return 1; } - return filterBuilder.Empty; + int depth = msg.Properties.sender.Payload.ParentSymbol.Split('.').Length; + return depth; } public ulong? ExtractIdentityFromRenderedMessage(string renderedMessage) @@ -343,39 +390,6 @@ private FilterDefinition BuildCategoryFilter(eMessageCategory? c } return null; } - - //private FilterDefinition BuildIdentityFilter(List identities) - //{ - // return Builders.Filter.In(item => ExtractIdentityFromRenderedMessage(item.RenderedMessage).Value, identities); - //} - - private FilterDefinition BuildMessageDigestFilter(List messageDigests) - { - return Builders.Filter.In(item => item.Properties.sender.Payload.MessageDigest, messageDigests); - } - - private FilterDefinition BuildTimeStampAcknowledgedFilter() - { - return Builders.Filter.Eq(item => item.TimeStampAcknowledged, null); - } - - private FilterDefinition BuildTimeStampAcknowledgedForArchiveFilter() - { - var filterBuilder = Builders.Filter; - return filterBuilder.Ne(item => item.TimeStampAcknowledged, null); - } - - public int CalculateDepth(MongoDbLogItem msg) - { - if (string.IsNullOrEmpty(msg.Properties.sender.Payload.ParentSymbol)) - { - return 1; - } - - int depth = msg.Properties.sender.Payload.ParentSymbol.Split('.').Length; - return depth; - } - } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs index 985e86746..62cf00673 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs @@ -10,12 +10,11 @@ namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services { public interface IDataService { - public IEnumerable ActiveMessage { get; set; } + public IEnumerable MessageDisplay { get; set; } public Task<(List messages, long count)> GetDataAsycForActive(int itemsPerPage, int currentPage, eMessageCategory category, int? depthValue, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); public Task<(List messages, long count)> GetDataAsyncForArchive (int itemsPerPage, int currentPage, eMessageCategory category, int? depthValue, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); - public Task AcknowledgeAllMessages(IEnumerable msg); - + public Task AcknowledgeAllMessages(); public Task AcknowledgeMessage(ulong identity, int messageDigest); - Task TryAutoAcknowledgeMessages(IEnumerable msg); + public Task AutoAcknowledgeMessages(IEnumerable msg); } } \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index 7f3bcaaed..88ec629c3 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -11,8 +11,6 @@ using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; - - namespace TcoCore { public partial class TcoDiagnosticsAlternativeView : IDisposable @@ -33,11 +31,6 @@ public partial class TcoDiagnosticsAlternativeView : IDisposable private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; - ////Data and Lists, Logs from db, Messages from Plc - //private IEnumerable _mongoDbLogItemFiltered = new List(); - private List _messagesPlc = new List(); - public int CachedDataCount { get; private set; } - private string ActiveMessagesCount() => "Aktive Messages : " + ViewModel._tcoObject.MessageHandler.ActiveMessagesCount; private string DiagnosticsMessage() => "Diag depth : " + DepthValue; @@ -84,7 +77,7 @@ protected override async Task OnInitializedAsync() } UpdateValuesOnChange(ViewModel._tcoObject); - DataService.ActiveMessage = ViewModel.MessageDisplay; + DataService.MessageDisplay = ViewModel.MessageDisplay; InitializeDiagnosticsUpdateTimer(); } @@ -112,52 +105,13 @@ public void InitializeDiagnosticsUpdateTimer() // Problem now, when i set pinned to false, and check which Messages still occur, the Logger creates new Logs. // => my Solution is, to have a Purge Method(), which purges from my DB newer Messages, when the Origin Error Message is not Acknowledged - public async Task AcknowledgeAllMessages() - { - try - { - //await DataService.AcknowledgeAllMessages(ViewModel.MessageDisplay); - } - catch (System.Exception ex) - { - Console.WriteLine(ex.ToString()); - } - } - - public async Task AcknowledgeMessage(ulong? identity, int messageDigest) - { - try - { - //await DataService.AcknowledgeSingleMessage(identity, messageDigest, ViewModel.MessageDisplay); - } - catch (System.Exception ex) - { - Console.WriteLine(ex.ToString()); - } - } - - public void Dispose() - { - _messageUpdateTimer?.Dispose(); - } - private async void MessageUpdateTimer_Elapsed(object sender, ElapsedEventArgs e) { await InvokeAsync(async () => { - //DB Action - //await DataService.RefreshDataForDisplayAsync( _itemsPerPage, MinMessageCategoryFilter, _currentPage); - //Update plc Data + await ViewModel.UpdateMessagesAsync(); - DataService.ActiveMessage = ViewModel.MessageDisplay; - //_mongoDbLogItemFiltered = OrderMongoDbLogItems(DataService.CachedData) - // .Where(x => ViewModel.CalculateDepth(x) <= DepthValue); - //DataService.ExtractIdentity(); - //await DataService.FilterDataEntriesToUpdate(); - //DataService.CategorizeMessages(ViewModel.MessageDisplay.ToList()); - - //await DataService.PurgeNewerSimilarMessages(); - ////await DataService.AutoAckNonPinnedMessages(ViewModel.MessageDisplay); + DataService.MessageDisplay = ViewModel.MessageDisplay; StateHasChanged(); }); @@ -178,5 +132,10 @@ public int DepthValue } } + public void Dispose() + { + _messageUpdateTimer?.Dispose(); + } + } } From 83c255498de6fe0e1333b6932c04c785c3ea6b1e Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 18 Oct 2023 20:38:11 +0200 Subject: [PATCH 11/13] autoack not working, ackkAll must be implemented. --- .../PlcHammer.Hmi.Blazor/Startup.cs | 14 +- .../ExtractIdentityFromRenderedMessage.cs | 28 ++ .../{Filter => Helper}/FilterHelper.cs | 29 +- .../Helper/MessageProcessingHelper.cs | 80 +++++ .../Helper/MongoDbHelper.cs | 206 +++++++++++ .../MessagesTabs/ActiveMessages.razor | 8 +- .../MessagesTabs/ActiveMessages.razor.cs | 13 +- .../MessagesTabs/ArchivedMessages.razor.cs | 9 - ...e.cs => DataBaseMaxEntryCleanupService.cs} | 4 +- .../Services/DataService.cs | 336 +++--------------- .../Services/IDataService.cs | 4 +- .../TcoDiagnosticsAlternativeView.cs | 2 +- 12 files changed, 408 insertions(+), 325 deletions(-) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractIdentityFromRenderedMessage.cs rename src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/{Filter => Helper}/FilterHelper.cs (60%) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs rename src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/{DataCleanupService.cs => DataBaseMaxEntryCleanupService.cs} (93%) diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs index e3f444745..29fcc1045 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs @@ -100,18 +100,18 @@ public void ConfigureServices(IServiceCollection services) // .WriteTo.MQTT(new MQTTnet.Client.Options.MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io").Build(), "fun_with_TcOpen_Hammer") .WriteTo.MongoDBBson( databaseUrl: $"{MongoUri}/{DatabaseName}", - collectionName: $"{CollectionName}" - ).Enrich.WithProperty("user", SecurityManager.Manager.Principal.Identity.Name) - .Enrich.With(new Serilog.Enrichers.EnvironmentNameEnricher()) - .Enrich.With(new Serilog.Enrichers.EnvironmentUserNameEnricher()) - .Enrich.With(new Serilog.Enrichers.MachineNameEnricher()) - .MinimumLevel.Verbose())) // Sets the logger configuration (default reports only to console). + collectionName: $"{CollectionName}") + // ).Enrich.WithProperty("user", SecurityManager.Manager.Principal.Identity.Name) + //.Enrich.With(new Serilog.Enrichers.EnvironmentNameEnricher()) + //.Enrich.With(new Serilog.Enrichers.EnvironmentUserNameEnricher()) + //.Enrich.With(new Serilog.Enrichers.MachineNameEnricher()) + .MinimumLevel.Debug())) // Sets the logger configuration (default reports only to console). .SetSecurity(SecurityManager.Manager.Service) .SetEditValueChangeLogging(Entry.PlcHammer.Connector); services.Configure(Configuration.GetSection("MongoDbSettings")); services.AddTransient(); - services.AddSingleton(); + services.AddSingleton(); services.AddBlazorStrap(); } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractIdentityFromRenderedMessage.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractIdentityFromRenderedMessage.cs new file mode 100644 index 000000000..94b6c8cdf --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractIdentityFromRenderedMessage.cs @@ -0,0 +1,28 @@ +using System; +using System.Text.RegularExpressions; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper +{ + public static class IdentityExtractor + { + public static ulong? ExtractIdentityFromRenderedMessage(string renderedMessage) + { + var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); + var match = regex.Match(renderedMessage); + if (match.Success) + { + var identityString = match.Groups[1].Value; + if (ulong.TryParse(identityString, out ulong identity)) + { + return identity; + } + else + { + Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log + return null; + } + } + return null; + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Filter/FilterHelper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/FilterHelper.cs similarity index 60% rename from src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Filter/FilterHelper.cs rename to src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/FilterHelper.cs index b320fab4c..940124bb5 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Filter/FilterHelper.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/FilterHelper.cs @@ -5,6 +5,7 @@ using TcoCore; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; public class FilterHelper @@ -49,13 +50,33 @@ public static FilterDefinition BuildCategoryFilter(eMessageCateg } public static FilterDefinition BuildTimeStampAcknowledgedFilter() + { + return Builders.Filter.Eq(item => item.TimeStampAcknowledged, null); + } + + public static FilterDefinition BuildTimeStampAcknowledgeNullFilter() + { + var filterBuilder = Builders.Filter; + return filterBuilder.Ne(item => item.TimeStampAcknowledged, null); + } + + public static FilterDefinition BuildPlainTcoMessageFilter(PlainTcoMessage plainTcoMessage, ulong extractedIdentity) { - return Builders.Filter.Eq(item => item.TimeStampAcknowledged, null); + var filterBuilder = Builders.Filter; + + var filter = filterBuilder.Eq("Properties.sender.Payload.MessageDigest", plainTcoMessage.MessageDigest) & + filterBuilder.Eq("Properties.sender.Payload.Identity", extractedIdentity) & + filterBuilder.Eq("TimeStampAcknowledged", BsonNull.Value); + + return filter; } - public static FilterDefinition BuildTimeStampAcknowledgedForArchiveFilter() + public static ProjectionDefinition BuildMinimalProjection() { - var filterBuilder = Builders.Filter; - return filterBuilder.Ne(item => item.TimeStampAcknowledged, null); + return Builders.Projection + .Include(item => item.Id) + .Include(item => item.RenderedMessage) + .Include(item => item.Properties.sender.Payload.MessageDigest); } + } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs new file mode 100644 index 000000000..7001018a2 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using Microsoft.Extensions.Options; + +using MongoDB.Driver; + +using TcoCore; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper +{ + class MessageProcessingHelper + { + + static int delayForSettingPinnedFalse = 20; + + public MessageProcessingHelper() + { + } + + public async Task> GetStillPinnedMsgsAfterSettingItFalse(List messages) + { + if (messages == null || !messages.Any()) + { + return new List(); + } + + var tasks = messages.Select(ProcessMessageAsync).ToList(); + + await Task.WhenAll(tasks); + + return tasks.Where(t => t.Result != null).Select(t => t.Result).ToList(); + } + + public async Task GetStillPinnedSingleMsgAfterSettingItFalse(PlainTcoMessage message) + { + if (message == null) + { + return null; + } + + return await ProcessMessageAsync(message); + } + + public int CalculateDepth(MongoDbLogItem msg) + { + if (string.IsNullOrEmpty(msg.Properties.sender.Payload.ParentSymbol)) + { + return 1; + } + + int depth = msg.Properties.sender.Payload.ParentSymbol.Split('.').Length; + return depth; + } + + private async Task ProcessMessageAsync(PlainTcoMessage message) + { + if (message == null) + { + return null; + } + + message.OnlinerMessage.Pinned.Cyclic = false; + + await Task.Delay(delayForSettingPinnedFalse); + + if (message.OnlinerMessage.IsActive) + { + return message; + } + + return null; + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs new file mode 100644 index 000000000..1370f5ec2 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs @@ -0,0 +1,206 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +using Microsoft.Extensions.Options; + +using MongoDB.Bson; +using MongoDB.Driver; + +using TcoCore; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper +{ + class MongoDbHelper + { + private readonly IMongoDatabase _database; + private readonly string _collectionName; + + public MongoDbHelper(IOptions settings) + { + var client = new MongoClient(settings.Value.MongoUri); + _database = client.GetDatabase(settings.Value.DatabaseName); + _collectionName = settings.Value.CollectionName; + } + + public async Task> QueryDb() + { + var _collection = _database.GetCollection(_collectionName); + + // Step 1: Query for entries with TimestampAcknowledged == null + var filter = FilterHelper.BuildTimeStampAcknowledgedFilter(); + var projection = FilterHelper.BuildMinimalProjection(); + + var unAcknowledgedMessages = await _collection.Find(filter).Project(projection).ToListAsync(); + + if (!unAcknowledgedMessages.Any()) + { + return new List(); + } + return unAcknowledgedMessages; + } + + //Checking for Duplication in Db due to the way, the Plc Logger and Messenger works + public async Task CheckForDuplication() + { + var collection = _database.GetCollection(_collectionName); + var filter = FilterHelper.BuildTimeStampAcknowledgedFilter(); + var messages = await collection.Find(filter).ToListAsync(); + + var distinctCombinations = messages + .Where(m => IdentityExtractor.ExtractIdentityFromRenderedMessage(m.RenderedMessage).HasValue && m.Properties.sender.Payload.MessageDigest != 0) + .Select(m => new + { + Identity = IdentityExtractor.ExtractIdentityFromRenderedMessage(m.RenderedMessage), + Digest = m.Properties.sender.Payload.MessageDigest + }) + .Distinct(); + + foreach (var combo in distinctCombinations) + { + var similarMessages = messages.Where(m => + IdentityExtractor.ExtractIdentityFromRenderedMessage(m.RenderedMessage) == combo.Identity && + m.Properties.sender.Payload.MessageDigest == combo.Digest) + .OrderBy(m => m.UtcTimeStamp) + .ToList(); + + if (similarMessages.Count > 1) + { + await PurgeMultipleEntriesAsync(collection, similarMessages.Skip(1).ToList()); + } + } + } + + public async Task PurgeMultipleEntriesAsync(IMongoCollection collection, List messagesToPurge) + { + var idsToDelete = messagesToPurge.Select(m => m.Id).ToList(); + + var deleteFilter = Builders.Filter.In("_id", idsToDelete); + await collection.DeleteManyAsync(deleteFilter); + } + + public async Task BulkUpdateTimestampAcknowledgedAsync(IEnumerable messageToAck) + { + var _collection = _database.GetCollection(_collectionName); + + var timeStampAcknowledged = DateTime.UtcNow; + var bulkOps = new List>(); + + if (messageToAck == null || !messageToAck.Any()) + { + return; + } + + foreach (var message in messageToAck) + { + var filter = + + Builders.Filter.Eq(item => item.Id, message.Id); + var update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); + + var upsertOne = new UpdateOneModel(filter, update); + bulkOps.Add(upsertOne); + } + + if (bulkOps.Any()) + { + await _collection.BulkWriteAsync(bulkOps); + } + } + + public async Task UpdateTimeStampAcknowledgeAsync(ObjectId? id, UpdateDefinition update) + { + if (id == null) + { + throw new ArgumentNullException(nameof(id), "The provided ObjectId is null."); + } + + var collection = _database.GetCollection(_collectionName); + return await collection.UpdateOneAsync(m => m.Id == id, update); + } + + public async Task<(List messages, long count)> GetDataAsync( + int itemsPerPage, + int currentPage, + FilterDefinition filter) + { + var collection = _database.GetCollection(_collectionName); + + var messages = await collection.Find(filter) + .Skip((currentPage - 1) * itemsPerPage) + .Limit(itemsPerPage) + .SortByDescending(item => item.UtcTimeStamp) + .ToListAsync(); + + var count = await collection.CountDocumentsAsync(filter); + + return (messages, count); + } + + public async Task GetPlainTcoMessageFromId(ObjectId id, IEnumerable messageDisplay) + { + // Fetch the MongoDbLogItem from the database using the provided ObjectId + var collection = _database.GetCollection(_collectionName); + var message = await collection.Find(m => m.Id == id).FirstOrDefaultAsync(); + + if (message == null) + { + return null; + } + + var identity = IdentityExtractor.ExtractIdentityFromRenderedMessage(message.RenderedMessage); + + if (!identity.HasValue) + { + return null; + } + + var plainTcoMessage = messageDisplay.FirstOrDefault(x => + x.Identity == (ulong)identity.Value && + x.MessageDigest == message.Properties.sender.Payload.MessageDigest + ); + + return plainTcoMessage; + } + + public async Task GetMongoDbLogItemIdFromPlainTcoMessage(PlainTcoMessage plainTcoMessage) + { + if (plainTcoMessage == null) + { + return null; + } + + var collection = _database.GetCollection(_collectionName); + + var filter = FilterHelper.BuildTimeStampAcknowledgeNullFilter(); + var projection = FilterHelper.BuildMinimalProjection(); + + var results = await collection.Find(filter).Project(projection).ToListAsync(); + + foreach (var item in results) + { + var renderedMessage = item["RenderedMessage"].AsString; + var extractedIdentity = IdentityExtractor.ExtractIdentityFromRenderedMessage(renderedMessage); + + if (extractedIdentity.HasValue) + { + + var specificFilter = FilterHelper.BuildPlainTcoMessageFilter(plainTcoMessage, extractedIdentity.Value); + var message = await collection.Find(specificFilter).FirstOrDefaultAsync(); + + if (message != null) + { + return message.Id; + } + } + } + + return null; + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor index f4e3b10f6..43b357bf6 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor @@ -48,9 +48,11 @@ @message.Level @message.MessageTemplate?.Text @message.Properties?.sender?.Payload?.ParentSymbol - + + + } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs index ed407b855..894270c1a 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs @@ -6,6 +6,8 @@ using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; using global::TcoCore; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; +using MongoDB.Bson; + namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.MessagesTabs { public partial class ActiveMessages @@ -83,16 +85,9 @@ private async Task AcknowledgeMessages() await DataService.AcknowledgeAllMessages(); } - public async Task AcknowledgeMessage(ulong? identity, int messageDigest) + public async Task AcknowledgeMessage(ObjectId id) { - try - { - //await DataService.AcknowledgeSingleMessage(identity, messageDigest, ViewModel.MessageDisplay); - } - catch (System.Exception ex) - { - Console.WriteLine(ex.ToString()); - } + await DataService.AcknowledgeSingleMessage(id); } } } \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs index 11faad53b..1503348bf 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs @@ -24,14 +24,6 @@ public partial class ArchivedMessages [Parameter] public int DepthValueThreshold { get; set; } - //[Parameter] - //public Func AcknowledgeMessageCallback { get; set; } - - //[Parameter] - //public Func AcknowledgeAllMessages { get; set; } - - //[Parameter] - //public string ActiveMessagesCount { get; set; } [Parameter] public Func GetMessageStatusPinned { get; set; } @@ -71,7 +63,6 @@ public async Task GetDataFilteredAsyncForArchive() var result = await DataService.GetDataAsyncForArchive(_itemsPerPage, _currentPage, category, _depthValue, startDate, endDate, keyword); - List filteredItems = result.messages; long totalCount = result.count; _totalPages = (int)Math.Ceiling((double)totalCount / _itemsPerPage); if (_totalPages < 1) diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataBaseMaxEntryCleanupService.cs similarity index 93% rename from src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs rename to src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataBaseMaxEntryCleanupService.cs index fc2feacc9..63f886c2a 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataCleanupService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataBaseMaxEntryCleanupService.cs @@ -11,7 +11,7 @@ namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services { - public class DataCleanupService : IDisposable + public class DataBaseMaxEntryCleanupService : IDisposable { private readonly IMongoCollection _collection; private readonly Timer _timer; @@ -22,7 +22,7 @@ public class DataCleanupService : IDisposable private readonly IMongoDatabase _database; private readonly string _collectionName; - public DataCleanupService(IOptions settings) + public DataBaseMaxEntryCleanupService(IOptions settings) { var client = new MongoClient(settings.Value.MongoUri); _database = client.GetDatabase(settings.Value.DatabaseName); diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index ed29acf24..649034bbb 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -10,25 +10,26 @@ using TcoCore; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services { public class DataService : IDataService { - private readonly IMongoDatabase _database; - private readonly string _collectionName; + private readonly MongoDbHelper _mongoDbHelper; + private readonly MessageProcessingHelper _messageProcessingHelper; + public DataService(IOptions settings) { - var client = new MongoClient(settings.Value.MongoUri); - _database = client.GetDatabase(settings.Value.DatabaseName); - _collectionName = settings.Value.CollectionName; + _mongoDbHelper = new MongoDbHelper(settings); + _messageProcessingHelper = new MessageProcessingHelper(); } //set viwa the view.cs, gets it from ViewModel.cs via Plc public IEnumerable MessageDisplay { get; set; } - private List StillActiveMessagesAfterPinnedTest { get; set; } + public async Task<(List messages, long count)> GetDataAsycForActive( int itemsPerPage, @@ -39,71 +40,15 @@ public DataService(IOptions settings) DateTime? endDate = null, string? keyword = null) { - var collection = _database.GetCollection(_collectionName); - - await CheckForDuplication(collection); + await _mongoDbHelper.CheckForDuplication(); var combinedFilter = FilterHelper.BuildDateFilter(startDate, endDate) & FilterHelper.BuildKeywordFilter(keyword) & FilterHelper.BuildCategoryFilter(category) & FilterHelper.BuildTimeStampAcknowledgedFilter(); - var messages = await collection.Find(combinedFilter) - .Skip((currentPage - 1) * itemsPerPage) - .Limit(itemsPerPage) - .SortByDescending(item => item.UtcTimeStamp) - .ToListAsync(); - var count = await collection.CountDocumentsAsync(combinedFilter); - - - return (messages, count); - } - - private async Task CheckForDuplication(IMongoCollection collection) - { - Console.WriteLine("Starting CheckForDuplication..."); - - var filter = FilterHelper.BuildTimeStampAcknowledgedFilter(); - var messages = await collection.Find(filter).ToListAsync(); - - Console.WriteLine($"Total messages fetched: {messages.Count}"); - - var distinctCombinations = messages - .Where(m => ExtractIdentityFromRenderedMessage(m.RenderedMessage).HasValue && m.Properties.sender.Payload.MessageDigest != 0) - .Select(m => new - { - Identity = ExtractIdentityFromRenderedMessage(m.RenderedMessage), - Digest = m.Properties.sender.Payload.MessageDigest - }) - .Distinct(); - - Console.WriteLine($"Distinct combinations found: {distinctCombinations.Count()}"); - - foreach (var combo in distinctCombinations) - { - var similarMessages = messages.Where(m => - ExtractIdentityFromRenderedMessage(m.RenderedMessage) == combo.Identity && - m.Properties.sender.Payload.MessageDigest == combo.Digest ) - .ToList(); - - Console.WriteLine($"For combo (Identity: {combo.Identity}, Digest: {combo.Digest}), found {similarMessages.Count} similar messages."); - - if (similarMessages.Count > 1) - { - Console.WriteLine($"Purging {similarMessages.Count - 1} duplicate messages for combo (Identity: {combo.Identity}, Digest: {combo.Digest})"); - await PurgeMultipleEntriesAsync(collection, similarMessages); - } - } - } - - private async Task PurgeMultipleEntriesAsync(IMongoCollection collection, List messagesToPurge) - { - var idsToDelete = messagesToPurge.Select(m => m.Id).ToList(); - var deleteFilter = Builders.Filter.In("_id", idsToDelete); - await collection.DeleteManyAsync(deleteFilter); - } - - + return await _mongoDbHelper.GetDataAsync(itemsPerPage, currentPage, combinedFilter); + } public async Task<(List messages, long count)> GetDataAsyncForArchive( int itemsPerPage, @@ -114,126 +59,19 @@ private async Task PurgeMultipleEntriesAsync(IMongoCollection co DateTime? endDate = null, string? keyword = null) { - var collection = _database.GetCollection(_collectionName); - var combinedFilter = FilterHelper.BuildDateFilter(startDate, endDate) & FilterHelper.BuildKeywordFilter(keyword) & FilterHelper.BuildCategoryFilter(category) - & FilterHelper.BuildTimeStampAcknowledgedForArchiveFilter(); - - - var messages = await collection.Find(combinedFilter) - .Skip((currentPage - 1) * itemsPerPage) - .Limit(itemsPerPage) - .SortByDescending(item => item.UtcTimeStamp) - .ToListAsync(); - - var count = await collection.CountDocumentsAsync(combinedFilter); - return (messages, count); - } - - public Task AcknowledgeMessage(ulong identity, int messageDigest) => throw new NotImplementedException(); - - - - //public async Task AutoAcknowledgeMessages(IEnumerable msg) - //{ - // var messagesInDb = await QueryDb(); - // var messagesFromPlc = MessageDisplay.ToList(); - - // var messageToAck = new List(); - - // if (messagesInDb != null) - // { - // messageToAck = messagesInDb; - // foreach (var message in messagesInDb) - // { - // var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); - // if (!identity.HasValue) continue; - - // bool isActive = messagesFromPlc.Any(x => - // x.Identity == (ulong)identity.Value && - // x.MessageDigest == message.Properties.sender.Payload.MessageDigest - // ); - - // if (!isActive && message != null) - // { - // messageToAck.Remove(message); - // } - // } - - // await BulkUpdateTimestampAcknowledgedAsync(messageToAck); - // } - //} - - public async Task AutoAcknowledgeMessages(IEnumerable msg) - { - var messagesInDbNoTimeStampAck = await QueryDb(); - var messagesFromPlc = MessageDisplay.ToList(); - var messageToAck = new List(); - - if (messagesInDbNoTimeStampAck != null) - { - foreach (var message in messagesInDbNoTimeStampAck) - { - var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); - - bool isInActive; - - if (identity.HasValue) - { - isInActive = !messagesFromPlc.Any(x => - x.Identity == (ulong)identity.Value && - x.MessageDigest == message.Properties.sender.Payload.MessageDigest - ); - } - else - { - isInActive = true; - } - - if (isInActive && message != null) - { - messageToAck.Add(message); - } - } - await BulkUpdateTimestampAcknowledgedAsync(messageToAck); // Update the timestamps for messages to acknowledge. - } - } - - public async Task BulkUpdateTimestampAcknowledgedAsync(IEnumerable messageToAck) - { - var _collection = _database.GetCollection(_collectionName); - - var timeStampAcknowledged = DateTime.UtcNow; - var bulkOps = new List>(); - - if (messageToAck == null || !messageToAck.Any()) - { - return; - } + & FilterHelper.BuildTimeStampAcknowledgeNullFilter(); - foreach (var message in messageToAck) - { - var filter = Builders.Filter.Eq(item => item.Id, message.Id); - var update = Builders.Update.Set(item => item.TimeStampAcknowledged, timeStampAcknowledged); - - var upsertOne = new UpdateOneModel(filter, update); - bulkOps.Add(upsertOne); - } - - if (bulkOps.Any()) - { - await _collection.BulkWriteAsync(bulkOps); - } + return await _mongoDbHelper.GetDataAsync(itemsPerPage, currentPage, combinedFilter); } public async Task AcknowledgeAllMessages() { //List messagesToUpdate = new List(); - //foreach (var message in MessageDisplay.Where(m => m.Pinned)) - //{ + //foreach (var message in MessageDisplay.Where(m => m.Pinned)) // if (message != null) // { // await GetListofStillActiveMessages(message); @@ -260,135 +98,55 @@ public async Task AcknowledgeAllMessages() //await BulkUpdateTimestampAcknowledgedAsync(); } - public async Task> QueryDb() + public async Task AcknowledgeSingleMessage(ObjectId id) { - var _collection = _database.GetCollection(_collectionName); - - // Step 1: Query for entries with TimestampAcknowledged == null - var filter = FilterHelper.BuildTimeStampAcknowledgedFilter(); - var projection = Builders.Projection - .Include(item => item.TimeStampAcknowledged) - .Include(item => item.Properties.sender.Payload.MessageDigest) - .Include(item => item.RenderedMessage); + var update = Builders.Update.Set(m => m.TimeStampAcknowledged, DateTime.UtcNow); - var unAcknowledgedMessages = await _collection.Find(filter).Project(projection).ToListAsync(); + var messageFromId = await _mongoDbHelper.GetPlainTcoMessageFromId(id, MessageDisplay); + var messageStillPinned = await _messageProcessingHelper.GetStillPinnedSingleMsgAfterSettingItFalse(messageFromId); - if (!unAcknowledgedMessages.Any()) + if (messageStillPinned != null ) { - return new List(); + Console.WriteLine($"Still Active Message: {id}."); + return; + } - return unAcknowledgedMessages; + var result = await _mongoDbHelper.UpdateTimeStampAcknowledgeAsync(id, update); } - - //public async Task AcknowledgeSingleMessage(ulong? identity, int messageDigest, IEnumerable messageDisplay) - //{ - // if (CategorizedMessages == null) - // { - // CategorizeMessages(messageDisplay.ToList()); - // } - - // List messagesToUpdate = new List(); - - // foreach (var messageToAcknowledge in CategorizedMessages.ActiveMessagesPinned.Where(m => - // m.Properties?.ExtractedIdentity == identity && - // m.Properties?.sender?.Payload?.MessageDigest == messageDigest)) - // { - // var _resultMessage = await TryAcknowledgeMessageInternal(messageToAcknowledge, messageDisplay); - // if (_resultMessage != null) - // { - // messagesToUpdate.Add(_resultMessage); - // } - - // if (messagesToUpdate.Any()) - // { - // await UpdateAllMessagesInDb(messagesToUpdate); - // } - // } - //} - - private async Task GetListofStillActiveMessages(PlainTcoMessage message) + public async Task AutoAcknowledgeMessages(IEnumerable msg) { - if (message == null) - { - return; - } - - message.OnlinerMessage.Pinned.Cyclic = false; - - //await PurgeNewerSimilarMessages(); + var messagesInDbNoTimeStampAck = await _mongoDbHelper.QueryDb(); + var messagesFromPlc = MessageDisplay.ToList(); + var messageToAck = new List(); - await Task.Delay(2); - if (message.OnlinerMessage.IsActive) + if (messagesInDbNoTimeStampAck != null) + { + foreach (var message in messagesInDbNoTimeStampAck) { - StillActiveMessagesAfterPinnedTest.Add(message); - } - } - - //public async Task PurgeNewerSimilarMessages() - //{ - // if (_database == null || string.IsNullOrEmpty(_collectionName)) - // { - // Console.WriteLine("Database or collection name is not initialized."); - // return; - // } - - // if (CachedDataEntriesToUpdate == null) - // { - // Console.WriteLine("CachedDataEntriesToUpdate is not initialized."); - // return; - // } - - // var collection = _database.GetCollection(_collectionName); - - // foreach (var unacknowledgedMessage in CachedDataEntriesToUpdate) - // { - // // 2. For each of these messages, find newer similar messages based on identity and digest in the cache - // var newerIdenticalMessages = CachedDataEntriesToUpdate.Where(m => - // m?.Properties?.ExtractedIdentity == unacknowledgedMessage?.Properties?.ExtractedIdentity && - // m?.Properties?.sender?.Payload?.MessageDigest == unacknowledgedMessage?.Properties?.sender?.Payload?.MessageDigest && - // m?.UtcTimeStamp > unacknowledgedMessage?.UtcTimeStamp).ToList(); - - // if (newerIdenticalMessages.Any()) - // { - // // 3. Delete these newer similar messages from the database - // var filter = Builders.Filter.In(m => m.Id, newerIdenticalMessages.Select(x => x.Id)); - // await collection.DeleteManyAsync(filter); - // //Console.WriteLine($"Purged {newerIdenticalMessages.Count} duplicates for {unacknowledgedMessage?.MessageTemplate?.Text}"); - // } - // } - //} - + var identity = IdentityExtractor.ExtractIdentityFromRenderedMessage(message.RenderedMessage); - public int CalculateDepth(MongoDbLogItem msg) - { - if (string.IsNullOrEmpty(msg.Properties.sender.Payload.ParentSymbol)) - { - return 1; - } + bool isInActive; - int depth = msg.Properties.sender.Payload.ParentSymbol.Split('.').Length; - return depth; - } + if (identity.HasValue) + { + isInActive = !messagesFromPlc.Any(x => + x.Identity == (ulong)identity.Value && + x.MessageDigest == message.Properties.sender.Payload.MessageDigest + ); + } + else + { + isInActive = true; + } - public ulong? ExtractIdentityFromRenderedMessage(string renderedMessage) - { - var regex = new Regex(@"Identity: (\d+)", RegexOptions.Compiled); - var match = regex.Match(renderedMessage); - if (match.Success) - { - var identityString = match.Groups[1].Value; - if (ulong.TryParse(identityString, out ulong identity)) - { - return identity; - } - else - { - Console.WriteLine($"Failed to parse identity: {identityString}"); // Debug log - return null; + if (isInActive && message != null) + { + messageToAck.Add(message); + } } + //await _mongoDbHelper.BulkUpdateTimestampAcknowledgedAsync(messageToAck); } - return null; } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs index 62cf00673..0e5eec5fc 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/IDataService.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Threading.Tasks; +using MongoDB.Bson; + using TcoCore; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; @@ -14,7 +16,7 @@ public interface IDataService public Task<(List messages, long count)> GetDataAsycForActive(int itemsPerPage, int currentPage, eMessageCategory category, int? depthValue, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); public Task<(List messages, long count)> GetDataAsyncForArchive (int itemsPerPage, int currentPage, eMessageCategory category, int? depthValue, DateTime? startDate = null, DateTime? endDate = null, string keyword = null); public Task AcknowledgeAllMessages(); - public Task AcknowledgeMessage(ulong identity, int messageDigest); + public Task AcknowledgeSingleMessage(ObjectId id); public Task AutoAcknowledgeMessages(IEnumerable msg); } } \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index 88ec629c3..8b696d7c9 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -26,7 +26,7 @@ public partial class TcoDiagnosticsAlternativeView : IDisposable /// DataCleanupService is responsible for limiting the entries to 5000 logs /// [Inject] - public DataCleanupService DataCleanupService { get; set; } + public DataBaseMaxEntryCleanupService DataBaseMaxEntryCleanupSerice { get; set; } private IEnumerable eMessageCategories => Enum.GetValues(typeof(eMessageCategory)).Cast().Skip(1); public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; From 12a64ce19b7c028a0cf0cc8729a5224489d334b2 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 30 Oct 2023 09:36:27 +0100 Subject: [PATCH 12/13] basic functionalities work, --- .../Helper/DepthValueExtractor.cs | 22 +++++ .../Helper/ExtractMessageFromTemplateText.cs | 29 ++++++ .../Helper/MessageProcessingHelper.cs | 4 +- .../Mapping/MessageCategoryMapper.cs | 22 ++--- .../Mapping/MongoDbLogItem.cs | 7 ++ .../MessagesTabs/ActiveMessages.razor | 97 +++++++++++-------- .../MessagesTabs/ActiveMessages.razor.cs | 18 ++-- .../MessagesTabs/ActiveMessages.razor.css | 55 ++++++++++- .../MessagesTabs/ArchivedMessages.razor | 82 ++++++++-------- .../MessagesTabs/ArchivedMessages.razor.cs | 13 ++- .../MessagesTabs/ArchivedMessages.razor.css | 55 +++++++++++ .../Services/DataService.cs | 66 ++++++------- .../TcoDiagnosticsAlternativeView.cs | 32 +++--- .../TcoDiagnosticsAlternativeView.razor | 16 +-- .../TcoDiagnosticsAlternativeView.razor.css | 46 --------- .../TcoDiagnosticsAlternativeViewModel.cs | 2 - 16 files changed, 344 insertions(+), 222 deletions(-) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DepthValueExtractor.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractMessageFromTemplateText.cs create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DepthValueExtractor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DepthValueExtractor.cs new file mode 100644 index 000000000..4398a7a6a --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DepthValueExtractor.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper +{ + public static class DepthValueExtractor + { + public static int ExtractFromParentSymbol(string parentSymbol) + { + if (string.IsNullOrEmpty(parentSymbol)) + { + return 0; + } + + var depthArray = parentSymbol.Split('.'); + return depthArray.Length; + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractMessageFromTemplateText.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractMessageFromTemplateText.cs new file mode 100644 index 000000000..a4136ac29 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/ExtractMessageFromTemplateText.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping; + +namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper +{ + public class ExtractMessageFromTemplateText + { + public static List ExtractMessageWithoutBraces(List messages) + { + foreach (var message in messages) + { + message.MessageTemplate.Text = Regex.Replace(message?.MessageTemplate?.Text, @"\{.*?\}", "").Trim(); + } + + return messages; + } + + public static string ExtractMessageWithoutBraces(string messageTemplateText) + { + return System.Text.RegularExpressions.Regex.Replace(messageTemplateText, @"\{.*?\}", "").Trim(); + } + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs index 7001018a2..7307c0f4f 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs @@ -16,8 +16,8 @@ namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper { class MessageProcessingHelper { - - static int delayForSettingPinnedFalse = 20; + // not sure, why this has to be so high, otherwise the Message get not Acknowledged first Button Push + static int delayForSettingPinnedFalse = 500; public MessageProcessingHelper() { diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MessageCategoryMapper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MessageCategoryMapper.cs index eb5b7caab..c6628ca39 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MessageCategoryMapper.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MessageCategoryMapper.cs @@ -42,18 +42,18 @@ public static class MessageCategoryMapper private static readonly Dictionary ColorMapping = new Dictionary { - { eMessageCategory.Trace, "bg-trace" }, - { eMessageCategory.Debug, "bg-debug" }, - { eMessageCategory.Info, "bg-info" }, - { eMessageCategory.TimedOut, "bg-timedout" }, - { eMessageCategory.Notification, "bg-notification" }, - { eMessageCategory.Warning, "bg-warning" }, - { eMessageCategory.Error, "bg-error" }, - { eMessageCategory.ProgrammingError, "bg-programmingerror" }, - { eMessageCategory.Critical, "bg-critical" }, - { eMessageCategory.Fatal, "bg-fatal" }, - { eMessageCategory.Catastrophic, "bg-catastrophic" } + { eMessageCategory.Trace, "icon-bg-primary" }, + { eMessageCategory.Debug, "icon-bg-secondary" }, + { eMessageCategory.Info, "icon-bg-info" }, + { eMessageCategory.Warning, "icon-bg-warning" }, + { eMessageCategory.Error, "icon-bg-danger" }, + { eMessageCategory.ProgrammingError, "icon-bg-danger" }, + { eMessageCategory.Critical, "icon-bg-danger" }, + { eMessageCategory.Fatal, "icon-bg-fatal" }, + { eMessageCategory.Catastrophic, "icon-bg-fatal" } }; + + public static string GetBackgroundColorForCategory(string level) { diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs index 0767bbe37..23f9a235f 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs @@ -7,11 +7,16 @@ using System; using System.Collections.Generic; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper; + namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping { public class MongoDbLogItem { + [BsonIgnore] // This ensures MongoDB doesn't try to serialize this property + public int DepthValue => DepthValueExtractor.ExtractFromParentSymbol(Properties?.sender?.Payload?.ParentSymbol); + static MongoDbLogItem() { try @@ -27,6 +32,7 @@ static MongoDbLogItem() } } + [BsonId] public ObjectId Id { get; set; } @@ -161,6 +167,7 @@ public override PayloadProperties Deserialize(BsonDeserializationContext context } } } + } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor index 43b357bf6..db5307eeb 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor @@ -1,14 +1,16 @@ @using MongoDB.Bson +@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper @using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping @using global::TcoCore @using BlazorStrap -

    ActiveMessages

    - - - + + + + Open Message: @TotalCount + @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) { @@ -16,47 +18,58 @@ } - + + Acknowledge All Messages + + Depth Value: @DepthValue - - - - - - - UTC Timestamp - Timestamp Acknowledged - Rendered Message - Level - Message Template Text - Sender Parent Symbol - Action - - - - @if (_messagesToDisplay != null) + + + + Timestamp + Acknowledged Timestamp + Icon + Severity Level + Message Content + Message Source + Cycle + Actions + + + + @if (_messagesToDisplay != null) + { + foreach (var message in _messagesToDisplay) { - @foreach (var message in _messagesToDisplay) - { - - @message.UtcTimeStamp - @(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : " ") - @message.RenderedMessage - @message.Level - @message.MessageTemplate?.Text - @message.Properties?.sender?.Payload?.ParentSymbol - - - - - } + var bgColorClass = MessageCategoryMapper.GetBackgroundColorForCategory(message.Level); + var icon = MessageCategoryMapper.GetIconForLevel(message.Level); + + @message.UtcTimeStamp + @(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : " ") + @((MarkupString)icon) + @message.Level + @ExtractMessageFromTemplateText.ExtractMessageWithoutBraces(message.MessageTemplate?.Text) + @message.Properties?.sender?.Payload?.ParentSymbol + @message.Properties?.sender?.Payload?.Cycle + + + + } - - - - + } + else + { + + No messages available to display. + + } + + + + + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs index 894270c1a..229a1b87a 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.cs @@ -7,6 +7,7 @@ using global::TcoCore; using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Services; using MongoDB.Bson; +using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper; namespace TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.MessagesTabs { @@ -35,10 +36,11 @@ public partial class ActiveMessages private eMessageCategory DropDownSelectedCategory { get; set; } - private int _itemsPerPage = 5; + private int _itemsPerPage = 15; int _currentPage = 1; int _totalPages = 10; private IEnumerable _messagesToDisplay = new List(); + private long TotalCount { get; set; } protected override async Task OnInitializedAsync() { @@ -61,18 +63,20 @@ public async Task GetDataFilteredAsync() DateTime? endDate = DateTime.Now; string keyword = ""; eMessageCategory category = DropDownSelectedCategory; // Example category - int _depthValue = DepthValue; + int depthValue = DepthValue; - var result = await DataService.GetDataAsycForActive(_itemsPerPage, _currentPage, category, _depthValue, startDate, endDate, keyword); + var result = await DataService.GetDataAsycForActive(_itemsPerPage, _currentPage, category, depthValue, startDate, endDate, keyword); - List filteredItems = result.messages; - long totalCount = result.count; - _totalPages = (int)Math.Ceiling((double)totalCount / _itemsPerPage); + TotalCount = result.count; + _totalPages = (int)Math.Ceiling((double)TotalCount / _itemsPerPage); if (_totalPages < 1) { _totalPages = 1; } - _messagesToDisplay = result.messages; + + var _messagesWithDepthValue = result.messages.Where(x => x.DepthValue <= depthValue).ToList(); + + _messagesToDisplay = ExtractMessageFromTemplateText.ExtractMessageWithoutBraces(_messagesWithDepthValue); } private async Task AutoAcknowledgeMessages(IEnumerable messages) diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css index 5f282702b..fc658a680 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css @@ -1 +1,54 @@ - \ No newline at end of file + +.icon-container { + font-size: 1.4rem; + display: flex; + align-items: center; + justify-content: center; +} + +/* Adjust the width of the Message Content and Message Source columns */ +th:nth-child(1), td:nth-child(1) { /* Message Content column */ + width: 10%; /* Adjust as needed */ +} +/* Adjust the width of the Message Content and Message Source columns */ +th:nth-child(2), td:nth-child(2) { /* Message Content column */ + width: 10%; /* Adjust as needed */ +} + +th:nth-child(3) { /* Message Content column */ + width: 3%; /* Adjust as needed */ +} + +th:nth-child(4), td:nth-child(4) { /* Message Content column */ + width: 8%; /* Adjust as needed */ +} + +.icon-bg-primary { + background-color: rgba(0, 123, 255, 0.6); /* primary color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + +.icon-bg-secondary { + background-color: rgba(108, 117, 125, 0.6); /* secondary color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + +.icon-bg-info { + background-color: rgba(23, 162, 184, 0.6); /* info color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + +.icon-bg-warning { + background-color: rgba(255, 193, 7, 0.6); /* warning color at 70% opacity */ + color: #212529; /* dark text color for contrast */ +} + +.icon-bg-danger { + background-color: rgba(204, 37, 53, 0.7); /* danger color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + +.icon-bg-fatal { + background-color: rgba(220, 53, 69, 0.9); /* danger color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor index 184357853..6a76afa10 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor @@ -1,62 +1,58 @@  -@using MongoDB.Bson +@using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Helper @using TcOpen.Inxton.TcoCore.Blazor.TcoDiagnosticsAlternative.Mapping @using global::TcoCore @using BlazorStrap -

    ArchiveMessages

    - - - - - - - @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) - { - - } - - - - Depth Value: @DepthValue - - - - - - - + + Messages: @TotalCount + + + @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) + { + + } + + + + + + + Depth Value: @DepthValue + + + + + + + - UTC Timestamp + Timestamp Timestamp Acknowledged - Rendered Message + Icon Level - Message Template Text - Sender Parent Symbol + Message + Message Source @if (_messagesToDisplayArchive != null) { - @foreach (var message in _messagesToDisplayArchive) + foreach (var message in _messagesToDisplayArchive) { - - @message.UtcTimeStamp - @(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : " ") - @message.RenderedMessage - @message.Level - @message.MessageTemplate?.Text - @message.Properties?.sender?.Payload?.ParentSymbol - + var bgColorClass = MessageCategoryMapper.GetBackgroundColorForCategory(message.Level); + var icon = MessageCategoryMapper.GetIconForLevel(message.Level); + + @message.UtcTimeStamp + @(message.TimeStampAcknowledged.HasValue ? message.TimeStampAcknowledged.Value.ToString("MM/dd/yyyy HH:mm:ss") : " ") + @((MarkupString)icon) + @message.Level + @ExtractMessageFromTemplateText.ExtractMessageWithoutBraces(message.MessageTemplate?.Text) + @message.Properties?.sender?.Payload?.ParentSymbol + } } - - - - - - - + \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs index 1503348bf..c24b91099 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs @@ -33,9 +33,11 @@ public partial class ArchivedMessages private eMessageCategory DropDownSelectedCategory { get; set; } - private int _itemsPerPage = 6; + private string Keyword { get; set; } = ""; + private int _itemsPerPage = 15; int _currentPage = 1; int _totalPages = 10; + public long TotalCount { get; set; } private IEnumerable _messagesToDisplayArchive = new List(); protected override async Task OnInitializedAsync() @@ -57,19 +59,20 @@ public async Task GetDataFilteredAsyncForArchive() DateTime? startDate = DateTime.Now.AddDays(-7); // Example: 7 days ago DateTime? endDate = DateTime.Now; - string keyword = ""; + string keyword = Keyword; eMessageCategory category = DropDownSelectedCategory; // Example category int _depthValue = DepthValue; var result = await DataService.GetDataAsyncForArchive(_itemsPerPage, _currentPage, category, _depthValue, startDate, endDate, keyword); - long totalCount = result.count; - _totalPages = (int)Math.Ceiling((double)totalCount / _itemsPerPage); + TotalCount = result.count; + _totalPages = (int)Math.Ceiling((double)TotalCount / _itemsPerPage); if (_totalPages < 1) { _totalPages = 1; } - _messagesToDisplayArchive = result.messages; + + _messagesToDisplayArchive = result.messages.Where(x => x.DepthValue <= _depthValue).ToList(); } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css new file mode 100644 index 000000000..3d4254cf6 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css @@ -0,0 +1,55 @@ +.icon-bg-primary { + background-color: rgba(0, 123, 255, 0.2); /* primary color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + +.icon-bg-secondary { + background-color: rgba(108, 117, 125, 0.2); /* secondary color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + +.icon-bg-info { + background-color: rgba(23, 162, 184, 0.2); /* info color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + +.icon-bg-warning { + background-color: rgba(255, 193, 7, 0.2); /* warning color at 70% opacity */ + color: #212529; /* dark text color for contrast */ +} + +.icon-bg-danger { + background-color: rgba(220, 53, 69, 0.2); /* danger color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + + +.icon-bg-fatal { + background-color: rgba(220, 53, 69, 0.3); /* danger color at 70% opacity */ + color: #ffffff; /* white text color for contrast */ +} + + +.icon-container { + font-size: 1.4rem; + display: flex; + align-items: center; + justify-content: center; +} + +/* Adjust the width of the Message Content and Message Source columns */ +th:nth-child(1), td:nth-child(1) { /* Message Content column */ + width: 10%; /* Adjust as needed */ +} +/* Adjust the width of the Message Content and Message Source columns */ +th:nth-child(2), td:nth-child(2) { /* Message Content column */ + width: 10%; /* Adjust as needed */ +} + +th:nth-child(3) { /* Message Content column */ + width: 3%; /* Adjust as needed */ +} + +th:nth-child(4), td:nth-child(4) { /* Message Content column */ + width: 8%; /* Adjust as needed */ +} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs index 649034bbb..7f9f37f59 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Services/DataService.cs @@ -69,47 +69,47 @@ public DataService(IOptions settings) public async Task AcknowledgeAllMessages() { - //List messagesToUpdate = new List(); - - //foreach (var message in MessageDisplay.Where(m => m.Pinned)) - // if (message != null) - // { - // await GetListofStillActiveMessages(message); - // } - //} - - //var filteredActiveMessages = StillActiveMessagesAfterPinnedTest; - - //foreach (var message in MessagesInDbFiltered) - //{ - // var identity = ExtractIdentityFromRenderedMessage(message.RenderedMessage); - // if (!identity.HasValue) continue; - - // bool isMessageAcknowledged = filteredActiveMessages.Any(x => - // x.Identity == (ulong)identity.Value && - // x.MessageDigest == message.Properties.sender.Payload.MessageDigest - // ); - - // if (isMessageAcknowledged && MessagesReadyToAck != null) - // { - // MessagesReadyToAck.Remove(message); - // } - //} - //await BulkUpdateTimestampAcknowledgedAsync(); + var messageDisplay = MessageDisplay.ToList(); + // Get the list of messages that are still pinned after setting them to false. + var stillPinnedMessages = await _messageProcessingHelper.GetStillPinnedMsgsAfterSettingItFalse(MessageDisplay.ToList()); + + // Determine which messages from MessageDisplay are not in the stillPinnedMessages list. + var messagesToAcknowledge = messageDisplay + .Where(x => !stillPinnedMessages.Any(m => m.Identity == x.Identity && m.MessageDigest == x.MessageDigest)); + + // Convert PlainTcoMessage to MongoDbLogItem for the bulk update method. + var mongoDbMessagesToAcknowledge = new List(); + foreach (var message in messagesToAcknowledge) + { + var mongoDbLogItemId = await _mongoDbHelper.GetMongoDbLogItemIdFromPlainTcoMessage(message); + if (mongoDbLogItemId.HasValue) + { + var mongoDbMessage = new MongoDbLogItem + { + Id = mongoDbLogItemId.Value, + }; + mongoDbMessagesToAcknowledge.Add(mongoDbMessage); + } + } + + // Bulk update the timestamp for all messages that are ready to be acknowledged. + await _mongoDbHelper.BulkUpdateTimestampAcknowledgedAsync(mongoDbMessagesToAcknowledge); } + public async Task AcknowledgeSingleMessage(ObjectId id) { var update = Builders.Update.Set(m => m.TimeStampAcknowledged, DateTime.UtcNow); var messageFromId = await _mongoDbHelper.GetPlainTcoMessageFromId(id, MessageDisplay); var messageStillPinned = await _messageProcessingHelper.GetStillPinnedSingleMsgAfterSettingItFalse(messageFromId); - - if (messageStillPinned != null ) + if (messageStillPinned != null) { - Console.WriteLine($"Still Active Message: {id}."); - return; - + var messageStillPinned2 = await _messageProcessingHelper.GetStillPinnedSingleMsgAfterSettingItFalse(messageFromId); + if (messageStillPinned2 != null) + { + return; + } } var result = await _mongoDbHelper.UpdateTimeStampAcknowledgeAsync(id, update); } @@ -145,7 +145,7 @@ public async Task AutoAcknowledgeMessages(IEnumerable msg) messageToAck.Add(message); } } - //await _mongoDbHelper.BulkUpdateTimestampAcknowledgedAsync(messageToAck); + await _mongoDbHelper.BulkUpdateTimestampAcknowledgedAsync(messageToAck); } } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs index 8b696d7c9..c1462c47b 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.cs @@ -32,10 +32,10 @@ public partial class TcoDiagnosticsAlternativeView : IDisposable public string DiagnosticsStatus { get; set; } = "Diagnostics is not running"; private string ActiveMessagesCount() => "Aktive Messages : " + ViewModel._tcoObject.MessageHandler.ActiveMessagesCount; - private string DiagnosticsMessage() => "Diag depth : " + DepthValue; + private string DiagnosticsMessage() => "Diag depth : " + InitialDepthValue; private int _maxDiagnosticsDepth = 20; - private static int _depthValue; + public static int InitialDepthValue { get; set; } //public static int SetDefaultDepth(int item) => _depthValue = item; //private static eMessageCategory _minMessageCategoryFilter; @@ -47,6 +47,11 @@ public static void SetMinMessageCategoryFilter(eMessageCategory category) MinMessageCategoryFilter = category; } + public static void SetDefaultDepthValue(int depthValue) + { + InitialDepthValue = depthValue; + } + public bool GetMessageStatusPinned(MongoDbLogItem message) { var matchingMessage = ViewModel.MessageDisplay.FirstOrDefault( @@ -59,7 +64,7 @@ public bool GetMessageStatusPinned(MongoDbLogItem message) /// SetsUpdate Intervall via Consuming App /// public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value; - private static int _diagnosticsUpdateInterval = 200; + private static int _diagnosticsUpdateInterval =500; private Timer _messageUpdateTimer; protected override async Task OnInitializedAsync() @@ -117,25 +122,16 @@ await InvokeAsync(async () => }); } - public int DepthValue - { - get - { - if (_depthValue == 0) - _depthValue = ViewModel._tcoObject.MessageHandler.DiagnosticsDepth; - return _depthValue; - } - set - { - _depthValue = value; - ViewModel._tcoObject.MessageHandler.DiagnosticsDepth = value; - } - } - public void Dispose() { _messageUpdateTimer?.Dispose(); } + private string _activeTab = "activeMessages"; // Default active tab + + private void SwitchTab(string tabName) + { + _activeTab = tabName; + } } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor index 354491f2c..9a6c0c41e 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor @@ -6,7 +6,8 @@ @using BlazorStrap.V5 - + + Active Messages @@ -14,7 +15,7 @@ DataService="DataService" MaxDiagnosticsDepth="_maxDiagnosticsDepth" GetMessageStatusPinned="GetMessageStatusPinned" - DepthValue="@DepthValue" + InitalDepthValue="@InitialDepthValue" InitialCategory="@MinMessageCategoryFilter" /> @@ -27,18 +28,9 @@ DataService="DataService" MaxDiagnosticsDepth="_maxDiagnosticsDepth" GetMessageStatusPinned="GetMessageStatusPinned" - DepthValue="@DepthValue" + InitalDepthValue="@InitialDepthValue" InitialCategory="@MinMessageCategoryFilter" /> - -@code { - private string _activeTab = "activeMessages"; // Default active tab - - private void SwitchTab(string tabName) - { - _activeTab = tabName; - } -} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css index bb401fd5b..78ffad63e 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeView.razor.css @@ -60,49 +60,3 @@ button { right: 5px; /* Adjust the position of the dropdown arrow */ } -.icon-container { - font-size: 1.4rem; -} -.bg-trace { - background-color: rgba(155, 198, 245, 0.5) !important; /* Very light gray with opacity */ -} - -.bg-debug { - background-color: rgba(155, 198, 245, 0.5) !important; /* Soft blue with opacity */ -} - -.bg-info { - background-color: rgba(138, 176, 211, 0.5)!important; /* Soft green with opacity */ -} - -.bg-timedout { - background-color: rgba(64, 108, 158, 0.5)!important; /* Soft yellow with opacity */ -} - -.bg-notification { - background-color: rgba(255, 230, 204, 0.5)!important; /* Soft orange with opacity */ -} - -.bg-warning { - background-color: rgba(228, 146, 58, 0.5) !important; /* Soft peach with opacity */ -} - -.bg-error { - background-color: rgba(245, 145, 145, 0.9) !important; /* Soft red with opacity */ -} - -.bg-programmingerror { - background-color: rgba(255, 179, 179, 0.5)!important; /* Lighter red with opacity */ -} - -.bg-critical { - background-color: rgba(184, 53, 53, 0.5)!important; /* Light crimson with opacity */ -} - -.bg-fatal { - background-color: rgba(131, 38, 38, 0.5)!important; /* Moderate red with opacity */ -} - -.bg-catastrophic { - background-color: rgba(151, 30, 30, 0.5)!important; /* Slightly deep red with opacity */ -} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs index 5a436bd41..7c7b8862b 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/TcoDiagnosticsAlternativeViewModel.cs @@ -68,7 +68,5 @@ internal set SetProperty(ref _diagnosticsRunning, value); } } - - } } From c78f998c2cb5df6cf5babc5f289f3b5a913342a1 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 30 Oct 2023 14:22:20 +0100 Subject: [PATCH 13/13] basic Functionalities work, filtering, Acknowledging, displaying. pls try it out, perfomance issues, when too many msgs incoming --- .../PlcHammer.Hmi.Blazor/Startup.cs | 4 +- .../DateTimePickerComponent.razor | 84 ++++++++++++++++ .../DateTimePicker/TimePickerComponent.razor | 99 +++++++++++++++++++ .../Helper/MessageProcessingHelper.cs | 15 +++ .../Helper/MongoDbHelper.cs | 4 + .../Mapping/MongoDbLogItem.cs | 26 +++++ .../MessagesTabs/ActiveMessages.razor | 6 +- .../MessagesTabs/ActiveMessages.razor.css | 6 +- .../MessagesTabs/ArchivedMessages.razor | 20 +++- .../MessagesTabs/ArchivedMessages.razor.cs | 14 ++- .../MessagesTabs/ArchivedMessages.razor.css | 2 +- 11 files changed, 267 insertions(+), 13 deletions(-) create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/DateTimePickerComponent.razor create mode 100644 src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/TimePickerComponent.razor diff --git a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs index 29fcc1045..f55d56cef 100644 --- a/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs +++ b/src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Startup.cs @@ -105,7 +105,7 @@ public void ConfigureServices(IServiceCollection services) //.Enrich.With(new Serilog.Enrichers.EnvironmentNameEnricher()) //.Enrich.With(new Serilog.Enrichers.EnvironmentUserNameEnricher()) //.Enrich.With(new Serilog.Enrichers.MachineNameEnricher()) - .MinimumLevel.Debug())) // Sets the logger configuration (default reports only to console). + .MinimumLevel.Verbose())) // Sets the logger configuration (default reports only to console). .SetSecurity(SecurityManager.Manager.Service) .SetEditValueChangeLogging(Entry.PlcHammer.Connector); @@ -148,7 +148,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) }); Entry.PlcHammer.Connector.BuildAndStart(); - Entry.PlcHammer.TECH_MAIN._app._logger.StartLoggingMessages(TcoCore.eMessageCategory.All); + Entry.PlcHammer.TECH_MAIN._app._logger.StartLoggingMessages(TcoCore.eMessageCategory.Debug); } private static void SetUpRepositories(IRepository processRecipiesRepository, diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/DateTimePickerComponent.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/DateTimePickerComponent.razor new file mode 100644 index 000000000..9d10fcc85 --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/DateTimePickerComponent.razor @@ -0,0 +1,84 @@ +
    + @if (UseNative) + { + + + } + else + { + + + } +
    + +@code { + + [Parameter] + public DateTime DateAndTime + { + get; set; + } + + [Parameter] + public EventCallback DateAndTimeChanged + { + get; set; + } + + [Parameter] + public bool IsDisabled + { + get; set; + } + + [Parameter] + public bool UseNative + { + get; set; + } + + private DateTime Date + { + get + { + return DateAndTime.Date; + } + set + { + DateAndTime = value.AddSeconds(SecondOfDay); + _ = NotifyChanged(); + } + } + + private int SecondOfDay + { + get + { + return DateAndTime.Hour * 3600 + DateAndTime.Minute * 60; + } + set + { + DateAndTime = DateAndTime.Date.AddSeconds(value); + _ = NotifyChanged(); + } + } + + private Task NotifyChanged() + { + return DateAndTimeChanged.InvokeAsync(DateAndTime); + } +} diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/TimePickerComponent.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/TimePickerComponent.razor new file mode 100644 index 000000000..0a665fcbf --- /dev/null +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/DateTimePicker/TimePickerComponent.razor @@ -0,0 +1,99 @@ +@using Microsoft.AspNetCore.Components; + +@if (UseNativeTimePicker) +{ + +} +else +{ + + : + +} + +@code { + [Parameter] + public int SecondOfDay + { + get + { + return Hour * 3600 + Minute * 60; + } + + set + { + Hour = value / 3600; + Minute = (value % 3600) / 60; + } + } + + [Parameter] + public EventCallback SecondOfDayChanged + { + get; set; + } + + [Parameter] + public bool UseNativeTimePicker + { + get; set; + } + + [Parameter] + public bool IsDisabled + { + get; set; + } + + public int Hour + { + get; set; + } + + public int Minute + { + get; set; + } + + private Task NotifyChanged() + { + return SecondOfDayChanged.InvokeAsync(SecondOfDay); + } + + public Dictionary InputAttributes + { + get; set; + } = + new Dictionary() + { + { "class", "form-control w-auto d-inline" } + }; +} \ No newline at end of file diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs index 7307c0f4f..99b226da2 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MessageProcessingHelper.cs @@ -76,5 +76,20 @@ private async Task ProcessMessageAsync(PlainTcoMessage message) return null; } + + public static DateTime AdjustForDaylightSavingTime(DateTime date) + { + TimeZoneInfo localZone = TimeZoneInfo.Local; + if (localZone.IsDaylightSavingTime(date)) + { + // Summertime + return date.AddHours(2); + } + else + { + // Wintertime + return date.AddHours(1); + } + } } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs index 1370f5ec2..27cb222f6 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Helper/MongoDbHelper.cs @@ -139,6 +139,10 @@ public async Task UpdateTimeStampAcknowledgeAsync(ObjectId? id, Up var count = await collection.CountDocumentsAsync(filter); + foreach (var message in messages) { + message.AdjustForDaylightSavingTime(); + } + return (messages, count); } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs index 23f9a235f..3f1ccc137 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/Mapping/MongoDbLogItem.cs @@ -32,6 +32,31 @@ static MongoDbLogItem() } } + public void AdjustForDaylightSavingTime() + { + TimeZoneInfo localZone = TimeZoneInfo.Local; + + if (localZone.IsDaylightSavingTime(UtcTimeStamp)) + { + // Summertime + UtcTimeStamp = UtcTimeStamp.AddHours(2); + if (TimeStampAcknowledged.HasValue) + { + TimeStampAcknowledged = TimeStampAcknowledged.Value.AddHours(2); + } + } + else + { + // Wintertime + UtcTimeStamp = UtcTimeStamp.AddHours(1); + if (TimeStampAcknowledged.HasValue) + { + TimeStampAcknowledged = TimeStampAcknowledged.Value.AddHours(1); + } + } + } + + [BsonId] public ObjectId Id { get; set; } @@ -168,6 +193,7 @@ public override PayloadProperties Deserialize(BsonDeserializationContext context } } + } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor index db5307eeb..bca20130d 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor @@ -26,14 +26,14 @@ - + Timestamp Acknowledged Timestamp Icon - Severity Level - Message Content + Level + Message Message Source Cycle Actions diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css index fc658a680..7d84c7612 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ActiveMessages.razor.css @@ -1,7 +1,8 @@  .icon-container { - font-size: 1.4rem; + font-size: 1.8rem; display: flex; + height: 100%; align-items: center; justify-content: center; } @@ -20,7 +21,7 @@ th:nth-child(3) { /* Message Content column */ } th:nth-child(4), td:nth-child(4) { /* Message Content column */ - width: 8%; /* Adjust as needed */ + width: 6%; /* Adjust as needed */ } .icon-bg-primary { @@ -52,3 +53,4 @@ th:nth-child(4), td:nth-child(4) { /* Message Content column */ background-color: rgba(220, 53, 69, 0.9); /* danger color at 70% opacity */ color: #ffffff; /* white text color for contrast */ } + diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor index 6a76afa10..d1da973bb 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor @@ -5,7 +5,6 @@ @using BlazorStrap - Messages: @TotalCount @foreach (var category in Enum.GetValues(typeof(eMessageCategory))) @@ -17,6 +16,21 @@ + + + + + + + + + Messages: @TotalCount Depth Value: @DepthValue @@ -25,7 +39,7 @@ - + Timestamp @@ -34,6 +48,7 @@ Level Message Message Source + Cycle @@ -50,6 +65,7 @@ @message.Level @ExtractMessageFromTemplateText.ExtractMessageWithoutBraces(message.MessageTemplate?.Text) @message.Properties?.sender?.Payload?.ParentSymbol + @message.Properties?.sender?.Payload?.Cycle } } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs index c24b91099..ccc144540 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.cs @@ -33,6 +33,11 @@ public partial class ArchivedMessages private eMessageCategory DropDownSelectedCategory { get; set; } + private DateTime DateLower { get; set; } = new DateTime(2022, 01, 01, 12, 0, 0); + private DateTime DateUpper { get; set; } + public bool IsDisabled { get; set; } + public bool UseNative { get; set; } + private string Keyword { get; set; } = ""; private int _itemsPerPage = 15; int _currentPage = 1; @@ -45,6 +50,7 @@ protected override async Task OnInitializedAsync() DropDownSelectedCategory = InitialCategory; DepthValue = InitalDepthValue; + DateUpper = DateTime.Now; await GetDataFilteredAsyncForArchive(); } @@ -57,10 +63,10 @@ protected override async Task OnParametersSetAsync() public async Task GetDataFilteredAsyncForArchive() { - DateTime? startDate = DateTime.Now.AddDays(-7); // Example: 7 days ago - DateTime? endDate = DateTime.Now; + DateTime? startDate = DateLower; + DateTime? endDate = DateUpper; string keyword = Keyword; - eMessageCategory category = DropDownSelectedCategory; // Example category + eMessageCategory category = DropDownSelectedCategory; int _depthValue = DepthValue; var result = await DataService.GetDataAsyncForArchive(_itemsPerPage, _currentPage, category, _depthValue, startDate, endDate, keyword); @@ -72,6 +78,8 @@ public async Task GetDataFilteredAsyncForArchive() _totalPages = 1; } + + _messagesToDisplayArchive = result.messages.Where(x => x.DepthValue <= _depthValue).ToList(); } diff --git a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css index 3d4254cf6..8b0a4dda3 100644 --- a/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css +++ b/src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnosticsAlternative/MessagesTabs/ArchivedMessages.razor.css @@ -31,7 +31,7 @@ .icon-container { - font-size: 1.4rem; + font-size: 1.6rem; display: flex; align-items: center; justify-content: center;