Merge branch 'main' into 13364-validation-issues-when-creating-a-new-…

…model

.github/workflows/auto-approve-pr.yaml

@@ -10,7 +10,7 @@ jobs:
     if: github.event.label.name == 'skip-manual-testing'
     steps:
       - name: Checkout PR code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 

.github/workflows/frontend-unit-tests.yml

@@ -85,7 +85,7 @@ jobs:
         run: yarn test:ci
 
       - name: 'Upload coverage reports to Codecov'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

.github/workflows/lint-pr.yaml

@@ -51,6 +51,7 @@ jobs:
             resource-adm
             resource-registry
             settings
+            studio-root
             subform
             testing
             text

.yarnrc.yml

@@ -8,4 +8,4 @@ enableTelemetry: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.2.cjs

README.md

@@ -61,6 +61,8 @@ The development environment consist of several services defined in [compose.yaml
 - `studio-repos` which is [gitea][14] with some custom config. More [here](gitea/README.md).
 - `studio-db` which is a postgres database used by both `studio-designer` and `studio-repos`.
 - `database_migrations` which is a one-time task container designed to perform and complete database migrations before exiting.
+- `redis` which is a redis cache used by designer.
+- `redis-commander` which is a ui for redis cache.
 
 Run all parts of the solution in containers (Make sure docker is running), with docker compose as follows:
 

backend/packagegroups/NuGet.props

@@ -24,7 +24,9 @@
     <PackageReference Update="Microsoft.Azure.Security.KeyVault.Secrets" Version="4.5.0" />
     <PackageReference Update="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
     <PackageReference Update="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.24" />
+    <PackageReference Update="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
     <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.0" />
     <PackageReference Update="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
     <PackageReference Update="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
     <PackageReference Update="HtmlAgilityPack" Version="1.11.67" />
@@ -40,7 +42,6 @@
     <PackageReference Update="DotNetEnv" Version="3.1.1" />
     <PackageReference Update="NuGet.Versioning" Version="6.11.1" />
     <PackageReference Update="DistributedLock.Postgres" Version="1.2.0" />
-    <PackageReference Update="Community.Microsoft.Extensions.Caching.PostgreSql" Version="4.0.6" />
   </ItemGroup>
 
   <ItemGroup Label="Packages used for testing">

backend/src/Designer/Configuration/FeedbackFormSettings.cs

@@ -0,0 +1,23 @@
+using Altinn.Studio.Designer.Configuration.Marker;
+
+namespace Altinn.Studio.Designer.Configuration
+{
+    /// <summary>
+    /// Class representation for basic FeedbackForm configuration
+    /// </summary>
+    public class FeedbackFormSettings : ISettingsMarker
+    {
+        /// <summary>
+        /// Gets or sets the Slack settings
+        /// </summary>
+        public SlackSettings SlackSettings { get; set; }
+    }
+
+    public class SlackSettings
+    {
+        /// <summary>
+        /// Gets or sets the WebhookUrl
+        /// </summary>
+        public string WebhookUrl { get; set; }
+    }
+}

backend/src/Designer/Configuration/RedisCacheSettings.cs

@@ -0,0 +1,10 @@
+using Altinn.Studio.Designer.Configuration.Marker;
+
+namespace Altinn.Studio.Designer.Configuration;
+
+public class RedisCacheSettings : ISettingsMarker
+{
+    public bool UseRedisCache { get; set; } = false;
+    public string ConnectionString { get; set; }
+    public string InstanceName { get; set; }
+}

backend/src/Designer/Controllers/AppDevelopmentController.cs

@@ -334,6 +334,17 @@ public async Task<IActionResult> GetLayoutSets(string org, string app, Cancellat
             return Ok(layoutSets);
         }
 
+        [HttpGet("layout-sets/extended")]
+        [UseSystemTextJson]
+        public async Task<LayoutSetsModel> GetLayoutSetsExtended(string org, string app, CancellationToken cancellationToken)
+        {
+            string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+            var editingContext = AltinnRepoEditingContext.FromOrgRepoDeveloper(org, app, developer);
+
+            LayoutSetsModel layoutSetsModel = await _appDevelopmentService.GetLayoutSetsExtended(editingContext, cancellationToken);
+            return layoutSetsModel;
+        }
+
         /// <summary>
         /// Add a new layout set
         /// </summary>

backend/src/Designer/Controllers/FeedbackFormController.cs

@@ -0,0 +1,75 @@
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Configuration;
+using Altinn.Studio.Designer.Models.Dto;
+using Altinn.Studio.Designer.TypedHttpClients.Slack;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+
+namespace Altinn.Studio.Designer.Controllers;
+
+/// <summary>
+/// Controller containing actions related to feedback form
+/// </summary>
+[Authorize]
+[ApiController]
+[ValidateAntiForgeryToken]
+[Route("designer/api/{org}/{app:regex(^(?!datamodels$)[[a-z]][[a-z0-9-]]{{1,28}}[[a-z0-9]]$)}/feedbackform")]
+public class FeedbackFormController : ControllerBase
+{
+    private readonly ISlackClient _slackClient;
+    private readonly GeneralSettings _generalSettings;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FeedbackFormController"/> class.
+    /// </summary>
+    /// <param name="slackClient">A http client to send messages to slack</param>
+    /// <param name="generalSettings">the general settings</param>
+    public FeedbackFormController(ISlackClient slackClient, GeneralSettings generalSettings)
+    {
+        _slackClient = slackClient;
+        _generalSettings = generalSettings;
+    }
+
+    /// <summary>
+    /// Endpoint for submitting feedback
+    /// </summary>
+    [HttpPost]
+    [Route("submit")]
+    public async Task<IActionResult> SubmitFeedback([FromRoute] string org, [FromRoute] string app, [FromBody] FeedbackForm feedback, CancellationToken cancellationToken)
+    {
+        if (feedback == null)
+        {
+            return BadRequest("Feedback object is null");
+        }
+
+        if (feedback.Answers == null || feedback.Answers.Count == 0)
+        {
+            return BadRequest("Feedback answers are null or empty");
+        }
+
+        if (!feedback.Answers.ContainsKey("org"))
+        {
+            feedback.Answers.Add("org", org);
+        }
+
+        if (!feedback.Answers.ContainsKey("app"))
+        {
+            feedback.Answers.Add("app", app);
+        }
+
+        if (!feedback.Answers.ContainsKey("env"))
+        {
+            feedback.Answers.Add("env", _generalSettings.HostName);
+        }
+
+        await _slackClient.SendMessage(new SlackRequest
+        {
+            Text = JsonSerializer.Serialize(feedback.Answers, new JsonSerializerOptions { WriteIndented = true })
+        }, cancellationToken);
+
+        return Ok();
+    }
+}

backend/src/Designer/Controllers/ProcessModelingController.cs

@@ -48,27 +48,6 @@ public FileStreamResult GetProcessDefinition(string org, string repo)
         }
 
         [HttpPut("process-definition")]
-        [Obsolete("This endpoint should be replaced by process-definition-latest, and url fixed after integration with frontend")]
-        public async Task<IActionResult> SaveProcessDefinition(string org, string repo,
-            CancellationToken cancellationToken)
-        {
-            Request.EnableBuffering();
-            try
-            {
-                await Guard.AssertValidXmlStreamAndRewindAsync(Request.Body);
-            }
-            catch (ArgumentException)
-            {
-                return BadRequest("BPMN file is not valid XML");
-            }
-
-            string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
-            await _processModelingService.SaveProcessDefinitionAsync(
-                AltinnRepoEditingContext.FromOrgRepoDeveloper(org, repo, developer), Request.Body, cancellationToken);
-            return Ok();
-        }
-
-        [HttpPut("process-definition-latest")]
         public async Task<IActionResult> UpsertProcessDefinitionAndNotify(string org, string repo, [FromForm] IFormFile content, [FromForm] string metadata, CancellationToken cancellationToken)
         {
             Request.EnableBuffering();

backend/src/Designer/Controllers/ResourceAdminController.cs

@@ -14,6 +14,7 @@
 using Altinn.Studio.Designer.ModelBinding.Constants;
 using Altinn.Studio.Designer.Models;
 using Altinn.Studio.Designer.Services.Interfaces;
+using Altinn.Studio.Designer.Services.Models;
 using Altinn.Studio.Designer.TypedHttpClients.ResourceRegistryOptions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -34,18 +35,18 @@ public class ResourceAdminController : ControllerBase
         private readonly CacheSettings _cacheSettings;
         private readonly IOrgService _orgService;
         private readonly IResourceRegistry _resourceRegistry;
-        private readonly ResourceRegistryIntegrationSettings _resourceRegistrySettings;
+        private readonly IEnvironmentsService _environmentsService;
 
-        public ResourceAdminController(IGitea gitea, IRepository repository, IResourceRegistryOptions resourceRegistryOptions, IMemoryCache memoryCache, IOptions<CacheSettings> cacheSettings, IOrgService orgService, IOptions<ResourceRegistryIntegrationSettings> resourceRegistryEnvironment, IResourceRegistry resourceRegistry)
+        public ResourceAdminController(IGitea gitea, IRepository repository, IResourceRegistryOptions resourceRegistryOptions, IMemoryCache memoryCache, IOptions<CacheSettings> cacheSettings, IOrgService orgService, IResourceRegistry resourceRegistry, IEnvironmentsService environmentsService)
         {
             _giteaApi = gitea;
             _repository = repository;
             _resourceRegistryOptions = resourceRegistryOptions;
             _memoryCache = memoryCache;
             _cacheSettings = cacheSettings.Value;
             _orgService = orgService;
-            _resourceRegistrySettings = resourceRegistryEnvironment.Value;
             _resourceRegistry = resourceRegistry;
+            _environmentsService = environmentsService;
         }
 
         [HttpPost]
@@ -175,12 +176,14 @@ public async Task<ActionResult<List<ListviewServiceResource>>> GetRepositoryReso
 
             if (includeEnvResources)
             {
-                foreach (string environment in _resourceRegistrySettings.Keys)
+                IEnumerable<string> environments = await GetEnvironmentsForOrg(org);
+                foreach (string environment in environments)
                 {
                     string cacheKey = $"resourcelist_${environment}";
                     if (!_memoryCache.TryGetValue(cacheKey, out List<ServiceResource> environmentResources))
                     {
                         environmentResources = await _resourceRegistry.GetResourceList(environment, false);
+
                         var cacheEntryOptions = new MemoryCacheEntryOptions()
                             .SetPriority(CacheItemPriority.High)
                             .SetAbsoluteExpiration(new TimeSpan(0, _cacheSettings.DataNorgeApiCacheTimeout, 0));
@@ -239,7 +242,8 @@ public async Task<ActionResult<ServiceResourceStatus>> GetPublishStatusById(stri
                 PublishedVersions = []
             };
 
-            foreach (string envir in _resourceRegistrySettings.Keys)
+            IEnumerable<string> environments = await GetEnvironmentsForOrg(org);
+            foreach (string envir in environments)
             {
                 resourceStatus.PublishedVersions.Add(await AddEnvironmentResourceStatus(envir, id));
             }
@@ -643,5 +647,11 @@ private string GetRepositoryName(string org)
         {
             return string.Format("{0}-resources", org);
         }
+
+        private async Task<IEnumerable<string>> GetEnvironmentsForOrg(string org)
+        {
+            IEnumerable<EnvironmentModel> environments = await _environmentsService.GetOrganizationEnvironments(org);
+            return environments.Select(environment => environment.Name == "production" ? "prod" : environment.Name);
+        }
     }
 }

backend/src/Designer/Designer.csproj

@@ -22,7 +22,6 @@
     <PackageReference Include="Altinn.Common.AccessTokenClient" />
     <PackageReference Include="Altinn.Platform.Storage.Interface" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" />
-    <PackageReference Include="Community.Microsoft.Extensions.Caching.PostgreSql" />
     <PackageReference Include="CompilerAttributes" />
     <PackageReference Include="DistributedLock.Postgres" />
     <PackageReference Include="DotNetEnv" />
@@ -38,6 +37,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" />
     <PackageReference Include="Microsoft.Azure.KeyVault" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
@@ -46,6 +46,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" />
     <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" />

backend/src/Designer/Infrastructure/GitRepository/AltinnAppGitRepository.cs

@@ -8,6 +8,8 @@
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Xml.Serialization;
+using Altinn.App.Core.Internal.Process.Elements;
 using Altinn.Studio.Designer.Configuration;
 using Altinn.Studio.Designer.Exceptions.AppDevelopment;
 using Altinn.Studio.Designer.Helpers;
@@ -804,6 +806,13 @@ public Stream GetProcessDefinitionFile()
             return OpenStreamByRelativePath(ProcessDefinitionFilePath);
         }
 
+        public Definitions GetDefinitions()
+        {
+            Stream processDefinitionStream = GetProcessDefinitionFile();
+            XmlSerializer serializer = new(typeof(Definitions));
+            return (Definitions)serializer.Deserialize(processDefinitionStream);
+        }
+
         /// <summary>
         /// Checks if image already exists in wwwroot
         /// </summary>

backend/src/Designer/Middleware/UserRequestSynchronization/Services/RequestSyncEvaluators/EndpointNameSyncEvaluator.cs

@@ -51,7 +51,9 @@ public class EndpointNameSyncEvaluator : IRequestSyncEvaluator
             nameof(ProcessModelingController).Replace(RemoveControllerSuffix, string.Empty),
             GenerateFrozenSet(
                 nameof(ProcessModelingController.AddDataTypeToApplicationMetadata),
-                nameof(ProcessModelingController.DeleteDataTypeFromApplicationMetadata)
+                nameof(ProcessModelingController.DeleteDataTypeFromApplicationMetadata),
+                nameof(ProcessModelingController.UpsertProcessDefinitionAndNotify),
+                nameof(ProcessModelingController.SaveProcessDefinitionFromTemplate)
             )
         },
         {

backend/src/Designer/Migrations/20241111093515_DistributedCacheTable.cs

@@ -11,14 +11,14 @@ public partial class DistributedCacheTable : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Up/01-setup-distributedcache-table.sql"));
-            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Up/02-setup-grants.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Create/01-setup-distributedcache-table.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Create/02-setup-grants.sql"));
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Down/01-drop-distributedcache-table.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Drop/01-drop-distributedcache-table.sql"));
         }
     }
 }