Merge branch 'refs/heads/v14/dev' into release/14.0

src/Umbraco.Cms.Api.Management/Controllers/Document/GetAuditLogDocumentController.cs

@@ -35,7 +35,7 @@ public GetAuditLogDocumentController(
     [MapToApiVersion("1.0")]
     [HttpGet("{id:guid}/audit-log")]
     [ProducesResponseType(typeof(PagedViewModel<AuditLogResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> GetAuditLog(CancellationToken cancellationToken, Guid id, Direction orderDirection = Direction.Descending, DateTime? sinceDate = null, int skip = 0, int take = 100)
+    public async Task<IActionResult> GetAuditLog(CancellationToken cancellationToken, Guid id, Direction orderDirection = Direction.Descending, DateTimeOffset? sinceDate = null, int skip = 0, int take = 100)
     {
         AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
             User,

src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllLogViewerController.cs

@@ -48,8 +48,8 @@ public async Task<IActionResult> AllLogs(
         Direction orderDirection = Direction.Descending,
         string? filterExpression = null,
         [FromQuery(Name = "logLevel")] LogLevel[]? logLevels = null,
-        DateTime? startDate = null,
-        DateTime? endDate = null)
+        DateTimeOffset? startDate = null,
+        DateTimeOffset? endDate = null)
     {
         var levels = logLevels?.Select(l => l.ToString()).ToArray();
 

src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllMessageTemplateLogViewerController.cs

@@ -40,8 +40,8 @@ public async Task<IActionResult> AllMessageTemplates(
         CancellationToken cancellationToken,
         int skip = 0,
         int take = 100,
-        DateTime? startDate = null,
-        DateTime? endDate = null)
+        DateTimeOffset? startDate = null,
+        DateTimeOffset? endDate = null)
     {
         Attempt<PagedModel<LogTemplate>, LogViewerOperationStatus> messageTemplatesAttempt = await _logViewerService.GetMessageTemplatesAsync(startDate, endDate, skip, take);
 

src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogLevelCountLogViewerController.cs

@@ -34,8 +34,8 @@ public LogLevelCountLogViewerController(ILogViewerService logViewerService, IUmb
     [ProducesResponseType(typeof(LogLevelCountsReponseModel), StatusCodes.Status200OK)]
     public async Task<IActionResult> LogLevelCounts(
         CancellationToken cancellationToken,
-        DateTime? startDate = null,
-        DateTime? endDate = null)
+        DateTimeOffset? startDate = null,
+        DateTimeOffset? endDate = null)
     {
         Attempt<LogLevelCounts?, LogViewerOperationStatus> logLevelCountsAttempt =
             await _logViewerService.GetLogLevelCountsAsync(startDate, endDate);

src/Umbraco.Cms.Api.Management/Controllers/LogViewer/ValidateLogFileSizeLogViewerController.cs

@@ -26,8 +26,8 @@ public class ValidateLogFileSizeLogViewerController : LogViewerControllerBase
     [ProducesResponseType(StatusCodes.Status200OK)]
     public async Task<IActionResult> CanViewLogs(
         CancellationToken cancellationToken,
-        DateTime? startDate = null,
-        DateTime? endDate = null)
+        DateTimeOffset? startDate = null,
+        DateTimeOffset? endDate = null)
     {
         Attempt<bool, LogViewerOperationStatus> result = await _logViewerService.CanViewLogsAsync(startDate, endDate);
 

src/Umbraco.Cms.Api.Management/Controllers/Media/GetAuditLogMediaController.cs

@@ -34,7 +34,7 @@ public GetAuditLogMediaController(
     [MapToApiVersion("1.0")]
     [HttpGet("{id:guid}/audit-log")]
     [ProducesResponseType(typeof(PagedViewModel<AuditLogResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> GetAuditLog(CancellationToken cancellationToken, Guid id, Direction orderDirection = Direction.Descending, DateTime? sinceDate = null, int skip = 0, int take = 100)
+    public async Task<IActionResult> GetAuditLog(CancellationToken cancellationToken, Guid id, Direction orderDirection = Direction.Descending, DateTimeOffset? sinceDate = null, int skip = 0, int take = 100)
     {
         AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
             User,

src/Umbraco.Cms.Api.Management/ViewModels/Member/MemberResponseModel.cs

@@ -19,11 +19,11 @@ public class MemberResponseModel : ContentResponseModelBase<MemberValueModel, Me
 
     public int FailedPasswordAttempts { get; set; }
 
-    public DateTime? LastLoginDate { get; set; }
+    public DateTimeOffset? LastLoginDate { get; set; }
 
-    public DateTime? LastLockoutDate { get; set; }
+    public DateTimeOffset? LastLockoutDate { get; set; }
 
-    public DateTime? LastPasswordChangeDate { get; set; }
+    public DateTimeOffset? LastPasswordChangeDate { get; set; }
 
     public IEnumerable<Guid> Groups { get; set; } = [];
 }

src/Umbraco.Core/Services/AuditService.cs

@@ -242,7 +242,7 @@ public async Task<PagedModel<IAuditItem>> GetItemsByKeyAsync(
         int skip,
         int take,
         Direction orderDirection = Direction.Descending,
-        DateTime? sinceDate = null,
+        DateTimeOffset? sinceDate = null,
         AuditType[]? auditTypeFilter = null)
         {
             if (skip < 0)
@@ -264,7 +264,7 @@ public async Task<PagedModel<IAuditItem>> GetItemsByKeyAsync(
             using (ScopeProvider.CreateCoreScope(autoComplete: true))
             {
                 IQuery<IAuditItem> query = Query<IAuditItem>().Where(x => x.Id == keyToIdAttempt.Result);
-                IQuery<IAuditItem>? customFilter = sinceDate.HasValue ? Query<IAuditItem>().Where(x => x.CreateDate >= sinceDate) : null;
+                IQuery<IAuditItem>? customFilter = sinceDate.HasValue ? Query<IAuditItem>().Where(x => x.CreateDate >= sinceDate.Value.LocalDateTime) : null;
                 PaginationHelper.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize);
 
                 IEnumerable<IAuditItem> auditItems = _auditRepository.GetPagedResultsByQuery(query, pageNumber, pageSize, out var totalRecords, orderDirection, auditTypeFilter, customFilter);

src/Umbraco.Core/Services/IAuditService.cs

@@ -99,7 +99,7 @@ Task<PagedModel<IAuditItem>> GetItemsByKeyAsync(
         int skip,
         int take,
         Direction orderDirection = Direction.Descending,
-        DateTime? sinceDate = null,
+        DateTimeOffset? sinceDate = null,
         AuditType[]? auditTypeFilter = null) => throw new NotImplementedException();
 
     /// <summary>

src/Umbraco.Core/Services/ILogViewerService.cs

@@ -22,8 +22,8 @@ public interface ILogViewerService : IService
     /// <param name="filterExpression">The query expression to filter on.</param>
     /// <param name="logLevels">The log levels for which to retrieve the log messages.</param>
     Task<Attempt<PagedModel<ILogEntry>?, LogViewerOperationStatus>> GetPagedLogsAsync(
-        DateTime? startDate,
-        DateTime? endDate,
+        DateTimeOffset? startDate,
+        DateTimeOffset? endDate,
         int skip,
         int take,
         Direction orderDirection = Direction.Descending,
@@ -63,7 +63,7 @@ public interface ILogViewerService : IService
     /// <param name="startDate">The start date for the date range.</param>
     /// <param name="endDate">The end date for the date range.</param>
     /// <returns>The value whether or not you are able to view the logs.</returns>
-    Task<Attempt<bool, LogViewerOperationStatus>> CanViewLogsAsync(DateTime? startDate, DateTime? endDate);
+    Task<Attempt<bool, LogViewerOperationStatus>> CanViewLogsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate);
 
     /// <summary>
     ///     Returns a number of the different log level entries.
@@ -72,7 +72,7 @@ public interface ILogViewerService : IService
     /// </summary>
     /// <param name="startDate">The start date for the date range.</param>
     /// <param name="endDate">The end date for the date range.</param>
-    Task<Attempt<LogLevelCounts?, LogViewerOperationStatus>> GetLogLevelCountsAsync(DateTime? startDate, DateTime? endDate);
+    Task<Attempt<LogLevelCounts?, LogViewerOperationStatus>> GetLogLevelCountsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate);
 
     /// <summary>
     ///     Returns a paged model of all unique message templates and their counts.
@@ -83,7 +83,7 @@ public interface ILogViewerService : IService
     /// <param name="endDate">The end date for the date range.</param>
     /// <param name="skip">The amount of items to skip.</param>
     /// <param name="take">The amount of items to take.</param>
-    Task<Attempt<PagedModel<LogTemplate>, LogViewerOperationStatus>> GetMessageTemplatesAsync(DateTime? startDate, DateTime? endDate, int skip, int take);
+    Task<Attempt<PagedModel<LogTemplate>, LogViewerOperationStatus>> GetMessageTemplatesAsync(DateTimeOffset? startDate, DateTimeOffset? endDate, int skip, int take);
 
     /// <summary>
     ///     Get the log level values of the global minimum and the UmbracoFile one from the config file.

src/Umbraco.Core/Services/LogViewerService.cs

@@ -32,8 +32,8 @@ public LogViewerService(
 
     /// <inheritdoc/>
     public async Task<Attempt<PagedModel<ILogEntry>?, LogViewerOperationStatus>> GetPagedLogsAsync(
-        DateTime? startDate,
-        DateTime? endDate,
+        DateTimeOffset? startDate,
+        DateTimeOffset? endDate,
         int skip,
         int take,
         Direction orderDirection = Direction.Descending,
@@ -109,7 +109,7 @@ public async Task<PagedModel<ILogViewerQuery>> GetSavedLogQueriesAsync(int skip,
     }
 
     /// <inheritdoc/>
-    public async Task<Attempt<bool, LogViewerOperationStatus>> CanViewLogsAsync(DateTime? startDate, DateTime? endDate)
+    public async Task<Attempt<bool, LogViewerOperationStatus>> CanViewLogsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate)
     {
         LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
         bool isAllowed = CanViewLogs(logTimePeriod);
@@ -123,7 +123,7 @@ public async Task<Attempt<bool, LogViewerOperationStatus>> CanViewLogsAsync(Date
     }
 
     /// <inheritdoc/>
-    public async Task<Attempt<LogLevelCounts?, LogViewerOperationStatus>> GetLogLevelCountsAsync(DateTime? startDate, DateTime? endDate)
+    public async Task<Attempt<LogLevelCounts?, LogViewerOperationStatus>> GetLogLevelCountsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate)
     {
         LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
 
@@ -143,7 +143,7 @@ public async Task<Attempt<bool, LogViewerOperationStatus>> CanViewLogsAsync(Date
     }
 
     /// <inheritdoc/>
-    public async Task<Attempt<PagedModel<LogTemplate>, LogViewerOperationStatus>> GetMessageTemplatesAsync(DateTime? startDate, DateTime? endDate, int skip, int take)
+    public async Task<Attempt<PagedModel<LogTemplate>, LogViewerOperationStatus>> GetMessageTemplatesAsync(DateTimeOffset? startDate, DateTimeOffset? endDate, int skip, int take)
     {
         LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
 
@@ -183,7 +183,7 @@ public ReadOnlyDictionary<string, LogLevel> GetLogLevelsFromSinks()
     /// <param name="startDate">The start date for the date range (can be null).</param>
     /// <param name="endDate">The end date for the date range (can be null).</param>
     /// <returns>The LogTimePeriod object used to filter logs.</returns>
-    private LogTimePeriod GetTimePeriod(DateTime? startDate, DateTime? endDate)
+    private LogTimePeriod GetTimePeriod(DateTimeOffset? startDate, DateTimeOffset? endDate)
     {
         if (startDate is null || endDate is null)
         {
@@ -199,7 +199,7 @@ private LogTimePeriod GetTimePeriod(DateTime? startDate, DateTime? endDate)
             }
         }
 
-        return new LogTimePeriod(startDate.Value, endDate.Value);
+        return new LogTimePeriod(startDate.Value.LocalDateTime, endDate.Value.LocalDateTime);
     }
 
     /// <summary>

tests/Umbraco.Tests.AcceptanceTest/tests/ApiTesting/Language/Language.spec.ts

@@ -6,28 +6,28 @@ test.describe('Language tests', () => {
   const isoCodeDanish = 'da-DK';
 
   test.beforeEach(async ({umbracoApi}) => {
-    await umbracoApi.language.delete(isoCodeDanish);
+    await umbracoApi.language.ensureNameNotExists(languageNameDanish);
   });
 
   test.afterEach(async ({umbracoApi}) => {
-    await umbracoApi.language.delete(isoCodeDanish);
+    await umbracoApi.language.ensureNameNotExists(languageNameDanish);
   });
 
   test('can create a language', async ({umbracoApi}) => {
+    // Act
     await umbracoApi.language.create(languageNameDanish, false, false, isoCodeDanish);
 
     // Assert
     expect(await umbracoApi.language.doesExist(isoCodeDanish)).toBeTruthy();
   });
 
   test('can update a language', async ({umbracoApi}) => {
+    // Arrange
     const wrongLanguageName = 'densk';
-
     await umbracoApi.language.create(wrongLanguageName, false, false, isoCodeDanish);
-
     const language = await umbracoApi.language.get(isoCodeDanish);
 
-    // Updates language
+    // Act
     language.name = languageNameDanish;
     await umbracoApi.language.update(isoCodeDanish, language);
 
@@ -39,10 +39,11 @@ test.describe('Language tests', () => {
   });
 
   test('can delete a language', async ({umbracoApi}) => {
+    // Arrange
     await umbracoApi.language.create(languageNameDanish, false, false, isoCodeDanish);
-
     expect(await umbracoApi.language.doesExist(isoCodeDanish)).toBeTruthy();
 
+    //Act
     await umbracoApi.language.delete(isoCodeDanish);
 
     // Assert

tests/Umbraco.Tests.AcceptanceTest/tests/ApiTesting/Stylesheet/Stylesheet.spec.ts

@@ -58,7 +58,7 @@ test.describe('Stylesheet tests', () => {
     expect(await umbracoApi.stylesheet.doesExist(stylesheetPath)).toBeTruthy();
 
     // Act
-    await umbracoApi.stylesheet.delete(stylesheetPath);
+    await umbracoApi.stylesheet.delete(stylesheetName);
 
     // Assert
     expect(await umbracoApi.stylesheet.doesExist(stylesheetPath)).toBeFalsy();

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Language/Language.spec.ts

@@ -0,0 +1,124 @@
+import {test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+test.describe('Language tests', () => {
+  const languageName = 'Arabic';
+  const isoCode = 'ar';
+  const defaultLanguageName = 'English (United States)';
+  const defaultLanguageIsoCode = 'en-US';
+
+  test.beforeEach(async ({umbracoApi, umbracoUi}) => {
+    await umbracoUi.goToBackOffice();
+    await umbracoApi.language.ensureNameNotExists(languageName);
+  });
+
+  test.afterEach(async ({umbracoApi}) => {
+    await umbracoApi.language.ensureNameNotExists(languageName);
+  });
+
+  test('can add language @smoke', async ({umbracoApi, umbracoUi}) => {
+    // Arrange
+    await umbracoUi.language.goToSettingsTreeItem('Language');
+
+    // Act
+    await umbracoUi.language.clickCreateLink();
+    await umbracoUi.language.chooseLanguageByName(languageName);
+    await umbracoUi.language.clickSaveButton();
+
+    // Assert
+    expect(await umbracoApi.language.doesExist(isoCode)).toBeTruthy();
+    // Verify the created language displays in the list
+    await umbracoUi.language.clickLanguageRoot();
+    await umbracoUi.language.isLanguageNameVisible(languageName, true);
+  });
+
+  test('can update default language option @smoke', async ({umbracoApi, umbracoUi}) => {
+    // Arrange
+    await umbracoApi.language.create(languageName, false, false, isoCode);
+    expect(await umbracoApi.language.doesExist(isoCode)).toBeTruthy();
+    await umbracoUi.language.goToSettingsTreeItem('Language');
+
+    // Act
+    await umbracoUi.language.clickLanguageByName(languageName);
+    await umbracoUi.language.switchDefaultLanguageOption();
+    await umbracoUi.language.clickSaveButton();
+
+    // Assert
+    const languageData = await umbracoApi.language.get(isoCode);
+    expect(languageData.isDefault).toBe(true);
+
+    // Clean
+    // To delete this language, you need to change en-US to be default language
+    const defaultLanguageData = await umbracoApi.language.get(defaultLanguageIsoCode);
+    defaultLanguageData.isDefault = true;
+    await umbracoApi.language.update(defaultLanguageIsoCode, defaultLanguageData);
+  });
+
+  test('can update mandatory language option', async ({umbracoApi, umbracoUi}) => {
+    // Arrange
+    await umbracoApi.language.create(languageName, false, false, isoCode);
+    expect(await umbracoApi.language.doesExist(isoCode)).toBeTruthy();
+    await umbracoUi.language.goToSettingsTreeItem('Language');
+
+    // Act
+    await umbracoUi.language.clickLanguageByName(languageName);
+    await umbracoUi.language.switchMandatoryLanguageOption();
+    await umbracoUi.language.clickSaveButton();
+
+    // Assert
+    const languageData = await umbracoApi.language.get(isoCode);
+    expect(languageData.isMandatory).toBe(true);
+  });
+
+  test('can delete language @smoke', async ({umbracoApi, umbracoUi}) => {
+    // Arrange
+    await umbracoApi.language.create(languageName, false, false, isoCode);
+    expect(await umbracoApi.language.doesExist(isoCode)).toBeTruthy();
+    await umbracoUi.language.goToSettingsTreeItem('Language');
+
+    // Act
+    await umbracoUi.language.removeLanguageByName(languageName);
+
+    // Assert
+    await umbracoUi.language.isSuccessNotificationVisible();
+    expect(await umbracoApi.language.doesExist(isoCode)).toBeFalsy();
+    // TODO: uncomment this when the front-end is ready. Currently the deleted language is not disappeared after deleting.
+    //await umbracoUi.language.isLanguageNameVisible(languageName, false);
+  });
+
+  // TODO: Remove skip when the add fallback language function works
+  test.skip('can remove fallback language', async ({umbracoApi, umbracoUi}) => {
+    // Arrange
+    await umbracoApi.language.create(languageName, false, false, isoCode);
+    expect(await umbracoApi.language.doesExist(isoCode)).toBeTruthy();
+    await umbracoUi.language.goToSettingsTreeItem('Language');
+
+    // Act
+    await umbracoUi.language.clickLanguageByName(languageName);
+    await umbracoUi.language.removeFallbackLanguageByName(defaultLanguageName);
+    await umbracoUi.language.clickSaveButton();
+
+    // Act
+    const languageData = await umbracoApi.language.get(isoCode);
+    expect(languageData.fallbackIsoCode).toBeFalsy();
+  });
+
+  // TODO: Remove skip when the add fallback language function works
+  test.skip('can add fallback language', async ({umbracoApi, umbracoUi}) => {
+    // Arrange
+    await umbracoApi.language.create(languageName, false, false, isoCode, null);
+    expect(await umbracoApi.language.doesExist(isoCode)).toBeTruthy();
+    await umbracoUi.language.goToSettingsTreeItem('Language');
+
+    // Act
+    await umbracoUi.language.clickLanguageByName(languageName);
+    await umbracoUi.language.clickAddFallbackLanguageButton();
+    await umbracoUi.language.selectFallbackLanguageByName(defaultLanguageName);
+    await umbracoUi.language.clickSaveButton();
+
+    // Act
+    const languageData = await umbracoApi.language.get(isoCode);
+    expect(languageData.fallbackIsoCode).toBe(defaultLanguageIsoCode);
+  });
+});
+