From d6942737bf42f318df34fa10aea7e1b723098214 Mon Sep 17 00:00:00 2001
From: Martin Rojas Miguel Angel <MiguelAngel.MartinRojas@novatec-gmbh.de>
Date: Wed, 6 Jun 2018 14:42:29 +0200
Subject: [PATCH] TSK-534 Rename lookup configuration property

---
 .../src/main/resources/application.properties             | 2 +-
 .../environments/data-sources/customized-fields.json      | 8 ++++----
 .../details/access-items/access-items.component.html      | 2 +-
 .../details/access-items/access-items.component.ts        | 2 +-
 .../information/workbasket-information.component.html     | 2 +-
 .../information/workbasket-information.component.ts       | 2 +-
 web/src/app/shared/type-ahead/type-ahead.component.html   | 2 +-
 web/src/app/shared/type-ahead/type-ahead.component.scss   | 5 +++++
 web/src/environments/data-sources/customized-fields.json  | 8 ++++----
 9 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/rest/taskana-rest-spring-example/src/main/resources/application.properties b/rest/taskana-rest-spring-example/src/main/resources/application.properties
index 6bfc09c4a..27aca93b7 100644
--- a/rest/taskana-rest-spring-example/src/main/resources/application.properties
+++ b/rest/taskana-rest-spring-example/src/main/resources/application.properties
@@ -5,7 +5,7 @@ datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0;INIT=CREATE SCHEM
 datasource.driverClassName=org.h2.Driver
 datasource.username=sa
 datasource.password=sa
-devMode=false
+devMode=true
 ####### control LDAP usage
 taskana.ldap.useLdap=false
 ####### properties to connect to LDAP
diff --git a/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/customized-fields.json b/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/customized-fields.json
index 82adbf53e..2a1aeaf14 100644
--- a/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/customized-fields.json
+++ b/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/customized-fields.json
@@ -2,8 +2,8 @@
   "EN": {
     "workbaskets": {
       "information": {
-        "lookupField": {
-          "visible": false
+        "owner": {
+          "lookupField": true
         },
         "custom1": {
           "field": "Customized field 1 title",
@@ -15,8 +15,8 @@
         }
       },
       "access-items": {
-        "lookupField": {
-          "visible": true
+        "accessId": {
+          "lookupField": true
         },
         "custom3": {
           "field": "",
diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.html b/web/src/app/administration/workbasket/details/access-items/access-items.component.html
index c89f66b1a..eef3cc5e5 100644
--- a/web/src/app/administration/workbasket/details/access-items/access-items.component.html
+++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.html
@@ -42,7 +42,7 @@
 								<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
 							</button>
 						</td>
-						<td *ngIf="lookupField.visible else accessIdInput" class="input-group text-align text-width taskana-type-ahead" [ngClass]="{
+						<td *ngIf="accessIdField.lookupField else accessIdInput" class="input-group text-align text-width taskana-type-ahead" [ngClass]="{
 							'has-warning': (accessItemsClone[index].accessId !== accessItem.accessId),
 							'has-error': !accessItem.accessId } ">
 							<taskana-type-ahead required #accessItemName="ngModel" [(ngModel)]="accessItem.accessId" name="accessItem.accessId-{{index}}"
diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts
index 73cb9a486..b13c28612 100644
--- a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts
+++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts
@@ -34,7 +34,7 @@ export class AccessItemsComponent implements OnChanges, OnDestroy {
 	active: string;
 	badgeMessage = '';
 
-	lookupField = this.customFieldService.getCustomField('Owner', 'workbaskets.access-items.lookupField');
+	accessIdField = this.customFieldService.getCustomField('Owner', 'workbaskets.access-items.accessId');
 	custom1Field = this.customFieldService.getCustomField('Custom 1', 'workbaskets.access-items.custom1');
 	custom2Field = this.customFieldService.getCustomField('Custom 2', 'workbaskets.access-items.custom2');
 	custom3Field = this.customFieldService.getCustomField('Custom 3', 'workbaskets.access-items.custom3');
diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.html b/web/src/app/administration/workbasket/details/information/workbasket-information.component.html
index 127852d8d..0daeb22da 100644
--- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.html
+++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.html
@@ -39,7 +39,7 @@
                 </div>
                 <div class="form-group required">
                     <label for="wb-owner" class="control-label">Owner</label>
-                    <taskana-type-ahead *ngIf="lookupField.visible else ownerInput" required #owner="ngModel" name="owner" [(ngModel)]="workbasket.owner"
+                    <taskana-type-ahead *ngIf="ownerField.lookupField else ownerInput" required #owner="ngModel" name="owner" [(ngModel)]="workbasket.owner"
                         placeHolderMessage="Owner is required"></taskana-type-ahead>
                     <ng-template #ownerInput>
                         <input type="text" required #owner="ngModel" class="form-control" id="wb-owner" placeholder="Owner" [(ngModel)]="workbasket.owner"
diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts
index 3dea7ad2f..b5366012e 100644
--- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts
+++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts
@@ -37,7 +37,7 @@ export class WorkbasketInformationComponent implements OnInit, OnChanges, OnDest
 	requestInProgress = false;
 	badgeMessage = '';
 
-	lookupField = this.customFieldsService.getCustomField('Owner', 'workbaskets.information.lookupField');
+	ownerField = this.customFieldsService.getCustomField('Owner', 'workbaskets.information.owner');
 	custom1Field = this.customFieldsService.getCustomField('Custom 1', 'workbaskets.information.custom1');
 	custom2Field = this.customFieldsService.getCustomField('Custom 2', 'workbaskets.information.custom2');
 	custom3Field = this.customFieldsService.getCustomField('Custom 3', 'workbaskets.information.custom3');
diff --git a/web/src/app/shared/type-ahead/type-ahead.component.html b/web/src/app/shared/type-ahead/type-ahead.component.html
index e87e6f792..66d575335 100644
--- a/web/src/app/shared/type-ahead/type-ahead.component.html
+++ b/web/src/app/shared/type-ahead/type-ahead.component.html
@@ -20,7 +20,7 @@
     <div>{{dataSource.selected?.name}}</div>
   </div>
   <div [ngClass]="{'hidden': dataSource.selected && !typing}">
-    <span  class="field-label-wrapper">
+    <span class="field-label-wrapper">
       <label>
         {{dataSource.selected?.name}}
       </label>
diff --git a/web/src/app/shared/type-ahead/type-ahead.component.scss b/web/src/app/shared/type-ahead/type-ahead.component.scss
index 0385320dd..f7795175c 100644
--- a/web/src/app/shared/type-ahead/type-ahead.component.scss
+++ b/web/src/app/shared/type-ahead/type-ahead.component.scss
@@ -11,6 +11,11 @@ $grey: #ddd;
         border-bottom: 1px solid $grey;
         margin-top:6px;
     }
+    > div{
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
 }
 
 .input-text {
diff --git a/web/src/environments/data-sources/customized-fields.json b/web/src/environments/data-sources/customized-fields.json
index fb204da48..3a835251a 100644
--- a/web/src/environments/data-sources/customized-fields.json
+++ b/web/src/environments/data-sources/customized-fields.json
@@ -2,8 +2,8 @@
     "EN": {
         "workbaskets": {
             "information": {
-                "lookupField": {
-                    "visible": true
+                "owner": {
+                    "lookupField": true
                 },
                 "custom1": {
                     "field": "Customized field 1 title",
@@ -15,8 +15,8 @@
                 }
             },
             "access-items": {
-                "lookupField": {
-                    "visible": false
+                "accessId": {
+                    "lookupField": true
                 },
                 "custom3": {
                     "field": "",