Skip to content

fix: we upload in webapp already #3545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rebelchris merged 1 commit into from
Feb 4, 2026
Merged

fix: we upload in webapp already #3545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/common/schema/feedback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ export const feedbackInputSchema = z.object({
.max(2000),
pageUrl: z.string().nullish(),
userAgent: z.string().nullish(),
screenshotUrl: z.url().nullish(),
});
3 changes: 0 additions & 3 deletions src/entity/Feedback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ export class Feedback {
@Column({ type: 'text', nullable: true })
screenshotUrl: string | null;

@Column({ type: 'text', nullable: true })
screenshotId: string | null;

@CreateDateColumn()
@Index('IDX_feedback_created_at')
createdAt: Date;
Expand Down
47 changes: 6 additions & 41 deletions src/schema/feedback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,13 @@ import { ValidationError } from 'apollo-server-errors';
import { feedbackInputSchema } from '../common/schema/feedback';
import { ZodError } from 'zod/v4';
import { GQLEmptyResponse } from './common';
import { uploadPostFile, UploadPreset } from '../common/cloudinary';
import { generateUUID } from '../ids';
// @ts-expect-error - no types
import { FileUpload } from 'graphql-upload/GraphQLUpload.js';

interface GQLFeedbackInput {
category: number;
description: string;
pageUrl?: string;
userAgent?: string;
screenshot?: Promise<FileUpload>;
screenshotUrl?: string;
}

export const typeDefs = /* GraphQL */ `
Expand Down Expand Up @@ -46,9 +42,9 @@ export const typeDefs = /* GraphQL */ `
userAgent: String

"""
Optional screenshot image upload
Optional screenshot URL (client uploads to Cloudinary)
"""
screenshot: Upload
screenshotUrl: String
}

"""
Expand Down Expand Up @@ -98,37 +94,7 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
throw err;
}

let screenshotUrl: string | null = null;
let screenshotId: string | null = null;

// Handle screenshot upload
if (input.screenshot && process.env.CLOUDINARY_URL) {
const upload = await input.screenshot;
const extension = upload.filename?.split('.').pop()?.toLowerCase();

// Validate image type
const allowedExtensions = ['png', 'jpg', 'jpeg', 'webp', 'gif'];
if (!extension || !allowedExtensions.includes(extension)) {
throw new ValidationError(
'Invalid screenshot format. Allowed: png, jpg, jpeg, webp, gif',
);
}

const id = generateUUID();
const filename = `feedback_${id}`;
const preset =
extension === 'gif'
? UploadPreset.FreeformGif
: UploadPreset.FreeformImage;

const uploadResult = await uploadPostFile(
filename,
upload.createReadStream(),
preset,
);
screenshotUrl = uploadResult.url;
screenshotId = uploadResult.id;
}
const screenshotUrl = input.screenshotUrl || null;

// Create feedback record
// CDC will pick this up and handle classification via PubSub
Expand All @@ -140,16 +106,15 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
pageUrl: input.pageUrl || null,
userAgent: input.userAgent || null,
screenshotUrl,
screenshotId,
status: FeedbackStatus.Pending,
flags: {},
});

// Create ContentImage record to link screenshot to feedback
if (screenshotUrl && screenshotId) {
if (screenshotUrl) {
await ctx.con.getRepository(ContentImage).save({
url: screenshotUrl,
serviceId: screenshotId,
serviceId: screenshotUrl,
usedByType: ContentImageUsedByType.Feedback,
usedById: feedback.id,
});
Expand Down
Loading