Merge branch 'main' into v17/dev

Author: AndyButland

src/Umbraco.Core/Services/DictionaryItemService.cs

@@ -159,7 +159,25 @@ public async Task<Attempt<IDictionaryItem, DictionaryItemOperationStatus>> Creat
     /// <inheritdoc />
     public async Task<Attempt<IDictionaryItem, DictionaryItemOperationStatus>> UpdateAsync(
         IDictionaryItem dictionaryItem, Guid userKey)
-        => await SaveAsync(
+    {
+        // Create and update dates aren't tracked for dictionary items. They exist on IDictionaryItem due to the
+        // inheritance from IEntity, but we don't store them.
+        // However we have logic in ServerEventSender that will provide SignalR events for created and update operations,
+        // where these dates are used to distinguish between the two (whether or not the entity has an identity cannot
+        // be used here, as these events fire after persistence when the identity is known for both creates and updates).
+        // So ensure we set something that can be distinguished here.
+        if (dictionaryItem.CreateDate == default)
+        {
+            dictionaryItem.CreateDate = DateTime.MinValue;
+        }
+
+        if (dictionaryItem.UpdateDate == default)
+        {
+            // TODO (V17): To align with updates of system dates, this needs to change to DateTime.UtcNow.
+            dictionaryItem.UpdateDate = DateTime.Now;
+        }
+
+        return await SaveAsync(
             dictionaryItem,
             () =>
             {
@@ -174,6 +192,7 @@ public async Task<Attempt<IDictionaryItem, DictionaryItemOperationStatus>> Updat
             AuditType.Save,
             "Update DictionaryItem",
             userKey);
+    }
 
     /// <inheritdoc />
     public async Task<Attempt<IDictionaryItem?, DictionaryItemOperationStatus>> DeleteAsync(Guid id, Guid userKey)

src/Umbraco.Web.UI.Client/package-lock.json

@@ -60,6 +60,7 @@
 		"./lit-element": "./dist-cms/packages/core/lit-element/index.js",
 		"./localization": "./dist-cms/packages/core/localization/index.js",
 		"./log-viewer": "./dist-cms/packages/log-viewer/index.js",
+		"./management-api": "./dist-cms/packages/management-api/index.js",
 		"./markdown-editor": "./dist-cms/packages/markdown-editor/index.js",
 		"./media-type": "./dist-cms/packages/media/media-types/index.js",
 		"./media": "./dist-cms/packages/media/media/index.js",
@@ -126,6 +127,7 @@
 		"./external/monaco-editor": "./dist-cms/external/monaco-editor/index.js",
 		"./external/openid": "./dist-cms/external/openid/index.js",
 		"./external/rxjs": "./dist-cms/external/rxjs/index.js",
+		"./external/signalr": "./dist-cms/external/signalr/index.js",
 		"./external/tiptap": "./dist-cms/external/tiptap/index.js",
 		"./external/uui": "./dist-cms/external/uui/index.js"
 	},

src/Umbraco.Web.UI.Client/package.json

@@ -15,6 +15,7 @@ const CORE_PACKAGES = [
 	import('../../packages/block/umbraco-package.js'),
 	import('../../packages/clipboard/umbraco-package.js'),
 	import('../../packages/code-editor/umbraco-package.js'),
+	import('../../packages/content/umbraco-package.js'),
 	import('../../packages/data-type/umbraco-package.js'),
 	import('../../packages/dictionary/umbraco-package.js'),
 	import('../../packages/documents/umbraco-package.js'),
@@ -24,6 +25,7 @@ const CORE_PACKAGES = [
 	import('../../packages/help/umbraco-package.js'),
 	import('../../packages/language/umbraco-package.js'),
 	import('../../packages/log-viewer/umbraco-package.js'),
+	import('../../packages/management-api/umbraco-package.js'),
 	import('../../packages/markdown-editor/umbraco-package.js'),
 	import('../../packages/media/umbraco-package.js'),
 	import('../../packages/members/umbraco-package.js'),
@@ -48,7 +50,6 @@ const CORE_PACKAGES = [
 	import('../../packages/umbraco-news/umbraco-package.js'),
 	import('../../packages/user/umbraco-package.js'),
 	import('../../packages/webhook/umbraco-package.js'),
-	import('../../packages/content/umbraco-package.js'),
 ];
 
 @customElement('umb-backoffice')

src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts

@@ -0,0 +1 @@
+export * from '@microsoft/signalr';

src/Umbraco.Web.UI.Client/src/external/signalr/index.ts

@@ -0,0 +1,11 @@
+{
+	"name": "@umbraco-backoffice/signalr",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"build": "vite build"
+	},
+	"dependencies": {
+		"@microsoft/signalr": "9.0.6"
+	}
+}

src/Umbraco.Web.UI.Client/src/external/signalr/package.json

@@ -0,0 +1,18 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base';
+
+const dist = '../../../dist-cms/external/signalr';
+
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+
+export default defineConfig({
+	...getDefaultConfig({
+		dist,
+		base: '/umbraco/backoffice/external/signalr',
+		entry: {
+			index: './index.ts',
+		},
+	}),
+});