diff --git a/web/src/app/administration/administration-routing.module.ts b/web/src/app/administration/administration-routing.module.ts index 70b7f5d54..0dfcb7102 100644 --- a/web/src/app/administration/administration-routing.module.ts +++ b/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'; diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts index 2f4f9c020..d60361eba 100644 --- a/web/src/app/administration/administration.module.ts +++ b/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, diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.html b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html similarity index 100% rename from web/src/app/administration/workbasket/details/access-items/access-items.component.html rename to web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.scss b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.scss similarity index 100% rename from web/src/app/administration/workbasket/details/access-items/access-items.component.scss rename to web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.scss diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.spec.ts similarity index 94% rename from web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts rename to web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.spec.ts index fd6c9bdc3..089aa13b1 100644 --- a/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts +++ b/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; + let component: WorkbasketAccessItemsComponent; + let fixture: ComponentFixture; 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'); diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts similarity index 95% rename from web/src/app/administration/workbasket/details/access-items/access-items.component.ts rename to web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts index 964cef6e3..e25f840ee 100644 --- a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts +++ b/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; diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.html b/web/src/app/administration/components/workbasket-details/workbasket-details.component.html similarity index 100% rename from web/src/app/administration/workbasket/details/workbasket-details.component.html rename to web/src/app/administration/components/workbasket-details/workbasket-details.component.html diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts b/web/src/app/administration/components/workbasket-details/workbasket-details.component.spec.ts similarity index 88% rename from web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts rename to web/src/app/administration/components/workbasket-details/workbasket-details.component.spec.ts index 1203532db..2376da968 100644 --- a/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts +++ b/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] }); diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.ts b/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts similarity index 100% rename from web/src/app/administration/workbasket/details/workbasket-details.component.ts rename to web/src/app/administration/components/workbasket-details/workbasket-details.component.ts diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.html b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.html similarity index 69% rename from web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.html rename to web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.html index 7f3a6c8e3..b6e09ad96 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.html +++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.html @@ -14,9 +14,9 @@
- +
- +
diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.scss b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.scss similarity index 100% rename from web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.scss rename to web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.scss diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts similarity index 92% rename from web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts rename to web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts index 3d27a7bd1..aa5e5b6ba 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts +++ b/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; + let component: WorkbasketDistributionTargetsComponent; + let fixture: ComponentFixture; 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); diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts similarity index 97% rename from web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts rename to web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts index 4fbd4389a..7bbe37906 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts +++ b/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; diff --git a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html b/web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.html similarity index 100% rename from web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html rename to web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.html diff --git a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss b/web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.scss similarity index 100% rename from web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss rename to web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.scss diff --git a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts b/web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.ts similarity index 81% rename from web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts rename to web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.ts index d0b37fe67..384c21590 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts +++ b/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; @Input() distributionTargetsSelected: Array; @Output() performDualListFilter = new EventEmitter<{ filterBy: FilterModel, side: Side }>(); diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.html b/web/src/app/administration/components/workbasket-information/workbasket-information.component.html similarity index 100% rename from web/src/app/administration/workbasket/details/information/workbasket-information.component.html rename to web/src/app/administration/components/workbasket-information/workbasket-information.component.html diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.scss b/web/src/app/administration/components/workbasket-information/workbasket-information.component.scss similarity index 100% rename from web/src/app/administration/workbasket/details/information/workbasket-information.component.scss rename to web/src/app/administration/components/workbasket-information/workbasket-information.component.scss diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts b/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts similarity index 100% rename from web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts rename to web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts b/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts similarity index 98% rename from web/src/app/administration/workbasket/details/information/workbasket-information.component.ts rename to web/src/app/administration/components/workbasket-information/workbasket-information.component.ts index bbcff227d..38862922d 100644 --- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts +++ b/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', diff --git a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.html b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html similarity index 100% rename from web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.html rename to web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html diff --git a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.scss b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.scss similarity index 100% rename from web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.scss rename to web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.scss diff --git a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts similarity index 100% rename from web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts rename to web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts diff --git a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.ts b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts similarity index 93% rename from web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.ts rename to web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts index fe75acff4..97db6cbe4 100644 --- a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.ts +++ b/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', diff --git a/web/src/app/administration/workbasket/master/workbasket-list.component.html b/web/src/app/administration/components/workbasket-list/workbasket-list.component.html similarity index 100% rename from web/src/app/administration/workbasket/master/workbasket-list.component.html rename to web/src/app/administration/components/workbasket-list/workbasket-list.component.html diff --git a/web/src/app/administration/workbasket/master/workbasket-list.component.scss b/web/src/app/administration/components/workbasket-list/workbasket-list.component.scss similarity index 100% rename from web/src/app/administration/workbasket/master/workbasket-list.component.scss rename to web/src/app/administration/components/workbasket-list/workbasket-list.component.scss diff --git a/web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts similarity index 98% rename from web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts rename to web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts index 60ae706f8..284c4486f 100644 --- a/web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts +++ b/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({ diff --git a/web/src/app/administration/workbasket/master/workbasket-list.component.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts similarity index 100% rename from web/src/app/administration/workbasket/master/workbasket-list.component.ts rename to web/src/app/administration/components/workbasket-list/workbasket-list.component.ts