T3chguy/settings versions improvements #857
Conversation
removed redundant v prefix (key already says version) links to most applicable version/tag tag-commit -> commit commit1-commit2-commit3 -> commit1 (v)x.y.z -> tag<x.y.z> commit -> commit Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
Can one of the admins verify this patch? |
| @@ -530,7 +538,7 @@ module.exports = React.createClass({ | |||
| }, | |||
|
|
|||
| _renderUserInterfaceSettings: function() { | |||
| var client = MatrixClientPeg.get(); | |||
| // const client = MatrixClientPeg.get(); | |||
There was a problem hiding this comment.
This looks unused, I'd remove it entirely.
| <li><label>Device ID:</label> <span><code>{deviceId}</code></span></li> | ||
| <li><label>Device key:</label> <span><code><b>{identityKey}</b></code></span></li> | ||
| <li><label>Device ID:</label> <span><code>{deviceId}</code></span></li> | ||
| <li><label>Device key:</label> <span><code><b>{identityKey}</b></code></span></li> |
There was a problem hiding this comment.
I'm not entirely sure why more spaces are needed here
There was a problem hiding this comment.
Hmm, I didn't intend to change that, IDE must have thought it was being clever
| const uriTail = (token.startsWith('v') && token.includes('.')) ? `releases/tag/${token}` : `commit/${token}`; | ||
| return `https://github.com/${repo}/${uriTail}`; | ||
| } | ||
| const semVerRegex = /^v?(\d+\.\d+\.\d+)(?:-(?:\d+-g)?(.+))?|$/i; |
There was a problem hiding this comment.
I think this should probably more closely match https://github.com/mojombo/semver/blob/master/semver.svg so (\d+\.\d+\.\d+) seems OK but the pre-release part (?:-(?:\d+-g)?(.+)) looks like it could be a bit more flexible (allowing more than just "-g" unless I've misunderstood something).
There was a problem hiding this comment.
the part you mentioned is actually for catching the trailing commit (which is newer than the base tag) Have now updated the regex to catch rc's and also -dirty git describes.
Regex and examples: https://regex101.com/r/Wl3CqO/4/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Less naive semver detection
now links to trailing commit instead of to latest tag if there is one
removes redundant 'v's
soft-depends on element-hq/element-web#3683