feature: support Umbraco 15

Author: jcdcdev

.github/workflows/build.yml

@@ -13,6 +13,6 @@ jobs:
           project-path: src/Umbraco.Community.SimpleTrees/Umbraco.Community.SimpleTrees.csproj
           npm-working-dir: src/Umbraco.Community.SimpleTrees.Client
           npm-enabled: true
-          umbraco-version: 16
+          umbraco-version: 15
           dotnet-version: "9"
           npm-version: "22.x"

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
           npm-working-dir: src/Umbraco.Community.SimpleTrees.Client
           npm-enabled: true
           npm-version: "22.x"
-          umbraco-version: 16
+          umbraco-version: 15
           dotnet-version: "9"
       - name: Release
         uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main

.github/workflows/update-readme.yml

@@ -30,7 +30,7 @@ jobs:
     needs: get-refs
     env:
       DRY_RUN: ${{ github.event.inputs.dry-run }}
-      PROJECT_NAME: jcdcdev.Umbraco.RelationsManager
+      PROJECT_NAME: Umbraco.Community.SimpleTrees
       README_FILEPATH: ./.github/README.md
       NUGET_README_FILEPATH: ./docs/README_nuget.md
     strategy:

.github/workflows/update-security-policy.yml

@@ -30,7 +30,7 @@ jobs:
     needs: get-refs
     env:
       DRY_RUN: ${{ github.event.inputs.dry-run }}
-      PROJECT_NAME: jcdcdev.Umbraco.RelationsManager
+      PROJECT_NAME: Umbraco.Community.SimpleTrees
       SECURITY_POLICY_FILEPATH: ./SECURITY.md
     strategy:
       max-parallel: 1

src/Umbraco.Community.SimpleTrees.Client/package-lock.json

@@ -13,7 +13,7 @@
 		"lit": "^3.3.0",
 		"@hey-api/client-fetch": "^0.10.0",
 		"@hey-api/openapi-ts": "^0.67.3",
-		"@umbraco-cms/backoffice": "^16.0.0-rc5",
+		"@umbraco-cms/backoffice": "^15.4.3",
 		"typescript": "^5.8.3",
 		"vite": "^6.3.5"
 	},

src/Umbraco.Community.SimpleTrees.Client/package.json

@@ -1,7 +1,6 @@
 import {UmbControllerHost} from "@umbraco-cms/backoffice/controller-api";
-import {UmbDataSourceResponse} from "@umbraco-cms/backoffice/repository";
-import {tryExecute} from "@umbraco-cms/backoffice/resources";
-import {GetUmbracoSimpleTreesApiV1TreeRootResponse, SimpleTreesService} from "../api";
+import {tryExecuteAndNotify} from "@umbraco-cms/backoffice/resources";
+import {SimpleTreesService} from "../api";
 import {SimpleTreesChildrenOfRequestArgs, SimpleTreesRootItemsRequestArgs} from "../tree/types.ts";
 
 export class SimpleTreesDataSource {
@@ -13,7 +12,7 @@ export class SimpleTreesDataSource {
 
 	}
 
-	async getRoot(args: SimpleTreesRootItemsRequestArgs): Promise<UmbDataSourceResponse<GetUmbracoSimpleTreesApiV1TreeRootResponse>> {
+	async getRoot(args: SimpleTreesRootItemsRequestArgs) {
 		const options = {
 			query: {
 				skip: args.skip,
@@ -22,14 +21,14 @@ export class SimpleTreesDataSource {
 				treeAlias: args.treeAlias
 			}
 		}
-		return await tryExecute(this.#host, SimpleTreesService.getUmbracoSimpleTreesApiV1TreeRoot(options));
+		return await tryExecuteAndNotify(this.#host, SimpleTreesService.getUmbracoSimpleTreesApiV1TreeRoot(options));
 	}
-	
-	async getChildren(args: SimpleTreesChildrenOfRequestArgs): Promise<UmbDataSourceResponse<GetUmbracoSimpleTreesApiV1TreeRootResponse>> {
+
+	async getChildren(args: SimpleTreesChildrenOfRequestArgs) {
 		if (!args.parent.unique) {
 			return await this.getRoot(args);
 		}
-		
+
 		const options = {
 			query: {
 				treeAlias: args.treeAlias,
@@ -40,7 +39,7 @@ export class SimpleTreesDataSource {
 				foldersOnly: args.foldersOnly,
 			}
 		}
-		
-		return await tryExecute(this.#host, SimpleTreesService.getUmbracoSimpleTreesApiV1TreeItems(options));
+
+		return await tryExecuteAndNotify(this.#host, SimpleTreesService.getUmbracoSimpleTreesApiV1TreeItems(options));
 	}
 }

src/Umbraco.Community.SimpleTrees.Client/src/repository/simple-trees.data-source.ts

@@ -10,7 +10,7 @@ import {UmbControllerHost} from "@umbraco-cms/backoffice/controller-api";
 import {SimpleTreesTreeServerDataSource} from "../tree/simple-trees.server-data-source.ts";
 import {UmbApi} from "@umbraco-cms/backoffice/extension-api";
 import {SIMPLE_TREES_TREE_STORE_CONTEXT} from "../tree/simple-trees.tree-store.ts";
-import {tryExecute} from "@umbraco-cms/backoffice/resources";
+import {tryExecuteAndNotify} from "@umbraco-cms/backoffice/resources";
 import {SimpleTreesService} from "../api";
 
 export class SimpleTreesRepository extends UmbTreeRepositoryBase<SimpleTreesTreeItemModel, SimpleTreesTreeRootModel, SimpleTreesRootItemsRequestArgs, SimpleTreesChildrenOfRequestArgs, SimpleTreesAncestorsOfRequestArgs> implements UmbApi {
@@ -58,7 +58,7 @@ export class SimpleTreesRepository extends UmbTreeRepositoryBase<SimpleTreesTree
 				entityType: entityType,
 			}
 		};
-		return await tryExecute(this._host, SimpleTreesService.getUmbracoSimpleTreesApiV1TreeRender(options));
+		return await tryExecuteAndNotify(this._host, SimpleTreesService.getUmbracoSimpleTreesApiV1TreeRender(options));
 	}
 }
 

src/Umbraco.Community.SimpleTrees.Client/src/repository/simple-trees.repository.ts

@@ -7,7 +7,6 @@ import {
 	SimpleTreesRootItemsRequestArgs,
 	SimpleTreesTreeItemModel
 } from "./types.ts";
-import {UmbDataSourceResponse} from "@umbraco-cms/backoffice/repository";
 import {SimpleTreeItem} from "../api";
 
 export class SimpleTreesTreeServerDataSource extends UmbTreeServerDataSourceBase<SimpleTreeItem, SimpleTreesTreeItemModel, SimpleTreesRootItemsRequestArgs, SimpleTreesChildrenOfRequestArgs, SimpleTreesAncestorsOfRequestArgs> {
@@ -16,13 +15,22 @@ export class SimpleTreesTreeServerDataSource extends UmbTreeServerDataSourceBase
 
 	constructor(host: UmbControllerHost) {
 		const getRootItems = async (args: SimpleTreesRootItemsRequestArgs) => {
-			return await this.resource?.getRoot(args)!;
+			const results = await this.resource?.getRoot(args)!;
+			return {
+				total: results.data?.data.total || 0,
+				items: results.data?.data.items || []
+			}
+
 		};
 
 		const getChildrenOf = async (args: SimpleTreesChildrenOfRequestArgs) => {
 			// @ts-ignore
 			args.treeAlias = this._host?._treeAlias;
-			return await this.resource?.getChildren(args)!;
+			const results = await this.resource?.getChildren(args)!;
+			return {
+				total: results.data?.data.total || 0,
+				items: results.data?.data.items || []
+			}
 		};
 
 		const mapper = (item: SimpleTreeItem): SimpleTreesTreeItemModel => {
@@ -41,7 +49,7 @@ export class SimpleTreesTreeServerDataSource extends UmbTreeServerDataSourceBase
 			};
 		};
 
-		function getAncestorsOf(args: SimpleTreesAncestorsOfRequestArgs): Promise<UmbDataSourceResponse<Array<SimpleTreeItem>>> {
+		function getAncestorsOf(args: SimpleTreesAncestorsOfRequestArgs) : Promise<SimpleTreeItem[]> {
 			console.log('getAncestorsOf', args);
 			throw new Error('Method not implemented.');
 		}

src/Umbraco.Community.SimpleTrees.Client/src/tree/simple-trees.server-data-source.ts

@@ -9,7 +9,7 @@ const SIMPLE_TREES_MANAGER_CONTEXT_TOKEN = 'SimpleTrees.Workspace';
 const EDIT_SIMPLE_TREES_WORKSPACE_PATH_PATTERN = new UmbPathPattern('/edit/:id');
 
 export class SimpleTreesWorkspaceContext
-	extends UmbContextBase
+	extends UmbContextBase<SimpleTreesWorkspaceContext>
 	implements UmbWorkspaceContext, UmbRoutableWorkspaceContext {
 	readonly routes: UmbWorkspaceRouteManager;