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

feature:support non-properties-diff #4533

Merged
merged 6 commits into from
Aug 31, 2022

Conversation

SunnyBoy-WYH
Copy link
Contributor

What's the purpose of this PR

feature: support diff config for non-properties type files.

Which issue(s) this PR fixes:

Fixes #
link:#4315

Brief changelog

  1. no back-end code changed,support table diff and text diff for yaml/xml/txt..
  2. import 2 file from :1. https://github.com/jeremyfa/yaml.js/ 2. https://github.com/abdolence/x2js , MIT and apache2.0 liscense.
  3. to support diff, i transfer yaml and xml to js object,and finally transfer the object to properties, and reuse the diff logic with properties to support table diff.
  4. reuse the text diff components, just like the issue mentioned.

@github-actions
Copy link

github-actions bot commented Aug 23, 2022

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@SunnyBoy-WYH
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA.

@SunnyBoy-WYH
Copy link
Contributor Author

I record a video for this feature, and please criticize and correct me, thank you very much!

QQ.20220823234052.mp4

@nobodyiam nobodyiam requested a review from lepdou August 28, 2022 08:27
@lepdou
Copy link
Contributor

lepdou commented Aug 29, 2022

@SunnyBoy-WYH
Put comparison type field here?
image

@codecov-commenter
Copy link

codecov-commenter commented Aug 29, 2022

Codecov Report

Merging #4533 (99fc252) into master (150fe19) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #4533   +/-   ##
=========================================
  Coverage     53.41%   53.41%           
  Complexity     2708     2708           
=========================================
  Files           492      492           
  Lines         15390    15390           
  Branches       1596     1596           
=========================================
  Hits           8220     8220           
  Misses         6611     6611           
  Partials        559      559           

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

apollo-portal/src/main/resources/static/config/diff.html Outdated Show resolved Hide resolved
</div>
<div class="radio-inline">
<label >
<input type="radio" name="tableDiff" ng-click="isTableDiff = false" ng-checked="isTableDiff == false">
Copy link
Contributor

Choose a reason for hiding this comment

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

It can be simplified to?

ng-checked="!isTableDiff"

apollo-portal/src/main/resources/static/config/diff.html Outdated Show resolved Hide resolved
apollo-portal/src/main/resources/static/i18n/zh-CN.json Outdated Show resolved Hide resolved
@SunnyBoy-WYH
Copy link
Contributor Author

@SunnyBoy-WYH Put comparison type field here? image
I changed it~
1661826993846

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 9b14c3e into apolloconfig:master Aug 31, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Aug 31, 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.

4 participants