From 368ecbba4ed6b766b51a014e6331b29466e649d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 26 Apr 2023 14:41:41 +0200
Subject: [PATCH] manifest with view clean up

---
 .../libs/extensions-registry/models/index.ts             | 2 +-
 .../models/workspace-view-collection.model.ts            | 9 +++------
 .../extensions-registry/models/workspace-view.model.ts   | 7 -------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/index.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/index.ts
index 5aa1dd3da9..c3b67977d0 100644
--- a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/index.ts
@@ -208,7 +208,7 @@ export interface ManifestElement<ElementType extends HTMLElement = HTMLElement>
 	meta?: unknown;
 }
 
-export interface ManifestWithView extends ManifestElement {
+export interface ManifestWithView<ElementType extends HTMLElement = HTMLElement> extends ManifestElement<ElementType> {
 	meta: MetaManifestWithView;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view-collection.model.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view-collection.model.ts
index 0eced004df..c0f53f870f 100644
--- a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view-collection.model.ts
+++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view-collection.model.ts
@@ -1,15 +1,12 @@
-import type { ManifestBase, ManifestWithConditions } from '.';
+import type { ManifestWithConditions, ManifestWithView, MetaManifestWithView } from '.';
 
 export interface ManifestWorkspaceViewCollection
-	extends ManifestBase,
+	extends ManifestWithView,
 		ManifestWithConditions<ConditionsEditorViewCollection> {
 	type: 'workspaceViewCollection';
 	meta: MetaEditorViewCollection;
 }
-export interface MetaEditorViewCollection {
-	pathname: string;
-	label: string;
-	icon: string;
+export interface MetaEditorViewCollection extends MetaManifestWithView {
 	entityType: string;
 	repositoryAlias: string;
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view.model.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view.model.ts
index c3fa752e98..5ed73f57ed 100644
--- a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view.model.ts
+++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-view.model.ts
@@ -2,16 +2,9 @@ import type { ManifestWithView } from '.';
 
 export interface ManifestWorkspaceView extends ManifestWithView {
 	type: 'workspaceView';
-	meta: MetaWorkspaceView;
 	conditions: ConditionsWorkspaceView;
 }
 
-export interface MetaWorkspaceView {
-	pathname: string;
-	label: string;
-	icon: string;
-}
-
 export interface ConditionsWorkspaceView {
 	workspaces: string[];
 }