Consistent overriding of labels set by the user #1218
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
server.js
Outdated
| @@ -3342,7 +3342,7 @@ cache(function(query_data, match, sendBadge, request) { | |||
| // falls through | |||
| default: | |||
| var value = typeof json_data[info] != 'undefined' && typeof json_data[info] != 'object' ? json_data[info] : Array.isArray(json_data[info]) ? json_data[info].join(", ") : 'invalid data'; | |||
| badgeData.text[0] = query_data.label || type + " " + info; | |||
| badgeData.text[0] = getLabel(type + " " + info, query_data); | |||
There was a problem hiding this comment.
Could you use a template string?
server.js
Outdated
| @@ -1784,7 +1784,7 @@ cache(function(queryData, match, sendBadge, request) { | |||
| const variants = { | |||
| // default use `conda|{channelname}` as label | |||
| '': function(queryData, badgeData) { | |||
| badgeData.text[0] = (queryData && queryData.label) || 'conda|' + badgeData.text[0]; | |||
| badgeData.text[0] = getLabel('conda|' + badgeData.text[0], queryData); | |||
There was a problem hiding this comment.
Could you use a template string? conda|${badgeData.text[0]}
server.js
Outdated
| var count = data.items[0].count; | ||
| badgeData.text[0] = site + ' ' + item + ' questions'; | ||
| var count = parsedData.items[0].count; | ||
| badgeData.text[0] = getLabel(site + ' ' + item + ' questions', data); |
|
Haha, funnily enough I was pair-programming on some Ruby code with a colleague the other day, he also suggested using string templates! My main language is Java, there isn't really anything that straightforward built in natively. 😉 |
|
All service tests passing locally. A beautiful thing. 💯 |
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.
Hello,
Quite a few badges were ignoring the override label set by the user (using
?label=healthinessesin the URL for instance), and were just imposing their own value with calls such asbadgeData.text[0] = 'format';. Admittedly, some of the badges submitted in my previous pull requests were also misbehaving like this! 😅This piece of work makes sure preference is given to the user defined value if any, by adding missing calls to
getLabelwhen the value ofbadgeData.text[0]is reassigned.Everything seems to still pass locally, nevertheless not sure what to put in the pull request title as the list of service tests to run would probably be a bit too long.
Cheers,
Pyves