From c349f2ba6a4757794db75fcbd953f357d955dcb0 Mon Sep 17 00:00:00 2001 From: Pere Diaz Bou Date: Tue, 5 Jul 2022 14:57:16 +0200 Subject: [PATCH] mgr/dashboard: fix api tests + lint Signed-off-by: Pere Diaz Bou (cherry picked from commit 08c980ede37f1d2eba08b43ce624994b939a3ca3) (cherry picked from commit 065c9d4bd10aae24641b3905b060b8b2fc57bbc0) Resolves: rhbz#2125432 --- qa/tasks/mgr/dashboard/test_rbd.py | 4 ++-- .../src/app/shared/datatable/table/table.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/tasks/mgr/dashboard/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py index 07d0f3cb961ce..5cd4ac209a93c 100644 --- a/qa/tasks/mgr/dashboard/test_rbd.py +++ b/qa/tasks/mgr/dashboard/test_rbd.py @@ -13,7 +13,7 @@ class RbdTest(DashboardTestCase): @DashboardTestCase.RunAs('test', 'test', [{'rbd-image': ['create', 'update', 'delete']}]) def test_read_access_permissions(self): - self._get('/api/block/image?offset=0&limit=5&search=&sort=%3Cname') + self._get('/api/block/image?offset=0&limit=-1&search=&sort=+name') self.assertStatus(403) self.get_image('pool', None, 'image') self.assertStatus(403) @@ -284,7 +284,7 @@ class RbdTest(DashboardTestCase): self.fail("Snapshot {} not found".format(snap_name)) def test_list(self): - data = self._view_cache_get('/api/block/image') + data = self._get('/api/block/image?offset=0&limit=-1&search=&sort=+name') self.assertStatus(200) self.assertEqual(len(data), 2) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts index 9591f1ddb5fee..b4f82b2abbf19 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts @@ -797,8 +797,8 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O changeSorting({ sorts }: any) { this.userConfig.sorts = sorts; if (this.serverSide) { - this.userConfig.offset = 0; - this.reloadData(); + this.userConfig.offset = 0; + this.reloadData(); } } -- 2.39.5