Add file edit options on frontend #164
Merged
Conversation
This file contains 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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
nickbar01234
commented
Apr 15, 2024
| @@ -105,7 +105,11 @@ model File { | |||
| id String @id @default(auto()) @map("_id") @db.ObjectId | |||
| date DateTime // will zero out the hours | |||
| filetype String | |||
|
|
|||
| // Use with Google API | |||
| fileId String | |||
There was a problem hiding this comment.
Make it easier to keep track instead of parsing the string.
nickbar01234
commented
Apr 15, 2024
| @@ -106,13 +106,14 @@ export const PATCH = withSessionAndRole( | |||
| ); | |||
| const studentIDsToAdd = seniorBody.StudentIDs; | |||
|
|
|||
| const { StudentIDs: _, ...other } = seniorBody; | |||
There was a problem hiding this comment.
This actually was a bug we didn't notice before. Without destructuring StudentIDs, the relation on User side is not updated.
nickbar01234
commented
Apr 15, 2024
| }, | ||
| include: { senior: true }, | ||
| }); | ||
| const otherFiles = await prisma.file.findMany({ |
There was a problem hiding this comment.
Without this check, user can make files with the same date!
nickbar01234
commented
Apr 15, 2024
| !user.SeniorIDs.some( | ||
| (seniorId: string) => seniorId === fileData.seniorId | ||
| ) || | ||
| otherFiles.length > 0 |
There was a problem hiding this comment.
Same problem here!
nickbar01234
commented
Apr 15, 2024
| }: { | ||
| seniorId: string; | ||
| seniorFolder: string; | ||
| files: PrismaFile[]; | ||
| editFile?: PrismaFile; | ||
| setEditFile: React.Dispatch<React.SetStateAction<PrismaFile | undefined>>; |
There was a problem hiding this comment.
I don't think this is too clean, but it makes the most sense given the time constraint.
wkim10
reviewed
Apr 15, 2024
|
|
||
| if ( | ||
| !user.SeniorIDs.some((seniorId: string) => seniorId === fileData.seniorId) | ||
| otherFiles.length > 0 || | ||
| maybeFile == null || |
wkim10
reviewed
Apr 15, 2024
| }, | ||
| }); | ||
| onClick={async () => { | ||
| editFile == null |
wkim10
reviewed
Apr 15, 2024
| const fetching = fetchingCreateFile || fetchingUpdateFile; | ||
|
|
||
| React.useEffect(() => { | ||
| if (editFile != undefined) { |
wkim10
reviewed
Apr 15, 2024
| @@ -168,19 +200,28 @@ const AddFile = ({ | |||
| selectedTags.length == 0 || | |||
There was a problem hiding this comment.
this wasn't one of your changes but triple equals ===
wkim10
reviewed
Apr 15, 2024
| }} | ||
| > | ||
| {!fetching ? "Create" : "Loading..."} | ||
| {fetching ? "Loading..." : editFile == null ? "Create" : "Update"} |
wkim10
reviewed
Apr 15, 2024
| }); | ||
|
|
||
| const fetching = fetchingDeleteFile; | ||
| const editable = setFileEdit != undefined; |
wkim10
reviewed
Apr 15, 2024
| }) => { | ||
| const [showAddFilePopUp, setShowAddFilePopUp] = useState<boolean>(false); | ||
|
|
||
| const handlePopUp = () => { | ||
| setShowAddFilePopUp(!showAddFilePopUp); | ||
| }; | ||
|
|
||
| React.useEffect(() => { | ||
| if (editFile != null) { |
wkim10
reviewed
Apr 15, 2024
| }, | ||
| }); | ||
|
|
||
| if (file === null) { | ||
| if (file == null || !file.senior.StudentIDs.includes(session.user.id)) { |
johnny-t06
requested changes
Apr 15, 2024
| @@ -106,13 +106,14 @@ export const PATCH = withSessionAndRole( | |||
| ); | |||
| const studentIDsToAdd = seniorBody.StudentIDs; | |||
|
|
|||
| const { StudentIDs: _, ...other } = seniorBody; | |||
src/app/api/file/[fileId]/route.ts
Outdated
| FileResponse.parse({ | ||
| code: "INVALID_REQUEST", | ||
| message: "Not a valid request", | ||
| code: "SUCCESS_UPDATE", |
There was a problem hiding this comment.
I think unsuccessful error code to display on front end for some user feedback is more smooth
johnny-t06
approved these changes
Apr 15, 2024
nickbar01234
force-pushed
the
nickbar01234/file-api
branch
from
65f9a7e to
ba2876b
Compare
|
Resolved with @wkim10 on |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description