Cleanup

Altinn · Jan 6, 2025 · 73e2f93 · 73e2f93
1 parent c5a6487
commit 73e2f93
Show file tree

Hide file tree

Showing 39 changed files with 25 additions and 16 deletions.
diff --git a/backend/src/Designer/EventHandlers/ComponentIdChanged/ComponentIdChangedLayoutsHandler.cs b/backend/src/Designer/EventHandlers/ComponentIdChanged/ComponentIdChangedLayoutsHandler.cs
@@ -52,7 +52,7 @@ await _fileSyncHandlerExecutor.ExecuteWithExceptionHandlingAndConditionalNotific
                     }
 
                     List<Reference> referencesToUpdate = [new Reference("component", notification.LayoutSetName, notification.OldComponentId, notification.NewComponentId)];
-                    hasChanges = await _appDevelopmentService.UpdateLayoutReferences(notification.EditingContext, referencesToUpdate, cancellationToken);
+                    hasChanges |= await _appDevelopmentService.UpdateLayoutReferences(notification.EditingContext, referencesToUpdate, cancellationToken);
 
                     return hasChanges;
                 });

diff --git a/backend/src/Designer/Services/Implementation/AppDevelopmentService.cs b/backend/src/Designer/Services/Implementation/AppDevelopmentService.cs
@@ -729,20 +729,29 @@ private async Task<bool> UpdateLayoutReferences(AltinnAppGitRepository altinnApp
                                             {
                                                 case "layoutSet":
                                                     updatedReference = updatedLayoutsSets.FirstOrDefault(item => item.Type == type && item.Id == layoutSetId);
+                                                    if (updatedReference != null)
+                                                    {
+                                                        target["taskId"] = updatedReference.NewId;
+                                                        hasLayoutChanges = true;
+                                                    }
                                                     break;
                                                 case "page":
                                                     updatedReference = updatedLayouts.FirstOrDefault(item => item.Type == type && item.LayoutSetName == layoutSetId && item.Id == id);
+                                                    if (updatedReference != null)
+                                                    {
+                                                        target["id"] = updatedReference.NewId;
+                                                        hasLayoutChanges = true;
+                                                    }
                                                     break;
                                                 case "component":
                                                     updatedReference = updatedComponents.FirstOrDefault(item => item.Type == type && item.LayoutSetName == layoutSetId && item.Id == id);
+                                                    if (updatedReference != null)
+                                                    {
+                                                        target["id"] = updatedReference.NewId;
+                                                        hasLayoutChanges = true;
+                                                    }
                                                     break;
                                             }
-
-                                            if (updatedReference != null)
-                                            {
-                                                target["taskId"] = updatedReference.NewId;
-                                                hasLayoutChanges = true;
-                                            }
                                         }
 
                                         if (component["overrides"] is JsonArray overrideList)

diff --git a/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/DeleteFormLayoutTests.cs b/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/DeleteFormLayoutTests.cs
@@ -60,9 +60,9 @@ public async Task DeleteFormLayout_NonExistingFile_Should_AndReturnNotFound(stri
 
         [Theory]
         [InlineData("ttd", "testUser", "layout", "Side2")]
-        public async Task DeleteFormLayout_DeletesAssociatedSummaryComponents_ReturnsOk(string org, string developer, string layoutSetName, string layoutName)
+        public async Task DeleteFormLayout_DeletesAssociatedSummary2Components_ReturnsOk(string org, string developer, string layoutSetName, string layoutName)
         {
-            string actualApp = "deleted-component-before-delete";
+            string actualApp = "app-with-summary2-components";
             string app = TestDataHelper.GenerateTestRepoName();
             await CopyRepositoryForTest(org, actualApp, developer, app);
 
@@ -72,7 +72,7 @@ public async Task DeleteFormLayout_DeletesAssociatedSummaryComponents_ReturnsOk(
             using var response = await HttpClient.SendAsync(httpRequestMessage);
             response.StatusCode.Should().Be(HttpStatusCode.OK);
 
-            string expectedApp = "deleted-component-after-delete";
+            string expectedApp = "app-with-summary2-components-after-deleting-references";
 
             string[] layoutPaths = [
                 "layout/layouts/Side1.json",

diff --git a/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/DeleteLayoutSetTests.cs b/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/DeleteLayoutSetTests.cs
@@ -162,9 +162,9 @@ public async Task DeleteLayoutSet_RemovesComponentsReferencingLayoutSet(string o
 
         [Theory]
         [InlineData("ttd", "testUser", "layoutSet")]
-        public async Task DeleteLayoutSet_DeletesAssociatedSummaryComponents_ReturnsOk(string org, string developer, string layoutSetName)
+        public async Task DeleteLayoutSet_DeletesAssociatedSummary2Components_ReturnsOk(string org, string developer, string layoutSetName)
         {
-            string actualApp = "deleted-component-before-delete";
+            string actualApp = "app-with-summary2-components";
             string app = TestDataHelper.GenerateTestRepoName();
             await CopyRepositoryForTest(org, actualApp, developer, app);
 
@@ -174,7 +174,7 @@ public async Task DeleteLayoutSet_DeletesAssociatedSummaryComponents_ReturnsOk(s
             using var response = await HttpClient.SendAsync(httpRequestMessage);
             response.StatusCode.Should().Be(HttpStatusCode.OK, await response.Content.ReadAsStringAsync());
 
-            string expectedApp = "deleted-component-after-delete";
+            string expectedApp = "app-with-summary2-components-after-deleting-references";
 
             string[] layoutPaths = [
                 "layoutSet/layouts/Side1.json",

diff --git a/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/SaveFormLayoutTests.cs b/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/SaveFormLayoutTests.cs
@@ -96,9 +96,9 @@ public async Task SaveFormLayoutWithComponentIdsChange_ReturnsOk(string org, str
 
         [Theory]
         [InlineData("ttd", "testUser", "component", "Side2", "Input-Om7N3y")]
-        public async Task SaveFormLayoutWithDeletedComponent_DeletesAssociatedSummaryComponents_ReturnsOk(string org, string developer, string layoutSetName, string layoutName, string componentId)
+        public async Task SaveFormLayoutWithDeletedComponent_DeletesAssociatedSummary2Components_ReturnsOk(string org, string developer, string layoutSetName, string layoutName, string componentId)
         {
-            string actualApp = "deleted-component-before-delete";
+            string actualApp = "app-with-summary2-components";
             string app = TestDataHelper.GenerateTestRepoName();
             await CopyRepositoryForTest(org, actualApp, developer, app);
 
@@ -121,7 +121,7 @@ public async Task SaveFormLayoutWithDeletedComponent_DeletesAssociatedSummaryCom
             HttpResponseMessage response = await SendHttpRequest(url, payload);
             response.StatusCode.Should().Be(HttpStatusCode.OK);
 
-            string expectedApp = "deleted-component-after-delete";
+            string expectedApp = "app-with-summary2-components-after-deleting-references";
 
             string[] layoutPaths = [
                 "component/layouts/Side1.json",

diff --git a/...ter-delete/App/ui/component/Settings.json → ...references/App/ui/component/Settings.json b/...ter-delete/App/ui/component/Settings.json → ...references/App/ui/component/Settings.json
diff --git a/...elete/App/ui/component/layouts/Side1.json → ...ences/App/ui/component/layouts/Side1.json b/...elete/App/ui/component/layouts/Side1.json → ...ences/App/ui/component/layouts/Side1.json
diff --git a/...elete/App/ui/component/layouts/Side2.json → ...ences/App/ui/component/layouts/Side2.json b/...elete/App/ui/component/layouts/Side2.json → ...ences/App/ui/component/layouts/Side2.json
diff --git a/...er-delete/App/ui/component2/Settings.json → ...eferences/App/ui/component2/Settings.json b/...er-delete/App/ui/component2/Settings.json → ...eferences/App/ui/component2/Settings.json
diff --git a/...lete/App/ui/component2/layouts/Side1.json → ...nces/App/ui/component2/layouts/Side1.json b/...lete/App/ui/component2/layouts/Side1.json → ...nces/App/ui/component2/layouts/Side1.json
diff --git a/...lete/App/ui/component2/layouts/Side2.json → ...nces/App/ui/component2/layouts/Side2.json b/...lete/App/ui/component2/layouts/Side2.json → ...nces/App/ui/component2/layouts/Side2.json
diff --git a/...nent-after-delete/App/ui/layout-sets.json → ...leting-references/App/ui/layout-sets.json b/...nent-after-delete/App/ui/layout-sets.json → ...leting-references/App/ui/layout-sets.json
diff --git a/...-after-delete/App/ui/layout/Settings.json → ...ng-references/App/ui/layout/Settings.json b/...-after-delete/App/ui/layout/Settings.json → ...ng-references/App/ui/layout/Settings.json
diff --git a/...r-delete/App/ui/layout/layouts/Side1.json → ...ferences/App/ui/layout/layouts/Side1.json b/...r-delete/App/ui/layout/layouts/Side1.json → ...ferences/App/ui/layout/layouts/Side1.json
diff --git a/...after-delete/App/ui/layout2/Settings.json → ...g-references/App/ui/layout2/Settings.json b/...after-delete/App/ui/layout2/Settings.json → ...g-references/App/ui/layout2/Settings.json
diff --git a/...-delete/App/ui/layout2/layouts/Side1.json → ...erences/App/ui/layout2/layouts/Side1.json b/...-delete/App/ui/layout2/layouts/Side1.json → ...erences/App/ui/layout2/layouts/Side1.json
diff --git a/...-delete/App/ui/layout2/layouts/Side2.json → ...erences/App/ui/layout2/layouts/Side2.json b/...-delete/App/ui/layout2/layouts/Side2.json → ...erences/App/ui/layout2/layouts/Side2.json
diff --git a/...er-delete/App/ui/layoutSet2/Settings.json → ...eferences/App/ui/layoutSet2/Settings.json b/...er-delete/App/ui/layoutSet2/Settings.json → ...eferences/App/ui/layoutSet2/Settings.json
diff --git a/...lete/App/ui/layoutSet2/layouts/Side1.json → ...nces/App/ui/layoutSet2/layouts/Side1.json b/...lete/App/ui/layoutSet2/layouts/Side1.json → ...nces/App/ui/layoutSet2/layouts/Side1.json
diff --git a/...lete/App/ui/layoutSet2/layouts/Side2.json → ...nces/App/ui/layoutSet2/layouts/Side2.json b/...lete/App/ui/layoutSet2/layouts/Side2.json → ...nces/App/ui/layoutSet2/layouts/Side2.json
diff --git a/...ore-delete/App/ui/component/Settings.json → ...components/App/ui/component/Settings.json b/...ore-delete/App/ui/component/Settings.json → ...components/App/ui/component/Settings.json
diff --git a/...elete/App/ui/component/layouts/Side1.json → ...nents/App/ui/component/layouts/Side1.json b/...elete/App/ui/component/layouts/Side1.json → ...nents/App/ui/component/layouts/Side1.json
diff --git a/...elete/App/ui/component/layouts/Side2.json → ...nents/App/ui/component/layouts/Side2.json b/...elete/App/ui/component/layouts/Side2.json → ...nents/App/ui/component/layouts/Side2.json
diff --git a/...re-delete/App/ui/component2/Settings.json → ...omponents/App/ui/component2/Settings.json b/...re-delete/App/ui/component2/Settings.json → ...omponents/App/ui/component2/Settings.json
diff --git a/...lete/App/ui/component2/layouts/Side1.json → ...ents/App/ui/component2/layouts/Side1.json b/...lete/App/ui/component2/layouts/Side1.json → ...ents/App/ui/component2/layouts/Side1.json
diff --git a/...lete/App/ui/component2/layouts/Side2.json → ...ents/App/ui/component2/layouts/Side2.json b/...lete/App/ui/component2/layouts/Side2.json → ...ents/App/ui/component2/layouts/Side2.json
diff --git a/...ent-before-delete/App/ui/layout-sets.json → ...mmary2-components/App/ui/layout-sets.json b/...ent-before-delete/App/ui/layout-sets.json → ...mmary2-components/App/ui/layout-sets.json
diff --git a/...before-delete/App/ui/layout/Settings.json → ...y2-components/App/ui/layout/Settings.json b/...before-delete/App/ui/layout/Settings.json → ...y2-components/App/ui/layout/Settings.json
diff --git a/...e-delete/App/ui/layout/layouts/Side1.json → ...mponents/App/ui/layout/layouts/Side1.json b/...e-delete/App/ui/layout/layouts/Side1.json → ...mponents/App/ui/layout/layouts/Side1.json
diff --git a/...e-delete/App/ui/layout/layouts/Side2.json → ...mponents/App/ui/layout/layouts/Side2.json b/...e-delete/App/ui/layout/layouts/Side2.json → ...mponents/App/ui/layout/layouts/Side2.json
diff --git a/...efore-delete/App/ui/layout2/Settings.json → ...2-components/App/ui/layout2/Settings.json b/...efore-delete/App/ui/layout2/Settings.json → ...2-components/App/ui/layout2/Settings.json
diff --git a/...-delete/App/ui/layout2/layouts/Side1.json → ...ponents/App/ui/layout2/layouts/Side1.json b/...-delete/App/ui/layout2/layouts/Side1.json → ...ponents/App/ui/layout2/layouts/Side1.json
diff --git a/...-delete/App/ui/layout2/layouts/Side2.json → ...ponents/App/ui/layout2/layouts/Side2.json b/...-delete/App/ui/layout2/layouts/Side2.json → ...ponents/App/ui/layout2/layouts/Side2.json
diff --git a/...ore-delete/App/ui/layoutSet/Settings.json → ...components/App/ui/layoutSet/Settings.json b/...ore-delete/App/ui/layoutSet/Settings.json → ...components/App/ui/layoutSet/Settings.json
diff --git a/...elete/App/ui/layoutSet/layouts/Side1.json → ...nents/App/ui/layoutSet/layouts/Side1.json b/...elete/App/ui/layoutSet/layouts/Side1.json → ...nents/App/ui/layoutSet/layouts/Side1.json
diff --git a/...elete/App/ui/layoutSet/layouts/Side2.json → ...nents/App/ui/layoutSet/layouts/Side2.json b/...elete/App/ui/layoutSet/layouts/Side2.json → ...nents/App/ui/layoutSet/layouts/Side2.json
diff --git a/...re-delete/App/ui/layoutSet2/Settings.json → ...omponents/App/ui/layoutSet2/Settings.json b/...re-delete/App/ui/layoutSet2/Settings.json → ...omponents/App/ui/layoutSet2/Settings.json
diff --git a/...lete/App/ui/layoutSet2/layouts/Side1.json → ...ents/App/ui/layoutSet2/layouts/Side1.json b/...lete/App/ui/layoutSet2/layouts/Side1.json → ...ents/App/ui/layoutSet2/layouts/Side1.json
diff --git a/...lete/App/ui/layoutSet2/layouts/Side2.json → ...ents/App/ui/layoutSet2/layouts/Side2.json b/...lete/App/ui/layoutSet2/layouts/Side2.json → ...ents/App/ui/layoutSet2/layouts/Side2.json