Improve backwards compatibility for apps that use LayoutEvaluator.RemoveHiddenData

src/Altinn.App.Core/Helpers/DataModel/RowRemovalOption.cs

@@ -1,4 +1,5 @@
-namespace Altinn.App.Core.Helpers.DataModel;
+// ReSharper disable once CheckNamespace // Namespace is kept after refactoring
+namespace Altinn.App.Core.Helpers;
 
 /// <summary>
 /// Option for how to handle row removal

src/Altinn.App.Core/Internal/App/IAppResources.cs

@@ -133,7 +133,7 @@ public interface IAppResources
     /// <summary>
     /// Gets the full layout model for the optional set
     /// </summary>
-    [Obsolete("Use GetLayoutModelForTask instead", true)]
+    [Obsolete("Use GetLayoutModelForTask instead", false)]
     LayoutModel GetLayoutModel(string? layoutSetId = null);
 
     /// <summary>

src/Altinn.App.Core/Internal/Expressions/LayoutEvaluator.cs

@@ -1,4 +1,4 @@
-using Altinn.App.Core.Helpers.DataModel;
+using Altinn.App.Core.Helpers;
 using Altinn.App.Core.Models.Expressions;
 using Altinn.App.Core.Models.Layout;
 using Altinn.App.Core.Models.Layout.Components;
@@ -122,7 +122,16 @@ await HiddenFieldsForRemovalRecurs(
     /// <summary>
     /// Remove fields that are only referenced from hidden fields from the data object in the state.
     /// </summary>
-    public static async Task RemoveHiddenData(LayoutEvaluatorState state, RowRemovalOption rowRemovalOption)
+    [Obsolete("Use the async version of this method RemoveHiddenDataAsync")]
+    public static void RemoveHiddenData(LayoutEvaluatorState state, RowRemovalOption rowRemovalOption)
+    {
+        RemoveHiddenDataAsync(state, rowRemovalOption).Wait();
+    }
+
+    /// <summary>
+    /// Remove fields that are only referenced from hidden fields from the data object in the state.
+    /// </summary>
+    public static async Task RemoveHiddenDataAsync(LayoutEvaluatorState state, RowRemovalOption rowRemovalOption)
     {
         var fields = await GetHiddenFieldsForRemoval(state);
         foreach (var dataReference in fields)

src/Altinn.App.Core/Internal/Expressions/LayoutEvaluatorState.cs

@@ -1,5 +1,6 @@
 using Altinn.App.Core.Configuration;
 using Altinn.App.Core.Features;
+using Altinn.App.Core.Helpers;
 using Altinn.App.Core.Helpers.DataModel;
 using Altinn.App.Core.Models;
 using Altinn.App.Core.Models.Expressions;

src/Altinn.App.Core/Internal/Expressions/LayoutEvaluatorStateInitializer.cs

@@ -91,15 +91,18 @@ public DataElement GetDataElement(DataElementIdentifier dataElementIdentifier)
     /// <summary>
     /// Initialize LayoutEvaluatorState with given Instance, data object and layoutSetId
     /// </summary>
-    [Obsolete("Use the overload with ILayoutEvaluatorStateInitializer instead")]
+    //[Obsolete("Use the overload with ILayoutEvaluatorStateInitializer instead")]
+    // We don't yet have a good alternative for this method
     public async Task<LayoutEvaluatorState> Init(
         Instance instance,
         object data,
         string? layoutSetId,
         string? gatewayAction = null
     )
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         var layouts = _appResources.GetLayoutModel(layoutSetId);
+#pragma warning restore CS0618 // Type or member is obsolete
         var dataElement = instance.Data.Find(d => d.DataType == layouts.DefaultDataType.Id);
         Debug.Assert(dataElement is not null);
         var appMetadata = await _appMetadata.GetApplicationMetadata();

src/Altinn.App.Core/Internal/Process/ProcessTasks/Common/ProcessTaskFinalizer.cs

@@ -1,7 +1,6 @@
 using System.Text.Json;
 using Altinn.App.Core.Configuration;
 using Altinn.App.Core.Helpers;
-using Altinn.App.Core.Helpers.DataModel;
 using Altinn.App.Core.Helpers.Serialization;
 using Altinn.App.Core.Internal.App;
 using Altinn.App.Core.Internal.AppModel;
@@ -105,7 +104,7 @@ private async Task RemoveFieldsOnTaskComplete(
                 gatewayAction: null,
                 language
             );
-            await LayoutEvaluator.RemoveHiddenData(evaluationState, RowRemovalOption.DeleteRow);
+            await LayoutEvaluator.RemoveHiddenDataAsync(evaluationState, RowRemovalOption.DeleteRow);
         }
 
         // Remove shadow fields

test/Altinn.App.Core.Tests/LayoutExpressions/FullTests/Test2/RunTest2.cs

@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using Altinn.App.Core.Helpers.DataModel;
+using Altinn.App.Core.Helpers;
 using Altinn.App.Core.Internal.Expressions;
 using Altinn.App.Core.Models.Layout;
 using FluentAssertions;
@@ -88,7 +88,7 @@ public async Task RemoveWholeGroup()
         data.Some.Data[0].Binding2.Should().Be(0); // binding is not nullable, but will be reset to zero
         data.Some.Data[1].Binding.Should().Be("binding");
         data.Some.Data[1].Binding2.Should().Be(2);
-        await LayoutEvaluator.RemoveHiddenData(state, RowRemovalOption.DeleteRow);
+        await LayoutEvaluator.RemoveHiddenDataAsync(state, RowRemovalOption.DeleteRow);
 
         // Verify data was removed
         data.Some.Data[0].Binding.Should().BeNull();

test/Altinn.App.Core.Tests/LayoutExpressions/FullTests/Test3/RunTest3.cs

@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using Altinn.App.Core.Helpers.DataModel;
+using Altinn.App.Core.Helpers;
 using Altinn.App.Core.Internal.Expressions;
 using Altinn.App.Core.Models.Layout;
 using FluentAssertions;
@@ -73,7 +73,7 @@ public async Task RemoveRowDataFromGroup()
         data.Some.Data[2].Binding.Should().Be("hideRow");
         data.Some.Data[2].Binding2.Should().Be(3);
         data.Some.Data[2].Binding3.Should().Be("text");
-        await LayoutEvaluator.RemoveHiddenData(state, RowRemovalOption.SetToNull);
+        await LayoutEvaluator.RemoveHiddenDataAsync(state, RowRemovalOption.SetToNull);
 
         // Verify row not deleted but fields null
         data.Some.Data.Should().HaveCount(3);
@@ -142,7 +142,7 @@ public async Task RemoveRowFromGroup()
         data.Some.Data[2].Binding3.Should().Be("text");
 
         // Verify rows deleted
-        await LayoutEvaluator.RemoveHiddenData(state, RowRemovalOption.DeleteRow);
+        await LayoutEvaluator.RemoveHiddenDataAsync(state, RowRemovalOption.DeleteRow);
         data.Some.Data.Should().HaveCount(2);
         data.Some.Data[0].Binding.Should().BeNull();
         data.Some.Data[0].Binding2.Should().Be(0); // binding is not nullable, but will be reset to zero

test/Altinn.App.Core.Tests/LayoutExpressions/TestDataModel.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Altinn.App.Core.Helpers;
 using Altinn.App.Core.Helpers.DataModel;
 using Altinn.App.Core.Tests.LayoutExpressions.TestUtilities;
 using Altinn.Platform.Storage.Interface.Models;