Skip to content
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

Presentation: Serialize JSON objects in format expected in TS #995

Merged
merged 3 commits into from
Feb 10, 2025
Merged

Presentation: Serialize JSON objects in format expected in TS #995

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcad53c
Serialize JSON objects in format expected in TS
grigasp Feb 7, 2025
74b1b26
Merge branch 'main' into presentation/serializer-changes
grigasp Feb 10, 2025
098f509
Merge branch 'main' into presentation/serializer-changes
grigasp Feb 10, 2025
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
14 changes: 7 additions & 7 deletions iModelJsNodeAddon/presentation/ECPresentationSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,8 @@ struct HierarchyUpdateSerializer : HierarchyChangeRecordDiffHandler
void _HandleKey(NavNodeKeyCR newValue) override
{
Add("key", newValue.AsJson(&m_allocator).Move());
if (!m_changes.HasMember("labelDefinition"))
Add("labelDefinition", m_updatedNode->GetLabelDefinition().AsJson(&m_allocator).Move());
if (!m_changes.HasMember("label"))
Add("label", m_updatedNode->GetLabelDefinition().AsJson(&m_allocator).Move());
}
void _HandleHasChildren(bool newValue) override {Add("hasChildren", rapidjson::Value(newValue).Move());}
void _HandleIsChecked(bool newValue) override {Add("isChecked", rapidjson::Value(newValue).Move());}
Expand All @@ -402,7 +402,7 @@ struct HierarchyUpdateSerializer : HierarchyChangeRecordDiffHandler
void _HandleType(Utf8StringCR newValue) override {}
void _HandleLabelDefinition(LabelDefinitionCR newValue) override
{
Add("labelDefinition", newValue.AsJson(&m_allocator).Move());
Add("label", newValue.AsJson(&m_allocator).Move());
if (!m_changes.HasMember("key"))
Add("key", m_updatedNode->GetKey()->AsJson(&m_allocator).Move());
}
Expand Down Expand Up @@ -789,7 +789,7 @@ rapidjson::Document IModelJsECPresentationSerializer::_AsJson(ContextR ctx, Cont
json.SetObject();

if (0 != (ContentSetItem::SerializationFlags::SERIALIZE_DisplayLabel & flags))
json.AddMember("labelDefinition", IModelJsECPresentationSerializer::_AsJson(ctx, contentSetItem.GetDisplayLabelDefinition(), &json.GetAllocator()), json.GetAllocator());
json.AddMember("label", IModelJsECPresentationSerializer::_AsJson(ctx, contentSetItem.GetDisplayLabelDefinition(), &json.GetAllocator()), json.GetAllocator());

if (0 != (ContentSetItem::SerializationFlags::SERIALIZE_ImageId & flags))
json.AddMember("imageId", rapidjson::Value(contentSetItem.GetImageId().c_str(), json.GetAllocator()), json.GetAllocator());
Expand Down Expand Up @@ -1165,7 +1165,7 @@ rapidjson::Document IModelJsECPresentationSerializer::_AsJson(ContextR ctx, NavN
rapidjson::Document json(allocator);
json.SetObject();
json.AddMember("key", navNode.GetKey()->AsJson(ctx, &json.GetAllocator()), json.GetAllocator());
json.AddMember("labelDefinition", IModelJsECPresentationSerializer::_AsJson(ctx, navNode.GetLabelDefinition(), &json.GetAllocator()), json.GetAllocator());
json.AddMember("label", IModelJsECPresentationSerializer::_AsJson(ctx, navNode.GetLabelDefinition(), &json.GetAllocator()), json.GetAllocator());
if (navNode.HasChildren())
json.AddMember("hasChildren", navNode.HasChildren(), json.GetAllocator());
if (!navNode.GetDescription().empty())
Expand Down Expand Up @@ -1279,8 +1279,8 @@ rapidjson::Document IModelJsECPresentationSerializer::_AsJson(ContextR ctx, Node
rapidjson::Value filteringData;
filteringData.SetObject();

filteringData.AddMember("occurances", navNodesPathElement.GetFilteringData().GetOccurances(), json.GetAllocator());
filteringData.AddMember("childrenOccurances", navNodesPathElement.GetFilteringData().GetChildrenOccurances(), json.GetAllocator());
filteringData.AddMember("matchesCount", navNodesPathElement.GetFilteringData().GetOccurances(), json.GetAllocator());
filteringData.AddMember("childMatchesCount", navNodesPathElement.GetFilteringData().GetChildrenOccurances(), json.GetAllocator());

json.AddMember("filteringData", filteringData, json.GetAllocator());

Expand Down
Loading