Change Project.isMember to be only active memberships by default. Optionally include inactive.

Author: CarsonF

src/components/project/dto/project.dto.ts

@@ -177,10 +177,11 @@ class Project extends Interfaces {
 
   readonly rootDirectory: Secured<LinkTo<'Directory'> | null>;
 
-  @Field({
-    description: 'Is the requesting user a member of this project?',
-  })
-  readonly isMember: boolean;
+  /** The current user's membership, if any. */
+  readonly membership:
+    | (LinkTo<'ProjectMember'> &
+        Pick<UnsecuredDto<ProjectMember>, 'roles' | 'inactiveAt'>)
+    | null;
 
   @Field({
     description: stripIndent`

src/components/project/project.gel.repository.ts

@@ -38,6 +38,11 @@ const hydrate = e.shape(e.Project, (project) => ({
   __typename: project.__type__.name.slice(9, null),
 
   rootDirectory: true,
+  membership: {
+    id: true,
+    roles: true,
+    inactiveAt: true,
+  },
   primaryPartnership: e
     .select(project.partnerships, (p) => ({
       filter: e.op(p.primary, '=', true),

src/components/project/project.repository.ts

@@ -15,12 +15,15 @@ import { CommonRepository, OnIndex, UniquenessError } from '~/core/database';
 import { type ChangesOf, getChanges } from '~/core/database/changes';
 import {
   ACTIVE,
+  collect,
   createNode,
   createRelationships,
+  currentUser,
   defineSorters,
   FullTextIndex,
   matchChangesetAndChangedProps,
   matchProjectSens,
+  matchProps,
   matchPropsAndProjectSensAndScopedRoles,
   merge,
   paginate,
@@ -89,6 +92,19 @@ export class ProjectRepository extends CommonRepository {
           relation('out', '', 'rootDirectory', ACTIVE),
           node('rootDirectory', 'Directory'),
         ])
+        .subQuery('node', (sub) =>
+          sub
+            .match([
+              node('node'),
+              relation('out', '', 'member', ACTIVE),
+              node('membership'),
+              relation('out', '', 'user'),
+              currentUser,
+            ])
+            .apply(matchProps({ nodeName: 'membership', outputVar: 'dto' }))
+            .with(collect('dto').as('dtos'))
+            .return('dtos[0] as membership'),
+        )
         .optionalMatch([
           node('node'),
           relation('out', '', 'partnership', ACTIVE),
@@ -134,7 +150,7 @@ export class ProjectRepository extends CommonRepository {
           merge('props', 'changedProps', {
             type: 'node.type',
             pinned,
-            isMember: '"member:true" in props.scope',
+            membership: 'membership',
             rootDirectory: 'rootDirectory { .id }',
             primaryPartnership: 'primaryPartnership { .id }',
             primaryLocation: 'primaryLocation { .id }',

src/components/project/project.resolver.ts

@@ -18,6 +18,7 @@ import {
   ListArg,
   mapSecuredValue,
   NotFoundException,
+  OptionalField,
   SecuredDateRange,
 } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
@@ -83,6 +84,14 @@ class ModifyOtherLocationArgs {
   locationId: ID;
 }
 
+@ArgsType()
+class IsMemberArgs {
+  @OptionalField({
+    description: 'Consider inactive memberships as well',
+  })
+  includeInactive?: boolean;
+}
+
 @Resolver(IProject)
 export class ProjectResolver {
   constructor(private readonly projectService: ProjectService) {}
@@ -148,6 +157,19 @@ export class ProjectResolver {
     return list;
   }
 
+  @ResolveField(() => Boolean, {
+    description: 'Is the requesting user a member of this project?',
+  })
+  isMember(
+    @Parent() project: Project,
+    @Args() { includeInactive }: IsMemberArgs,
+  ): boolean {
+    return (
+      !!project.membership &&
+      (includeInactive ? true : !project.membership.inactiveAt)
+    );
+  }
+
   @ResolveField(() => String, { nullable: true })
   avatarLetters(@Parent() project: Project): string | undefined {
     return project.name.canRead && project.name.value