Feature/ocel

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Restore bXES dependencies
         run: dotnet restore All.sln
       - name: Build bXES
@@ -43,7 +43,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            9.0.x
+            10.0.x
             8.0.x
             6.0.x
       - name: Build and unit test Procfiler

Directory.Packages.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Aspire.Hosting" Version="9.3.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="Confluent.Kafka" Version="2.5.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
@@ -25,16 +25,16 @@
     <PackageVersion Include="JetBrains.RdFramework" Version="2024.3.0" />
     <PackageVersion Include="JetBrains.Annotations" Version="2022.1.0" />
     <PackageVersion Include="Radzen.Blazor" Version="5.6.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.621003" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.22" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.12.6" />

Ficus/docker/run/Run.FicusDashboard.Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG BUILD_CONFIGURATION=Release
 ARG PROJECT_NAME=FicusDashboard
 

Ficus/docker/run/Run.FicusDashboardBackend.Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG BUILD_CONFIGURATION=Release
 ARG PROJECT_NAME=FicusDashboardBackend
 
@@ -10,9 +10,9 @@ COPY Directory.Packages.props ./Directory.Packages.props
 RUN dotnet restore ./Ficus/src/front/FicusFrontend/$PROJECT_NAME/$PROJECT_NAME.csproj
 
 WORKDIR /app/Ficus/src/front/FicusFrontend/$PROJECT_NAME
-RUN dotnet build $PROJECT_NAME.csproj -c $BUILD_CONFIGURATION -o /app/build
+RUN dotnet build $PROJECT_NAME.csproj -c $BUILD_CONFIGURATION -o /app/build -v d
 
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
+FROM mcr.microsoft.com/dotnet/aspnet:10.0
 ARG PROJECT_NAME=FicusDashboardBackend
 
 EXPOSE 8080

Ficus/docker/tests/Tests.KafkaIntegrationTests.Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build-env
 
 RUN apt update -y && apt upgrade -y
 RUN apt install nodejs -y
@@ -10,7 +10,7 @@ COPY ./bxes ./bxes
 COPY ./FicusBxes.sln ./FicusBxes.sln
 COPY Directory.Packages.props ./Directory.Packages.props
 
-RUN dotnet build . -c Release
+RUN dotnet build . -c Release -v d
 
 FROM build-env as test
 ENTRYPOINT [ "dotnet", "test", "/app/Ficus/test/IntegrationTests/IntegrationTests/IntegrationTests.csproj", "-c", "Release" ]

Ficus/protos/pipelines_and_context.proto

@@ -45,9 +45,36 @@ message GrpcContextValue {
     GrpcUintArray uint_array = 24;
     string json = 25;
     GrpcSimpleEventLog event_log = 26;
+    GrpcOcelModelAnnotation ocel_annotation = 27;
   }
 }
 
+message GrpcOcelModelAnnotation {
+  repeated GrpcModelElementOcelAnnotation annotations = 1;
+}
+
+message GrpcModelElementOcelAnnotation {
+  uint64 element_id = 1;
+  optional GrpcOcelState initial_state = 2;
+  GrpcOcelState final_state = 3;
+  repeated GrpcOcelStateObjectRelation relations = 4;
+}
+
+message GrpcOcelStateObjectRelation {
+  string object_id = 1;
+  uint64 element_id = 2;
+  repeated string related_objects_ids = 3;
+}
+
+message GrpcOcelState {
+  repeated GrpcOcelObjectTypeState type_states = 1;
+}
+
+message GrpcOcelObjectTypeState {
+  string type = 1;
+  repeated string object_ids = 2;
+}
+
 message GrpcFloatArray {
   repeated double items = 1;
 }
@@ -201,6 +228,7 @@ message GrpcComplexContextRequestPipelinePart {
 enum GrpcGraphKind {
   None = 0;
   DAG = 1;
+  DagLCS = 2;
 }
 
 message GrpcGraph {
@@ -255,6 +283,35 @@ message GrpcSoftwareData {
   repeated GrpcGeneralHistogramData histogram_data = 13;
   repeated GrpcSimpleCounterData simple_counter_data = 14;
   repeated GrpcActivityDurationData activities_durations_data = 15;
+  repeated GrpcOcelData ocel_data = 16;
+}
+
+message GrpcOcelObjectTypeData {
+  optional string type = 1;
+}
+
+message GrpcOcelAllocateMerge {
+  optional string type = 1;
+  repeated string merged_objects_ids = 2;
+}
+
+message GrpcOcelProducedObject {
+  string id = 1;
+  optional string type = 2;
+}
+
+message GrpcOcelConsumeProduce {
+  repeated GrpcOcelProducedObject produced_objects = 1;
+}
+
+message GrpcOcelData {
+  string object_id = 1;
+  oneof action {
+    GrpcOcelObjectTypeData allocate = 2;
+    GrpcOcelObjectTypeData consume = 3;
+    GrpcOcelAllocateMerge merged_object_allocation = 4;
+    GrpcOcelConsumeProduce produce_object_consumption = 5;
+  }
 }
 
 message GrpcActivityDurationData {

Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/CaseInfo.razor

@@ -1,4 +1,4 @@
-@using BlazorBootstrap
+@using FicusDashboard.Components.Utils
 @using FicusDashboard.Layout.Models
 @using FicusDashboard.Services.Cases
 @using JetBrains.Lifetimes
@@ -21,7 +21,7 @@
 @if (myIsLoading)
 {
   <div style="width: 100%; height: 100%; display: flex; align-items: center; justify-content: center;">
-    <Spinner Type="SpinnerType.Dots" />
+    <Loader />
   </div>
 
   return;

Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/CanvasComponent.razor

@@ -1,16 +1,18 @@
-@using BlazorBootstrap;
+@using FicusDashboard.Components.Utils
 
 @inherits ComponentBase
 
 @inject IJSRuntime Js
 
-@if (myIsDrawing)
-{
-  <Spinner Style="margin-top: 10px; margin-left: 10px;" Type="SpinnerType.Dots" Color="SpinnerColor.Primary"/>
-}
+<div style="height: 10px; width: 100%; display: flex; align-items: center; justify-content: center;">
+  @if (myIsDrawing)
+  {
+    <Loader />
+  }
+</div>
 
-<div style="visibility: @(myIsDrawing ? "collapse" : "visible")" class="@(IsFullScreen ? "canvas-container-fullscreen" : "canvas-container")">
-  <div id="@myCytoscapeContainerId" class="@(IsFullScreen ? "canvas-container-fullscreen" : "cytoscape-canvas")">
+<div style="visibility: @(myIsDrawing ? "collapse" : "inherit")" class="canvas-container">
+  <div id="@myCytoscapeContainerId" class="cytoscape-canvas">
   </div>
 </div>
 
@@ -39,7 +41,7 @@
     return Task.CompletedTask;
   }
 
-  public Task ExportGraph(string fileName) => 
+  public Task ExportGraph(string fileName) =>
     Js.InvokeVoidAsync("exportCytoscapeToSvg", myCytoscapeReference, fileName).AsTask();
 
   private void ReRenderCanvasInternal()
@@ -48,7 +50,7 @@
     StateHasChanged();
 
     //some hacks in order to make it work after changing to full screen from JS side
-    Task.Delay(100).ContinueWith(_ =>
+    Task.Delay(200).ContinueWith(_ =>
     {
       InvokeAsync(async () =>
       {
@@ -64,5 +66,4 @@
     myRequestedToRerender = true;
     ReRenderCanvasInternal();
   }
-
 }

Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/CanvasComponent.razor.css

@@ -1,20 +1,16 @@
 .canvas-container {
   min-width: 800px;
   min-height: 650px;
-  width: 100%;
-  height: 100%;
   background-color: var(--cv-section-content-color);
   padding: 5px;
-}
-
-.canvas-container-fullscreen {
-  width: 100%;
-  height: 100%;
-  padding: 5px;
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
 }
 
 .cytoscape-canvas {
   width: 100%;
   height: 100%;
   padding: 5px;
+  flex-grow: 1;
 }

Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/AggregatedDataModels.cs

@@ -11,6 +11,21 @@ public class AggregatedData
   public bool IsEmpty => GlobalSoftwareData.IsEmpty;
 }
 
+public class EnhancedGraphEntity
+{
+  public ulong Id { get; set; }
+  public string? Html { get; set; }
+  public string Color { get; set; }
+  public string ExecutionTimeStringRepr { get; set; }
+}
+
+public class EnhancedEdge : EnhancedGraphEntity
+{
+  public int NumberOfExecutions { get; set; }
+}
+
+public class EnhancedNode : EnhancedGraphEntity;
+
 public class MergedSoftwareData
 {
   public Dictionary<string, ValueWithUnits<Dictionary<string, double>>> Histograms { get; set; } = new();

Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/EnhancementsSettings.razor

@@ -1,22 +1,30 @@
-@if (myEnhancements is { })
+@using FicusDashboard.Components.Utils
+
+@if (myEnhancements is not null)
 {
+  <div style="width: 100%; margin-bottom: 5px;">
+    <BoolCheckbox T="bool"
+                  Checked="@myNextState"
+                  Handler="@((_, _) => SelectOrDeselectAll())"
+                  Title="[De]Select All"/>
+  </div>
+
   @foreach (var group in myEnhancements.GroupBy(e => e.Group).OrderBy(e => e.Key))
   {
     <div style="margin-bottom: 10px;">
       <div>
         @(string.IsNullOrWhiteSpace(group.Key) ? "Ungrouped" : group.Key)
       </div>
 
-      @foreach (var enhancement in group)
-      {
-        <div style="display: flex; flex-direction: row; align-items: center;">
-          <input type="checkbox"
-                 checked="checked"
-                 @onchange="@(args => HandleSelectionChange(args.Value is true, enhancement))"/>
-
-          <div style="margin-left: 5px;">@enhancement.DisplayName</div>
-        </div>
-      }
+      <div style="margin-left: 10px;">
+        @foreach (var enhancement in group)
+        {
+          <BoolCheckbox T="bool"
+                        Checked="@myNextState"
+                        Handler="@((newValue, _) => HandleSelectionChange(newValue, enhancement))"
+                        Title="@enhancement.DisplayName"/>
+        }
+      </div>
     </div>
   }
 }
@@ -34,7 +42,7 @@
 
   [Parameter] public required List<EnhancementName>? Enhancements { get; init; }
 
-
+  private bool myNextState = true;
   private List<EnhancementName>? myEnhancements;
   private HashSet<EnhancementName> mySelectedEnhancements = null!;
 
@@ -48,7 +56,7 @@
 
     myEnhancements = Enhancements;
 
-    if (myEnhancements is not { }) return;
+    if (myEnhancements is null) return;
 
     mySelectedEnhancements = myEnhancements.ToHashSet();
   }
@@ -65,4 +73,25 @@
     }
   }
 
+  private void SelectOrDeselectAll()
+  {
+    if (myEnhancements is null) return;
+
+    if (!myNextState)
+    {
+      foreach (var name in myEnhancements)
+      {
+        mySelectedEnhancements.Add(name);
+      }
+    }
+    else
+    {
+      mySelectedEnhancements.Clear();
+    }
+
+    myNextState = !myNextState;
+
+    StateHasChanged();
+  }
+
 }