TSK-1187 renamed and rearranged the workbasket in administration

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

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { WorkbasketListComponent } from 'app/administration/workbasket/master/workbasket-list.component';
-import { WorkbasketDetailsComponent } from 'app/administration/workbasket/details/workbasket-details.component';
+import { WorkbasketListComponent } from 'app/administration/components/workbasket-list/workbasket-list.component';
+import { WorkbasketDetailsComponent } from 'app/administration/components/workbasket-details/workbasket-details.component';
 import { MasterAndDetailComponent } from 'app/shared/master-and-detail/master-and-detail.component';
 import { ClassificationListComponent } from 'app/administration/components/classification-list/classification-list.component';
 import { ClassificationDetailsComponent } from 'app/administration/components/classification-details/classification-details.component';

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

@@ -12,13 +12,13 @@ import { AdministrationRoutingModule } from './administration-routing.module';
 /**
  * Components
  */
-import { WorkbasketListComponent } from './workbasket/master/workbasket-list.component';
-import { WorkbasketListToolbarComponent } from './workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component';
-import { WorkbasketDetailsComponent } from './workbasket/details/workbasket-details.component';
-import { WorkbasketInformationComponent } from './workbasket/details/information/workbasket-information.component';
-import { DistributionTargetsComponent } from './workbasket/details/distribution-targets/distribution-targets.component';
-import { DualListComponent } from './workbasket/details/distribution-targets/dual-list/dual-list.component';
-import { AccessItemsComponent } from './workbasket/details/access-items/access-items.component';
+import { WorkbasketListComponent } from './components/workbasket-list/workbasket-list.component';
+import { WorkbasketListToolbarComponent } from './components/workbasket-list-toolbar/workbasket-list-toolbar.component';
+import { WorkbasketDetailsComponent } from './components/workbasket-details/workbasket-details.component';
+import { WorkbasketInformationComponent } from './components/workbasket-information/workbasket-information.component';
+import { WorkbasketDistributionTargetsComponent } from './components/workbasket-distribution-targets/workbasket-distribution-targets.component';
+import { WorkbasketDualListComponent } from './components/workbasket-dual-list/workbasket-dual-list.component';
+import { WorkbasketAccessItemsComponent } from './components/workbasket-access-items/workbasket-access-items.component';
 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';
@@ -45,11 +45,11 @@ const MODULES = [
 const DECLARATIONS = [
   WorkbasketListComponent,
   WorkbasketListToolbarComponent,
-  AccessItemsComponent,
+  WorkbasketAccessItemsComponent,
   WorkbasketDetailsComponent,
   WorkbasketInformationComponent,
-  DistributionTargetsComponent,
-  DualListComponent,
+  WorkbasketDistributionTargetsComponent,
+  WorkbasketDualListComponent,
   ClassificationListComponent,
   ImportExportComponent,
   ClassificationTypesSelectorComponent,

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

@@ -23,11 +23,11 @@ import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.serv
 import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
 import { NgxsModule, Store } from '@ngxs/store';
 import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
-import { AccessItemsComponent } from './access-items.component';
+import { WorkbasketAccessItemsComponent } from './workbasket-access-items.component';
 
 describe('AccessItemsComponent', () => {
-  let component: AccessItemsComponent;
-  let fixture: ComponentFixture<AccessItemsComponent>;
+  let component: WorkbasketAccessItemsComponent;
+  let fixture: ComponentFixture<WorkbasketAccessItemsComponent>;
   let workbasketService;
   let debugElement;
   let alertService;
@@ -38,7 +38,7 @@ describe('AccessItemsComponent', () => {
 
   const configure = (testBed: TestBed) => {
     testBed.configureTestingModule({
-      declarations: [AccessItemsComponent],
+      declarations: [WorkbasketAccessItemsComponent],
       imports: [FormsModule, AngularSvgIconModule, HttpClientModule, ReactiveFormsModule, NgxsModule.forRoot()],
       providers: [WorkbasketService, AlertService, GeneralModalService, SavingWorkbasketService, RequestInProgressService,
         AccessIdsService, FormsValidatorService, { provide: Store, useValue: storeSpy }]
@@ -61,7 +61,7 @@ describe('AccessItemsComponent', () => {
         }
       });
 
-      fixture = testBed.createComponent(AccessItemsComponent);
+      fixture = testBed.createComponent(WorkbasketAccessItemsComponent);
 
       component = fixture.componentInstance;
       component.workbasket = new Workbasket('1');

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

@@ -18,17 +18,17 @@ import { highlight } from 'app/shared/animations/validation.animation';
 import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
 import { AccessIdDefinition } from 'app/models/access-id';
 import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
-import { ERROR_TYPES } from '../../../../models/errors';
-import { ErrorsService } from '../../../../services/errors/errors.service';
-import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../../models/customisation';
+import { ERROR_TYPES } from '../../../models/errors';
+import { ErrorsService } from '../../../services/errors/errors.service';
+import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../models/customisation';
 
 @Component({
   selector: 'taskana-workbasket-access-items',
-  templateUrl: './access-items.component.html',
+  templateUrl: './workbasket-access-items.component.html',
   animations: [highlight],
-  styleUrls: ['./access-items.component.scss']
+  styleUrls: ['./workbasket-access-items.component.scss']
 })
-export class AccessItemsComponent implements OnChanges, OnDestroy {
+export class WorkbasketAccessItemsComponent implements OnChanges, OnDestroy {
   @Input()
   workbasket: Workbasket;
 

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

@@ -27,10 +27,10 @@ import { configureTests } from 'app/app.test.configuration';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { ImportExportService } from 'app/administration/services/import-export.service';
 import { WorkbasketDetailsComponent } from './workbasket-details.component';
-import { WorkbasketInformationComponent } from './information/workbasket-information.component';
-import { AccessItemsComponent } from './access-items/access-items.component';
-import { DistributionTargetsComponent } from './distribution-targets/distribution-targets.component';
-import { DualListComponent } from './distribution-targets/dual-list/dual-list.component';
+import { WorkbasketInformationComponent } from '../workbasket-information/workbasket-information.component';
+import { WorkbasketAccessItemsComponent } from '../workbasket-access-items/workbasket-access-items.component';
+import { WorkbasketDistributionTargetsComponent } from '../workbasket-distribution-targets/workbasket-distribution-targets.component';
+import { WorkbasketDualListComponent } from '../workbasket-dual-list/workbasket-dual-list.component';
 
 @Component({
   selector: 'taskana-dummy-detail',
@@ -59,8 +59,8 @@ describe('WorkbasketDetailsComponent', () => {
         imports: [RouterTestingModule.withRoutes(routes), FormsModule, AngularSvgIconModule, HttpClientModule, ReactiveFormsModule,
           InfiniteScrollModule],
         declarations: [WorkbasketDetailsComponent, WorkbasketInformationComponent,
-          AccessItemsComponent,
-          DistributionTargetsComponent, DualListComponent, DummyDetailComponent],
+          WorkbasketAccessItemsComponent,
+          WorkbasketDistributionTargetsComponent, WorkbasketDualListComponent, DummyDetailComponent],
         providers: [WorkbasketService, MasterAndDetailService, GeneralModalService, RequestInProgressService,
           AlertService, SavingWorkbasketService, ImportExportService]
       });

web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.html

@@ -14,9 +14,9 @@
 	</div>
 	<div #panelBody class="panel-body">
     <div class="dual-list list-left col-xs-12 col-md-5-6 container">
-      <taskana-dual-list #dualListLeft id="dual-list-Left" header="Available distribution targets" [(distributionTargets)]="distributionTargetsLeft"
+      <taskana-workbasket-dual-list #dualListLeft id="dual-list-Left" header="Available distribution targets" [(distributionTargets)]="distributionTargetsLeft"
                                     [distributionTargetsSelected]="distributionTargetsSelected" (performDualListFilter)="performFilter($event)" (scrolling)="onScroll($event)" [side]="side.LEFT"
-      [requestInProgress]="requestInProgressLeft" [loadingItems]="loadingItems" [(allSelected)]="selectAllLeft"></taskana-dual-list>
+                                    [requestInProgress]="requestInProgressLeft" [loadingItems]="loadingItems" [(allSelected)]="selectAllLeft"></taskana-workbasket-dual-list>
     </div>
 
 		<div class="hidden-xs hidden-sm col-md-1 list-arrows text-center button-margin-top">
@@ -40,9 +40,9 @@
 			</button>
     </div>
     <div class="dual-list list-right col-xs-12 col-md-5-6 container">
-      <taskana-dual-list #dualListRight id="dual-list-right" header="Selected distribution targets" [(distributionTargets)]="distributionTargetsRight"
+      <taskana-workbasket-dual-list #dualListRight id="dual-list-right" header="Selected distribution targets" [(distributionTargets)]="distributionTargetsRight"
                                     [distributionTargetsSelected]="distributionTargetsSelected" (performDualListFilter)="performFilter($event)" [requestInProgress]="requestInProgressRight"
-      [side]="side.RIGHT" [(allSelected)]="selectAllRight"></taskana-dual-list>
+                                    [side]="side.RIGHT" [(allSelected)]="selectAllRight"></taskana-workbasket-dual-list>
     </div>
 	</div>
 </div>

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

@@ -21,12 +21,12 @@ import { RequestInProgressService } from 'app/services/requestInProgress/request
 import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary';
 import { configureTests } from 'app/app.test.configuration';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { DistributionTargetsComponent, Side } from './distribution-targets.component';
-import { DualListComponent } from './dual-list/dual-list.component';
+import { WorkbasketDistributionTargetsComponent, Side } from './workbasket-distribution-targets.component';
+import { WorkbasketDualListComponent } from '../workbasket-dual-list/workbasket-dual-list.component';
 
 describe('DistributionTargetsComponent', () => {
-  let component: DistributionTargetsComponent;
-  let fixture: ComponentFixture<DistributionTargetsComponent>;
+  let component: WorkbasketDistributionTargetsComponent;
+  let fixture: ComponentFixture<WorkbasketDistributionTargetsComponent>;
   let workbasketService;
   const workbasket = new Workbasket('1', '', '', '', ICONTYPES.TOPIC, '', '', '', '', '', '', '', '', '', '', '', '',
     new Links({ href: 'someurl' }, { href: 'someurl' }, { href: 'someurl' }));
@@ -35,13 +35,13 @@ describe('DistributionTargetsComponent', () => {
     const configure = (testBed: TestBed) => {
       testBed.configureTestingModule({
         imports: [AngularSvgIconModule, HttpClientModule, InfiniteScrollModule],
-        declarations: [DistributionTargetsComponent, DualListComponent],
+        declarations: [WorkbasketDistributionTargetsComponent, WorkbasketDualListComponent],
         providers: [WorkbasketService, AlertService, SavingWorkbasketService, GeneralModalService, RequestInProgressService,
         ]
       });
     };
     configureTests(configure).then(testBed => {
-      fixture = TestBed.createComponent(DistributionTargetsComponent);
+      fixture = TestBed.createComponent(WorkbasketDistributionTargetsComponent);
       component = fixture.componentInstance;
       component.workbasket = workbasket;
       workbasketService = TestBed.get(WorkbasketService);

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

@@ -18,8 +18,8 @@ import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
 import { Page } from 'app/models/page';
 import { OrientationService } from 'app/services/orientation/orientation.service';
 import { Orientation } from 'app/models/orientation';
-import { ERROR_TYPES } from '../../../../models/errors';
-import { ErrorsService } from '../../../../services/errors/errors.service';
+import { ERROR_TYPES } from '../../../models/errors';
+import { ErrorsService } from '../../../services/errors/errors.service';
 
 export enum Side {
   LEFT,
@@ -27,10 +27,10 @@ export enum Side {
 }
 @Component({
   selector: 'taskana-workbaskets-distribution-targets',
-  templateUrl: './distribution-targets.component.html',
-  styleUrls: ['./distribution-targets.component.scss']
+  templateUrl: './workbasket-distribution-targets.component.html',
+  styleUrls: ['./workbasket-distribution-targets.component.scss']
 })
-export class DistributionTargetsComponent implements OnChanges, OnDestroy {
+export class WorkbasketDistributionTargetsComponent implements OnChanges, OnDestroy {
   @Input()
   workbasket: Workbasket;
 

web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.ts

@@ -2,15 +2,15 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { WorkbasketSummary } from 'app/models/workbasket-summary';
 import { FilterModel } from 'app/models/filter';
 import { expandDown } from 'app/shared/animations/expand.animation';
-import { Side } from '../distribution-targets.component';
+import { Side } from '../workbasket-distribution-targets/workbasket-distribution-targets.component';
 
 @Component({
-  selector: 'taskana-dual-list',
-  templateUrl: './dual-list.component.html',
-  styleUrls: ['./dual-list.component.scss'],
+  selector: 'taskana-workbasket-dual-list',
+  templateUrl: './workbasket-dual-list.component.html',
+  styleUrls: ['./workbasket-dual-list.component.scss'],
   animations: [expandDown]
 })
-export class DualListComponent implements OnInit {
+export class WorkbasketDualListComponent implements OnInit {
   @Input() distributionTargets: Array<WorkbasketSummary>;
   @Input() distributionTargetsSelected: Array<WorkbasketSummary>;
   @Output() performDualListFilter = new EventEmitter<{ filterBy: FilterModel, side: Side }>();

web/src/app/administration/components/workbasket-information/workbasket-information.component.ts

@@ -19,9 +19,9 @@ import { RemoveConfirmationService } from 'app/services/remove-confirmation/remo
 import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
 import { map } from 'rxjs/operators';
 import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
-import { ERROR_TYPES } from '../../../../models/errors';
-import { ErrorsService } from '../../../../services/errors/errors.service';
-import { CustomField, getCustomFields, WorkbasketsCustomisation } from '../../../../models/customisation';
+import { ERROR_TYPES } from '../../../models/errors';
+import { ErrorsService } from '../../../services/errors/errors.service';
+import { CustomField, getCustomFields, WorkbasketsCustomisation } from '../../../models/customisation';
 
 @Component({
   selector: 'taskana-workbasket-information',

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

@@ -9,8 +9,8 @@ import { WorkbasketSummary } from 'app/models/workbasket-summary';
 import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
 import { TaskanaType } from 'app/models/taskana-type';
 import { expandDown } from 'app/shared/animations/expand.animation';
-import { ErrorsService } from '../../../../services/errors/errors.service';
-import { ERROR_TYPES } from '../../../../models/errors';
+import { ErrorsService } from '../../../services/errors/errors.service';
+import { ERROR_TYPES } from '../../../models/errors';
 
 @Component({
   selector: 'taskana-workbasket-list-toolbar',

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

@@ -21,7 +21,7 @@ import { OrientationService } from 'app/services/orientation/orientation.service
 import { configureTests } from 'app/app.test.configuration';
 import { Page } from 'app/models/page';
 import { ImportExportService } from 'app/administration/services/import-export.service';
-import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar/workbasket-list-toolbar.component';
+import { WorkbasketListToolbarComponent } from '../workbasket-list-toolbar/workbasket-list-toolbar.component';
 import { WorkbasketListComponent } from './workbasket-list.component';
 
 @Component({