From 493e25b56598b23a620769fb465543b5f3c6e614 Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Mon, 18 May 2020 01:23:42 +0200
Subject: [PATCH] TSK-1214: refactored taskana-classification

TSK-1214 Trying to make drag'n drop in tree possible

TSK-1214 Removed refreshClassification output from tree

TSK-1214 New action in store updates a classification and refetches all, saving now correctly refreshes the classification-list

TSK-1214 Fixed tests in tree component

TSK-1214 Removed tree service and corresponding test in class-details

TSK-1214 fixed issues in tree where multiple actions to store are fired incorrectly

TSK-1214 added accessibility action, use space to select a tree node

TSK-1214 swapped space and enter in tree component, cleaned code

TSK-1214 fixed bug where page isn't updated dynamically according to browser path

TSK-1214 workaround circular dependency.

service uses snapshot of store, does not actually access the state in store

TSK-1214 fixed eslint. TODO: circular dependency between classification.service and classification.state

TSK-1214 changed first() to take(1) to fix Observable dying during test

TSK-1214 fixed test cases and lint issues

TSK-1214 fixed circular dependency

TSK-1214 devmode = false

TSK-1214: fixed merge problems with notificationService and removed some warnings

TSK-1214: fixed merge problems with notificationService

TSK-1214 remove wrong imports from before merge
---
 .../src/main/resources/application.properties |   2 +-
 .../administration-routing.module.ts          |  10 +-
 .../administration/administration.module.ts   |   4 +-
 .../classification-details.component.html     |  48 ++--
 .../classification-details.component.scss     |   3 +
 .../classification-details.component.spec.ts  |  38 +--
 .../classification-details.component.ts       | 233 ++++++------------
 .../classification-list.component.html        |  38 +--
 .../classification-list.component.spec.ts     |   5 +-
 .../classification-list.component.ts          | 161 ++++++------
 .../classification-overview.component.html    |  17 ++
 .../classification-overview.component.scss    |   0
 .../classification-overview.component.spec.ts |  52 ++++
 .../classification-overview.component.ts      |  57 +++++
 .../workbasket-access-items.component.ts      |   2 +-
 .../workbasket-details.component.ts           |   2 +-
 ...rkbasket-distribution-targets.component.ts |   2 +-
 .../workbasket-information.component.ts       |   2 +-
 web/src/app/app.module.ts                     |   3 -
 .../components/spinner/spinner.component.ts   |   5 +-
 .../components/tree/tree.component.html       |   2 +-
 .../components/tree/tree.component.spec.ts    |  83 ++++---
 .../shared/components/tree/tree.component.ts  | 118 +++++----
 web/src/app/shared/models/action.ts           |   4 +-
 .../models/classification-definition.ts       |   6 +-
 .../shared/models/classification-resource.ts  |   2 +-
 web/src/app/shared/models/classification.ts   |   6 +-
 web/src/app/shared/models/notifications.ts    |   4 +-
 web/src/app/shared/models/tree-node.ts        |   6 +-
 .../shared/models/workbasket-definition.ts    |   6 +-
 .../classifications.service.ts                |  55 ++---
 .../app/shared/services/tree/tree.service.ts  |  15 --
 .../classification.actions.ts                 |  54 +++-
 .../classification.selectors.ts               |  22 ++
 .../classification.state.ts                   | 155 +++++++++++-
 .../components/task/task.component.ts         |   4 +-
 web/tsconfig.json                             |   2 +-
 37 files changed, 727 insertions(+), 501 deletions(-)
 create mode 100644 web/src/app/administration/components/classification-overview/classification-overview.component.html
 create mode 100644 web/src/app/administration/components/classification-overview/classification-overview.component.scss
 create mode 100644 web/src/app/administration/components/classification-overview/classification-overview.component.spec.ts
 create mode 100644 web/src/app/administration/components/classification-overview/classification-overview.component.ts
 delete mode 100644 web/src/app/shared/services/tree/tree.service.ts

diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties
index a8b493b1a..b0722d19c 100644
--- a/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties
+++ b/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties
@@ -23,7 +23,7 @@ taskana.schemaName=TASKANA
 ########spring.jpa.generate-ddl=true
 ########spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 ####### property that control rest api security deploy use true for no security.
-devMode=false
+devMode=true
 
 ####### property that control if the database is cleaned and sample data is generated
 generateSampleData=true
diff --git a/web/src/app/administration/administration-routing.module.ts b/web/src/app/administration/administration-routing.module.ts
index 8637829b2..f895f7c16 100644
--- a/web/src/app/administration/administration-routing.module.ts
+++ b/web/src/app/administration/administration-routing.module.ts
@@ -8,6 +8,7 @@ import { ClassificationListComponent } from 'app/administration/components/class
 import { ClassificationDetailsComponent } from 'app/administration/components/classification-details/classification-details.component';
 import { DomainGuard } from 'app/shared/guards/domain.guard';
 import { AccessItemsManagementComponent } from './components/access-items-management/access-items-management.component';
+import { ClassificationOverviewComponent } from './components/classification-overview/classification-overview.component';
 
 const routes: Routes = [
   {
@@ -38,17 +39,17 @@ const routes: Routes = [
   },
   {
     path: 'classifications',
-    component: MasterAndDetailComponent,
+    component: ClassificationOverviewComponent,
     canActivate: [DomainGuard],
     children: [
       {
         path: '',
-        component: ClassificationListComponent,
+        component: ClassificationOverviewComponent,
         outlet: 'master'
       },
       {
         path: ':id',
-        component: ClassificationDetailsComponent,
+        component: ClassificationOverviewComponent,
         outlet: 'detail'
       },
       {
@@ -83,4 +84,5 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class AdministrationRoutingModule {}
+export class AdministrationRoutingModule {
+}
diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts
index 13c9bc7a3..0cde5f73c 100644
--- a/web/src/app/administration/administration.module.ts
+++ b/web/src/app/administration/administration.module.ts
@@ -32,6 +32,7 @@ import { SavingWorkbasketService } from './services/saving-workbaskets.service';
 import { ClassificationDefinitionService } from './services/classification-definition.service';
 import { WorkbasketDefinitionService } from './services/workbasket-definition.service';
 import { ImportExportService } from './services/import-export.service';
+import { ClassificationOverviewComponent } from './components/classification-overview/classification-overview.component';
 
 const MODULES = [
   CommonModule,
@@ -53,10 +54,11 @@ const DECLARATIONS = [
   WorkbasketInformationComponent,
   WorkbasketDistributionTargetsComponent,
   WorkbasketDualListComponent,
+  ClassificationOverviewComponent,
   ClassificationListComponent,
-  ImportExportComponent,
   ClassificationTypesSelectorComponent,
   ClassificationDetailsComponent,
+  ImportExportComponent,
   AccessItemsManagementComponent
 ];
 
diff --git a/web/src/app/administration/components/classification-details/classification-details.component.html b/web/src/app/administration/components/classification-details/classification-details.component.html
index 815de9d69..df3e6ba99 100644
--- a/web/src/app/administration/components/classification-details/classification-details.component.html
+++ b/web/src/app/administration/components/classification-details/classification-details.component.html
@@ -1,48 +1,43 @@
 <div class="container-scrollable">
   <taskana-spinner [isRunning]="requestInProgress" class="floating" (spinnerIsRunning)="spinnerRunning($event)"></taskana-spinner>
   <div id="classification-details" *ngIf="classification && !spinnerIsRunning">
-    <ul class="nav nav-tabs" role="tablist">
-      <li *ngIf="showDetail" class="visible-xs visible-sm hidden">
-        <a (click)="backClicked()">
-          <span class="material-icons md-20 blue">arrow_back</span>
-        </a>
-      </li>
-    </ul>
     <div id="classification" class="panel panel-default classification">
+
+      <!-- TITLE + ACTION BUTTONS -->
       <div class="panel-heading">
-        <div *ngIf="showDetail" class="pull-left btn-group align-header">
-          <button (click)="backClicked()" class="btn btn-default no-style blue visible-xs visible-sm hidden">
-            <span class="material-icons md-20 blue">arrow_back</span>
-          </button>
-        </div>
         <div class="pull-right btn-group">
           <button type="button" (click)="onSubmit()" class="btn btn-default btn-primary" data-toggle="tooltip" title="Save">
             <span class="material-icons md-20">save</span>
           </button>
-          <button type="button" (click)="onClear()" class="btn btn-default" data-toggle="tooltip" title="Undo Changes">
-            <span class="material-icons md-20 blue">undo</span>
+          <button type="button" (click)="onRestore()" class="btn btn-default" data-toggle="tooltip" title="Restore Previous Version">
+            <span class="material-icons md-20 blue">restore</span>
           </button>
           <button type="button" (click)="removeClassification()" data-toggle="tooltip" title="Delete" class="btn btn-default">
             <span class="material-icons md-20 red">delete</span>
           </button>
         </div>
         <h4 class="panel-header">{{classification.name}}&nbsp; [{{classification.type}}]
-          <span *ngIf="action=== 'CREATE'" class="badge warning"> {{badgeMessage}}</span>
+          <span *ngIf="action=== 0" class="badge warning"> {{badgeMessage}}</span>
         </h4>
       </div>
+
+      <!-- DETAILED FIELDS -->
       <div class="panel-body" style="padding: 0">
         <form #ClassificationForm="ngForm">
           <div class="row" style="padding: 15px">
-
             <div class="col-md-6">
+
+              <!-- KEY -->
               <div class="form-group required">
                 <label for="classification-key" class="control-label">Key</label>
-                <input type="text" required #key="ngModel" [disabled]="action!== 'CREATE'? true : false" class="form-control"
-                  id="classification-key" placeholder="Key" [(ngModel)]="classification.key" name="classification.key">
-                <taskana-field-error-display *ngIf="action === 'CREATE'" [displayError]="!isFieldValid('classification.key')"
+                <input type="text" required #key="ngModel" [disabled]="action!== 0" class="form-control"
+                       id="classification-key" placeholder="Key" [(ngModel)]="classification.key" name="classification.key">
+                <taskana-field-error-display *ngIf="action === 0" [displayError]="!isFieldValid('classification.key')"
                   [validationTrigger]="this.toogleValidationMap.get('classification.key')" errorMessage="* Key is required">
                 </taskana-field-error-display>
               </div>
+
+              <!-- NAME -->
               <div class="form-group required">
                 <label for="classification-name" class="control-label">Name</label>
                 <input type="text" required #name="ngModel" class="form-control" id="classification-name" placeholder="Name"
@@ -51,11 +46,12 @@
                   errorMessage="* Name is required">
                 </taskana-field-error-display>
               </div>
+
+              <!-- DOMAIN -->
               <div class="form-group">
                 <label for="classification-domain" class="control-label">Domain</label>
                 <input type="text" disabled #domain="ngModel" class="form-control" id="classification-domain"
                   placeholder="Domain" [(ngModel)]="classification.domain" name="classification.domain">
-
                 <a *ngIf="!masterDomainSelected()" (click)="validChanged()">
                   <label>
                     <b>Valid in Domain:</b>
@@ -64,6 +60,8 @@
                   </label>
                 </a>
               </div>
+
+              <!-- PRIORITY AND CATEGORY -->
               <div class="row">
                 <div class="form-group required col-xs-6">
                   <label for="classification-priority" class="control-label">Priority</label>
@@ -100,16 +98,22 @@
               </div>
             </div>
             <div class="col-md-6">
+
+              <!-- SERVICE LEVEL -->
               <div class="form-group">
                 <label for="classification-service-level" class="control-label">Service Level</label>
                 <input type="text" class="form-control" id="classification-service-level" placeholder="Service Level"
                   [(ngModel)]="classification.serviceLevel" name="classification.serviceLevel">
               </div>
+
+              <!-- APPLICATION ENTRY POINT -->
               <div class="form-group">
                 <label for="classification-application-entry-point" class="control-label">Application entry point</label>
                 <input type="text" class="form-control" id="classification-application-entry-point" placeholder="Application entry point"
                   [(ngModel)]="classification.applicationEntryPoint" name="classification.applicationEntryPoint">
               </div>
+
+              <!-- DESCRIPTION -->
               <div class="form-group">
                 <label for="classification-description" class="control-label">Description</label>
                 <textarea class="form-control" rows="5" id="classification-description" placeholder="Description"
@@ -118,17 +122,15 @@
             </div>
           </div>
 
+          <!-- CUSTOM FIELDS -->
           <div class="row custom-field-row">
-
             <div class="custom-classification-form" *ngFor="let customField of (customFields$ | async), let i = index"
                  style="width: 50%;">
-
               <div *ngIf="customField.visible" class="form-group custom-field-wrapper">
                 <label for="classification-custom-{{i + 1}}" class="control-label">{{customField.field}}</label>
                 <input type="text" class="form-control" id="classification-custom-{{i + 1}}" placeholder="{{customField.field}}"
                   [(ngModel)]="classification[getClassificationCustom(i + 1)]" name="classification.custom{{i + 1}}">
               </div>
-
             </div>
           </div>
         </form>
diff --git a/web/src/app/administration/components/classification-details/classification-details.component.scss b/web/src/app/administration/components/classification-details/classification-details.component.scss
index cc6d96c2b..1d6f1f554 100644
--- a/web/src/app/administration/components/classification-details/classification-details.component.scss
+++ b/web/src/app/administration/components/classification-details/classification-details.component.scss
@@ -11,3 +11,6 @@
   height: 70px;
   padding: 0 15px
 }
+.dropdown-menu > li {
+  cursor: pointer;
+}
diff --git a/web/src/app/administration/components/classification-details/classification-details.component.spec.ts b/web/src/app/administration/components/classification-details/classification-details.component.spec.ts
index ba0d75f9d..27bf69e04 100644
--- a/web/src/app/administration/components/classification-details/classification-details.component.spec.ts
+++ b/web/src/app/administration/components/classification-details/classification-details.component.spec.ts
@@ -1,13 +1,12 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
-import { Routes } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
 import { Component } from '@angular/core';
 import { of } from 'rxjs';
 import { AngularSvgIconModule } from 'angular-svg-icon';
 import { configureTests } from 'app/app.test.configuration';
 import { NgxsModule, Store } from '@ngxs/store';
+import { Location } from '@angular/common';
 
 
 import { ClassificationDefinition } from 'app/shared/models/classification-definition';
@@ -17,15 +16,11 @@ import { MasterAndDetailService } from 'app/shared/services/master-and-detail/ma
 import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
 import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
 import { TreeNodeModel } from 'app/shared/models/tree-node';
-import { TreeService } from 'app/shared/services/tree/tree.service';
 import { ImportExportService } from 'app/administration/services/import-export.service';
 import { EngineConfigurationSelectors } from 'app/shared/store/engine-configuration-store/engine-configuration.selectors';
 import { ClassificationSelectors } from 'app/shared/store/classification-store/classification.selectors';
-import { dispatchKeyboardEvent } from '@angular/cdk/testing';
-import { TabDirective } from 'ngx-bootstrap';
-import { KEYS } from 'angular-tree-component';
-import { NotificationService } from '../../../shared/services/notifications/notification.service';
 import { ClassificationDetailsComponent } from './classification-details.component';
+import { NotificationService } from '../../../shared/services/notifications/notification.service';
 
 
 @Component({
@@ -35,26 +30,25 @@ import { ClassificationDetailsComponent } from './classification-details.compone
 class DummyDetailComponent {
 }
 
-const routes: Routes = [
-  { path: 'taskana/administration/classifications', component: DummyDetailComponent }
-];
-
 describe('ClassificationDetailsComponent', () => {
   let component: ClassificationDetailsComponent;
   let fixture: ComponentFixture<ClassificationDetailsComponent>;
   const treeNodes: Array<TreeNodeModel> = new Array(new TreeNodeModel());
 
   let classificationsService;
-  let treeService;
+  let removeConfirmationService;
 
-  const storeSpy: jasmine.SpyObj<Store> = jasmine.createSpyObj('Store', ['select']);
+  const locationSpy: jasmine.SpyObj<Location> = jasmine.createSpyObj('Location', ['go']);
+  const storeSpy: jasmine.SpyObj<Store> = jasmine.createSpyObj('Store', ['select', 'dispatch']);
   const configure = (testBed: TestBed) => {
     testBed.configureTestingModule({
-      imports: [FormsModule, HttpClientModule, RouterTestingModule.withRoutes(routes), AngularSvgIconModule, NgxsModule.forRoot()],
+      imports: [FormsModule, HttpClientModule, AngularSvgIconModule, NgxsModule.forRoot()],
       declarations: [ClassificationDetailsComponent, DummyDetailComponent],
       providers: [MasterAndDetailService, RequestInProgressService, ClassificationsService,
         HttpClient, NotificationService,
-        TreeService, ImportExportService, { provide: Store, useValue: storeSpy }]
+        ImportExportService,
+        { provide: Location, useValue: locationSpy },
+        { provide: Store, useValue: storeSpy }]
     });
   };
 
@@ -71,6 +65,7 @@ describe('ClassificationDetailsComponent', () => {
         }
       });
 
+
       fixture = testBed.createComponent(ClassificationDetailsComponent);
 
       component = fixture.componentInstance;
@@ -79,7 +74,6 @@ describe('ClassificationDetailsComponent', () => {
       spyOn(classificationsService, 'deleteClassification').and.returnValue(of(true));
       component.classification = new ClassificationDefinition('id1');
       component.classification._links = new LinksClassification({ self: '' });
-      treeService = testBed.get(TreeService);
       fixture.detectChanges();
       done();
     });
@@ -89,16 +83,4 @@ describe('ClassificationDetailsComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-
-  it('should trigger treeService remove node id after removing a node', done => {
-    const treeServiceSpy = spyOn(treeService, 'setRemovedNodeId');
-    const ref = component.removeClassification();
-    ref.afterOpened().subscribe(() => {
-      ref.close(ref.componentInstance.callback);
-    });
-    ref.afterClosed().subscribe(() => {
-      expect(treeServiceSpy).toHaveBeenCalledWith('id1');
-      done();
-    });
-  });
 });
diff --git a/web/src/app/administration/components/classification-details/classification-details.component.ts b/web/src/app/administration/components/classification-details/classification-details.component.ts
index 327710383..ea83e55bb 100644
--- a/web/src/app/administration/components/classification-details/classification-details.component.ts
+++ b/web/src/app/administration/components/classification-details/classification-details.component.ts
@@ -1,34 +1,35 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { Select, Store } from '@ngxs/store';
-import { Observable, Subscription, zip } from 'rxjs';
+import { Observable, Subject, zip } from 'rxjs';
 
-import { ClassificationDefinition, customFieldCount } from 'app/shared/models/classification-definition';
+import { ClassificationDefinition,
+  customFieldCount } from 'app/shared/models/classification-definition';
 import { ACTION } from 'app/shared/models/action';
 
 import { highlight } from 'theme/animations/validation.animation';
 import { TaskanaDate } from 'app/shared/util/taskana.date';
 
 import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
-import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service';
 import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
-import { TreeService } from 'app/shared/services/tree/tree.service';
 
 import { DomainService } from 'app/shared/services/domain/domain.service';
 import { Pair } from 'app/shared/models/pair';
 import { NgForm } from '@angular/forms';
 import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service';
 import { ImportExportService } from 'app/administration/services/import-export.service';
-import { map, take } from 'rxjs/operators';
+import { map, take, takeUntil } from 'rxjs/operators';
 import { EngineConfigurationSelectors } from 'app/shared/store/engine-configuration-store/engine-configuration.selectors';
 import { ClassificationSelectors } from 'app/shared/store/classification-store/classification.selectors';
-import { MatDialogRef } from '@angular/material/dialog';
+import { Location } from '@angular/common';
 import { NOTIFICATION_TYPES } from '../../../shared/models/notifications';
 import { NotificationService } from '../../../shared/services/notifications/notification.service';
 import { ClassificationCategoryImages,
   CustomField,
   getCustomFields } from '../../../shared/models/customisation';
-import { DialogPopUpComponent } from '../../../shared/components/popup/dialog-pop-up.component';
+
+import { CreateClassification,
+  RestoreSelectedClassification,
+  SaveClassification } from '../../../shared/store/classification-store/classification.actions';
 
 @Component({
   selector: 'taskana-classification-details',
@@ -38,42 +39,33 @@ import { DialogPopUpComponent } from '../../../shared/components/popup/dialog-po
 })
 export class ClassificationDetailsComponent implements OnInit, OnDestroy {
   classification: ClassificationDefinition;
-  classificationClone: ClassificationDefinition;
-  classificationCategories: string[];
-  showDetail = false;
   badgeMessage = '';
   requestInProgress = false;
   @Select(ClassificationSelectors.selectCategories) categories$: Observable<string[]>;
   @Select(EngineConfigurationSelectors.selectCategoryIcons) categoryIcons$: Observable<ClassificationCategoryImages>;
   @Select(ClassificationSelectors.selectedClassificationType) selectedClassificationType$: Observable<string>;
   @Select(ClassificationSelectors.selectClassificationTypesObject) classificationTypes$: Observable<Object>;
+  @Select(ClassificationSelectors.selectedClassification) selectedClassification$: Observable<ClassificationDefinition>;
+  @Select(ClassificationSelectors.activeAction) action$: Observable<ACTION>;
 
   spinnerIsRunning = false;
   customFields$: Observable<CustomField[]>;
 
   @ViewChild('ClassificationForm', { static: false }) classificationForm: NgForm;
   toogleValidationMap = new Map<string, boolean>();
-  private action: any;
-  private classificationServiceSubscription: Subscription;
-  private classificationSelectedSubscription: Subscription;
-  private routeSubscription: Subscription;
-  private masterAndDetailSubscription: Subscription;
-  private classificationSavingSubscription: Subscription;
-  private classificationRemoveSubscription: Subscription;
-  private domainSubscription: Subscription;
-  private importingExportingSubscription: Subscription;
+  action: ACTION;
+  destroy$ = new Subject<void>();
 
-  constructor(private classificationsService: ClassificationsService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private masterAndDetailService: MasterAndDetailService,
+  constructor(
+    private classificationsService: ClassificationsService,
+    private location: Location,
     private requestInProgressService: RequestInProgressService,
-    private treeService: TreeService,
     private domainService: DomainService,
     private formsValidatorService: FormsValidatorService,
-    private notificationService: NotificationService,
+    private notificationsService: NotificationService,
     private importExportService: ImportExportService,
-    private store: Store) {
+    private store: Store
+  ) {
   }
 
   ngOnInit() {
@@ -81,57 +73,34 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
       map(customisation => customisation.information),
       getCustomFields(customFieldCount)
     );
-    this.classificationSelectedSubscription = this.classificationsService.getSelectedClassification()
-      .subscribe(classificationSelected => {
-        if (classificationSelected && this.classification
-          && this.classification.classificationId === classificationSelected.classificationId) {
-          return;
-        }
-        this.initProperties();
-        if (classificationSelected) {
-          this.fillClassificationInformation(classificationSelected);
-        }
-      });
-
-    this.routeSubscription = this.route.params.subscribe(params => {
-      let { id } = params;
-      delete this.action;
-      if (id && id.indexOf('new-classification') !== -1) {
-        this.action = ACTION.CREATE;
+    this.selectedClassification$.pipe(takeUntil(this.destroy$)).subscribe(data => {
+      this.fillClassificationInformation(data);
+    });
+    this.action$.pipe(takeUntil(this.destroy$)).subscribe(data => {
+      this.action = data;
+      if (this.action === ACTION.CREATE) {
+        this.initClassificationOnCreation();
         this.badgeMessage = 'Creating new classification';
-        id = id.replace('new-classification/', '');
-        if (id === 'undefined') {
-          id = '';
-        }
-        this.fillClassificationInformation(this.classification ? this.classification : new ClassificationDefinition());
-      }
-
-      if (!this.classification || (this.classification.classificationId !== id && id)) {
-        this.selectClassification(id);
+      } else {
+        this.badgeMessage = '';
       }
     });
 
-    this.masterAndDetailSubscription = this.masterAndDetailService.getShowDetail().subscribe(showDetail => {
-      this.showDetail = showDetail;
-    });
-
-    this.importingExportingSubscription = this.importExportService.getImportingFinished().subscribe((value: Boolean) => {
+    this.importExportService.getImportingFinished().pipe(takeUntil(this.destroy$)).subscribe(() => {
       if (this.classification.classificationId) {
         this.selectClassification(this.classification.classificationId);
       }
     });
   }
 
+
   backClicked(): void {
-    this.classificationsService.selectClassification();
-    this.router.navigate(['./'], { relativeTo: this.route.parent });
+    this.location.go(this.location.path().replace(/(classifications).*/g, 'classifications'));
   }
 
-  removeClassification(): MatDialogRef<DialogPopUpComponent> {
-    return this.notificationService.showDialog(
-      `You are going to delete classification: ${this.classification.key}. Can you confirm this action?`,
-      this.removeClassificationConfirmation.bind(this)
-    );
+  removeClassification() {
+    this.notificationsService.showDialog(`You are going to delete classification: ${this.classification.key}. Can you confirm this action?`,
+      this.removeClassificationConfirmation.bind(this));
   }
 
   isFieldValid(field: string): boolean {
@@ -147,10 +116,18 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
     });
   }
 
-  onClear() {
+  onRestore() {
     this.formsValidatorService.formSubmitAttempt = false;
-    this.notificationService.showToast(NOTIFICATION_TYPES.INFO_ALERT);
-    this.classification = { ...this.classificationClone };
+    if (this.action === ACTION.CREATE) {
+      this.classification = new ClassificationDefinition();
+      this.notificationsService.showToast(NOTIFICATION_TYPES.INFO_ALERT);
+    } else {
+      this.store.dispatch(
+        new RestoreSelectedClassification(this.classification.classificationId)
+      ).pipe(take(1)).subscribe(ctx => {
+        this.notificationsService.showToast(NOTIFICATION_TYPES.INFO_ALERT);
+      });
+    }
   }
 
   selectCategory(category: string) {
@@ -177,41 +154,31 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
     return this.domainService.getSelectedDomainValue() === '';
   }
 
-  private initProperties() {
-    delete this.classification;
-    delete this.action;
-  }
-
   private async onSave() {
     this.requestInProgressService.setRequestInProgress(true);
     if (this.action === ACTION.CREATE) {
-      this.classificationSavingSubscription = this.classificationsService.postClassification(this.classification)
-        .subscribe((classification: ClassificationDefinition) => {
-          this.classification = classification;
-          this.classificationsService.selectClassification(classification);
-          this.notificationService.showToast(
-            NOTIFICATION_TYPES.SUCCESS_ALERT_2,
-            new Map<string, string>([['classificationKey', classification.key]])
-          );
-          this.afterRequest();
-        },
-        error => {
-          this.notificationService.triggerError(NOTIFICATION_TYPES.CREATE_ERR, error);
-          this.afterRequest();
-        });
+      this.store.dispatch(
+        new CreateClassification(this.classification)
+      ).pipe(take(1)).subscribe(store => {
+        this.notificationsService.showToast(
+          NOTIFICATION_TYPES.SUCCESS_ALERT_2,
+          new Map<string, string>([['classificationKey', store.classification.selectedClassification.key]])
+        );
+        this.afterRequest();
+      }, error => {
+        this.notificationsService.triggerError(NOTIFICATION_TYPES.CREATE_ERR, error);
+        this.afterRequest();
+      });
     } else {
       try {
-        this.classification = (<ClassificationDefinition> await this.classificationsService.putClassification(
-          this.classification._links.self.href, this.classification
-        ));
+        this.store.dispatch(new SaveClassification(this.classification));
         this.afterRequest();
-        this.notificationService.showToast(
+        this.notificationsService.showToast(
           NOTIFICATION_TYPES.SUCCESS_ALERT_3,
           new Map<string, string>([['classificationKey', this.classification.key]])
         );
-        this.cloneClassification(this.classification);
       } catch (error) {
-        this.notificationService.triggerError(NOTIFICATION_TYPES.SAVE_ERR, error);
+        this.notificationsService.triggerError(NOTIFICATION_TYPES.SAVE_ERR, error);
         this.afterRequest();
       }
     }
@@ -225,9 +192,8 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
   private async selectClassification(id: string) {
     if (!this.classificationIsAlreadySelected()) {
       this.requestInProgress = true;
-      const classification = await this.classificationsService.getClassification(id);
+      const classification = await this.classificationsService.getClassification(id).toPromise();
       this.fillClassificationInformation(classification);
-      this.classificationsService.selectClassification(classification);
       this.requestInProgress = false;
     }
   }
@@ -237,13 +203,7 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
   }
 
   private fillClassificationInformation(classificationSelected: ClassificationDefinition) {
-    if (this.action === ACTION.CREATE) { // CREATE
-      this.initClassificationOnCreation(classificationSelected);
-    } else {
-      this.classification = classificationSelected;
-      this.cloneClassification(classificationSelected);
-      this.checkDomainAndRedirect();
-    }
+    this.classification = { ...classificationSelected };
   }
 
   private addDateToClassification(classification: ClassificationDefinition) {
@@ -252,56 +212,29 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
     classification.modified = date;
   }
 
-  private initClassificationOnCreation(classificationSelected: ClassificationDefinition) {
+  private initClassificationOnCreation() {
     zip(this.categories$, this.selectedClassificationType$).pipe(take(1)).subscribe(([categories, selectedType]: [string[], string]) => {
       const tempClassification: ClassificationDefinition = new ClassificationDefinition();
-      // tempClassification.parentId = classificationSelected.classificationId;
-      // tempClassification.parentKey = classificationSelected.key;
       [tempClassification.category] = categories;
       tempClassification.domain = this.domainService.getSelectedDomainValue();
       tempClassification.type = selectedType;
       this.addDateToClassification(tempClassification);
       this.classification = tempClassification;
-      this.cloneClassification(this.classification);
-    });
-  }
-
-  private checkDomainAndRedirect() {
-    this.domainSubscription = this.domainService.getSelectedDomain().subscribe(domain => {
-      if (domain !== '' && this.classification && this.classification.domain !== domain) {
-        this.backClicked();
-      }
     });
   }
 
   private removeClassificationConfirmation() {
     if (!this.classification || !this.classification.classificationId) {
-      this.notificationService.triggerError(NOTIFICATION_TYPES.SELECT_ERR);
+      this.notificationsService.triggerError(NOTIFICATION_TYPES.SELECT_ERR);
       return;
     }
     this.requestInProgressService.setRequestInProgress(true);
-    this.treeService.setRemovedNodeId(this.classification.classificationId);
 
-    this.classificationRemoveSubscription = this.classificationsService
-      .deleteClassification(this.classification._links.self.href)
-      .subscribe(() => {
-        const { key } = this.classification;
-        delete this.classification;
-        this.afterRequest();
-        this.classificationsService.selectClassification();
-        this.router.navigate(['taskana/administration/classifications']);
-        this.notificationService.showToast(
-          NOTIFICATION_TYPES.SUCCESS_ALERT_4,
-          new Map<string, string>([['classificationKey', key]])
-        );
-      }, error => {
-        this.notificationService.triggerError(NOTIFICATION_TYPES.REMOVE_ERR, error);
-        this.afterRequest();
-      });
-  }
-
-  private cloneClassification(classification: ClassificationDefinition) {
-    this.classificationClone = { ...classification };
+    this.store.dispatch(new RemoveSelectedClassification()).pipe(take(1)).subscribe(() => {
+      this.notificationsService.showToast(NOTIFICATION_TYPES.SUCCESS_ALERT_4,
+        new Map<string, string>([['classificationKey', this.classification.key]]));
+      this.afterRequest();
+    });
   }
 
   getClassificationCustom(customNumber: number): string {
@@ -311,7 +244,7 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
   // TODO: Remove when classification is in store
   getAvailableCategories(type: string) {
     let returnCategories: string[] = [];
-    this.classificationTypes$.subscribe(classTypes => {
+    this.classificationTypes$.pipe(take(1)).subscribe(classTypes => {
       returnCategories = classTypes[type];
     });
 
@@ -319,29 +252,7 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    if (this.masterAndDetailSubscription) {
-      this.masterAndDetailSubscription.unsubscribe();
-    }
-    if (this.routeSubscription) {
-      this.routeSubscription.unsubscribe();
-    }
-    if (this.classificationSelectedSubscription) {
-      this.classificationSelectedSubscription.unsubscribe();
-    }
-    if (this.classificationServiceSubscription) {
-      this.classificationServiceSubscription.unsubscribe();
-    }
-    if (this.classificationSavingSubscription) {
-      this.classificationSavingSubscription.unsubscribe();
-    }
-    if (this.classificationRemoveSubscription) {
-      this.classificationRemoveSubscription.unsubscribe();
-    }
-    if (this.domainSubscription) {
-      this.domainSubscription.unsubscribe();
-    }
-    if (this.importingExportingSubscription) {
-      this.importingExportingSubscription.unsubscribe();
-    }
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 }
diff --git a/web/src/app/administration/components/classification-list/classification-list.component.html b/web/src/app/administration/components/classification-list/classification-list.component.html
index a39d0275f..90478a821 100644
--- a/web/src/app/administration/components/classification-list/classification-list.component.html
+++ b/web/src/app/administration/components/classification-list/classification-list.component.html
@@ -1,35 +1,43 @@
 <div class="classification-list-full-height">
-	<li id="wb-action-toolbar" class="list-group-item tab-align">
+
+	<!-- ACTION TOOLBAR -->
+	<li class="list-group-item tab-align" id="wb-action-toolbar">
 		<div class="row">
 			<div class="col-xs-6 btn-group">
-				<button type="button" (click)="addClassification()" data-toggle="tooltip" title="Add" class="btn btn-default">
+
+				<button class="btn btn-default" type="button" (click)="addClassification()" data-toggle="tooltip" title="Add">
 					<span class="material-icons md-20 green-blue">add_circle_outline</span>
 				</button>
-				<taskana-import-export-component class ="btn-group" [currentSelection]="selectionToImport">
+
+				<taskana-import-export-component
+						class ="btn-group" [currentSelection]="taskanaType.CLASSIFICATIONS">
 				</taskana-import-export-component>
 			</div>
 			<div class="col-xs-6">
-				<taskana-classification-types-selector class="pull-right"></taskana-classification-types-selector>
+				<taskana-classification-types-selector
+						class="pull-right">
+				</taskana-classification-types-selector>
 			</div>
 		</div>
 	</li>
+
+	<!-- FILTER -->
 	<div class="col-xs-2 category-filter">
 		<button class="btn btn-default" data-toggle="dropdown" type="button" id="dropdown-classification-filter" data-toggle="dropdown"
 		 aria-haspopup="true" aria-expanded="true">
-			<svg-icon *ngIf="selectedCategory else category_unselected" class="blue" [src]="(getCategoryIcon(selectedCategory) | async)?.name"
-			 data-toggle="tooltip" [title]="(getCategoryIcon(category) | async)?.text"></svg-icon>
+			<svg-icon class="blue" *ngIf="selectedCategory else category_unselected" [src]="(getCategoryIcon(selectedCategory) | async)?.name"
+			 data-toggle="tooltip"></svg-icon>
 			<ng-template #category_unselected>
-				<svg-icon data-toggle="tooltip" title="All" class="blue " src="./assets/icons/asterisk.svg"></svg-icon>
+				<svg-icon data-toggle="tooltip" title="All" class="blue" src="./assets/icons/asterisk.svg"></svg-icon>
 			</ng-template>
 		</button>
 		<ul class="dropdown-menu dropdown-menu-classification" role="menu">
 			<li>
-				<a type="button" (click)="selectCategory('');" data-toggle="tooltip" title="All">
+				<a type="button" (click)="selectCategory('');" data-toggle="tooltip">
 					<svg-icon class="blue" src="./assets/icons/asterisk.svg"></svg-icon>
 					All
 				</a>
-				<a *ngFor="let category of categories$ | async" type="button" (click)="selectCategory(category);" data-toggle="tooltip"
-				 [title]="category">
+				<a *ngFor="let category of categories$ | async" type="button" (click)="selectCategory(category);" data-toggle="tooltip">
 					<svg-icon class="blue" [src]="(getCategoryIcon(category) | async)?.name" data-toggle="tooltip" [title]="(getCategoryIcon(category) | async)?.text"></svg-icon>
 					{{category}}
 				</a>
@@ -39,13 +47,13 @@
 	<div class="col-xs-8">
 		<input class="filter-input" [ngModel]="inputValue" (ngModelChange)="inputValue = $event" placeholder="Filter classifications">
 	</div>
-	<div class="col-xs-12 horizontal-bottom-divider">
-	</div>
+
+	<div class="col-xs-12 horizontal-bottom-divider"></div>
+
+	<!-- CLASSIFICATION TREE -->
 	<taskana-spinner class="col-xs-12" [isRunning]="requestInProgress" positionClass="centered-spinner-whole-screen"></taskana-spinner>
 	<taskana-tree class="col-xs-12" *ngIf="(classifications && classifications.length) else empty_classifications"
-	 [treeNodes]="classifications" [selectNodeId]="selectedId" [filterText]="inputValue" [filterIcon]="selectedCategory"
-	 (selectNodeIdChanged)="selectClassification($event)" (refreshClassification)="getClassifications($event)"
-                (switchTaskanaSpinnerEmit)="switchTaskanaSpinner($event)"></taskana-tree>
+	 [filterText]="inputValue" [filterIcon]="selectedCategory"></taskana-tree>
 	<ng-template #empty_classifications>
 		<div *ngIf="!requestInProgress" class="col-xs-12 container-no-items center-block">
 			<h3 class="grey">There are no classifications</h3>
diff --git a/web/src/app/administration/components/classification-list/classification-list.component.spec.ts b/web/src/app/administration/components/classification-list/classification-list.component.spec.ts
index 00236fef0..45be868f3 100644
--- a/web/src/app/administration/components/classification-list/classification-list.component.spec.ts
+++ b/web/src/app/administration/components/classification-list/classification-list.component.spec.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { of } from 'rxjs';
 import { Routes } from '@angular/router';
@@ -18,7 +18,6 @@ import { ClassificationDefinitionService } from 'app/administration/services/cla
 import { DomainService } from 'app/shared/services/domain/domain.service';
 import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
 import { configureTests } from 'app/app.test.configuration';
-import { TreeService } from 'app/shared/services/tree/tree.service';
 import { ImportExportService } from 'app/administration/services/import-export.service';
 import { NgxsModule } from '@ngxs/store';
 import { MatRadioModule } from '@angular/material/radio';
@@ -51,7 +50,7 @@ describe('ClassificationListComponent', () => {
       providers: [
         HttpClient, WorkbasketDefinitionService, NotificationService,
         ClassificationsService, DomainService, ClassificationDefinitionService,
-        RequestInProgressService, TreeService, ImportExportService
+        RequestInProgressService, ImportExportService
       ]
     });
   };
diff --git a/web/src/app/administration/components/classification-list/classification-list.component.ts b/web/src/app/administration/components/classification-list/classification-list.component.ts
index e127ec40b..eec5c29c5 100644
--- a/web/src/app/administration/components/classification-list/classification-list.component.ts
+++ b/web/src/app/administration/components/classification-list/classification-list.component.ts
@@ -1,84 +1,108 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Select } from '@ngxs/store';
+import { Observable, Subject } from 'rxjs';
+import { map, takeUntil } from 'rxjs/operators';
+import { ActivatedRoute } from '@angular/router';
+import { Actions, ofActionCompleted, ofActionDispatched, Select, Store } from '@ngxs/store';
+
+import { ImportExportService } from 'app/administration/services/import-export.service';
 
 import { TaskanaType } from 'app/shared/models/taskana-type';
-import { Classification } from 'app/shared/models/classification';
-import { TreeNodeModel } from 'app/shared/models/tree-node';
-
-import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
 import { Pair } from 'app/shared/models/pair';
-import { ImportExportService } from 'app/administration/services/import-export.service';
+import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
 import { EngineConfigurationSelectors } from 'app/shared/store/engine-configuration-store/engine-configuration.selectors';
 import { ClassificationSelectors } from 'app/shared/store/classification-store/classification.selectors';
-import { ClassificationDefinition } from '../../../shared/models/classification-definition';
-import { NOTIFICATION_TYPES } from '../../../shared/models/notifications';
-
+import { Location } from '@angular/common';
 import { ClassificationCategoryImages } from '../../../shared/models/customisation';
+
 import { NotificationService } from '../../../shared/services/notifications/notification.service';
 
+import { GetClassifications, SetActiveAction } from '../../../shared/store/classification-store/classification.actions';
+import { ACTION } from '../../../shared/models/action';
+import { TreeNodeModel } from '../../../shared/models/tree-node';
+
+
 @Component({
   selector: 'taskana-classification-list',
   templateUrl: './classification-list.component.html',
   styleUrls: ['./classification-list.component.scss']
 })
 export class ClassificationListComponent implements OnInit, OnDestroy {
-  selectedCategory = '';
-  selectedId: string;
-  selectionToImport = TaskanaType.CLASSIFICATIONS;
-  requestInProgress = false;
-  initialized = false;
+  taskanaType = TaskanaType;
+  requestInProgress = true;
   inputValue: string;
-  classifications: Classification[] = [];
+  selectedCategory = '';
+
   @Select(ClassificationSelectors.classificationTypes) classificationTypes$: Observable<string[]>;
   @Select(ClassificationSelectors.selectedClassificationType) classificationTypeSelected$: Observable<string>;
   @Select(ClassificationSelectors.selectCategories) categories$: Observable<string[]>;
+  @Select(ClassificationSelectors.classifications) classifications$: Observable<TreeNodeModel[]>;
+  @Select(ClassificationSelectors.activeAction) activeAction$: Observable<ACTION>;
   @Select(EngineConfigurationSelectors.selectCategoryIcons) categoryIcons$: Observable<ClassificationCategoryImages>;
-  classificationServiceSubscription: Subscription;
-  classificationTypeSubscription: Subscription;
-  classificationSelectedSubscription: Subscription;
-  classificationSavedSubscription: Subscription;
-  importingExportingSubscription: Subscription;
+
+  action: ACTION;
+  destroy$ = new Subject<void>();
+  classifications: TreeNodeModel[];
 
   constructor(
     private classificationService: ClassificationsService,
-    private router: Router,
+    private location: Location,
     private route: ActivatedRoute,
     private importExportService: ImportExportService,
-    private notificationsService: NotificationService
+    private notificationsService: NotificationService,
+    private store: Store,
+    private ngxsActions$: Actions
   ) {
+    this.ngxsActions$.pipe(ofActionDispatched(GetClassifications),
+      takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.requestInProgress = true;
+      });
+    this.ngxsActions$.pipe(ofActionCompleted(GetClassifications),
+      takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.requestInProgress = false;
+      });
   }
 
   ngOnInit() {
-    this.classificationSavedSubscription = this.classificationService
+    this.classifications$.pipe(takeUntil(this.destroy$)).subscribe(classifications => {
+      if (classifications) {
+        this.classifications = [...classifications];
+      }
+    });
+
+    this.classificationService
       .classificationSavedTriggered()
+      .pipe(takeUntil(this.destroy$))
       .subscribe(() => {
-        this.performRequest(true);
+        this.store.dispatch(new GetClassifications());
       });
 
-    this.classificationTypeSubscription = this.classificationTypeSelected$.subscribe(() => {
-      this.performRequest();
-      this.selectClassification();
-      this.selectedCategory = '';
-    });
+    this.classificationTypeSelected$
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.store.dispatch(new GetClassifications());
+        this.selectedCategory = '';
+      });
 
-    this.importingExportingSubscription = this.importExportService.getImportingFinished().subscribe(() => {
-      this.performRequest(true);
-    });
-  }
+    this.importExportService.getImportingFinished()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.store.dispatch(new GetClassifications());
+      });
 
-  selectClassification(id?: string) {
-    this.selectedId = id;
-
-    if (id) {
-      this.router.navigate([{ outlets: { detail: [this.selectedId] } }], { relativeTo: this.route });
-    }
+    this.activeAction$
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(action => {
+        this.action = action;
+      });
   }
 
   addClassification() {
-    this.router.navigate([{ outlets: { detail: [`new-classification/${this.selectedId}`] } }], { relativeTo: this.route });
+    if (this.action !== ACTION.CREATE) {
+      this.store.dispatch(new SetActiveAction(ACTION.CREATE));
+    }
+    this.location.go(this.location.path().replace(/(classifications).*/g, 'classifications/new-classification'));
   }
 
   selectCategory(category: string) {
@@ -95,55 +119,8 @@ export class ClassificationListComponent implements OnInit, OnDestroy {
     );
   }
 
-  private performRequest(forceRequest = false) {
-    if (this.initialized && !forceRequest) {
-      return;
-    }
-
-    this.requestInProgress = true;
-    this.classifications = [];
-
-    if (this.classificationServiceSubscription) { this.classificationServiceSubscription.unsubscribe(); }
-    if (this.classificationSelectedSubscription) { this.classificationSelectedSubscription.unsubscribe(); }
-
-    this.classificationServiceSubscription = this.classificationService.getClassifications()
-      .subscribe((classifications: TreeNodeModel[]) => {
-        this.requestInProgress = false;
-        this.classifications = classifications;
-      });
-    this.classificationSelectedSubscription = this.classificationService.getSelectedClassification()
-      .subscribe((classificationSelected: ClassificationDefinition) => {
-        this.selectedId = classificationSelected ? classificationSelected.classificationId : undefined;
-      });
-
-    this.initialized = true;
-  }
-
-  private getClassifications(key?: string) {
-    this.requestInProgress = true;
-    this.classificationService.getClassifications()
-      .subscribe((classifications: TreeNodeModel[]) => {
-        this.classifications = classifications;
-        this.requestInProgress = false;
-      });
-
-    if (key) {
-      this.notificationsService.showToast(
-        NOTIFICATION_TYPES.SUCCESS_ALERT_5,
-        new Map<string, string>([['classificationKey', key]])
-      );
-    }
-  }
-
-  private switchTaskanaSpinner($event) {
-    this.requestInProgress = $event;
-  }
-
   ngOnDestroy(): void {
-    if (this.classificationServiceSubscription) { this.classificationServiceSubscription.unsubscribe(); }
-    if (this.classificationSelectedSubscription) { this.classificationSelectedSubscription.unsubscribe(); }
-    if (this.classificationSavedSubscription) { this.classificationSavedSubscription.unsubscribe(); }
-    if (this.importingExportingSubscription) { this.importingExportingSubscription.unsubscribe(); }
-    if (this.classificationTypeSubscription) { this.classificationTypeSubscription.unsubscribe(); }
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 }
diff --git a/web/src/app/administration/components/classification-overview/classification-overview.component.html b/web/src/app/administration/components/classification-overview/classification-overview.component.html
new file mode 100644
index 000000000..4de4b7a00
--- /dev/null
+++ b/web/src/app/administration/components/classification-overview/classification-overview.component.html
@@ -0,0 +1,17 @@
+<div class="no-gutter">
+  <div class="col-xs-12 col-md-4 vertical-right-divider">
+    <taskana-classification-list></taskana-classification-list>
+  </div>
+  <div class="col-xs-12 col-md-8" *ngIf="showDetail; else showEmptyPage">
+    <taskana-classification-details></taskana-classification-details>
+  </div>
+
+  <ng-template #showEmptyPage>
+    <div class="hidden-xs hidden-sm col-md-8 container-no-items">
+      <div class="center-block no-detail">
+        <h3 class="grey">Select a classification</h3>
+        <svg-icon class="img-responsive empty-icon" src="./assets/icons/classification-empty.svg"></svg-icon>
+      </div>
+    </div>
+  </ng-template>
+</div>
diff --git a/web/src/app/administration/components/classification-overview/classification-overview.component.scss b/web/src/app/administration/components/classification-overview/classification-overview.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/src/app/administration/components/classification-overview/classification-overview.component.spec.ts b/web/src/app/administration/components/classification-overview/classification-overview.component.spec.ts
new file mode 100644
index 000000000..bffff7e54
--- /dev/null
+++ b/web/src/app/administration/components/classification-overview/classification-overview.component.spec.ts
@@ -0,0 +1,52 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Location } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgxsModule } from '@ngxs/store';
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { Router, Routes } from '@angular/router';
+import { ClassificationOverviewComponent } from './classification-overview.component';
+
+@Component({
+  selector: 'taskana-dummy-detail',
+  template: 'dummydetail'
+})
+export class DummyDetailComponent {
+}
+
+describe('ClassificationOverviewComponent', () => {
+  let component: ClassificationOverviewComponent;
+  let fixture: ComponentFixture<ClassificationOverviewComponent>;
+  let router;
+  let debugElement;
+  const locationSpy: jasmine.SpyObj<Location> = jasmine.createSpyObj('Location', ['go']);
+
+  beforeEach((() => {
+    const routes: Routes = [
+      { path: ':id', component: DummyDetailComponent }
+    ];
+
+    TestBed.configureTestingModule({
+      declarations: [
+        ClassificationOverviewComponent,
+        DummyDetailComponent],
+      imports: [
+        RouterTestingModule.withRoutes(routes),
+        NgxsModule.forRoot()],
+      providers: [
+        { provide: Location, useValue: locationSpy },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    });
+
+    fixture = TestBed.createComponent(ClassificationOverviewComponent);
+    component = fixture.componentInstance;
+    debugElement = fixture.debugElement.nativeElement;
+    router = TestBed.get(Router);
+
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/web/src/app/administration/components/classification-overview/classification-overview.component.ts b/web/src/app/administration/components/classification-overview/classification-overview.component.ts
new file mode 100644
index 000000000..408bab190
--- /dev/null
+++ b/web/src/app/administration/components/classification-overview/classification-overview.component.ts
@@ -0,0 +1,57 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable, Subject } from 'rxjs';
+import { Select, Store } from '@ngxs/store';
+import { takeUntil } from 'rxjs/operators';
+import { ClassificationSelectors } from '../../../shared/store/classification-store/classification.selectors';
+import { ClassificationDefinition } from '../../../shared/models/classification-definition';
+import { ACTION } from '../../../shared/models/action';
+import { SelectClassification,
+  SetActiveAction } from '../../../shared/store/classification-store/classification.actions';
+
+@Component({
+  selector: 'app-classification-overview',
+  templateUrl: './classification-overview.component.html',
+  styleUrls: ['./classification-overview.component.scss']
+})
+export class ClassificationOverviewComponent implements OnInit, OnDestroy {
+  showDetail = false;
+  @Select(ClassificationSelectors.selectedClassification) selectedClassification$: Observable<ClassificationDefinition>;
+  private destroy$ = new Subject<void>();
+  routerParams: any;
+
+  constructor(
+    private route: ActivatedRoute,
+    private store: Store
+  ) {
+  }
+
+  ngOnInit() {
+    if (this.route.firstChild) {
+      this.route.firstChild.params
+        .pipe(takeUntil(this.destroy$))
+        .subscribe(params => {
+          this.routerParams = params;
+
+          if (this.routerParams.id) {
+            this.showDetail = true;
+            this.store.dispatch(new SelectClassification(this.routerParams.id));
+          }
+          if (this.routerParams.id && this.routerParams.id.indexOf('new-classification') !== -1) {
+            this.store.dispatch(new SetActiveAction(ACTION.CREATE));
+          }
+        });
+    }
+
+    this.selectedClassification$
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(selectedClassification => {
+        this.showDetail = !!selectedClassification;
+      });
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+}
diff --git a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts
index 51dd3a767..ed3cac725 100644
--- a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts
+++ b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts
@@ -39,7 +39,7 @@ export class WorkbasketAccessItemsComponent implements OnChanges, OnDestroy {
   workbasket: Workbasket;
 
   @Input()
-  action: string;
+  action: ACTION;
 
   @Input()
   active: string;
diff --git a/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts b/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts
index 34dcb39e7..54b9cca5e 100644
--- a/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts
+++ b/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts
@@ -22,7 +22,7 @@ export class WorkbasketDetailsComponent implements OnInit, OnDestroy {
   selectedId: string;
   showDetail = false;
   requestInProgress = false;
-  action: string;
+  action: ACTION;
   tabSelected = 'information';
 
   private workbasketSelectedSubscription: Subscription;
diff --git a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts
index c39f241bd..ba1178d63 100644
--- a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts
+++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts
@@ -37,7 +37,7 @@ export class WorkbasketDistributionTargetsComponent implements OnChanges, OnDest
   workbasket: Workbasket;
 
   @Input()
-  action: string;
+  action: ACTION;
 
   @Input()
   active: string;
diff --git a/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts b/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts
index f280f768f..d0a9ce33e 100644
--- a/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts
+++ b/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts
@@ -40,7 +40,7 @@ implements OnInit, OnChanges, OnDestroy {
   workbasketClone: Workbasket;
   workbasketErrors;
   @Input()
-  action: string;
+  action: ACTION;
 
   allTypes: Map<string, string>;
   requestInProgress = false;
diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts
index a7f29e171..f650436df 100644
--- a/web/src/app/app.module.ts
+++ b/web/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { SelectedRouteService } from 'app/shared/services/selected-route/selecte
 import { DomainService } from 'app/shared/services/domain/domain.service';
 import { StartupService } from 'app/shared/services/startup/startup.service';
 import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service';
-import { TreeService } from 'app/shared/services/tree/tree.service';
 import { WindowRefService } from 'app/shared/services/window/window.service';
 import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service';
 import { NavBarComponent } from 'app/shared/components/nav-bar/nav-bar.component';
@@ -50,7 +49,6 @@ import { UserGuard } from './shared/guards/user.guard';
 import { ClassificationCategoriesService } from './shared/services/classification-categories/classification-categories.service';
 import { environment } from '../environments/environment';
 import { STATES } from './shared/store';
-import { ToastComponent } from './shared/components/toast/toast.component';
 
 const MODULES = [
   TabsModule.forRoot(),
@@ -101,7 +99,6 @@ export function startupServiceFactory(startupService: StartupService): () => Pro
       multi: true
     },
     MasterAndDetailService,
-    TreeService,
     TaskanaEngineService,
     FormsValidatorService,
     UploadService,
diff --git a/web/src/app/shared/components/spinner/spinner.component.ts b/web/src/app/shared/components/spinner/spinner.component.ts
index 21529cb5f..d4725c8cf 100644
--- a/web/src/app/shared/components/spinner/spinner.component.ts
+++ b/web/src/app/shared/components/spinner/spinner.component.ts
@@ -13,7 +13,7 @@ declare let $: any;
 export class SpinnerComponent implements OnDestroy {
   showSpinner: boolean;
   @Input()
-  delay = 250;
+  delay = 0;
 
   @Input()
   isModal = false;
@@ -50,9 +50,6 @@ export class SpinnerComponent implements OnDestroy {
       return;
     }
 
-    if (this.currentTimeout) {
-      return;
-    }
     this.runSpinner(value);
   }
 
diff --git a/web/src/app/shared/components/tree/tree.component.html b/web/src/app/shared/components/tree/tree.component.html
index 344db84f7..9e310ada1 100644
--- a/web/src/app/shared/components/tree/tree.component.html
+++ b/web/src/app/shared/components/tree/tree.component.html
@@ -1,4 +1,4 @@
-<tree-root #tree [nodes]="treeNodes" [options]="options" (activate)="onActivate($event)" (deactivate)="onDeactivate($event)"
+<tree-root #tree [nodes]="classifications" [options]="options" (activate)="onActivate($event)" (deactivate)="onDeactivate($event)"
            (moveNode)="onMoveNode($event)" (treeDrop)="onDrop($event)">
     <ng-template #treeNodeTemplate let-node let-index="index">
         <span class="text-top">
diff --git a/web/src/app/shared/components/tree/tree.component.spec.ts b/web/src/app/shared/components/tree/tree.component.spec.ts
index 823fe14cb..69414b0a5 100644
--- a/web/src/app/shared/components/tree/tree.component.spec.ts
+++ b/web/src/app/shared/components/tree/tree.component.spec.ts
@@ -3,9 +3,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AngularSvgIconModule } from 'angular-svg-icon';
 import { HttpClientModule } from '@angular/common/http';
 
-import { TreeService } from 'app/shared/services/tree/tree.service';
 import { configureTests } from 'app/app.test.configuration';
-import { NgxsModule } from '@ngxs/store';
+import { NgxsModule, Store } from '@ngxs/store';
+import { ClassificationSelectors } from 'app/shared/store/classification-store/classification.selectors';
+import { of } from 'rxjs';
+import { ACTION } from 'app/shared/models/action';
+import { TreeNodeModel } from 'app/shared/models/tree-node';
+import { Location } from '@angular/common';
+import { UpdateClassification } from 'app/shared/store/classification-store/classification.actions';
 import { TaskanaTreeComponent } from './tree.component';
 import { ClassificationDefinition } from '../../models/classification-definition';
 import { LinksClassification } from '../../models/links-classfication';
@@ -28,52 +33,46 @@ describe('TaskanaTreeComponent', () => {
   let moveNodeEvent;
   let dropEvent;
 
+  const locationSpy: jasmine.SpyObj<Location> = jasmine.createSpyObj('Location', ['go', 'path']);
+  const storeSpy: jasmine.SpyObj<Store> = jasmine.createSpyObj('Store', ['select', 'dispatch']);
+
   const configure = (testBed: TestBed) => {
     testBed.configureTestingModule({
       imports: [AngularSvgIconModule, HttpClientModule, NgxsModule.forRoot()],
       declarations: [TreeVendorComponent],
-      providers: [TreeService, ClassificationsService]
+      providers: [ClassificationsService,
+        { provide: Location, useValue: locationSpy },
+        { provide: Store, useValue: storeSpy }]
     });
   };
 
   beforeEach(done => {
     configureTests(configure).then(testBed => {
+      locationSpy.path.and.callFake(() => '');
+      storeSpy.select.and.callFake(selector => {
+        switch (selector) {
+          case ClassificationSelectors.selectedClassificationId:
+            return of('id4');
+          case ClassificationSelectors.activeAction:
+            return of(ACTION.CREATE);
+          case ClassificationSelectors.classifications:
+            return of([new TreeNodeModel('id4')]);
+          default:
+            return of();
+        }
+      });
+
       fixture = testBed.createComponent(TaskanaTreeComponent);
       classificationsService = testBed.get(ClassificationsService);
-      spyOn(classificationsService, 'putClassification').and.callFake((url, classification) => classification);
       moveNodeEvent = {
         eventName: 'moveNode',
-        node: {
-          classificationId: 'id4',
-          parentId: '',
-          parentKey: '',
-          _links: {
-            self: {
-              href: 'url'
-            }
-          }
-        },
-        to: {
-          parent: {
-            classificationId: 'id3',
-            key: 'key3'
-          }
-        }
+        node: { classificationId: 'id4', parentId: '', parentKey: '', _links: { self: { href: 'url' } } },
+        to: { parent: { classificationId: 'id3', key: 'key3' } }
       };
 
       dropEvent = {
-        event: {
-          target: {
-            tagName: 'TREE-VIEWPORT'
-          }
-        },
-        element: {
-          data: {
-            classificationId: 'id3',
-            parentId: 'id1',
-            parentKey: 'key1'
-          }
-        }
+        event: { target: { tagName: 'TREE-VIEWPORT' } },
+        element: { data: { classificationId: 'id3', parentId: 'id1', parentKey: 'key1' } }
       };
 
       component = fixture.componentInstance;
@@ -87,12 +86,15 @@ describe('TaskanaTreeComponent', () => {
   });
 
   it('should be change the classification parent (onMoveNode)', async () => {
-    spyOn(classificationsService, 'getClassification').and.returnValue(new ClassificationDefinition('id4',
+    const classification = new ClassificationDefinition('id4',
       'key4', '', '', 'MANUAL', 'DOMAIN_A', 'TASK', true, '019-04-10T10:23:34.985Z', '2019-04-10T10:23:34.985Z',
       'classification4', 'description', 1, 'level', '', '', '', '', '', '',
-      '', '', '', new LinksClassification({ href: '' }, '', '', { href: '' }, { href: '' }, { href: '' })));
+      '', '', '', new LinksClassification({ href: '' }, '', '', { href: '' }, { href: '' }, { href: '' }));
+
+    // using parameter 'any' since getClassification is a private method
+    spyOn<any>(component, 'getClassification').and.returnValue(classification);
     spyOn(component, 'switchTaskanaSpinner');
-    const classification = classificationsService.getClassification();
+
     expect(classification.parentId).toEqual('');
     expect(classification.parentKey).toEqual('');
 
@@ -100,18 +102,21 @@ describe('TaskanaTreeComponent', () => {
 
     expect(classification.parentId).toEqual('id3');
     expect(classification.parentKey).toEqual('key3');
-    expect(classificationsService.putClassification).toHaveBeenCalledWith(classification._links.self.href, classification);
+    expect(storeSpy.dispatch).toHaveBeenCalledWith(new UpdateClassification(classification));
     expect(component.switchTaskanaSpinner).toHaveBeenCalledWith(true);
     expect(component.switchTaskanaSpinner).toHaveBeenCalledWith(false);
   });
 
   it('should be changed the parent classification to root node (onDrop)', async () => {
-    spyOn(classificationsService, 'getClassification').and.returnValue(new ClassificationDefinition('id3',
+    const classification = new ClassificationDefinition('id3',
       'key3', 'id1', 'key1', 'MANUAL', 'DOMAIN_A', 'TASK', true, '019-04-10T10:23:34.985Z', '2019-04-10T10:23:34.985Z',
       'classification3', 'description', 1, 'level', '', '', '', '', '', '',
-      '', '', '', new LinksClassification({ href: '' }, '', '', { href: '' }, { href: '' }, { href: '' })));
+      '', '', '', new LinksClassification({ href: '' }, '', '', { href: '' }, { href: '' }, { href: '' }));
+
+    // using parameter 'any' since getClassification is a private method
+    spyOn<any>(component, 'getClassification').and.returnValue(classification);
     spyOn(component, 'switchTaskanaSpinner');
-    const classification = classificationsService.getClassification();
+
     expect(classification.parentId).toEqual('id1');
     expect(classification.parentKey).toEqual('key1');
 
diff --git a/web/src/app/shared/components/tree/tree.component.ts b/web/src/app/shared/components/tree/tree.component.ts
index 890e84043..807c4a47a 100644
--- a/web/src/app/shared/components/tree/tree.component.ts
+++ b/web/src/app/shared/components/tree/tree.component.ts
@@ -10,18 +10,25 @@ import { AfterViewChecked,
   ViewChild } from '@angular/core';
 import { TreeNodeModel } from 'app/shared/models/tree-node';
 
-import { ITreeOptions, KEYS, TreeComponent, TreeNode } from 'angular-tree-component';
+import { ITreeOptions, KEYS, TREE_ACTIONS, TreeComponent } from 'angular-tree-component';
 import { Pair } from 'app/shared/models/pair';
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Select } from '@ngxs/store';
+import { Observable, Subject } from 'rxjs';
+import { map, takeUntil } from 'rxjs/operators';
+import { Select, Store } from '@ngxs/store';
 import { EngineConfigurationSelectors } from 'app/shared/store/engine-configuration-store/engine-configuration.selectors';
 
-import { TreeService } from '../../services/tree/tree.service';
+import { Location } from '@angular/common';
+import { NOTIFICATION_TYPES } from 'app/shared/models/notifications';
+import { NotificationService } from 'app/shared/services/notifications/notification.service';
 import { Classification } from '../../models/classification';
 import { ClassificationDefinition } from '../../models/classification-definition';
 import { ClassificationsService } from '../../services/classifications/classifications.service';
 import { ClassificationCategoryImages } from '../../models/customisation';
+import { ClassificationSelectors } from '../../store/classification-store/classification.selectors';
+import { DeselectClassification,
+  SelectClassification,
+  UpdateClassification } from '../../store/classification-store/classification.actions';
+import { ACTION } from '../../models/action';
 
 @Component({
   selector: 'taskana-tree',
@@ -29,23 +36,23 @@ import { ClassificationCategoryImages } from '../../models/customisation';
   styleUrls: ['./tree.component.scss'],
 })
 export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy {
-  @Input() treeNodes: Array<TreeNodeModel>;
-  @Output() treeNodesChange = new EventEmitter<Array<TreeNodeModel>>();
+  classifications: TreeNodeModel[];
   @Input() selectNodeId: string;
-  @Output() selectNodeIdChanged = new EventEmitter<string>();
   @Input() filterText: string;
   @Input() filterIcon = '';
-  @Output() refreshClassification = new EventEmitter<string>();
   @Output() switchTaskanaSpinnerEmit = new EventEmitter<boolean>();
   @Select(EngineConfigurationSelectors.selectCategoryIcons) categoryIcons$: Observable<ClassificationCategoryImages>;
+  @Select(ClassificationSelectors.selectedClassificationId) selectedClassificationId$: Observable<string>;
+  @Select(ClassificationSelectors.activeAction) activeAction$: Observable<ACTION>;
+  @Select(ClassificationSelectors.classifications) classifications$: Observable<TreeNodeModel[]>;
+
   options: ITreeOptions = {
     displayField: 'name',
     idField: 'classificationId',
     actionMapping: {
       keys: {
-        [KEYS.ENTER]: (tree, node, $event) => {
-          node.toggleExpanded();
-        }
+        [KEYS.ENTER]: TREE_ACTIONS.TOGGLE_ACTIVE,
+        [KEYS.SPACE]: TREE_ACTIONS.TOGGLE_EXPANDED
       }
     },
     useVirtualScroll: true,
@@ -61,36 +68,56 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
 
   private filterTextOld: string;
   private filterIconOld = '';
-  private removedNodeIdSubscription: Subscription;
+  private action: ACTION;
+  private destroy$ = new Subject<void>();
 
   constructor(
-    private treeService: TreeService,
     private elementRef: ElementRef,
     private classificationsService: ClassificationsService,
+    private location: Location,
+    private store: Store,
+    private notificationsService: NotificationService,
   ) {
   }
 
   @HostListener('document:click', ['$event'])
   onDocumentClick(event) {
     if (this.checkValidElements(event) && this.tree.treeModel.getActiveNode()) {
-      this.unSelectActiveNode();
+      this.deselectActiveNode();
     }
   }
 
   ngOnInit() {
-    this.removedNodeIdSubscription = this.treeService.getRemovedNodeId().subscribe(value => {
-      const removedNode = this.getNode(value);
-      if (removedNode.parent) {
-        removedNode.parent.collapse();
+    this.activeAction$.pipe(takeUntil(this.destroy$)).subscribe(action => {
+      this.action = action;
+    });
+
+    this.selectedClassificationId$.pipe(takeUntil(this.destroy$)).subscribe(selectedClassificationId => {
+      this.selectNodeId = typeof selectedClassificationId !== 'undefined' ? selectedClassificationId : undefined;
+      if (typeof this.tree.treeModel.getActiveNode() !== 'undefined') {
+        if (this.tree.treeModel.getActiveNode().data.classificationId !== this.selectNodeId) {
+          this.selectNode(this.selectNodeId);
+        }
       }
     });
+
+    this.classifications$.pipe(takeUntil(this.destroy$)).subscribe(classifications => {
+      if (typeof (classifications) !== 'undefined') {
+        this.classifications = classifications.map(this.classificationsDeepCopy.bind(this));
+      }
+    });
+  }
+
+  classificationsDeepCopy(classification: TreeNodeModel) {
+    const ret: TreeNodeModel = { ...classification };
+    ret.children = ret.children ? [...ret.children] : [];
+    ret.children = ret.children.map(this.classificationsDeepCopy.bind(this));
+    return ret;
   }
 
   ngAfterViewChecked(): void {
     if (this.selectNodeId && !this.tree.treeModel.getActiveNode()) {
       this.selectNode(this.selectNodeId);
-    } else if (!this.selectNodeId && this.tree.treeModel.getActiveNode()) {
-      this.unSelectActiveNode();
     }
 
     if (this.filterTextOld !== this.filterText
@@ -103,11 +130,17 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
   }
 
   onActivate(treeNode: any) {
-    this.selectNodeIdChanged.emit(`${treeNode.node.data.classificationId}`);
+    const id = treeNode.node.data.classificationId;
+    this.selectNodeId = id;
+    this.store.dispatch(new SelectClassification(id));
+    this.location.go(this.location.path().replace(/(classifications).*/g, `classifications/(detail:${id})`));
   }
 
-  onDeactivate(treeNode: any) {
-    this.selectNodeIdChanged.emit();
+  onDeactivate(event: any) {
+    if (!event.treeModel.activeNodes.length && this.action !== ACTION.CREATE) {
+      this.store.dispatch(new DeselectClassification());
+      this.location.go(this.location.path().replace(/(classifications).*/g, 'classifications'));
+    }
   }
 
   async onMoveNode($event) {
@@ -116,7 +149,7 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
     classification.parentId = $event.to.parent.classificationId;
     classification.parentKey = $event.to.parent.key;
     this.collapseParentNodeIfItIsTheLastChild($event.node);
-    await this.updateClassification(classification);
+    this.updateClassification(classification);
   }
 
   async onDrop($event) {
@@ -126,7 +159,7 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
       this.collapseParentNodeIfItIsTheLastChild($event.element.data);
       classification.parentId = '';
       classification.parentKey = '';
-      await this.updateClassification(classification);
+      this.updateClassification(classification);
     }
   }
 
@@ -142,23 +175,16 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
     this.switchTaskanaSpinnerEmit.emit(active);
   }
 
-  ngOnDestroy(): void {
-    if (this.removedNodeIdSubscription) {
-      this.removedNodeIdSubscription.unsubscribe();
-    }
-  }
-
   private selectNode(nodeId: string) {
     if (nodeId) {
       const selectedNode = this.getNode(nodeId);
       if (selectedNode) {
         selectedNode.setIsActive(true);
-        this.expandParent(selectedNode);
       }
     }
   }
 
-  private unSelectActiveNode() {
+  private deselectActiveNode() {
     const activeNode = this.tree.treeModel.getActiveNode();
     delete this.selectNodeId;
     activeNode.setIsActive(false);
@@ -169,14 +195,6 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
     return this.tree.treeModel.getNodeById(nodeId);
   }
 
-  private expandParent(node: TreeNode) {
-    if (!node.parent || node.isRoot) {
-      return;
-    }
-    node.parent.expand();
-    this.expandParent(node.parent);
-  }
-
   private filterNodes(text, iconText) {
     this.tree.treeModel.filterNodes(node => this.checkNameAndKey(node, text)
         && this.checkIcon(node, iconText));
@@ -206,12 +224,15 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
   }
 
   private getClassification(classificationId: string): Promise<ClassificationDefinition> {
-    return this.classificationsService.getClassification(classificationId);
+    return this.classificationsService.getClassification(classificationId).toPromise();
   }
 
-  private async updateClassification(classification: Classification) {
-    await this.classificationsService.putClassification(classification._links.self.href, classification);
-    this.refreshClassification.emit(classification.key);
+  private updateClassification(classification: Classification) {
+    this.store.dispatch(new UpdateClassification(classification));
+    this.notificationsService.showToast(
+      NOTIFICATION_TYPES.SUCCESS_ALERT_5,
+      new Map<string, string>([['classificationKey', classification.key]])
+    );
     this.switchTaskanaSpinner(false);
   }
 
@@ -221,4 +242,9 @@ export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy
       this.getNode(node.parentId).collapse();
     }
   }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
 }
diff --git a/web/src/app/shared/models/action.ts b/web/src/app/shared/models/action.ts
index 07b82f91a..f55cf3dc6 100644
--- a/web/src/app/shared/models/action.ts
+++ b/web/src/app/shared/models/action.ts
@@ -1,5 +1,5 @@
 
 export enum ACTION {
-  CREATE = 'CREATE',
-  COPY = 'COPY'
+  CREATE,
+  COPY
 }
diff --git a/web/src/app/shared/models/classification-definition.ts b/web/src/app/shared/models/classification-definition.ts
index d7bb70f8a..e369a070f 100644
--- a/web/src/app/shared/models/classification-definition.ts
+++ b/web/src/app/shared/models/classification-definition.ts
@@ -1,7 +1,8 @@
 import { LinksClassification } from 'app/shared/models/links-classfication';
 
 export class ClassificationDefinition {
-  constructor(public classificationId?: string,
+  constructor(
+    public classificationId?: string,
     public key?: string,
     public parentId?: string,
     public parentKey?: string,
@@ -24,7 +25,8 @@ export class ClassificationDefinition {
     public custom6?: string,
     public custom7?: string,
     public custom8?: string,
-    public _links?: LinksClassification) {
+    public _links?: LinksClassification
+  ) {
   }
 }
 
diff --git a/web/src/app/shared/models/classification-resource.ts b/web/src/app/shared/models/classification-resource.ts
index 0769dd5c7..ae238e51f 100644
--- a/web/src/app/shared/models/classification-resource.ts
+++ b/web/src/app/shared/models/classification-resource.ts
@@ -3,7 +3,7 @@ import { Links } from './links';
 
 export class ClassificationResource {
   constructor(
-    public classifications: Array<Classification> = [],
+    public classifications: Classification[] = [],
     public _links?: Links
   ) {
   }
diff --git a/web/src/app/shared/models/classification.ts b/web/src/app/shared/models/classification.ts
index 0b732207c..a217d5d5c 100644
--- a/web/src/app/shared/models/classification.ts
+++ b/web/src/app/shared/models/classification.ts
@@ -1,7 +1,8 @@
 import { Links } from 'app/shared/models/links';
 
 export class Classification {
-  constructor(public classificationId?: string, // newly created classifications don't have an id yet.
+  constructor(
+    public classificationId?: string, // newly created classifications don't have an id yet.
     public key?: string,
     public category?: string,
     public type?: string,
@@ -10,6 +11,7 @@ export class Classification {
     public parentId?: string,
     public priority?: number,
     public serviceLevel?: string,
-    public _links?: Links) {
+    public _links?: Links
+  ) {
   }
 }
diff --git a/web/src/app/shared/models/notifications.ts b/web/src/app/shared/models/notifications.ts
index 6906a4955..6b0c05a22 100644
--- a/web/src/app/shared/models/notifications.ts
+++ b/web/src/app/shared/models/notifications.ts
@@ -229,7 +229,7 @@ export const notifications = new Map<NOTIFICATION_TYPES, Pair>([
   // taskdetails.component
   [NOTIFICATION_TYPES.INFO_ALERT, new Pair(
     '',
-    'Reset edited fields'
+    'Refreshed selected classification'
   )],
   // classification-details.component
   [NOTIFICATION_TYPES.SUCCESS_ALERT_4, new Pair(
@@ -310,5 +310,5 @@ export const notifications = new Map<NOTIFICATION_TYPES, Pair>([
   [NOTIFICATION_TYPES.INFO_ALERT_2, new Pair(
     '',
     'The selected Workbasket is empty!'
-  )],
+  )]
 ]);
diff --git a/web/src/app/shared/models/tree-node.ts b/web/src/app/shared/models/tree-node.ts
index 7d0291af0..f15004350 100644
--- a/web/src/app/shared/models/tree-node.ts
+++ b/web/src/app/shared/models/tree-node.ts
@@ -1,7 +1,8 @@
 import { Classification } from 'app/shared/models/classification';
 
 export class TreeNodeModel extends Classification {
-  constructor(public id?: string,
+  constructor(
+    public id?: string,
     public key?: string,
     public category?: string,
     public type?: string,
@@ -10,7 +11,8 @@ export class TreeNodeModel extends Classification {
     public parentId?: string,
     public priority?: number,
     public serviceLevel?: string,
-    public children: Array<TreeNodeModel> = []) {
+    public children: TreeNodeModel[] = []
+  ) {
     super(id, key, category, type, domain, name, parentId, priority, serviceLevel);
   }
 }
diff --git a/web/src/app/shared/models/workbasket-definition.ts b/web/src/app/shared/models/workbasket-definition.ts
index a3e479e90..e77f8d2aa 100644
--- a/web/src/app/shared/models/workbasket-definition.ts
+++ b/web/src/app/shared/models/workbasket-definition.ts
@@ -2,8 +2,10 @@ import { WorkbasketAccessItems } from './workbasket-access-items';
 import { Workbasket } from './workbasket';
 
 export class WorkbasketDefinition {
-  constructor(public distributionTargets: string[],
+  constructor(
+    public distributionTargets: string[],
     public workbasketAccessItems: WorkbasketAccessItems[],
-    public workbasket: Workbasket) {
+    public workbasket: Workbasket
+  ) {
   }
 }
diff --git a/web/src/app/shared/services/classifications/classifications.service.ts b/web/src/app/shared/services/classifications/classifications.service.ts
index 96f9319bb..a280511a3 100644
--- a/web/src/app/shared/services/classifications/classifications.service.ts
+++ b/web/src/app/shared/services/classifications/classifications.service.ts
@@ -1,9 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { environment } from 'environments/environment';
-import { combineLatest, Observable, Subject } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { map, mergeMap, tap } from 'rxjs/operators';
-import { Select, Store } from '@ngxs/store';
 
 import { Classification } from 'app/shared/models/classification';
 import { ClassificationDefinition } from 'app/shared/models/classification-definition';
@@ -13,23 +12,17 @@ import { DomainService } from 'app/shared/services/domain/domain.service';
 import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
 import { Direction } from 'app/shared/models/sorting';
 import { QueryParameters } from 'app/shared/models/query-parameters';
-import { ClassificationSelectors } from 'app/shared/store/classification-store/classification.selectors';
-import { SetSelectedClassificationType } from 'app/shared/store/classification-store/classification.actions';
 
 @Injectable()
 export class ClassificationsService {
   private url = `${environment.taskanaRestUrl}/v1/classifications/`;
-  private classificationSelected = new Subject<ClassificationDefinition>();
   private classificationSaved = new Subject<number>();
   private classificationResourcePromise: Promise<ClassificationResource>;
   private lastDomain: string;
-  // TODO: this should not be here in the service
-  @Select(ClassificationSelectors.selectedClassificationType) classificationTypeSelected$: Observable<string>;
 
   constructor(
     private httpClient: HttpClient,
     private domainService: DomainService,
-    private store: Store
   ) {}
 
   private static classificationParameters(domain: string): QueryParameters {
@@ -44,11 +37,11 @@ export class ClassificationsService {
   }
 
   // GET
-  getClassifications(): Observable<Array<Classification>> {
+  getClassifications(classificationType?: string): Observable<Array<Classification>> {
     return this.domainService.getSelectedDomain().pipe(
       mergeMap(domain => this.getClassificationObservable(this.httpClient.get<ClassificationResource>(
         `${this.url}${TaskanaQueryParameters.getQueryParameters(ClassificationsService.classificationParameters(domain))}`
-      ))),
+      ), classificationType)),
       tap(() => {
         this.domainService.domainChangedComplete();
       })
@@ -67,13 +60,8 @@ export class ClassificationsService {
   }
 
   // GET
-  getClassification(id: string): Promise<ClassificationDefinition> {
-    return this.httpClient.get<ClassificationDefinition>(`${this.url}${id}`)
-      .pipe(tap((classification: ClassificationDefinition) => {
-        if (classification) {
-          this.store.dispatch(new SetSelectedClassificationType(classification.type));
-        }
-      })).toPromise();
+  getClassification(id: string): Observable<ClassificationDefinition> {
+    return this.httpClient.get<ClassificationDefinition>(`${this.url}${id}`);
   }
 
   // POST
@@ -82,23 +70,16 @@ export class ClassificationsService {
   }
 
   // PUT
-  putClassification(url: string, classification: Classification): Promise<Classification> {
-    return this.httpClient.put<Classification>(url, classification).toPromise();
+  putClassification(classification: Classification): Observable<Classification> {
+    return this.httpClient.put<Classification>(`${this.url}${classification.classificationId}`, classification);
   }
 
   // DELETE
-  deleteClassification(url: string): Observable<string> {
-    return this.httpClient.delete<string>(url);
+  deleteClassification(id: string): Observable<string> {
+    return this.httpClient.delete<string>(`${this.url}${id}`);
   }
 
   // #region "Service extras"
-  selectClassification(classification?: ClassificationDefinition) {
-    this.classificationSelected.next(classification);
-  }
-
-  getSelectedClassification(): Observable<ClassificationDefinition> {
-    return this.classificationSelected.asObservable();
-  }
 
   triggerClassificationSaved() {
     this.classificationSaved.next(Date.now());
@@ -110,17 +91,15 @@ export class ClassificationsService {
 
   // #endregion
 
-  private getClassificationObservable(classificationRef: Observable<ClassificationResource>): Observable<Array<Classification>> {
-    return combineLatest(
-      [classificationRef,
-        this.classificationTypeSelected$]
-    ).pipe(
-      map(
-        ([resource, type]: [ClassificationResource, string]) => (
-          resource.classifications ? this.buildHierarchy(resource.classifications, type) : []
-        )
+  private getClassificationObservable(
+    classificationRef: Observable<ClassificationResource>,
+    classificationType: string
+  ): Observable<Array<Classification>> {
+    return classificationRef.pipe(map(
+      (resource: ClassificationResource) => (
+        resource.classifications ? this.buildHierarchy(resource.classifications, classificationType) : []
       )
-    );
+    ));
   }
 
   private buildHierarchy(classifications: Array<Classification>, type: string): Array<Classification> {
diff --git a/web/src/app/shared/services/tree/tree.service.ts b/web/src/app/shared/services/tree/tree.service.ts
deleted file mode 100644
index a914f4acd..000000000
--- a/web/src/app/shared/services/tree/tree.service.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
-
-@Injectable()
-export class TreeService {
-  public removedNodeId = new Subject<string>();
-
-  setRemovedNodeId(value: string) {
-    this.removedNodeId.next(value);
-  }
-
-  getRemovedNodeId() {
-    return this.removedNodeId.asObservable();
-  }
-}
diff --git a/web/src/app/shared/store/classification-store/classification.actions.ts b/web/src/app/shared/store/classification-store/classification.actions.ts
index 2d5e12eca..c311f7c76 100644
--- a/web/src/app/shared/store/classification-store/classification.actions.ts
+++ b/web/src/app/shared/store/classification-store/classification.actions.ts
@@ -1,5 +1,57 @@
+import { ClassificationDefinition } from '../../models/classification-definition';
+import { ACTION } from '../../models/action';
+import { Classification } from '../../models/classification';
+
 export class SetSelectedClassificationType {
-  static readonly type = '[Classification-Types-Selector] Set selected classification type';
+  static readonly type = '[Classification-Selected Type] Set selected classification type';
   constructor(public selectedType: string) {
   }
 }
+
+export class SelectClassification {
+  static readonly type = '[Classification] Select a classification';
+  constructor(public classificationId: string) {
+  }
+}
+
+export class DeselectClassification {
+  static readonly type = '[Classification] Deselect a classification';
+}
+
+export class CreateClassification {
+  static readonly type = '[Classification] Create a new classification';
+  constructor(public classification: ClassificationDefinition) {
+  }
+}
+
+export class SaveClassification {
+  static readonly type = '[Classification] Save a classification and select it';
+  constructor(public classification: ClassificationDefinition) {
+  }
+}
+
+export class RestoreSelectedClassification {
+  static readonly type = '[Classification] Fetch and restore a classification';
+  constructor(public classificationId: string) {
+  }
+}
+
+export class SetActiveAction {
+  static readonly type = '[Classification] Set the currently active Action';
+  constructor(public action?: ACTION) {
+  }
+}
+
+export class RemoveSelectedClassification {
+  static readonly type = '[Classification] Remove the selected Classification';
+}
+
+export class GetClassifications {
+  static readonly type = '[Classification] Get all classifications';
+}
+
+export class UpdateClassification {
+  static readonly type = '[Tree] Update a classification and refetch all classifications';
+  constructor(public classification: Classification) {
+  }
+}
diff --git a/web/src/app/shared/store/classification-store/classification.selectors.ts b/web/src/app/shared/store/classification-store/classification.selectors.ts
index fca1814cf..9ca5870c6 100644
--- a/web/src/app/shared/store/classification-store/classification.selectors.ts
+++ b/web/src/app/shared/store/classification-store/classification.selectors.ts
@@ -1,5 +1,7 @@
 import { Selector } from '@ngxs/store';
 import { ClassificationStateModel, ClassificationState } from './classification.state';
+import { ClassificationDefinition } from '../../models/classification-definition';
+import { ACTION } from '../../models/action';
 
 export class ClassificationSelectors {
   @Selector([ClassificationState])
@@ -21,4 +23,24 @@ export class ClassificationSelectors {
   static selectClassificationTypesObject(state: ClassificationStateModel): Object {
     return state.classificationTypes;
   }
+
+  @Selector([ClassificationState])
+  static classifications(state: ClassificationStateModel): ClassificationDefinition[] {
+    return state.classifications;
+  }
+
+  @Selector([ClassificationState])
+  static selectedClassification(state: ClassificationStateModel): ClassificationDefinition {
+    return state.selectedClassification;
+  }
+
+  @Selector([ClassificationState])
+  static activeAction(state: ClassificationStateModel): ACTION {
+    return state.action;
+  }
+
+  @Selector([ClassificationState])
+  static selectedClassificationId(state: ClassificationStateModel): string {
+    return state.selectedClassification.classificationId;
+  }
 }
diff --git a/web/src/app/shared/store/classification-store/classification.state.ts b/web/src/app/shared/store/classification-store/classification.state.ts
index d76aeff72..e157111c2 100644
--- a/web/src/app/shared/store/classification-store/classification.state.ts
+++ b/web/src/app/shared/store/classification-store/classification.state.ts
@@ -1,16 +1,30 @@
-import { Action, State, StateContext } from '@ngxs/store';
+import { Action, NgxsAfterBootstrap, State, StateContext } from '@ngxs/store';
 import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
-import { CategoriesResponse, ClassificationCategoriesService } from '../../services/classification-categories/classification-categories.service';
-import { SetSelectedClassificationType } from './classification.actions';
+import { take, tap } from 'rxjs/operators';
+import { CategoriesResponse,
+  ClassificationCategoriesService } from '../../services/classification-categories/classification-categories.service';
+import { CreateClassification,
+  DeselectClassification,
+  GetClassifications,
+  RemoveSelectedClassification,
+  RestoreSelectedClassification,
+  SaveClassification,
+  SelectClassification,
+  SetActiveAction,
+  SetSelectedClassificationType,
+  UpdateClassification } from './classification.actions';
+import { ClassificationsService } from '../../services/classifications/classifications.service';
+import { ClassificationDefinition } from '../../models/classification-definition';
+import { ACTION } from '../../models/action';
 
 class InitializeStore {
   static readonly type = '[ClassificationState] Initializing state';
 }
 
 @State<ClassificationStateModel>({ name: 'classification' })
-export class ClassificationState {
-  constructor(private categoryService: ClassificationCategoriesService) {
+export class ClassificationState implements NgxsAfterBootstrap {
+  constructor(private categoryService: ClassificationCategoriesService,
+    private classificationsService: ClassificationsService) {
   }
 
   @Action(SetSelectedClassificationType)
@@ -21,19 +35,143 @@ export class ClassificationState {
     }
   }
 
+  @Action(SelectClassification)
+  selectClassification(ctx: StateContext<ClassificationStateModel>, action: SelectClassification): Observable<any> | void {
+    if (typeof action.classificationId !== 'undefined') {
+      return this.classificationsService.getClassification(action.classificationId).pipe(take(1), tap(
+        selectedClassification => {
+          ctx.patchState({
+            selectedClassification,
+            action: null
+          });
+        }
+      ));
+    }
+    return null;
+  }
+
+  @Action(DeselectClassification)
+  deselectClassification(ctx: StateContext<ClassificationStateModel>): Observable<any> | void {
+    ctx.patchState({
+      selectedClassification: undefined,
+      action: null
+    });
+    return null;
+  }
+
   @Action(InitializeStore)
   initializeStore(ctx: StateContext<ClassificationStateModel>): Observable<any> {
     return this.categoryService.getClassificationCategoriesByType().pipe(
-      tap(classificationTypes => {
+      take(1), tap(classificationTypes => {
         ctx.setState({
           ...ctx.getState(),
           classificationTypes,
+          classifications: undefined,
           selectedClassificationType: Object.keys(classificationTypes)[0],
         });
       }),
     );
   }
 
+  @Action(GetClassifications)
+  getClassifications(ctx: StateContext<ClassificationStateModel>): Observable<any> {
+    const { selectedClassificationType } = ctx.getState();
+    return this.classificationsService.getClassifications(selectedClassificationType).pipe(
+      take(1), tap(classifications => {
+        classifications.forEach(classification => {
+          classification.children = !classification.children ? [] : classification.children;
+        });
+        ctx.patchState({
+          classifications: [...classifications]
+        });
+      }),
+    );
+  }
+
+  @Action(CreateClassification)
+  createClassification(ctx: StateContext<ClassificationStateModel>, action: CreateClassification): Observable<any> {
+    return this.classificationsService.postClassification(action.classification).pipe(
+      take(1), tap(classification => {
+        ctx.patchState(
+          {
+            classifications: [...ctx.getState().classifications, classification],
+            selectedClassification: classification,
+            action: null
+          }
+        );
+      })
+    );
+  }
+
+  @Action(SaveClassification)
+  saveClassification(ctx: StateContext<ClassificationStateModel>, action: SaveClassification): Observable<any> {
+    return this.classificationsService.putClassification(action.classification).pipe(
+      // TODO remove this call when backend is fixed modified dates are not same
+      take(1), tap(retClassification => this.classificationsService.getClassification(retClassification.classificationId).subscribe(
+        savedClassification => {
+          ctx.patchState({
+            classifications: ctx.getState().classifications.map(currentClassification => {
+              if (currentClassification.classificationId === savedClassification.classificationId) { // TODO there has to be a better way
+                return savedClassification;
+              }
+              return currentClassification;
+            }),
+            selectedClassification: savedClassification
+          });
+        }
+      )), tap(() => this.classificationsService.getClassifications(
+        ctx.getState().selectedClassificationType
+      ).subscribe( // TODO find a better way because 3 calls are way too much
+        classifications => {
+          ctx.patchState({
+            classifications
+          });
+        }
+      ))
+    );
+  }
+
+  @Action(RestoreSelectedClassification)
+  restoreSelectedClassification(ctx: StateContext<ClassificationStateModel>, action: RestoreSelectedClassification): Observable<any> {
+    return this.classificationsService.getClassification(action.classificationId).pipe(
+      take(1), tap(selectedClassification => {
+        ctx.patchState({ selectedClassification });
+      })
+    );
+  }
+
+  @Action(SetActiveAction)
+  setActiveAction(ctx: StateContext<ClassificationStateModel>, action: SetActiveAction): void {
+    if (action.action === ACTION.CREATE) {
+      ctx.patchState({ selectedClassification: new ClassificationDefinition(), action: action.action });
+    } else {
+      ctx.patchState({ action: action.action });
+    }
+  }
+
+  @Action(RemoveSelectedClassification)
+  removeSelectedClassification(ctx: StateContext<ClassificationStateModel>): Observable<any> {
+    const sel = ctx.getState().selectedClassification;
+    return this.classificationsService.deleteClassification(sel.classificationId).pipe(take(1), tap(() => {
+      const classifications = ctx.getState().classifications.filter(el => el.classificationId !== sel.classificationId);
+      ctx.patchState({ selectedClassification: undefined, classifications });
+    }));
+  }
+
+  @Action(UpdateClassification)
+  updateClassification(ctx: StateContext<ClassificationStateModel>, action: SaveClassification): Observable<any> {
+    return this.classificationsService.putClassification(action.classification).pipe(
+      // TODO remove this call when backend is fixed modified dates are not same
+      take(1), tap(() => this.classificationsService.getClassifications(ctx.getState().selectedClassificationType).subscribe(
+        classifications => {
+          ctx.patchState({
+            classifications
+          });
+        }
+      ))
+    );
+  }
+
   // initialize after Startup service has configured the taskanaRestUrl properly.
   ngxsAfterBootstrap(ctx: StateContext<ClassificationStateModel>): void {
     ctx.dispatch(new InitializeStore());
@@ -41,6 +179,9 @@ export class ClassificationState {
 }
 
 export interface ClassificationStateModel {
+  classifications: ClassificationDefinition[],
+  selectedClassification: ClassificationDefinition,
   selectedClassificationType: string;
   classificationTypes: CategoriesResponse,
+  action: ACTION,
 }
diff --git a/web/src/app/workplace/components/task/task.component.ts b/web/src/app/workplace/components/task/task.component.ts
index 04ebe80aa..dbc64bf6a 100644
--- a/web/src/app/workplace/components/task/task.component.ts
+++ b/web/src/app/workplace/components/task/task.component.ts
@@ -44,7 +44,9 @@ export class TaskComponent implements OnInit, OnDestroy {
   async getTask(id: string) {
     this.requestInProgress = true;
     this.task = await this.taskService.getTask(id).toPromise();
-    const classification = await this.classificationService.getClassification(this.task.classificationSummaryResource.classificationId);
+    const classification = await this.classificationService.getClassification(
+      this.task.classificationSummaryResource.classificationId
+    ).toPromise();
     this.address = this.extractUrl(classification.applicationEntryPoint) || `${this.address}/?q=${this.task.name}`;
     this.link = this.sanitizer.bypassSecurityTrustResourceUrl(this.address);
     this.getWorkbaskets();
diff --git a/web/tsconfig.json b/web/tsconfig.json
index e85340a9a..1a693cae2 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -15,7 +15,7 @@
       "node_modules/@types"
     ],
     "lib": [
-      "es2016",
+      "es2018",
       "dom"
     ]
   }