From bb20c1b0c31d9905cec8d308884cee6a5326c6f8 Mon Sep 17 00:00:00 2001
From: Michael Hoffmeister <michael.hoffmeister@festo.com>
Date: Mon, 23 Dec 2024 15:10:11 +0100
Subject: [PATCH] * 1st overall progress    working for repo load

---
 src/AasxPackageExplorer/MainWindow.xaml       |  62 +++++++++--
 src/AasxPackageExplorer/MainWindow.xaml.cs    |  83 ++++++++++----
 .../AasxFileServerInterfaceService.cs         |   4 +-
 .../PackageCentral/PackageContainerBase.cs    |  11 +-
 .../PackageContainerHttpRepoSubset.cs         | 101 ++++++++++++++++--
 .../PackageContainerNetworkHttpFile.cs        |   6 +-
 .../PackageCentral/PackageHttpDownloadUtil.cs |  12 +--
 .../ProgressableStreamContent.cs              |  12 +--
 .../IntegratedConnectFlyout.xaml.cs           |  10 +-
 .../Data/BlazorSession.MainWindow.cs          |   5 +-
 10 files changed, 240 insertions(+), 66 deletions(-)

diff --git a/src/AasxPackageExplorer/MainWindow.xaml b/src/AasxPackageExplorer/MainWindow.xaml
index aec553ef..a9e64fac 100644
--- a/src/AasxPackageExplorer/MainWindow.xaml
+++ b/src/AasxPackageExplorer/MainWindow.xaml
@@ -27,8 +27,31 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                
+                <!-- use central ressources shared by all projects -->                
                 <ResourceDictionary Source="pack://application:,,,/AasxIntegrationBaseWpf;component/Themes/Generic.xaml"/>
+                
+                <!-- define some own ressources -->
                 <ResourceDictionary>
+
+                    <Style x:Key="TranspBackground" TargetType="{x:Type Button}">
+                        <Setter Property="Background" Value="Transparent"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Border Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="0">
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="Transparent"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -71,7 +94,9 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
 
-                <Menu x:Name="MenuMain" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="0" VerticalAlignment="Center" FontSize="14" Background="Transparent">
+                <Menu Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="0" 
+                      x:Name="MenuMain" 
+                      VerticalAlignment="Center" FontSize="14" Background="Transparent">
                 </Menu>
 
                 <Grid Grid.Column="2">
@@ -215,7 +240,7 @@
                         </Viewbox>
                     </Border>
 
-                    <Border Grid.Row="2" Grid.Column="0"
+                    <Border Grid.Row="2" Grid.Column="0" x:Name="BorderContainerList"
                             BorderThickness="1.0" BorderBrush="{DynamicResource DarkestAccentColor}" CornerRadius="6" 
                             Margin="2,0,0,0" Padding="2">
                         <repo:PackageContainerListOfListControl x:Name="RepoListControl" >
@@ -226,14 +251,14 @@
 
 
                 <!-- MIHO1 -->
-                <Border Grid.Row="0" Grid.Column="2" 
+                <Border Grid.Row="0" Grid.Column="2" x:Name="BorderDisplayElements"
                         BorderThickness="1.0" BorderBrush="{DynamicResource DarkestAccentColor}" CornerRadius="6" 
                         Margin="0,2,0,0" Padding="2">
                     <local:DiplayVisualAasxElements x:Name="DisplayElements" SelectedItemChanged="DisplayElements_SelectedItemChanged" MouseDoubleClick="DisplayElements_MouseDoubleClick">
                     </local:DiplayVisualAasxElements>
                 </Border>
 
-                <Border Grid.Row="0" Grid.Column="4" 
+                <Border Grid.Row="0" Grid.Column="4" x:Name="BorderEditElements"
                         BorderThickness="1.0" BorderBrush="{DynamicResource DarkestAccentColor}" CornerRadius="6" 
                         Margin="0,2,2,0" Padding="2">
                     <TabControl x:Name="ElementTabControl" MinWidth="320" BorderBrush="White">
@@ -365,17 +390,40 @@
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="20"/>
+                        <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
-                    <ProgressBar x:Name="ProgressBarInfo" 
+                    
+                    <!-- left column: overall progress -->
+                    <TextBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" 
+                             x:Name="TextBlockProgressOverall"
+                             BorderBrush="LightGray" Padding="2, 2, 2, 2" Margin="0,3,0,2"
+                             Text="inactive" Foreground="LightGray"
+                             Background="White"
+                             MinWidth="120"/>
+
+                    <Button Grid.Row="0" Grid.Column="1" x:Name="ButtonProgressOverallClear"
+                            Style="{DynamicResource TranspBackground}"
+                            FontSize="16" Foreground="LightGray"
+                            BorderThickness="0" Background="Transparent"
+                            Click="ButtonProgressOverallClear_Click"
+                            Content="&#x2bbe;">
+                    </Button>
+
+                    <!-- right column: progress bar for single download -->
+                    <ProgressBar Grid.Row="0" Grid.Column="2" x:Name="ProgressBarDownload" 
                              BorderBrush="LightGray"
                              Background="Transparent" Foreground="{DynamicResource DarkAccentColor}" 
                              MinWidth="120" Margin="2,3,6,2"/>
-                    <Label Grid.Row="0" Grid.Column="0" x:Name="LabelProgressBarInfo"
+                    <Label Grid.Row="0" Grid.Column="2" x:Name="LabelProgressBarDownload"
                             Content="0 bytes" Foreground="LightGray"
                             HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
                 </Grid>
 
-                <Label x:Name="Message" VerticalContentAlignment="Center"></Label>
+                <Label x:Name="Message"
+                       Margin="2,3,2,2" Padding="0, 0, 0, 2"
+                       Content="Ready"
+                       VerticalContentAlignment="Center"/>
             </DockPanel>
 
         </Grid>
diff --git a/src/AasxPackageExplorer/MainWindow.xaml.cs b/src/AasxPackageExplorer/MainWindow.xaml.cs
index c6592a95..594302a9 100644
--- a/src/AasxPackageExplorer/MainWindow.xaml.cs
+++ b/src/AasxPackageExplorer/MainWindow.xaml.cs
@@ -21,6 +21,7 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using Extensions;
 using Microsoft.Win32;
 using Newtonsoft.Json;
+using NPOI.POIFS.Properties;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -312,18 +313,34 @@ private PackCntRuntimeOptions UiBuildRuntimeOptionsForMainAppLoad()
             var ro = new PackCntRuntimeOptions()
             {
                 Log = Log.Singleton,
-                ProgressChanged = (state, tfs, tbd) =>
+                ProgressChanged = (state, tfs, tbd, msg) =>
                 {
-                    if (state == PackCntRuntimeOptions.Progress.Starting
-                        || state == PackCntRuntimeOptions.Progress.Ongoing)
-                        SetProgressBar(
-                            Math.Min(100.0, 100.0 * tbd / (tfs.HasValue ? tfs.Value : 5 * 1024 * 1024)),
-                            AdminShellUtil.ByteSizeHumanReadable(tbd));
+                    if (state == PackCntRuntimeOptions.Progress.StartOverall)
+                    {
+                        SetProgressOverall(true, msg);
+                    }
+
+                    if (state == PackCntRuntimeOptions.Progress.OverallMessage)
+                    {
+                        SetProgressOverall(true, msg);
+                    }
 
-                    if (state == PackCntRuntimeOptions.Progress.Final)
+                    if (state == PackCntRuntimeOptions.Progress.EndOverall)
+                    {
+                        SetProgressOverall(false, msg);
+                    }
+
+                    if ((state == PackCntRuntimeOptions.Progress.StartDownload
+                        || state == PackCntRuntimeOptions.Progress.PerformDownload)
+                        && tfs.HasValue && tbd.HasValue)
+                        SetProgressDownload(
+                            Math.Min(100.0, 100.0 * tbd.Value / (tfs.HasValue ? tfs.Value : 5 * 1024 * 1024)),
+                            AdminShellUtil.ByteSizeHumanReadable(tbd.Value));
+
+                    if (state == PackCntRuntimeOptions.Progress.EndDownload)
                     {
                         // clear
-                        SetProgressBar();
+                        SetProgressDownload();
 
                         // close message boxes
                         if (currentFlyoutControl is IntegratedConnectFlyout)
@@ -957,7 +974,7 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
             // attach result search
             ToolFindReplace.Flyout = this;
             ToolFindReplace.ResultSelected += ToolFindReplace_ResultSelected;
-            ToolFindReplace.SetProgressBar += SetProgressBar;
+            ToolFindReplace.SetProgressBar += SetProgressDownload;
 
             // Package Central starting ..
             PackageCentral.CentralRuntimeOptions = UiBuildRuntimeOptionsForMainAppLoad();
@@ -1860,7 +1877,8 @@ private void UiHandleReRenderAnyUiInEntityPanel(
 
             var newIdfs = new List<Aas.IIdentifiable>();
             var loadedIdfs = new List<Aas.IIdentifiable>();
-            var loadRes = await PackageContainerHttpRepoSubset.LoadFromSourceInternalAsync(
+
+            var loadRes = await PackageContainerHttpRepoSubset.LoadFromSourceToTargetAsync(
                 fullItemLocation: fullItemLocation,
                 targetEnv: packEnv,
                 loadNew: false,
@@ -2875,22 +2893,48 @@ public void TriggerPendingReIndexElements()
 			_mainTimer_PendingReIndexElements = true;
 	    }
 
-		private void SetProgressBar()
+        private void SetProgressOverallIsEnabled(bool active)
+        {
+            BorderDisplayElements.IsEnabled = active;
+            BorderEditElements.IsEnabled = active;
+            BorderContainerList.IsEnabled = active;
+            MenuMain.IsEnabled = active;
+        }
+
+        private void SetProgressOverall(bool active, string message)
+        {
+            ProgressBarDownload.Dispatcher.BeginInvoke(
+                System.Windows.Threading.DispatcherPriority.Background,
+                new Action(() => {
+                    TextBlockProgressOverall.Background = (active) ? Brushes.DarkGreen : Brushes.White;
+                    TextBlockProgressOverall.Text = "" + message;
+                    ButtonProgressOverallClear.Visibility = (active) ? Visibility.Visible : Visibility.Collapsed;
+                    // an active == true will set all controls to isEnabled == false!! and vice versa
+                    SetProgressOverallIsEnabled(!active);
+                } ));
+        }
+
+        private void ButtonProgressOverallClear_Click(object sender, RoutedEventArgs e)
+        {
+            SetProgressOverall(false, "");
+        }
+
+        private void SetProgressDownload()
         {
-            SetProgressBar(0.0, "");
+            SetProgressDownload(0.0, "");
         }
 
-        private void SetProgressBar(double? percent, string message = null)
+        private void SetProgressDownload(double? percent, string message = null)
         {
             if (percent.HasValue)
-                ProgressBarInfo.Dispatcher.BeginInvoke(
+                ProgressBarDownload.Dispatcher.BeginInvoke(
                             System.Windows.Threading.DispatcherPriority.Background,
-                            new Action(() => ProgressBarInfo.Value = percent.Value));
+                            new Action(() => ProgressBarDownload.Value = percent.Value));
 
             if (message != null)
-                LabelProgressBarInfo.Dispatcher.BeginInvoke(
+                LabelProgressBarDownload.Dispatcher.BeginInvoke(
                     System.Windows.Threading.DispatcherPriority.Background,
-                    new Action(() => LabelProgressBarInfo.Content = message));
+                    new Action(() => LabelProgressBarDownload.Content = message));
         }
 
         private async Task ButtonHistory_ObjectRequested(object sender, VisualElementHistoryItem hi)
@@ -3011,7 +3055,7 @@ public void StatusLineClear()
             Message.Background = Brushes.White;
             Message.Foreground = Brushes.Black;
             Message.FontWeight = FontWeights.Normal;
-            SetProgressBar();
+            SetProgressDownload();
         }
 
         /// <summary>
@@ -3081,7 +3125,7 @@ public void SaveScreenshot(string filename = "noname")
                 filename += ".png";
 
             // needs to be the main thread
-            ProgressBarInfo.Dispatcher.BeginInvoke(
+            ProgressBarDownload.Dispatcher.BeginInvoke(
                 System.Windows.Threading.DispatcherPriority.Background,
                 new Action(() =>
                 {
@@ -4278,5 +4322,6 @@ private async void Button_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        
     }
 }
diff --git a/src/AasxPackageLogic/PackageCentral/AasxFileServerInterface/AasxFileServerInterfaceService.cs b/src/AasxPackageLogic/PackageCentral/AasxFileServerInterface/AasxFileServerInterfaceService.cs
index d8bb3750..cb25c386 100644
--- a/src/AasxPackageLogic/PackageCentral/AasxFileServerInterface/AasxFileServerInterfaceService.cs
+++ b/src/AasxPackageLogic/PackageCentral/AasxFileServerInterface/AasxFileServerInterfaceService.cs
@@ -163,12 +163,12 @@ internal async Task<string> LoadAasxPackageAsync(string packageId, PackCntRuntim
 
                             if (fileSize > totalBytes)
                             {
-                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Ongoing,
+                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.PerformDownload,
                                 fileSize, totalBytes);
                             }
                             else
                             {
-                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Final, fileSize, totalBytes);
+                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.EndDownload, fileSize, totalBytes);
                                 runtimeOptions?.Log?.Info($".. download done with {totalBytes} bytes read!");
                             }
 
diff --git a/src/AasxPackageLogic/PackageCentral/PackageContainerBase.cs b/src/AasxPackageLogic/PackageCentral/PackageContainerBase.cs
index 99328476..d378470e 100644
--- a/src/AasxPackageLogic/PackageCentral/PackageContainerBase.cs
+++ b/src/AasxPackageLogic/PackageCentral/PackageContainerBase.cs
@@ -43,9 +43,14 @@ public class PackageContainerCredentials
     /// </summary>
     public class PackCntRuntimeOptions
     {
-        public enum Progress { Idle, Starting, Ongoing, Final }
-
-        public delegate void ProgressChangedHandler(Progress state, long? totalFileSize, long totalBytesDownloaded);
+        public enum Progress { 
+            Idle, 
+            StartOverall, EndOverall,
+            StartDownload, PerformDownload, EndDownload,
+            OverallMessage }
+
+        public delegate void ProgressChangedHandler(
+            Progress state, long? totalFileSize = null, long? totalBytesDownloaded = null, string message = "");
 
         public delegate void AskForSelectFromListHandler(
             string caption, List<AnyUiDialogueListItem> list,
diff --git a/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs b/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs
index c0664430..a8fb7051 100644
--- a/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs
+++ b/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs
@@ -616,7 +616,7 @@ public static ProfileDescription FindProfileDescription(string input)
                 if (pd.Id.Equals(input))
                     return pd;
             return null;
-        }
+        }        
 
         //
         // ALL
@@ -656,7 +656,8 @@ private static async Task<bool> FromRegistryGetAasAndSubmodels(
             bool allowFakeResponses,            
             dynamic aasDescriptor,
             List<Aas.IIdentifiable> trackNewIdentifiables = null,
-            List<Aas.IIdentifiable> trackLoadedIdentifiables = null)
+            List<Aas.IIdentifiable> trackLoadedIdentifiables = null,
+            Action<int, int> lambdaReportProgress = null)
         {
             // access
             if (record == null)
@@ -717,6 +718,9 @@ private static async Task<bool> FromRegistryGetAasAndSubmodels(
                         aasSi.Endpoint.ToString());
                     continue;
                 }
+
+                lambdaReportProgress?.Invoke(1, 0);
+
                 // possible culprit: Submodels are listed twice (or more) in an AAS
                 // try filter (actually: false alarm, but leave in)
                 var uniqSms = aas.Submodels?.Distinct(
@@ -746,6 +750,7 @@ private static async Task<bool> FromRegistryGetAasAndSubmodels(
                         (new Aas.IKey[] { new Aas.Key(KeyTypes.Submodel, smrr.Id) }).ToList()));
 
                 // add this AAS
+                
                 trackLoadedIdentifiables?.Add(aas);
                 if (prepAas?.AddIfNew(aas, aasSi) == true)
                     trackNewIdentifiables?.Add(aas);
@@ -779,6 +784,7 @@ private static async Task<bool> FromRegistryGetAasAndSubmodels(
                             trackLoadedIdentifiables?.Add(sm);
                             if (prepSM?.AddIfNew(sm, si) == true)
                                 trackNewIdentifiables?.Add(sm);
+                            lambdaReportProgress?.Invoke(0, 1);
                         });
                 }
                 else
@@ -815,6 +821,8 @@ public override async Task LoadFromSourceAsync(
             PackageContainerOptionsBase containerOptions = null,
             PackCntRuntimeOptions runtimeOptions = null)
         {
+            runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.StartOverall, message: "Start repo load");
+
             var newEnv = await LoadFromSourceInternalAsync(
                 fullItemLocation,
                 Env,
@@ -822,9 +830,11 @@ public override async Task LoadFromSourceAsync(
 
             if (newEnv != null)
                 Env = newEnv;
+
+            runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.EndOverall, message: "Done repo load");
         }
 
-        public static async Task<AdminShellPackageEnvBase> LoadFromSourceInternalAsync(
+        public static async Task<AdminShellPackageEnvBase> LoadFromSourceToTargetAsync(
             string fullItemLocation,
             AdminShellPackageEnvBase targetEnv = null,
             bool loadNew = true,
@@ -833,10 +843,54 @@ public static async Task<AdminShellPackageEnvBase> LoadFromSourceInternalAsync(
             PackageContainerOptionsBase containerOptions = null,
             PackCntRuntimeOptions runtimeOptions = null)
         {
-            var allowFakeResponses = runtimeOptions?.AllowFakeResponses ?? false;
+            runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.StartOverall, message: "Start repo load");
+
+            var res = await LoadFromSourceInternalAsync(
+                fullItemLocation: fullItemLocation,
+                targetEnv: targetEnv,
+                loadNew: loadNew,
+                trackNewIdentifiables: trackNewIdentifiables,
+                trackLoadedIdentifiables: trackLoadedIdentifiables,
+                containerOptions: containerOptions, runtimeOptions: runtimeOptions);
 
-            PackageContainerListBase containerList = null;
+            runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.EndOverall, message: "Done repo load");
+
+            return res;
+        }
 
+        protected static async Task<AdminShellPackageEnvBase> LoadFromSourceInternalAsync(
+            string fullItemLocation,
+            AdminShellPackageEnvBase targetEnv = null,
+            bool loadNew = true,
+            List<Aas.IIdentifiable> trackNewIdentifiables = null,
+            List<Aas.IIdentifiable> trackLoadedIdentifiables = null,
+            PackageContainerOptionsBase containerOptions = null,
+            PackCntRuntimeOptions runtimeOptions = null)
+        {
+            // lambda for overall progress
+            int numAAS = 0;
+            int numSM = 0;
+            int numCD = 0;
+            int numDiv = 0;
+            
+            Action<int, int, int, int> lambdaReportAll = (nAas, nSm, nCd, nDiv) =>
+            {
+                runtimeOptions?.ProgressChanged(PackCntRuntimeOptions.Progress.OverallMessage,
+                    message: $"{nAas} / {nSm} / {nCd} / {nDiv}");
+            };
+
+            Action<int, int> lambdaReportAasSm = (iAAS, iSM) =>
+            {
+                numAAS += iAAS;
+                numSM += iSM;
+                lambdaReportAll(numAAS, numSM, numCD, numDiv);
+            };
+
+            runtimeOptions?.Log?.Info("Note: overall progress format is #AAS / #Submodel / #CD / #else");
+
+            // start
+            var allowFakeResponses = runtimeOptions?.AllowFakeResponses ?? false;
+            PackageContainerListBase containerList = null;
             var baseUri = GetBaseUri(fullItemLocation);
 
             // use existing ?
@@ -900,6 +954,8 @@ public static async Task<AdminShellPackageEnvBase> LoadFromSourceInternalAsync(
                     var resObj = await PackageHttpDownloadUtil.DownloadEntityToDynamicObject(
                         new Uri(fullItemLocation), runtimeOptions, allowFakeResponses);
 
+                    lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
+
                     // Note: GetAllAssetAdministrationShellIdsByAssetLink only returns a list of ids
                     if (resObj == null)
                     {
@@ -925,10 +981,13 @@ public static async Task<AdminShellPackageEnvBase> LoadFromSourceInternalAsync(
                             if (singleDesc == null || !HasProperty(singleDesc, "endpoints"))
                                 continue;
 
+                            lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
+
                             // refer to dedicated function
                             await FromRegistryGetAasAndSubmodels(
                                 prepAas, prepSM, record, runtimeOptions, allowFakeResponses, singleDesc,
-                                trackNewIdentifiables, trackLoadedIdentifiables);
+                                trackNewIdentifiables, trackLoadedIdentifiables,
+                                lambdaReportProgress: lambdaReportAasSm);
                         }
 
                         if (record.BaseType == ConnectExtendedRecord.BaseTypeEnum.Repository)
@@ -942,6 +1001,7 @@ await FromRegistryGetAasAndSubmodels(
                             if (aas != null)
                             {
                                 // add
+                                lambdaReportAll(++numAAS, numSM, numCD, numDiv);
                                 trackLoadedIdentifiables?.Add(aas);
                                 if (prepAas.AddIfNew(aas, new AasIdentifiableSideInfo()
                                 {
@@ -990,12 +1050,15 @@ await FromRegistryGetAasAndSubmodels(
                         return null;
                     }
 
+                    lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
+
                     foreach (var res in resObj.result)
                     {
                         // refer to dedicated function
                         await FromRegistryGetAasAndSubmodels(
                             prepAas, prepSM, record, runtimeOptions, allowFakeResponses, res,
-                            trackNewIdentifiables, trackLoadedIdentifiables);
+                            trackNewIdentifiables, trackLoadedIdentifiables,
+                            lambdaReportProgress: lambdaReportAasSm);
                     }
                 }
 
@@ -1041,11 +1104,13 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                         runtimeOptions?.Log?.Error("Registry did not return a valid AAS descriptor! Aborting.");
                         return null;
                     }
+                    lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
 
                     // refer to dedicated function
                     var res = await FromRegistryGetAasAndSubmodels(
                                 prepAas, prepSM, record, runtimeOptions, allowFakeResponses, aasDesc,
-                                trackNewIdentifiables, trackLoadedIdentifiables);
+                                trackNewIdentifiables, trackLoadedIdentifiables,
+                                lambdaReportProgress: lambdaReportAasSm);
                     if (!res)
                     {
                         runtimeOptions?.Log?.Error("Error retrieving AAS from registry! Aborting.");
@@ -1082,6 +1147,8 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                             if (code != HttpStatusCode.OK)
                                 return;
 
+                            lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
+
                             try
                             {
                                 var node = System.Text.Json.Nodes.JsonNode.Parse(ms);
@@ -1182,6 +1249,8 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                         return null;
                     }
 
+                    lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
+
                     // Have  a list of ids. Decompose into single id.
                     // Note: Parallel makes no sense, ideally only 1 result (is per AssetId)!!
                     // TODO: not parallel!
@@ -1199,6 +1268,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                         if (aas != null)
                         {
                             // add
+                            lambdaReportAll(++numAAS, numSM, numCD, numDiv);
                             trackLoadedIdentifiables?.Add(aas);
                             if (prepAas.AddIfNew(aas, new AasIdentifiableSideInfo()
                             {
@@ -1242,6 +1312,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                             {
                                 var node = System.Text.Json.Nodes.JsonNode.Parse(ms);
                                 var aas = Jsonization.Deserialize.AssetAdministrationShellFrom(node);
+                                lambdaReportAll(++numAAS, numSM, numCD, numDiv);
                                 trackLoadedIdentifiables?.Add(aas);
                                 if (prepAas.AddIfNew(aas, new AasIdentifiableSideInfo()
                                 {
@@ -1282,6 +1353,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                             {
                                 var node = System.Text.Json.Nodes.JsonNode.Parse(ms);
                                 var sm = Jsonization.Deserialize.SubmodelFrom(node);
+                                lambdaReportAll(numAAS, ++numSM, numCD, numDiv);
                                 trackLoadedIdentifiables?.Add(sm);
                                 if (prepSM.AddIfNew(sm, new AasIdentifiableSideInfo()
                                 {
@@ -1322,6 +1394,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                             {
                                 var node = System.Text.Json.Nodes.JsonNode.Parse(ms);
                                 var cd = Jsonization.Deserialize.ConceptDescriptionFrom(node);
+                                lambdaReportAll(numAAS, numSM, ++numCD, numDiv);
                                 trackLoadedIdentifiables?.Add(cd);
                                 if (prepCD.AddIfNew(cd, new AasIdentifiableSideInfo()
                                 {
@@ -1393,6 +1466,8 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                         {
                             try
                             {
+                                lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
+
                                 var node = System.Text.Json.Nodes.JsonNode.Parse(ms);
                                 if (node["data"]?["searchSMs"] is JsonArray smdata
                                     && smdata.Count >= 1)
@@ -1474,6 +1549,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                                     {
                                         var node = System.Text.Json.Nodes.JsonNode.Parse(ms);
                                         var sm = Jsonization.Deserialize.SubmodelFrom(node);
+                                        lambdaReportAll(numAAS, ++numSM, numCD, numDiv);
                                         if (fi.Type == FetchItemType.SmUrl || fi.Type == FetchItemType.SmId)
                                         {
                                             trackLoadedIdentifiables?.Add(sm);
@@ -1552,6 +1628,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                                             var sm = Jsonization.Deserialize.SubmodelFrom(node);
                                             lock (prepSM)
                                             {
+                                                lambdaReportAll(numAAS, ++numSM, numCD, numDiv);
                                                 trackLoadedIdentifiables?.Add(sm);
                                                 if (prepSM.AddIfNew(sm, new AasIdentifiableSideInfo()
                                                 {
@@ -1593,6 +1670,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
 
                                     try
                                     {
+                                        lambdaReportAll(numAAS, numSM, numCD, ++numDiv);
                                         dynPack.AddThumbnail(aas.Id, ms.ToArray());
                                     }
                                     catch (Exception ex)
@@ -1602,7 +1680,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                                 });
                         });
 
-                // start auto-load missing Submodels?
+                // start auto-load missing CDs?
                 if (operationFound && (record?.AutoLoadCds ?? false))
                 {
                     var lrs = env.FindAllReferencedSemanticIds().ToList();
@@ -1618,9 +1696,9 @@ await Parallel.ForEachAsync(lrs,
                             if (record?.AutoLoadOnDemand ?? true)
                             {
                                 // side info level 1
-                                lock (prepSM)
+                                lock (prepCD)
                                 {
-                                    prepSM.AddIfNew(null, new AasIdentifiableSideInfo()
+                                    prepCD.AddIfNew(null, new AasIdentifiableSideInfo()
                                     {
                                         IsStub = true,
                                         StubLevel = AasIdentifiableSideInfoLevel.IdWithEndpoint,
@@ -1650,6 +1728,7 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                                             var cd = Jsonization.Deserialize.ConceptDescriptionFrom(node);
                                             lock (prepCD)
                                             {
+                                                lambdaReportAll(numAAS, numSM, ++numCD, numDiv);
                                                 trackLoadedIdentifiables?.Add(cd);
                                                 if (prepCD.AddIfNew(cd, new AasIdentifiableSideInfo()
                                                 {
diff --git a/src/AasxPackageLogic/PackageCentral/PackageContainerNetworkHttpFile.cs b/src/AasxPackageLogic/PackageCentral/PackageContainerNetworkHttpFile.cs
index 5957a416..361a3ad9 100644
--- a/src/AasxPackageLogic/PackageCentral/PackageContainerNetworkHttpFile.cs
+++ b/src/AasxPackageLogic/PackageCentral/PackageContainerNetworkHttpFile.cs
@@ -264,7 +264,7 @@ private async Task DownloadFromSource(Uri sourceUri,
                         long lastBytesRead = 0;
                         int bytesRead;
 
-                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Starting,
+                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.StartDownload,
                                 contentLength, totalBytesRead);
 
                         while ((bytesRead = await contentStream.ReadAsync(buffer, 0, buffer.Length,
@@ -278,14 +278,14 @@ await file.WriteAsync(buffer, 0, bytesRead,
                             if (totalBytesRead > lastBytesRead + deltaSize)
                             {
                                 runtimeOptions?.Log?.Info($".. downloading to temp-file {TempFn}");
-                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Ongoing,
+                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.PerformDownload,
                                     contentLength, totalBytesRead);
                                 lastBytesRead = totalBytesRead;
                             }
                         }
 
                         // assume bytes read to be total bytes
-                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Final,
+                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.EndDownload,
                             totalBytesRead, totalBytesRead);
 
                         // log                
diff --git a/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs b/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs
index 75bd1f42..edf95fe2 100644
--- a/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs
+++ b/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs
@@ -297,7 +297,7 @@ public static async Task HttpGetToMemoryStream(
                         long lastBytesRead = 0;
                         int bytesRead;
 
-                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Starting,
+                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.StartDownload,
                                 contentLength, totalBytesRead);
 
                         while ((bytesRead = await contentStream.ReadAsync(buffer, 0, buffer.Length,
@@ -312,14 +312,14 @@ await memStream.WriteAsync(buffer, 0, bytesRead,
                             {
                                 if (runtimeOptions?.ExtendedConnectionDebug == true)
                                     runtimeOptions.Log?.Info($".. downloading to memory stream");
-                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Ongoing,
+                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.PerformDownload,
                                     contentLength, totalBytesRead);
                                 lastBytesRead = totalBytesRead;
                             }
                         }
 
                         // assume bytes read to be total bytes
-                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Final,
+                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.EndDownload,
                             totalBytesRead, totalBytesRead);
 
                         // log                
@@ -466,7 +466,7 @@ await memStream.WriteAsync(buffer, 0, bytesRead,
                         long lastBytesRead = 0;
                         int bytesRead;
 
-                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Starting,
+                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.StartDownload,
                                 contentLength, totalBytesRead);
 
                         while ((bytesRead = await contentStream.ReadAsync(buffer, 0, buffer.Length,
@@ -481,14 +481,14 @@ await memStream.WriteAsync(buffer, 0, bytesRead,
                             {
                                 if (runtimeOptions?.ExtendedConnectionDebug == true)
                                     runtimeOptions.Log?.Info($".. downloading to memory stream");
-                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Ongoing,
+                                runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.PerformDownload,
                                     contentLength, totalBytesRead);
                                 lastBytesRead = totalBytesRead;
                             }
                         }
 
                         // assume bytes read to be total bytes
-                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.Final,
+                        runtimeOptions?.ProgressChanged?.Invoke(PackCntRuntimeOptions.Progress.EndDownload,
                             totalBytesRead, totalBytesRead);
 
                         // log                
diff --git a/src/AasxPackageLogic/PackageCentral/ProgressableStreamContent.cs b/src/AasxPackageLogic/PackageCentral/ProgressableStreamContent.cs
index 7c097582..476d32cb 100644
--- a/src/AasxPackageLogic/PackageCentral/ProgressableStreamContent.cs
+++ b/src/AasxPackageLogic/PackageCentral/ProgressableStreamContent.cs
@@ -59,8 +59,8 @@ protected override Task SerializeToStreamAsync(Stream stream, TransportContext c
                 var uploaded = 0;
                 var lastUploaded = 0;
 
-                _runtimeOptions?.ProgressChanged(
-                    PackCntRuntimeOptions.Progress.Starting, _content.Length, uploaded);
+                _runtimeOptions?.ProgressChanged?.Invoke(
+                    PackCntRuntimeOptions.Progress.StartDownload, _content.Length, uploaded);
 
                 using (var _instream = new MemoryStream(_content))
                     while (true)
@@ -73,16 +73,16 @@ protected override Task SerializeToStreamAsync(Stream stream, TransportContext c
 
                         if (uploaded > lastUploaded + _deltaSizeForProgress)
                         {
-                            _runtimeOptions?.ProgressChanged(
-                                PackCntRuntimeOptions.Progress.Ongoing, _content.Length, uploaded);
+                            _runtimeOptions?.ProgressChanged?.Invoke(
+                                PackCntRuntimeOptions.Progress.PerformDownload, _content.Length, uploaded);
                             lastUploaded = uploaded;
                         }
 
                         stream.Write(buffer, 0, length);
                     }
 
-                _runtimeOptions?.ProgressChanged(
-                    PackCntRuntimeOptions.Progress.Final, _content.Length, uploaded);
+                _runtimeOptions?.ProgressChanged?.Invoke(
+                    PackCntRuntimeOptions.Progress.EndDownload, _content.Length, uploaded);
             });
         }
 
diff --git a/src/AasxWpfControlLibrary/IntegratedConnectFlyout.xaml.cs b/src/AasxWpfControlLibrary/IntegratedConnectFlyout.xaml.cs
index 5c96f262..aed68dc5 100644
--- a/src/AasxWpfControlLibrary/IntegratedConnectFlyout.xaml.cs
+++ b/src/AasxWpfControlLibrary/IntegratedConnectFlyout.xaml.cs
@@ -391,20 +391,20 @@ private async void ProceedOnPageStart()
             var ro = new PackCntRuntimeOptions()
             {
                 Log = _logger,
-                ProgressChanged = (state, tfs, tbd) =>
+                ProgressChanged = (state, tfs, tbd, msg) =>
                 {
-                    if (state == PackCntRuntimeOptions.Progress.Ongoing)
+                    if (state == PackCntRuntimeOptions.Progress.PerformDownload)
                     {
                         // determine
                         if (tfs == null)
                             tfs = 5 * 1024 * 1024;
-                        var frac = Math.Min(100.0, 100.0 * tbd / tfs.Value);
-                        var bshr = AdminShellUtil.ByteSizeHumanReadable(tbd);
+                        var frac = Math.Min(100.0, 100.0 * tbd.Value / tfs.Value);
+                        var bshr = AdminShellUtil.ByteSizeHumanReadable(tbd.Value);
 
                         SetProgressBar(frac, $"{bshr} transferred");
                     }
 
-                    if (state == PackCntRuntimeOptions.Progress.Final)
+                    if (state == PackCntRuntimeOptions.Progress.EndDownload)
                         SetProgressBar(0.0, "");
                 },
                 AskForSelectFromList = (caption, items, propRes) =>
diff --git a/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs b/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs
index 8e099bac..e711e19a 100644
--- a/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs
+++ b/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs
@@ -16,7 +16,6 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Media.Imaging;
 using AasxIntegrationBase;
 using AasxPackageExplorer;
 using AasxPackageLogic;
@@ -26,8 +25,6 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using Extensions;
 using AnyUi;
 using BlazorExplorer;
-using BlazorExplorer.Shared;
-using Microsoft.JSInterop;
 using AasCore.Aas3_0;
 
 namespace BlazorUI.Data
@@ -111,7 +108,7 @@ private PackCntRuntimeOptions UiBuildRuntimeOptionsForMainAppLoad()
             var ro = new PackCntRuntimeOptions()
             {
                 Log = Log.Singleton,
-                ProgressChanged = (state, tfs, tbd) =>
+                ProgressChanged = (state, tfs, tbd, msg) =>
                 {
                     ;
                 },