Skip to content
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.

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

Add simple attachment button #823

Merged
merged 25 commits into from
Mar 19, 2022
Merged

Add simple attachment button #823

merged 25 commits into from
Mar 19, 2022

Conversation

newhinton
Copy link
Contributor

@newhinton newhinton commented Feb 23, 2022

Signed-off-by: Felix Nüsse felix.nuesse@t-online.de

This closes #74. It allows to upload arbitrary files to display as attachments. This should be superseeded and replaced by #790.

I did not add this button to the three dot menu because this would require the Note Vue component to hold references to the editor/view and react to it. This functionality however, will be part of #790.

On a sidenote, the uploadfeature may fail silently when the php upload size is set to lower than the file one tries to upload. The result is that the NoteService errors out because the 'tmp_name' field will be unset and fread cant read the file which has not been uploaded. Is this something we need to check against?

Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Copy link
Member

@korelstar korelstar left a comment

Choose a reason for hiding this comment

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

Thanks for this PR!

On a sidenote, the uploadfeature may fail silently when the php upload size is set to lower than the file one tries to upload. The result is that the NoteService errors out because the 'tmp_name' field will be unset and fread cant read the file which has not been uploaded. Is this something we need to check against?

Yes, please! Could you please add additional checks for this to the PHP code and an error message to the JavaScript code?

Here are some other points:

  • please implement the button using the ActionButton component inside of an Actions component. See e.g. https://github.com/nextcloud/notes/blob/v4.3.0/src/components/Note.vue#L41
  • please add an appropriate icon (due to the text label, the button is too large) using vue-material-design-icons (e.g. file-image-plus?)
  • please use position: fixed for positioning the button and place it directly (with an appropriate margin) left to the three-dot menu.
  • could we also add another ActionButton (inside the same Actions) for adding existing images (your existing method onClickSelect)?
  • can we add the original file name as alternate text for the markdown code? (e.g. ![original filename](123456.jpg))

Thanks!

Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
@newhinton
Copy link
Contributor Author

newhinton commented Feb 27, 2022

I implemented some of your changes!

We now have the buttons directly next to the threedot, also the select image button is there. However, i have reused available icons. The name used is now the original filename, not the generated uuid (as displayvalue, not the actual file)

I have also implemented a VERY basic check for tmp_file, though it really is not the best as it does not return a 500. If we want to expand on this, we should not do it in this pr because it requires quite a bit of changes.

I have also not used actionbuttons. I consider this PR a stopgap measure, and i dont want to spend too much time refining this pr since it gets removed anyway. (that obviously excludes the server-check and the errormessages which certainly do not get overridden by the toolbar. Also that is the reason why i didnt add new icons, they will be updated in #788)
I hope thats okay with you

Edit: I tried using actionbuttons as in the example, but that ended up in very strange behaviour that i didnt really want to debug, thats why i said i dont want to put too much effort in this

Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
@newhinton newhinton requested a review from korelstar March 12, 2022 11:16
@korelstar korelstar force-pushed the feature/74/imageupload branch from 688fbd5 to 9482695 Compare March 13, 2022 19:48
Copy link
Member

@korelstar korelstar left a comment

Choose a reason for hiding this comment

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

Thanks for your changes and sorry for having too less time for a review. I've rebased the branch to current master and did some support with switching to the ActionButton and Actions components. For now, this part is fine.

I have also implemented a VERY basic check for tmp_file, though it really is not the best as it does not return a 500. If we want to expand on this, we should not do it in this pr because it requires quite a bit of changes.

I don't think that it will require much changes. You just need to throw an Exception in the PHP code, the method Controller.Helper.handleErrorResponse() does the remainder for you. But you will have to adjust the JavaScript code a little bit.

However, inserting an existing image has some issues. They exist already since #785:

  • Insert existing image does not work, since the PROPFIND request results in a 404. I think it's because const currentNotePath = apppath + '/' + categories should use the current category instead of all categories
  • even if this would work, the inserted Markdown code contains a wrong path to the chosen image - at least when working in a subdirectory

Could you please fix these two issues? The fix will be also needed for the toolbar PR, so it's not wasteful. Any changes will also apply to the toolbar PR (when you rebase it after merging this one).

@korelstar korelstar added this to the 4.4.0 milestone Mar 13, 2022
newhinton and others added 8 commits March 13, 2022 22:06
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
@korelstar korelstar force-pushed the feature/74/imageupload branch from 9482695 to 54ed311 Compare March 13, 2022 21:06
…ture/74/imageupload

# Conflicts:
#	src/components/EditorEasyMDE.vue
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
@newhinton
Copy link
Contributor Author

I implemented the 500 in the notesservice.

I like what you did with the action buttons, the only thing i changed was adding a 5px margin to seperate the two buttons.

Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
@newhinton
Copy link
Contributor Author

@korelstar Ah yes now i know why adding images fails: if i assume that store.getters.getCategories() returns the array that contains ALL available categories, not the category of the currently selected note. I fixed this by using the proper category. It should hopefully work now.

newhinton and others added 3 commits March 14, 2022 18:20
@korelstar
Copy link
Member

There was still an issue when uploading an image (reference to this in function), but I fixed that.

In addition, there was an issue with the relative path (e.g. if note is in Test1/ and chosen image is in Test2/). I fundamentally re-worked this part by using the path module from NodeJS. Code is much shorter and less error prone, now.

All in all, I think it's done now. I will do some more tests and merge it then. Thanks!

@newhinton
Copy link
Contributor Author

Oh yeah, that reference slipped, sorry.

Well, using a library is ingenious, somehow i always stick to plain js for most of the logic. Maybe it's the left-pad-trauma, but anyhow: yours looks way better!

@korelstar korelstar merged commit 7df2fa9 into master Mar 19, 2022
@korelstar korelstar deleted the feature/74/imageupload branch March 19, 2022 20:02
@korelstar korelstar added feature: backend Related to the PHP backend feature: editor Related to generic parts of the editor, e.g. loading/saving notes feature: EasyMDE Realted to the integrated EasyMDE editor labels Mar 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature: backend Related to the PHP backend feature: EasyMDE Realted to the integrated EasyMDE editor feature: editor Related to generic parts of the editor, e.g. loading/saving notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

support for attachments / images [$106]
2 participants