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

align file system folder data sources

Browse Source
This commit is contained in:
Mads Rasmussen
2024-01-09 15:31:23 +01:00
parent 6b28396515
commit d6c62b822d
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts
View File

@@ -33,11 +33,12 @@ export class UmbScriptFolderServerDataSource implements UmbFolderDataSource {
if (!unique) throw new Error('Unique is missing');
const path = this.#serverPathUniqueSerializer.toServerPath(unique);
if (!path) throw new Error('Cannot read script folder without a path');
const { data, error } = await tryExecuteAndNotify(
this.#host,
ScriptResource.getScriptFolderByPath({
path,
path: encodeURIComponent(path),
}),
);
@@ -67,9 +68,7 @@ export class UmbScriptFolderServerDataSource implements UmbFolderDataSource {
const parentPath = new UmbServerPathUniqueSerializer().toServerPath(args.parentUnique);
const requestBody: CreateScriptFolderRequestModel = {
parent: {
path: parentPath,
},
parent: parentPath ? { path: parentPath } : null,
name: args.name,
};
@@ -81,8 +80,9 @@ export class UmbScriptFolderServerDataSource implements UmbFolderDataSource {
);
if (data) {
const newPath = this.#serverPathUniqueSerializer.toUnique(data);
return this.read(newPath);
const newPath = decodeURIComponent(data);
const newPathUnique = this.#serverPathUniqueSerializer.toUnique(newPath);
return this.read(newPathUnique);
}
return { error };
@@ -98,11 +98,12 @@ export class UmbScriptFolderServerDataSource implements UmbFolderDataSource {
if (!unique) throw new Error('Unique is missing');
const path = this.#serverPathUniqueSerializer.toServerPath(unique);
if (!path) throw new Error('Cannot delete script folder without a path');
return tryExecuteAndNotify(
this.#host,
ScriptResource.deleteScriptFolderByPath({
path,
path: encodeURIComponent(path),
}),
);
}

15
src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts
View File

@@ -33,11 +33,12 @@ export class UmbStylesheetFolderServerDataSource implements UmbFolderDataSource
if (!unique) throw new Error('Unique is missing');
const path = this.#serverPathUniqueSerializer.toServerPath(unique);
if (!path) throw new Error('Cannot read stylesheet folder without a path');
const { data, error } = await tryExecuteAndNotify(
this.#host,
StylesheetResource.getStylesheetFolderByPath({
path,
path: encodeURIComponent(path),
}),
);
@@ -67,9 +68,7 @@ export class UmbStylesheetFolderServerDataSource implements UmbFolderDataSource
const parentPath = new UmbServerPathUniqueSerializer().toServerPath(args.parentUnique);
const requestBody: CreateStylesheetFolderRequestModel = {
parent: {
path: parentPath,
},
parent: parentPath ? { path: parentPath } : null,
name: args.name,
};
@@ -81,8 +80,9 @@ export class UmbStylesheetFolderServerDataSource implements UmbFolderDataSource
);
if (data) {
const newPath = this.#serverPathUniqueSerializer.toUnique(data);
return this.read(newPath);
const newPath = decodeURIComponent(data);
const newPathUnique = this.#serverPathUniqueSerializer.toUnique(newPath);
return this.read(newPathUnique);
}
return { error };
@@ -98,11 +98,12 @@ export class UmbStylesheetFolderServerDataSource implements UmbFolderDataSource
if (!unique) throw new Error('Unique is missing');
const path = this.#serverPathUniqueSerializer.toServerPath(unique);
if (!path) throw new Error('Cannot delete stylesheet folder without a path');
return tryExecuteAndNotify(
this.#host,
StylesheetResource.deleteStylesheetFolderByPath({
path,
path: encodeURIComponent(path),
}),
);
}