From 712d8b435ba97b80ab723509e6fc1a3e913f7313 Mon Sep 17 00:00:00 2001
From: Martin Rojas Miguel Angel <MiguelAngel.MartinRojas@novatec-gmbh.de>
Date: Mon, 4 Jun 2018 13:11:22 +0200
Subject: [PATCH] TSK-538 Bug order by description issue is now fixed.

---
 .../src/main/java/pro/taskana/rest/WorkbasketController.java  | 4 ++++
 .../workbasket/master/list/workbasket-list.component.html     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java
index 9df03799b..62c7367eb 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java
@@ -68,6 +68,7 @@ public class WorkbasketController extends AbstractPagingController {
     private static final String DOMAIN = "domain";
     private static final String REQUIRED_PERMISSION = "required-permission";
     private static final String TYPE = "type";
+    private static final String DESCRIPTION = "description";
 
     private static final String SORT_BY = "sort-by";
     private static final String SORT_DIRECTION = "order";
@@ -277,6 +278,9 @@ public class WorkbasketController extends AbstractPagingController {
                 case (TYPE):
                     query = query.orderByType(sortDirection);
                     break;
+                case (DESCRIPTION):
+                    query = query.orderByDescription(sortDirection);
+                    break;
                 default:
                     throw new IllegalArgumentException("Unknown order '" + sortBy + "'");
             }
diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list.component.html b/web/src/app/administration/workbasket/master/list/workbasket-list.component.html
index eb6911903..382e5cae3 100644
--- a/web/src/app/administration/workbasket/master/list/workbasket-list.component.html
+++ b/web/src/app/administration/workbasket/master/list/workbasket-list.component.html
@@ -27,7 +27,7 @@
         </div>
         <taskana-spinner [isRunning]="requestInProgress"></taskana-spinner>
         <ng-template #empty_workbaskets>
-            <div class="col-xs-12 container-no-items center-block">
+            <div *ngIf="!requestInProgress" class="col-xs-12 container-no-items center-block">
                 <h3 class="grey">There are no workbaskets</h3>
                 <svg-icon class="img-responsive empty-icon" src="./assets/icons/wb-empty.svg"></svg-icon>
             </div>