Skip to content

#2385 fix isuue with parameters in json, test are fixed #2433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidBlaa merged 1 commit into from
Apr 2, 2026
+24 −10
Merged

#2385 fix isuue with parameters in json, test are fixed #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Components/XML/BExIS.Xml.Helpers.UnitTests/XmlMetadataConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
24 changes: 18 additions & 6 deletions Components/XML/BExIS.Xml.Helpers/XmlMetadataConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
{
Expand All @@ -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
Expand Down Expand Up @@ -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];
Expand All @@ -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
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion Console/Workspace
Open in desktop
Submodule Workspace updated 1 files
+4 −0 Components/Dlm/Db/Mappings/Default/Data/EntityTemplate.hbm.xml
Loading