add hideAppNameInPdf functionality to footer in the pdf

src/Altinn.App.Core/Features/IInstanceDataAccessor.cs

@@ -76,7 +76,7 @@ public interface IInstanceDataAccessor
     /// <see cref="IInstanceDataAccessor"/> directly in the expression evaluator.
     /// </summary>
     /// <returns></returns>
-    internal LayoutEvaluatorState? GetLayoutEvaluatorState();
+    internal LayoutEvaluatorState GetLayoutEvaluatorState();
 
     /// <summary>
     /// <para>Set the authentication method used when reading and writing data of the given data type.</para>

src/Altinn.App.Core/Internal/Data/CleanInstanceDataAccessor.cs

@@ -144,7 +144,7 @@ public DataElement GetDataElement(DataElementIdentifier dataElementIdentifier)
         return _dataAccessor.GetDataElement(dataElementIdentifier);
     }
 
-    public LayoutEvaluatorState? GetLayoutEvaluatorState()
+    public LayoutEvaluatorState GetLayoutEvaluatorState()
     {
         throw new NotImplementedException(
             "GetLayoutEvaluatorState is not implemented in CleanInstanceDataAccessor, because LayoutEvaluatorState will be deprecated."

src/Altinn.App.Core/Internal/Data/InstanceDataUnitOfWork.cs

@@ -64,19 +64,19 @@
     private static readonly StorageAuthenticationMethod _defaultAuthenticationMethod =
         StorageAuthenticationMethod.CurrentUser();
 
     public InstanceDataUnitOfWork(
         Instance instance,
         IDataClient dataClient,
         IInstanceClient instanceClient,
         ApplicationMetadata appMetadata,
         ITranslationService translationService,
         ModelSerializationService modelSerializationService,
         IAppResources appResources,
         IOptions<FrontEndSettings> frontEndSettings,
         string? taskId,
         string? language,
         Telemetry? telemetry = null
     )
     {
         if (instance.Id is not null)
         {
@@ -181,19 +181,15 @@
 
     private LayoutEvaluatorState? _layoutEvaluatorStateCache;
 
-    public LayoutEvaluatorState? GetLayoutEvaluatorState()
+    public LayoutEvaluatorState GetLayoutEvaluatorState()
     {
-        if (TaskId is null)
-        {
-            return null;
-        }
         if (_layoutEvaluatorStateCache is not null)
         {
             return _layoutEvaluatorStateCache;
         }
 
         // Could use a double lock here, but a deadlock is more problematic than creating the state twice
-        var layouts = _appResources.GetLayoutModelForTask(TaskId);
+        var layouts = TaskId is null ? null : _appResources.GetLayoutModelForTask(TaskId);
 
         _layoutEvaluatorStateCache = new LayoutEvaluatorState(
             this,
@@ -415,7 +411,7 @@
         }
     }
 
     public DataElementChanges GetDataElementChanges(bool initializeAltinnRowId)
     {
         if (HasAbandonIssues)
         {
@@ -629,7 +625,7 @@
         }
 
         // Delete data elements
         foreach (var change in changes.AllChanges.Where(c => c.Type == ChangeType.Deleted))
         {
             async Task DeleteData()
             {

src/Altinn.App.Core/Internal/Data/PreviousDataAccessor.cs

@@ -19,7 +19,7 @@ internal class PreviousDataAccessor : IInstanceDataAccessor
     private readonly FrontEndSettings _frontEndSettings;
     private readonly ITranslationService _translationService;
     private readonly Telemetry? _telemetry;
-    private readonly Lazy<LayoutEvaluatorState?> _layoutEvaluatorState;
+    private readonly Lazy<LayoutEvaluatorState> _layoutEvaluatorState;
 
     private readonly ConcurrentDictionary<DataElementIdentifier, Task<IFormDataWrapper>> _previousDataCache = new();
 
@@ -41,7 +41,7 @@ public PreviousDataAccessor(
         _layoutEvaluatorState = new(() =>
         {
             var originalState = _dataAccessor.GetLayoutEvaluatorState();
-            return originalState?.WithDataAccessor(this);
+            return originalState.WithDataAccessor(this);
         });
     }
 
@@ -106,7 +106,7 @@ public IInstanceDataAccessor GetPreviousDataAccessor()
         return this;
     }
 
-    public LayoutEvaluatorState? GetLayoutEvaluatorState()
+    public LayoutEvaluatorState GetLayoutEvaluatorState()
     {
         return _layoutEvaluatorState.Value;
     }

src/Altinn.App.Core/Internal/Expressions/LayoutEvaluatorState.cs

@@ -102,7 +102,7 @@
     /// <summary>
     /// Get component from componentModel
     /// </summary>
     [Obsolete("You need to get a context, not a component", true)]
     public void GetComponent(string pageName, string componentId)
     {
         throw new NotSupportedException("GetComponent is not supported, use GetComponentContext instead.");
@@ -149,9 +149,9 @@
     /// <summary>
     /// Get a specific component context from the state
     /// </summary>
     [Obsolete(
         "A context is not uniquely identified by componentId and rowIndexes, use GetComponentContext(string, ComponentContext) instead so that we get subform data element as well."
     )]
     public async Task<ComponentContext?> GetComponentContext(
         string? pageName,
         string componentId,
@@ -267,9 +267,9 @@
     private static string GetInstanceOwnerPartyType(InstanceOwner? instanceOwner)
     {
         return !string.IsNullOrWhiteSpace(instanceOwner?.OrganisationNumber) ? "org"
             : !string.IsNullOrWhiteSpace(instanceOwner?.PersonNumber) ? "person"
             : !string.IsNullOrWhiteSpace(instanceOwner?.Username) ? "selfIdentified"
             : "unknown";
     }
 
     /// <summary>
@@ -301,7 +301,7 @@
     {
         var formDataWrapper =
             await DataAccessor.GetFormDataWrapper(binding, context.DataElementIdentifier)
             ?? throw new NullReferenceException($"No data element found for {binding.DataType} {binding.Field}");
 
         if (formDataWrapper.DataElement == null)
         {
@@ -323,9 +323,9 @@
     /// <summary>
     /// Return a full dataModelBinding from a context aware binding by adding indexes
     /// </summary>
     [Obsolete(
         "This method is deprecated and will be removed in a future version in favor of AddInidicies(ModelBinding, ComponentContext)."
     )]
     public async Task<DataReference> AddInidicies(
         ModelBinding binding,
         DataElementIdentifier dataElementIdentifier,
@@ -334,7 +334,7 @@
     {
         var formDataWrapper =
             await DataAccessor.GetFormDataWrapper(binding, dataElementIdentifier)
             ?? throw new NullReferenceException($"No data element found for {binding.DataType} {binding.Field}");
 
         if (formDataWrapper.DataElement == null)
         {
@@ -445,7 +445,7 @@
         return _componentModel?.DefaultDataType;
     }
 
-    internal LayoutEvaluatorState? WithDataAccessor(IInstanceDataAccessor dataAccessor)
+    internal LayoutEvaluatorState WithDataAccessor(IInstanceDataAccessor dataAccessor)
     {
         return new LayoutEvaluatorState(
             dataAccessor,

src/Altinn.App.Core/Internal/Expressions/LayoutEvaluatorStateInitializer.cs

@@ -54,18 +54,18 @@
         private readonly string? _gatewayAction;
         private readonly IFormDataWrapper _data;
 
         public SingleDataElementAccessor(
             Instance instance,
             DataElement dataElement,
             ApplicationMetadata applicationMetadata,
             IFormDataWrapper data,
             LayoutModel layouts,
             FrontEndSettings frontEndSettings,
             ITranslationService translationService,
             string? gatewayAction,
             string? taskId,
             string? language
         )
         {
             Instance = instance;
             _dataElement = dataElement;
@@ -115,7 +115,7 @@
             throw new NotSupportedException("Legacy single data accessor does not implement GetPreviousDataAccessor");
         }
 
-        public LayoutEvaluatorState? GetLayoutEvaluatorState()
+        public LayoutEvaluatorState GetLayoutEvaluatorState()
         {
             return new LayoutEvaluatorState(
                 this,

src/Altinn.App.Core/Internal/Pdf/PdfService.cs

@@ -1,9 +1,12 @@
 using System.Globalization;
+using System.Text.Json;
 using Altinn.App.Core.Configuration;
 using Altinn.App.Core.Features;
 using Altinn.App.Core.Features.Auth;
 using Altinn.App.Core.Helpers.Extensions;
+using Altinn.App.Core.Internal.App;
 using Altinn.App.Core.Internal.Data;
+using Altinn.App.Core.Internal.Expressions;
 using Altinn.App.Core.Internal.Texts;
 using Altinn.App.Core.Models;
 using Altinn.App.Core.Models.Expressions;
@@ -21,6 +24,14 @@
 /// </summary>
 public class PdfService : IPdfService
 {
+    private static readonly JsonSerializerOptions _jsonSerializerOptions = new()
+    {
+        AllowTrailingCommas = true,
+        ReadCommentHandling = JsonCommentHandling.Skip,
+        PropertyNameCaseInsensitive = true,
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+    };
+
     private readonly IDataClient _dataClient;
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly IPdfGeneratorClient _pdfGeneratorClient;
@@ -29,6 +40,7 @@
     private readonly IAuthenticationContext _authenticationContext;
     private readonly ITranslationService _translationService;
     private readonly GeneralSettings _generalSettings;
+    private readonly IAppResources _resources;
     private readonly InstanceDataUnitOfWorkInitializer? _instanceDataUnitOfWorkInitializer;
     private readonly Telemetry? _telemetry;
     internal const string PdfElementType = "ref-data-as-pdf";
@@ -46,6 +58,7 @@
         ILogger<PdfService> logger,
         IAuthenticationContext authenticationContext,
         ITranslationService translationService,
+        IAppResources resources,
         IServiceProvider? serviceProvider = null,
         Telemetry? telemetry = null
     )
@@ -58,6 +71,7 @@
         _logger = logger;
         _authenticationContext = authenticationContext;
         _translationService = translationService;
+        _resources = resources;
         _instanceDataUnitOfWorkInitializer = serviceProvider?.GetService<InstanceDataUnitOfWorkInitializer>();
         _telemetry = telemetry;
     }
@@ -206,7 +220,7 @@
         }
         else if (displayFooter)
         {
-            footerContent = await GetFooterContent(instance, language);
+            footerContent = await GetFooterContent(instance, taskId, language);
         }
 
         Stream pdfContent = await _pdfGeneratorClient.GeneratePdf(uri, footerContent, ct);
@@ -257,7 +271,7 @@
         {
             foreach (KeyValuePair<string, string> param in additionalQueryParams)
             {
                 url += $"&{param.Key}={param.Value}";
             }
         }
 
@@ -338,7 +352,7 @@
             </div>";
     }
 
-    private async Task<string> GetFooterContent(Instance instance, string? language)
+    private async Task<string> GetFooterContent(Instance instance, string taskId, string? language)
     {
         TimeZoneInfo timeZone = TimeZoneInfo.Utc;
         try
@@ -353,15 +367,19 @@
 
         DateTimeOffset now = TimeZoneInfo.ConvertTime(DateTimeOffset.UtcNow, timeZone);
 
-        string title = await _translationService.TranslateTextKey("appName", language) ?? "Altinn";
+        bool hideAppName = await GetHideAppNameInPdf(instance, taskId, language);
 
         string dateGenerated = now.ToString("dd.MM.yyyy HH:mm", new CultureInfo("nb-NO"));
         string altinnReferenceId = instance.Id.Split("/")[1].Split("-")[4];
 
+        string title = hideAppName
+            ? string.Empty
+            : $"<span>{await _translationService.TranslateTextKey("appName", language) ?? "Altinn"}</span>";
+
         string footerTemplate =
             $@"<div style='font-family: Inter; font-size: 12px; width: 100%; display: flex; flex-direction: row; align-items: center; gap: 12px; padding: 0 70px 0 70px;'>
                 <div style='display: flex; flex-direction: row; width: 100%; align-items: center'>
-                    <span>{title}</span>
+                    {title}
                     <div
                         id='header-template'
                         style='color: #F00; font-weight: 700; border: 1px solid #F00; padding: 6px 8px; margin-left: auto;'
@@ -379,6 +397,69 @@
         return footerTemplate;
     }
 
+    private async Task<bool> GetHideAppNameInPdf(Instance instance, string taskId, string? language)
+    {
+        string? layoutSets = _resources.GetLayoutSets();
+        if (string.IsNullOrEmpty(layoutSets))
+            return false;
+
+        try
+        {
+            using var jsonDoc = JsonDocument.Parse(
+                layoutSets,
+                new JsonDocumentOptions { AllowTrailingCommas = true, CommentHandling = JsonCommentHandling.Skip }
+            );
+            var root = jsonDoc.RootElement;
+
+            if (
+                !root.TryGetProperty("uiSettings", out var uiSettings)
+                || !uiSettings.TryGetProperty("hideAppNameInPdf", out var hideAppName)
+            )
+                return false;
+
+            if (hideAppName.ValueKind == JsonValueKind.True)
+                return true;
+            if (hideAppName.ValueKind == JsonValueKind.False)
+                return false;
+
+            if (_instanceDataUnitOfWorkInitializer is null)
+            {
+                _logger.LogWarning(
+                    "Cannot evaluate hideAppNameInPdf expression: InstanceDataUnitOfWorkInitializer is not available"
+                );
+                return false;
+            }
+
+            var expression = hideAppName.Deserialize<Expression>(_jsonSerializerOptions);
+            var dataAccessor = await _instanceDataUnitOfWorkInitializer.Init(instance, taskId, language);
+            var state = dataAccessor.GetLayoutEvaluatorState();
+
+            var layoutSet = _resources.GetLayoutSetForTask(taskId);
+            DataElementIdentifier? dataElement = layoutSet?.DataType is { } dataType
+                ? instance.Data?.Find(d => d.DataType == dataType)
+                : null;
+
+            var componentContext = new ComponentContext(
+                dataAccessor,
+                component: null,
+                rowIndices: null,
+                dataElementIdentifier: dataElement
+            );
+            var result = await ExpressionEvaluator.EvaluateExpression(state, expression, componentContext);
+            return result is true;
+        }
+        catch (JsonException e)
+        {
+            _logger.LogWarning(e, "Failed to evaluate hideAppNameInPdf, defaulting to showing app name");
+            return false;
+        }
+        catch (InvalidOperationException e)
+        {
+            _logger.LogWarning(e, "Failed to evaluate hideAppNameInPdf, defaulting to showing app name");
+            return false;
+        }
+    }
+
     private static List<KeyValuePair<string, string>> CreateAutoPdfTaskIdsQueryParams(
         List<string>? autoGeneratePdfForTaskIds
     )

test/Altinn.App.Api.Tests/Controllers/PdfControllerTests.cs

@@ -6,6 +6,7 @@
 using Altinn.App.Core.Internal.AppModel;
 using Altinn.App.Core.Internal.Auth;
 using Altinn.App.Core.Internal.Data;
+using Altinn.App.Core.Internal.Expressions;
 using Altinn.App.Core.Internal.Instances;
 using Altinn.App.Core.Internal.Language;
 using Altinn.App.Core.Internal.Pdf;
@@ -89,7 +90,8 @@
             generalSettingsOptions,
             _logger.Object,
             _authenticationContext.Object,
-            _translationService.Object
+            _translationService.Object,
+            _appResources.Object
         );
         return pdfService;
     }
@@ -150,7 +152,7 @@
                 .Returns<HttpRequestMessage, CancellationToken>(
                     async (m, c) =>
                     {
                         requestBody = await m.Content!.ReadAsStringAsync();
                         return mockResponse;
                     }
                 );
@@ -223,7 +225,7 @@
                 .Returns<HttpRequestMessage, CancellationToken>(
                     async (m, c) =>
                     {
                         requestBody = await m.Content!.ReadAsStringAsync();
                         return mockResponse;
                     }
                 );
@@ -298,7 +300,7 @@
                 .Returns<HttpRequestMessage, CancellationToken>(
                     async (m, c) =>
                     {
                         requestBody = await m.Content!.ReadAsStringAsync();
                         return mockResponse;
                     }
                 );