@dosgato/api 0.0.35 → 0.0.37

package/dist/asset/asset.service.js

@@ -1,14 +1,14 @@
 import { BaseService } from '@txstate-mws/graphql-server';
 import { ManyJoinedLoader, OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
-import { intersect, isNotNull, keyby, roundTo, sortby } from 'txstate-utils';
-import { getAssets, AssetFolderService, appendPath, getResizes, SiteService, DosGatoService, getLatestDownload, AssetFolderServiceInternal, AssetResponse, fileHandler, deleteAsset, undeleteAsset, popPath, basename, registerResize, getResizesById, VersionedService, cleanupBinaries, getDownloads, getResizeDownloads, AssetFolderResponse, moveAssets, copyAssets } from '../internal.js';
 import { lookup } from 'mime-types';
+import { intersect, isNotNull, keyby, roundTo, sortby } from 'txstate-utils';
+import { getAssets, AssetFolderService, appendPath, getResizes, SiteService, DosGatoService, getLatestDownload, AssetFolderServiceInternal, AssetResponse, fileHandler, deleteAsset, undeleteAsset, popPath, basename, registerResize, getResizesById, VersionedService, cleanupBinaries, getDownloads, getResizeDownloads, AssetFolderResponse, moveAssets, copyAssets, finalizeAssetDeletion, DeletedFilter } from '../internal.js';
 const thumbnailMimes = new Set(['image/jpg', 'image/jpeg', 'image/gif', 'image/png']);
 const assetsByIdLoader = new PrimaryKeyLoader({
-    fetch: async (dataIds) => await getAssets({ ids: dataIds })
+    fetch: async (dataIds) => await getAssets({ ids: dataIds, deleted: DeletedFilter.SHOW })
 });
 const assetsByInternalIdLoader = new PrimaryKeyLoader({
-    fetch: async (internalIds) => await getAssets({ internalIds }),
+    fetch: async (internalIds) => await getAssets({ internalIds, deleted: DeletedFilter.SHOW }),
     extractId: asset => asset.internalId,
     idLoader: assetsByIdLoader
 });
@@ -268,6 +268,18 @@ export class AssetService extends DosGatoService {
             throw new Error('Could not delete asset');
         }
     }
+    async finalizeDeletion(dataId) {
+        const asset = await this.loaders.get(assetsByIdLoader).load(dataId);
+        if (!asset)
+            throw new Error('Asset to be deleted does not exist');
+        if (!(await this.haveAssetPerm(asset, 'delete')))
+            throw new Error(`Current user is not permitted to delete asset ${String(asset.name)}.${asset.extension}.`);
+        const currentUser = await this.currentUser();
+        await finalizeAssetDeletion(asset.internalId, currentUser.internalId);
+        this.loaders.clear();
+        const deletedAsset = await this.loaders.get(assetsByIdLoader).load(dataId);
+        return new AssetResponse({ asset: deletedAsset, success: true });
+    }
     async undelete(dataId) {
         const asset = await this.loaders.get(assetsByIdLoader).load(dataId);
         if (!asset)
@@ -289,32 +301,23 @@ export class AssetService extends DosGatoService {
         if (!asset.box || asset.mime === 'image/svg+xml')
             return;
         const resizes = await this.getResizes(asset);
+        let missingresize = false;
+        for (let w = asset.box.width; w >= 100; w = roundTo(w / 2)) {
+            if (!resizes.find(r => r.mime === 'image/webp' && r.width === w))
+                missingresize = true;
+        }
+        if (!missingresize)
+            return;
         const info = await fileHandler.sharp(asset.checksum).metadata();
         const orientation = info.orientation ?? 1;
-        const colors = await new Promise((resolve, reject) => {
-            const colorSet = new Set();
-            fileHandler.sharp(asset.checksum)
-                .raw()
-                .on('data', (b) => {
-                for (let offset = 0; offset < b.length && colorSet.size < 10000; offset += info.channels) {
-                    const colorString = Array.from({ length: info.channels }, (_, i) => b[offset + i]).join(',');
-                    colorSet.add(colorString);
-                }
-            })
-                .on('error', () => reject(new Error('there was a problem counting colors in image ' + asset.filename)))
-                .on('end', () => resolve(colorSet.size));
-        });
-        const outputformat = colors >= 10000
-            ? 'jpg'
-            : (info.pages ?? 0) > 0 && info.format !== 'heif'
-                ? 'gif'
-                : 'png';
-        const outputmime = lookup(outputformat);
-        const img = fileHandler.sharp(asset.checksum, { animated: outputformat === 'gif' });
+        const animated = (info.pages ?? 0) > 0 && info.format !== 'heif';
+        const img = fileHandler.sharp(asset.checksum, { animated });
+        // make the lossless vs lossy decision only once, at the biggest size
+        const biggestwebpresize = resizes.find(r => r.mime === 'image/webp' && r.width === asset.box.width);
+        let uselossless = biggestwebpresize?.lossless;
         for (let w = asset.box.width; w >= 100; w = roundTo(w / 2)) {
-            const needregular = !resizes.some(r => r.mime === outputmime && r.width === w);
-            const needwebp = !resizes.some(r => r.mime === 'image/webp' && r.width === w);
-            if (needregular || needwebp) {
+            const webpresize = resizes.find(r => r.mime === 'image/webp' && r.width === w);
+            if (!webpresize) {
                 const resized = img.clone().resize(w, null, { kernel: 'mitchell' })
                     // theoretically one call to .rotate() is supposed to fix orientation, but
                     // there seems to be a bug in sharpjs where the rotation doesn't take
@@ -323,25 +326,45 @@ export class AssetService extends DosGatoService {
                     .flip(exifToFlip[orientation])
                     .flop(exifToFlop[orientation])
                     .rotate(exifToRotation[orientation]);
-                if (needregular) {
-                    const formatted = outputformat === 'jpg'
-                        ? resized.clone().jpeg({ quality: 65 })
-                        : outputformat === 'png'
-                            ? resized.clone().png({ palette: colors <= 256, compressionLevel: 9, progressive: true })
-                            : resized.clone().gif({ effort: 10, reoptimize: true, loop: info.loop ?? 0 });
-                    const { checksum, info: outputinfo } = await fileHandler.sharpWrite(formatted);
-                    if (outputinfo.size > asset.size && ['image/jpeg', 'image/png', 'image/gif'].includes(asset.mime)) {
-                        // we made a resize that's bigger than the original, abort!
-                        await cleanupBinaries([checksum]);
+                let webp, webpsum, webpinfo;
+                if (uselossless !== true) {
+                    webp = resized.clone().webp({ quality: 75, effort: 6, loop: info.loop ?? 0 });
+                    ({ checksum: webpsum, info: webpinfo } = await fileHandler.sharpWrite(webp));
+                }
+                if (uselossless !== false) {
+                    // try making a near-lossless version and see whether it's acceptably small
+                    const lossless = resized.clone().webp({ quality: 75, effort: 6, loop: info.loop ?? 0, nearLossless: true });
+                    const { checksum: losslesssum, info: losslessinfo } = await fileHandler.sharpWrite(lossless);
+                    if (uselossless === true || losslessinfo.size < webpinfo.size * 1.2) {
+                        if (webpsum)
+                            await cleanupBinaries([webpsum]);
+                        webp = lossless;
+                        webpsum = losslesssum;
+                        webpinfo = losslessinfo;
+                        uselossless = true;
                     }
                     else {
-                        await registerResize(asset, w, checksum, outputmime, outputformat === 'jpg' ? 60 : 0, outputinfo.size);
+                        uselossless = false;
+                        await cleanupBinaries([losslesssum]);
                     }
                 }
-                if (needwebp) {
-                    const webp = resized.webp({ quality: 75, effort: 6, loop: info.loop ?? 0 });
-                    const { checksum: webpsum, info: webpinfo } = await fileHandler.sharpWrite(webp);
-                    await registerResize(asset, w, webpsum, 'image/webp', 75, webpinfo.size);
+                await registerResize(asset, w, webpsum, 'image/webp', 75, webpinfo.size, uselossless);
+                const outputformat = uselossless
+                    ? (animated ? 'gif' : 'png')
+                    : 'jpg';
+                const outputmime = lookup(outputformat);
+                const formatted = outputformat === 'jpg'
+                    ? resized.clone().jpeg({ quality: 65 })
+                    : outputformat === 'png'
+                        ? resized.clone().png({ compressionLevel: 9, progressive: true })
+                        : resized.clone().gif({ effort: 10, reoptimize: true, loop: info.loop ?? 0 });
+                const { checksum, info: outputinfo } = await fileHandler.sharpWrite(formatted);
+                if (outputinfo.size > asset.size && ['image/jpeg', 'image/png', 'image/gif'].includes(asset.mime)) {
+                    // we made a resize that's bigger than the original and no more compatible, abort!
+                    await cleanupBinaries([checksum]);
+                }
+                else {
+                    await registerResize(asset, w, checksum, outputmime, outputformat === 'jpg' ? 65 : 0, outputinfo.size, outputformat === 'gif' || outputformat === 'jpg');
                 }
             }
         }

package/dist/asset/asset.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../src/asset/asset.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../src/asset/asset.service.ts"],"names":[],"mappings":"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"}

package/dist/assetfolder/assetfolder.database.d.ts

@@ -1,4 +1,4 @@
-import { AssetFolder, AssetFolderFilter, CreateAssetFolderInput } from '../internal.js';
+import { AssetFolder, AssetFolderFilter, CreateAssetFolderInput, DeleteState } from '../internal.js';
 export interface AssetFolderRow {
     id: number;
     siteId: number;
@@ -6,10 +6,12 @@ export interface AssetFolderRow {
     name: string;
     guid: string;
     deletedAt?: Date;
+    deleteState: DeleteState;
     deletedBy?: string;
 }
 export declare function getAssetFolders(filter?: AssetFolderFilter): Promise<AssetFolder[]>;
 export declare function createAssetFolder(args: CreateAssetFolderInput): Promise<AssetFolder>;
 export declare function renameAssetFolder(folderId: string, name: string): Promise<number>;
-export declare function deleteAssetFolder(id: number, userInternalId: number): Promise<number>;
-export declare function undeleteAssetFolder(id: number): Promise<number>;
+export declare function deleteAssetFolder(id: number, userInternalId: number): Promise<void>;
+export declare function finalizeAssetFolderDeletion(id: number, userInternalId: number): Promise<void>;
+export declare function undeleteAssetFolder(id: number): Promise<void>;

package/dist/assetfolder/assetfolder.database.js

@@ -1,6 +1,6 @@
 import db from 'mysql2-async/db';
 import { nanoid } from 'nanoid';
-import { AssetFolder } from '../internal.js';
+import { AssetFolder, DeletedFilter, DeleteState } from '../internal.js';
 async function processFilters(filter) {
     const where = [];
     const binds = [];
@@ -34,14 +34,20 @@ async function processFilters(filter) {
     if (filter?.root) {
         where.push('assetfolders.path = \'/\'');
     }
-    if (filter?.deleted != null) {
-        if (filter.deleted) {
-            where.push('assetfolders.deletedAt IS NOT NULL');
+    if (filter?.deleted) {
+        if (filter.deleted === DeletedFilter.ONLY) {
+            // Only show deleted asset folders
+            where.push(`assetfolders.deleteState = ${DeleteState.DELETED}`);
         }
-        else {
-            where.push('assetfolders.deletedAt IS NULL');
+        else if (filter.deleted === DeletedFilter.HIDE) {
+            // hide fully deleted asset folders
+            where.push(`assetfolders.deleteState != ${DeleteState.DELETED}`);
         }
     }
+    else {
+        // deleted filter not specified, return asset folders that are not fully deleted
+        where.push(`assetfolders.deleteState != ${DeleteState.DELETED}`);
+    }
     return { where, binds };
 }
 export async function getAssetFolders(filter) {
@@ -65,9 +71,27 @@ export async function renameAssetFolder(folderId, name) {
     return await db.update('UPDATE assetfolders SET name = ? WHERE guid = ?', [name, folderId]);
 }
 export async function deleteAssetFolder(id, userInternalId) {
-    return await db.update('UPDATE assetfolders SET deletedBy = ?, deletedAt = NOW() WHERE id = ?', [userInternalId, id]);
+    return await db.transaction(async (db) => {
+        const folderIds = await db.getvals('SELECT id FROM assetfolders WHERE id = ? OR path like ?', [id, `%/${id}%`]);
+        const binds = [userInternalId, DeleteState.MARKEDFORDELETE];
+        await db.update(`UPDATE assetfolders SET deletedBy = ?, deletedAt = NOW(), deleteState = ? WHERE id IN (${db.in(binds, folderIds)})`, binds);
+        await db.update(`UPDATE assets SET deletedBy = ?, deletedAt = NOW(), deleteState = ? WHERE folderId IN (${db.in(binds, folderIds)})`, binds);
+    });
+}
+export async function finalizeAssetFolderDeletion(id, userInternalId) {
+    return await db.transaction(async (db) => {
+        const folderIds = await db.getvals('SELECT id FROM assetfolders WHERE id = ? OR path like ?', [id, `%/${id}%`]);
+        const binds = [userInternalId, DeleteState.DELETED];
+        await db.update(`UPDATE assetfolders SET deletedBy = ?, deletedAt = NOW(), deleteState = ? WHERE id IN (${db.in(binds, folderIds)})`, binds);
+        await db.update(`UPDATE assets SET deletedBy = ?, deletedAt = NOW(), deleteState = ? WHERE folderId IN (${db.in(binds, folderIds)})`, binds);
+    });
 }
 export async function undeleteAssetFolder(id) {
-    return await db.update('UPDATE assetfolders SET deletedBy = null, deletedAt = null WHERE id = ?', [id]);
+    return await db.transaction(async (db) => {
+        const folderIds = await db.getvals('SELECT id FROM assetfolders WHERE id = ? OR path like ?', [id, `%/${id}%`]);
+        const binds = [DeleteState.NOTDELETED];
+        await db.update(`UPDATE assetfolders SET deletedBy = null, deletedAt = null, deleteState = ? WHERE id IN (${db.in(binds, folderIds)})`, binds);
+        await db.update(`UPDATE assets SET deletedBy = null, deletedAt = null, deleteState = ? WHERE folderId IN (${db.in(binds, folderIds)})`, binds);
+    });
 }
 //# sourceMappingURL=assetfolder.database.js.map

package/dist/assetfolder/assetfolder.database.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetfolder.database.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assetfolder.database.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.database.ts"],"names":[],"mappings":"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"}

package/dist/assetfolder/assetfolder.model.d.ts

@@ -1,10 +1,12 @@
 import { DateTime } from 'luxon';
 import { ValidatedResponse, ValidatedResponseArgs } from '@txstate-mws/graphql-server';
+import { DeletedFilter, DeleteState } from '../internal.js';
 export declare class AssetFolder {
     internalId: number;
     id: string;
     name: string;
     deleted: boolean;
+    deleteState: DeleteState;
     deletedAt?: DateTime;
     siteId: string;
     deletedBy?: number;
@@ -30,7 +32,7 @@ export declare class AssetFolderFilter {
     beneath?: string[];
     parentPaths?: string[];
     root?: boolean;
-    deleted?: boolean;
+    deleted?: DeletedFilter;
 }
 export declare class CreateAssetFolderInput {
     name: string;

package/dist/assetfolder/assetfolder.model.js

@@ -11,7 +11,7 @@ import { DateTime } from 'luxon';
 import { isNotBlank, isNotNull } from 'txstate-utils';
 import { Field, ID, InputType, ObjectType, registerEnumType } from 'type-graphql';
 import { ValidatedResponse } from '@txstate-mws/graphql-server';
-import { UrlSafePath, UrlSafeString } from '../internal.js';
+import { DeletedFilter, DeleteState, UrlSafePath, UrlSafeString } from '../internal.js';
 let AssetFolder = class AssetFolder {
     constructor(row) {
         this.internalId = row.id;
@@ -25,6 +25,7 @@ let AssetFolder = class AssetFolder {
         this.deleted = isNotNull(row.deletedAt);
         this.deletedAt = DateTime.fromJSDate(row.deletedAt);
         this.deletedBy = row.deletedBy;
+        this.deleteState = this.deleteState = row.deleteState === 0 ? DeleteState.NOTDELETED : ((row.deleteState === 1 ? DeleteState.MARKEDFORDELETE : DeleteState.DELETED));
     }
 };
 __decorate([
@@ -39,6 +40,10 @@ __decorate([
     Field({ description: 'Folder has been soft-deleted but is still recoverable.' }),
     __metadata("design:type", Boolean)
 ], AssetFolder.prototype, "deleted", void 0);
+__decorate([
+    Field({ description: 'Indicates whether this asset folder is undeleted, marked for deletion, or deleted.' }),
+    __metadata("design:type", Number)
+], AssetFolder.prototype, "deleteState", void 0);
 __decorate([
     Field({ nullable: true, description: 'Date this folder was soft-deleted, null when not applicable.' }),
     __metadata("design:type", DateTime)
@@ -87,8 +92,8 @@ __decorate([
     __metadata("design:type", Boolean)
 ], AssetFolderFilter.prototype, "root", void 0);
 __decorate([
-    Field(type => Boolean, { nullable: true, description: 'true -> return only deleted folders, false -> return only nondeleted folders, undefined -> return all folders' }),
-    __metadata("design:type", Boolean)
+    Field(type => DeletedFilter, { nullable: true }),
+    __metadata("design:type", String)
 ], AssetFolderFilter.prototype, "deleted", void 0);
 AssetFolderFilter = __decorate([
     InputType()

package/dist/assetfolder/assetfolder.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetfolder.model.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assetfolder.model.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.model.ts"],"names":[],"mappings":"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"}

package/dist/assetfolder/assetfolder.resolver.d.ts

@@ -14,6 +14,7 @@ export declare class AssetFolderResolver {
     createAssetFolder(ctx: Context, args: CreateAssetFolderInput, validateOnly?: boolean): Promise<AssetFolderResponse>;
     renameAssetFolder(ctx: Context, folderId: string, name: string, validateOnly?: boolean): Promise<AssetFolderResponse>;
     deleteAssetFolder(ctx: Context, folderId: string): Promise<AssetFolderResponse>;
+    finalizeAssetFolderDeletion(ctx: Context, folderId: string): Promise<AssetFolderResponse>;
     undeleteAssetFolder(ctx: Context, folderId: string): Promise<AssetFolderResponse>;
 }
 export declare class AssetFolderPermissionsResolver {

package/dist/assetfolder/assetfolder.resolver.js

@@ -60,6 +60,9 @@ let AssetFolderResolver = class AssetFolderResolver {
     async deleteAssetFolder(ctx, folderId) {
         return await ctx.svc(AssetFolderService).delete(folderId);
     }
+    async finalizeAssetFolderDeletion(ctx, folderId) {
+        return await ctx.svc(AssetFolderService).finalizeDeletion(folderId);
+    }
     async undeleteAssetFolder(ctx, folderId) {
         return await ctx.svc(AssetFolderService).undelete(folderId);
     }
@@ -180,6 +183,14 @@ __decorate([
     __metadata("design:paramtypes", [Context, String]),
     __metadata("design:returntype", Promise)
 ], AssetFolderResolver.prototype, "deleteAssetFolder", null);
+__decorate([
+    Mutation(returns => AssetFolderResponse),
+    __param(0, Ctx()),
+    __param(1, Arg('folderId', type => ID)),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Context, String]),
+    __metadata("design:returntype", Promise)
+], AssetFolderResolver.prototype, "finalizeAssetFolderDeletion", null);
 __decorate([
     Mutation(returns => AssetFolderResponse),
     __param(0, Ctx()),

package/dist/assetfolder/assetfolder.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetfolder.resolver.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assetfolder.resolver.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.resolver.ts"],"names":[],"mappings":"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"}

package/dist/assetfolder/assetfolder.service.d.ts

@@ -27,6 +27,7 @@ export declare class AssetFolderService extends DosGatoService<AssetFolder> {
     create(args: CreateAssetFolderInput, validateOnly?: boolean): Promise<AssetFolderResponse>;
     rename(folderId: string, name: string, validateOnly?: boolean): Promise<AssetFolderResponse>;
     delete(folderId: string): Promise<AssetFolderResponse>;
+    finalizeDeletion(folderId: string): Promise<AssetFolderResponse>;
     undelete(folderId: string): Promise<AssetFolderResponse>;
     mayView(folder: AssetFolder): Promise<boolean>;
     mayViewForEdit(folder: AssetFolder): Promise<boolean>;

package/dist/assetfolder/assetfolder.service.js

@@ -1,18 +1,18 @@
 import { BaseService } from '@txstate-mws/graphql-server';
 import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
-import { AssetService, DosGatoService, getAssetFolders, AssetServiceInternal, createAssetFolder, AssetFolderResponse, renameAssetFolder, deleteAssetFolder, undeleteAssetFolder, normalizePath } from '../internal.js';
+import { AssetService, DosGatoService, getAssetFolders, AssetServiceInternal, createAssetFolder, AssetFolderResponse, renameAssetFolder, deleteAssetFolder, undeleteAssetFolder, normalizePath, finalizeAssetFolderDeletion, DeletedFilter } from '../internal.js';
 import { isNull, isNotNull, unique, mapConcurrent, intersect, isNotBlank, keyby, isBlank } from 'txstate-utils';
 const assetFolderByInternalIdLoader = new PrimaryKeyLoader({
-    fetch: async (ids) => await getAssetFolders({ internalIds: ids }),
+    fetch: async (ids) => await getAssetFolders({ internalIds: ids, deleted: DeletedFilter.SHOW }),
     extractId: af => af.internalId
 });
 const assetFolderByIdLoader = new PrimaryKeyLoader({
-    fetch: async (ids) => await getAssetFolders({ ids }),
+    fetch: async (ids) => await getAssetFolders({ ids, deleted: DeletedFilter.SHOW }),
     idLoader: assetFolderByInternalIdLoader
 });
 assetFolderByInternalIdLoader.addIdLoader(assetFolderByIdLoader);
 const foldersByNameLoader = new OneToManyLoader({
-    fetch: async (names) => await getAssetFolders({ names }),
+    fetch: async (names) => await getAssetFolders({ names, deleted: DeletedFilter.SHOW }),
     extractKey: folder => folder.name,
     idLoader: [assetFolderByIdLoader, assetFolderByInternalIdLoader]
 });
@@ -271,6 +271,18 @@ export class AssetFolderService extends DosGatoService {
             throw new Error('Could not delete asset folder');
         }
     }
+    async finalizeDeletion(folderId) {
+        const folder = await this.raw.findById(folderId);
+        if (!folder)
+            throw new Error('Folder to be deleted does not exist');
+        if (!(await this.haveAssetFolderPerm(folder, 'delete')))
+            throw new Error(`Current user is not permitted to delete folder ${String(folder.name)}.`);
+        const currentUser = await this.currentUser();
+        await finalizeAssetFolderDeletion(folder.internalId, currentUser.internalId);
+        const deletedfolder = await this.loaders.get(assetFolderByIdLoader).load(folderId);
+        this.loaders.clear();
+        return new AssetFolderResponse({ assetFolder: deletedfolder, success: true });
+    }
     async undelete(folderId) {
         const folder = await this.raw.findById(folderId);
         if (!folder)