* various updates

* fix order of paste into
* Note: sequence of selection
  does matter

Author: festo-i40

src/AasxCsharpLibrary/Extensions/ExtendExtension.cs

@@ -6,6 +6,7 @@ This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
 
 This source code may use other Open Source software components (see LICENSE.txt).
 */
+using AdminShellNS;
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
@@ -25,5 +26,11 @@ public static bool IsValid(this List<IExtension> elems)
             return true;
         }
 
+        public static bool IsOneBlank(this List<IExtension> elems)
+        {
+            if (elems == null || elems.Count != 1)
+                return false;
+            return elems[0].Value?.HasContent() != true;
+        }
     }
 }

src/AasxCsharpLibrary/Extensions/ExtendQualifier.cs

@@ -6,6 +6,7 @@ This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
 
 This source code may use other Open Source software components (see LICENSE.txt).
 */
+using AdminShellNS;
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
@@ -140,6 +141,13 @@ public static bool IsValid(this List<IQualifier> elems)
             return true;
         }
 
+        public static bool IsOneBlank(this List<IQualifier> elems)
+        {
+            if (elems == null || elems.Count != 1)
+                return false;
+            return elems[0].Value?.HasContent() != true;
+        }
+
         public static IQualifier FindQualifierOfType(this IEnumerable<IQualifier> qualifiers, string qualifierType)
         {
             if (qualifiers == null || qualifierType == null)

src/AasxPackageExplorer/options-debug.MIHO.json

@@ -31,11 +31,12 @@
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\samm-test\\Run2_DNP_plus_CD_SM_step_2.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\Test1.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\samm-test\\SMT_and_SAMM_Showcase_v02.aasx",
+  "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_TechData_Work\\IDTA 02003-1-2_SubmodelTemplate_TechnicalData_v1.3_workingFile_MIHO.aasx",
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\SMT_and_SAMM_Showcase_v02_spiel.aasx",
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\tmp\\SMT_ProductChangeNotification_Draft_v19_spiel.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:\\MIHO\\Develop\\Aasx\\repo\\SMT_and_SAMM_Showcase_v02.aasx",
+  // "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\SMT_and_SAMM_Showcase_v02.aasx",
   // "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\SMT_and_SAMM_Showcase_v01.aasx",
   // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\SAMSON_TROVIS_3730-3_Vorlage_Demo_Achema.aasx",
   // "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\Prototyp_DPP_SkillsConveyor\\Prototyp_SkillsConveyor.aasx",

src/AasxPackageLogic/DispEditHelperCopyPaste.cs

@@ -568,9 +568,9 @@ public void DispSmeCutCopyPasteHelper(
                         // the sequence of adding childs might by altered in order to preserve
                         // original order of elements
                         var itemsInOrder = cpb.Items;
-                        if (buttonNdx != 2)
+                        if (buttonNdx == 3)
                         {
-                            // paste below, paste into will use reversing
+                            // paste below into will use reversing
                             itemsInOrder.Reverse();
                         }
 

src/AasxPackageLogic/DispEditHelperEntities.cs

@@ -4454,14 +4454,21 @@ public void DisplayOrEditAasEntitySubmodelElement(
                             return new AnyUiLambdaActionNavigateTo(sml.SemanticIdListElement);
                         },
                         relatedReferable: sml,
-                        auxContextHeader: new[] { "\u2573", "Delete semanticIdListElement" },
+                        auxContextHeader: new[] { "\U0001F796", "Auto-detect" },
                         auxContextLambda: (i) =>
                         {
                             if (i == 0)
                             {
-                                sml.SemanticIdListElement = null;
-                                this.AddDiaryEntry(sml, new DiaryEntryStructChange());
-                                return new AnyUiLambdaActionRedrawEntity();
+                                // check for underlying SMCs
+                                if (sml.Value != null && sml.Value.Count > 0
+                                    && sml.Value.First() is Aas.ISubmodelElementCollection subsmc
+                                    && subsmc.SemanticId?.IsValid() == true)
+                                {
+                                    sml.SemanticIdListElement = subsmc.SemanticId.Copy();
+
+                                    this.AddDiaryEntry(sml, new DiaryEntryStructChange());
+                                    return new AnyUiLambdaActionRedrawEntity();
+                                }
                             }
                             return new AnyUiLambdaActionNone();
                         });

src/AasxPackageLogic/DispEditHelperMiniModules.cs

@@ -216,6 +216,11 @@ public void QualifierHelper(
                                 if (uc.Result && uc.ResultItem?.Tag is QualifierPreset preset
                                     && preset.qualifier != null)
                                 {
+                                    // if qualifiers is actually containing only one
+                                    // "blank" qualifier, replace this
+                                    if (qualifiers.IsOneBlank())
+                                        qualifiers.RemoveAt(0);
+
                                     qualifiers.Add(preset.qualifier);
                                     this.AddDiaryEntry(relatedReferable, new DiaryEntryStructChange());
                                 }
@@ -925,6 +930,11 @@ public void ExtensionHelper(
                                 if (uc.Result && uc.ResultItem?.Tag is ExtensionPreset preset
                                     && preset.extension != null)
                                 {
+                                    // if extensions is actually containing only one
+                                    // "blank" extension, replace this
+                                    if (extensions.IsOneBlank())
+                                        extensions.RemoveAt(0);
+
                                     extensions.Add(preset.extension);
                                     this.AddDiaryEntry(relatedReferable, new DiaryEntryStructChange());
                                 }

src/BlazorExplorer/BlazorVisualElements.cs

@@ -346,10 +346,13 @@ public bool TrySelectVisualElement(VisualElementGeneric ve, bool? wishExpanded)
         /// Carefully checks and tries to select a tree item which is identified
         /// by the main data object (e.g. an AAS, SME, ..)
         /// </summary>
-        public bool TrySelectMainDataObject(object dataObject, bool? wishExpanded)
+        public bool TrySelectMainDataObject(
+            object dataObject, bool? wishExpanded,
+            bool alsoDereferenceObjects = false)
         {
             // access?
-            var ve = SearchVisualElementOnMainDataObject(dataObject);
+            var ve = SearchVisualElementOnMainDataObject(dataObject,
+                alsoDereferenceObjects: alsoDereferenceObjects);
             if (ve == null)
                 return false;