Merge branch 'develop'

Author: CarsonF

.yarn/releases/yarn-3.6.2.cjs renamed to .yarn/releases/yarn-3.6.3.cjs

@@ -6,7 +6,7 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.6.2.cjs
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
 
 logFilters:
   # discard these messages that flood the build log

.yarnrc.yml

@@ -2,7 +2,7 @@
   "name": "cord-api-v3",
   "version": "3.0.0",
   "license": "MIT",
-  "packageManager": "[email protected].2",
+  "packageManager": "[email protected].3",
   "engines": {
     "node": ">= 18.9"
   },

package.json

@@ -1,4 +1,4 @@
-import { InputType, ObjectType } from '@nestjs/graphql';
+import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import {
   PaginatedList,
   SortablePaginationInput,
@@ -28,3 +28,14 @@ export class ProgressReportMediaList extends PaginatedList(
 ) {
   readonly report: ProgressReport;
 }
+
+@ObjectType()
+export class AvailableProgressReportMediaVariant {
+  @Field(() => Variant)
+  readonly variant: Variant<MediaVariant>;
+
+  @Field({
+    description: 'Whether the user can upload/create media for this variant',
+  })
+  readonly canCreate: boolean;
+}

src/components/progress-report/media/dto/media-list.dto.ts

@@ -2,6 +2,7 @@ import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 import { AnonSession, Session, Variant } from '~/common';
 import { Privileges, withVariant } from '../../../authorization';
 import {
+  AvailableProgressReportMediaVariant as AvailableVariant,
   ProgressReportMedia as ReportMedia,
   ProgressReportMediaList as ReportMediaList,
 } from '../dto';
@@ -12,6 +13,7 @@ export class ProgressReportMediaListResolver {
 
   @ResolveField(() => [Variant], {
     description: 'The variants the requester has access to upload',
+    deprecationReason: 'Use `availableVariants` instead',
   })
   uploadableVariants(
     @Parent() { report }: ReportMediaList,
@@ -23,4 +25,25 @@ export class ProgressReportMediaListResolver {
       privileges.forContext(withVariant(context, variant)).can('create'),
     );
   }
+
+  @ResolveField(() => [AvailableVariant], {
+    description: 'The variants available to the requester',
+  })
+  availableVariants(
+    @Parent() { report }: ReportMediaList,
+    @AnonSession() session: Session,
+  ): readonly AvailableVariant[] {
+    const context = report as any; // the report is fine for condition context
+    const privileges = this.privileges.for(session, ReportMedia);
+    return ReportMedia.Variants.filter((variant) =>
+      privileges.forContext(withVariant(context, variant)).can('read'),
+    ).map(
+      (variant): AvailableVariant => ({
+        variant,
+        canCreate: privileges
+          .forContext(withVariant(context, variant))
+          .can('create'),
+      }),
+    );
+  }
 }

src/components/progress-report/media/resolvers/list.resolver.ts

@@ -17,11 +17,7 @@ export const deleteBaseNode = (nodeVar: string) => (query: Query) =>
       node('propertyNode', 'Property'),
     ])
     // Mark any parent base node relationships (pointing to the base node) as active = false.
-    .optionalMatch([
-      node(nodeVar),
-      relation('in', 'baseNodeRel'),
-      node('', 'BaseNode'),
-    ])
+    .optionalMatch([node(nodeVar), relation('in', 'baseNodeRel'), node()])
     .setValues({
       [`${nodeVar}.deletedAt`]: DateTime.local(),
       'baseNodeRel.active': false,