Merge branch 'main' into split-app-contnet-library

backend/src/Designer/Controllers/AppDevelopmentController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.Json.Nodes;
 using System.Threading;
 using System.Threading.Tasks;
@@ -9,7 +10,6 @@
 using Altinn.Studio.Designer.Events;
 using Altinn.Studio.Designer.Filters;
 using Altinn.Studio.Designer.Helpers;
-using Altinn.Studio.Designer.Infrastructure.GitRepository;
 using Altinn.Studio.Designer.Models;
 using Altinn.Studio.Designer.Models.Dto;
 using Altinn.Studio.Designer.Services.Interfaces;
@@ -32,7 +32,6 @@ public class AppDevelopmentController : Controller
         private readonly IAppDevelopmentService _appDevelopmentService;
         private readonly IRepository _repository;
         private readonly ISourceControl _sourceControl;
-        private readonly IAltinnGitRepositoryFactory _altinnGitRepositoryFactory;
         private readonly ApplicationInsightsSettings _applicationInsightsSettings;
         private readonly IMediator _mediator;
 
@@ -43,15 +42,13 @@ public class AppDevelopmentController : Controller
         /// <param name="appDevelopmentService">The app development service</param>
         /// <param name="repositoryService">The application repository service</param>
         /// <param name="sourceControl">The source control service.</param>
-        /// <param name="altinnGitRepositoryFactory"></param>
         /// <param name="applicationInsightsSettings">An <see cref="ApplicationInsightsSettings"/></param>
         /// <param name="mediator"></param>
-        public AppDevelopmentController(IAppDevelopmentService appDevelopmentService, IRepository repositoryService, ISourceControl sourceControl, IAltinnGitRepositoryFactory altinnGitRepositoryFactory, ApplicationInsightsSettings applicationInsightsSettings, IMediator mediator)
+        public AppDevelopmentController(IAppDevelopmentService appDevelopmentService, IRepository repositoryService, ISourceControl sourceControl, ApplicationInsightsSettings applicationInsightsSettings, IMediator mediator)
         {
             _appDevelopmentService = appDevelopmentService;
             _repository = repositoryService;
             _sourceControl = sourceControl;
-            _altinnGitRepositoryFactory = altinnGitRepositoryFactory;
             _applicationInsightsSettings = applicationInsightsSettings;
             _mediator = mediator;
         }
@@ -123,8 +120,17 @@ public async Task<ActionResult> SaveFormLayout(string org, string app, [FromQuer
 
                 if (formLayoutPayload.ComponentIdsChange is not null && !string.IsNullOrEmpty(layoutSetName))
                 {
-                    foreach (var componentIdChange in formLayoutPayload.ComponentIdsChange)
+                    foreach (var componentIdChange in formLayoutPayload.ComponentIdsChange.Where((componentIdChange) => componentIdChange.OldComponentId != componentIdChange.NewComponentId))
                     {
+                        if (componentIdChange.NewComponentId == null)
+                        {
+                            await _mediator.Publish(new ComponentDeletedEvent
+                            {
+                                ComponentId = componentIdChange.OldComponentId,
+                                LayoutSetName = layoutSetName,
+                                EditingContext = editingContext
+                            }, cancellationToken);
+                        }
                         await _mediator.Publish(new ComponentIdChangedEvent
                         {
                             OldComponentId = componentIdChange.OldComponentId,
@@ -159,16 +165,26 @@ await _mediator.Publish(new LayoutPageAddedEvent
         /// <param name="app">Application identifier which is unique within an organisation.</param>
         /// <param name="layoutSetName">The name of the layout set the specific layout belongs to</param>
         /// <param name="layoutName">The form layout to be deleted</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
         /// <returns>A success message if the save was successful</returns>
         [HttpDelete]
         [Route("form-layout/{layoutName}")]
-        public ActionResult DeleteFormLayout(string org, string app, [FromQuery] string layoutSetName, [FromRoute] string layoutName)
+        public async Task<ActionResult> DeleteFormLayout(string org, string app, [FromQuery] string layoutSetName, [FromRoute] string layoutName, CancellationToken cancellationToken)
         {
             try
             {
                 string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
                 var editingContext = AltinnRepoEditingContext.FromOrgRepoDeveloper(org, app, developer);
+
+                await _mediator.Publish(new LayoutPageDeletedEvent
+                {
+                    EditingContext = editingContext,
+                    LayoutSetName = layoutSetName,
+                    LayoutName = layoutName,
+                }, cancellationToken);
+
                 _appDevelopmentService.DeleteFormLayout(editingContext, layoutSetName, layoutName);
+
                 return Ok();
             }
             catch (FileNotFoundException exception)
@@ -402,13 +418,15 @@ public async Task<ActionResult> DeleteLayoutSet(string org, string app, [FromRou
         {
             string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
             var editingContext = AltinnRepoEditingContext.FromOrgRepoDeveloper(org, app, developer);
-            LayoutSets layoutSets = await _appDevelopmentService.DeleteLayoutSet(editingContext, layoutSetIdToUpdate, cancellationToken);
 
             await _mediator.Publish(new LayoutSetDeletedEvent
             {
                 EditingContext = editingContext,
-                LayoutSetId = layoutSetIdToUpdate
+                LayoutSetName = layoutSetIdToUpdate
             }, cancellationToken);
+
+            LayoutSets layoutSets = await _appDevelopmentService.DeleteLayoutSet(editingContext, layoutSetIdToUpdate, cancellationToken);
+
             return Ok(layoutSets);
         }
 
@@ -543,20 +561,6 @@ public ActionResult GetWidgetSettings(string org, string app)
             return Ok(widgetSettings);
         }
 
-        [HttpGet]
-        [Route("option-list-ids")]
-        public ActionResult GetOptionListIds(string org, string app)
-        {
-            string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
-            AltinnAppGitRepository altinnAppGitRepository = _altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, app, developer);
-            string[] optionListIds = altinnAppGitRepository.GetOptionsListIds();
-            if (optionListIds.Length == 0)
-            {
-                return NoContent();
-            }
-            return Ok(optionListIds);
-        }
-
         [HttpGet("app-version")]
         public VersionResponse GetAppVersion(string org, string app)
         {

backend/src/Designer/Controllers/ResourceAdminController.cs

@@ -487,7 +487,7 @@ public async Task<ActionResult<List<AvailableService>>> GetAltinn2LinkServices(s
                 foreach (ServiceResource resource in allResources)
                 {
                     if (resource?.HasCompetentAuthority.Orgcode != null
-                        && resource.ResourceReferences != null && resource.ResourceReferences.Exists(r => r.ReferenceType != null && r.ReferenceType.Equals(ReferenceType.ServiceCode))
+                        && resource.ResourceReferences != null && resource.ResourceReferences.Exists(r => r.ReferenceType != null && r.ReferenceType.Equals(ResourceReferenceType.ServiceCode))
                         && resource.ResourceType == ResourceType.Altinn2Service)
                     {
                         AvailableService service = new AvailableService();
@@ -496,8 +496,8 @@ public async Task<ActionResult<List<AvailableService>>> GetAltinn2LinkServices(s
                             service.ServiceName = resource.Title["nb"];
                         }
 
-                        service.ExternalServiceCode = resource.ResourceReferences.First(r => r.ReferenceType.Equals(ReferenceType.ServiceCode)).Reference;
-                        service.ExternalServiceEditionCode = Convert.ToInt32(resource.ResourceReferences.First(r => r.ReferenceType.Equals(ReferenceType.ServiceEditionCode)).Reference);
+                        service.ExternalServiceCode = resource.ResourceReferences.First(r => r.ReferenceType.Equals(ResourceReferenceType.ServiceCode)).Reference;
+                        service.ExternalServiceEditionCode = Convert.ToInt32(resource.ResourceReferences.First(r => r.ReferenceType.Equals(ResourceReferenceType.ServiceEditionCode)).Reference);
                         service.ServiceOwnerCode = resource.HasCompetentAuthority.Orgcode;
                         unfiltered.Add(service);
                     }
@@ -551,7 +551,7 @@ private ValidationProblemDetails ValidateResource(ServiceResource resource)
 
             if (resource.ResourceType == ResourceType.MaskinportenSchema)
             {
-                if (resource.ResourceReferences == null || !resource.ResourceReferences.Any((x) => x.ReferenceType == ReferenceType.MaskinportenScope))
+                if (resource.ResourceReferences == null || !resource.ResourceReferences.Any((x) => x.ReferenceType == ResourceReferenceType.MaskinportenScope))
                 {
                     ModelState.AddModelError($"{resource.Identifier}.resourceReferences", "resourceerror.missingmaskinportenscope");
                 }

backend/src/Designer/Enums/ReferenceType.cs

@@ -1,31 +1,9 @@
-using System.Runtime.Serialization;
-
 namespace Altinn.Studio.Designer.Enums
 {
-    /// <summary>
-    /// Enum for reference types of resources in the resource registry
-    /// </summary>
     public enum ReferenceType
     {
-        [EnumMember(Value = "Default")]
-        Default = 0,
-
-        [EnumMember(Value = "Uri")]
-        Uri = 1,
-
-        [EnumMember(Value = "DelegationSchemeId")]
-        DelegationSchemeId = 2,
-
-        [EnumMember(Value = "MaskinportenScope")]
-        MaskinportenScope = 3,
-
-        [EnumMember(Value = "ServiceCode")]
-        ServiceCode = 4,
-
-        [EnumMember(Value = "ServiceEditionCode")]
-        ServiceEditionCode = 5,
-
-        [EnumMember(Value = "ApplicationId")]
-        ApplicationId = 6,
+        LayoutSet,
+        Layout,
+        Component
     }
 }

backend/src/Designer/Enums/ReferenceSource.cs → backend/src/Designer/Enums/ResourceReferenceSource.cs

@@ -5,7 +5,7 @@ namespace Altinn.Studio.Designer.Enums
     /// <summary>
     /// Enum for the different reference sources for resources in the resource registry
     /// </summary>
-    public enum ReferenceSource
+    public enum ResourceReferenceSource
     {
         [EnumMember(Value = "Default")]
         Default = 0,

backend/src/Designer/Enums/ResourceReferenceType.cs

@@ -0,0 +1,31 @@
+using System.Runtime.Serialization;
+
+namespace Altinn.Studio.Designer.Enums
+{
+    /// <summary>
+    /// Enum for reference types of resources in the resource registry
+    /// </summary>
+    public enum ResourceReferenceType
+    {
+        [EnumMember(Value = "Default")]
+        Default = 0,
+
+        [EnumMember(Value = "Uri")]
+        Uri = 1,
+
+        [EnumMember(Value = "DelegationSchemeId")]
+        DelegationSchemeId = 2,
+
+        [EnumMember(Value = "MaskinportenScope")]
+        MaskinportenScope = 3,
+
+        [EnumMember(Value = "ServiceCode")]
+        ServiceCode = 4,
+
+        [EnumMember(Value = "ServiceEditionCode")]
+        ServiceEditionCode = 5,
+
+        [EnumMember(Value = "ApplicationId")]
+        ApplicationId = 6,
+    }
+}

backend/src/Designer/EventHandlers/ComponentDeleted/ComponentDeletedLayoutsHandler.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Enums;
+using Altinn.Studio.Designer.Events;
+using Altinn.Studio.Designer.Hubs.SyncHub;
+using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Services.Interfaces;
+using MediatR;
+
+namespace Altinn.Studio.Designer.EventHandlers.ComponentDeleted;
+
+public class ComponentDeletedLayoutsHandler(IFileSyncHandlerExecutor fileSyncHandlerExecutor, IAppDevelopmentService appDevelopmentService) : INotificationHandler<ComponentDeletedEvent>
+{
+    public async Task Handle(ComponentDeletedEvent notification, CancellationToken cancellationToken)
+    {
+        await fileSyncHandlerExecutor.ExecuteWithExceptionHandlingAndConditionalNotification(
+            notification.EditingContext,
+            SyncErrorCodes.ComponentDeletedLayoutsSyncError,
+            "layouts",
+            async () =>
+            {
+                List<Reference> referencesToDelete = [new Reference(ReferenceType.Component, notification.LayoutSetName, notification.ComponentId)];
+                return await appDevelopmentService.UpdateLayoutReferences(notification.EditingContext, referencesToDelete, cancellationToken);
+            });
+    }
+}

backend/src/Designer/EventHandlers/LayoutPageDeleted/LayoutPageDeletedLayoutsHandler.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Enums;
+using Altinn.Studio.Designer.Events;
+using Altinn.Studio.Designer.Hubs.SyncHub;
+using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Services.Interfaces;
+using MediatR;
+
+namespace Altinn.Studio.Designer.EventHandlers.LayoutPageDeleted;
+
+public class LayoutPageDeletedLayoutsHandler(IFileSyncHandlerExecutor fileSyncHandlerExecutor, IAppDevelopmentService appDevelopmentService) : INotificationHandler<LayoutPageDeletedEvent>
+{
+    public async Task Handle(LayoutPageDeletedEvent notification, CancellationToken cancellationToken)
+    {
+        await fileSyncHandlerExecutor.ExecuteWithExceptionHandlingAndConditionalNotification(
+            notification.EditingContext,
+            SyncErrorCodes.LayoutPageDeletedLayoutsSyncError,
+            "layouts",
+            async () =>
+            {
+                List<Reference> referencesToDelete = [new Reference(ReferenceType.Layout, notification.LayoutSetName, notification.LayoutName)];
+                return await appDevelopmentService.UpdateLayoutReferences(notification.EditingContext, referencesToDelete, cancellationToken);
+            });
+    }
+}

backend/src/Designer/EventHandlers/LayoutSetDeleted/LayoutSetDeletedLayoutsHandler.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Enums;
+using Altinn.Studio.Designer.Events;
+using Altinn.Studio.Designer.Hubs.SyncHub;
+using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Services.Interfaces;
+using MediatR;
+
+namespace Altinn.Studio.Designer.EventHandlers.LayoutSetDeleted;
+
+public class LayoutSetDeletedLayoutsHandler(IFileSyncHandlerExecutor fileSyncHandlerExecutor, IAppDevelopmentService appDevelopmentService) : INotificationHandler<LayoutSetDeletedEvent>
+{
+    public async Task Handle(LayoutSetDeletedEvent notification, CancellationToken cancellationToken)
+    {
+        await fileSyncHandlerExecutor.ExecuteWithExceptionHandlingAndConditionalNotification(
+            notification.EditingContext,
+            SyncErrorCodes.LayoutSetDeletedLayoutsSyncError,
+            "layouts",
+            async () =>
+            {
+                List<Reference> referencesToDelete = [new Reference(ReferenceType.LayoutSet, notification.LayoutSetName, notification.LayoutSetName)];
+                return await appDevelopmentService.UpdateLayoutReferences(notification.EditingContext, referencesToDelete, cancellationToken);
+            });
+    }
+}