TSK-1324: Moved tree from shared to administration component

This commit is contained in:
Sofie Hofmann 2020-07-07 10:14:42 +02:00 committed by Mustapha Zorgati
parent 1fdf793a7b
commit eb480e4764
10 changed files with 19 additions and 20 deletions

View File

@ -11,7 +11,7 @@ import { Location } from '@angular/common';
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 { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { TreeNodeModel } from 'app/shared/models/tree-node';
import { TreeNodeModel } from 'app/administration/models/tree-node';
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';

View File

@ -52,8 +52,8 @@
<!-- CLASSIFICATION TREE -->
<taskana-shared-spinner class="col-xs-12" [isRunning]="requestInProgress" positionClass="centered-spinner-whole-screen"></taskana-shared-spinner>
<taskana-shared-tree class="col-xs-12" *ngIf="(classifications && classifications.length) else empty_classifications"
[filterText]="inputValue" [filterIcon]="selectedCategory" (switchTaskanaSpinnerEmit)="requestInProgress=$event"></taskana-shared-tree>
<taskana-administration-tree class="col-xs-12" *ngIf="(classifications && classifications.length) else empty_classifications"
[filterText]="inputValue" [filterIcon]="selectedCategory" (switchTaskanaSpinnerEmit)="requestInProgress=$event"></taskana-administration-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>

View File

@ -7,7 +7,7 @@ import { Routes } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { AngularSvgIconModule } from 'angular-svg-icon';
import { TreeNodeModel } from 'app/shared/models/tree-node';
import { TreeNodeModel } from 'app/administration/models/tree-node';
import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component';
import { ClassificationTypesSelectorComponent } from 'app/administration/components/classification-types-selector/classification-types-selector.component';

View File

@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core';
import { ComponentFixture, TestBed, tick } from '@angular/core/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AngularSvgIconModule } from 'angular-svg-icon';
import { HttpClientModule } from '@angular/common/http';
@ -8,12 +8,11 @@ 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 { ClassificationsService } from '../../services/classifications/classifications.service';
import { Classification } from '../../models/classification';
import { ClassificationsService } from '../../../shared/services/classifications/classifications.service';
import { Classification } from '../../../shared/models/classification';
@Component({
selector: 'tree-root',

View File

@ -8,7 +8,7 @@ import { AfterViewChecked,
OnInit,
Output,
ViewChild } from '@angular/core';
import { TreeNodeModel } from 'app/shared/models/tree-node';
import { TreeNodeModel } from 'app/administration/models/tree-node';
import { ITreeOptions, KEYS, TREE_ACTIONS, TreeComponent } from 'angular-tree-component';
import { Pair } from 'app/shared/models/pair';
@ -20,18 +20,18 @@ import { EngineConfigurationSelectors } from 'app/shared/store/engine-configurat
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 { ClassificationsService } from '../../services/classifications/classifications.service';
import { ClassificationCategoryImages } from '../../models/customisation';
import { ClassificationSelectors } from '../../store/classification-store/classification.selectors';
import { Classification } from '../../../shared/models/classification';
import { ClassificationsService } from '../../../shared/services/classifications/classifications.service';
import { ClassificationCategoryImages } from '../../../shared/models/customisation';
import { ClassificationSelectors } from '../../../shared/store/classification-store/classification.selectors';
import { DeselectClassification,
SelectClassification,
UpdateClassification } from '../../store/classification-store/classification.actions';
import { ACTION } from '../../models/action';
import { ClassificationTreeService } from '../../services/classification-tree/classification-tree.service';
UpdateClassification } from '../../../shared/store/classification-store/classification.actions';
import { ACTION } from '../../../shared/models/action';
import { ClassificationTreeService } from '../../services/classification-tree.service';
@Component({
selector: 'taskana-shared-tree',
selector: 'taskana-administration-tree',
templateUrl: './tree.component.html',
styleUrls: ['./tree.component.scss'],
})

View File

@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { TreeNodeModel } from '../../models/tree-node';
import { Classification } from '../../models/classification';
import { TreeNodeModel } from '../models/tree-node';
import { Classification } from '../../shared/models/classification';
@Injectable({
providedIn: 'root'

View File

@ -15,7 +15,7 @@ import { ClassificationsService } from 'app/shared/services/classifications/clas
*/
import { SpinnerComponent } from 'app/shared/components/spinner/spinner.component';
import { MasterAndDetailComponent } from 'app/shared/components/master-and-detail/master-and-detail.component';
import { TaskanaTreeComponent } from 'app/shared/components/tree/tree.component';
import { TaskanaTreeComponent } from 'app/administration/components/tree/tree.component';
import { TypeAheadComponent } from 'app/shared/components/type-ahead/type-ahead.component';
import { FilterComponent } from 'app/shared/components/filter/filter.component';
import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.component';