Refactor file upload and toast notifications #472
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- template/app/migrations/20250731133938_drop_upload_url_from_file/migration.sql | ||
| +++ opensaas-sh/app/migrations/20250731133938_drop_upload_url_from_file/migration.sql | ||
| @@ -0,0 +1,8 @@ | ||
| +/* | ||
| + Warnings: | ||
| + | ||
| + - You are about to drop the column `uploadUrl` on the `File` table. All the data in the column will be lost. | ||
| + | ||
| +*/ | ||
| +-- AlterTable | ||
| +ALTER TABLE "File" DROP COLUMN "uploadUrl"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| --- template/app/migrations/20250806121259_add_s3_key_file/migration.sql | ||
| +++ opensaas-sh/app/migrations/20250806121259_add_s3_key_file/migration.sql | ||
| @@ -0,0 +1,11 @@ | ||
| +/* | ||
| + Warnings: | ||
| + | ||
| + - You are about to drop the column `key` on the `File` table. All the data in the column will be lost. | ||
| + - Added the required column `s3Key` to the `File` table without a default value. This is not possible if the table is not empty. | ||
| + | ||
| +*/ | ||
| +-- AlterTable | ||
| +DELETE FROM "File"; | ||
| +ALTER TABLE "File" DROP COLUMN "key", | ||
| +ADD COLUMN "s3Key" TEXT NOT NULL; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| --- template/app/src/client/App.tsx | ||
| +++ opensaas-sh/app/src/client/App.tsx | ||
| @@ -4,6 +4,7 @@ | ||
| import './Main.css'; | ||
| import NavBar from './components/NavBar/NavBar'; | ||
| import { demoNavigationitems, marketingNavigationItems } from './components/NavBar/constants'; | ||
| +import { useIsLandingPage } from './hooks/useIsLandingPage'; | ||
| import CookieConsentBanner from './components/cookie-consent/Banner'; | ||
| import { Toaster } from '../components/ui/toaster'; | ||
|
|
||
| @@ -13,11 +14,8 @@ | ||
| */ | ||
| export default function App() { | ||
| const location = useLocation(); | ||
| - const isMarketingPage = useMemo(() => { | ||
| - return location.pathname === '/' || location.pathname.startsWith('/pricing'); | ||
| - }, [location]); | ||
| - | ||
| - const navigationItems = isMarketingPage ? marketingNavigationItems : demoNavigationitems; | ||
| + const isLandingPage = useIsLandingPage(); | ||
| + const navigationItems = isLandingPage ? marketingNavigationItems : demoNavigationitems; | ||
|
|
||
| const shouldDisplayAppNavBar = useMemo(() => { | ||
| return ( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,16 @@ | ||
| --- template/app/src/client/components/NavBar/constants.ts | ||
| +++ opensaas-sh/app/src/client/components/NavBar/constants.ts | ||
| @@ -9,12 +9,12 @@ | ||
|
|
||
| export const marketingNavigationItems: NavigationItem[] = [ | ||
| { name: 'Features', to: '/#features' }, | ||
| - { name: 'Pricing', to: routes.PricingPageRoute.to }, | ||
| ...staticNavigationItems, | ||
| ] as const; | ||
|
|
||
| export const demoNavigationitems: NavigationItem[] = [ | ||
| { name: 'AI Scheduler', to: routes.DemoAppRoute.to }, | ||
| { name: 'File Upload', to: routes.FileUploadRoute.to }, | ||
| + { name: 'Pricing', to: routes.PricingPageRoute.to }, | ||
| ...staticNavigationItems, | ||
| ] as const; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,28 @@ | ||
| --- template/app/src/file-upload/fileUploading.ts | ||
| +++ opensaas-sh/app/src/file-upload/fileUploading.ts | ||
| @@ -1,5 +1,7 @@ | ||
| +import type { User } from 'wasp/entities'; | ||
| import axios from 'axios'; | ||
| import { ALLOWED_FILE_TYPES, MAX_FILE_SIZE_BYTES } from './validation'; | ||
| +import { PrismaClient } from '@prisma/client'; | ||
|
|
||
| type AllowedFileTypes = (typeof ALLOWED_FILE_TYPES)[number]; | ||
| export type FileWithValidType = File & { type: AllowedFileTypes }; | ||
| @@ -51,3 +53,17 @@ | ||
| function isFileWithAllowedFileType(file: File): file is FileWithValidType { | ||
| return ALLOWED_FILE_TYPES.includes(file.type as AllowedFileTypes); | ||
| } | ||
| + | ||
| +export async function checkIfUserHasReachedFileUploadLimit({ userId, prismaFileDelegate }: { userId: User['id']; prismaFileDelegate: PrismaClient['file'] }) { | ||
| + const numberOfFilesByUser = await prismaFileDelegate.count({ | ||
| + where: { | ||
| + user: { | ||
| + id: userId, | ||
| + }, | ||
| + }, | ||
| + }); | ||
| + if (numberOfFilesByUser >= 2) { | ||
| + return true; | ||
| + } | ||
| + return false; | ||
| +} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,34 @@ | ||
| --- template/app/src/file-upload/operations.ts | ||
| +++ opensaas-sh/app/src/file-upload/operations.ts | ||
| @@ -1,6 +1,5 @@ | ||
| -import * as z from 'zod'; | ||
| -import { HttpError } from 'wasp/server'; | ||
| import { type File } from 'wasp/entities'; | ||
| +import { HttpError } from 'wasp/server'; | ||
| import { | ||
| type GetAllFilesByUser, | ||
| type GetDownloadFileSignedURL, | ||
| @@ -8,6 +7,8 @@ | ||
| type CreateFileUploadUrl, | ||
| type AddFileToDb, | ||
| } from 'wasp/server/operations'; | ||
| +import { checkIfUserHasReachedFileUploadLimit } from './fileUploading'; | ||
| +import * as z from 'zod'; | ||
|
|
||
| import { | ||
| getUploadFileSignedURLFromS3, | ||
| @@ -37,6 +38,14 @@ | ||
| throw new HttpError(401); | ||
| } | ||
|
|
||
| + const userFileLimitReached = await checkIfUserHasReachedFileUploadLimit({ | ||
| + userId: context.user.id, | ||
| + prismaFileDelegate: context.entities.File, | ||
| + }); | ||
| + if (userFileLimitReached) { | ||
| + throw new HttpError(403, 'This demo only allows 2 file uploads per user.'); | ||
| + } | ||
| + | ||
| const { fileType, fileName } = ensureArgsSchemaOrThrowHttpError(createFileInputSchema, rawArgs); | ||
|
|
||
| return await getUploadFileSignedURLFromS3({ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| --- template/app/src/file-upload/workers.ts | ||
| +++ opensaas-sh/app/src/file-upload/workers.ts | ||
| @@ -0,0 +1,29 @@ | ||
| +import type { DeleteFilesJob } from 'wasp/server/jobs'; | ||
| +import { deleteFileFromS3 } from './s3Utils'; | ||
| + | ||
| +export const deleteFilesJob: DeleteFilesJob<never, void> = async (_args, context) => { | ||
| + const filesToDelete = await context.entities.File.findMany({ | ||
| + where: { | ||
| + createdAt: { | ||
| + lt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 7), | ||
|
There was a problem hiding this comment. I'd suggest we do const last7Days = new Date(Date.now() - 1000 * 60 * 60 * 24 * 7);So it's more clear what is the limit. Or even better: const dayInMiliseconds = 1000 * 60 * 60 * 24;
const timeLimitToDeleteFiles = Date.now() - 7 * dayInMiliseconds;Something along those lines. |
||
| + }, | ||
| + }, | ||
| + select: { s3Key: true, id: true }, | ||
| + }); | ||
| + | ||
| + for (const file of filesToDelete) { | ||
| + try { | ||
| + await deleteFileFromS3({ s3Key: file.s3Key }); | ||
| + } catch (err) { | ||
| + console.error(`Failed to delete S3 file with key ${file.s3Key}:`, err); | ||
| + } | ||
| + } | ||
| + | ||
| + const deletedFiles = await context.entities.File.deleteMany({ | ||
| + where: { | ||
| + id: { in: filesToDelete.map((file) => file.id) }, | ||
| + }, | ||
| + }); | ||
|
Comment on lines
+17
to
+29
There was a problem hiding this comment. This is fine, but it would be better done in a Prisma transaction: try {
await prisma.$transaction(async (tx) => {
await tx.file.delete(...)
await deleteFileFromS3(...)
})
} catch (err) {
// If something went wrong with deleting the file from S3, the file won't be deleted from the database
}I'm not sure if we this is too fancy @FranjoMindek There was a problem hiding this comment. We use prisma transactions elsewhere in the code so I think its fine to use it here too. |
||
| + | ||
| + console.log(`Deleted ${deletedFiles.count} files`); | ||
| +}; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.