Skip to content

Fixed/ Logged out error modal. #3054

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

Closed
wants to merge 6 commits into from
Closed

Fixed/ Logged out error modal. #3054

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3042a77
ut
letscodedanish Feb 25, 2024
9fc3d6f
Fixed Logged out error modal
letscodedanish Feb 26, 2024
31847a4
final commit
letscodedanish Feb 26, 2024
4c5557a
Merge branch 'develop' into fix/modal
letscodedanish Feb 26, 2024
dc4c7b5
suggested changes done
letscodedanish Feb 27, 2024
037ecfc
Merge branch 'fix/modal' of https://github.com/letscodedanish/p5.js-w…
letscodedanish Feb 27, 2024
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
4 changes: 3 additions & 1 deletion client/modules/IDE/hooks/useSketchActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ const useSketchActions = () => {

function downloadSketch() {
dispatch(autosaveProject());
exportProjectAsZip(project.id);
if (authenticated && project.owner === authenticated.userId) {
exportProjectAsZip(project.id);
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you've got the if checking a little bit backwards here. We want to allow downloading of other people's projects. But we do not want to call save functions on other people's projects.

Should be more like

 if (authenticated && project.owner === authenticated.userId) {
  dispatch(autosaveProject());
 }   
 exportProjectAsZip(project.id);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lindapaiste ,I've revised the downloadSketch function to ensure that we only trigger the autosave functionality if the user is authenticated and they are the owner of the sketch. Here's the updated implementation:

function downloadSketch() {
if (authenticated && project.owner === authenticated.userId) {
dispatch(autosaveProject());
}
exportProjectAsZip(project.id);
}

Copy link
Contributor Author

@letscodedanish letscodedanish Feb 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lindapaiste , And I think this could also be done , correct me if I'm wrong

if (authenticated && project.owner === authenticated.userId) {
dispatch(autosaveProject());
exportProjectAsZip(project.id);
} else {
exportProjectAsZip(project.id);
}

This code block first checks if the user is authenticated and if the current user is the owner of the project. If both conditions are met, it triggers the autosaveProject function before exporting the project as a zip file. If the conditions are not met, it directly exports the project as a zip file without triggering the autosave function.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should run your code locally and make sure that it works before submitting a PR. authenticated.userId will not work because authenticated is a boolean value -- it is not the user object. project.owner is not the id -- it's the entire user object for the owner. We need a different conditional check here. Probably authenticated && canEditProjectName would do it? But we need to try it out and check the various situations, like if this is a new sketch that has not been saved before.

}

function shareSketch() {
Expand Down
Loading