feat: Proof of concept for content library on organisation level

backend/src/Designer/Controllers/Organisation/OrgCodeListController.cs

@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Helpers;
+using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Models.Dto;
+using Altinn.Studio.Designer.Services.Interfaces;
+using Altinn.Studio.Designer.Services.Interfaces.Organisation;
+using LibGit2Sharp;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Altinn.Studio.Designer.Controllers.Organisation;
+
+/// <summary>
+/// Controller containing actions related to code lists on organisation level.
+/// </summary>
+[ApiController]
+[Authorize]
+[Route("designer/api/{org}/code-lists")]
+public class OrgCodeListController : ControllerBase
+{
+    private readonly IOrgCodeListService _orgCodeListService;
+    private readonly ISourceControl _sourceControl;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OrgCodeListController"/> class.
+    /// </summary>
+    /// <param name="orgCodeListService">The CodeList service for organisation level</param>
+    /// <param name="sourceControl">The source control service.</param>
+    public OrgCodeListController(IOrgCodeListService orgCodeListService, ISourceControl sourceControl)
+    {
+        _orgCodeListService = orgCodeListService;
+        _sourceControl = sourceControl;
+    }
+
+    /// <summary>
+    /// Fetches the contents of all the code lists belonging to the organisation.
+    /// </summary>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    /// <returns>List of <see cref="OptionListData" /> objects with all code lists belonging to the organisation with data
+    /// set if code list is valid, or hasError set if code list is invalid.</returns>
+    [HttpGet]
+    public async Task<ActionResult<List<OptionListData>>> GetCodeLists(string org, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await _sourceControl.VerifyCloneExists(org, $"{org}-content");
+            string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+
+            List<OptionListData> codeLists = await _orgCodeListService.GetCodeLists(org, developer, cancellationToken);
+
+            return Ok(codeLists);
+        }
+        catch (NotFoundException)
+        {
+            return NoContent();
+        }
+    }
+
+    /// <summary>
+    /// Creates or overwrites a code list.
+    /// </summary>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="codeListId">Name of the code list.</param>
+    /// <param name="codeList">Contents of the code list.</param>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    [HttpPost]
+    [Produces("application/json")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [Route("{codeListId}")]
+    public async Task<ActionResult<List<OptionListData>>> CreateCodeList(string org, [FromRoute] string codeListId, [FromBody] List<Option> codeList, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+
+        List<OptionListData> codeLists = await _orgCodeListService.CreateCodeList(org, developer, codeListId, codeList, cancellationToken);
+
+        return Ok(codeLists);
+    }
+
+    /// <summary>
+    /// Creates or overwrites a code list.
+    /// </summary>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="codeListId">Name of the code list.</param>
+    /// <param name="codeList">Contents of the code list.</param>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    [HttpPut]
+    [Produces("application/json")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [Route("{codeListId}")]
+    public async Task<ActionResult<List<OptionListData>>> UpdateCodeList(string org, [FromRoute] string codeListId, [FromBody] List<Option> codeList, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+
+        List<OptionListData> codeLists = await _orgCodeListService.UpdateCodeList(org, developer, codeListId, codeList, cancellationToken);
+
+        return Ok(codeLists);
+    }
+
+    /// <summary>
+    /// Create new code list.
+    /// </summary>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="file">File being uploaded.</param>
+    /// <param name="cancellationToken"><see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    [HttpPost]
+    [Route("upload")]
+    public async Task<ActionResult<List<OptionListData>>> UploadCodeList(string org, [FromForm] IFormFile file, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+
+        try
+        {
+            List<OptionListData> codeLists = await _orgCodeListService.UploadCodeList(org, developer, file, cancellationToken);
+            return Ok(codeLists);
+        }
+        catch (JsonException e)
+        {
+            return BadRequest(e.Message);
+        }
+    }
+
+    /// <summary>
+    /// Deletes a code list.
+    /// </summary>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="codeListId">Name of the code list.</param>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    [HttpDelete]
+    [Produces("application/json")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [Route("{codeListId}")]
+    public async Task<ActionResult<List<OptionListData>>> DeleteCodeList(string org, [FromRoute] string codeListId, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+
+        bool codeListExists = await _orgCodeListService.CodeListExists(org, developer, codeListId, cancellationToken);
+        if (!codeListExists)
+        {
+            return NotFound($"The code list file {codeListId}.json does not exist.");
+        }
+
+        List<OptionListData> codeLists = await _orgCodeListService.DeleteCodeList(org, developer, codeListId, cancellationToken);
+        return Ok(codeLists);
+    }
+}

backend/src/Designer/Controllers/Organisation/OrgTextController.cs

@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Helpers;
+using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Services.Interfaces.Organisation;
+using LibGit2Sharp;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Altinn.Studio.Designer.Controllers.Organisation;
+
+/// <summary>
+/// Controller for text resources on organisation level
+/// </summary>
+[ApiController]
+[Authorize]
+[Route("designer/api/{org}/text")]
+public class OrgTextController : ControllerBase
+{
+    private readonly IOrgTextsService _orgTextsService;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OrgTextController"/> class.
+    /// </summary>
+    /// <param name="orgTextsService">The texts service.</param>
+    public OrgTextController(IOrgTextsService orgTextsService)
+    {
+        _orgTextsService = orgTextsService;
+    }
+
+    /// <summary>
+    /// Returns a JSON resource file for the given language code
+    /// </summary>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="languageCode">The resource language id (for example <code>nb, en</code>)</param>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    /// <returns>The JSON config</returns>
+    [HttpGet]
+    [Route("language/{languageCode}")]
+    public async Task<ActionResult<TextResource>> GetResources(string org, string languageCode, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+        try
+        {
+            TextResource textResource = await _orgTextsService.GetText(org, developer, languageCode, cancellationToken);
+            return Ok(textResource);
+        }
+        catch (NotFoundException)
+        {
+            return NotFound($"Text resource, resource.{languageCode}.json, could not be found.");
+        }
+
+    }
+
+    /// <summary>
+    /// Save a resource file
+    /// </summary>
+    /// <param name="jsonData">The JSON Data</param>
+    /// <param name="languageCode">The resource language id (for example <code>nb, en</code> )</param>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    /// <returns>The updated resource file</returns>
+    [HttpPost]
+    [Route("language/{languageCode}")]
+    public async Task<ActionResult<TextResource>> CreateResource([FromBody] TextResource jsonData, string languageCode, string org, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+
+        try
+        {
+            await _orgTextsService.SaveText(org, developer, jsonData, languageCode, cancellationToken);
+            TextResource textResource = await _orgTextsService.GetText(org, developer, languageCode, cancellationToken);
+            return Ok(textResource);
+        }
+        catch (ArgumentException e)
+        {
+            return BadRequest(e.Message);
+        }
+    }
+
+    /// <summary>
+    /// Method to update multiple texts for given keys and a given
+    /// language in the text resource files.
+    /// Non-existing keys will be added.
+    /// </summary>
+    /// <param name="org">Unique identifier of the organisation.</param>
+    /// <param name="keysTexts">List of Key/Value pairs that should be updated or added if not present.</param>
+    /// <param name="languageCode">The languageCode for the text resource file that is being edited.</param>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
+    /// <returns>The updated resource file</returns>
+    [HttpPut]
+    [Route("language/{languageCode}")]
+    public async Task<ActionResult<TextResource>> UpdateResource(string org, [FromBody] Dictionary<string, string> keysTexts, string languageCode, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
+
+        try
+        {
+            await _orgTextsService.UpdateTextsForKeys(org, developer, keysTexts, languageCode, cancellationToken);
+            TextResource textResource = await _orgTextsService.GetText(org, developer, languageCode, cancellationToken);
+            return Ok(textResource);
+        }
+        catch (ArgumentException exception)
+        {
+            return BadRequest(exception.Message);
+        }
+        catch (NotFoundException)
+        {
+            return BadRequest($"The text resource, resource.{languageCode}.json, could not be updated.");
+        }
+    }
+}

backend/src/Designer/Controllers/Preview/InstancesController.cs

@@ -30,6 +30,8 @@ public class InstancesController(IHttpContextAccessor httpContextAccessor,
     IApplicationMetadataService applicationMetadataService
 ) : Controller
 {
+    private const string OptionsFolderPath = "App/options/";
+
     // <summary>
     // Redirect requests from older versions of Studio to old controller
     // </summary>
@@ -188,7 +190,7 @@ CancellationToken cancellationToken
             // TODO: Need code to get dynamic options list based on language and source?
             string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
             AltinnAppGitRepository altinnAppGitRepository = altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, app, developer);
-            string options = await altinnAppGitRepository.GetOptionsList(optionListId, cancellationToken);
+            string options = await altinnAppGitRepository.GetOptionsList(optionListId, OptionsFolderPath, cancellationToken);
             return Ok(options);
         }
         catch (NotFoundException)

backend/src/Designer/Controllers/Preview/V3/OldInstancesController.cs

@@ -27,6 +27,8 @@ public class OldInstancesController(IHttpContextAccessor httpContextAccessor,
     IAltinnGitRepositoryFactory altinnGitRepositoryFactory
 ) : Controller
 {
+    private const string OptionsFolderPath = "App/options/";
+
     /// <summary>
     /// Get instance data
     /// </summary>
@@ -183,7 +185,7 @@ CancellationToken cancellationToken
             // TODO: Need code to get dynamic options list based on language and source?
             string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
             AltinnAppGitRepository altinnAppGitRepository = altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, app, developer);
-            string options = await altinnAppGitRepository.GetOptionsList(optionListId, cancellationToken);
+            string options = await altinnAppGitRepository.GetOptionsList(optionListId, OptionsFolderPath, cancellationToken);
             return Ok(options);
         }
         catch (NotFoundException)

backend/src/Designer/Controllers/PreviewController.cs

@@ -62,6 +62,7 @@ public class PreviewController(IHttpContextAccessor httpContextAccessor,
 
         // This value will be overridden to act as the task number for apps that use layout sets
         private const int PartyId = 51001;
+        private const string OptionsFolderPath = "App/options/";
 
         /// <summary>
         /// Default action for the preview.
@@ -627,7 +628,7 @@ public async Task<ActionResult<string>> GetOptions(string org, string app, strin
             {
                 string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
                 AltinnAppGitRepository altinnAppGitRepository = _altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, app, developer);
-                string options = await altinnAppGitRepository.GetOptionsList(optionListId, cancellationToken);
+                string options = await altinnAppGitRepository.GetOptionsList(optionListId, OptionsFolderPath, cancellationToken);
                 return Ok(options);
             }
             catch (NotFoundException)

backend/src/Designer/Factories/AltinnGitRepositoryFactory.cs

@@ -62,5 +62,15 @@ public string GetRepositoryPath(string org, string repository, string developer)
             string[] paths = { _repositoriesRootDirectory, developer.AsFileName(), org.AsFileName(), repository.AsFileName() };
             return Path.Combine(paths);
         }
+
+        /// <summary>
+        /// Creates an instance of <see cref="AltinnOrgGitRepository"/>
+        /// </summary>
+        /// <returns><see cref="AltinnOrgGitRepository"/></returns>
+        public AltinnOrgGitRepository GetAltinnOrgGitRepository(string org, string repository, string developer)
+        {
+            var repositoryDirectory = GetRepositoryPath(org, repository, developer);
+            return new AltinnOrgGitRepository(org, repository, developer, _repositoriesRootDirectory, repositoryDirectory);
+        }
     }
 }

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

@@ -87,7 +87,7 @@ public class AltinnAppGitRepository : AltinnGitRepository
         };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AltinnGitRepository"/> class.
+        /// Initializes a new instance of the <see cref="AltinnAppGitRepository"/> class.
         /// </summary>
         /// <param name="org">Organization owning the repository identified by it's short name.</param>
         /// <param name="repository">Repository name to search for schema files.</param>
@@ -606,7 +606,7 @@ public List<RefToOptionListSpecifier> FindOptionListReferencesInLayout(
             string layoutName
         )
         {
-            var optionListIds = GetOptionsListIds();
+            var optionListIds = GetOptionsListIds(OptionsFolderPath);
             var layoutArray = layout["data"]?["layout"] as JsonArray;
             if (layoutArray == null)
             {
@@ -995,9 +995,9 @@ public async Task<string> GetAppFrontendCshtml(
         /// Gets a list of file names from the Options folder representing the available options lists.
         /// </summary>
         /// <returns>A list of option list names.</returns>
-        public string[] GetOptionsListIds()
+        public string[] GetOptionsListIds(string optionsFolderPath)
         {
-            string optionsFolder = Path.Combine(OptionsFolderPath);
+            string optionsFolder = Path.Combine(optionsFolderPath);
             if (!DirectoryExistsByRelativePath(optionsFolder))
             {
                 return [];
@@ -1012,16 +1012,18 @@ public string[] GetOptionsListIds()
         /// Gets a specific options list with the provided id.
         /// </summary>
         /// <param name="optionsListId">The name of the options list to fetch.</param>
+        /// <param name="optionsFolderPath"></param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that observes if operation is cancelled.</param>
         /// <returns>The options list as a string.</returns>
         public async Task<string> GetOptionsList(
             string optionsListId,
+            string optionsFolderPath,
             CancellationToken cancellationToken = default
         )
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            string optionsFilePath = Path.Combine(OptionsFolderPath, $"{optionsListId}.json");
+            string optionsFilePath = Path.Combine(optionsFolderPath, $"{optionsListId}.json");
             if (!FileExistsByRelativePath(optionsFilePath))
             {
                 throw new NotFoundException($"Options file {optionsListId}.json was not found.");