Skip to content

Commit 9e31935

Browse files
Only store GUID of migrated start node IDs
1 parent 32d5403 commit 9e31935

File tree

3 files changed

+33
-12
lines changed

3 files changed

+33
-12
lines changed

src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/ContentPickerReplaceDataTypeArtifactMigratorBase.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,18 @@ protected ContentPickerReplaceDataTypeArtifactMigratorBase(string fromEditorAlia
2626
/// <inheritdoc />
2727
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> configuration)
2828
{
29-
if (configuration.TryGetValue("startNodeId", out var startNodeIdValue) &&
30-
(startNodeIdValue?.ToString() is not string startNodeIdString || !UdiParser.TryParse(startNodeIdString, out _)))
29+
if (configuration.TryGetValue("startNodeId", out var startNodeIdValue))
3130
{
32-
// Remove invalid start node id
33-
configuration.Remove("startNodeId");
31+
if (startNodeIdValue?.ToString() is not string startNodeId || !UdiParser.TryParse(startNodeId, out GuidUdi? udi))
32+
{
33+
// Remove invalid start node ID
34+
configuration.Remove("startNodeId");
35+
}
36+
else
37+
{
38+
// Update start node ID to GUID
39+
configuration["startNodeId"] = udi.Guid;
40+
}
3441
}
3542

3643
return configuration;

src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MediaPickerDataTypeArtifactMigrator.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,18 @@ public MediaPickerDataTypeArtifactMigrator(PropertyEditorCollection propertyEdit
2727
/// <inheritdoc />
2828
protected override IDictionary<string, object>? MigrateConfiguration(IDictionary<string, object> fromConfiguration)
2929
{
30-
if (fromConfiguration.TryGetValue("startNodeId", out var startNodeIdValue) &&
31-
(startNodeIdValue?.ToString() is not string startNodeId || !UdiParser.TryParse(startNodeId, out _)))
30+
if (fromConfiguration.TryGetValue("startNodeId", out var startNodeIdValue))
3231
{
33-
// Remove invalid start node ID
34-
fromConfiguration.Remove("startNodeId");
32+
if (startNodeIdValue?.ToString() is not string startNodeId || !UdiParser.TryParse(startNodeId, out GuidUdi? udi))
33+
{
34+
// Remove invalid start node ID
35+
fromConfiguration.Remove("startNodeId");
36+
}
37+
else
38+
{
39+
// Update start node ID to GUID
40+
fromConfiguration["startNodeId"] = udi.Guid;
41+
}
3542
}
3643

3744
return fromConfiguration;

src/Umbraco.Deploy.Contrib/Migrators/Legacy/DataType/MediaPickerReplaceDataTypeArtifactMigratorBase.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,18 @@ protected MediaPickerReplaceDataTypeArtifactMigratorBase(string fromEditorAlias,
3939
configuration["multiPicker"] = Multiple;
4040
}
4141

42-
if (configuration.TryGetValue("startNodeId", out var startNodeIdValue) &&
43-
(startNodeIdValue?.ToString() is not string startNodeId || !UdiParser.TryParse(startNodeId, out _)))
42+
if (configuration.TryGetValue("startNodeId", out var startNodeIdValue))
4443
{
45-
// Remove invalid start node ID
46-
configuration.Remove("startNodeId");
44+
if (startNodeIdValue?.ToString() is not string startNodeId || !UdiParser.TryParse(startNodeId, out GuidUdi? udi))
45+
{
46+
// Remove invalid start node ID
47+
configuration.Remove("startNodeId");
48+
}
49+
else
50+
{
51+
// Update start node ID to GUID
52+
configuration["startNodeId"] = udi.Guid;
53+
}
4754
}
4855

4956
return configuration;

0 commit comments

Comments
 (0)