Fix bugs sorting service instances #239
Merged
Conversation
This file contains hidden or 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
- Don't return null if service classes aren't passed in - Pass an array to `_.sortBy` so that secondary sort on 'metadata.name' works
openshift-ci-robot
added
the
size/L
jwforres
reviewed
Oct 26, 2017
| } | ||
| var getServiceClassDisplayName = function(serviceInstance) { | ||
| var serviceClassName = _.get(serviceInstance, 'spec.clusterServiceClassRef.name'); | ||
| return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || serviceInstance.spec.clusterServiceClassExternalName; |
There was a problem hiding this comment.
just checking, external name is required right?
There was a problem hiding this comment.
I'm not sure it is, but it should be OK if it's not set?
There was a problem hiding this comment.
yeah nevermind, forgot you were doing the secondary sort below
jwforres
reviewed
Oct 26, 2017
| } | ||
|
|
||
| if (failed) { | ||
| deferred.reject(); |
There was a problem hiding this comment.
i think $q.all passes up the content from the failure when it does a reject, not positive. Not that we necessarily need that, but we should document above if it is a difference.
There was a problem hiding this comment.
Thanks, updated the comment.
Add a utility that always waits for all promises, even if one fails. (`$q.all` returns immediately when one fails.)
spadgett
force-pushed
the
fix-sort-instances
branch
from
619a455 to
ccfee38
Compare
jwforres
approved these changes
Oct 26, 2017
openshift-merge-robot
added a commit
to openshift/origin-web-console
that referenced
this pull request
Oct 26, 2017
Automatic merge from submit-queue. Wait for service classes and plans to load Wait for all service classes and plans to load on the overview before checking bindability and sorting service instances. Fixes #2384 Requires openshift/origin-web-common#239 origin-web-common 0.0.70 -> 0.0.71 https://github.com/openshift/origin-web-common/releases/tag/v0.0.71
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.
_.sortByso that we're correctly handling secondary sort.See openshift/origin-web-console#2384
See openshift/origin-web-console#2385