@dosgato/api 0.0.15 → 0.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/asset/asset.database.d.ts +14 -2
- package/dist/asset/asset.database.js +44 -4
- package/dist/asset/asset.database.js.map +1 -1
- package/dist/asset/asset.model.d.ts +2 -0
- package/dist/asset/asset.model.js +12 -4
- package/dist/asset/asset.model.js.map +1 -1
- package/dist/asset/asset.routes.d.ts +20 -1
- package/dist/asset/asset.routes.js +163 -36
- package/dist/asset/asset.routes.js.map +1 -1
- package/dist/asset/asset.service.js +24 -6
- package/dist/asset/asset.service.js.map +1 -1
- package/dist/asset/asset.storage.d.ts +10 -2
- package/dist/asset/asset.storage.js +17 -3
- package/dist/asset/asset.storage.js.map +1 -1
- package/dist/assetfolder/assetfolder.database.js +1 -4
- package/dist/assetfolder/assetfolder.database.js.map +1 -1
- package/dist/assetfolder/assetfolder.model.js +5 -5
- package/dist/assetfolder/assetfolder.model.js.map +1 -1
- package/dist/assetfolder/assetfolder.resolver.d.ts +1 -1
- package/dist/assetfolder/assetfolder.resolver.js +6 -5
- package/dist/assetfolder/assetfolder.resolver.js.map +1 -1
- package/dist/assetfolder/assetfolder.service.d.ts +1 -1
- package/dist/assetfolder/assetfolder.service.js +36 -28
- package/dist/assetfolder/assetfolder.service.js.map +1 -1
- package/dist/assetrule/assetrule.database.js.map +1 -1
- package/dist/assetrule/assetrule.model.js.map +1 -1
- package/dist/data/data.database.js.map +1 -1
- package/dist/data/data.model.js +1 -1
- package/dist/data/data.model.js.map +1 -1
- package/dist/data/data.resolver.d.ts +4 -3
- package/dist/data/data.resolver.js +36 -9
- package/dist/data/data.resolver.js.map +1 -1
- package/dist/data/data.service.d.ts +3 -3
- package/dist/data/data.service.js +52 -19
- package/dist/data/data.service.js.map +1 -1
- package/dist/datafolder/datafolder.database.js.map +1 -1
- package/dist/datafolder/datafolder.service.js +7 -3
- package/dist/datafolder/datafolder.service.js.map +1 -1
- package/dist/dataroot/dataroot.model.js.map +1 -1
- package/dist/datarule/datarule.database.js.map +1 -1
- package/dist/globalrule/globalrule.database.js.map +1 -1
- package/dist/globalrule/globalrule.service.d.ts +1 -0
- package/dist/globalrule/globalrule.service.js +3 -0
- package/dist/globalrule/globalrule.service.js.map +1 -1
- package/dist/group/group.database.d.ts +2 -1
- package/dist/group/group.database.js +13 -1
- package/dist/group/group.database.js.map +1 -1
- package/dist/group/group.resolver.d.ts +1 -0
- package/dist/group/group.resolver.js +12 -0
- package/dist/group/group.resolver.js.map +1 -1
- package/dist/group/group.service.d.ts +1 -0
- package/dist/group/group.service.js +23 -16
- package/dist/group/group.service.js.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/migrations.js +10 -0
- package/dist/migrations.js.map +1 -1
- package/dist/page/page.database.js.map +1 -1
- package/dist/page/page.resolver.d.ts +1 -1
- package/dist/page/page.resolver.js +4 -3
- package/dist/page/page.resolver.js.map +1 -1
- package/dist/page/page.service.d.ts +1 -1
- package/dist/page/page.service.js +26 -14
- package/dist/page/page.service.js.map +1 -1
- package/dist/pagerule/pagerule.database.js.map +1 -1
- package/dist/pagerule/pagerule.model.js.map +1 -1
- package/dist/pagetree/pagetree.resolver.js +8 -4
- package/dist/pagetree/pagetree.resolver.js.map +1 -1
- package/dist/role/role.resolver.d.ts +1 -1
- package/dist/role/role.resolver.js +4 -3
- package/dist/role/role.resolver.js.map +1 -1
- package/dist/role/role.service.d.ts +1 -1
- package/dist/role/role.service.js +8 -15
- package/dist/role/role.service.js.map +1 -1
- package/dist/scalars/index.d.ts +1 -0
- package/dist/scalars/index.js +1 -0
- package/dist/scalars/index.js.map +1 -1
- package/dist/scalars/urlsafepath.d.ts +5 -0
- package/dist/scalars/urlsafepath.js +27 -0
- package/dist/scalars/urlsafepath.js.map +1 -0
- package/dist/scalars/urlsafestring.js +1 -3
- package/dist/scalars/urlsafestring.js.map +1 -1
- package/dist/site/site.database.js.map +1 -1
- package/dist/site/site.model.d.ts +0 -5
- package/dist/site/site.model.js +2 -20
- package/dist/site/site.model.js.map +1 -1
- package/dist/site/site.resolver.js +3 -3
- package/dist/site/site.resolver.js.map +1 -1
- package/dist/site/site.service.js +1 -1
- package/dist/site/site.service.js.map +1 -1
- package/dist/siterule/siterule.database.js.map +1 -1
- package/dist/siterule/siterule.model.js.map +1 -1
- package/dist/template/template.service.js.map +1 -1
- package/dist/templaterule/templaterule.database.js.map +1 -1
- package/dist/templaterule/templaterule.model.js.map +1 -1
- package/dist/user/user.service.js.map +1 -1
- package/dist/util/index.js +1 -2
- package/dist/util/index.js.map +1 -1
- package/dist/util/registry.js.map +1 -1
- package/dist/versionedservice/service.d.ts +17 -1
- package/dist/versionedservice/service.js +41 -4
- package/dist/versionedservice/service.js.map +1 -1
- package/package.json +4 -3
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BaseService } from '@txstate-mws/graphql-server';
|
|
2
2
|
import { ManyJoinedLoader, OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
|
|
3
3
|
import { intersect, isNotNull, keyby, roundTo, sortby } from 'txstate-utils';
|
|
4
|
-
import { getAssets, AssetFolderService, appendPath, getResizes, SiteService, DosGatoService, getLatestDownload, AssetFolderServiceInternal, AssetResponse, fileHandler, deleteAsset, undeleteAsset, moveAsset, popPath, basename, registerResize, getResizesById } from '../internal.js';
|
|
4
|
+
import { getAssets, AssetFolderService, appendPath, getResizes, SiteService, DosGatoService, getLatestDownload, AssetFolderServiceInternal, AssetResponse, fileHandler, deleteAsset, undeleteAsset, moveAsset, popPath, basename, registerResize, getResizesById, VersionedService, cleanupBinaries } from '../internal.js';
|
|
5
5
|
import { lookup } from 'mime-types';
|
|
6
6
|
const thumbnailMimes = new Set(['image/jpg', 'image/jpeg', 'image/gif', 'image/png']);
|
|
7
7
|
const assetsByIdLoader = new PrimaryKeyLoader({
|
|
@@ -96,21 +96,33 @@ export class AssetServiceInternal extends BaseService {
|
|
|
96
96
|
return appendPath(await this.svc(AssetFolderServiceInternal).getPath(folder), asset.name);
|
|
97
97
|
}
|
|
98
98
|
async processAssetFilters(filter) {
|
|
99
|
+
if (filter?.legacyIds?.length) {
|
|
100
|
+
const ids = await this.svc(VersionedService).find([{ indexName: 'legacyId', in: filter.legacyIds }], 'latest');
|
|
101
|
+
filter.ids = intersect({ skipEmpty: true }, filter.ids, ids);
|
|
102
|
+
if (!filter.ids.length)
|
|
103
|
+
filter.internalIds = [-1];
|
|
104
|
+
}
|
|
99
105
|
if (filter?.paths?.length) {
|
|
100
106
|
const folderidpaths = await this.svc(AssetFolderServiceInternal).convertPathsToIDPaths(filter.paths.map(popPath));
|
|
101
107
|
const folderids = folderidpaths.map(p => +p.split(/\//).slice(-1)[0]);
|
|
102
108
|
filter.folderInternalIds = intersect({ skipEmpty: true }, filter.folderInternalIds, folderids);
|
|
103
109
|
filter.names = filter.paths.map(basename);
|
|
110
|
+
if (!folderidpaths.length)
|
|
111
|
+
filter.internalIds = [-1];
|
|
104
112
|
}
|
|
105
113
|
if (filter?.beneath?.length) {
|
|
106
114
|
const folderidpaths = await this.svc(AssetFolderServiceInternal).convertPathsToIDPaths(filter.beneath);
|
|
107
115
|
const folders = await this.svc(AssetFolderServiceInternal).getChildFoldersByIDPaths(folderidpaths);
|
|
108
116
|
const ids = [...folders.map(f => f.internalId), ...folderidpaths.map(basename).map(Number)];
|
|
109
117
|
filter.folderInternalIds = intersect({ skipEmpty: true }, filter.folderInternalIds, ids);
|
|
118
|
+
if (!folderidpaths.length)
|
|
119
|
+
filter.internalIds = [-1];
|
|
110
120
|
}
|
|
111
121
|
if (filter?.parentPaths?.length) {
|
|
112
122
|
const folderidpaths = await this.svc(AssetFolderServiceInternal).convertPathsToIDPaths(filter.parentPaths);
|
|
113
123
|
filter.folderInternalIds = intersect({ skipEmpty: true }, filter.folderInternalIds, folderidpaths.map(basename).map(Number));
|
|
124
|
+
if (!folderidpaths.length)
|
|
125
|
+
filter.internalIds = [-1];
|
|
114
126
|
}
|
|
115
127
|
if (filter?.links?.length) {
|
|
116
128
|
const assets = await this.findByIds(filter.links.map(l => l.id));
|
|
@@ -233,7 +245,7 @@ export class AssetService extends DosGatoService {
|
|
|
233
245
|
}
|
|
234
246
|
}
|
|
235
247
|
async createResizes(asset) {
|
|
236
|
-
if (!asset.box)
|
|
248
|
+
if (!asset.box || asset.mime === 'image/svg+xml')
|
|
237
249
|
return;
|
|
238
250
|
const resizes = await this.getResizes(asset);
|
|
239
251
|
const info = await fileHandler.sharp(asset.checksum).metadata();
|
|
@@ -258,7 +270,7 @@ export class AssetService extends DosGatoService {
|
|
|
258
270
|
: 'png';
|
|
259
271
|
const outputmime = lookup(outputformat);
|
|
260
272
|
const img = fileHandler.sharp(asset.checksum, { animated: outputformat === 'gif' });
|
|
261
|
-
for (let w = asset.box.width; w
|
|
273
|
+
for (let w = asset.box.width; w >= 100; w = roundTo(w / 2)) {
|
|
262
274
|
const needregular = !resizes.some(r => r.mime === outputmime && r.width === w);
|
|
263
275
|
const needwebp = !resizes.some(r => r.mime === 'image/webp' && r.width === w);
|
|
264
276
|
if (needregular || needwebp) {
|
|
@@ -277,12 +289,18 @@ export class AssetService extends DosGatoService {
|
|
|
277
289
|
? resized.clone().png({ palette: colors <= 256, compressionLevel: 9, progressive: true })
|
|
278
290
|
: resized.clone().gif({ effort: 10, reoptimize: true, loop: info.loop ?? 0 });
|
|
279
291
|
const { checksum, info: outputinfo } = await fileHandler.sharpWrite(formatted);
|
|
280
|
-
|
|
292
|
+
if (outputinfo.size > asset.size && ['image/jpeg', 'image/png', 'image/gif'].includes(asset.mime)) {
|
|
293
|
+
// we made a resize that's bigger than the original, abort!
|
|
294
|
+
await cleanupBinaries([checksum]);
|
|
295
|
+
}
|
|
296
|
+
else {
|
|
297
|
+
await registerResize(asset, w, checksum, outputmime, outputformat === 'jpg' ? 60 : 0, outputinfo.size);
|
|
298
|
+
}
|
|
281
299
|
}
|
|
282
300
|
if (needwebp) {
|
|
283
|
-
const webp = resized.webp({ quality:
|
|
301
|
+
const webp = resized.webp({ quality: 75, effort: 6, loop: info.loop ?? 0 });
|
|
284
302
|
const { checksum: webpsum, info: webpinfo } = await fileHandler.sharpWrite(webp);
|
|
285
|
-
await registerResize(asset, w, webpsum, 'image/webp',
|
|
303
|
+
await registerResize(asset, w, webpsum, 'image/webp', 75, webpinfo.size);
|
|
286
304
|
}
|
|
287
305
|
}
|
|
288
306
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../src/asset/asset.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../src/asset/asset.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,24 +4,32 @@ import sharp from 'sharp';
|
|
|
4
4
|
import { Readable } from 'stream';
|
|
5
5
|
interface FileHandler {
|
|
6
6
|
init: () => Promise<void>;
|
|
7
|
-
put: (stream: Readable) => Promise<
|
|
7
|
+
put: (stream: Readable) => Promise<{
|
|
8
|
+
checksum: string;
|
|
9
|
+
size: number;
|
|
10
|
+
}>;
|
|
8
11
|
get: (checksum: string) => Readable;
|
|
9
12
|
sharp: (checksum: string, opts?: sharp.SharpOptions) => sharp.Sharp;
|
|
10
13
|
sharpWrite: (img: sharp.Sharp) => Promise<{
|
|
11
14
|
checksum: string;
|
|
12
15
|
info: sharp.OutputInfo;
|
|
13
16
|
}>;
|
|
17
|
+
remove: (checksum: string) => Promise<void>;
|
|
14
18
|
}
|
|
15
19
|
declare class FileSystemHandler implements FileHandler {
|
|
16
20
|
#private;
|
|
17
21
|
init(): Promise<void>;
|
|
18
22
|
get(checksum: string): import("fs").ReadStream;
|
|
19
|
-
put(stream: Readable): Promise<
|
|
23
|
+
put(stream: Readable): Promise<{
|
|
24
|
+
checksum: string;
|
|
25
|
+
size: number;
|
|
26
|
+
}>;
|
|
20
27
|
sharp(checksum: string, opts?: sharp.SharpOptions): sharp.Sharp;
|
|
21
28
|
sharpWrite(img: sharp.Sharp): Promise<{
|
|
22
29
|
checksum: any;
|
|
23
30
|
info: sharp.OutputInfo;
|
|
24
31
|
}>;
|
|
32
|
+
remove(checksum: string): Promise<void>;
|
|
25
33
|
}
|
|
26
34
|
export declare const fileHandler: FileSystemHandler;
|
|
27
35
|
export {};
|
|
@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
6
6
|
var _FileSystemHandler_instances, _FileSystemHandler_getTmpLocation, _FileSystemHandler_getFileLocation, _FileSystemHandler_moveToPerm;
|
|
7
7
|
import { createHash } from 'crypto';
|
|
8
8
|
import { createReadStream, createWriteStream } from 'fs';
|
|
9
|
-
import { mkdir, rename } from 'fs/promises';
|
|
9
|
+
import { mkdir, rename, unlink } from 'fs/promises';
|
|
10
10
|
import { nanoid } from 'nanoid';
|
|
11
11
|
import { dirname } from 'path';
|
|
12
12
|
import sharp from 'sharp';
|
|
@@ -17,6 +17,7 @@ class FileSystemHandler {
|
|
|
17
17
|
}
|
|
18
18
|
async init() {
|
|
19
19
|
await mkdir('/files/tmp', { recursive: true });
|
|
20
|
+
await mkdir('/files/storage', { recursive: true });
|
|
20
21
|
}
|
|
21
22
|
get(checksum) {
|
|
22
23
|
const filepath = __classPrivateFieldGet(this, _FileSystemHandler_instances, "m", _FileSystemHandler_getFileLocation).call(this, checksum);
|
|
@@ -26,11 +27,12 @@ class FileSystemHandler {
|
|
|
26
27
|
async put(stream) {
|
|
27
28
|
const tmp = __classPrivateFieldGet(this, _FileSystemHandler_instances, "m", _FileSystemHandler_getTmpLocation).call(this);
|
|
28
29
|
const hash = createHash('sha1');
|
|
29
|
-
|
|
30
|
+
let size = 0;
|
|
31
|
+
stream.on('data', (data) => { hash.update(data); size += data.length; });
|
|
30
32
|
await pipeline(stream, createWriteStream(tmp));
|
|
31
33
|
const checksum = hash.digest('hex');
|
|
32
34
|
await __classPrivateFieldGet(this, _FileSystemHandler_instances, "m", _FileSystemHandler_moveToPerm).call(this, tmp, checksum);
|
|
33
|
-
return checksum;
|
|
35
|
+
return { checksum, size };
|
|
34
36
|
}
|
|
35
37
|
sharp(checksum, opts) {
|
|
36
38
|
const filepath = __classPrivateFieldGet(this, _FileSystemHandler_instances, "m", _FileSystemHandler_getFileLocation).call(this, checksum);
|
|
@@ -45,6 +47,18 @@ class FileSystemHandler {
|
|
|
45
47
|
await __classPrivateFieldGet(this, _FileSystemHandler_instances, "m", _FileSystemHandler_moveToPerm).call(this, tmp, checksum);
|
|
46
48
|
return { checksum, info };
|
|
47
49
|
}
|
|
50
|
+
async remove(checksum) {
|
|
51
|
+
const filepath = __classPrivateFieldGet(this, _FileSystemHandler_instances, "m", _FileSystemHandler_getFileLocation).call(this, checksum);
|
|
52
|
+
try {
|
|
53
|
+
return await unlink(filepath);
|
|
54
|
+
}
|
|
55
|
+
catch (e) {
|
|
56
|
+
if (e.code === 'ENOENT')
|
|
57
|
+
console.warn('Tried to delete file with checksum', checksum, 'but it did not exist.');
|
|
58
|
+
else
|
|
59
|
+
console.warn(e);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
48
62
|
}
|
|
49
63
|
_FileSystemHandler_instances = new WeakSet(), _FileSystemHandler_getTmpLocation = function _FileSystemHandler_getTmpLocation() {
|
|
50
64
|
return `/files/tmp/${nanoid()}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset.storage.js","sourceRoot":"","sources":["../../src/asset/asset.storage.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"asset.storage.js","sourceRoot":"","sources":["../../src/asset/asset.storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,10 +62,7 @@ export async function createAssetFolder(args) {
|
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
export async function renameAssetFolder(folderId, name) {
|
|
65
|
-
return await db.
|
|
66
|
-
const id = await db.getval('SELECT id FROM assetfolders WHERE guid = ?', [folderId]);
|
|
67
|
-
return await db.update('UPDATE assetfolders SET name = ? WHERE id = ?', [name, id]);
|
|
68
|
-
});
|
|
65
|
+
return await db.update('UPDATE assetfolders SET name = ? WHERE guid = ?', [name, folderId]);
|
|
69
66
|
}
|
|
70
67
|
export async function moveAssetFolder(id, targetFolder) {
|
|
71
68
|
return await db.transaction(async (db) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assetfolder.database.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.database.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"assetfolder.database.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.database.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ import { DateTime } from 'luxon';
|
|
|
11
11
|
import { isNotBlank, isNotNull } from 'txstate-utils';
|
|
12
12
|
import { Field, ID, InputType, ObjectType, registerEnumType } from 'type-graphql';
|
|
13
13
|
import { ValidatedResponse } from '@txstate-mws/graphql-server';
|
|
14
|
-
import { UrlSafeString } from '../internal.js';
|
|
14
|
+
import { UrlSafePath, UrlSafeString } from '../internal.js';
|
|
15
15
|
let AssetFolder = class AssetFolder {
|
|
16
16
|
constructor(row) {
|
|
17
17
|
this.internalId = row.id;
|
|
@@ -70,15 +70,15 @@ __decorate([
|
|
|
70
70
|
__metadata("design:type", Array)
|
|
71
71
|
], AssetFolderFilter.prototype, "childOfFolderIds", void 0);
|
|
72
72
|
__decorate([
|
|
73
|
-
Field(type => [
|
|
73
|
+
Field(type => [UrlSafePath], { nullable: true, description: 'Return folders with the given paths.' }),
|
|
74
74
|
__metadata("design:type", Array)
|
|
75
75
|
], AssetFolderFilter.prototype, "paths", void 0);
|
|
76
76
|
__decorate([
|
|
77
|
-
Field(type => [
|
|
77
|
+
Field(type => [UrlSafePath], { nullable: true, description: 'Return folders that descend from any of the given paths.' }),
|
|
78
78
|
__metadata("design:type", Array)
|
|
79
79
|
], AssetFolderFilter.prototype, "beneath", void 0);
|
|
80
80
|
__decorate([
|
|
81
|
-
Field(type => [
|
|
81
|
+
Field(type => [UrlSafePath], { nullable: true, description: 'Return folders that are direct children of any of the given paths.' }),
|
|
82
82
|
__metadata("design:type", Array)
|
|
83
83
|
], AssetFolderFilter.prototype, "parentPaths", void 0);
|
|
84
84
|
__decorate([
|
|
@@ -96,7 +96,7 @@ export { AssetFolderFilter };
|
|
|
96
96
|
let CreateAssetFolderInput = class CreateAssetFolderInput {
|
|
97
97
|
};
|
|
98
98
|
__decorate([
|
|
99
|
-
Field(),
|
|
99
|
+
Field(type => UrlSafeString),
|
|
100
100
|
__metadata("design:type", String)
|
|
101
101
|
], CreateAssetFolderInput.prototype, "name", void 0);
|
|
102
102
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assetfolder.model.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACjF,OAAO,EAAE,iBAAiB,EAAyB,MAAM,6BAA6B,CAAA;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"assetfolder.model.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class AssetFolderResolver {
|
|
|
11
11
|
roles(ctx: Context, folder: AssetFolder, withPermission?: AssetFolderPermission[]): Promise<Role[]>;
|
|
12
12
|
permissions(folder: AssetFolder): AssetFolder;
|
|
13
13
|
createAssetFolder(ctx: Context, args: CreateAssetFolderInput, validateOnly?: boolean): Promise<AssetFolderResponse>;
|
|
14
|
-
renameAssetFolder(ctx: Context, folderId: string, name: string): Promise<AssetFolderResponse>;
|
|
14
|
+
renameAssetFolder(ctx: Context, folderId: string, name: string, validateOnly?: boolean): Promise<AssetFolderResponse>;
|
|
15
15
|
moveAssetFolder(ctx: Context, folderId: string, targetId: string): Promise<AssetFolderResponse>;
|
|
16
16
|
deleteAssetFolder(ctx: Context, folderId: string): Promise<AssetFolderResponse>;
|
|
17
17
|
undeleteAssetFolder(ctx: Context, folderId: string): Promise<AssetFolderResponse>;
|
|
@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Context } from '@txstate-mws/graphql-server';
|
|
14
14
|
import { Resolver, Arg, Ctx, FieldResolver, Root, Mutation, ID, Query } from 'type-graphql';
|
|
15
|
-
import { Asset, AssetFilter, Role, RoleService, User, AssetFolder, AssetFolderFilter, AssetFolderPermission, AssetFolderPermissions, AssetFolderService, AssetRuleService, UserService, AssetFolderResponse, CreateAssetFolderInput } from '../internal.js';
|
|
15
|
+
import { Asset, AssetFilter, Role, RoleService, User, AssetFolder, AssetFolderFilter, AssetFolderPermission, AssetFolderPermissions, AssetFolderService, AssetRuleService, UserService, AssetFolderResponse, CreateAssetFolderInput, UrlSafeString } from '../internal.js';
|
|
16
16
|
import { isNull } from 'txstate-utils';
|
|
17
17
|
let AssetFolderResolver = class AssetFolderResolver {
|
|
18
18
|
async assetfolders(ctx, filter) {
|
|
@@ -51,8 +51,8 @@ let AssetFolderResolver = class AssetFolderResolver {
|
|
|
51
51
|
async createAssetFolder(ctx, args, validateOnly) {
|
|
52
52
|
return await ctx.svc(AssetFolderService).create(args, validateOnly);
|
|
53
53
|
}
|
|
54
|
-
async renameAssetFolder(ctx, folderId, name) {
|
|
55
|
-
return await ctx.svc(AssetFolderService).rename(folderId, name);
|
|
54
|
+
async renameAssetFolder(ctx, folderId, name, validateOnly) {
|
|
55
|
+
return await ctx.svc(AssetFolderService).rename(folderId, name, validateOnly);
|
|
56
56
|
}
|
|
57
57
|
async moveAssetFolder(ctx, folderId, targetId) {
|
|
58
58
|
return await ctx.svc(AssetFolderService).move(folderId, targetId);
|
|
@@ -158,9 +158,10 @@ __decorate([
|
|
|
158
158
|
Mutation(returns => AssetFolderResponse),
|
|
159
159
|
__param(0, Ctx()),
|
|
160
160
|
__param(1, Arg('folderId', type => ID)),
|
|
161
|
-
__param(2, Arg('name')),
|
|
161
|
+
__param(2, Arg('name', type => UrlSafeString)),
|
|
162
|
+
__param(3, Arg('validateOnly', { nullable: true })),
|
|
162
163
|
__metadata("design:type", Function),
|
|
163
|
-
__metadata("design:paramtypes", [Context, String, String]),
|
|
164
|
+
__metadata("design:paramtypes", [Context, String, String, Boolean]),
|
|
164
165
|
__metadata("design:returntype", Promise)
|
|
165
166
|
], AssetFolderResolver.prototype, "renameAssetFolder", null);
|
|
166
167
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assetfolder.resolver.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAC3F,OAAO,EACL,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAC3E,qBAAqB,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,gBAAgB,EACnF,WAAW,EAAE,mBAAmB,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"assetfolder.resolver.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export declare class AssetFolderService extends DosGatoService<AssetFolder> {
|
|
|
25
25
|
getChildAssets(folder: AssetFolder, recursive?: boolean, filter?: AssetFilter): Promise<import("../internal.js").Asset[]>;
|
|
26
26
|
getPath(folder: AssetFolder): Promise<string>;
|
|
27
27
|
create(args: CreateAssetFolderInput, validateOnly?: boolean): Promise<AssetFolderResponse>;
|
|
28
|
-
rename(folderId: string, name: string): Promise<AssetFolderResponse>;
|
|
28
|
+
rename(folderId: string, name: string, validateOnly?: boolean): Promise<AssetFolderResponse>;
|
|
29
29
|
move(folderId: string, targetFolderId: string): Promise<AssetFolderResponse>;
|
|
30
30
|
delete(folderId: string): Promise<AssetFolderResponse>;
|
|
31
31
|
undelete(folderId: string): Promise<AssetFolderResponse>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseService } from '@txstate-mws/graphql-server';
|
|
2
2
|
import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
|
|
3
|
-
import { AssetService, DosGatoService, getAssetFolders, AssetServiceInternal, createAssetFolder, AssetFolderResponse, renameAssetFolder, moveAssetFolder, deleteAssetFolder, undeleteAssetFolder, normalizePath
|
|
3
|
+
import { AssetService, DosGatoService, getAssetFolders, AssetServiceInternal, createAssetFolder, AssetFolderResponse, renameAssetFolder, moveAssetFolder, deleteAssetFolder, undeleteAssetFolder, normalizePath } from '../internal.js';
|
|
4
4
|
import { isNull, isNotNull, unique, mapConcurrent, intersect, isNotBlank, keyby, isBlank } from 'txstate-utils';
|
|
5
5
|
const assetFolderByInternalIdLoader = new PrimaryKeyLoader({
|
|
6
6
|
fetch: async (ids) => await getAssetFolders({ internalIds: ids }),
|
|
@@ -71,10 +71,14 @@ export class AssetFolderServiceInternal extends BaseService {
|
|
|
71
71
|
rowsByNameAndIDPath[row.name][row.path].push(row);
|
|
72
72
|
}
|
|
73
73
|
const idpaths = [];
|
|
74
|
-
|
|
74
|
+
// eslint-disable-next-line no-labels
|
|
75
|
+
loop1: for (const pt of paths) {
|
|
75
76
|
let searchpaths = ['/'];
|
|
76
77
|
for (const segment of pt) {
|
|
77
|
-
const pages = searchpaths.flatMap(sp => rowsByNameAndIDPath[segment][sp]);
|
|
78
|
+
const pages = searchpaths.flatMap(sp => rowsByNameAndIDPath[segment]?.[sp]);
|
|
79
|
+
// eslint-disable-next-line no-labels
|
|
80
|
+
if (pages.some(isNull))
|
|
81
|
+
break loop1;
|
|
78
82
|
searchpaths = pages.map(pg => `${pg.path}${pg.path === '/' ? '' : '/'}${pg.internalId}`);
|
|
79
83
|
if (!searchpaths.length)
|
|
80
84
|
break;
|
|
@@ -118,16 +122,22 @@ export class AssetFolderServiceInternal extends BaseService {
|
|
|
118
122
|
const idpaths = await this.convertPathsToIDPaths(filter.paths);
|
|
119
123
|
const ids = idpaths.map(p => +p.split(/\//).slice(-1)[0]);
|
|
120
124
|
filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
|
|
125
|
+
if (!idpaths.length)
|
|
126
|
+
filter.internalIds = [-1];
|
|
121
127
|
}
|
|
122
128
|
// beneath a named path e.g. /site1/about
|
|
123
129
|
if (filter?.beneath?.length) {
|
|
124
130
|
const idpaths = await this.convertPathsToIDPaths(filter.beneath);
|
|
125
131
|
filter.internalIdPathsRecursive = intersect({ skipEmpty: true }, filter.internalIdPaths, idpaths);
|
|
132
|
+
if (!idpaths.length)
|
|
133
|
+
filter.internalIds = [-1];
|
|
126
134
|
}
|
|
127
135
|
// direct children of a named path e.g. /site1/about
|
|
128
136
|
if (filter?.parentPaths?.length) {
|
|
129
137
|
const idpaths = await this.convertPathsToIDPaths(filter.parentPaths);
|
|
130
138
|
filter.internalIdPaths = intersect({ skipEmpty: true }, filter.internalIdPaths, idpaths);
|
|
139
|
+
if (!idpaths.length)
|
|
140
|
+
filter.internalIds = [-1];
|
|
131
141
|
}
|
|
132
142
|
if (filter?.links?.length) {
|
|
133
143
|
const folders = await this.findByIds(filter.links.map(l => l.id));
|
|
@@ -200,12 +210,11 @@ export class AssetFolderService extends DosGatoService {
|
|
|
200
210
|
return await this.raw.getPath(folder);
|
|
201
211
|
}
|
|
202
212
|
async create(args, validateOnly) {
|
|
203
|
-
const parentFolder = await this.
|
|
213
|
+
const parentFolder = await this.raw.findById(args.parentId);
|
|
204
214
|
if (!parentFolder)
|
|
205
215
|
throw new Error('Parent folder does not exist.');
|
|
206
216
|
if (!(await this.haveAssetFolderPerm(parentFolder, 'create')))
|
|
207
|
-
throw new Error(`
|
|
208
|
-
args.name = makeSafe(args.name);
|
|
217
|
+
throw new Error(`You are not permitted to create folders in ${String(parentFolder.name)}.`);
|
|
209
218
|
const resp = new AssetFolderResponse({ success: true });
|
|
210
219
|
if (isBlank(args.name))
|
|
211
220
|
resp.addMessage('You must enter a folder name.', 'args.name');
|
|
@@ -214,34 +223,33 @@ export class AssetFolderService extends DosGatoService {
|
|
|
214
223
|
resp.addMessage('That name is already in use.', 'args.name');
|
|
215
224
|
if (validateOnly || resp.hasErrors())
|
|
216
225
|
return resp;
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
return new AssetFolderResponse({ assetFolder: assetfolder, success: true });
|
|
221
|
-
}
|
|
222
|
-
catch (err) {
|
|
223
|
-
console.error(err);
|
|
224
|
-
throw new Error('Could not create asset folder');
|
|
225
|
-
}
|
|
226
|
+
const assetfolder = await createAssetFolder(args);
|
|
227
|
+
this.loaders.clear();
|
|
228
|
+
return new AssetFolderResponse({ assetFolder: assetfolder, success: true });
|
|
226
229
|
}
|
|
227
|
-
async rename(folderId, name) {
|
|
230
|
+
async rename(folderId, name, validateOnly) {
|
|
228
231
|
const folder = await this.raw.findById(folderId);
|
|
229
232
|
if (!folder)
|
|
230
|
-
throw new Error('Folder to be renamed does not exist');
|
|
233
|
+
throw new Error('Folder to be renamed does not exist.');
|
|
231
234
|
if (isNull(folder.parentInternalId))
|
|
232
235
|
throw new Error('Root asset folders cannot be renamed.');
|
|
233
236
|
if (!(await this.haveAssetFolderPerm(folder, 'update')))
|
|
234
|
-
throw new Error(`
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
237
|
+
throw new Error(`You are not permitted to rename folder ${String(folder.name)}.`);
|
|
238
|
+
const resp = new AssetFolderResponse({ success: true });
|
|
239
|
+
if (isBlank(name))
|
|
240
|
+
resp.addMessage('You must enter a folder name.', 'name');
|
|
241
|
+
const parent = await this.raw.findByInternalId(folder.parentInternalId);
|
|
242
|
+
if (!parent)
|
|
243
|
+
throw new Error('Folder has a non-existing parent.');
|
|
244
|
+
const [folders, assets] = await Promise.all([this.raw.getChildFolders(parent, false, { names: [name] }), this.raw.getChildAssets(parent, false, { names: [name] })]);
|
|
245
|
+
if (folders.some(f => f.internalId !== folder.internalId) || assets.length)
|
|
246
|
+
resp.addMessage('That name is already in use.', 'name');
|
|
247
|
+
if (validateOnly || resp.hasErrors())
|
|
248
|
+
return resp;
|
|
249
|
+
await renameAssetFolder(folderId, name);
|
|
250
|
+
this.loaders.clear();
|
|
251
|
+
const updatedFolder = await this.raw.findById(folderId);
|
|
252
|
+
return new AssetFolderResponse({ assetFolder: updatedFolder, success: true });
|
|
245
253
|
}
|
|
246
254
|
async move(folderId, targetFolderId) {
|
|
247
255
|
const [folder, targetFolder] = await Promise.all([
|