From 4c9dd20f39e1d7bc66be5c07a8e5c3fd10d7bd0c Mon Sep 17 00:00:00 2001
From: Martin Rojas Miguel Angel <MiguelAngel.MartinRojas@novatec-gmbh.de>
Date: Mon, 19 Feb 2018 10:51:19 +0100
Subject: [PATCH] TSK-306 fix Id name and remove last & from GET query.

---
 admin/package-lock.json                                   | 3 +--
 admin/package.json                                        | 2 +-
 admin/src/app/services/workbasketservice.service.spec.ts  | 8 ++++----
 admin/src/app/services/workbasketservice.service.ts       | 4 +++-
 .../src/app/workbasket/list/workbasket-list.component.ts  | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/admin/package-lock.json b/admin/package-lock.json
index 7a3de9da7..afc31d64e 100755
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -4381,8 +4381,7 @@
         "jsbn": {
           "version": "0.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "json-schema": {
           "version": "0.2.3",
diff --git a/admin/package.json b/admin/package.json
index 12d5db1f4..1bf294fe7 100755
--- a/admin/package.json
+++ b/admin/package.json
@@ -57,4 +57,4 @@
     "tslint": "5.9.1",
     "typescript": "2.5.3"
   }
-}
\ No newline at end of file
+}
diff --git a/admin/src/app/services/workbasketservice.service.spec.ts b/admin/src/app/services/workbasketservice.service.spec.ts
index 7f1d494ac..a00c40765 100644
--- a/admin/src/app/services/workbasketservice.service.spec.ts
+++ b/admin/src/app/services/workbasketservice.service.spec.ts
@@ -26,22 +26,22 @@ describe('WorkbasketService ', () => {
 
     it('should have a valid query parameter expression sortBy=key, order=asc as default', () => {
       workbasketService.getWorkBasketsSummary();
-      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=key&order=asc&', jasmine.any(Object));
+      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=key&order=asc', jasmine.any(Object));
     });
   
     it('should have a valid query parameter expression with sortBy=name and order=desc', () => {
       workbasketService.getWorkBasketsSummary('name', Direction.DESC);
-      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc&', jasmine.any(Object));
+      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc', jasmine.any(Object));
     });
   
     it('should have a valid query parameter expression with sortBy=name  and order=desc and descLike=some description ',()  => {
       workbasketService.getWorkBasketsSummary('name', Direction.DESC, undefined, undefined, 'some description');
-      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc&descLike=some description&', jasmine.any(Object));
+      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc&descLike=some description', jasmine.any(Object));
     });
   
     it('should have a valid query parameter expression with sortBy=key, order=asc, descLike=some description and type=group ',()  => {
       workbasketService.getWorkBasketsSummary('name', Direction.DESC, undefined, undefined, 'some description', undefined, undefined, 'group');
-      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc&descLike=some description&type=group&', jasmine.any(Object));
+      expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc&descLike=some description&type=group', jasmine.any(Object));
   });
   
 
diff --git a/admin/src/app/services/workbasketservice.service.ts b/admin/src/app/services/workbasketservice.service.ts
index b62e60b6c..bfdd639b8 100644
--- a/admin/src/app/services/workbasketservice.service.ts
+++ b/admin/src/app/services/workbasketservice.service.ts
@@ -121,7 +121,9 @@ export class WorkbasketService {
     query += type?                `${this.TYPE}=${type}&`:'';
     query += requiredPermission?  `${this.REQUIREDPERMISSION}=${requiredPermission}&`:'';
 
-    
+    if(query.lastIndexOf('&') === query.length-1){
+      query = query.slice(0, query.lastIndexOf('&'))
+    }
     return query;
   }
 }
diff --git a/admin/src/app/workbasket/list/workbasket-list.component.ts b/admin/src/app/workbasket/list/workbasket-list.component.ts
index 1d0320d95..40f2d00c4 100644
--- a/admin/src/app/workbasket/list/workbasket-list.component.ts
+++ b/admin/src/app/workbasket/list/workbasket-list.component.ts
@@ -19,7 +19,7 @@ export class WorkbasketListComponent implements OnInit {
 
   sortBy: string = 'key';
   sortDirection: Direction = Direction.ASC;
-  sortingFields : Map<string, string> = new Map([['name', 'Name'], ['key', 'Id'], ['description', 'Description'], ['owner', 'Owner'], ['type', 'Type']]);
+  sortingFields : Map<string, string> = new Map([['name', 'Name'], ['key', 'Key'], ['description', 'Description'], ['owner', 'Owner'], ['type', 'Type']]);
 
   private workBasketSummarySubscription: Subscription;
   private workbasketServiceSubscription: Subscription;