Merge branch 'main' into clean-up-studio-toggleable-textfield

Author: standeren

backend/src/Designer/Controllers/AppDevelopmentController.cs

@@ -547,17 +547,14 @@ public ActionResult GetWidgetSettings(string org, string app)
         [Route("option-list-ids")]
         public ActionResult GetOptionListIds(string org, string app)
         {
-            try
-            {
-                string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
-                AltinnAppGitRepository altinnAppGitRepository = _altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, app, developer);
-                string[] optionListIds = altinnAppGitRepository.GetOptionsListIds();
-                return Ok(optionListIds);
-            }
-            catch (LibGit2Sharp.NotFoundException)
+            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")]

backend/src/Designer/Controllers/ContactController.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Helpers;
+using Altinn.Studio.Designer.Services.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Altinn.Studio.Designer.Controllers
+{
+    [Route("designer/api/[controller]")]
+    [ApiController]
+    public class ContactController : ControllerBase
+    {
+        private readonly IGitea _giteaService;
+
+        public ContactController(IGitea giteaService)
+        {
+            _giteaService = giteaService;
+        }
+
+        [AllowAnonymous]
+        [HttpGet("belongs-to-org")]
+        public async Task<IActionResult> BelongsToOrg()
+        {
+            bool isNotAuthenticated = !AuthenticationHelper.IsAuthenticated(HttpContext);
+            if (isNotAuthenticated)
+            {
+                return Ok(new BelongsToOrgDto { BelongsToOrg = false });
+            }
+
+            try
+            {
+                var organizations = await _giteaService.GetUserOrganizations();
+                return Ok(new BelongsToOrgDto { BelongsToOrg = organizations.Count > 0 });
+            }
+            catch (Exception)
+            {
+                return Ok(new BelongsToOrgDto { BelongsToOrg = false });
+            }
+        }
+    }
+}

backend/src/Designer/Helpers/AuthenticationHelper.cs

@@ -23,5 +23,10 @@ public static Task<string> GetDeveloperAppTokenAsync(this HttpContext context)
         {
             return context.GetTokenAsync("access_token");
         }
+
+        public static bool IsAuthenticated(HttpContext context)
+        {
+            return context.User.Identity?.IsAuthenticated ?? false;
+        }
     }
 }

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

@@ -798,7 +798,7 @@ public string[] GetOptionsListIds()
             string optionsFolder = Path.Combine(OptionsFolderPath);
             if (!DirectoryExistsByRelativePath(optionsFolder))
             {
-                throw new NotFoundException("Options folder not found.");
+                return [];
             }
 
             string[] fileNames = GetFilesByRelativeDirectoryAscSorted(optionsFolder, "*.json");

backend/src/Designer/Models/Dto/BelongsToOrg.cs

@@ -0,0 +1,7 @@
+using System.Text.Json.Serialization;
+
+public class BelongsToOrgDto
+{
+    [JsonPropertyName("belongsToOrg")]
+    public bool BelongsToOrg { get; set; }
+}

backend/tests/Designer.Tests/Controllers/ContactController/FetchBelongsToOrgTests.cs

@@ -0,0 +1,66 @@
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Designer.Tests.Controllers.ApiTests;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Designer.Tests.Controllers.ContactController;
+
+public class FetchBelongsToOrgTests : DesignerEndpointsTestsBase<FetchBelongsToOrgTests>,
+    IClassFixture<WebApplicationFactory<Program>>
+{
+    public FetchBelongsToOrgTests(WebApplicationFactory<Program> factory) : base(factory)
+    {
+    }
+
+    [Fact]
+    public async Task UsersThatBelongsToOrg_ShouldReturn_True()
+    {
+        string url = "/designer/api/contact/belongs-to-org";
+
+        using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, url);
+
+        var response = await HttpClient.SendAsync(httpRequestMessage);
+        var responseContent = await response.Content.ReadAsAsync<BelongsToOrgDto>();
+
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.True(responseContent.BelongsToOrg);
+    }
+
+    [Fact]
+    public async Task UsersThatDoNotBelongsToOrg_ShouldReturn_False_IfAnonymousUser()
+    {
+        string configPath = GetConfigPath();
+        IConfiguration configuration = new ConfigurationBuilder()
+            .AddJsonFile(configPath, false, false)
+            .AddJsonStream(GenerateJsonOverrideConfig())
+            .AddEnvironmentVariables()
+            .Build();
+
+        var anonymousClient = Factory.WithWebHostBuilder(builder =>
+        {
+            builder.UseConfiguration(configuration);
+            builder.ConfigureTestServices(services =>
+            {
+                services.AddAuthentication("Anonymous")
+                    .AddScheme<AuthenticationSchemeOptions, TestAuthHandler>("Anonymous", options => { });
+            });
+        }).CreateDefaultClient();
+
+        string url = "/designer/api/contact/belongs-to-org";
+
+        using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, url);
+
+        var response = await anonymousClient.SendAsync(httpRequestMessage);
+        var responseContent = await response.Content.ReadAsAsync<BelongsToOrgDto>();
+
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.False(responseContent.BelongsToOrg);
+    }
+}

backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionListsReferencesTests.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Altinn.Studio.Designer.Models.Dto;
 using Designer.Tests.Controllers.ApiTests;
+using Designer.Tests.Utils;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
@@ -14,6 +16,7 @@ public class GetOptionListsReferencesTests : DesignerEndpointsTestsBase<GetOptio
 {
     const string RepoWithUsedOptions = "app-with-options";
     const string RepoWithUnusedOptions = "app-with-layoutsets";
+    const string RepoWithoutOptions = "empty-app";
 
     public GetOptionListsReferencesTests(WebApplicationFactory<Program> factory) : base(factory)
     {
@@ -85,4 +88,25 @@ public async Task GetOptionListsReferences_Returns200Ok_WithEmptyOptionsReferenc
         Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
         Assert.Equivalent("[]", responseBody);
     }
+
+    [Fact]
+    public async Task GetOptionListsReferences_Returns200Ok_WithEmptyOptionsReferences_WhenAppDoesNotHaveOptions()
+    {
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest("ttd", RepoWithoutOptions, "testUser", targetRepository);
+        string repoPath = TestDataHelper.GetTestDataRepositoryDirectory("ttd", targetRepository, "testUser");
+        string exampleLayout = @"{ ""data"": {""layout"": []}}";
+        string filePath = Path.Combine(repoPath, "App/ui/form/layouts");
+        Directory.CreateDirectory(filePath);
+        await File.WriteAllTextAsync(Path.Combine(filePath, "exampleLayout.json"), exampleLayout);
+
+        string apiUrl = $"/designer/api/ttd/{targetRepository}/options/usage";
+        using HttpRequestMessage httpRequestMessage = new(HttpMethod.Get, apiUrl);
+
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+        string responseBody = await response.Content.ReadAsStringAsync();
+
+        Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
+        Assert.Equivalent("[]", responseBody);
+    }
 }

backend/tests/Designer.Tests/Infrastructure/GitRepository/AltinnAppGitRepositoryTests.cs

@@ -296,14 +296,14 @@ public Task GetOptionListIds_WithAppThatHasOptionLists_ShouldReturnOptionListPat
         }
 
         [Fact]
-        public Task GetOptionListIds_WithAppThatHasNoOptionLists_ShouldThrowNotFoundException()
+        public void GetOptionListIds_WithAppThatHasNoOptionLists_ShouldReturnEmptyList()
         {
             string org = "ttd";
             string repository = "empty-app";
             string developer = "testUser";
             AltinnAppGitRepository altinnAppGitRepository = PrepareRepositoryForTest(org, repository, developer);
-            Assert.Throws<LibGit2Sharp.NotFoundException>(altinnAppGitRepository.GetOptionsListIds);
-            return Task.CompletedTask;
+            var optionsIds = altinnAppGitRepository.GetOptionsListIds();
+            Assert.Equal([], optionsIds);
         }
 
         [Fact]

backend/tests/Designer.Tests/Mocks/IGiteaMock.cs

@@ -9,6 +9,7 @@
 using Altinn.Studio.Designer.Services.Interfaces;
 
 using Designer.Tests.Utils;
+using Organization = Altinn.Studio.Designer.RepositoryClient.Model.Organization;
 
 namespace Designer.Tests.Mocks
 {
@@ -131,7 +132,13 @@ public Task<List<Team>> GetTeams()
 
         public Task<List<Organization>> GetUserOrganizations()
         {
-            throw new NotImplementedException();
+            var organizations = new List<Organization>
+            {
+                new Organization { Username = "Org1", Id = 1 }, // Example items
+                new Organization { Username = "Org2", Id = 2 }
+            };
+
+            return Task.FromResult(organizations);
         }
 
         public Task<IList<Repository>> GetUserRepos()

frontend/app-development/features/appContentLibrary/AppContentLibrary.tsx

@@ -14,6 +14,7 @@ import {
   useAddOptionListMutation,
   useUpdateOptionListMutation,
   useUpdateOptionListIdMutation,
+  useDeleteOptionListMutation,
 } from 'app-shared/hooks/mutations';
 import { mapToCodeListsUsage } from './utils/mapToCodeListsUsage';
 
@@ -24,6 +25,7 @@ export function AppContentLibrary(): React.ReactElement {
     org,
     app,
   );
+  const { mutate: deleteOptionList } = useDeleteOptionListMutation(org, app);
   const { mutate: uploadOptionList } = useAddOptionListMutation(org, app, {
     hideDefaultError: (error: AxiosError<ApiError>) => isErrorUnknown(error),
   });
@@ -65,6 +67,7 @@ export function AppContentLibrary(): React.ReactElement {
       codeList: {
         props: {
           codeListsData,
+          onDeleteCodeList: deleteOptionList,
           onUpdateCodeListId: handleUpdateCodeListId,
           onUpdateCodeList: handleUpdate,
           onUploadCodeList: handleUpload,

frontend/app-development/features/overview/components/News/NewsContent/news.nb.json

@@ -1,6 +1,11 @@
 {
   "$schema": "news.schema.json",
   "news": [
+    {
+      "date": "2025-01-17",
+      "title": "Nå kan du ha flere datamodeller i et prosess-steg!",
+      "content": "Du kan nå koble komponenter i et prosess-steg til andre datamodeller, ikke bare til den overordnede datamodellen for steget. Dette gir deg nye muligheter til å håndtere data i appene dine."
+    },
     {
       "date": "2024-11-29",
       "title": "Prøv nytt design på Utforming!",

frontend/language/src/nb.json

@@ -12,9 +12,13 @@
   "api_errors.ResourceNotFound": "Studio prøver å finne en fil som ikke finnes.",
   "api_errors.Unauthorized": "Handlingen du prøver å utføre krever rettigheter du ikke har. Du blir nå logget ut.",
   "api_errors.UploadedImageNotValid": "Det opplastede bildet er ikke en gyldig filtype",
+  "app_content_library.code_lists.clear_search_button_label": "Fjern søkeord",
   "app_content_library.code_lists.code_list_accordion_title": "Kodelistenavn: {{codeListTitle}}",
   "app_content_library.code_lists.code_list_accordion_usage_sub_title_plural": "Kodelisten brukes i {{codeListUsagesCount}} komponenter.",
   "app_content_library.code_lists.code_list_accordion_usage_sub_title_single": "Kodelisten brukes i {{codeListUsagesCount}} komponent.",
+  "app_content_library.code_lists.code_list_delete": "Slett kodeliste",
+  "app_content_library.code_lists.code_list_delete_disabled_title": "Før du kan å slette kodelisten, må du fjerne den fra der den er brukt i appen.",
+  "app_content_library.code_lists.code_list_delete_enabled_title": "Slett kodelisten fra biblioteket.",
   "app_content_library.code_lists.code_list_edit_id_label": "Navn på kodeliste",
   "app_content_library.code_lists.code_list_edit_id_title": "Rediger navn på kodelisten {{codeListName}}",
   "app_content_library.code_lists.code_list_show_usage": "Se hvor kodelisten er tatt i bruk",
@@ -153,11 +157,16 @@
   "code_list_editor.text_resource.label.select": "Finn ledetekst for verdi nummer {{number}}",
   "code_list_editor.text_resource.label.value": "Oppgi ledetekst for verdi nummer {{number}}",
   "code_list_editor.value_item": "Verdi for alternativ {{number}}",
+  "contact.altinn_servicedesk.content": "Er du tjenesteeier og har du behov for hjelp? Ta kontakt med oss!",
+  "contact.altinn_servicedesk.heading": "Altinn Servicedesk",
   "contact.email.content": "Du kan skrive en e-post til Altinn servicedesk hvis du har spørsmål om å opprette organisasjoner eller miljøer, opplever tekniske problemer eller har spørsmål om dokumentasjonen eller andre ting.",
   "contact.email.heading": "Send e-post",
   "contact.github_issue.content": "Hvis du har behov for funksjonalitet eller ser feil og mangler i Studio som vi må fikse, kan du opprette en sak i Github, så ser vi på den.",
   "contact.github_issue.heading": "Rapporter feil og mangler til oss",
   "contact.github_issue.link_label": "Opprett sak i Github",
+  "contact.serviceDesk.email": "<b>E-post:</b> <a>[email protected]</a>",
+  "contact.serviceDesk.emergencyPhone": "<b>Vakttelefon:</b> <a>94 49 00 02</a> (tilgjengelig kl. 15:45–07:00)",
+  "contact.serviceDesk.phone": "<b>Telefon:</b> <a>75 00 62 99</a>",
   "contact.slack.content": "Hvis du har spørsmål om hvordan du bygger en app, kan du snakke direkte med utviklingsteamet i Altinn Studio på Slack. De hjelper deg med å",
   "contact.slack.content_list": "<0>bygge appene slik du ønsker</0><0>svare på spørsmål og veilede deg</0><0>ta imot innspill på ny funksjonalitet</0>",
   "contact.slack.heading": "Skriv melding til oss Slack",

frontend/libs/studio-components/src/components/StudioSearch/StudioSearch.module.css

@@ -0,0 +1,3 @@
+.studioSearch div:empty {
+  display: contents;
+}

frontend/libs/studio-components/src/components/StudioSearch/StudioSearch.tsx

@@ -1,6 +1,7 @@
 import React, { forwardRef, useId } from 'react';
 import { Label, Search, type SearchProps } from '@digdir/designsystemet-react';
 import type { WithoutAsChild } from '../../types/WithoutAsChild';
+import classes from './StudioSearch.module.css';
 
 export type StudioSearchProps = WithoutAsChild<SearchProps>;
 
@@ -10,14 +11,15 @@ const StudioSearch = forwardRef<HTMLInputElement, StudioSearchProps>(
     const searchId = id ?? generatedId;
     const showLabel = !!label;
 
+    // TODO: Remove studioSearch css class when Design System is updated. See issue: https://github.com/digdir/designsystemet/issues/2765
     return (
       <div className={className}>
         {showLabel && (
           <Label htmlFor={searchId} spacing>
             {label}
           </Label>
         )}
-        <Search {...rest} id={searchId} size={size} ref={ref} />
+        <Search {...rest} className={classes.studioSearch} id={searchId} size={size} ref={ref} />
       </div>
     );
   },

frontend/libs/studio-content-library/mocks/mockPagesConfig.ts

@@ -12,6 +12,7 @@ export const mockPagesConfig: PagesConfig = {
   codeList: {
     props: {
       codeListsData: codeListsDataMock,
+      onDeleteCodeList: () => {},
       onUpdateCodeListId: () => {},
       onUpdateCodeList: () => {},
       onUploadCodeList: () => {},