From 5f94093b4ea43ae9090f37c3298e5687b44a9869 Mon Sep 17 00:00:00 2001
From: Michael Hoffmeister <michael.hoffmeister@festo.com>
Date: Sun, 29 Dec 2024 09:39:34 +0100
Subject: [PATCH] * upload of attachments

---
 src/AasxCsharpLibrary/AdminShellUtil.cs       |   2 +-
 src/AasxPackageExplorer/MainWindow.xaml       |   2 +-
 src/AasxPackageExplorer/MainWindow.xaml.cs    |  45 +++---
 src/AasxPackageExplorer/debug.MIHO.script     |   4 +-
 .../options-debug.MIHO.json                   |   3 +-
 .../AdminShellPackageDynamicFetchEnv.cs       |   2 +-
 .../PackageContainerHttpRepoSubset.cs         | 141 ++++++++++++++++--
 .../PackageCentral/PackageHttpDownloadUtil.cs |  55 +++++--
 src/AasxPackageLogic/VisualAasxElements.cs    |  26 ++++
 9 files changed, 236 insertions(+), 44 deletions(-)

diff --git a/src/AasxCsharpLibrary/AdminShellUtil.cs b/src/AasxCsharpLibrary/AdminShellUtil.cs
index dcae2210..fecf0f30 100644
--- a/src/AasxCsharpLibrary/AdminShellUtil.cs
+++ b/src/AasxCsharpLibrary/AdminShellUtil.cs
@@ -539,7 +539,7 @@ public static string FilterFriendlyName(string src,
             if (pascalCase && src.Length > 0)
                 src = char.ToUpper(src[0]) + src.Substring(1);
 
-            var regex = regexForFilter ?? @"[^a-zA-Z0-9\-_]";
+            var regex = regexForFilter ?? @"[^a-zA-Z0-9_]";
             src = Regex.Replace(src, regex, "_");
 
             if (fixMoreBlanks)
diff --git a/src/AasxPackageExplorer/MainWindow.xaml b/src/AasxPackageExplorer/MainWindow.xaml
index 87a57416..81652d73 100644
--- a/src/AasxPackageExplorer/MainWindow.xaml
+++ b/src/AasxPackageExplorer/MainWindow.xaml
@@ -424,7 +424,7 @@
                 </Grid>
 
                 <Label x:Name="Message"
-                       Margin="2,3,2,2" Padding="0, 2, 0, 0"
+                       Margin="2,3,2,2" Padding="2, 2, 0, 0"
                        Content="Ready"
                        VerticalContentAlignment="Center"/>
             </DockPanel>
diff --git a/src/AasxPackageExplorer/MainWindow.xaml.cs b/src/AasxPackageExplorer/MainWindow.xaml.cs
index 129d0eeb..a96f83b1 100644
--- a/src/AasxPackageExplorer/MainWindow.xaml.cs
+++ b/src/AasxPackageExplorer/MainWindow.xaml.cs
@@ -86,7 +86,7 @@ public PackageCentral PackageCentral
 		
 		public AasxMenuWpf MainMenu = new AasxMenuWpf();
 
-        private Aas.ISubmodelElement _showContentElement = null;
+        private VisualElementGeneric _showContentElement = null;
         private VisualElementGeneric currentEntityForUpdate = null;
         private IFlyoutControl currentFlyoutControl = null;
 
@@ -714,18 +714,11 @@ public void PrepareDispEditEntity(
             // some entities require special handling
             if (entities?.ExactlyOne == true && entities.First() is VisualElementSubmodelElement sme)
             { 
-                if (sme?.theWrapper is Aas.IFile file)
+                if (sme?.theWrapper is Aas.IFile || sme?.theWrapper is Aas.IBlob)
                 {
                     ShowContent.IsEnabled = true;
-                    _showContentElement = file;
-                    DragSource.Foreground = Brushes.Black;
-                }
-
-                if (sme?.theWrapper is Aas.IBlob blb)
-                {
-                    ShowContent.IsEnabled = true;
-                    this._showContentElement = blb;
                     DragSource.Foreground = Brushes.Black;
+                    _showContentElement = entities.First();
                 }
             }
 
@@ -3103,7 +3096,15 @@ public void LogShow()
         {
             // show only if not present
             if (_messageReportWindow != null)
+            {
+                // this is ridiculous, but this seems to make the trick
+                // https://stackoverflow.com/questions/257587/bring-a-window-to-the-front-in-wpf
+                _messageReportWindow.Activate();
+                _messageReportWindow.Topmost = true;  // important
+                _messageReportWindow.Topmost = false; // important
+                _messageReportWindow.Focus();         // important
                 return;
+            }
 
             // Collect all the stored log prints
             IEnumerable<StoredPrint> Prints()
@@ -3364,15 +3365,18 @@ private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
             }
         }
 
-        private void ShowContent_Click(object sender, RoutedEventArgs e)
+        private async void ShowContent_Click(object sender, RoutedEventArgs e)
         {
-            if (sender == ShowContent && _showContentElement != null && PackageCentral.MainAvailable)
+            await Task.Yield();
+
+            if (sender == ShowContent && _showContentElement != null && PackageCentral.MainAvailable
+                && _showContentElement is VisualElementSubmodelElement veSme)
             {
                 //
                 // Text edit of BLOB?
                 //
 
-                if (this._showContentElement is Aas.IBlob blb
+                if (veSme?.theWrapper is Aas.IBlob blb
                     && MainMenu?.IsChecked("EditMenu") == true
                     && AdminShellUtil.CheckForTextContentType(blb.ContentType))
                 {
@@ -3399,7 +3403,7 @@ private void ShowContent_Click(object sender, RoutedEventArgs e)
                     return;
                 }
 
-                if (this._showContentElement is Aas.IFile file
+                if (veSme?.theWrapper is Aas.IFile file
                     && MainMenu?.IsChecked("EditMenu") == true
                     && AdminShellUtil.CheckForTextContentType(file.ContentType))
                 {
@@ -3419,9 +3423,9 @@ private void ShowContent_Click(object sender, RoutedEventArgs e)
                 //
 
                 Tuple<object, string> contentFound = null;
-                if (_showContentElement is Aas.IFile scFile)
+                if (veSme?.theWrapper is Aas.IFile scFile)
                     contentFound = new Tuple<object, string>(scFile.Value, scFile.ContentType);
-                if (_showContentElement is Aas.IBlob scBlob && MainMenu?.IsChecked("EditMenu") == false)
+                if (veSme?.theWrapper is Aas.IBlob scBlob && MainMenu?.IsChecked("EditMenu") == false)
                     contentFound = new Tuple<object, string>(scBlob.Value, scBlob.ContentType);
 
                 if (contentFound != null)
@@ -3435,8 +3439,13 @@ private void ShowContent_Click(object sender, RoutedEventArgs e)
                             if (!contentUri.ToLower().Trim().StartsWith("http://")
                                 && !contentUri.ToLower().Trim().StartsWith("https://"))
                             {
-                                // make it as file
-                                contentUri = PackageCentral.Main.MakePackageFileAvailableAsTempFile(contentUri);
+                                // make it a file?
+                                // more info for Registry/ Repo available?
+                                var x = veSme.FindAasSubmodelIdShortPath();
+                                contentUri = await PackageCentral.Main.MakePackageFileAvailableAsTempFileAsync(contentUri,
+                                    aasId: x?.Item1?.Id,
+                                    smId: x?.Item2?.Id,
+                                    idShortPath: x?.Item3);
                             }
 
                             BrowserDisplayLocalFile(contentUri, contentFound.Item2);
diff --git a/src/AasxPackageExplorer/debug.MIHO.script b/src/AasxPackageExplorer/debug.MIHO.script
index 4b4d8a2e..e67c3e13 100644
--- a/src/AasxPackageExplorer/debug.MIHO.script
+++ b/src/AasxPackageExplorer/debug.MIHO.script
@@ -10,14 +10,14 @@
 // Tool("exportsmtasciidoc", "File", "C:\\HOMI\\Develop\\Aasx\\repo\\new.zip", "AntoraStyle", "true");
 Tool("editkey");
 // Tool("createrepofromapi", "BaseAddress", "http://localhost:5001/api/v3.0/", "BaseType", "Repository");
-Tool("connectextended", "BaseAddress", "http://smt-repo.admin-shell-io.com/api/v3.0", "BaseType", "Repository", "GetAllAas", "false", "GetSingleAas", "true", "AasId", "https://admin-shell.io/idta/aas/DigitalNameplate/3/0", "AutoLoadOnDemand", "false", "AutoLoadCds", "true", "ParallelReads", "10");
+// Tool("connectextended", "BaseAddress", "http://smt-repo.admin-shell-io.com/api/v3.0", "BaseType", "Repository", "GetAllAas", "false", "GetSingleAas", "true", "AasId", "https://admin-shell.io/idta/aas/DigitalNameplate/3/0", "AutoLoadOnDemand", "false", "AutoLoadCds", "true", "ParallelReads", "10");
 // Tool("connectextended", "BaseAddress", "http://smt-repo.admin-shell-io.com/api/v3.0", "BaseType", "Repository", "GetSingleAas", "false", "GetAllAas", "true", "PageLimit", "4", "AutoLoadOnDemand", "false", "AutoLoadCds", "true");
 // Tool("connectextended", "BaseAddress", "http://localhost:5001/api/v3.0/", "BaseType", "Repository", "GetSingleAas", "false", "GetAllAas", "true", "PageLimit", "99", "AutoLoadOnDemand", "false");
 // Tool("connectextended", "BaseAddress", "http://localhost:5001/api/v3.0/", "BaseType", "Repository", "GetSingleAas", "true", "AasId", "http://smart.festo.com/id/demo-box/aas/instance/99920202206560529000071817", "AutoLoadOnDemand", "false");
 // Tool("connectextended", "BaseAddress", "https://eis-data.aas-voyager.com/", "BaseType", "Repository", "GetSingleAas", "true", "PageLimit", "2", "AutoLoadOnDemand", "false", "AasId", "https://new.abb.com/products/de/2CSF204101R1400/aas");
 // Tool("connectextended", "BaseAddress", "https://techday2-registry.admin-shell-io.com/", "BaseType", "Registry", "GetSingleAas", "false", "GetAasByAssetLink", "true", "PageLimit", "2", "AutoLoadOnDemand", "false", "AssetId", "https://pk.harting.com/?.20P=ZSN1");
 // Select("AAS", "First");
-// Tool("apiuploadassistant");
+Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
 // Select("Submodel", "First");
 // Select("Submodel", "Next");
 // Tool("exportsmtasciidoc", "File", "C:\Users\homi0002\Desktop\tmp\new.zip", "ExportHtml", "true", "ExportPdf", "false", "AntoraStyle", "false", "ViewResult", "true");
diff --git a/src/AasxPackageExplorer/options-debug.MIHO.json b/src/AasxPackageExplorer/options-debug.MIHO.json
index e5b8228c..908e4faa 100644
--- a/src/AasxPackageExplorer/options-debug.MIHO.json
+++ b/src/AasxPackageExplorer/options-debug.MIHO.json
@@ -50,7 +50,8 @@
     // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\Syn2tecMachine_P2518_AAS__V3_DL2.aasx",
     // "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\Syn2tecMachine_P2518_AAS__V3_DL2.aasx",
     // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\test-data\\MTP\\test-data-SMT_MTP.aasx",
-    "AasxToLoad": "C:\\Users\\Micha\\Desktop\\Demo\\AASX\\8001203_SPAU-P10R-T-R18M-L-PNLK-PNVBA-M8D_060ff64f-9fd2-422d-81ce-b17e49f007c5_work.aasx",
+    // "AasxToLoad": "C:\\Users\\Micha\\Desktop\\Demo\\AASX\\8001203_SPAU-P10R-T-R18M-L-PNLK-PNVBA-M8D_060ff64f-9fd2-422d-81ce-b17e49f007c5_work.aasx",
+    "AasxToLoad": "C:\\Users\\Micha\\Desktop\\t3\\dnp-t30.aasx",
     // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\00_FestoDemoBox-Module-2-Kopie.aasx",
     // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\8001203_SPAU-P10R-T-R18M-L-PNLK-PNVBA-M8D_060ff64f-9fd2-422d-81ce-b17e49f007c5_work_spiel.aasx",
     // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\1449600_NEBM-SM12G8-E-1.5-Q5-LE6_511946fb-00c1-4aa8-9877-9ba23d86146e.aasx",
diff --git a/src/AasxPackageLogic/PackageCentral/AdminShellPackageDynamicFetchEnv.cs b/src/AasxPackageLogic/PackageCentral/AdminShellPackageDynamicFetchEnv.cs
index 5a91111f..bf7606a5 100644
--- a/src/AasxPackageLogic/PackageCentral/AdminShellPackageDynamicFetchEnv.cs
+++ b/src/AasxPackageLogic/PackageCentral/AdminShellPackageDynamicFetchEnv.cs
@@ -383,7 +383,7 @@ public override async Task<byte[]> GetBytesFromPackageOrExternalAsync(
                 return absBytes;
 
             // ok, try to load from the server
-            if (aasId?.HasContent() != true || idShortPath?.HasContent() != true
+            if (aasId?.HasContent() != true || smId?.HasContent() != true || idShortPath?.HasContent() != true
                 || _defaultRepoBaseUri == null)
                 return null;
 
diff --git a/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs b/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs
index 6c396462..13c11801 100644
--- a/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs
+++ b/src/AasxPackageLogic/PackageCentral/PackageContainerHttpRepoSubset.cs
@@ -38,6 +38,9 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using Lucene.Net.Util.Automaton;
 using RestSharp;
 using static Lucene.Net.Search.FieldCache;
+using System.Reflection.Metadata;
+using AngleSharp.Io;
+using System.Globalization;
 
 namespace AasxPackageLogic.PackageCentral
 {
@@ -2832,10 +2835,18 @@ public class UploadAssistantJobRecord
             public ConnectExtendedRecord.BaseTypeEnum BaseType = ConnectExtendedRecord.BaseTypeEnum.Repository;
             // public ConnectExtendedRecord.BaseTypeEnum BaseType = ConnectExtendedRecord.BaseTypeEnum.Registry;
 
+            [AasxMenuArgument(help: "Includes Submodels of the particular AAS into the upload.")]
             public bool IncludeSubmodels = false;
+
+            [AasxMenuArgument(help: "Includes ConceptDescriptions referrred by semanticIds of the Submodels and " +
+                "SubmodelElements into the upload.")]
             public bool IncludeCDs = false;
+
+            [AasxMenuArgument(help: "Includes supplementary files of FileElements of the Submodels into the upload.")]
             public bool IncludeSupplFiles = false;
 
+            [AasxMenuArgument(help: "If Identifiables exist on particular Repository/ Registry, still flag to " +
+                "upload them anyway, overwriting the existing contents.")]
             public bool OverwriteIfExist = false;
         }
 
@@ -3028,8 +3039,19 @@ public static async Task<bool> PerformUploadAssistant(
                     return g;
                 });
 
-            if (!(await displayContext.StartFlyoverModalAsync(ucJob)))
+            if (ticket?.ScriptMode != true)
+            {
+                // if not in script mode, perform dialogue
+                if (!(await displayContext.StartFlyoverModalAsync(ucJob)))
+                    return false;
+            }
+
+            // some obvious checks
+            if (recordJob.BaseAddress?.HasContent() != true)
+            {
+                Log.Singleton.Error("No BaseAddress given. Aborting!");
                 return false;
+            }
 
             // sort Identifiables to look nice
             var sorted = idfs.ToList();
@@ -3079,6 +3101,7 @@ public static async Task<bool> PerformUploadAssistant(
             HttpClient client = null;
             if (recordJob.BaseType == ConnectExtendedRecord.BaseTypeEnum.Repository)
             {
+                // Note: it seems to be also possible to create an HttpClient with "" as BaseAddress and pass Host via URL!!
                 baseUri = new Uri(recordJob.BaseAddress);
                 client = PackageHttpDownloadUtil.CreateHttpClient(baseUri, runtimeOptions, containerList);
             }
@@ -3184,8 +3207,12 @@ public static async Task<bool> PerformUploadAssistant(
             ucSelect.Rows = rows.ToList();
             ucSelect.EmptySelectOk = true;
 
-            if (!(await displayContext.StartFlyoverModalAsync(ucSelect)))
-                return false;
+            if (ticket?.ScriptMode != true)
+            {
+                // if not in script mode, perform dialogue
+                if (!(await displayContext.StartFlyoverModalAsync(ucSelect)))
+                    return false;
+            }
 
             // translate result items
             var rowsToUpload = ucSelect.ResultItems;
@@ -3278,7 +3305,7 @@ public static async Task<bool> PerformUploadAssistant(
                                 lambdaReportIdShortPathError: (idsp) =>
                                 {
                                     Log.Singleton.Error("When uploading Submodel {0}, idShort path for File " +
-                                            "elements contains invalid characters and prevents uploading file " +
+                                            "element contains invalid characters and prevents uploading file " +
                                             "attchment: {1}", submodel.IdShort, idsp);
                                     lock (rowsToUpload)
                                     {
@@ -3292,8 +3319,17 @@ public static async Task<bool> PerformUploadAssistant(
                                 if (filEl?.FileSme?.Value?.HasContent() != true)
                                     continue;
 
-                                // try read the bytes (should have try/catch in it)
-                                var ba = await packEnv.GetBytesFromPackageOrExternalAsync(filEl.FileSme.Value);
+                                // try read the bytes (has NO try/catch in it)
+                                byte[] ba = null;
+                                try
+                                {
+                                    ba = await packEnv.GetBytesFromPackageOrExternalAsync(filEl.FileSme.Value);
+                                } 
+                                catch (Exception ex)
+                                {
+                                    LogInternally.That.SilentlyIgnoredError(ex);
+                                    ba = null;
+                                }
                                 if (ba == null || ba.Length < 1)
                                 {
                                     Log.Singleton.Error("Centralize file: cannot read file: {0}", filEl.FileSme.Value);
@@ -3316,20 +3352,105 @@ public static async Task<bool> PerformUploadAssistant(
                                     using (var ms = new MemoryStream(ba))
                                     {
                                         // write
+#if _not_now
+                                        using (var hc = new HttpClient())
+                                        {
+                                            // hc.BaseAddress = new Uri("http://localhost:5001");
+                                            // hc.BaseAddress = new Uri("https://echo.free.beeceptor.com");
+                                            hc.DefaultRequestHeaders.Clear();
+                                            // hc.DefaultRequestHeaders.Add("Accept", "application/octet-stream");
+                                            hc.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("multipart/form-data"));
+                                            var url = "https://echo.free.beeceptor.com";
+                                            // var url = "http://localhost:5001/api/v3.0/shells/d3d3LmV4YW1wbGUuY29tL2lkcy9hYXMvODI4MV8yMTUyXzIxNDJfODE2Ng/submodels/d3d3LmV4YW1wbGUuY29tL2lkcy9zbS83NDg1XzAxMjFfMjA0Ml82NzAw/submodel-elements/Fixed_content.idta_smt_badge/attachment";
+                                            // var url = "/";
+                                            // var content = new ByteArrayContent(new byte[] { 1, 2, 3, 4, 5 });
+                                            // content.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+                                            // var content = new StringContent("{1.2345}", Encoding.UTF8, "application/json");
+
+                                            using (var content = new MultipartFormDataContent())
+                                            {
+                                                content.Headers.ContentType.MediaType = "multipart/form-data";
+                                                var stream = new MemoryStream(Encoding.UTF8.GetBytes("{ \"a\": 3 }"));
+                                                stream.Flush();
+                                                stream.Seek(0, SeekOrigin.Begin);
+                                                var fc = new StreamContent(stream); 
+                                                fc.Headers.Add("Content-Disposition", "form-data; name=\"file\"");
+                                                fc.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+                                                content.Add(fc, "file", "upload.png");
+
+                                                // content.Add(fc, "\"textdatei\"", "upload.txt");
+
+                                                var resp = await hc.PutAsync(url, content);
+                                                if (true || resp.IsSuccessStatusCode)
+                                                {
+                                                    // TODO: give back?
+                                                    var c2 = await resp.Content.ReadAsStringAsync();
+                                                    ;
+                                                }
+                                            }
+                                        } 
+#endif
+
+#if __by_chatgpt
+                                        using (var hc = new HttpClient())
+                                        {
+                                            // Base address if needed
+                                            // hc.BaseAddress = new Uri("http://localhost:5001");
+                                            // hc.BaseAddress = new Uri("https://echo.free.beeceptor.com");
+
+                                            hc.DefaultRequestHeaders.Clear();
+                                            hc.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("multipart/form-data"));
+
+                                            // var url = "https://echo.free.beeceptor.com"; // Replace with your actual URL
+                                            var url = "http://localhost:5001/api/v3.0/shells/d3d3LmV4YW1wbGUuY29tL2lkcy9hYXMvODI4MV8yMTUyXzIxNDJfODE2Ng/submodels/d3d3LmV4YW1wbGUuY29tL2lkcy9zbS83NDg1XzAxMjFfMjA0Ml82NzAw/submodel-elements/Fixed_content.idta_smt_badge/attachment"; // Replace with your actual URL
+
+                                            using (var content = new MultipartFormDataContent())
+                                            {
+                                                // Creating a stream with file data
+                                                var filePath = @"C:\Users\Micha\Desktop\t3\new2\idta_smt_badge.png"; // Replace with your file path
+                                                var fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+
+                                                var fileContent = new StreamContent(fileStream);
+                                                fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+
+                                                // Adding the file as form-data
+                                                content.Add(fileContent, "file", "upload.png");
+
+                                                // You can add other form data if needed
+                                                // var jsonContent = new StringContent("{ \"a\": 3 }", Encoding.UTF8, "application/json");
+                                                // content.Add(jsonContent, "data");
+
+                                                var resp = await hc.PutAsync(url, content);
+                                                var responseBody = await resp.Content.ReadAsStringAsync();
+                                            }
+                                        }
+#endif
+
+                                        // the multi-part content needs very specific information to work
+                                        var mpFn = Path.GetFileName(filEl.FileSme.Value);
+                                        var mpCt = filEl.FileSme.ContentType?.Trim();
+                                        if (mpCt?.HasContent() != true)
+                                            mpCt = "application/octet-stream";
+
+                                        // do the PUT with multi-part content
                                         var res3 = await PackageHttpDownloadUtil.HttpPutPostFromMemoryStream(
-                                            client,
+                                            null, // do NOT re-use client, as headers are re-defined!
                                             ms,
                                             destUri: attLoc,
                                             runtimeOptions: runtimeOptions,
                                             containerList: containerList,
-                                            usePost: usePost);
+                                            usePost: usePost,
+                                            useMultiPart: true,
+                                            mpParamName: "file",
+                                            mpFileName: mpFn,
+                                            mpContentType: mpCt);
 
                                         lock (rowsToUpload)
                                         {
                                             if (res3.Item1 != HttpStatusCode.OK && res3.Item1 != HttpStatusCode.NoContent)
                                             {
-                                                Log.Singleton.Error("Error uploading attachment of {0} bytes to: {1}",
-                                                    ba.Length, attLoc.ToString());
+                                                Log.Singleton.Error("Error uploading attachment of {0} bytes to: {1}. HTTP code {2} with content: {3}",
+                                                    ba.Length, attLoc.ToString(), res3.Item1, res3.Item2);
                                                 numAttNOK++;
                                             }
                                             else
diff --git a/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs b/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs
index 2ac9d3b0..0c7b18a4 100644
--- a/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs
+++ b/src/AasxPackageLogic/PackageCentral/PackageHttpDownloadUtil.cs
@@ -32,6 +32,8 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using System.ServiceModel;
 using Namotion.Reflection;
 using System.Text.Json.Nodes;
+using System.Reflection.Metadata;
+using System.IO.Pipes;
 
 namespace AasxPackageLogic.PackageCentral
 {
@@ -532,13 +534,28 @@ await memStream.WriteAsync(buffer, 0, bytesRead,
             return null;
         }
 
+        /// <summary>
+        /// Does es PUT/POST
+        /// </summary>
+        /// <param name="reUseClient"></param>
+        /// <param name="ms"></param>
+        /// <param name="destUri"></param>
+        /// <param name="usePost"></param>
+        /// <param name="runtimeOptions"></param>
+        /// <param name="containerList"></param>
+        /// <param name="mpParamName">If set with a name, name of the parameter in the multi part body to be transferred as a file</param>
+        /// <returns></returns>
         public static async Task<Tuple<HttpStatusCode, string>> HttpPutPostFromMemoryStream(
             HttpClient reUseClient,
             MemoryStream ms,
             Uri destUri,
             bool usePost = false,
             PackCntRuntimeOptions runtimeOptions = null,
-            PackageContainerListBase containerList = null)
+            PackageContainerListBase containerList = null,
+            bool useMultiPart = false,
+            string mpParamName = null,
+            string mpFileName = null,
+            string mpContentType = null)            
         {
             // access
             if (ms == null || destUri == null)
@@ -550,21 +567,39 @@ public static async Task<Tuple<HttpStatusCode, string>> HttpPutPostFromMemoryStr
 
             // Log
             if (runtimeOptions?.ExtendedConnectionDebug == true)
-                runtimeOptions.Log?.Info($"HttpClient PUT/POSTZ() with base-address {client.BaseAddress} " +
+                runtimeOptions.Log?.Info($"HttpClient PUT/POST() with base-address {client.BaseAddress} " +
                     $"and request {requestPath} .. ");
 
-            // make data
-            var data = new ProgressableStreamContent(ms.ToArray(), runtimeOptions);
+            // make overall content
+            HttpContent overallContent = null;
+            if (useMultiPart && mpParamName?.HasContent() == true && mpFileName?.HasContent() == true && mpContentType?.HasContent() == true)
+            {
+                // Note: may re-define reUseClient's headers!!
+                client.DefaultRequestHeaders.Clear();
+                client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("multipart/form-data"));
+
+                overallContent = new MultipartFormDataContent();
+
+                var fileContent = new StreamContent(ms);
+                fileContent.Headers.ContentType = new MediaTypeHeaderValue(mpContentType);
+
+                // Adding the file as form-data
+                (overallContent as MultipartFormDataContent).Add(fileContent, mpParamName, mpFileName);
+            }
+            else
+            {
+                // var data = new ProgressableStreamContent(ms.ToArray(), runtimeOptions);
+                overallContent = new ByteArrayContent(ms.ToArray());
+                // var data = new StringContent("1.2345", Encoding.UTF8, "application/json");
+            }
 
             // get response?
             using (var response = (!usePost) 
-                ? await client.PutAsync(requestPath, data)
-                : await client.PostAsync(requestPath, data))
+                ? await client.PutAsync(requestPath, overallContent)
+                : await client.PostAsync(requestPath, overallContent))
             {
-                var content = "";
-                if (response.IsSuccessStatusCode)
-                    // TODO: give back?
-                    content = await response.Content.ReadAsStringAsync();
+                // always get back content to allow debug
+                var content = await response.Content.ReadAsStringAsync();
 
                 // ok!
                 return new Tuple<HttpStatusCode, string>(response.StatusCode, content);
diff --git a/src/AasxPackageLogic/VisualAasxElements.cs b/src/AasxPackageLogic/VisualAasxElements.cs
index 0a5e7d37..83638858 100644
--- a/src/AasxPackageLogic/VisualAasxElements.cs
+++ b/src/AasxPackageLogic/VisualAasxElements.cs
@@ -13,6 +13,7 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using AdminShellNS.DiaryData;
 using AnyUi;
 using Extensions;
+using JetBrains.Annotations;
 using Namotion.Reflection;
 using System;
 using System.Collections.Generic;
@@ -1266,6 +1267,31 @@ public override void RefreshFromMainData()
             }
         }
 
+        public Tuple<Aas.IAssetAdministrationShell, Aas.ISubmodel, string> FindAasSubmodelIdShortPath()
+        {
+            // find a SubmodelRef?
+            var veSmr = FindAllParents((ve) => ve is VisualElementSubmodelRef).FirstOrDefault() as VisualElementSubmodelRef;
+            if (veSmr != null)
+            {
+                return new Tuple<IAssetAdministrationShell, ISubmodel, string>(
+                    veSmr.theAas,
+                    veSmr.theSubmodel,
+                    theWrapper?.CollectIdShortByParent(separatorChar: '.', excludeIdentifiable: true));
+            }
+
+            // find just a Submodel
+            var veSm = FindAllParents((ve) => ve is VisualElementSubmodel).FirstOrDefault() as VisualElementSubmodel;
+            if (veSm != null)
+            {
+                return new Tuple<IAssetAdministrationShell, ISubmodel, string>(
+                    null,
+                    veSm.theSubmodel,
+                    theWrapper?.CollectIdShortByParent(separatorChar: '.', excludeIdentifiable: true));
+            }
+
+            return null;
+        }
+
     }
 
     public class VisualElementOperationVariable : VisualElementGeneric