From a6905662090702e171dedfc9ea8fb12f7234043d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 27 Feb 2023 15:04:12 +0100
Subject: [PATCH] update all workspace actions

---
 .../workspace/actions/save-and-publish.action.ts     | 12 ++++--------
 .../workspace/actions/save-and-schedule.action.ts    | 12 ++++--------
 .../workspace-context/workspace-context.interface.ts |  1 +
 .../shared/workspace-actions/save.action.ts          | 12 +++++++-----
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-publish.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-publish.action.ts
index 9d32a23225..1e0c6e368b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-publish.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-publish.action.ts
@@ -1,14 +1,10 @@
 import { UmbWorkspaceAction } from '../../../../shared/components/workspace/workspace-action';
 import { UmbDocumentWorkspaceContext } from '../document-workspace.context';
-import { UmbDocumentRepository } from '../../repository/document.repository';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
-export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceAction<
-	UmbDocumentRepository,
-	UmbDocumentWorkspaceContext
-> {
-	constructor(host: UmbControllerHostInterface, repositoryAlias: string) {
-		super(host, repositoryAlias);
+export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceAction<UmbDocumentWorkspaceContext> {
+	constructor(host: UmbControllerHostInterface) {
+		super(host);
 	}
 
 	async execute() {
@@ -17,6 +13,6 @@ export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceAction
 		const document = this.workspaceContext.getData();
 		// TODO: handle errors
 		if (!document) return;
-		this.repository?.saveAndPublish();
+		this.workspaceContext.repository.saveAndPublish();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-schedule.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-schedule.action.ts
index 3c79e5fd37..58811ee248 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-schedule.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/actions/save-and-schedule.action.ts
@@ -1,14 +1,10 @@
 import { UmbWorkspaceAction } from '../../../../shared/components/workspace/workspace-action';
-import { UmbDocumentRepository } from '../../repository/document.repository';
 import { UmbDocumentWorkspaceContext } from '../document-workspace.context';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
-export class UmbSaveAndScheduleDocumentWorkspaceAction extends UmbWorkspaceAction<
-	UmbDocumentRepository,
-	UmbDocumentWorkspaceContext
-> {
-	constructor(host: UmbControllerHostInterface, repositoryAlias: string) {
-		super(host, repositoryAlias);
+export class UmbSaveAndScheduleDocumentWorkspaceAction extends UmbWorkspaceAction<UmbDocumentWorkspaceContext> {
+	constructor(host: UmbControllerHostInterface) {
+		super(host);
 	}
 
 	async execute() {
@@ -17,6 +13,6 @@ export class UmbSaveAndScheduleDocumentWorkspaceAction extends UmbWorkspaceActio
 		const document = this.workspaceContext.getData();
 		// TODO: handle errors
 		if (!document) return;
-		this.repository?.saveAndSchedule();
+		this.workspaceContext.repository.saveAndSchedule();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface.ts
index e372dfc228..c04061f3e1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface.ts
@@ -1,6 +1,7 @@
 import { Observable } from 'rxjs';
 
 export interface UmbWorkspaceContextInterface<T = unknown> {
+	repository: any; // TODO: add type
 	isNew: Observable<boolean>;
 	getIsNew(): boolean;
 	setIsNew(value: boolean): void;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/workspace-actions/save.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/workspace-actions/save.action.ts
index 4719ead35b..8701ad850c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/workspace-actions/save.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/workspace-actions/save.action.ts
@@ -3,9 +3,9 @@ import { UmbWorkspaceContextInterface } from '../components/workspace/workspace-
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
 // TODO: add interface for repo/partial repo/save-repo
-export class UmbSaveWorkspaceAction extends UmbWorkspaceAction<any, UmbWorkspaceContextInterface> {
-	constructor(host: UmbControllerHostInterface, repositoryAlias: string) {
-		super(host, repositoryAlias);
+export class UmbSaveWorkspaceAction extends UmbWorkspaceAction<UmbWorkspaceContextInterface> {
+	constructor(host: UmbControllerHostInterface) {
+		super(host);
 	}
 
 	/* TODO: we need a solution for all actions to notify the system that is has been executed.
@@ -26,7 +26,8 @@ export class UmbSaveWorkspaceAction extends UmbWorkspaceAction<any, UmbWorkspace
 		if (!this.workspaceContext) return;
 
 		// TODO: preferably the actions dont talk directly with repository, but instead with its context.
-		const { error } = await this.repository.create(data);
+		// We just need to consider how third parties can extend the system.
+		const { error } = await this.workspaceContext.repository.create(data);
 
 		// TODO: this is temp solution to bubble validation errors to the UI
 		if (error) {
@@ -41,6 +42,7 @@ export class UmbSaveWorkspaceAction extends UmbWorkspaceAction<any, UmbWorkspace
 	}
 
 	#update(data: any) {
-		this.repository?.save(data);
+		if (!this.workspaceContext) return;
+		this.workspaceContext.repository?.save(data);
 	}
 }