Merge branch 'main' of https://github.com/umbraco/Umbraco-CMS

Author: AndyButland

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

@@ -258,7 +258,7 @@
 		"typescript-eslint": "^8.39.1",
 		"typescript-json-schema": "^0.65.1",
 		"vite": "^7.1.2",
-		"vite-plugin-static-copy": "^3.1.1",
+		"vite-plugin-static-copy": "^3.1.2",
 		"vite-tsconfig-paths": "^5.1.4",
 		"web-component-analyzer": "^2.0.0"
 	},

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

@@ -298,7 +298,7 @@ export abstract class UmbContentDetailWorkspaceContextBase<
 			this.variantOptions,
 			(variantOptions) => {
 				variantOptions.forEach((variantOption) => {
-					const missingThis = this.#variantValidationContexts.filter((x) => {
+					const missingThis = !this.#variantValidationContexts.some((x) => {
 						const variantId = x.getVariantId();
 						if (!variantId) return;
 						return variantId.culture === variantOption.culture && variantId.segment === variantOption.segment;

src/Umbraco.Web.UI.Client/src/packages/content/content/workspace/content-detail-workspace-base.ts

@@ -1,12 +1,16 @@
 import { UmbManagementApiDataTypeDetailDataCacheInvalidationManager } from './repository/detail/server-data-source/data-type-detail.server.cache-invalidation.manager.js';
+import { UmbManagementApiDataTypeItemDataCacheInvalidationManager } from './repository/item/data-type-item.server.cache-invalidation.manager.js';
 import type { UmbEntryPointOnInit, UmbEntryPointOnUnload } from '@umbraco-cms/backoffice/extension-api';
 
 let detailDataCacheInvalidationManager: UmbManagementApiDataTypeDetailDataCacheInvalidationManager | undefined;
+let itemDataCacheInvalidationManager: UmbManagementApiDataTypeItemDataCacheInvalidationManager | undefined;
 
 export const onInit: UmbEntryPointOnInit = (host) => {
 	detailDataCacheInvalidationManager = new UmbManagementApiDataTypeDetailDataCacheInvalidationManager(host);
+	itemDataCacheInvalidationManager = new UmbManagementApiDataTypeItemDataCacheInvalidationManager(host);
 };
 
 export const onUnload: UmbEntryPointOnUnload = () => {
 	detailDataCacheInvalidationManager?.destroy();
+	itemDataCacheInvalidationManager?.destroy();
 };

src/Umbraco.Web.UI.Client/src/packages/data-type/entry-point.ts

@@ -7,20 +7,26 @@ import {
 	type DataTypeResponseModel,
 	type UpdateDataTypeRequestModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
-import { UmbManagementApiDetailDataRequestManager } from '@umbraco-cms/backoffice/management-api';
+import {
+	UmbManagementApiDetailDataRequestManager,
+	UmbManagementApiInflightRequestCache,
+} from '@umbraco-cms/backoffice/management-api';
 
 export class UmbManagementApiDataTypeDetailDataRequestManager extends UmbManagementApiDetailDataRequestManager<
 	DataTypeResponseModel,
 	UpdateDataTypeRequestModel,
 	CreateDataTypeRequestModel
 > {
+	static #inflightRequestCache = new UmbManagementApiInflightRequestCache<DataTypeResponseModel>();
+
 	constructor(host: UmbControllerHost) {
 		super(host, {
 			create: (body: CreateDataTypeRequestModel) => DataTypeService.postDataType({ body }),
 			read: (id: string) => DataTypeService.getDataTypeById({ path: { id } }),
 			update: (id: string, body: UpdateDataTypeRequestModel) => DataTypeService.putDataTypeById({ path: { id }, body }),
 			delete: (id: string) => DataTypeService.deleteDataTypeById({ path: { id } }),
 			dataCache: dataTypeDetailCache,
+			inflightRequestCache: UmbManagementApiDataTypeDetailDataRequestManager.#inflightRequestCache,
 		});
 	}
 }

src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/server-data-source/data-type-detail.server.request-manager.ts

@@ -0,0 +1,13 @@
+import { dataTypeItemCache } from './data-type-item.server.cache.js';
+import { UmbManagementApiItemDataCacheInvalidationManager } from '@umbraco-cms/backoffice/management-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import type { DataTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+
+export class UmbManagementApiDataTypeItemDataCacheInvalidationManager extends UmbManagementApiItemDataCacheInvalidationManager<DataTypeItemResponseModel> {
+	constructor(host: UmbControllerHost) {
+		super(host, {
+			dataCache: dataTypeItemCache,
+			eventSources: ['Umbraco:CMS:DataType'],
+		});
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.server.cache-invalidation.manager.ts

@@ -0,0 +1,6 @@
+import type { DataTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbManagementApiItemDataCache } from '@umbraco-cms/backoffice/management-api';
+
+const dataTypeItemCache = new UmbManagementApiItemDataCache<DataTypeItemResponseModel>();
+
+export { dataTypeItemCache };

src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.server.cache.ts

@@ -1,12 +1,11 @@
 import { UMB_DATA_TYPE_ENTITY_TYPE } from '../../entity.js';
 import type { UmbDataTypeItemModel } from './types.js';
+import { UmbManagementApiDataTypeItemDataRequestManager } from './data-type-item.server.request-manager.js';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 import type { DataTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
-import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/property-editor';
-import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 
 let manifestPropertyEditorUis: Array<ManifestPropertyEditorUi> = [];
 
@@ -19,12 +18,13 @@ export class UmbDataTypeItemServerDataSource extends UmbItemServerDataSourceBase
 	DataTypeItemResponseModel,
 	UmbDataTypeItemModel
 > {
+	#itemRequestManager = new UmbManagementApiDataTypeItemDataRequestManager(this);
+
 	/**
 	 * Creates an instance of UmbDataTypeItemServerDataSource.
 	 * @param {UmbControllerHost} host - The controller host for this controller to be appended to
 	 * @memberof UmbDataTypeItemServerDataSource
 	 */
-
 	constructor(host: UmbControllerHost) {
 		super(host, {
 			mapper,
@@ -41,13 +41,7 @@ export class UmbDataTypeItemServerDataSource extends UmbItemServerDataSourceBase
 	override async getItems(uniques: Array<string>) {
 		if (!uniques) throw new Error('Uniques are missing');
 
-		const itemRequestManager = new UmbItemDataApiGetRequestController(this, {
-			// eslint-disable-next-line local-rules/no-direct-api-import
-			api: (args) => DataTypeService.getItemDataType({ query: { id: args.uniques } }),
-			uniques,
-		});
-
-		const { data, error } = await itemRequestManager.request();
+		const { data, error } = await this.#itemRequestManager.getItems(uniques);
 
 		return { data: this._getMappedItems(data), error };
 	}

src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.server.data-source.ts

@@ -0,0 +1,15 @@
+/* eslint-disable local-rules/no-direct-api-import */
+import { dataTypeItemCache } from './data-type-item.server.cache.js';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { DataTypeService, type DataTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbManagementApiItemDataRequestManager } from '@umbraco-cms/backoffice/management-api';
+
+export class UmbManagementApiDataTypeItemDataRequestManager extends UmbManagementApiItemDataRequestManager<DataTypeItemResponseModel> {
+	constructor(host: UmbControllerHost) {
+		super(host, {
+			getItems: (ids: Array<string>) => DataTypeService.getItemDataType({ query: { id: ids } }),
+			dataCache: dataTypeItemCache,
+			getUniqueMethod: (item) => item.id,
+		});
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.server.request-manager.ts

@@ -0,0 +1,12 @@
+import { UmbManagementApiDictionaryItemDataCacheInvalidationManager } from './repository/item/dictionary-item.server.cache-invalidation.manager.js';
+import type { UmbEntryPointOnInit, UmbEntryPointOnUnload } from '@umbraco-cms/backoffice/extension-api';
+
+let itemDataCacheInvalidationManager: UmbManagementApiDictionaryItemDataCacheInvalidationManager | undefined;
+
+export const onInit: UmbEntryPointOnInit = (host) => {
+	itemDataCacheInvalidationManager = new UmbManagementApiDictionaryItemDataCacheInvalidationManager(host);
+};
+
+export const onUnload: UmbEntryPointOnUnload = () => {
+	itemDataCacheInvalidationManager?.destroy();
+};