diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts index 4db2ea766..fa55bcaec 100644 --- a/web/src/app/administration/administration.module.ts +++ b/web/src/app/administration/administration.module.ts @@ -24,8 +24,6 @@ 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 */ @@ -33,7 +31,6 @@ 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, @@ -45,7 +42,6 @@ const MODULES = [ AdministrationRoutingModule, TypeaheadModule, InfiniteScrollModule, - TreeModule.forRoot() ]; const DECLARATIONS = [ @@ -60,8 +56,7 @@ const DECLARATIONS = [ ImportExportComponent, ClassificationTypesSelectorComponent, ClassificationDetailsComponent, - AccessItemsManagementComponent, - ClassificationTreeComponent + AccessItemsManagementComponent ]; @NgModule({ @@ -73,7 +68,6 @@ const DECLARATIONS = [ SavingWorkbasketService, ClassificationCategoriesService, ImportExportService, - TreeService ] }) export class AdministrationModule { 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 29e92bbb3..a80433ddc 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 @@ -19,7 +19,7 @@ import { ClassificationsService } from 'app/shared/services/classifications/clas import { TreeNodeModel } from 'app/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/administration/services/tree.service'; +import { TreeService } from 'app/services/tree/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'; 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 9e327fe22..e9ed93cbf 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 @@ -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/administration/services/tree.service'; +import { TreeService } from 'app/services/tree/tree.service'; import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; import { DomainService } from 'app/services/domain/domain.service'; 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 74f19f112..66885cd81 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 @@ -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/administration/services/tree.service'; +import { TreeService } from 'app/services/tree/tree.service'; import { ImportExportService } from 'app/administration/services/import-export.service'; import { NgxsModule } from '@ngxs/store'; import { ClassificationListComponent } from './classification-list.component'; diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts index 266a4ad65..1a7c9d547 100644 --- a/web/src/app/app.module.ts +++ b/web/src/app/app.module.ts @@ -25,6 +25,7 @@ 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'; @@ -105,6 +106,7 @@ export function startupServiceFactory(startupService: StartupService): () => Pro }, AlertService, MasterAndDetailService, + TreeService, TitlesService, TaskanaEngineService, RemoveConfirmationService, diff --git a/web/src/app/administration/services/tree.service.ts b/web/src/app/services/tree/tree.service.ts similarity index 100% rename from web/src/app/administration/services/tree.service.ts rename to web/src/app/services/tree/tree.service.ts diff --git a/web/src/app/shared/shared.module.ts b/web/src/app/shared/shared.module.ts index 1b56f9d30..c31c554a8 100644 --- a/web/src/app/shared/shared.module.ts +++ b/web/src/app/shared/shared.module.ts @@ -4,6 +4,7 @@ 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'; @@ -17,6 +18,7 @@ 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'; @@ -59,6 +61,7 @@ const MODULES = [ AngularSvgIconModule, HttpClientModule, RouterModule, + TreeModule.forRoot() ]; const DECLARATIONS = [ @@ -67,6 +70,7 @@ const DECLARATIONS = [ SpinnerComponent, AlertComponent, MasterAndDetailComponent, + TaskanaTreeComponent, TypeAheadComponent, MapValuesPipe, RemoveNoneTypePipe, diff --git a/web/src/app/administration/components/classification-tree/tree.component.html b/web/src/app/shared/tree/tree.component.html similarity index 100% rename from web/src/app/administration/components/classification-tree/tree.component.html rename to web/src/app/shared/tree/tree.component.html diff --git a/web/src/app/administration/components/classification-tree/tree.component.scss b/web/src/app/shared/tree/tree.component.scss similarity index 100% rename from web/src/app/administration/components/classification-tree/tree.component.scss rename to web/src/app/shared/tree/tree.component.scss diff --git a/web/src/app/administration/components/classification-tree/tree.component.spec.ts b/web/src/app/shared/tree/tree.component.spec.ts similarity index 91% rename from web/src/app/administration/components/classification-tree/tree.component.spec.ts rename to web/src/app/shared/tree/tree.component.spec.ts index 49e2cf664..31aecfa63 100644 --- a/web/src/app/administration/components/classification-tree/tree.component.spec.ts +++ b/web/src/app/shared/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/administration/services/tree.service'; +import { TreeService } from 'app/services/tree/tree.service'; import { configureTests } from 'app/app.test.configuration'; import { NgxsModule } from '@ngxs/store'; -import { ClassificationTreeComponent } from './tree.component'; -import { ClassificationDefinition } from '../../../models/classification-definition'; -import { LinksClassification } from '../../../models/links-classfication'; -import { ClassificationsService } from '../../../shared/services/classifications/classifications.service'; +import { TaskanaTreeComponent } from './tree.component'; +import { ClassificationDefinition } from '../../models/classification-definition'; +import { LinksClassification } from '../../models/links-classfication'; +import { ClassificationsService } from '../services/classifications/classifications.service'; @Component({ selector: 'tree-root', diff --git a/web/src/app/administration/components/classification-tree/tree.component.ts b/web/src/app/shared/tree/tree.component.ts similarity index 92% rename from web/src/app/administration/components/classification-tree/tree.component.ts rename to web/src/app/shared/tree/tree.component.ts index cd05af58e..cf5ac21f2 100644 --- a/web/src/app/administration/components/classification-tree/tree.component.ts +++ b/web/src/app/shared/tree/tree.component.ts @@ -8,6 +8,7 @@ import { AfterViewChecked, OnInit, Output, ViewChild } from '@angular/core'; +import { TreeNodeModel } from 'app/models/tree-node'; import { ITreeOptions, KEYS, TreeComponent, TreeNode } from 'angular-tree-component'; import { Pair } from 'app/models/pair'; @@ -16,19 +17,18 @@ 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.service'; -import { TreeNodeModel } from '../../models/tree-node'; -import { Classification } from '../../../models/classification'; -import { ClassificationDefinition } from '../../../models/classification-definition'; -import { ClassificationsService } from '../../../shared/services/classifications/classifications.service'; -import { ClassificationCategoryImages } from '../../../models/customisation'; +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'; @Component({ selector: 'taskana-tree', templateUrl: './tree.component.html', styleUrls: ['./tree.component.scss'], }) -export class ClassificationTreeComponent implements OnInit, AfterViewChecked, OnDestroy { +export class TaskanaTreeComponent implements OnInit, AfterViewChecked, OnDestroy { @Input() treeNodes: Array; @Output() treeNodesChange = new EventEmitter>(); @Input() selectNodeId: string;