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.

Sign up for GitHub

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

feat:namespace & release & rollback scrollbar #3936

Closed
wants to merge 2 commits into from
Closed

feat:namespace & release & rollback scrollbar #3936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4068145
feat:namespace & release & rollback scrollbar
cookiejoo Aug 31, 2021
a29e6e4
feat:add changes
cookiejoo Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Apollo 1.10.0
* [switch apollo.config-service log from warning to info level](https://github.com/ctripcorp/apollo/pull/3884)
* [Make Access Key Timestamp check configurable](https://github.com/ctripcorp/apollo/pull/3908)
* [remove ctrip profile](https://github.com/ctripcorp/apollo/pull/3920)
* [namespace & release & rollback scrollbar](https://github.com/apolloconfig/apollo/pull/3936)

------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
8 changes: 7 additions & 1 deletion apollo-portal/src/main/resources/static/styles/common-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ table th {
padding: 5px 0 5px 50px;
}

/*搜索框*/
/*搜索框
::-webkit-scrollbar {
width: 0;
height: 0;
Expand All @@ -546,6 +546,12 @@ table th {

::-webkit-scrollbar-thumb:vertical:hover {
background: rgba(255, 255, 255, 0);
}*/

.namespace-view-table-scrollbar {
Copy link
Member

Choose a reason for hiding this comment

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

we already have the Expand/Collapse button for every namespace, is it necessary to limit its height?

Copy link
Author

Choose a reason for hiding this comment

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

Because it is troublesome to display and view the configuration under a lot of configurations.

For example, there is a namespace with a configuration of 1000 or more. When I move up and down, I sometimes scroll to a very deep place, and then go back and find that the shrink button is far away. If the height is fixed at this time, finding the shrink button will greatly reduce my scrolling operation at this time.

Thank you for your time。

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the feedback. However I don't quite favor the idea to add the scrollbar for configuration items. Wouldn't it be better to add pagination for very long namespaces?

Copy link
Author

Choose a reason for hiding this comment

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

Maybe adding a scrollbar is good for our users，Pagination is also a good idea，
I wonder if your future plan for this page long namespaces is about this optimization?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, pagination is in the to-do list #1261

Copy link
Author

@cookiejoo cookiejoo Sep 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe i can try add pagination in my company ENV，I can do something for community，I can contribute to the community。
Although I'm not a professional UI。

Copy link
Member

Choose a reason for hiding this comment

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

This sounds great!

max-height: 600px;
width: 100%;
overflow-y: scroll;
}

.app-list {
Expand Down
2 changes: 1 addition & 1 deletion apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<!--namespace body-->
<section ng-show="!namespace.isConfigHidden">
<!--table view-->
<div class="namespace-view-table" ng-show="namespace.viewType == 'table'">
<div class="namespace-view-table namespace-view-table-scrollbar" ng-show="namespace.viewType == 'table'">

<div class="J_namespace-release-tip well well-sm no-radius text-center"
ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease">
Expand Down
2 changes: 1 addition & 1 deletion apollo-portal/src/main/resources/static/views/component/release-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && toReleaseNamespa

</div>

<div class="release modal-body">
<div class="release modal-body namespace-view-table-scrollbar">

<div class="form-group">
<div class="col-sm-2 control-label" ng-if="!toReleaseNamespace.isPropertiesFormat">
Expand Down
2 changes: 1 addition & 1 deletion apollo-portal/src/main/resources/static/views/component/rollback-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span>
</div>
</div>
<div class="modal-body">
<div class="modal-body namespace-view-table-scrollbar">
<div ng-if="!isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.Rollback.Tips' | translate }}
<a target="_blank"
Expand Down