LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Allow only images in modal image uploader. #7672

Merged
Ruk33 merged 8 commits from 7646-in-the-cover-upload-modal-trying-to-upload-anything-other-than-an-image-doesnt-reset-the-form into master 2022-09-02 18:43:35 +02:00
Conversation 0 Commits 8 Files changed 22 +455 -395
Ruk33 commented 2022-08-11 20:08:59 +02:00 (Migrated from github.com)
Copy link

Fixes

Issue Number: https://github.com/lbryio/lbry-desktop/issues/7646

What is the current behavior?

Even though a file filter is being used, the "All Files"
option allows users to select any file when uploading
an image.

What is the new behavior?

The electron filter is being used so the "All Files"
option is no longer displayed.

image

Other information

PR Checklist

Toggle...

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting)
  • Refactoring (no functional changes)
  • Documentation changes
  • Other - Please describe:

Please check all that apply to this PR using "x":

  • I have checked that this PR is not a duplicate of an existing PR (open, closed or merged)
  • I added a line describing my change to CHANGELOG.md
  • I have checked that this PR does not introduce a breaking change
  • This PR introduces breaking changes and I have provided a detailed explanation below
## Fixes Issue Number: https://github.com/lbryio/lbry-desktop/issues/7646 <!-- Tip: - Add keywords to directly close the Issue when the PR is merged. - Skip the keyword if the Issue contains multiple items. - https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword --> ## What is the current behavior? Even though a file filter is being used, the "All Files" option allows users to select any file when uploading an image. ## What is the new behavior? The electron filter is being used so the "All Files" option is no longer displayed. ![image](https://user-images.githubusercontent.com/1719111/184208937-a89cea19-cdcb-436e-85a6-eab8309687eb.png) ## Other information <!-- If this PR contains a breaking change, please describe the impact and solution strategy for existing applications below. --> ## PR Checklist <!-- For the checkbox formatting to work properly, make sure there are no spaces on either side of the "x" --> <details><summary>Toggle...</summary> What kind of change does this PR introduce? - [x] Bugfix - [ ] Feature - [ ] Code style update (formatting) - [ ] Refactoring (no functional changes) - [ ] Documentation changes - [ ] Other - Please describe: Please check all that apply to this PR using "x": - [x] I have checked that this PR is not a duplicate of an existing PR (open, closed or merged) - [ ] I added a line describing my change to CHANGELOG.md - [x] I have checked that this PR does not introduce a breaking change - [ ] This PR introduces breaking changes and I have provided a detailed explanation below </details>
jessopb (Migrated from github.com) reviewed 2022-08-12 05:02:38 +02:00
ui/component/common/file-selector.jsx
jessopb (Migrated from github.com) commented 2022-08-12 05:02:37 +02:00
Copy link

I'm concerned that changing this from { path } to file will break publishing. Did you try?
b9be8d9f3a/ui/component/publishFile/view.jsx (L273) expects file.path on electron because the sdk needs the path.

It may be good to send { file: file , path: path } and adjust all the functions assigned to onFileChosen to take that.

I'm concerned that changing this from { path } to file will break publishing. Did you try? https://github.com/lbryio/lbry-desktop/blob/b9be8d9f3a80d06c3e620ad12fc692f907c46223/ui/component/publishFile/view.jsx#L273 expects file.path on electron because the sdk needs the path. It may be good to send { file: file , path: path } and adjust all the functions assigned to onFileChosen to take that.
Ruk33 (Migrated from github.com) reviewed 2022-08-12 20:52:51 +02:00
ui/component/common/file-selector.jsx
Ruk33 (Migrated from github.com) commented 2022-08-12 20:52:51 +02:00
Copy link

Sounds good @jessopb, nice catch. Perhaps as a small note for the future, we should avoid using these union types. Notice how I'm still respecting the interface (by sending a File type) but still, it manages to break parts of the app...

Sounds good @jessopb, nice catch. Perhaps as a small note for the future, we should avoid using these union types. Notice how I'm still respecting the interface (by sending a `File` type) but still, it manages to break parts of the app...
jessopb (Migrated from github.com) reviewed 2022-08-12 22:52:14 +02:00
ui/component/common/file-selector.jsx
jessopb (Migrated from github.com) commented 2022-08-12 22:52:14 +02:00
Copy link

You're probably right. The union types were originally added when the codebase was supporting both web and app.

Maybe the type should be ChosenFile = { file: WebFile, path: string }

You're probably right. The union types were originally added when the codebase was supporting both web and app. Maybe the type should be ChosenFile = { file: WebFile, path: string }
Ruk33 (Migrated from github.com) reviewed 2022-08-13 00:24:26 +02:00
ui/component/common/file-selector.jsx
Ruk33 (Migrated from github.com) commented 2022-08-13 00:24:25 +02:00
Copy link

@jessopb I have updated the code so the File now contains a path and a mime type. With this, the file upload for posts works fine. Please let me know what you think. Thanks.

@jessopb I have updated the code so the `File` now contains a `path` and a `mime` type. With this, the file upload for posts works fine. Please let me know what you think. Thanks.
jessopb (Migrated from github.com) reviewed 2022-08-15 15:15:48 +02:00
ui/component/common/file-selector.jsx
jessopb (Migrated from github.com) commented 2022-08-15 15:15:33 +02:00
Copy link

This was an elegant solution, but I think WebFile is a well defined builtin type and probably shouldn't be polluted with extra params. I think we'd prefer { file: FILE, path: path }

This was an elegant solution, but I think WebFile is a well defined builtin type and probably shouldn't be polluted with extra params. I think we'd prefer { file: FILE, path: path }
jessopb (Migrated from github.com) requested changes 2022-08-26 18:02:04 +02:00
jessopb (Migrated from github.com) left a comment
Copy link

Sorry it took a while to get to this. Tested publish and it's broken.

Sorry it took a while to get to this. Tested publish and it's broken.
ui/component/fileDrop/view.jsx
jessopb (Migrated from github.com) commented 2022-08-26 18:01:49 +02:00
Copy link

Also breaks here on file drop. This should be a path.

Also breaks here on file drop. This should be a path.
ui/component/publishFile/view.jsx
jessopb (Migrated from github.com) commented 2022-08-26 17:58:03 +02:00
Copy link

Did you try publishing? Publish is trying to send an empty {}. (What happens when { thing: undefined })

Did you try publishing? Publish is trying to send an empty {}. (What happens when { thing: undefined })
jessopb (Migrated from github.com) approved these changes 2022-08-30 18:40:06 +02:00
jessopb (Migrated from github.com) requested changes 2022-08-30 21:22:59 +02:00
jessopb (Migrated from github.com) left a comment
Copy link

One small snag.

One small snag.
ui/modal/modalImageUpload/view.jsx
jessopb (Migrated from github.com) commented 2022-08-30 21:22:47 +02:00
Copy link

this blocks jpeg - possibly some other valid types. svg has been possible and allowed so far.

this blocks `jpeg` - possibly some other valid types. svg has been possible and allowed so far.
Sign in to join this conversation.
Reviewers
No reviewers
jessopb
Labels
Clear labels   
accessibility

   
app-parity

   
area: creator

   
area: daemon

   
area: design

   
area: devops

   
area: discovery

   
area: docs

   
area: installer

   
area: internal

   
area: livestream

   
area: performance

   
area: proposal

Work is part of a proposal

  
area: reposts

   
area: rewards

   
area: search

   
area: security

   
area: subscriptions

   
area: sync

   
area: ux

   
area: viewer

   
area: wallet

   
BEAMER

Beamer is waiting on you!

  
channel

   
comments

   
community PR

   
consider soon

Discuss this issue at the next planning meeting, then remove this label

  
core team

   
css

   
dependencies

   
electron

   
Epic

   
feature request

   
first-timers-only

   
good first issue

   
hacktoberfest

Welcome to Hacktoberfest

  
help wanted

   
hub-dependent

   
icebox

Long-term storage

  
Invalid

   
level: 0

   
level: 1

No knowledge of the existing code required

  
level: 2

Some knowledge of the existing code is recommended

  
level: 3

Significant knowledge of the existing code is recommended

  
level: 4

Intimate knowledge of the existing code is recommended

  
merge when green

   
needs: exploration

Solution unclear, needs research

  
needs: grooming

Issue needs to be groomed before work can start

  
needs: priority

Priority level needs to be defined

  
needs: repro

Issue needs step-by-step instructions on how to reproduce in latest code

  
needs: tech design

Needs technical design signoff before implementation can begin

  
notifications

   
odysee

   
on hold

Temporarily paused

  
playlists

   
priority: blocker

Issue is blocking release, do ASAP

  
priority: high

Work needs to be moved into sprint ASAP

  
priority: low

Work should be done but can stay in the backlog for now

  
priority: medium

Work needs to be done within 2-3 sprints

  
protocol dependent

   
recsys

   
redesign

general redesign not prioritize for anyone release

  
regression

   
resilience

   
sdk dependent

Requires work on lbry-sdk repo

  
Tom's Wishlist

   
trending

   
type: bug

Existing functionality is wrong or broken

  
type: discussion

A conversation. No specific changes requested

  
type: improvement

Existing (or partially existing) functionality needs to be changed

  
type: new feature

New functionality that does not exist yet

  
type: refactor

Minimal user-visible changes, but significant internal work

  
type: task

Either work that's not related to the code, or a small chore that does not fit into other categories

  
type: testing

Solution needs additional user testing

  
unplanned

Work that was not planned into the spirnt, took priority over planned work

  
windows
No labels
accessibility
app-parity
area: creator
area: daemon
area: design
area: devops
area: discovery
area: docs
area: installer
area: internal
area: livestream
area: performance
area: proposal
area: reposts
area: rewards
area: search
area: security
area: subscriptions
area: sync
area: ux
area: viewer
area: wallet
BEAMER
channel
comments
community PR
consider soon
core team
css
dependencies
electron
Epic
feature request
first-timers-only
good first issue
hacktoberfest
help wanted
hub-dependent
icebox
Invalid
level: 0
level: 1
level: 2
level: 3
level: 4
merge when green
needs: exploration
needs: grooming
needs: priority
needs: repro
needs: tech design
notifications
odysee
on hold
playlists
priority: blocker
priority: high
priority: low
priority: medium
protocol dependent
recsys
redesign
regression
resilience
sdk dependent
Tom's Wishlist
trending
type: bug
type: discussion
type: improvement
type: new feature
type: refactor
type: task
type: testing
unplanned
windows
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: LBRYCommunity/lbry-desktop#7672
No description provided.
Delete branch "7646-in-the-cover-upload-modal-trying-to-upload-anything-other-than-an-image-doesnt-reset-the-form"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?