change in the AID Plugin.cs

admin-shell-io · Mar 11, 2024 · 467cb08 · 467cb08
1 parent 2a4ca46
commit 467cb08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/AasxPluginAID/AIDAnyUiControl.cs b/src/AasxPluginAID/AIDAnyUiControl.cs
@@ -898,8 +898,15 @@ private async Task<AnyUiLambdaActionBase> ButtonTabPanels_Click(string cmd, stri
                 var salt = Guid.NewGuid().ToString().Substring(0, 8);
                 var targetFn = String.Format("{0}_{1}{2}", onlyFn, salt, onlyExt);
 
+                int submodelELementCount = 0;
+
+                if (_submodel.SubmodelElements != null )
+                {
+                    submodelELementCount = _submodel.SubmodelElements.Count;
+                }
+
                 var desc = AIDTDImport.CreateAssetInterfaceDescriptionFromTd(tdJObject,
-                                               targetPath + targetFn,_submodel.Id.ToString(),_submodel.SubmodelElements.Count,"JSONLD");
+                                               targetPath + targetFn,_submodel.Id.ToString(), submodelELementCount, "JSONLD");
                 _submodel.Add(desc);
                 PushUpdatenRedrawEvent();
                 return new AnyUiLambdaActionRedrawAllElementsBase() { NextFocus = _submodel };

diff --git a/src/AasxPluginAID/Plugin.cs b/src/AasxPluginAID/Plugin.cs
@@ -71,7 +71,7 @@ public class Session : PluginSessionBase
                 // check for a record in options, that matches Submodel
                 var found = false;
                 // ReSharper disable once UnusedVariable
-                if (sm.SemanticId.GetAsExactlyOneKey().Value.ToString() == "https://admin-shell.io/idta/AssetInterfacesDescription/1/0/Submodel")
+                if (sm.SemanticId?.GetAsExactlyOneKey().Value.ToString() == "https://admin-shell.io/idta/AssetInterfacesDescription/1/0/Submodel")
                     found = true;
                 if (!found)
                     return null;