Skip to content

Commit

Permalink
The release history of namespaces that are not properties will also s…
Browse files Browse the repository at this point in the history
…how comments and release times (#4198)

* add tech-support-qq-4.png

* Update README.md

* Enhance the user experience in the scenario of submitting duplicate keys

* Modify the key-value conflict exception prompt, adjust the code style

* feature: The release history of namespaces that are not properties will also show comments and release times

* doc(CHANGES.md): update CHANGES.md

Co-authored-by: Jason Song <nobodyiam@gmail.com>
  • Loading branch information
klboke and nobodyiam authored Jan 11, 2022
1 parent fec79aa commit 0e4542e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Apollo 2.0.0
* [Bump guava from 29.0 to 31.0.1](https://github.com/apolloconfig/apollo/pull/4182)
* [fix the json number display issue when it's longer than 16](https://github.com/apolloconfig/apollo/pull/4183)
* [Bump client springboot version](https://github.com/apolloconfig/apollo/pull/4189)
* [The release history of namespaces that are not properties will also show comments and release times](https://github.com/apolloconfig/apollo/pull/4198)
* [Add unit tests for Utils](https://github.com/apolloconfig/apollo/pull/4193)

------------------
Expand Down
30 changes: 30 additions & 0 deletions apollo-portal/src/main/resources/static/config/history.html
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,36 @@ <h5 class="text-center empty-container" ng-show="!history.operationContext.rules
<!--text mode-->
<div class="release-info col-md-9"
ng-show="isTextNamespace && history.changes && history.changes.length > 0">
<div class="panel-heading">

<span ng-bind="history.releaseTitle"></span>
<span class="label label-warning no-radius" ng-if="history.isReleaseAbandoned">{{'Config.History.Abandoned' | translate }}</span>
<span class="pull-right" ng-bind="history.releaseTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>

<div class="row" style="padding-top: 10px;">
<div class="col-md-5">
<small ng-show="history.releaseComment" ng-bind="history.releaseComment"></small>
</div>
<div class="col-md-7 text-right">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.History.RollbackToTips' | translate }}"
ng-show="namespace.hasReleasePermission && !history.isReleaseAbandoned
&& (history.operation == 0 || history.operation == 1 || history.operation == 4)"
ng-click="preRollback()">
<img src="../img/rollback.png">
{{'Config.History.RollbackTo' | translate }}
</button>
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm"
ng-class="{'active':history.viewType == 'diff'}" data-tooltip="tooltip"
data-placement="bottom" title="{{'Config.History.ChangedItemTips' | translate }}"
ng-click="switchConfigViewType(history, 'diff')">{{'Config.History.ChangedItem' | translate }}
</button>
</div>
</div>

</div>
</div>
<apollodiff ng-repeat="change in history.changes" old-str="change.entity.firstEntity.value"
new-str="change.entity.secondEntity.value" apollo-id="'releaseStrDiff'">
</apollodiff>
Expand Down

0 comments on commit 0e4542e

Please sign in to comment.