TSK-1187 tree component, service and model to administration

web/src/app/administration/administration.module.ts

@@ -9,6 +9,7 @@ import { ClassificationTypesSelectorComponent } from 'app/shared/classification-
 import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service';
 import { AccessItemsManagementComponent } from 'app/administration/components/access-items-management/access-items-management.component';
 import { AdministrationRoutingModule } from './administration-routing.module';
+import { TreeModule } from 'angular-tree-component';
 /**
  * Components
  */
@@ -22,6 +23,8 @@ import { WorkbasketAccessItemsComponent } from './components/workbasket-access-i
 import { ClassificationListComponent } from './components/classification-list/classification-list.component';
 import { ClassificationDetailsComponent } from './components/classification-details/classification-details.component';
 import { ImportExportComponent } from './components/import-export/import-export.component';
+import { ClassificationTreeComponent } from './components/classification-tree/tree.component';
+
 /**
  * Services
  */
@@ -29,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 { TreeService } from './services/tree.service';
 
 const MODULES = [
   CommonModule,
@@ -40,6 +44,7 @@ const MODULES = [
   AdministrationRoutingModule,
   TypeaheadModule,
   InfiniteScrollModule,
+  TreeModule.forRoot()
 ];
 
 const DECLARATIONS = [
@@ -54,7 +59,8 @@ const DECLARATIONS = [
   ImportExportComponent,
   ClassificationTypesSelectorComponent,
   ClassificationDetailsComponent,
-  AccessItemsManagementComponent
+  AccessItemsManagementComponent,
+  ClassificationTreeComponent
 ];
 
 @NgModule({
@@ -66,6 +72,7 @@ const DECLARATIONS = [
     SavingWorkbasketService,
     ClassificationCategoriesService,
     ImportExportService,
+    TreeService
   ]
 })
 export class AdministrationModule {

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

@@ -19,7 +19,7 @@ import { ClassificationsService } from 'app/shared/services/classifications/clas
 import { TreeNodeModel } from 'app/administration/models/tree-node';
 import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
 import { AlertService } from 'app/services/alert/alert.service';
-import { TreeService } from 'app/services/tree/tree.service';
+import { TreeService } from 'app/administration/services/tree.service';
 import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service';
 import { ImportExportService } from 'app/administration/services/import-export.service';
 import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';

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

@@ -15,7 +15,7 @@ import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-
 import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
 import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
 import { AlertService } from 'app/services/alert/alert.service';
-import { TreeService } from 'app/services/tree/tree.service';
+import { TreeService } from 'app/administration/services/tree.service';
 import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service';
 
 import { DomainService } from 'app/services/domain/domain.service';

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

@@ -20,7 +20,7 @@ import { DomainService } from 'app/services/domain/domain.service';
 import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
 import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
 import { configureTests } from 'app/app.test.configuration';
-import { TreeService } from 'app/services/tree/tree.service';
+import { TreeService } from 'app/administration/services/tree.service';
 import { ImportExportService } from 'app/administration/services/import-export.service';
 import { NgxsModule } from '@ngxs/store';
 import { ClassificationListComponent } from './classification-list.component';

web/src/app/administration/components/classification-tree/tree.component.spec.ts

@@ -3,13 +3,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AngularSvgIconModule } from 'angular-svg-icon';
 import { HttpClientModule } from '@angular/common/http';
 
-import { TreeService } from 'app/services/tree/tree.service';
+import { TreeService } from 'app/administration/services/tree.service';
 import { configureTests } from 'app/app.test.configuration';
 import { NgxsModule } from '@ngxs/store';
 import { TaskanaTreeComponent } from './tree.component';
-import { ClassificationDefinition } from '../../models/classification-definition';
-import { LinksClassification } from '../../models/links-classfication';
-import { ClassificationsService } from '../services/classifications/classifications.service';
+import { ClassificationDefinition } from '../../../models/classification-definition';
+import { LinksClassification } from '../../../models/links-classfication';
+import { ClassificationsService } from '../../../shared/services/classifications/classifications.service';
 
 @Component({
   selector: 'tree-root',

web/src/app/administration/components/classification-tree/tree.component.ts

@@ -8,7 +8,7 @@ import { AfterViewChecked,
   OnInit,
   Output,
   ViewChild } from '@angular/core';
-import { TreeNodeModel } from 'app/models/tree-node';
+import { TreeNodeModel } from '../../models/tree-node';
 
 import { ITreeOptions, KEYS, TreeComponent, TreeNode } from 'angular-tree-component';
 import { Pair } from 'app/models/pair';
@@ -16,18 +16,18 @@ import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Select } from '@ngxs/store';
 import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
-import { TreeService } from '../../services/tree/tree.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 { TreeService } from '../../services/tree.service';
+import { Classification } from '../../../models/classification';
+import { ClassificationDefinition } from '../../../models/classification-definition';
+import { ClassificationsService } from '../../../shared/services/classifications/classifications.service';
+import { ClassificationCategoryImages } from '../../../models/customisation';
 
 @Component({
   selector: 'taskana-tree',
   templateUrl: './tree.component.html',
   styleUrls: ['./tree.component.scss'],
 })
-export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy {
+export class ClassificationTreeComponent implements OnInit, AfterViewChecked, OnDestroy {
   @Input() treeNodes: Array<TreeNodeModel>;
   @Output() treeNodesChange = new EventEmitter<Array<TreeNodeModel>>();
   @Input() selectNodeId: string;

web/src/app/app.module.ts

@@ -25,7 +25,6 @@ import { DomainService } from 'app/services/domain/domain.service';
 import { StartupService } from 'app/services/startup-service/startup.service';
 import { AlertService } from 'app/services/alert/alert.service';
 import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
-import { TreeService } from 'app/services/tree/tree.service';
 import { TitlesService } from 'app/services/titles/titles.service';
 import { WindowRefService } from 'app/services/window/window.service';
 import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service';
@@ -106,7 +105,6 @@ export function startupServiceFactory(startupService: StartupService): () => Pro
     },
     AlertService,
     MasterAndDetailService,
-    TreeService,
     TitlesService,
     TaskanaEngineService,
     RemoveConfirmationService,

web/src/app/shared/shared.module.ts

@@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { AngularSvgIconModule } from 'angular-svg-icon';
 import { RouterModule } from '@angular/router';
-import { TreeModule } from 'angular-tree-component';
 import { AlertModule, TypeaheadModule, BsDatepickerModule } from 'ngx-bootstrap';
 import { AccordionModule } from 'ngx-bootstrap/accordion';
 import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
@@ -18,7 +17,6 @@ import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/g
 import { SpinnerComponent } from 'app/shared/spinner/spinner.component';
 import { AlertComponent } from 'app/shared/alert/alert.component';
 import { MasterAndDetailComponent } from 'app/shared/master-and-detail/master-and-detail.component';
-import { TaskanaTreeComponent } from 'app/shared/tree/tree.component';
 import { TypeAheadComponent } from 'app/shared/type-ahead/type-ahead.component';
 import { RemoveConfirmationComponent } from 'app/shared/remove-confirmation/remove-confirmation.component';
 import { FilterComponent } from 'app/shared/filter/filter.component';
@@ -61,7 +59,6 @@ const MODULES = [
   AngularSvgIconModule,
   HttpClientModule,
   RouterModule,
-  TreeModule.forRoot()
 ];
 
 const DECLARATIONS = [
@@ -70,7 +67,6 @@ const DECLARATIONS = [
   SpinnerComponent,
   AlertComponent,
   MasterAndDetailComponent,
-  TaskanaTreeComponent,
   TypeAheadComponent,
   MapValuesPipe,
   RemoveNoneTypePipe,