Changes to the base code

admin-shell-io · Feb 18, 2024 · f70e14c · f70e14c
1 parent 010e614
commit f70e14c
Show file tree

Hide file tree

Showing 5 changed files with 258 additions and 174 deletions.
diff --git a/src/AasxPluginAID/AIDAnyUiControl.cs b/src/AasxPluginAID/AIDAnyUiControl.cs
@@ -256,7 +256,7 @@ protected void RenderPanelOutside(
                 foreground: AnyUiBrushes.DarkBlue,
                 fontSize: 1.5f,
                 setBold: true,
-                content: $"AssetInterfaceDescriptions");
+                content: $"AssetInterfacesDescription");
 
             if (_opContext?.IsDisplayModeEditOrAdd == true)
                 AnyUiUIElement.RegisterControl(
@@ -275,7 +275,7 @@ protected void RenderPanelOutside(
             {
                 Margin = new AnyUiThickness(2),
                 MinHeight = 21,
-                Content = "Import Interface Description .."
+                Content = "Import Thing Description .."
             }), (o) =>
             {
                 ButtonTabPanels_Click("ButtonImportInterface");
@@ -704,7 +704,7 @@ private async Task InterfaceEntity_MenuClick(InterfaceEntity e, string menuItemH
                         // ask back via display context
                         if (AnyUiMessageBoxResult.Cancel == await _displayContext?.MessageBoxFlyoutShowAsync(
                                     "Delete Interface description? This cannot be reverted!",
-                                    "AssetInterfaceDescriptions",
+                                    "AssetInterfacesDescription",
                                     AnyUiMessageBoxButton.OKCancel,
                                     AnyUiMessageBoxImage.Question))
                             return;
@@ -899,7 +899,7 @@ private async Task<AnyUiLambdaActionBase> ButtonTabPanels_Click(string cmd, stri
                 var targetFn = String.Format("{0}_{1}{2}", onlyFn, salt, onlyExt);
 
                 var desc = AIDTDImport.CreateAssetInterfaceDescriptionFromTd(tdJObject,
-                                               targetPath + "/"+targetFn,_submodel.Id.ToString(),_submodel.SubmodelElements.Count,"JSONLD");
+                                               targetPath + targetFn,_submodel.Id.ToString(),_submodel.SubmodelElements.Count,"JSONLD");
                 _submodel.Add(desc);
                 PushUpdatenRedrawEvent();
                 return new AnyUiLambdaActionRedrawAllElementsBase() { NextFocus = _submodel };

diff --git a/src/AasxPluginAID/AIDTDExport.cs b/src/AasxPluginAID/AIDTDExport.cs
@@ -102,7 +102,9 @@ public static JObject serialize_aid_elem(JToken tdJToken, Aas.ISubmodelElement s
                     if (semanticReference == "https://admin-shell.io/idta/AssetInterfaceDescription/1/0/PropertyDefinition"
                         || semanticReference == "https://www.w3.org/2019/wot/json-schema#propertyName")
                     {
-                        TDJson[smcJObject["key"].ToString()] = JToken.FromObject(smcJObject);
+                        string _key = smcJObject["key"].ToString();
+                        smcJObject.Remove("key");
+                        TDJson[_key] = JToken.FromObject(smcJObject);
                     }
                     else
                     {
@@ -131,9 +133,9 @@ public static JObject ExportInterfacetoTDJson(Aas.ISubmodelElementCollection smc
                     {
 
                     }
-                    else if (se.IdShort == "InterfaceMetaData")
+                    else if (se.IdShort == "InteractionMetadata")
                     {
-                        JToken InterfaceMetaData = serialize_aid_elem(idtaDef.EndpointMetadataJObject["interface"]["childs"][6], se)["InterfaceMetaData"];
+                        JToken InterfaceMetaData = serialize_aid_elem(idtaDef.EndpointMetadataJObject["interface"]["childs"][6], se)["InteractionMetadata"];
                         TDJson.Merge(JObject.FromObject(InterfaceMetaData));
                     }
                     else