fix: optimised display of delete, archive, unarchive button (#790)

UserOfficeProject · Oct 29, 2024 · 845ec87 · 845ec87
2 parents 4236884 + 7d079d8
commit 845ec87
Show file tree

Hide file tree

Showing 12 changed files with 1,918 additions and 350 deletions.
diff --git a/apps/backend/src/datasources/postgres/CallDataSource.ts b/apps/backend/src/datasources/postgres/CallDataSource.ts
@@ -63,6 +63,10 @@ export default class PostgresCallDataSource implements CallDataSource {
       query.whereIn('fap_review_template_id', filter.fapReviewTemplateIds);
     }
 
+    if (filter?.esiTemplateIds) {
+      query.whereIn('esi_template_id', filter.esiTemplateIds);
+    }
+
     // if filter is explicitly set to true or false
     if (filter?.isActive === true) {
       query.where('is_active', true);

diff --git a/apps/backend/src/resolvers/queries/CallsQuery.ts b/apps/backend/src/resolvers/queries/CallsQuery.ts
@@ -17,6 +17,9 @@ export class CallsFilter {
   @Field(() => [Int], { nullable: true })
   public pdfTemplateIds?: number[];
 
+  @Field(() => [Int], { nullable: true })
+  public esiTemplateIds?: number[];
+
   @Field(() => [Int], { nullable: true })
   public fapReviewTemplateIds?: number[];
 

diff --git a/apps/backend/src/resolvers/types/FapReviewTemplate.ts b/apps/backend/src/resolvers/types/FapReviewTemplate.ts
@@ -21,7 +21,7 @@ export class TemplateResolver {
     @Ctx() context: ResolverContext
   ): Promise<number> {
     return context.queries.call
-      .getAll(context.user, { templateIds: [template.templateId] })
+      .getAll(context.user, { fapReviewTemplateIds: [template.templateId] })
       .then((result) => result?.length || 0);
   }
 }
diff --git a/apps/backend/src/resolvers/types/Template.ts b/apps/backend/src/resolvers/types/Template.ts
@@ -83,6 +83,16 @@ export class TemplateResolver {
       .then((result) => result?.length || 0);
   }
 
+  @FieldResolver(() => Int, { nullable: true })
+  async proposalESICallCount(
+    @Root() template: Template,
+    @Ctx() context: ResolverContext
+  ): Promise<number> {
+    return context.queries.call
+      .getAll(context.user, { esiTemplateIds: [template.templateId] })
+      .then((result) => result?.length || 0);
+  }
+
   @FieldResolver(() => TemplateGroup)
   async group(@Root() template: Template): Promise<TemplateGroup> {
     const templateDataSource = container.resolve(TemplateDataSource);