@dosgato/api 0.0.12 → 0.0.14

package/dist/datafolder/datafolder.service.js

@@ -111,38 +111,33 @@ export class DataFolderService extends DosGatoService {
             if (!(await this.haveGlobalPerm('manageGlobalData')))
                 throw new Error('Current user is not permitted to create global data folders.');
         }
+        const response = new DataFolderResponse({ success: true });
         if (!(await folderNameUniqueInDataRoot(args.name, args.siteId))) {
-            const response = new DataFolderResponse({});
             response.addMessage(`A folder with this name already exists in ${args.siteId ? 'this site' : 'global data'}.`, 'args.name');
-            return response;
-        }
-        else {
-            if (validateOnly) {
-                return new DataFolderResponse({ success: true, messages: [] });
-            }
-            else {
-                const dataFolder = await createDataFolder(args.name, template.id, args.siteId);
-                this.loaders.clear();
-                return new DataFolderResponse({ success: true, dataFolder });
-            }
         }
+        if (validateOnly || response.hasErrors())
+            return response;
+        const dataFolder = await createDataFolder(args.name, template.id, args.siteId);
+        this.loaders.clear();
+        response.dataFolder = dataFolder;
+        return response;
     }
-    async rename(folderId, name) {
+    async rename(folderId, name, validateOnly) {
         const folder = await this.raw.findById(folderId);
         if (!folder)
             throw new Error('Cannot rename a data folder that does not exist.');
         if (!(await this.haveDataFolderPerm(folder, 'update')))
             throw new Error(`Current user is not permitted to rename folder ${String(folder.name)}.`);
-        try {
-            await renameDataFolder(folder.id, name);
-            this.loaders.clear();
-            const updatedFolder = await this.raw.findById(folderId);
-            return new DataFolderResponse({ dataFolder: updatedFolder, success: true });
-        }
-        catch (err) {
-            console.error(err);
-            throw new Error('Could not rename data folder');
+        const response = new DataFolderResponse({ success: true });
+        if (name !== folder.name && !(await folderNameUniqueInDataRoot(name, folder.siteId))) {
+            response.addMessage(`A folder with this name already exists in ${folder.siteId ? 'this site' : 'global data'}.`, 'name');
         }
+        if (validateOnly || response.hasErrors())
+            return response;
+        await renameDataFolder(folder.id, name);
+        this.loaders.clear();
+        response.dataFolder = await await this.raw.findById(folderId);
+        return response;
     }
     async move(folderIds, siteId) {
         const dataFolders = (await Promise.all(folderIds.map(async (id) => await this.raw.findById(id)))).filter(isNotNull);

package/dist/datafolder/datafolder.service.js.map

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

package/dist/migrations.js

@@ -11,6 +11,14 @@ const dgMigrations = [
             await init(db);
             await seeddb(db);
         }
+    },
+    {
+        id: 20220915000000,
+        description: 'add unique index on (path,name) to pages table',
+        run: async (db) => {
+            await db.execute('ALTER TABLE `pages` MODIFY path varchar(255)');
+            await db.execute('ALTER TABLE `pages` ADD CONSTRAINT nameinpath UNIQUE (`pagetreeId`,`path`, `name`)');
+        }
     }
 ];
 export async function migrations(moreMigrations) {

package/dist/migrations.js.map

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

package/dist/site/site.database.d.ts

@@ -6,12 +6,8 @@ export declare function getSitesByTemplate(templateIds: number[], atLeastOneTree
     key: any;
     value: Site;
 }[]>;
-export declare function getSitesByGroupIds(groupIds: string[]): Promise<{
-    key: string;
-    value: Site;
-}[]>;
 export declare function getSitesByOwnerInternalId(ownerInternalIds: number[]): Promise<Site[]>;
-export declare function getSitesByManagerInternalId(managerInternalIds: number[]): Promise<{
+export declare function getSitesByManagerInternalId(managerInternalIds: number[], filter?: SiteFilter): Promise<{
     key: any;
     value: Site;
 }[]>;

package/dist/site/site.database.js

@@ -1,6 +1,6 @@
 import db from 'mysql2-async/db';
 import { unique, keyby } from 'txstate-utils';
-import { Site, PagetreeType, createSiteComment, getPageIndexes } from '../internal.js';
+import { Site, PagetreeType, createSiteComment, getPageIndexes, DeletedFilter } from '../internal.js';
 import { nanoid } from 'nanoid';
 const columns = ['sites.id', 'sites.name', 'sites.launchHost', 'sites.launchPath', 'sites.launchEnabled', 'sites.primaryPagetreeId', 'sites.rootAssetFolderId', 'sites.organizationId', 'sites.ownerId', 'sites.deletedAt', 'sites.deletedBy'];
 function processFilters(filter) {
@@ -28,6 +28,23 @@ function processFilters(filter) {
         }
         where.push(ors.join(' OR '));
     }
+    if (filter?.deleted) {
+        if (filter.deleted === DeletedFilter.ONLY) {
+            where.push('sites.deletedAt IS NOT NULL');
+        }
+        else if (filter.deleted === DeletedFilter.HIDE) {
+            where.push('sites.deletedAt IS NULL');
+        }
+    }
+    else {
+        where.push('sites.deletedAt IS NULL');
+    }
+    if (filter?.organizationIds) {
+        where.push(`sites.organizationId IN (${db.in(binds, filter.organizationIds)})`);
+    }
+    if (filter?.ownerInternalIds) {
+        where.push(`sites.ownerId IN (${db.in(binds, filter.ownerInternalIds)})`);
+    }
     if (filter?.assetRootIds?.length) {
         where.push(`sites.rootAssetFolderId IN (${db.in(binds, filter.assetRootIds)})`);
     }
@@ -69,13 +86,6 @@ export async function getSitesByTemplate(templateIds, atLeastOneTree) {
         return sites.map(s => ({ key: s.templateId, value: new Site(s) }));
     }
 }
-export async function getSitesByGroupIds(groupIds) {
-    const rows = await db.getall(`SELECT s.*, gs.groupId
-                                FROM sites s
-                                INNER JOIN groups_sites gs ON gs.siteId=s.id
-                                WHERE gs.groupId IN (${db.in([], groupIds)})`, groupIds);
-    return rows.map(r => ({ key: String(r.groupId), value: new Site(r) }));
-}
 export async function getSitesByOwnerInternalId(ownerInternalIds) {
     const rows = await db.getall(`SELECT sites.*
                                 FROM sites
@@ -83,11 +93,13 @@ export async function getSitesByOwnerInternalId(ownerInternalIds) {
                                 WHERE users.id IN (${db.in([], ownerInternalIds)})`, ownerInternalIds);
     return rows.map(row => new Site(row));
 }
-export async function getSitesByManagerInternalId(managerInternalIds) {
+export async function getSitesByManagerInternalId(managerInternalIds, filter) {
+    const { binds, where } = processFilters(filter);
+    where.push(`sites_managers.userId IN (${db.in(binds, managerInternalIds)})`);
     const rows = await db.getall(`SELECT sites.*, sites_managers.userId
                                 FROM sites
                                 INNER JOIN sites_managers ON sites.id = sites_managers.siteId
-                                WHERE sites_managers.userId IN (${db.in([], managerInternalIds)})`, managerInternalIds);
+                                WHERE (${where.join(') AND (')})`, binds);
     return rows.map(row => ({ key: row.userId, value: new Site(row) }));
 }
 export async function siteNameIsUnique(name) {

package/dist/site/site.database.js.map

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

package/dist/site/site.model.d.ts

@@ -1,5 +1,6 @@
 import { ValidatedResponse, ValidatedResponseArgs } from '@txstate-mws/graphql-server';
 import { DateTime } from 'luxon';
+import { DeletedFilter } from '../internal.js';
 export declare class LaunchURL {
     host: string;
     path: string;
@@ -29,6 +30,10 @@ export declare class SiteFilter {
     names?: string[];
     launchUrls?: LaunchURLInput[];
     launched?: boolean;
+    deleted?: DeletedFilter;
+    ownerInternalIds?: number[];
+    managerInternalIds?: number[];
+    organizationIds?: string[];
     assetRootIds?: number[];
 }
 export declare class CreateSiteInput {

package/dist/site/site.model.js

@@ -11,6 +11,7 @@ import { ValidatedResponse } from '@txstate-mws/graphql-server';
 import { DateTime } from 'luxon';
 import { optionalString, isNotNull } from 'txstate-utils';
 import { Field, ID, InputType, ObjectType, registerEnumType } from 'type-graphql';
+import { DeletedFilter } from '../internal.js';
 let LaunchURL = class LaunchURL {
     constructor(row) {
         this.host = row.launchHost;
@@ -112,6 +113,10 @@ __decorate([
     Field({ nullable: true, description: 'Return sites that are currently launched (i.e. they are publicly available at a specified URL other than the editing host).' }),
     __metadata("design:type", Boolean)
 ], SiteFilter.prototype, "launched", void 0);
+__decorate([
+    Field(type => DeletedFilter, { nullable: true }),
+    __metadata("design:type", String)
+], SiteFilter.prototype, "deleted", void 0);
 SiteFilter = __decorate([
     InputType()
 ], SiteFilter);

package/dist/site/site.model.js.map

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

package/dist/site/site.service.d.ts

@@ -1,28 +1,26 @@
 import { PageData } from '@dosgato/templating';
 import { BaseService } from '@txstate-mws/graphql-server';
-import { Site, SiteFilter, DosGatoService, SiteResponse, Group, UpdateSiteManagementInput } from '../internal.js';
+import { Site, SiteFilter, DosGatoService, SiteResponse, UpdateSiteManagementInput } from '../internal.js';
 export declare class SiteServiceInternal extends BaseService {
     find(filter?: SiteFilter): Promise<Site[]>;
     findById(siteId: string): Promise<Site | undefined>;
-    findByOrganization(orgId: string): Promise<Site[]>;
+    findByOrganization(orgId: string, filter?: SiteFilter): Promise<Site[]>;
     findByTemplateId(templateId: number, atLeastOneTree?: boolean): Promise<Site[]>;
-    findByGroup(group: Group): Promise<Site[]>;
     findByPagetreeId(pagetreeId: string): Promise<Site | undefined>;
     findByAssetRootId(assetFolderId: number): Promise<Site | undefined>;
-    findByOwnerInternalId(ownerInternalId: number): Promise<Site[]>;
-    findByManagerInternalId(managerInternalId: number): Promise<Site[]>;
+    findByOwnerInternalId(ownerInternalId: number, filter?: SiteFilter): Promise<Site[]>;
+    findByManagerInternalId(managerInternalId: number, filter?: SiteFilter): Promise<Site[]>;
 }
 export declare class SiteService extends DosGatoService<Site> {
     raw: SiteServiceInternal;
     find(filter?: SiteFilter): Promise<Site[]>;
     findById(siteId: string): Promise<Site | undefined>;
-    findByOrganization(orgId: string): Promise<Site[]>;
+    findByOrganization(orgId: string, filter?: SiteFilter): Promise<Site[]>;
     findByTemplateId(templateId: number, atLeastOneTree?: boolean): Promise<Site[]>;
-    findByGroup(group: Group): Promise<Site[]>;
     findByPagetreeId(pagetreeId: string): Promise<Site | undefined>;
     findByAssetRootId(assetFolderId: number): Promise<Site | undefined>;
-    findByOwnerInternalId(ownerInternalId: number): Promise<Site[]>;
-    findByManagerInternalId(managerInternalId: number): Promise<Site[]>;
+    findByOwnerInternalId(ownerInternalId: number, filter?: SiteFilter): Promise<Site[]>;
+    findByManagerInternalId(managerInternalId: number, filter?: SiteFilter): Promise<Site[]>;
     create(name: string, data: PageData, validateOnly?: boolean): Promise<SiteResponse>;
     rename(siteId: string, name: string, validateOnly?: boolean): Promise<SiteResponse>;
     setLaunchURL(siteId: string, host: string | undefined, path: string | undefined, enabled: boolean, validateOnly?: boolean): Promise<SiteResponse>;

package/dist/site/site.service.js

@@ -2,48 +2,44 @@ import { BaseService } from '@txstate-mws/graphql-server';
 import { OneToManyLoader, PrimaryKeyLoader, ManyJoinedLoader } from 'dataloader-factory';
 import { nanoid } from 'nanoid';
 import { isNotNull } from 'txstate-utils';
-import { getSites, getSitesByOrganization, getSitesByTemplate, getSitesByGroupIds, undeleteSite, PagetreeService, DosGatoService, createSite, VersionedService, SiteResponse, deleteSite, PageService, getSitesByOwnerInternalId, getSitesByManagerInternalId, siteNameIsUnique, renameSite, setLaunchURL, updateSiteManagement } from '../internal.js';
+import { getSites, getSitesByTemplate, undeleteSite, PagetreeService, DosGatoService, createSite, VersionedService, SiteResponse, deleteSite, PageService, getSitesByManagerInternalId, siteNameIsUnique, renameSite, setLaunchURL, updateSiteManagement, DeletedFilter } from '../internal.js';
 const sitesByIdLoader = new PrimaryKeyLoader({
     fetch: async (ids) => {
-        return await getSites({ ids });
+        return await getSites({ ids, deleted: DeletedFilter.SHOW });
     }
 });
 const siteByOrganizationIdLoader = new OneToManyLoader({
-    fetch: async (orgIds) => {
-        return await getSitesByOrganization(orgIds);
+    fetch: async (orgIds, filter) => {
+        return await getSites({ ...filter, organizationIds: orgIds });
     },
     extractKey: (item) => item.organizationId,
     idLoader: sitesByIdLoader
 });
 const sitesByAssetRootLoader = new PrimaryKeyLoader({
     fetch: async (assetRootIds) => {
-        return await getSites({ assetRootIds });
+        return await getSites({ assetRootIds, deleted: DeletedFilter.SHOW });
     },
     extractId: site => site.rootAssetFolderInternalId,
     idLoader: sitesByIdLoader
 });
+// TODO: does this loader need a filter parameter too? Without it, deleted
+// sites will be returned too
 const sitesByTemplateIdLoader = new ManyJoinedLoader({
     fetch: async (templateIds, atLeastOneTree) => {
         return await getSitesByTemplate(templateIds, atLeastOneTree);
     },
     idLoader: sitesByIdLoader
 });
-const sitesByGroupLoader = new ManyJoinedLoader({
-    fetch: async (groupIds) => {
-        return await getSitesByGroupIds(groupIds);
-    },
-    idLoader: sitesByIdLoader
-});
 const sitesByOwnerInternalIdLoader = new OneToManyLoader({
-    fetch: async (ownerInternalIds) => {
-        return await getSitesByOwnerInternalId(ownerInternalIds);
+    fetch: async (ownerInternalIds, filter) => {
+        return await getSites({ ...filter, ownerInternalIds: ownerInternalIds });
     },
     extractKey: (item) => item.ownerId,
     idLoader: sitesByIdLoader
 });
 const sitesByManagerInternalIdLoader = new ManyJoinedLoader({
-    fetch: async (managerInternalIds) => {
-        return await getSitesByManagerInternalId(managerInternalIds);
+    fetch: async (managerInternalIds, filter) => {
+        return await getSitesByManagerInternalId(managerInternalIds, filter);
     },
     idLoader: sitesByIdLoader
 });
@@ -58,15 +54,12 @@ export class SiteServiceInternal extends BaseService {
     async findById(siteId) {
         return await this.loaders.get(sitesByIdLoader).load(siteId);
     }
-    async findByOrganization(orgId) {
-        return await this.loaders.get(siteByOrganizationIdLoader).load(orgId);
+    async findByOrganization(orgId, filter) {
+        return await this.loaders.get(siteByOrganizationIdLoader, filter).load(orgId);
     }
     async findByTemplateId(templateId, atLeastOneTree) {
         return await this.loaders.get(sitesByTemplateIdLoader, atLeastOneTree).load(templateId);
     }
-    async findByGroup(group) {
-        return await this.loaders.get(sitesByGroupLoader).load(group.id);
-    }
     async findByPagetreeId(pagetreeId) {
         const pagetree = await this.svc(PagetreeService).findById(pagetreeId);
         if (!pagetree)
@@ -76,11 +69,11 @@ export class SiteServiceInternal extends BaseService {
     async findByAssetRootId(assetFolderId) {
         return await this.loaders.get(sitesByAssetRootLoader).load(assetFolderId);
     }
-    async findByOwnerInternalId(ownerInternalId) {
-        return await this.loaders.get(sitesByOwnerInternalIdLoader).load(ownerInternalId);
+    async findByOwnerInternalId(ownerInternalId, filter) {
+        return await this.loaders.get(sitesByOwnerInternalIdLoader, filter).load(ownerInternalId);
     }
-    async findByManagerInternalId(managerInternalId) {
-        return await this.loaders.get(sitesByManagerInternalIdLoader).load(managerInternalId);
+    async findByManagerInternalId(managerInternalId, filter) {
+        return await this.loaders.get(sitesByManagerInternalIdLoader, filter).load(managerInternalId);
     }
 }
 export class SiteService extends DosGatoService {
@@ -94,26 +87,23 @@ export class SiteService extends DosGatoService {
     async findById(siteId) {
         return await this.removeUnauthorized(await this.raw.findById(siteId));
     }
-    async findByOrganization(orgId) {
-        return await this.removeUnauthorized(await this.raw.findByOrganization(orgId));
+    async findByOrganization(orgId, filter) {
+        return await this.removeUnauthorized(await this.raw.findByOrganization(orgId, filter));
     }
     async findByTemplateId(templateId, atLeastOneTree) {
         return await this.removeUnauthorized(await this.raw.findByTemplateId(templateId, atLeastOneTree));
     }
-    async findByGroup(group) {
-        return await this.removeUnauthorized(await this.raw.findByGroup(group));
-    }
     async findByPagetreeId(pagetreeId) {
         return await this.removeUnauthorized(await this.raw.findByPagetreeId(pagetreeId));
     }
     async findByAssetRootId(assetFolderId) {
         return await this.removeUnauthorized(await this.raw.findByAssetRootId(assetFolderId));
     }
-    async findByOwnerInternalId(ownerInternalId) {
-        return await this.removeUnauthorized(await this.raw.findByOwnerInternalId(ownerInternalId));
+    async findByOwnerInternalId(ownerInternalId, filter) {
+        return await this.removeUnauthorized(await this.raw.findByOwnerInternalId(ownerInternalId, filter));
     }
-    async findByManagerInternalId(managerInternalId) {
-        return await this.removeUnauthorized(await this.raw.findByManagerInternalId(managerInternalId));
+    async findByManagerInternalId(managerInternalId, filter) {
+        return await this.removeUnauthorized(await this.raw.findByManagerInternalId(managerInternalId, filter));
     }
     async create(name, data, validateOnly) {
         if (!(await this.mayCreate()))

package/dist/site/site.service.js.map

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

package/dist/user/user.resolver.d.ts

@@ -1,11 +1,11 @@
 import { Context } from '@txstate-mws/graphql-server';
-import { Group, Role, User, UserFilter, Site, UserResponse, UpdateUserInput, UsersResponse } from '../internal.js';
+import { Group, Role, User, UserFilter, Site, UserResponse, UpdateUserInput, UsersResponse, SiteFilter } from '../internal.js';
 export declare class UserResolver {
     users(ctx: Context, filter: UserFilter): Promise<User[] | (User | import("./user.model.js").RedactedUser)[]>;
     groups(ctx: Context, user: User, direct: boolean): Promise<Group[]>;
     roles(ctx: Context, user: User, direct: boolean): Promise<Role[]>;
-    sitesOwned(ctx: Context, user: User): Promise<Site[]>;
-    sitesManaged(ctx: Context, user: User): Promise<Site[]>;
+    sitesOwned(ctx: Context, user: User, filter: SiteFilter): Promise<Site[]>;
+    sitesManaged(ctx: Context, user: User, filter: SiteFilter): Promise<Site[]>;
     permissions(user: User): User;
     createUser(ctx: Context, userId: string, name: string, email: string, trained: boolean | undefined, system: boolean | undefined, validateOnly?: boolean): Promise<UserResponse>;
     updateUser(ctx: Context, userId: string, args: UpdateUserInput, validateOnly?: boolean): Promise<UserResponse>;

package/dist/user/user.resolver.js

@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { Context } from '@txstate-mws/graphql-server';
 import { Resolver, Query, Arg, Ctx, FieldResolver, Root, Mutation, ID } from 'type-graphql';
-import { Group, GroupService, Role, RoleService, User, UserFilter, Site, SiteService, UserPermissions, UserResponse, UpdateUserInput, UserService, UsersResponse } from '../internal.js';
+import { Group, GroupService, Role, RoleService, User, UserFilter, Site, SiteService, UserPermissions, UserResponse, UpdateUserInput, UserService, UsersResponse, SiteFilter } from '../internal.js';
 let UserResolver = class UserResolver {
     async users(ctx, filter) {
         return await ctx.svc(UserService).find(filter);
@@ -23,11 +23,11 @@ let UserResolver = class UserResolver {
     async roles(ctx, user, direct) {
         return await ctx.svc(RoleService).findByUserId(user.id, direct);
     }
-    async sitesOwned(ctx, user) {
-        return await ctx.svc(SiteService).findByOwnerInternalId(user.internalId);
+    async sitesOwned(ctx, user, filter) {
+        return await ctx.svc(SiteService).findByOwnerInternalId(user.internalId, filter);
     }
-    async sitesManaged(ctx, user) {
-        return await ctx.svc(SiteService).findByManagerInternalId(user.internalId);
+    async sitesManaged(ctx, user, filter) {
+        return await ctx.svc(SiteService).findByManagerInternalId(user.internalId, filter);
     }
     permissions(user) {
         return user;
@@ -75,16 +75,18 @@ __decorate([
     FieldResolver(returns => [Site], { description: 'Sites owned by the user' }),
     __param(0, Ctx()),
     __param(1, Root()),
+    __param(2, Arg('filter', { nullable: true })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, User]),
+    __metadata("design:paramtypes", [Context, User, SiteFilter]),
     __metadata("design:returntype", Promise)
 ], UserResolver.prototype, "sitesOwned", null);
 __decorate([
     FieldResolver(returns => [Site], { description: 'Returns sites for which the user is a manager' }),
     __param(0, Ctx()),
     __param(1, Root()),
+    __param(2, Arg('filter', { nullable: true })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, User]),
+    __metadata("design:paramtypes", [Context, User, SiteFilter]),
     __metadata("design:returntype", Promise)
 ], UserResolver.prototype, "sitesManaged", null);
 __decorate([