diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts index 8e470fea0..664ee216e 100644 --- a/web/src/app/administration/administration.module.ts +++ b/web/src/app/administration/administration.module.ts @@ -25,10 +25,10 @@ import { ImportExportComponent } from './components/import-export/import-export. /** * Services */ -import { SavingWorkbasketService } from './services/saving-workbaskets/saving-workbaskets.service'; -import { ClassificationDefinitionService } from './services/classification-definition/classification-definition.service'; +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/import-export.service'; +import { ImportExportService } from './services/import-export.service'; const MODULES = [ CommonModule, diff --git a/web/src/app/administration/classification/details/classification-details.component.spec.ts b/web/src/app/administration/classification/details/classification-details.component.spec.ts index a6e3a0fb7..a80433ddc 100644 --- a/web/src/app/administration/classification/details/classification-details.component.spec.ts +++ b/web/src/app/administration/classification/details/classification-details.component.spec.ts @@ -21,7 +21,7 @@ import { GeneralModalService } from 'app/services/general-modal/general-modal.se import { AlertService } from 'app/services/alert/alert.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/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors'; import { ClassificationDetailsComponent } from './classification-details.component'; diff --git a/web/src/app/administration/classification/details/classification-details.component.ts b/web/src/app/administration/classification/details/classification-details.component.ts index b4d1697d3..e9ed93cbf 100644 --- a/web/src/app/administration/classification/details/classification-details.component.ts +++ b/web/src/app/administration/classification/details/classification-details.component.ts @@ -22,7 +22,7 @@ import { DomainService } from 'app/services/domain/domain.service'; import { Pair } from 'app/models/pair'; import { NgForm } from '@angular/forms'; import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { map, take } from 'rxjs/operators'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors'; diff --git a/web/src/app/administration/classification/master/list/classification-list.component.spec.ts b/web/src/app/administration/classification/master/list/classification-list.component.spec.ts index fc30770e1..66885cd81 100644 --- a/web/src/app/administration/classification/master/list/classification-list.component.spec.ts +++ b/web/src/app/administration/classification/master/list/classification-list.component.spec.ts @@ -15,13 +15,13 @@ import { ClassificationTypesSelectorComponent } from 'app/shared/classification- import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service'; import { AlertService } from 'app/services/alert/alert.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; -import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; +import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; 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 { ImportExportService } from 'app/administration/services/import-export/import-export.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/administration/classification/master/list/classification-list.component.ts b/web/src/app/administration/classification/master/list/classification-list.component.ts index d987c0d62..0e221578a 100644 --- a/web/src/app/administration/classification/master/list/classification-list.component.ts +++ b/web/src/app/administration/classification/master/list/classification-list.component.ts @@ -10,7 +10,7 @@ import { TreeNodeModel } from 'app/models/tree-node'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; import { Pair } from 'app/models/pair'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors'; import { ClassificationDefinition } from '../../../../models/classification-definition'; diff --git a/web/src/app/administration/components/import-export/import-export.component.spec.ts b/web/src/app/administration/components/import-export/import-export.component.spec.ts index fbe329ac7..041ef86e9 100644 --- a/web/src/app/administration/components/import-export/import-export.component.spec.ts +++ b/web/src/app/administration/components/import-export/import-export.component.spec.ts @@ -1,13 +1,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; +import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; import { AlertService } from 'app/services/alert/alert.service'; import { HttpClientModule } from '@angular/common/http'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { configureTests } from 'app/app.test.configuration'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { WorkbasketDefinitionService } from '../../services/workbasket-definition.service'; import { ImportExportComponent } from './import-export.component'; diff --git a/web/src/app/administration/components/import-export/import-export.component.ts b/web/src/app/administration/components/import-export/import-export.component.ts index b45593c7d..eeb9971fe 100644 --- a/web/src/app/administration/components/import-export/import-export.component.ts +++ b/web/src/app/administration/components/import-export/import-export.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; +import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service'; import { DomainService } from 'app/services/domain/domain.service'; import { TaskanaType } from 'app/models/taskana-type'; @@ -9,7 +9,7 @@ import { environment } from 'environments/environment'; import { AlertService } from 'app/services/alert/alert.service'; import { AlertModel, AlertType } from 'app/models/alert'; import { UploadService } from 'app/shared/services/upload/upload.service'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { HttpErrorResponse } from '@angular/common/http'; import { ERROR_TYPES } from '../../../models/errors'; import { ErrorsService } from '../../../services/errors/errors.service'; diff --git a/web/src/app/administration/services/classification-definition/classification-definition.service.ts b/web/src/app/administration/services/classification-definition.service.ts similarity index 100% rename from web/src/app/administration/services/classification-definition/classification-definition.service.ts rename to web/src/app/administration/services/classification-definition.service.ts diff --git a/web/src/app/administration/services/import-export/import-export.service.ts b/web/src/app/administration/services/import-export.service.ts similarity index 100% rename from web/src/app/administration/services/import-export/import-export.service.ts rename to web/src/app/administration/services/import-export.service.ts diff --git a/web/src/app/administration/services/saving-workbaskets/saving-workbaskets.service.spec.ts b/web/src/app/administration/services/saving-workbaskets.service.spec.ts similarity index 100% rename from web/src/app/administration/services/saving-workbaskets/saving-workbaskets.service.spec.ts rename to web/src/app/administration/services/saving-workbaskets.service.spec.ts diff --git a/web/src/app/administration/services/saving-workbaskets/saving-workbaskets.service.ts b/web/src/app/administration/services/saving-workbaskets.service.ts similarity index 100% rename from web/src/app/administration/services/saving-workbaskets/saving-workbaskets.service.ts rename to web/src/app/administration/services/saving-workbaskets.service.ts diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts b/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts index b25fc0e17..fd6c9bdc3 100644 --- a/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts +++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts @@ -15,7 +15,7 @@ import { ICONTYPES } from 'app/models/type'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; +import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts index 1913a7cb6..964cef6e3 100644 --- a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts +++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts @@ -9,7 +9,7 @@ import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-item import { ACTION } from 'app/models/action'; import { AlertModel, AlertType } from 'app/models/alert'; -import { SavingInformation, SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; +import { SavingInformation, SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts index 52c217fef..3d27a7bd1 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts +++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts @@ -15,7 +15,7 @@ import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-dis import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; +import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts index 492f0669e..4fbd4389a 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts +++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts @@ -11,7 +11,7 @@ import { AlertModel, AlertType } from 'app/models/alert'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; -import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; +import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts b/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts index e07119f34..3c5d6dcb3 100644 --- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts +++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts @@ -14,7 +14,7 @@ import { ACTION } from 'app/models/action'; import { Links } from 'app/models/links'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; +import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service'; import { AlertService } from 'app/services/alert/alert.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { configureTests } from 'app/app.test.configuration'; diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts index a2988dcbb..bbcff227d 100644 --- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts +++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts @@ -12,7 +12,7 @@ import { TaskanaDate } from 'app/shared/util/taskana.date'; import { AlertService } from 'app/services/alert/alert.service'; import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; +import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts b/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts index e5c84e3e1..1203532db 100644 --- a/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts +++ b/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts @@ -19,13 +19,13 @@ import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { AlertService } from 'app/services/alert/alert.service'; -import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; +import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.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 { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +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'; diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.ts b/web/src/app/administration/workbasket/details/workbasket-details.component.ts index 2416f4f73..87b9cdbbb 100644 --- a/web/src/app/administration/workbasket/details/workbasket-details.component.ts +++ b/web/src/app/administration/workbasket/details/workbasket-details.component.ts @@ -8,7 +8,7 @@ import { ACTION } from 'app/models/action'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { DomainService } from 'app/services/domain/domain.service'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { GeneralModalService } from '../../../services/general-modal/general-modal.service'; import { MessageModal } from '../../../models/message-modal'; import { ERROR_TYPES } from '../../../models/errors'; diff --git a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts b/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts index cf0bf3634..f5a216210 100644 --- a/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts +++ b/web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts @@ -18,10 +18,10 @@ import { SortingModel } from 'app/models/sorting'; import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; +import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service'; import { configureTests } from 'app/app.test.configuration'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar.component'; @Component({ diff --git a/web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts b/web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts index 8ab0e7e71..60ae706f8 100644 --- a/web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts +++ b/web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts @@ -15,12 +15,12 @@ import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service'; -import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; +import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; 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/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar/workbasket-list-toolbar.component'; import { WorkbasketListComponent } from './workbasket-list.component'; diff --git a/web/src/app/administration/workbasket/master/workbasket-list.component.ts b/web/src/app/administration/workbasket/master/workbasket-list.component.ts index 54d4e9961..779ef6b91 100644 --- a/web/src/app/administration/workbasket/master/workbasket-list.component.ts +++ b/web/src/app/administration/workbasket/master/workbasket-list.component.ts @@ -11,7 +11,7 @@ import { Orientation } from 'app/models/orientation'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { OrientationService } from 'app/services/orientation/orientation.service'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; -import { ImportExportService } from 'app/administration/services/import-export/import-export.service'; +import { ImportExportService } from 'app/administration/services/import-export.service'; @Component({ selector: 'taskana-workbasket-list',