Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixFeature non properties diff #4547

Merged
merged 12 commits into from
Sep 2, 2022

Conversation

SunnyBoy-WYH
Copy link
Contributor

@SunnyBoy-WYH SunnyBoy-WYH commented Sep 2, 2022

What's the purpose of this PR

fix some bug for #4533

Which issue(s) this PR fixes:

Fixes # #4315

Brief changelog

  1. fix : textDiff cannot use problem
  2. support : determined as not allEqual when some cluster key lacked
  3. do not show [commentDiff] checkbox when non-prop tableDiff
  4. prop file support textDiff , sort keys then can align text

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.
  • Update the CHANGES log.

@SunnyBoy-WYH
Copy link
Contributor Author

prop file textDiff

d5ac0801b566a84073d1008d2262e53

dc3db3c812c745f623293ab36075649

@SunnyBoy-WYH
Copy link
Contributor Author

non-prop tableDiff dont show commentDIff checkBox
1662088645092

@SunnyBoy-WYH
Copy link
Contributor Author

tableDiff support show not equal when some cluster lack key, for example, lack, and 、 value not equal

1662089289889

1662089350724(1)

1662089329247

# Conflicts:
#	apollo-portal/src/main/resources/static/config/diff.html
#	apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
@codecov-commenter
Copy link

codecov-commenter commented Sep 2, 2022

Codecov Report

Merging #4547 (b3736e9) into master (9b14c3e) will decrease coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #4547      +/-   ##
============================================
- Coverage     53.40%   53.37%   -0.03%     
+ Complexity     2707     2705       -2     
============================================
  Files           492      492              
  Lines         15390    15390              
  Branches       1596     1596              
============================================
- Hits           8219     8215       -4     
- Misses         6611     6615       +4     
  Partials        560      560              
Impacted Files Coverage Δ
...work/apollo/biz/message/DatabaseMessageSender.java 56.25% <0.00%> (-8.34%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@lepdou lepdou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lepdou lepdou merged commit 2662f03 into apolloconfig:master Sep 2, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Sep 2, 2022
@nobodyiam nobodyiam added this to the 2.1.0 milestone Feb 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants