Change GQL Resource.tools to a secured list so canCreate can be supplied

Author: CarsonF

src/components/tools/tool-usage/resource-tools.resolver.ts

@@ -1,19 +1,19 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 import { Loader, type LoaderOf } from '@seedcompany/data-loader';
 import { Resource } from '~/common';
-import { ToolUsage } from './dto';
+import { SecuredToolUsageList } from './dto';
 import { ToolUsageByContainerLoader } from './tool-usage-by-container.loader';
 
 @Resolver(() => Resource)
 export class ResourceToolsResolver {
-  @ResolveField(() => [ToolUsage], {
+  @ResolveField(() => SecuredToolUsageList, {
     description: 'Tools used in this resource',
   })
   async tools(
     @Parent() resource: Resource,
     @Loader(() => ToolUsageByContainerLoader)
     loader: LoaderOf<ToolUsageByContainerLoader>,
-  ): Promise<readonly ToolUsage[]> {
+  ): Promise<SecuredToolUsageList> {
     const { usages } = await loader.load(resource);
     return usages;
   }

src/components/tools/tool-usage/tool-usage-by-container.loader.ts

@@ -6,13 +6,13 @@ import {
   type LoaderOptionsOf,
 } from '~/core/data-loader';
 import { ToolLoader } from '../tool/tool.loader';
-import { type ToolUsage } from './dto';
+import { type SecuredToolUsageList } from './dto';
 import { ToolUsageLoader } from './tool-usage.loader';
 import { ToolUsageService } from './tool-usage.service';
 
 export interface UsagesByContainer {
   container: Resource;
-  usages: readonly ToolUsage[];
+  usages: SecuredToolUsageList;
 }
 
 @LoaderFactory()
@@ -35,7 +35,7 @@ export class ToolUsageByContainerLoader
     const res = await this.usages.readManyForContainers(ids);
 
     const canonicalUsages = await ctx.getLoader(ToolUsageLoader);
-    const usages = res.flatMap((u) => u.usages);
+    const usages = res.flatMap((u) => u.usages.items);
     canonicalUsages.primeAll(usages);
 
     const canonicalTools = await ctx.getLoader(ToolLoader);

src/components/tools/tool-usage/tool-usage.gel.repository.ts

@@ -33,7 +33,7 @@ export class ToolUsageRepository
     ($) => {
       const containers = e.cast(e.Resource, e.array_unpack($.containers));
       return e.select(containers, (container) => ({
-        container: e.select(container, (c) => ({ id: c.id })),
+        container: e.select(container, resAsBaseNode),
         usages: e.select(container.tools, this.hydrate),
       }));
     },

src/components/tools/tool-usage/tool-usage.neo4j.repository.ts

@@ -13,6 +13,7 @@ import {
   merge,
   variable,
 } from '~/core/database/query';
+import { type BaseNode } from '~/core/database/results';
 import { toolFilters } from '../tool/tool.neo4j.repository';
 import {
   type CreateToolUsage,
@@ -68,9 +69,9 @@ export class ToolUsageRepository extends DtoRepository(ToolUsage) {
           .return(collect('dto').as('usages')),
       )
       .return<{
-        container: { id: ID };
+        container: BaseNode;
         usages: ReadonlyArray<UnsecuredDto<ToolUsage>>;
-      }>(['container { .id }', 'usages'])
+      }>(['container', 'usages'])
       .run();
     return result;
   }

src/components/tools/tool-usage/tool-usage.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { mapKeys } from '@seedcompany/common';
 import {
   DuplicateException,
+  EnhancedResource,
   type ID,
   InputException,
   isIdLike,
@@ -10,7 +11,7 @@ import {
   ServerException,
   type UnsecuredDto,
 } from '~/common';
-import { HandleIdLookup, ResourceLoader } from '~/core';
+import { HandleIdLookup, ResourceLoader, ResourceResolver } from '~/core';
 import { type BaseNode, isBaseNode } from '~/core/database/results';
 import { Privileges } from '../../authorization';
 import { Tool } from '../tool/dto';
@@ -27,6 +28,7 @@ export class ToolUsageService {
   constructor(
     private readonly privileges: Privileges,
     private readonly resources: ResourceLoader,
+    private readonly resourceResolver: ResourceResolver,
     private readonly repo: ToolUsageRepository,
   ) {}
 
@@ -56,10 +58,30 @@ export class ToolUsageService {
     const containersById = mapKeys.fromList(containers, (r) => r.id).asMap;
     const rows = await this.repo.listForContainers(containers.map((r) => r.id));
     return rows.map((row): UsagesByContainer => {
-      const container = containersById.get(row.container.id)!;
+      const container = containersById.get(row.container.properties.id)!;
+
+      const typeName =
+        container.__typename ??
+        this.resourceResolver.resolveTypeByBaseNode(row.container);
+      const containerType = EnhancedResource.resolve(
+        typeName,
+      ) as EnhancedResource<typeof Resource>;
+
+      const usages = row.usages.flatMap(
+        (dto) => this.secure(dto, container) ?? [],
+      );
       return {
         container,
-        usages: row.usages.flatMap((dto) => this.secure(dto, container) ?? []),
+        usages: {
+          items: usages,
+          total: usages.length,
+          hasMore: false,
+
+          canRead: true,
+          canCreate: this.privileges
+            .for(containerType, container)
+            .can('create', 'tools'),
+        },
       };
     });
   }