feat: allow optional port for NFS remote #3131
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
badrAZ
changed the title
badrAZ
changed the title
badrAZ
changed the title
badrAZ
changed the title
julien-f
reviewed
Jul 3, 2018
| @@ -17,8 +17,11 @@ export const parse = string => { | |||
| object.path = `/${trimStart(rest, '/')}` // the leading slash has been forgotten on client side first implementation | |||
| } else if (type === 'nfs') { | |||
| object.type = 'nfs' | |||
| const [host, path] = rest.split(':') | |||
| const [host, port, path = port] = rest.split(':') | |||
There was a problem hiding this comment.
IMHO, a regex would be safer and easier to use.
julien-f
reviewed
Jul 3, 2018
| username, | ||
| password, | ||
| domain, | ||
| }) => { |
There was a problem hiding this comment.
Add tests related to these changes.
julien-f
reviewed
Jul 4, 2018
| @@ -17,8 +17,9 @@ export const parse = string => { | |||
| object.path = `/${trimStart(rest, '/')}` // the leading slash has been forgotten on client side first implementation | |||
| } else if (type === 'nfs') { | |||
| object.type = 'nfs' | |||
| const [host, path] = rest.split(':') | |||
| const [, host, port, path] = /^([^:]+):(\d+)?:?([^:]+)$/.exec(rest) | |||
There was a problem hiding this comment.
/^([^:]+):(?:(\d+):)?([^:]+)$/
And move it in a global constant.
julien-f
reviewed
Jul 4, 2018
| path: '/media/nfs', | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| const NFS_WITH_PORT_DATA = { |
pdonias
requested changes
Jul 4, 2018
| <br /> | ||
| <input | ||
| className='form-control' | ||
| ref='port' |
There was a problem hiding this comment.
Please rebase and make it controlled :)
pdonias
approved these changes
Jul 5, 2018
julien-f
reviewed
Jul 5, 2018
| @@ -3,6 +3,8 @@ import map from 'lodash/map' | |||
| import trim from 'lodash/trim' | |||
| import trimStart from 'lodash/trimStart' | |||
|
|
|||
| const URL_RE = /^([^:]+):(?:(\d+):)?([^:]+)$/ | |||
julien-f
approved these changes
Jul 5, 2018
julien-f
pushed a commit
that referenced
this pull request
Jul 5, 2018
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.
Fixes #2299
Screenshots
Check list
Fixes #007)${name} v${new version})Process
WiP:(Work in Progress) if not ready to be merged