Deferred preload and fetch on reviewer screen

api/src/prompt/prompt.service.ts

@@ -21,16 +21,16 @@ const byInternalIdLoader = new PrimaryKeyLoader({
 })
 
 const byRequirementIdLoader = new OneToManyLoader({
-  fetch: async (requirementIds: string[]) => {
-    return await getRequirementPrompts({ requirementIds })
+  fetch: async (requirementIds: string[], filters?: RequirementPromptFilter) => {
+    return await getRequirementPrompts({ ...filters, requirementIds })
   },
   extractKey: row => row.requirementId,
   idLoader: byInternalIdLoader
 })
 
 const byAppRequestInternalIdLoader = new OneToManyLoader({
-  fetch: async (appRequestIds: string[]) => {
-    return await getRequirementPrompts({ appRequestIds })
+  fetch: async (appRequestIds: string[], filters?: RequirementPromptFilter) => {
+    return await getRequirementPrompts({ ...filters, appRequestIds })
   },
   extractKey: (row: RequirementPrompt) => row.appRequestId,
   idLoader: [byInternalIdLoader]
@@ -83,14 +83,14 @@ export class RequirementPromptServiceInternal extends BaseService<RequirementPro
     return await this.findByInternalId(Number(id))
   }
 
-  async findByAppRequest (appRequest: AppRequest) {
-    const prompts = await this.loaders.get(byAppRequestInternalIdLoader).load(appRequest.id)
+  async findByAppRequest (appRequest: AppRequest, filters?: RequirementPromptFilter) {
+    const prompts = await this.loaders.get(byAppRequestInternalIdLoader, filters).load(appRequest.id)
     for (const prompt of prompts) prompt.appRequestTags = appRequest.tags
     return prompts
   }
 
-  async findByApplicationRequirement (requirement: ApplicationRequirement) {
-    const prompts = await this.loaders.get(byRequirementIdLoader).load(requirement.id)
+  async findByApplicationRequirement (requirement: ApplicationRequirement, filters?: RequirementPromptFilter) {
+    const prompts = await this.loaders.get(byRequirementIdLoader, filters).load(requirement.id)
     for (const prompt of prompts) prompt.appRequestTags = requirement.appRequestTags
     return prompts
   }
@@ -108,13 +108,13 @@ export class RequirementPromptService extends AuthService<RequirementPrompt> {
     return await this.findByInternalId(Number(id))
   }
 
-  async findByAppRequest (appRequest: AppRequest) {
-    const prompts = await this.raw.findByAppRequest(appRequest)
+  async findByAppRequest (appRequest: AppRequest, filters?: RequirementPromptFilter) {
+    const prompts = await this.raw.findByAppRequest(appRequest, filters)
     return this.removeUnauthorized(prompts)
   }
 
-  async findByApplicationRequirement (requirement: ApplicationRequirement) {
-    const prompts = await this.raw.findByApplicationRequirement(requirement)
+  async findByApplicationRequirement (requirement: ApplicationRequirement, filters?: RequirementPromptFilter) {
+    const prompts = await this.raw.findByApplicationRequirement(requirement, filters)
     return this.removeUnauthorized(prompts)
   }
 

api/src/requirement/requirement.resolver.ts

@@ -1,6 +1,6 @@
 import { Arg, Ctx, FieldResolver, ID, Mutation, Query, Resolver, Root } from 'type-graphql'
 import { Context, ValidatedResponse } from '@txstate-mws/graphql-server'
-import { requirementRegistry, Requirement, ApplicationRequirement, Prompt, promptRegistry, RequirementPrompt, RequirementPromptService, Application, ApplicationService, Configuration, ConfigurationService, RQContext, PeriodProgramRequirement, PromptService, JsonData, PeriodPromptService, PeriodPrompt, PeriodWorkflowStage, ProgramService, PeriodRequirementService, PeriodService, ApplicationRequirementService } from '../internal.js'
+import { requirementRegistry, Requirement, ApplicationRequirement, Prompt, promptRegistry, RequirementPrompt, RequirementPromptService, Application, ApplicationService, Configuration, ConfigurationService, RQContext, PeriodProgramRequirement, PromptService, JsonData, PeriodPromptService, PeriodPrompt, PeriodWorkflowStage, ProgramService, PeriodRequirementService, PeriodService, ApplicationRequirementService, RequirementPromptFilter } from '../internal.js'
 
 @Resolver(of => Requirement)
 export class RequirementResolver {
@@ -18,8 +18,8 @@ export class RequirementResolver {
 @Resolver(of => ApplicationRequirement)
 export class ApplicationRequirementResolver {
   @FieldResolver(returns => [RequirementPrompt])
-  async prompts (@Ctx() ctx: Context, @Root() requirement: ApplicationRequirement) {
-    return await ctx.svc(RequirementPromptService).findByApplicationRequirement(requirement)
+  async prompts (@Ctx() ctx: Context, @Root() requirement: ApplicationRequirement, @Arg('filter', { nullable: true }) filter?: RequirementPromptFilter) {
+    return await ctx.svc(RequirementPromptService).findByApplicationRequirement(requirement, filter)
   }
 
   @FieldResolver(returns => Application)

demos/src/default/definitions/prompts/cat.prompts.ts

@@ -38,6 +38,16 @@ export const applicant_seems_nice_prompt: PromptDefinition<NicePromptData> = {
   navTitle: 'Niceness',
   description: 'Reviewer will indicate whether the applicant seems nice.',
   schema: NicePromptSchema,
+  fetch: async (appRequest, config, data) => {
+    // Simulate delayed fetching
+    await new Promise(resolve => setTimeout(resolve, 1000))
+    return { ratings: [0, 1, 2, 3, 4, 5] }
+  },
+  preload: async (appRequest, config, data) => {
+    // Simulate delayed preloading
+    await new Promise(resolve => setTimeout(resolve, 1000))
+    return { seemsNice: false }
+  },
   validate: (data, config) => {
     const messages = []
     if (data.seemsNice == null) {