* update before refactore

Author: festo-i40

src/AasxPackageExplorer/MainWindow.xaml.cs

@@ -2662,7 +2662,7 @@ private async Task MainTimer_Tick(object sender, EventArgs e)
             // flags for tainted Identifiables
             MainTimer_CheckTaintedIdentifiables(
                 _mainTimer_LastCheckForTaintedIdentifiables,
-                PackageCentral.MainItem.Container.Env?.AasEnv);
+                PackageCentral.MainItem.Container?.Env?.AasEnv);
             _mainTimer_LastCheckForTaintedIdentifiables = DateTime.UtcNow;
 
             // pending re-index?

src/AasxPackageExplorer/debug.MIHO.script

@@ -9,13 +9,9 @@
 // Tool("sammaspectimport", "File", "C:\\HOMI\\Develop\\Aasx\\repo\\samm-test\\Batch-MM-2_0_0.ttl");
 // Tool("exportsmtasciidoc", "File", "C:\\HOMI\\Develop\\Aasx\\repo\\new.zip", "AntoraStyle", "true");
 Tool("editkey");
-// Tool("connectextended", 
-// 	"BaseAddress", "https://eis-data.aas-voyager.com/", 
-//	"BaseType", "Repository", 
-//	"GetSingleAas", "false", 
-//	"GetAllAas", "true", 
-// 	"PageLimit", "2", 
-//	"AutoLoadOnDemand", "false");
+// Tool("connectextended", "BaseAddress", "https://eis-data.aas-voyager.com/", "BaseType", "Repository", "GetSingleAas", "false", "GetAllAas", "true", "PageLimit", "2", "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");
 // Select("Submodel", "First");

src/AasxPackageLogic/DispEditHelperEntities.cs

@@ -1553,7 +1553,7 @@ public static async Task<bool> ExecuteUiForFetchOfElements(
                 {
                     MainWindowLogic.LogErrorToTicketStatic(ticket,
                         new InvalidDataException(),
-                        "Error building location from next fetch selection. Aborting.");
+                        "Error building location from fetch selection. Aborting.");
                     return false;
                 }
 
@@ -2128,9 +2128,11 @@ public void DisplayOrEditAasEntitySubmodelOrRef(
                 AddActionPanel(stack, "Submodel:",
                     repo: repo, superMenu: superMenu,
                     ticketMenu: new AasxMenu()
-                        .AddAction("aas-elem-del", "Delete",
-                            "Deletes the currently selected element.",
-                        inputGesture: "Ctrl+Shift+Delete"),
+                        .AddAction("aas-elem-del", "Delete \U0001f847 here",
+                            "Deletes the currently selected Submodel in the local environment.",
+                            inputGesture: "Ctrl+Shift+Delete")
+                        .AddAction("delete-sm-in-repo", "Delete SM \u274c in Repo",
+                            "Delete Submodel by Id in a given Repository or Registry."),
                     ticketAction: (buttonNdx, ticket) =>
                     {
                         if (buttonNdx == 0)
@@ -2314,7 +2316,7 @@ public void DisplayOrEditAasEntitySubmodelOrRef(
                             "assigns the SubmodelElement to it.")
                         .AddAction("create-smes", "Create \U0001f844 SMEs (all)",
                             "Create missing CDs from semanticId of used SMEs.")
-                        .AddAction("delete-cd-in-repo", "Delete \u274c in Repo",
+                        .AddAction("delete-cd-in-repo", "Delete CD \u274c in Repo",
                             "Delete ConceptDescriptions which are referenced by semanticId of SubmodelElements " +
                             "in a given Repository or Registry."),
                     ticketActionAsync: async (buttonNdx, ticket) =>
@@ -2390,11 +2392,22 @@ public void DisplayOrEditAasEntitySubmodelOrRef(
                             var cdIds = lrs.Select((lr) => lr?.Reference?.GetAsExactlyOneKey()?.Value);
 
                             // call function
+                            // (only the side info in the _specific_ endpoint gives information, in which
+                            //  repo the CDs could be deleted)
                             await PackageContainerHttpRepoSubset.AssistantDeleteCDsInRepo(
                                 ticket, context,
                                 "Delete CDs in Repository/ Registry",
                                 cdIds,
-                                runtimeOptions: packages.CentralRuntimeOptions);
+                                runtimeOptions: packages.CentralRuntimeOptions,
+                                presetRecord: new PackageContainerHttpRepoSubset.DeleteAssistantJobRecord()
+                                {
+                                    // assume Repo ?!
+                                    BaseType = ConnectExtendedRecord.BaseTypeEnum.Repository,
+
+                                    // extract base address
+                                    BaseAddress = "" + PackageContainerHttpRepoSubset.GetBaseUri(
+                                        sideInfo?.Endpoint?.AbsoluteUri)?.AbsoluteUri
+                                });
 
                             // ok
                             return new AnyUiLambdaActionNone();

src/AasxPackageLogic/PackageCentral/AdminShellPackageDynamicFetchEnv.cs

@@ -84,11 +84,14 @@ public async Task<bool> TryFetchThumbnail(Aas.IAssetAdministrationShell aas)
             // try
             try
             {
-                await PackageHttpDownloadUtil.HttpGetToMemoryStreamOLD(
+                await PackageHttpDownloadUtil.HttpGetToMemoryStream(
+                    null,
                     sourceUri: PackageContainerHttpRepoSubset.BuildUriForRepoAasThumbnail(_defaultRepoBaseUri, aas.Id),
                     runtimeOptions: _runtimeOptions,
-                    lambdaDownloadDone: (ms, contentFn) =>
+                    lambdaDownloadDoneOrFail: (code, ms, contentFn) =>
                     {
+                        if (code != HttpStatusCode.OK)
+                            return;
                         AddThumbnail(aas.Id, ms.ToArray());
                     });