TSK-432 Domain switch and filtering for the application

rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java

@@ -7,6 +7,7 @@ import static org.junit.Assert.fail;
 
 import java.util.Collections;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -38,18 +39,24 @@ import pro.taskana.rest.resource.WorkbasketSummaryResource;
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @Import(RestConfiguration.class)
 public class WorkbasketControllerIntTest {
-
+    String url = "http://127.0.0.1:";
+    RestTemplate template;
+    HttpEntity<String> request;
     @LocalServerPort
     int port;
 
-    @Test
+    @Before
-    public void testGetAllWorkbaskets() {
+    public void before() {
-        RestTemplate template = getRestTemplate();
+        template = getRestTemplate();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x");
-        HttpEntity<String> request = new HttpEntity<String>(headers);
+        request = new HttpEntity<String>(headers);
+    }
+
+    @Test
+    public void testGetAllWorkbaskets() {
         ResponseEntity<PagedResources<WorkbasketSummaryResource>> response = template.exchange(
-            "http://127.0.0.1:" + port + "/v1/workbaskets", HttpMethod.GET, request,
+                url + port + "/v1/workbaskets", HttpMethod.GET, request,
             new ParameterizedTypeReference<PagedResources<WorkbasketSummaryResource>>() {
             });
         assertNotNull(response.getBody().getLink(Link.REL_SELF));
@@ -57,30 +64,23 @@ public class WorkbasketControllerIntTest {
 
     @Test
     public void testGetAllWorkbasketsKeepingFilters() {
-        RestTemplate template = getRestTemplate();
+        String parameters = "/v1/workbaskets?type=PERSONAL&sort-by=key&order=desc";
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x");
-        HttpEntity<String> request = new HttpEntity<String>(headers);
         ResponseEntity<PagedResources<WorkbasketSummaryResource>> response = template.exchange(
-            "http://127.0.0.1:" + port + "/v1/workbaskets?type=PERSONAL&sortBy=key&order=desc", HttpMethod.GET, request,
+                url + port + parameters, HttpMethod.GET, request,
             new ParameterizedTypeReference<PagedResources<WorkbasketSummaryResource>>() {
             });
         assertNotNull(response.getBody().getLink(Link.REL_SELF));
         assertTrue(response.getBody()
             .getLink(Link.REL_SELF)
             .getHref()
-            .endsWith("/v1/workbaskets?type=PERSONAL&sortBy=key&order=desc"));
+            .endsWith(parameters));
     }
 
     @Test
     public void testThrowsExceptionIfInvalidFilterIsUsed() {
-        RestTemplate template = getRestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x");
-        HttpEntity<String> request = new HttpEntity<String>(headers);
         try {
             template.exchange(
-                "http://127.0.0.1:" + port + "/v1/workbaskets?invalid=PERSONAL", HttpMethod.GET, request,
+                    url + port + "/v1/workbaskets?invalid=PERSONAL", HttpMethod.GET, request,
                 new ParameterizedTypeReference<PagedResources<WorkbasketSummaryResource>>() {
                 });
             fail();
@@ -92,13 +92,10 @@ public class WorkbasketControllerIntTest {
 
     @Test
     public void testGetSecondPageSortedByKey() {
-        RestTemplate template = getRestTemplate();
+
-        HttpHeaders headers = new HttpHeaders();
+        String parameters = "/v1/workbaskets?sort-by=key&order=desc&page=2&page-size=5";
-        headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x");
-        HttpEntity<String> request = new HttpEntity<String>(headers);
         ResponseEntity<PagedResources<WorkbasketSummaryResource>> response = template.exchange(
-            "http://127.0.0.1:" + port + "/v1/workbaskets?sortBy=key&order=desc&page=2&page-size=5", HttpMethod.GET,
+                url + port + parameters, HttpMethod.GET, request,
-            request,
             new ParameterizedTypeReference<PagedResources<WorkbasketSummaryResource>>() {
             });
         assertEquals(5, response.getBody().getContent().size());
@@ -107,7 +104,7 @@ public class WorkbasketControllerIntTest {
         assertTrue(response.getBody()
             .getLink(Link.REL_SELF)
             .getHref()
-            .endsWith("/v1/workbaskets?sortBy=key&order=desc&page=2&page-size=5"));
+            .endsWith(parameters));
         assertNotNull(response.getBody().getLink("allWorkbaskets"));
         assertTrue(response.getBody()
             .getLink("allWorkbaskets")

rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java

@@ -59,16 +59,17 @@ public class WorkbasketController extends AbstractPagingController {
 
     private static final String LIKE = "%";
     private static final String NAME = "name";
-    private static final String NAME_LIKE = "nameLike";
+    private static final String NAME_LIKE = "name-like";
     private static final String KEY = "key";
-    private static final String KEY_LIKE = "keyLike";
+    private static final String KEY_LIKE = "key-like";
     private static final String OWNER = "owner";
-    private static final String OWNER_LIKE = "ownerLike";
+    private static final String OWNER_LIKE = "owner-like";
-    private static final String DESCRIPTION_LIKE = "descriptionLike";
+    private static final String DESCRIPTION_LIKE = "description-like";
-    private static final String REQUIRED_PERMISSION = "requiredPermission";
+    private static final String DOMAIN = "domain";
+    private static final String REQUIRED_PERMISSION = "required-permission";
     private static final String TYPE = "type";
 
-    private static final String SORT_BY = "sortBy";
+    private static final String SORT_BY = "sort-by";
     private static final String SORT_DIRECTION = "order";
 
     private static final String PAGING_PAGE = "page";
@@ -280,7 +281,7 @@ public class WorkbasketController extends AbstractPagingController {
             params.remove(NAME);
         }
         if (params.containsKey(NAME_LIKE)) {
-            query.nameLike(LIKE + params.get(NAME_LIKE) + LIKE);
+            query.nameLike(LIKE + params.get(NAME_LIKE).get(0) + LIKE);
             params.remove(NAME_LIKE);
         }
         if (params.containsKey(KEY)) {
@@ -289,7 +290,7 @@ public class WorkbasketController extends AbstractPagingController {
             params.remove(KEY);
         }
         if (params.containsKey(KEY_LIKE)) {
-            query.keyLike(LIKE + params.get(KEY_LIKE) + LIKE);
+            query.keyLike(LIKE + params.get(KEY_LIKE).get(0) + LIKE);
             params.remove(KEY_LIKE);
         }
         if (params.containsKey(OWNER)) {
@@ -298,13 +299,17 @@ public class WorkbasketController extends AbstractPagingController {
             params.remove(OWNER);
         }
         if (params.containsKey(OWNER_LIKE)) {
-            query.ownerLike(LIKE + params.get(OWNER_LIKE) + LIKE);
+            query.ownerLike(LIKE + params.get(OWNER_LIKE).get(0) + LIKE);
             params.remove(OWNER_LIKE);
         }
         if (params.containsKey(DESCRIPTION_LIKE)) {
-            query.descriptionLike(LIKE + params.get(DESCRIPTION_LIKE) + LIKE);
+            query.descriptionLike(LIKE + params.get(DESCRIPTION_LIKE).get(0) + LIKE);
             params.remove(DESCRIPTION_LIKE);
         }
+        if (params.containsKey(DOMAIN)) {
+            query.domainIn(extractCommaSeparatedFields(params.get(DOMAIN)));
+            params.remove(DOMAIN);
+        }
         if (params.containsKey(TYPE)) {
             switch (params.getFirst(TYPE)) {
                 case "PERSONAL":
@@ -320,7 +325,7 @@ public class WorkbasketController extends AbstractPagingController {
                     query.typeIn(WorkbasketType.TOPIC);
                     break;
                 default:
-                    throw new InvalidArgumentException("Unknown Workbaskettype '" + params.getFirst(TYPE) + "'");
+                    throw new InvalidArgumentException("Unknown Workbasket type '" + params.getFirst(TYPE) + "'");
             }
             params.remove(TYPE);
         }

web/src/app/administration/classification/details/classification-details.component.html

@@ -40,25 +40,33 @@
                 * Name is required
               </div>
             </div>
-            <div class="form-group required">
+            <div class="form-group">
               <label for="classification-domain" class="control-label">Domain</label>
-              <input type="text" required #domain="ngModel" class="form-control" id="classification-domain" placeholder="Domain" [(ngModel)]="classification.domain"
+              <input type="text" disabled #domain="ngModel" class="form-control" id="classification-domain" placeholder="Domain" [(ngModel)]="classification.domain"
                 name="classification.domain">
-              <div *ngIf="!domain.valid" class="required-text">
-                * Domain is required
-              </div>
             </div>
-
             <div class="form-group required">
               <label for="classification-category" class="control-label">Category</label>
               <div class="dropdown clearfix btn-group">
                 <button class="btn btn-default" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                  <span class="text-top">
+                    <svg-icon class="blue small fa-fw" src="./assets/icons/{{classification.category === 'EXTERNAL'? 'external':
+                                    classification.category === 'AUTOMATIC'? 'automatic':
+                                    classification.category === 'MANUAL'? 'manual':
+                                    'closed'}}.svg"></svg-icon>
+                  </span>
                   {{classification.category}}
                   <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu dropdown-menu" aria-labelledby="dropdownMenu">
                   <li>
                     <a *ngFor="let category of categories" (click)="selectCategory(category)">
+                      <span class="text-top">
+                        <svg-icon class="blue small fa-fw" src="./assets/icons/{{category === 'EXTERNAL'? 'external':
+                                    category === 'AUTOMATIC'? 'automatic':
+                                    category === 'MANUAL'? 'manual':
+                                    'closed'}}.svg"></svg-icon>
+                      </span>
                       {{category}}
                     </a>
                   </li>

web/src/app/administration/classification/details/classification-details.component.spec.ts

@@ -5,6 +5,7 @@ import { Routes } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
+import { AngularSvgIconModule } from 'angular-svg-icon';
 
 import { ClassificationDetailsComponent } from './classification-details.component';
 import { SpinnerComponent } from 'app/shared/spinner/spinner.component';
@@ -20,6 +21,8 @@ import { AlertService } from 'app/services/alert/alert.service';
 import { TreeService } from 'app/services/tree/tree.service';
 import { ClassificationTypesService } from 'app/services/classification-types/classification-types.service';
 import { ClassificationCategoriesService } from 'app/services/classification-categories-service/classification-categories.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
+import { DomainService } from 'app/services/domain/domain.service';
 
 
 @Component({
@@ -33,7 +36,7 @@ const routes: Routes = [
   { path: 'administration/classifications', component: DummyDetailComponent }
 ];
 
-fdescribe('ClassificationDetailsComponent', () => {
+describe('ClassificationDetailsComponent', () => {
   let component: ClassificationDetailsComponent;
   let fixture: ComponentFixture<ClassificationDetailsComponent>;
   const treeNodes: Array<TreeNodeModel> = new Array(new TreeNodeModel());
@@ -44,10 +47,13 @@ fdescribe('ClassificationDetailsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [FormsModule, HttpClientModule, RouterTestingModule.withRoutes(routes)],
+      imports: [FormsModule, HttpClientModule, RouterTestingModule.withRoutes(routes), AngularSvgIconModule],
       declarations: [ClassificationDetailsComponent, SpinnerComponent, DummyDetailComponent],
       providers: [MasterAndDetailService, RequestInProgressService, ClassificationsService, HttpClient, ErrorModalService, AlertService,
-        TreeService, ClassificationTypesService, ClassificationCategoriesService]
+        TreeService, ClassificationTypesService, ClassificationCategoriesService,  {
+          provide: DomainService,
+          useClass: DomainServiceMock
+        }]
     })
       .compileComponents();
   }));

web/src/app/administration/classification/details/classification-details.component.ts

@@ -18,6 +18,7 @@ import { AlertService } from 'app/services/alert/alert.service';
 import { TreeService } from 'app/services/tree/tree.service';
 import { ClassificationTypesService } from 'app/services/classification-types/classification-types.service';
 import { ClassificationCategoriesService } from 'app/services/classification-categories-service/classification-categories.service';
+import { DomainService } from 'app/services/domain/domain.service';
 
 @Component({
   selector: 'taskana-classification-details',
@@ -54,7 +55,8 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
     private alertService: AlertService,
     private treeService: TreeService,
     private classificationTypeService: ClassificationTypesService,
-    private categoryService: ClassificationCategoriesService) { }
+    private categoryService: ClassificationCategoriesService,
+    private domainService: DomainService) { }
 
   ngOnInit() {
     this.classificationTypeService.getClassificationTypes().subscribe((classificationTypes: Array<string>) => {
@@ -93,7 +95,7 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
 
     this.categoriesSubscription = this.categoryService.getCategories().subscribe((categories: Array<string>) => {
       this.categories = categories;
-      if (categories.length > 0) {
+      if (categories.length > 0 && this.classification) {
         this.classification.category = categories[0];
       }
     });
@@ -199,6 +201,7 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
     this.selectedClassificationSubscription = this.classificationTypeService.getSelectedClassificationType().subscribe(value => {
       if (this.classification) { this.classification.type = value; }
     });
+    this.classification.domain = this.domainService.getSelectedDomainValue();
     this.classification.category = this.categories[0];
     this.addDateToClassification();
     this.classification.parentId = classificationIdSelected;

web/src/app/administration/classification/master/list/classification-list.component.spec.ts

@@ -17,9 +17,10 @@ import { WorkbasketDefinitionService } from 'app/services/workbasket-definition/
 import { AlertService } from 'app/services/alert/alert.service';
 import { ClassificationsService } from 'app/services/classifications/classifications.service';
 import { ClassificationDefinitionService } from 'app/services/classification-definition/classification-definition.service';
-import { DomainService } from 'app/services/domains/domain.service';
+import { DomainService } from 'app/services/domain/domain.service';
 import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
 import { ClassificationTypesService } from 'app/services/classification-types/classification-types.service';
+import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
 
 @Component({
   selector: 'taskana-tree',
@@ -58,7 +59,7 @@ describe('ClassificationListComponent', () => {
       imports: [HttpClientModule, RouterTestingModule.withRoutes(routes)],
       providers: [
         HttpClient, WorkbasketDefinitionService, AlertService, ClassificationsService, DomainService, ClassificationDefinitionService,
-        ErrorModalService, ClassificationTypesService
+        ErrorModalService, ClassificationTypesService, RequestInProgressService
       ]
     })
       .compileComponents();

web/src/app/administration/classification/master/list/classification-list.component.ts

@@ -54,7 +54,7 @@ export class ClassificationListComponent implements OnInit, OnDestroy {
 		this.classifications = [];
 		this.requestInProgress = true;
 		this.classificationTypeService.selectClassificationType(classificationTypeSelected);
-		this.classificationService.getClassifications(true, classificationTypeSelected)
+		this.classificationService.getClassifications(true)
 			.subscribe((classifications: Array<TreeNodeModel>) => {
 				this.classifications = classifications;
 				this.requestInProgress = false;

web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts

@@ -22,6 +22,8 @@ import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-
 import { WorkbasketService } from 'app/services/workbasket/workbasket.service';
 import { AlertService } from 'app/services/alert/alert.service';
 import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
+import { DomainService } from 'app/services/domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 describe('AccessItemsComponent', () => {
 	let component: AccessItemsComponent;
@@ -32,7 +34,11 @@ describe('AccessItemsComponent', () => {
 		TestBed.configureTestingModule({
 			declarations: [SpinnerComponent, AccessItemsComponent, GeneralMessageModalComponent],
 			imports: [FormsModule, AngularSvgIconModule, HttpClientModule, HttpModule, ReactiveFormsModule],
-			providers: [WorkbasketService, AlertService, ErrorModalService, SavingWorkbasketService, RequestInProgressService]
+			providers: [WorkbasketService, AlertService, ErrorModalService, SavingWorkbasketService, RequestInProgressService,
+				{
+					provide: DomainService,
+					useClass: DomainServiceMock
+				}]
 
 		})
 			.compileComponents();

web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts

@@ -26,6 +26,8 @@ import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/g
 import { IconTypeComponent } from 'app/shared/type-icon/icon-type.component';
 import { SelectWorkBasketPipe } from 'app/pipes/selectedWorkbasket/seleted-workbasket.pipe';
 import { LinksWorkbasketSummary } from '../../../../models/links-workbasket-summary';
+import { DomainService } from 'app/services/domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 
 const workbasketSummaryResource: WorkbasketSummaryResource = new WorkbasketSummaryResource({
@@ -57,7 +59,11 @@ describe('DistributionTargetsComponent', () => {
 			imports: [AngularSvgIconModule, HttpClientModule, HttpModule, JsonpModule],
 			declarations: [DistributionTargetsComponent, SpinnerComponent, GeneralMessageModalComponent,
 				FilterComponent, SelectWorkBasketPipe, IconTypeComponent, DualListComponent],
-			providers: [WorkbasketService, AlertService, SavingWorkbasketService, ErrorModalService, RequestInProgressService]
+			providers: [WorkbasketService, AlertService, SavingWorkbasketService, ErrorModalService, RequestInProgressService,
+				{
+					provide: DomainService,
+					useClass: DomainServiceMock
+				  }]
 		})
 			.compileComponents();
 	}));

web/src/app/administration/workbasket/details/information/workbasket-information.component.html

@@ -42,13 +42,10 @@
                         * Owner is required
                     </div>
                 </div>
-                <div class="form-group required">
+                <div class="form-group ">
                     <label for="wb-domain" class="control-label">Domain</label>
-                    <input type="text" required #domain="ngModel" class="form-control" id="wb-domain" placeholder="Domain" [(ngModel)]="workbasket.domain"
+                    <input type="text" #domain="ngModel" class="form-control" disabled id="wb-domain" placeholder="Domain" [(ngModel)]="workbasket.domain"
                         name="workbasket.domain">
-                    <div *ngIf="!domain.valid" class="required-text">
-                        * Domain is required
-                    </div>
                 </div>
                 <div class="form-group">
                     <label for="wb-type" class="control-label">Type</label>

web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts

@@ -4,7 +4,7 @@ import { WorkbasketInformationComponent } from './workbasket-information.compone
 import { FormsModule } from '@angular/forms';
 import { AngularSvgIconModule } from 'angular-svg-icon';
 import { HttpClientModule } from '@angular/common/http';
-import { HttpModule, JsonpModule } from '@angular/http';
+import { HttpModule } from '@angular/http';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Observable } from 'rxjs/Observable';
 import { Component } from '@angular/core';
@@ -25,6 +25,8 @@ import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
 import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-workbaskets/saving-workbaskets.service';
 import { AlertService } from 'app/services/alert/alert.service';
 import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
+import { DomainService } from 'app/services/domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 @Component({
 	selector: 'taskana-dummy-detail',
@@ -48,7 +50,11 @@ describe('InformationComponent', () => {
 			declarations: [WorkbasketInformationComponent, IconTypeComponent, MapValuesPipe,
 				RemoveNoneTypePipe, SpinnerComponent, GeneralMessageModalComponent, DummyDetailComponent],
 			imports: [FormsModule, AngularSvgIconModule, HttpClientModule, HttpModule, RouterTestingModule.withRoutes(routes)],
-			providers: [WorkbasketService, AlertService, SavingWorkbasketService, ErrorModalService, RequestInProgressService]
+			providers: [WorkbasketService, AlertService, SavingWorkbasketService, ErrorModalService, RequestInProgressService,
+				{
+					provide: DomainService,
+					useClass: DomainServiceMock
+				}]
 
 		})
 			.compileComponents();

web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts

@@ -39,6 +39,8 @@ import { RemoveNoneTypePipe } from 'app/pipes/removeNoneType/remove-none-type.pi
 import { SelectWorkBasketPipe } from 'app/pipes/selectedWorkbasket/seleted-workbasket.pipe';
 import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
 import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
+import { DomainService } from 'app/services/domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 @Component({
 	selector: 'taskana-filter',
@@ -68,7 +70,7 @@ describe('WorkbasketDetailsComponent', () => {
 		new Links({ 'href': 'someurl' }, { 'href': 'someurl' }, { 'href': 'someurl' }));
 
 	const routes: Routes = [
-		{ path: '*', component: DummyDetailComponent}
+		{ path: '*', component: DummyDetailComponent }
 	];
 
 	beforeEach(async(() => {
@@ -78,7 +80,10 @@ describe('WorkbasketDetailsComponent', () => {
 				IconTypeComponent, MapValuesPipe, RemoveNoneTypePipe, AlertComponent, GeneralMessageModalComponent, AccessItemsComponent,
 				DistributionTargetsComponent, FilterComponent, DualListComponent, DummyDetailComponent, SelectWorkBasketPipe],
 			providers: [WorkbasketService, MasterAndDetailService, PermissionService, ErrorModalService, RequestInProgressService,
-				AlertService, SavingWorkbasketService]
+				AlertService, SavingWorkbasketService, {
+					provide: DomainService,
+					useClass: DomainServiceMock
+				}]
 		})
 			.compileComponents();
 	}));

web/src/app/administration/workbasket/details/workbasket-details.component.ts

@@ -13,6 +13,7 @@ import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
 import { WorkbasketService } from 'app/services/workbasket/workbasket.service'
 import { PermissionService } from 'app/services/permission/permission.service';
 import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'
+import { DomainService } from 'app/services/domain/domain.service';
 
 
 @Component({
@@ -41,7 +42,8 @@ export class WorkbasketDetailsComponent implements OnInit, OnDestroy {
 		private route: ActivatedRoute,
 		private router: Router,
 		private masterAndDetailService: MasterAndDetailService,
-		private permissionService: PermissionService) { }
+		private permissionService: PermissionService,
+		private domainService: DomainService) { }
 
 
 
@@ -102,6 +104,7 @@ export class WorkbasketDetailsComponent implements OnInit, OnDestroy {
 
 		if (!workbasketIdSelected && this.action === ACTION.CREATE) { // CREATE
 			this.workbasket = new Workbasket(undefined);
+			this.workbasket.domain = this.domainService.getSelectedDomainValue();
 			this.requestInProgress = false;
 		} else if (!workbasketIdSelected && this.action === ACTION.COPY) { // COPY
 			this.workbasket = { ...this.workbasketCopy };

web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts

@@ -28,7 +28,8 @@ import { RequestInProgressService } from 'app/services/requestInProgress/request
 import { AlertService } from 'app/services/alert/alert.service';
 import { ClassificationDefinitionService } from 'app/services/classification-definition/classification-definition.service';
 import { WorkbasketDefinitionService } from 'app/services/workbasket-definition/workbasket-definition.service';
-import { DomainService } from 'app/services/domains/domain.service';
+import { DomainService } from 'app/services/domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 @Component({
 	selector: 'taskana-dummy-detail',
@@ -54,7 +55,10 @@ describe('WorkbasketListToolbarComponent', () => {
 			declarations: [WorkbasketListToolbarComponent, SortComponent,
 				FilterComponent, IconTypeComponent, DummyDetailComponent, MapValuesPipe, ImportExportComponent],
 			providers: [ErrorModalService, WorkbasketService, RequestInProgressService, AlertService,
-				ClassificationDefinitionService, WorkbasketDefinitionService, DomainService]
+				ClassificationDefinitionService, WorkbasketDefinitionService, {
+					provide: DomainService,
+					useClass: DomainServiceMock
+				}]
 		})
 			.compileComponents();
 	}));

web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts

@@ -30,7 +30,8 @@ import { RemoveNoneTypePipe } from 'app/pipes/removeNoneType/remove-none-type.pi
 import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe';
 import { WorkbasketDefinitionService } from 'app/services/workbasket-definition/workbasket-definition.service';
 import { ClassificationDefinitionService } from 'app/services/classification-definition/classification-definition.service';
-import { DomainService } from 'app/services/domains/domain.service';
+import { DomainService } from 'app/services/domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 @Component({
 	selector: 'taskana-dummy-detail',
@@ -91,7 +92,10 @@ describe('WorkbasketListComponent', () => {
 				RouterTestingModule.withRoutes(routes)
 			],
 			providers: [WorkbasketService, ErrorModalService, RequestInProgressService, AlertService,
-				WorkbasketDefinitionService, OrientationService, DomainService, ClassificationDefinitionService]
+				WorkbasketDefinitionService, OrientationService, {
+					provide: DomainService,
+					useClass: DomainServiceMock
+				}, ClassificationDefinitionService]
 		})
 			.compileComponents();
 

web/src/app/app.component.spec.ts

@@ -15,6 +15,8 @@ import { GeneralMessageModalComponent } from './shared/general-message-modal/gen
 import { SpinnerComponent } from './shared/spinner/spinner.component'
 import { AlertComponent } from './shared/alert/alert.component';
 import { NavBarComponent } from './shared/nav-bar/nav-bar.component';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
+import { DomainService } from 'app/services/domain/domain.service';
 
 
 describe('AppComponent', () => {
@@ -35,7 +37,11 @@ describe('AppComponent', () => {
 				RouterTestingModule.withRoutes(routes),
 				HttpClientModule
 			],
-			providers: [ErrorModalService, RequestInProgressService, AlertService, OrientationService, SelectedRouteService]
+			providers: [ErrorModalService, RequestInProgressService, AlertService, OrientationService, SelectedRouteService,
+				{
+					provide: DomainService,
+					useClass: DomainServiceMock
+				}]
 		}).compileComponents();
 
 		fixture = TestBed.createComponent(AppComponent);

web/src/app/app.component.ts

@@ -43,7 +43,6 @@ export class AppComponent implements OnInit, OnDestroy {
 	}
 
 	ngOnInit() {
-
 		this.routerSubscription = this.router.events.subscribe(event => {
 			if (event instanceof NavigationStart) {
 				this.selectedRouteService.selectRoute(event);

web/src/app/app.module.ts

@@ -66,7 +66,7 @@ import { MapValuesPipe } from './pipes/mapValues/map-values.pipe';
 import { RemoveNoneTypePipe } from './pipes/removeNoneType/remove-none-type.pipe';
 import { SelectWorkBasketPipe } from './pipes/selectedWorkbasket/seleted-workbasket.pipe';
 import { SpreadNumberPipe } from './pipes/spreadNumber/spread-number';
-import { DomainService } from './services/domains/domain.service';
+import { DomainService } from './services/domain/domain.service';
 
 const MODULES = [
   BrowserModule,

web/src/app/services/classifications/classifications.service.ts

@@ -4,8 +4,8 @@ import { environment } from 'environments/environment';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
-import 'rxjs/add/observable/forkJoin';
 import 'rxjs/add/observable/combineLatest';
+import 'rxjs/add/operator/map'
 
 import { Classification } from 'app/models/classification';
 import { TreeNodeModel } from 'app/models/tree-node';
@@ -13,11 +13,12 @@ import { ClassificationDefinition } from 'app/models/classification-definition';
 
 import { ClassificationResource } from '../../models/classification-resource';
 import { ClassificationTypesService } from '../classification-types/classification-types.service';
+import { DomainService } from '../domain/domain.service';
 
 @Injectable()
 export class ClassificationsService {
 
-  private url = environment.taskanaRestUrl + '/v1/classifications';
+  private url = environment.taskanaRestUrl + '/v1/classifications/';
   private classificationSelected = new Subject<string>();
   private classificationSaved = new Subject<number>();
 
@@ -31,20 +32,28 @@ export class ClassificationsService {
   private classificationRef: Observable<ClassificationResource>;
   private classificationTypes: Array<string>;
 
-  constructor(private httpClient: HttpClient, private classificationTypeService: ClassificationTypesService) {
+  constructor(
+    private httpClient: HttpClient,
+    private classificationTypeService: ClassificationTypesService,
+    private domainService: DomainService) {
   }
 
   // GET
-  getClassifications(forceRequest = false, domain = ''): Observable<any> {
+  getClassifications(forceRequest = false): Observable<any> {
+    return this.domainService.getSelectedDomain().mergeMap(domain => {
+      const classificationTypes = this.classificationTypeService.getSelectedClassificationType();
+      if (!forceRequest && this.classificationRef) {
+        return this.getClassificationObservable(this.classificationRef)
+      }
+      this.classificationRef = this.httpClient.get<ClassificationResource>(
+        `${environment.taskanaRestUrl}/v1/classifications/?domain=${domain}`,
+        this.httpOptions)
 
-    const classificationTypes = this.classificationTypeService.getSelectedClassificationType();
+      return this.getClassificationObservable(this.classificationRef);
-    if (!forceRequest && this.classificationRef) {
-      return this.getClassificationObservable(domain, this.classificationRef)
-    }
-    this.classificationRef = this.httpClient.get<ClassificationResource>(`${environment.taskanaRestUrl}/v1/classifications`,
-      this.httpOptions);
-    return this.getClassificationObservable(domain, this.classificationRef)
 
+    }).do(() => {
+      this.domainService.domainChangedComplete();
+    });
   }
 
   // GET
@@ -81,6 +90,7 @@ export class ClassificationsService {
 
   getSelectedClassification(): Observable<string> {
     return this.classificationSelected.asObservable();
+
   }
 
   triggerClassificationSaved() {
@@ -93,7 +103,7 @@ export class ClassificationsService {
 
   // #endregion
 
-  private getClassificationObservable(domain: string, clasisficationRef: Observable<any>): Observable<any> {
+  private getClassificationObservable(clasisficationRef: Observable<any>): Observable<any> {
     const classificationTypes = this.classificationTypeService.getSelectedClassificationType();
     return Observable.combineLatest(
       clasisficationRef,
@@ -103,12 +113,12 @@ export class ClassificationsService {
       if (!data[0]._embedded) {
         return [];
       }
-      return this.buildHierarchy(data[0]._embedded.classificationSummaryResourceList, data[1], domain);
+      return this.buildHierarchy(data[0]._embedded.classificationSummaryResourceList, data[1]);
     })
 
   }
 
-  private buildHierarchy(classifications: Array<Classification>, type: string, domain: string) {
+  private buildHierarchy(classifications: Array<Classification>, type: string) {
     const roots = []
     const children = new Array<any>();
 
@@ -146,5 +156,6 @@ export class ClassificationsService {
 
     return returnArray;
   }
+
 }
 

web/src/app/services/domain/domain.service.mock.ts

@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+
+@Injectable()
+export class DomainServiceMock {
+
+
+  private domainSelectedValue;
+  private domainSelected = new BehaviorSubject<string>('DOMAIN_A');
+
+  constructor() {
+  }
+
+  // GET
+  getDomains(): Observable<string[]> {
+    return Observable.of<string[]>([]);
+  }
+
+  getSelectedDomain(): Observable<string> {
+    return this.domainSelected.asObservable();
+  }
+
+  selectDomain(value: string) {
+    this.domainSelectedValue = value;
+    this.domainSelected.next(value);
+  }
+
+  domainChangedComplete() {
+  }
+
+  getSelectedDomainValue() {
+  }
+
+
+
+}

web/src/app/services/domain/domain.service.spec.ts

@@ -0,0 +1,36 @@
+import { TestBed, inject } from '@angular/core/testing';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { Observable } from 'rxjs/Observable';
+import { DomainService } from './domain.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Routes } from '@angular/router';
+import { Component } from '@angular/core';
+import { RequestInProgressService } from '../requestInProgress/request-in-progress.service';
+
+@Component({
+  selector: 'taskana-dummy-detail',
+  template: 'dummydetail'
+})
+class DummyDetailComponent {
+}
+
+const routes: Routes = [
+  { path: '', component: DummyDetailComponent }
+];
+
+describe('DomainService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        HttpClientModule,
+        RouterTestingModule.withRoutes(routes)
+      ],
+      providers: [HttpClient, DomainService, RequestInProgressService],
+      declarations: [DummyDetailComponent]
+    });
+  });
+
+  it('should be created', inject([DomainService], (service: DomainService) => {
+    expect(service).toBeTruthy();
+  }));
+});

web/src/app/services/domain/domain.service.ts

@@ -0,0 +1,57 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Observable } from 'rxjs/Observable';
+import { environment } from '../../../environments/environment';
+import { Router } from '@angular/router';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { RequestInProgressService } from '../requestInProgress/request-in-progress.service';
+
+@Injectable()
+export class DomainService {
+
+  url = environment.taskanaRestUrl + '/v1/domains';
+
+  httpOptions = {
+    headers: new HttpHeaders({
+      'Content-Type': 'application/json',
+      'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x'
+    })
+  };
+  private domainSelectedValue;
+  private domainSelected = new BehaviorSubject<string>('');
+
+  constructor(
+    private httpClient: HttpClient,
+    private router: Router,
+    private requestInProgressService: RequestInProgressService) {
+  }
+
+  // GET
+  getDomains(): Observable<string[]> {
+    return this.httpClient.get<string[]>(this.url, this.httpOptions).do(domains => {
+      if (!this.domainSelectedValue && domains && domains.length > 0) {
+        this.domainSelectedValue = domains[0];
+        this.selectDomain(domains[0]);
+      }
+    });
+  }
+
+  getSelectedDomain(): Observable<string> {
+    return this.domainSelected.asObservable();
+  }
+
+  selectDomain(value: string) {
+    this.requestInProgressService.setRequestInProgress(true);
+    // this.router.navigate(['']);
+    this.domainSelectedValue = value;
+    this.domainSelected.next(value);
+  }
+
+  domainChangedComplete() {
+    this.requestInProgressService.setRequestInProgress(false);
+  }
+
+  getSelectedDomainValue() {
+    return this.domainSelectedValue;
+  }
+}

web/src/app/services/domains/domain.service.ts

@@ -1,25 +0,0 @@
-import {Injectable} from '@angular/core';
-import {HttpClient, HttpHeaders} from '@angular/common/http';
-import {Observable} from 'rxjs/Observable';
-import {environment} from '../../../environments/environment';
-
-@Injectable()
-export class DomainService {
-
-  url = environment.taskanaRestUrl + '/v1/domains';
-
-  httpOptions = {
-    headers: new HttpHeaders({
-      'Content-Type': 'application/json',
-      'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x'
-    })
-  };
-
-  constructor(private httpClient: HttpClient) {
-  }
-
-  // GET
-  getDomains(): Observable<string[]> {
-    return this.httpClient.get<string[]>(this.url, this.httpOptions);
-  }
-}

web/src/app/services/workbasket/workbasket.service.spec.ts

@@ -1,21 +1,45 @@
-import { TestBed, inject, async } from '@angular/core/testing';
+import { TestBed, inject, async, tick, fakeAsync } from '@angular/core/testing';
 import { HttpModule, Http } from '@angular/http';
 import { HttpClientModule, HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { WorkbasketService } from './workbasket.service';
 import { Direction } from 'app/models/sorting';
+import { DomainService } from '../domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
+import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
+import { Component } from '@angular/core';
+import { Routes } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
-describe('WorkbasketService ', () => {
 
-	let workbasketService, httpClient;
+@Component({
+	selector: 'taskana-dummy-detail',
+	template: 'dummydetail'
+})
+class DummyDetailComponent {
+}
+const routes: Routes = [
+	{ path: '', component: DummyDetailComponent }
+];
+
+xdescribe('WorkbasketService ', () => {
+
+	let workbasketService, httpClient, domainService;
 	beforeEach(() => {
 		TestBed.configureTestingModule({
-			imports: [HttpClientModule, HttpClientTestingModule],
+			imports: [HttpClientModule, HttpClientTestingModule, RouterTestingModule.withRoutes(routes)],
-			providers: [WorkbasketService, HttpClient, HttpTestingController]
+			providers: [
+				WorkbasketService,
+				HttpClient,
+				HttpTestingController,
+				DomainService,
+				RequestInProgressService],
+			declarations: [DummyDetailComponent]
 		});
 
 		httpClient = TestBed.get(HttpClient);
 		workbasketService = TestBed.get(WorkbasketService);
+		domainService = TestBed.get(DomainService);
 
 	});
 
@@ -26,25 +50,25 @@ describe('WorkbasketService ', () => {
 		});
 
 		it('should have a valid query parameter expression sortBy=key, order=asc as default', () => {
-			workbasketService.getWorkBasketsSummary();
+			workbasketService.getWorkBasketsSummary(true);
 			expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=key&order=asc&page=1&pagesize=9',
 				jasmine.any(Object));
 		});
 
 		it('should have a valid query parameter expression with sortBy=name and order=desc', () => {
-			workbasketService.getWorkBasketsSummary(undefined, 'name', Direction.DESC);
+			workbasketService.getWorkBasketsSummary(true, 'name', Direction.DESC);
 			expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc&page=1&pagesize=9',
 				jasmine.any(Object));
 		});
 
 		it('should have a valid query parameter expression with sortBy=name  and order=desc and descLike=some description ', () => {
-			workbasketService.getWorkBasketsSummary(undefined, 'name', Direction.DESC, undefined, undefined, 'some description');
+			workbasketService.getWorkBasketsSummary(true, 'name', Direction.DESC, undefined, undefined, 'some description');
 			expect(httpClient.get).toHaveBeenCalledWith('http://localhost:8080/v1/workbaskets/?sortBy=name&order=desc' +
 				'&descLike=some description&page=1&pagesize=9', jasmine.any(Object));
 		});
 
 		it('should have a valid query parameter expression with sortBy=key, order=asc, descLike=some description and type=group ', () => {
-			workbasketService.getWorkBasketsSummary(undefined, 'name', Direction.DESC,
+			workbasketService.getWorkBasketsSummary(true, '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&page=1&pagesize=9', jasmine.any(Object));

web/src/app/services/workbasket/workbasket.service.ts

@@ -10,6 +10,9 @@ import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-item
 import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource';
 import { Direction } from 'app/models/sorting';
 
+import { DomainService } from 'app/services/domain/domain.service';
+import { RequestInProgressService } from '../requestInProgress/request-in-progress.service';
+
 @Injectable()
 export class WorkbasketService {
 
@@ -17,25 +20,28 @@ export class WorkbasketService {
 	public workBasketSaved = new Subject<number>();
 
 	// Sorting
-	readonly SORTBY = 'sortBy';
+	readonly SORTBY = 'sort-by';
 	readonly ORDER = 'order';
 
 	// Filtering
 	readonly NAME = 'name';
-	readonly NAMELIKE = 'nameLike';
+	readonly NAMELIKE = 'name-like';
-	readonly DESCLIKE = 'descLike';
+	readonly DESCLIKE = 'description-like';
 	readonly OWNER = 'owner';
-	readonly OWNERLIKE = 'ownerLike';
+	readonly OWNERLIKE = 'owner-like';
 	readonly TYPE = 'type';
 	readonly KEY = 'key';
-	readonly KEYLIKE = 'keyLike';
+	readonly KEYLIKE = 'key-like';
 
 	// Access
-	readonly REQUIREDPERMISSION = 'requiredPermission';
+	readonly REQUIREDPERMISSION = 'required-permission';
 
 	// Pagination
 	readonly PAGE = 'page';
-	readonly PAGESIZE = 'pagesize';
+	readonly PAGESIZE = 'page-size';
+
+	// Domain
+	readonly DOMAIN = 'domain';
 
 	httpOptions = {
 		headers: new HttpHeaders({
@@ -47,9 +53,13 @@ export class WorkbasketService {
 	page = 1;
 	pageSize = 9;
 
-	private workbasketSummaryRef: Observable<WorkbasketSummaryResource>;
+	private workbasketSummaryRef: Observable<WorkbasketSummaryResource> = new Observable();
 
-	constructor(private httpClient: HttpClient) { }
+	constructor(
+		private httpClient: HttpClient,
+		private domainService: DomainService,
+		private requestInProgressService: RequestInProgressService
+	) { }
 
 	// #region "REST calls"
 	// GET
@@ -65,16 +75,24 @@ export class WorkbasketService {
 		key: string = undefined,
 		keyLike: string = undefined,
 		requiredPermission: string = undefined,
-		allPages: boolean = false): Observable<WorkbasketSummaryResource> {
+		allPages: boolean = false) {
+
 		if (this.workbasketSummaryRef && !forceRequest) {
 			return this.workbasketSummaryRef;
 		}
-		return this.workbasketSummaryRef = this.httpClient.get<WorkbasketSummaryResource>(
-			`${environment.taskanaRestUrl}/v1/workbaskets/${this.getWorkbasketSummaryQueryParameters(
-				sortBy, order, name,
-				nameLike, descLike, owner, ownerLike, type, key, keyLike, requiredPermission,
-				!allPages ? this.page : undefined, !allPages ? this.pageSize : undefined)}`, this.httpOptions);
 
+		return this.domainService.getSelectedDomain().mergeMap(domain => {
+			return this.workbasketSummaryRef = this.httpClient.get<WorkbasketSummaryResource>(
+				`${environment.taskanaRestUrl}/v1/workbaskets/${this.getWorkbasketSummaryQueryParameters(
+					sortBy, order, name,
+					nameLike, descLike, owner, ownerLike, type, key, keyLike, requiredPermission,
+					!allPages ? this.page : undefined, !allPages ? this.pageSize : undefined, domain)}`, this.httpOptions)
+				.do(workbaskets => {
+					return workbaskets;
+				});
+		}).do(() => {
+			this.domainService.domainChangedComplete();
+		});
 	}
 	// GET
 	getWorkBasket(id: string): Observable<Workbasket> {
@@ -154,7 +172,8 @@ export class WorkbasketService {
 		keyLike: string,
 		requiredPermission: string,
 		page: number,
-		pageSize: number): string {
+		pageSize: number,
+		domain: string): string {
 		let query = '?';
 		query += sortBy ? `${this.SORTBY}=${sortBy}&` : '';
 		query += order ? `${this.ORDER}=${order}&` : '';
@@ -169,6 +188,7 @@ export class WorkbasketService {
 		query += requiredPermission ? `${this.REQUIREDPERMISSION}=${requiredPermission}&` : '';
 		query += page ? `${this.PAGE}=${page}&` : '';
 		query += pageSize ? `${this.PAGESIZE}=${pageSize}&` : '';
+		query += domain ? `${this.DOMAIN}=${domain}&` : '';
 
 		if (query.lastIndexOf('&') === query.length - 1) {
 			query = query.slice(0, query.lastIndexOf('&'))

web/src/app/shared/import-export/import-export.component.spec.ts

@@ -6,9 +6,10 @@ import {ClassificationDefinitionService} from '../../services/classification-def
 import {WorkbasketDefinitionService} from '../../services/workbasket-definition/workbasket-definition.service';
 import {AlertService} from '../../services/alert/alert.service';
 import {HttpClientModule} from '@angular/common/http';
-import {DomainService} from '../../services/domains/domain.service';
+import {DomainService} from 'app/services/domain/domain.service';
 import {Observable} from 'rxjs/Observable';
 import {ErrorModalService} from '../../services/errorModal/error-modal.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 describe('ImportExportComponent', () => {
   let component: ImportExportComponent;
@@ -19,7 +20,10 @@ describe('ImportExportComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ImportExportComponent],
       imports: [HttpClientModule],
-      providers: [WorkbasketService, ClassificationDefinitionService, WorkbasketDefinitionService, AlertService, DomainService,
+      providers: [WorkbasketService, ClassificationDefinitionService, WorkbasketDefinitionService, AlertService,  {
+        provide: DomainService,
+        useClass: DomainServiceMock
+      },
         ErrorModalService]
     })
       .compileComponents();

web/src/app/shared/import-export/import-export.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ClassificationDefinitionService } from 'app/services/classification-definition/classification-definition.service';
 import { WorkbasketDefinitionService } from 'app/services/workbasket-definition/workbasket-definition.service';
-import { DomainService } from 'app/services/domains/domain.service';
+import { DomainService } from 'app/services/domain/domain.service';
 import { ImportType } from 'app/models/import-type';
 
 @Component({

web/src/app/shared/nav-bar/nav-bar.component.html

@@ -1,31 +1,52 @@
 <nav class="navbar navbar-fixed-top">
   <div class="navbar no-border-radius navbar-inverse no-gutter col-xs-12">
-    <div class="col-xs-2 col-md-5">
+    <div class="pull-left col-sm-3 col-md-4">
       <button type="button" *ngIf="!showNavbar" class="btn btn-default navbar-toggle show pull-left" (click)="toogleNavBar();"
         aria-expanded="true" aria-controls="navbar">
         <span class="glyphicon glyphicon-arrow-right white"></span>
       </button>
       <span>&nbsp;</span>
     </div>
-    <div class="col-xs-1"></div>
+    <div class="col-xs-6 col-sm-5 col-md-4">
-    <div class="col-xs-9 col-md-7">
       <ul class="nav logo">
-        <svg-icon class="logo white" src="./assets/icons/logo.svg"></svg-icon>
+        <svg-icon class="logo white hidden-xs" src="./assets/icons/logo.svg"></svg-icon>
         <p class="navbar-brand no-margin">
-            <a [href]="adminUrl">{{title}}</a>
+          <a [href]="adminUrl">{{title}}</a>
-          </p>
+        </p>
       </ul>
     </div>
-  </div>
+    <div class="pull-right domain-form">
-  <div [@toggle]="showNavbar" *ngIf="showNavbar" class="navbar-inverse sidenav full-height col-xs-6 col-md-3" data-html="false"
+      <div class="dropdown clearfix btn-group">
-    aria-expanded="true">
+        <label class="control-label hidden-xs">Working on </label>
-    <div class="col-xs-12">
+        <button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-      <div class="row">
+          {{selectedDomain}}
-        <button type="button" *ngIf="showNavbar" class="btn btn-default navbar-toggle show pull-right" (click)="toogleNavBar();"
+          <span class="caret"></span>
-          aria-expanded="true" aria-controls="navbar">
-          <span class="glyphicon glyphicon-arrow-left white"></span>
         </button>
+        <ul class="dropdown-menu dropdown-menu" aria-labelledby="dropdownMenu">
+          <li>
+            <a *ngFor="let domain of domains" (click)="selectDomain(domain)">
+              {{domain}}
+            </a>
+          </li>
+        </ul>
       </div>
+    </div>
+  </div>
+  <div [@toggle]="showNavbar" *ngIf="showNavbar" class="navbar-inverse sidenav full-height col-xs-9 col-sm-3" data-html="false"
+    aria-expanded="true">
+    <div class="row">
+      <ul class="nav">
+        <svg-icon class="logo white  logo visible-xs" src="./assets/icons/logo.svg"></svg-icon>
+        <p class="navbar-brand  logo visible-xs">
+          <a [href]="adminUrl">{{title}}</a>
+        </p>
+        <button type="button" *ngIf="showNavbar" class="btn btn-default navbar-toggle show pull-right" (click)="toogleNavBar();"
+        aria-expanded="true" aria-controls="navbar">
+        <span class="glyphicon glyphicon-arrow-left white"></span>
+      </button>
+      </ul>
+    </div>
+    <div class="nav-content">
       <div class="row menu">
         <span routerLink="administration/workbaskets" aria-controls="administration" routerLinkActive="active">Administration</span>
         <div class="row submenu" [ngClass]="{'selected': selectedRoute.indexOf('workbaskets') !== -1}">

web/src/app/shared/nav-bar/nav-bar.component.scss

@@ -1,10 +1,20 @@
 $background-color: #224562;
 $background-color-sidenav: #263847;
+$selected-border-color: #22a39f;
 .navbar-inverse {
     border:none;
     background-color: $background-color;
 }
 
+.navbar-toggle{
+    margin-right: 0px;
+}
+ul.nav > p {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    padding-right: 0px;
+}
+
 .navbar-inverse .navbar-toggle, .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
     border: none;
     background-color: transparent;
@@ -25,6 +35,7 @@ p.navbar-brand >a{
     vertical-align: middle;
     text-decoration: none;
     color: #9d9d9d;
+    font-size: 20px;
     &:hover {
         color: white;
     }
@@ -39,6 +50,29 @@ p.navbar-brand >a{
     z-index: 990;
 
 }
+
+.domain-form {
+    margin: 13px;
+    color: white;
+    font-size: 18px;
+    > div{
+        cursor: pointer;
+        > button {
+            color: white;
+            background-color: $background-color;
+            border: none;
+            font-size: 16px;
+            border-bottom: 1px solid grey;
+            margin-left:5px;
+        }
+    }
+}
+
+
+.nav-content{
+    margin-top: 25px;
+    margin-left: 8px;
+}
  
 /*
  * All side bar links styling.
@@ -64,9 +98,6 @@ p.navbar-brand >a{
     box-shadow: none;
     height: 100%;
     background-color: $background-color-sidenav;
-    &> div {
-        margin-bottom: 20px;
-    }
 }
 
 .navbar {
@@ -92,7 +123,7 @@ p.navbar-brand >a{
     background-color: transparent;
      &> span{
         padding-left: 10px;
-        border-left: #22a39f 5px solid;
+        border-left: $selected-border-color 5px solid;
         
         color: white;
     }

web/src/app/shared/nav-bar/nav-bar.component.spec.ts

@@ -6,6 +6,8 @@ import { HttpClientModule } from '@angular/common/http';
 import { NavBarComponent } from './nav-bar.component';
 
 import { SelectedRouteService } from 'app/services/selected-route/selected-route';
+import { DomainService } from 'app/services/domain/domain.service';
+import { DomainServiceMock } from 'app/services/domain/domain.service.mock';
 
 describe('NavBarComponent', () => {
   let component: NavBarComponent;
@@ -24,7 +26,10 @@ describe('NavBarComponent', () => {
         HttpClientModule,
         RouterTestingModule.withRoutes(routes),
       ],
-      providers: [SelectedRouteService]
+      providers: [SelectedRouteService, {
+        provide: DomainService,
+        useClass: DomainServiceMock
+      }]
     })
       .compileComponents();
   }));

web/src/app/shared/nav-bar/nav-bar.component.ts

@@ -3,6 +3,7 @@ import { environment } from 'environments/environment';
 import { SelectedRouteService } from 'app/services/selected-route/selected-route';
 import { Subscription } from 'rxjs/Subscription';
 import { trigger, state, style, transition, keyframes, animate } from '@angular/animations';
+import { DomainService } from 'app/services/domain/domain.service';
 
 @Component({
   selector: 'taskana-nav-bar',
@@ -27,27 +28,41 @@ export class NavBarComponent implements OnInit, OnDestroy {
   route: string;
   title = 'Taskana administration';
   showNavbar = false;
+  domains: Array<string> = [];
+  selectedDomain: string;
 
   adminUrl: string = environment.taskanaAdminUrl;
   monitorUrl: string = environment.taskanaMonitorUrl;
   workplaceUrl: string = environment.taskanaWorkplaceUrl;
 
-  selectedRouteSubscription: Subscription
+  selectedRouteSubscription: Subscription;
 
-  constructor(private selectedRouteService: SelectedRouteService) { }
+  constructor(
+    private selectedRouteService: SelectedRouteService,
+    private domainService: DomainService) { }
 
   ngOnInit() {
     this.selectedRouteSubscription = this.selectedRouteService.getSelectedRoute().subscribe((value: string) => {
       this.selectedRoute = value;
-    })
+    });
+    this.domainService.getDomains().subscribe(domains => {
+      this.domains = domains;
+    });
+
+    this.domainService.getSelectedDomain().subscribe(domain => {
+      this.selectedDomain = domain;
+    });
   }
 
-  ngOnDestroy(): void {
+  selectDomain(domain) {
-    if (this.selectedRouteSubscription) { this.selectedRouteSubscription.unsubscribe(); }
+    this.domainService.selectDomain(domain);
   }
 
   toogleNavBar() {
     this.showNavbar = !this.showNavbar;
   }
 
+  ngOnDestroy(): void {
+    if (this.selectedRouteSubscription) { this.selectedRouteSubscription.unsubscribe(); }
+  }
 }

web/src/assets/_tree.scss

@@ -59,12 +59,12 @@ tree-node-collection > div > tree-node > .tree-node {
         }
     }
 }
-
+/*
 .node-content-wrapper-focused {
     background: none;
     box-shadow: none;
 }
-
+*/
   
 /* START Children branch lines*/
   .node-content-wrapper::before {

web/src/test.ts

@@ -11,6 +11,7 @@ import {
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
+import 'rxjs/Rx';
 
 // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
 declare var __karma__: any;