From ac461973a015caabfe5d1d75889a2afc079bd791 Mon Sep 17 00:00:00 2001
From: david schoene <david.schoene@uni-jena.de>
Date: Tue, 31 Mar 2026 14:22:37 +0200
Subject: [PATCH] #2385 fix isuue with parameters in json, test are fixed

---
 .../XmlMetadataConverterTests.cs              |  4 +++-
 .../BExIS.Xml.Helpers/XmlMetadataConverter.cs | 24 ++++++++++++++-----
 .../src/lib/hooks/Metadata.svelte             |  4 ++--
 Console/Workspace                             |  2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Components/XML/BExIS.Xml.Helpers.UnitTests/XmlMetadataConverterTests.cs b/Components/XML/BExIS.Xml.Helpers.UnitTests/XmlMetadataConverterTests.cs
index f6d116ccc..2c490dc3b 100644
--- a/Components/XML/BExIS.Xml.Helpers.UnitTests/XmlMetadataConverterTests.cs
+++ b/Components/XML/BExIS.Xml.Helpers.UnitTests/XmlMetadataConverterTests.cs
@@ -64,7 +64,9 @@ public void ConvertTo_XmlToJson_ReturnJson()
             JObject result = xmlMetadataHelper.ConvertTo(xmlDocument);
             JObject result2 = xmlMetadataHelper.ConvertTo(xmlDocument, true);
 
-            bool isvalid = result.IsValid(schema);
+            IList<string> errorMessages = new List<string>();
+
+            bool isvalid = result.IsValid(schema, out errorMessages);
 
             var json = JsonConvert.SerializeObject(result);
             var json2 = JsonConvert.SerializeObject(result2);
diff --git a/Components/XML/BExIS.Xml.Helpers/XmlMetadataConverter.cs b/Components/XML/BExIS.Xml.Helpers/XmlMetadataConverter.cs
index 285af3531..626b18b5f 100644
--- a/Components/XML/BExIS.Xml.Helpers/XmlMetadataConverter.cs
+++ b/Components/XML/BExIS.Xml.Helpers/XmlMetadataConverter.cs
@@ -123,8 +123,8 @@ private JToken _convertPackageUsage(XmlNode node, MetadataPackageUsage usage, bo
                         // complex stuff
                         // add all children nodes
                         JObject complex = new JObject();
-                        setReference(complex, (XmlElement)tCHild, includeEmpty);
-                        setParameters(complex, (XmlElement)tCHild, includeEmpty);
+                        //setReference(complex, (XmlElement)tCHild, includeEmpty);
+                        //setParameters(complex, (XmlElement)tCHild, includeEmpty);
 
                         for (int i = 0; i < tCHild.ChildNodes.Count; i++)
                         {
@@ -144,6 +144,13 @@ private JToken _convertPackageUsage(XmlNode node, MetadataPackageUsage usage, bo
                         }
 
                         if (!complex.Children().Any()) return null;
+                        else
+                        {
+                            setReference(complex, (XmlElement)tCHild, includeEmpty);
+                            setParameters(complex, (XmlElement)tCHild, includeEmpty);
+
+                        }
+
 
                         if (getMaxCardinality(usage) <= 1) return complex;
                         else
@@ -218,9 +225,7 @@ private JToken _convertElementUsage(XmlNode node, BaseUsage usage, bool includeE
                             // complex stuff
                             // add all children nodes
                             JObject complex = new JObject();
-                            setReference(complex, (XmlElement)tCHild, includeEmpty);
-                            setParameters(complex, (XmlElement)tCHild, includeEmpty);
-
+                     
                             for (int i = 0; i < tCHild.ChildNodes.Count; i++)
                             {
                                 XmlNode child = tCHild.ChildNodes[i];
@@ -242,6 +247,13 @@ private JToken _convertElementUsage(XmlNode node, BaseUsage usage, bool includeE
                             }
 
                             if (!complex.Children().Any()) return null;
+                            else
+                            {
+                                setReference(complex, (XmlElement)tCHild, includeEmpty);
+                                setParameters(complex, (XmlElement)tCHild, includeEmpty);
+
+                            }
+
 
                             if (getMaxCardinality(usage) <= 1) return complex;
                             else
@@ -359,7 +371,7 @@ private void setParameters(JObject target, XmlElement element, bool includeEmpty
         { 
             if(element.HasAttributes)
             {
-                List<String> ignore = new List<String>() { "type", "ref", "id", "roleId", "number", "name" }; // system attributes
+                List<String> ignore = new List<String>() { "type", "ref", "id", "roleId", "number", "name","partyid"  }; // system attributes
 
                 foreach (XmlAttribute attr in element.Attributes)
                 {
diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte
index ac9d71b88..77e02473a 100644
--- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte
+++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte
@@ -74,9 +74,9 @@
 		<button class="btn btn-sm variant-filled-secondary flex-none" on:click={editOldFn}
 			><Fa icon={faPen} /><span class="pl-1">Edit</span></button
 		>
-		<!-- <button class="btn btn-sm variant-filled-secondary flex-none" on:click={editFn}
+		<button class="btn btn-sm variant-filled-secondary flex-none" on:click={editFn}
 			><Fa icon={faPen} /><span class="pl-1">Edit (beta)</span></button
-		> -->
+		>
 	</div>
 </div>
 {#if open}
diff --git a/Console/Workspace b/Console/Workspace
index 47ead9e98..664b8f532 160000
--- a/Console/Workspace
+++ b/Console/Workspace
@@ -1 +1 @@
-Subproject commit 47ead9e984d0a3b517266f39fa3816b04b746f41
+Subproject commit 664b8f53211ba4808fd3cc579b7f7ff8fa23857c