yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Julia Gru
2023-09-05 13:15:01 +02:00
committed by Jacob Overgaard
parent b769d9e77b
commit 813c3bf174
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/src/packages/templating/scripts/config.ts
View File

@@ -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';

5
src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/manifests.ts
View File

@@ -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,

14
src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts
View File

@@ -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,