From 813c3bf17454d5c32218fc28df55c1a636df5a67 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:15:01 +0200
Subject: [PATCH] cleanup

---
 .../src/packages/templating/scripts/config.ts      |  8 +++++---
 .../templating/scripts/repository/manifests.ts     |  5 +----
 .../scripts/repository/scripts.repository.ts       | 14 ++++++--------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/config.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/config.ts
index e534246dc5..d22c90f5fa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/config.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/config.ts
@@ -8,8 +8,10 @@ export const SCRIPTS_FOLDER_ENTITY_TYPE = 'script-folder';
 export const SCRIPTS_FOLDER_EMPTY_ENTITY_TYPE = 'script-folder-empty';
 
 export const SCRIPTS_REPOSITORY_ALIAS = 'Umb.Repository.Scripts';
-
 export const SCRIPTS_TREE_ALIAS = 'Umb.Tree.Scripts';
 
-export const UMB_SCRIPTS_TREE_STORE_CONTEXT_TOKEN_ALIAS = 'Umb.Store.Scripts.Tree';
-export const UMB_SCRIPTS_STORE_CONTEXT_TOKEN_ALIAS = 'Umb.Store.Scripts';
+export const SCRIPTS_STORE_ALIAS = 'Umb.Store.Scripts';
+export const SCRIPTS_TREE_STORE_ALIAS = 'Umb.Store.Scripts.Tree';
+
+export const UMB_SCRIPTS_TREE_STORE_CONTEXT_TOKEN_ALIAS = 'Umb.Store.Scripts.Tree.Context.Token';
+export const UMB_SCRIPTS_STORE_CONTEXT_TOKEN_ALIAS = 'Umb.Store.Scripts.Context.Token';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/manifests.ts
index 70b8ed527c..7655a64cc3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/manifests.ts
@@ -1,4 +1,4 @@
-import { SCRIPTS_REPOSITORY_ALIAS } from '../config.js';
+import { SCRIPTS_REPOSITORY_ALIAS, SCRIPTS_STORE_ALIAS, SCRIPTS_TREE_STORE_ALIAS } from '../config.js';
 import { UmbScriptsRepository } from './scripts.repository.js';
 import { UmbScriptsStore } from './scripts.store.js';
 import { UmbScriptsTreeStore } from './scripts.tree.store.js';
@@ -11,9 +11,6 @@ const repository: ManifestRepository = {
 	class: UmbScriptsRepository,
 };
 
-export const SCRIPTS_STORE_ALIAS = 'Umb.Store.PartialViews';
-export const SCRIPTS_TREE_STORE_ALIAS = 'Umb.Store.PartialViewsTree';
-
 const store: ManifestStore = {
 	type: 'store',
 	alias: SCRIPTS_STORE_ALIAS,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts
index dc666c21ed..f6db52f6e0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts
@@ -1,10 +1,7 @@
-import { PARTIAL_VIEW_ROOT_ENTITY_TYPE } from '../../partial-views/config.js';
-import { UMB_PARTIAL_VIEW_TREE_STORE_CONTEXT_TOKEN } from '../../partial-views/repository/partial-views.tree.store.js';
-import { PartialViewGetFolderResponse } from '../../partial-views/repository/sources/partial-views.folder.server.data.js';
 import { UmbScriptsTreeServerDataSource } from './sources/scripts.tree.server.data.js';
 import { UmbScriptsServerDataSource } from './sources/scripts.detail.server.data.js';
-import { UmbScriptsFolderServerDataSource } from './sources/scripts.folder.server.data.js';
-import { UmbScriptsTreeStore } from './scripts.tree.store.js';
+import { ScriptsGetFolderResponse, UmbScriptsFolderServerDataSource } from './sources/scripts.folder.server.data.js';
+import { UMB_SCRIPTS_TREE_STORE_CONTEXT_TOKEN, UmbScriptsTreeStore } from './scripts.tree.store.js';
 import {
 	DataSourceResponse,
 	UmbDataSourceErrorResponse,
@@ -27,6 +24,7 @@ import {
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { Observable } from '@umbraco-cms/backoffice/external/rxjs';
+import { SCRIPTS_ROOT_ENTITY_TYPE } from '../config.js';
 
 export class UmbScriptsRepository
 	implements
@@ -51,7 +49,7 @@ export class UmbScriptsRepository
 		this.#folderDataSource = new UmbScriptsFolderServerDataSource(this.#host);
 
 		this.#init = Promise.all([
-			new UmbContextConsumerController(this.#host, UMB_PARTIAL_VIEW_TREE_STORE_CONTEXT_TOKEN, (instance) => {
+			new UmbContextConsumerController(this.#host, UMB_SCRIPTS_TREE_STORE_CONTEXT_TOKEN, (instance) => {
 				this.#treeStore = instance;
 			}),
 		]);
@@ -82,7 +80,7 @@ export class UmbScriptsRepository
 	}
 	async requestFolder(
 		unique: string,
-	): Promise<{ data?: PartialViewGetFolderResponse | undefined; error?: ProblemDetails | undefined }> {
+	): Promise<{ data?: ScriptsGetFolderResponse | undefined; error?: ProblemDetails | undefined }> {
 		await this.#init;
 		return this.#folderDataSource.get(unique);
 	}
@@ -110,7 +108,7 @@ export class UmbScriptsRepository
 		const data = {
 			id: null,
 			path: null,
-			type: PARTIAL_VIEW_ROOT_ENTITY_TYPE,
+			type: SCRIPTS_ROOT_ENTITY_TYPE,
 			name: 'Partial Views',
 			icon: 'umb:folder',
 			hasChildren: true,