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

fix: Fix error when editing component IDs #14021

Merged
merged 7 commits into from
Nov 14, 2024
Merged

fix: Fix error when editing component IDs #14021

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de6fd66
Remove check of componentId as propertyName
mlqn Nov 8, 2024
4b6ccae
Fix componentId
mlqn Nov 11, 2024
2f71dfb
Fix componentId
mlqn Nov 11, 2024
5857719
Merge branch 'main' into 14004-when-a-component-id-is-updated-any-mat…
mlqn Nov 11, 2024
cdf1e5d
Added comments
mlqn Nov 12, 2024
3343470
Merge branch 'main' into 14004-when-a-component-id-is-updated-any-mat…
mlqn Nov 12, 2024
f66aa96
Cleanup
mlqn Nov 12, 2024
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
70 changes: 31 additions & 39 deletions backend/src/Designer/EventHandlers/ComponentIdChanged/ComponentIdChangedLayoutsHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Linq;
using System.Text.Json.Nodes;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -68,29 +69,37 @@ private void FindIdOccurrencesRecursive(JsonNode node, string oldComponentId, st
// Should we check if node is string to avoid unnecessary upcoming checks?
if (node is JsonObject jsonObject)
{
if (jsonObject[oldComponentId] is not null)
foreach (var property in jsonObject.ToList())
{
// When componentId is the propertyName
UpdateComponentIdActingAsPropertyName(jsonObject, oldComponentId, newComponentId);
}
else if (jsonObject["component"] is not null)
{
// Objects that references components i.e. in `rowsAfter` in RepeatingGroup
UpdateComponentIdActingAsCellMemberInRepeatingGroup(jsonObject, oldComponentId, newComponentId);
}
else if (jsonObject["tableHeaders"] is JsonArray tableHeadersArray)
{
// Objects that references components in `tableHeaders` in RepeatingGroup
UpdateComponentIdActingAsTableHeaderInRepeatingGroup(tableHeadersArray, oldComponentId, newComponentId);
}
else if (jsonObject["componentRef"] is not null)
{
// Components that are used in summary components will have this ref
UpdateComponentIdActingAsComponentRefInSummary(jsonObject, oldComponentId, newComponentId);
}
foreach (var property in jsonObject)
{
FindIdOccurrencesRecursive(property.Value, oldComponentId, newComponentId);
switch (property.Key)
{
case "component": // Objects that references components i.e. in `rowsAfter` in RepeatingGroup
case "componentRef": // Components that are used in summary components will have this ref
if (property.Value?.ToString() == oldComponentId)
{
jsonObject[property.Key] = newComponentId;
}
break;
case "tableHeaders":
if (property.Value is JsonArray tableHeadersArray)
{
// Objects that references components in `tableHeaders` in RepeatingGroup
UpdateComponentIdActingAsTableHeaderInRepeatingGroup(tableHeadersArray, oldComponentId, newComponentId);
}
break;
case "tableColumns":
if (jsonObject["type"]?.ToString() == "RepeatingGroup"
&& property.Value is JsonObject tableColumns
&& tableColumns[oldComponentId] is not null
)
{
UpdateComponentIdActingAsPropertyName(tableColumns, oldComponentId, newComponentId);
}
break;
default:
FindIdOccurrencesRecursive(property.Value, oldComponentId, newComponentId);
break;
}
}
}
else if (node is JsonArray jsonArray)
Expand Down Expand Up @@ -126,14 +135,6 @@ private void UpdateComponentIdActingAsExpressionMember(JsonArray jsonArray, stri
jsonArray[1] = newComponentId;
}

private void UpdateComponentIdActingAsCellMemberInRepeatingGroup(JsonNode jsonNode, string oldComponentId, string newComponentId)
{
if (jsonNode["component"]?.ToString() == oldComponentId)
{
jsonNode["component"] = newComponentId;
}
}

private void UpdateComponentIdActingAsTableHeaderInRepeatingGroup(JsonArray jsonArray, string oldComponentId, string newComponentId)
{
for (int i = 0; i < jsonArray.Count; i++)
Expand All @@ -151,13 +152,4 @@ private void UpdateComponentIdActingAsTableHeaderInRepeatingGroup(JsonArray json
}
}
}

private void UpdateComponentIdActingAsComponentRefInSummary(JsonNode jsonNode, string oldComponentId, string newComponentId)
{
if (jsonNode["componentRef"]?.ToString() == oldComponentId)
{
jsonNode["componentRef"] = newComponentId;
}
}

}
Loading