From: Pere Diaz Bou Date: Tue, 5 Jul 2022 08:10:23 +0000 (+0200) Subject: mgr/dashboard: fix linting errors X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=acca2ac2bcae4f80265eb5e7dc46184d3031531b;p=ceph.git mgr/dashboard: fix linting errors Signed-off-by: Pere Diaz Bou (cherry picked from commit 90869173ee4cbe2d9e24e354608995e04793bc7d) (cherry picked from commit 493873b86be4e4c98b3369f004a00d80ac5084c9) Resolves: rhbz#2125432 --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts index 9f2738bbd489e..49f4632f0ebc2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts @@ -167,7 +167,7 @@ describe('IscsiTargetFormComponent', () => { httpTesting.expectOne('ui-api/iscsi/settings').flush(SETTINGS); httpTesting.expectOne('ui-api/iscsi/portals').flush(PORTALS); httpTesting.expectOne('ui-api/iscsi/version').flush(VERSION); - httpTesting.expectOne('api/block/image?offset=0&limit=-1').flush(RBD_LIST); + httpTesting.expectOne('api/block/image?offset=0&limit=-1&search=&sort=%3Ename').flush(RBD_LIST); httpTesting.expectOne('api/iscsi/target').flush(LIST_TARGET); httpTesting.verify(); }); 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 07c3931de247d..db67461414455 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 @@ -656,7 +656,7 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O context.search = this.userConfig.search; if (this.userConfig.sorts?.length) { const sort = this.userConfig.sorts[0]; - context.sort = `${sort.dir == 'desc' ? '<' : '>'}${sort.prop}`; + context.sort = `${sort.dir === 'desc' ? '<' : '>'}${sort.prop}`; } this.fetchData.emit(context); this.updating = true; diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml index 43f93be3bd341..8655a57364612 100644 --- a/src/pybind/mgr/dashboard/openapi.yaml +++ b/src/pybind/mgr/dashboard/openapi.yaml @@ -171,6 +171,11 @@ paths: name: search schema: type: string + - default: '' + in: query + name: sort + schema: + type: string responses: '200': content: diff --git a/src/pybind/mgr/dashboard/services/rbd.py b/src/pybind/mgr/dashboard/services/rbd.py index 0652a4ebd0cf6..a3b5c0c06ac49 100644 --- a/src/pybind/mgr/dashboard/services/rbd.py +++ b/src/pybind/mgr/dashboard/services/rbd.py @@ -424,7 +424,8 @@ class RbdService(object): return joint_refs @classmethod - def rbd_pool_list(cls, pool_names: List[str], namespace=None, offset=0, limit=0, search='', sort=''): + def rbd_pool_list(cls, pool_names: List[str], namespace=None, offset=0, limit=0, + search='', sort=''): offset = int(offset) limit = int(limit) # let's use -1 to denotate we want ALL images for now. Iscsi currently gathers @@ -445,6 +446,8 @@ class RbdService(object): result = [] end = offset + limit + if len(sort) < 2: + sort = '>name' descending = sort[0] == '<' sort_by = sort[1:] if sort_by == 'pool_name':