提交 ff91c3af 编写于 作者: P Piotr Bryk 提交者: Sebastian Florek

Fix pagination on details pages when all namespaces are selected (#1194)

上级 58389cca
......@@ -687,4 +687,5 @@
<translation id="1877969373102862021" key="MSG_INGRESS_INFO_ANNOTATIONS_ENTRY" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Resource info details section annotations entry.">Annotations</translation>
<translation id="2799384691872397176" key="MSG_SECRET_LIST_STARTED_AT_TOOLTIP" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Tooltip 'Started at [some date]' showing the exact start time of the secret.">Created at <ph name="START_DATE" /> UTC</translation>
<translation id="6014322650743882966" key="MSG_INGRESS_LIST_STARTED_AT_TOOLTIP" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Tooltip 'Started at [some date]' showing the exact start time of the ingress.">Created at <ph name="START_DATE" /> UTC</translation>
<translation id="3641265385665997534" key="MSG_RESOURCE_CARD_LIST_PAGINATION_ERROR" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Message shown to the user when there is a pagination error.">Pagination error</translation>
</translationbundle>
\ No newline at end of file
......@@ -876,4 +876,5 @@
<translation id="1877969373102862021" key="MSG_INGRESS_INFO_ANNOTATIONS_ENTRY" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Resource info details section annotations entry.">Annotations</translation>
<translation id="2799384691872397176" key="MSG_SECRET_LIST_STARTED_AT_TOOLTIP" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Tooltip 'Started at [some date]' showing the exact start time of the secret.">Created at <ph name="START_DATE" /> UTC</translation>
<translation id="6014322650743882966" key="MSG_INGRESS_LIST_STARTED_AT_TOOLTIP" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Tooltip 'Started at [some date]' showing the exact start time of the ingress.">Created at <ph name="START_DATE" /> UTC</translation>
<translation id="3641265385665997534" key="MSG_RESOURCE_CARD_LIST_PAGINATION_ERROR" source="/usr/local/google/home/bryk/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Message shown to the user when there is a pagination error.">Pagination error</translation>
</translationbundle>
\ No newline at end of file
......@@ -106,14 +106,16 @@ export class ResourceCardListPaginationController {
* @export
*/
pageChanged(newPageNumber) {
let namespace = this.stateParams_.namespace || this.stateParams_.objectNamespace;
let namespace = this.stateParams_.objectNamespace || this.stateParams_.namespace;
let query = this.paginationService_.getResourceQuery(
this.paginationService_.getRowsLimit(this.paginationId), newPageNumber, namespace,
this.stateParams_.objectName);
this.listResource.get(
query, (list) => { this.list = list; },
(err) => { this.errorDialog_.open('Pagination error', err.data); });
(err) => {
this.errorDialog_.open(this.i18n.MSG_RESOURCE_CARD_LIST_PAGINATION_ERROR, err.data);
});
}
}
......@@ -147,4 +149,6 @@ export const resourceCardListPaginationComponent = {
const i18n = {
/** @export {string} @desc Label for pagination rows selector visible on resource lists. */
MSG_RESOURCE_CARD_LIST_PAGINATION_ROW_SELECTOR_LABEL: goog.getMsg('Rows per page'),
/** @export {string} @desc Message shown to the user when there is a pagination error. */
MSG_RESOURCE_CARD_LIST_PAGINATION_ERROR: goog.getMsg('Pagination error'),
};
......@@ -170,4 +170,17 @@ describe('Resource card list pagination', () => {
// then
expect(errDialog.open).toHaveBeenCalledWith('Pagination error', response);
});
it('should use object namespace first', () => {
let limit = 10;
let page = 2;
let queryString = `itemsPerPage=${limit}&page=${page}`;
paginationService.setRowsLimit(limit, paginationId);
ctrl.stateParams_.objectNamespace = 'foo-ns';
httpBackend.expectGET(`api/v1/pod/foo-ns?${queryString}`).respond(200, {});
// when
ctrl.pageChanged(page);
httpBackend.flush();
});
});
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册