From a2cd0e08014335f9775d9f8779b35c640d5362de Mon Sep 17 00:00:00 2001
From: Pere Diaz Bou <pdiazbou@redhat.com>
Date: Tue, 5 Jul 2022 11:55:51 +0200
Subject: [PATCH] mgr/dashboard: change sort char to '+' and page icons

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit c01ce41266aeec229d60c302b4da8ed6fac6f2d0)
(cherry picked from commit 25b8ce92f93407bf29cb0dd4015c4a35cb37d4dd)
Resolves: rhbz#2125432
---
 .../iscsi-target-form/iscsi-target-form.component.spec.ts | 2 +-
 .../frontend/src/app/shared/api/rbd.service.spec.ts       | 2 +-
 .../src/app/shared/datatable/table/table.component.html   | 8 ++++----
 .../src/app/shared/datatable/table/table.component.ts     | 5 +++--
 .../src/app/shared/models/cd-table-fetch-data-context.ts  | 6 +++---
 src/pybind/mgr/dashboard/services/rbd.py                  | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

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 49f4632f0ebc2..e993468c80d89 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&search=&sort=%3Ename').flush(RBD_LIST);
+    httpTesting.expectOne('api/block/image?offset=0&limit=-1&search=&sort=+name').flush(RBD_LIST);
     httpTesting.expectOne('api/iscsi/target').flush(LIST_TARGET);
     httpTesting.verify();
   });
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts
index f5ab8615ac65d..84abf6d346188 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts
@@ -59,7 +59,7 @@ describe('RbdService', () => {
     /* tslint:disable:no-empty */
     const context = new CdTableFetchDataContext(() => {});
     service.list(context.toParams()).subscribe();
-    const req = httpTesting.expectOne('api/block/image?offset=0&limit=10?search=&sort=<name');
+    const req = httpTesting.expectOne('api/block/image?offset=0&limit=10&search=&sort=+name');
     expect(req.request.method).toBe('GET');
   });
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html
index 8a65e62ae9653..2d2a8b5e95a5c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html
@@ -212,10 +212,10 @@
             {{ data?.length || 0 }} <ng-container i18n="X total">total</ng-container>
           </span>
         </div>
-        <datatable-pager [pagerLeftArrowIcon]="paginationClasses.pagerLeftArrow"
-                         [pagerRightArrowIcon]="paginationClasses.pagerRightArrow"
-                         [pagerPreviousIcon]="paginationClasses.pagerPrevious"
-                         [pagerNextIcon]="paginationClasses.pagerNext"
+        <datatable-pager [pagerLeftArrowIcon]="paginationClasses.pagerPrevious"
+                         [pagerRightArrowIcon]="paginationClasses.pagerNext"
+                         [pagerPreviousIcon]="paginationClasses.pagerLeftArrow"
+                         [pagerNextIcon]="paginationClasses.pagerRightArrow"
                          [page]="curPage"
                          [size]="pageSize"
                          [count]="rowCount"
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 db67461414455..9591f1ddb5fee 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;
@@ -797,7 +797,8 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O
   changeSorting({ sorts }: any) {
     this.userConfig.sorts = sorts;
     if (this.serverSide) {
-      this.reloadData();
+			this.userConfig.offset = 0;
+			this.reloadData();
     }
   }
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-fetch-data-context.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-fetch-data-context.ts
index 7f50bb7f1ec91..7937d82e6f3e6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-fetch-data-context.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-table-fetch-data-context.ts
@@ -16,7 +16,7 @@ export class CdTableFetchDataContext {
   error: Function;
   pageInfo: PageInfo = new PageInfo();
   search = '';
-  sort = '>name';
+  sort = '+name';
 
   constructor(error: () => void) {
     this.error = error;
@@ -29,8 +29,8 @@ export class CdTableFetchDataContext {
     if (!this.search) {
       this.search = '';
     }
-    if (!this.sort) {
-      this.sort = '>name';
+    if (!this.sort || this.sort.length < 2) {
+      this.sort = '+name';
     }
     return new HttpParams({
       fromObject: {
diff --git a/src/pybind/mgr/dashboard/services/rbd.py b/src/pybind/mgr/dashboard/services/rbd.py
index a3b5c0c06ac49..d1a63f5564be8 100644
--- a/src/pybind/mgr/dashboard/services/rbd.py
+++ b/src/pybind/mgr/dashboard/services/rbd.py
@@ -447,8 +447,8 @@ class RbdService(object):
         result = []
         end = offset + limit
         if len(sort) < 2:
-            sort = '>name'
-        descending = sort[0] == '<'
+            sort = '+name'
+        descending = sort[0] == '-'
         sort_by = sort[1:]
         if sort_by == 'pool_name':
             sort_by = 'pool'
-- 
2.39.5