FIX close: 1535 Add a button to hide the empty service on console at service list page #1576
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
# Conflicts: # console/src/main/resources/static/css/main.css # console/src/main/resources/static/js/main.js
zhaoyuguang
changed the title
# Conflicts: # console/src/main/resources/static/js/main.js
# Conflicts: # naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
nkorange
reviewed
Aug 1, 2019
| List<Service> result = new ArrayList<>(); | ||
| for (Map.Entry<String, Service> entry : chooseServiceMap(namespaceId).entrySet()) { | ||
| Service service = entry.getValue(); | ||
| String key = service.getName() + ":" + ArrayUtils.toString(service.getOwners()); | ||
| if (key.matches(regex)) { | ||
| result.add(service); | ||
| if (StringUtils.isBlank(regex) || !key.matches(regex)) { |
There was a problem hiding this comment.
Should be:
if (StringUtils.isNotBlank(regex) && !key.matches(regex)) {
continue;
}There was a problem hiding this comment.
This case: when Service Name is null and ipCount>0,
I still take him to the outer layer, so the code looks very clear
|
Two conditions four cases |
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.
Please do not create a Pull Request without creating an issue first.
What is the purpose of the change
Add a button to hide the empty service on console
在服务列表页面，增加一个按钮可以隐藏空服务
页面效果：
#1535
Brief changelog
XX
Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
[ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=trueto make sure basic checks pass. Runmvn clean install -DskipITsto make sure unit-test pass. Runmvn clean test-compile failsafe:integration-testto make sure integration-test pass.