diff --git a/web/src/app/administration/administration-routing.module.ts b/web/src/app/administration/administration-routing.module.ts index 0dfcb7102..8637829b2 100644 --- a/web/src/app/administration/administration-routing.module.ts +++ b/web/src/app/administration/administration-routing.module.ts @@ -3,10 +3,10 @@ import { Routes, RouterModule } from '@angular/router'; 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 { MasterAndDetailComponent } from 'app/shared/components/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'; -import { DomainGuard } from 'app/guards/domain.guard'; +import { DomainGuard } from 'app/shared/guards/domain.guard'; import { AccessItemsManagementComponent } from './components/access-items-management/access-items-management.component'; const routes: Routes = [ diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts index fa55bcaec..2033ce52e 100644 --- a/web/src/app/administration/administration.module.ts +++ b/web/src/app/administration/administration.module.ts @@ -7,8 +7,8 @@ import { SharedModule } from 'app/shared/shared.module'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { TreeModule } from 'angular-tree-component'; -import { ClassificationTypesSelectorComponent } from 'app/shared/classification-types-selector/classification-types-selector.component'; -import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service'; +import { ClassificationTypesSelectorComponent } from 'app/administration/components/classification-types-selector/classification-types-selector.component'; +import { ClassificationCategoriesService } from 'app/shared/services/classification-categories/classification-categories.service'; import { AccessItemsManagementComponent } from 'app/administration/components/access-items-management/access-items-management.component'; import { AdministrationRoutingModule } from './administration-routing.module'; /** diff --git a/web/src/app/administration/components/access-items-management/access-items-management.component.spec.ts b/web/src/app/administration/components/access-items-management/access-items-management.component.spec.ts index 821cf17a9..fe252ed19 100644 --- a/web/src/app/administration/components/access-items-management/access-items-management.component.spec.ts +++ b/web/src/app/administration/components/access-items-management/access-items-management.component.spec.ts @@ -2,9 +2,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { configureTests } from 'app/app.test.configuration'; import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.service'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; -import { AccessIdDefinition } from 'app/models/access-id'; -import { AccessItemsWorkbasketResource } from 'app/models/access-item-workbasket-resource'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; +import { AccessIdDefinition } from 'app/shared/models/access-id'; +import { AccessItemWorkbasketResource } from 'app/shared/models/access-item-workbasket-resource'; import { of } from 'rxjs'; import { NgxsModule } from '@ngxs/store'; import { AccessItemsManagementComponent } from './access-items-management.component'; @@ -30,7 +30,7 @@ describe('AccessItemsManagementComponent', () => { component = fixture.componentInstance; accessIdsService = testBed.get(AccessIdsService); spyOn(accessIdsService, 'getAccessItemsPermissions').and.returnValue(of(new Array())); - spyOn(accessIdsService, 'getAccessItemsInformation').and.returnValue(of(new AccessItemsWorkbasketResource())); + spyOn(accessIdsService, 'getAccessItemsInformation').and.returnValue(of(new AccessItemWorkbasketResource())); fixture.detectChanges(); done(); }); diff --git a/web/src/app/administration/components/access-items-management/access-items-management.component.ts b/web/src/app/administration/components/access-items-management/access-items-management.component.ts index c8b2cfd14..5ee41a666 100644 --- a/web/src/app/administration/components/access-items-management/access-items-management.component.ts +++ b/web/src/app/administration/components/access-items-management/access-items-management.component.ts @@ -4,22 +4,22 @@ import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@ang import { Observable, Subscription } from 'rxjs'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; -import { AccessItemsWorkbasketResource } from 'app/models/access-item-workbasket-resource'; -import { AccessItemWorkbasket } from 'app/models/access-item-workbasket'; -import { SortingModel } from 'app/models/sorting'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; -import { AlertModel, AlertType } from 'app/models/alert'; -import { AlertService } from 'app/services/alert/alert.service'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; +import { AccessItemWorkbasketResource } from 'app/shared/models/access-item-workbasket-resource'; +import { AccessItemWorkbasket } from 'app/shared/models/access-item-workbasket'; +import { Sorting } from 'app/shared/models/sorting'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; +import { AlertService } from 'app/shared/services/alert/alert.service'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; -import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; import { AccessIdsService } from '../../../shared/services/access-ids/access-ids.service'; -import { AccessIdDefinition } from '../../../models/access-id'; -import { ErrorsService } from '../../../services/errors/errors.service'; -import { ERROR_TYPES } from '../../../models/errors'; -import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../models/customisation'; -import { customFieldCount } from '../../../models/workbasket-access-items'; +import { AccessIdDefinition } from '../../../shared/models/access-id'; +import { ErrorsService } from '../../../shared/services/errors/errors.service'; +import { ERROR_TYPES } from '../../../shared/models/errors'; +import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../shared/models/customisation'; +import { customFieldCount } from '../../../shared/models/workbasket-access-items'; @Component({ selector: 'taskana-access-items-management', @@ -38,7 +38,7 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy { belongingGroups: Array; sortingFields = new Map([['workbasket-key', 'Workbasket Key'], ['access-id', 'Access id']]); accessItemDefaultSortBy: string = 'workbasket-key'; - sortModel: SortingModel = new SortingModel(this.accessItemDefaultSortBy); + sortModel: Sorting = new Sorting(this.accessItemDefaultSortBy); isGroup: boolean; groupsKey = 'ou=groups'; @@ -117,7 +117,7 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy { return this.formsValidatorService.isFieldValid(this.accessItemsGroups[index], field); } - sorting(sort: SortingModel) { + sorting(sort: Sorting) { this.sortModel = sort; this.searchForAccessItemsWorkbaskets(); } @@ -132,7 +132,7 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy { this.sortModel, true ) - .subscribe((accessItemsResource: AccessItemsWorkbasketResource) => { + .subscribe((accessItemsResource: AccessItemWorkbasketResource) => { this.setAccessItemsGroups(accessItemsResource ? accessItemsResource.accessItems : []); this.requestInProgressService.setRequestInProgress(false); }, 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 a80433ddc..a5bb99637 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 @@ -10,17 +10,17 @@ import { configureTests } from 'app/app.test.configuration'; import { NgxsModule, Store } from '@ngxs/store'; -import { ClassificationDefinition } from 'app/models/classification-definition'; -import { LinksClassification } from 'app/models/links-classfication'; +import { ClassificationDefinition } from 'app/shared/models/classification-definition'; +import { LinksClassification } from 'app/shared/models/links-classfication'; -import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +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/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/services/tree/tree.service'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; +import { TreeNodeModel } from 'app/shared/models/tree-node'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { TreeService } from 'app/shared/services/tree/tree.service'; +import { RemoveConfirmationService } from 'app/shared/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'; import { ClassificationSelectors } from 'app/store/classification-store/classification.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 e9ed93cbf..392f8f874 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 @@ -3,32 +3,32 @@ import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { Observable, Subscription, zip } from 'rxjs'; -import { ClassificationDefinition, customFieldCount } from 'app/models/classification-definition'; -import { ACTION } from 'app/models/action'; -import { AlertModel, AlertType } from 'app/models/alert'; +import { ClassificationDefinition, customFieldCount } from 'app/shared/models/classification-definition'; +import { ACTION } from 'app/shared/models/action'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; import { highlight } from 'app/shared/animations/validation.animation'; import { TaskanaDate } from 'app/shared/util/taskana.date'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; -import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; -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/services/tree/tree.service'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; +import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { TreeService } from 'app/shared/services/tree/tree.service'; +import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service'; -import { DomainService } from 'app/services/domain/domain.service'; -import { Pair } from 'app/models/pair'; +import { DomainService } from 'app/shared/services/domain/domain.service'; +import { Pair } from 'app/shared/models/pair'; import { NgForm } from '@angular/forms'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.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'; -import { ERROR_TYPES } from '../../../models/errors'; -import { ErrorsService } from '../../../services/errors/errors.service'; -import { ClassificationCategoryImages, CustomField, getCustomFields } from '../../../models/customisation'; +import { ERROR_TYPES } from '../../../shared/models/errors'; +import { ErrorsService } from '../../../shared/services/errors/errors.service'; +import { ClassificationCategoryImages, CustomField, getCustomFields } from '../../../shared/models/customisation'; @Component({ selector: 'taskana-classification-details', 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 66885cd81..146670b5d 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 @@ -7,20 +7,20 @@ import { Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { AngularSvgIconModule } from 'angular-svg-icon'; -import { TreeNodeModel } from 'app/models/tree-node'; +import { TreeNodeModel } from 'app/shared/models/tree-node'; import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; -import { ClassificationTypesSelectorComponent } from 'app/shared/classification-types-selector/classification-types-selector.component'; +import { ClassificationTypesSelectorComponent } from 'app/administration/components/classification-types-selector/classification-types-selector.component'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service'; -import { AlertService } from 'app/services/alert/alert.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.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 { DomainService } from 'app/shared/services/domain/domain.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { configureTests } from 'app/app.test.configuration'; -import { TreeService } from 'app/services/tree/tree.service'; +import { TreeService } from 'app/shared/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/administration/components/classification-list/classification-list.component.ts b/web/src/app/administration/components/classification-list/classification-list.component.ts index 75af2b34a..49d0bef47 100644 --- a/web/src/app/administration/components/classification-list/classification-list.component.ts +++ b/web/src/app/administration/components/classification-list/classification-list.component.ts @@ -4,21 +4,21 @@ import { map } from 'rxjs/operators'; import { Router, ActivatedRoute } from '@angular/router'; import { Select } from '@ngxs/store'; -import { TaskanaType } from 'app/models/taskana-type'; -import { Classification } from 'app/models/classification'; -import { TreeNodeModel } from 'app/models/tree-node'; +import { TaskanaType } from 'app/shared/models/taskana-type'; +import { Classification } from 'app/shared/models/classification'; +import { TreeNodeModel } from 'app/shared/models/tree-node'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; -import { Pair } from 'app/models/pair'; +import { Pair } from 'app/shared/models/pair'; 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'; -import { AlertModel, AlertType } from '../../../models/alert'; -import { AlertService } from '../../../services/alert/alert.service'; -import { ERROR_TYPES } from '../../../models/errors'; +import { ClassificationDefinition } from '../../../shared/models/classification-definition'; +import { AlertModel, AlertType } from '../../../shared/models/alert'; +import { AlertService } from '../../../shared/services/alert/alert.service'; +import { ERROR_TYPES } from '../../../shared/models/errors'; -import { ClassificationCategoryImages } from '../../../models/customisation'; +import { ClassificationCategoryImages } from '../../../shared/models/customisation'; @Component({ selector: 'taskana-classification-list', diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.html b/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.html similarity index 100% rename from web/src/app/shared/classification-types-selector/classification-types-selector.component.html rename to web/src/app/administration/components/classification-types-selector/classification-types-selector.component.html diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.scss b/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.scss similarity index 100% rename from web/src/app/shared/classification-types-selector/classification-types-selector.component.scss rename to web/src/app/administration/components/classification-types-selector/classification-types-selector.component.scss diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.spec.ts b/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.spec.ts similarity index 100% rename from web/src/app/shared/classification-types-selector/classification-types-selector.component.spec.ts rename to web/src/app/administration/components/classification-types-selector/classification-types-selector.component.spec.ts diff --git a/web/src/app/shared/classification-types-selector/classification-types-selector.component.ts b/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.ts similarity index 100% rename from web/src/app/shared/classification-types-selector/classification-types-selector.component.ts rename to web/src/app/administration/components/classification-types-selector/classification-types-selector.component.ts 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 041ef86e9..0dcdb01ce 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 @@ -2,9 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; -import { AlertService } from 'app/services/alert/alert.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; import { HttpClientModule } from '@angular/common/http'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { GeneralModalService } from 'app/shared/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.service'; 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 eeb9971fe..d76b81bba 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,19 +1,19 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; 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'; -import { MessageModal } from 'app/models/message-modal'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { DomainService } from 'app/shared/services/domain/domain.service'; +import { TaskanaType } from 'app/shared/models/taskana-type'; +import { MessageModal } from 'app/shared/models/message-modal'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; import { environment } from 'environments/environment'; -import { AlertService } from 'app/services/alert/alert.service'; -import { AlertModel, AlertType } from 'app/models/alert'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; import { UploadService } from 'app/shared/services/upload/upload.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'; -import { ErrorModel } from '../../../models/error-model'; +import { ERROR_TYPES } from '../../../shared/models/errors'; +import { ErrorsService } from '../../../shared/services/errors/errors.service'; +import { ErrorModel } from '../../../shared/models/error-model'; @Component({ selector: 'taskana-import-export-component', diff --git a/web/src/app/administration/components/type-icon/icon-type.component.ts b/web/src/app/administration/components/type-icon/icon-type.component.ts index bb7e1caae..32529d0d3 100644 --- a/web/src/app/administration/components/type-icon/icon-type.component.ts +++ b/web/src/app/administration/components/type-icon/icon-type.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input } from '@angular/core'; -import { ICONTYPES } from 'app/models/type'; +import { ICONTYPES } from 'app/shared/models/icon-types'; @Component({ selector: 'taskana-icon-type', diff --git a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.spec.ts b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.spec.ts index 013fbb464..c0f1ba61f 100644 --- a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.spec.ts +++ b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.spec.ts @@ -6,21 +6,21 @@ import { AngularSvgIconModule } from 'angular-svg-icon'; import { of } from 'rxjs'; import { configureTests } from 'app/app.test.configuration'; -import { Workbasket } from 'app/models/workbasket'; -import { AlertModel, AlertType } from 'app/models/alert'; -import { Links } from 'app/models/links'; -import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; -import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; -import { ICONTYPES } from 'app/models/type'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; +import { Links } from 'app/shared/models/links'; +import { WorkbasketAccessItems } from 'app/shared/models/workbasket-access-items'; +import { WorkbasketAccessItemsResource } from 'app/shared/models/workbasket-access-items-resource'; +import { ICONTYPES } from 'app/shared/models/icon-types'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.service'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; import { NgxsModule, Store } from '@ngxs/store'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { WorkbasketAccessItemsComponent } from './workbasket-access-items.component'; diff --git a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts index e25f840ee..d1178ef56 100644 --- a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts +++ b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts @@ -3,24 +3,24 @@ import { Observable, Subscription } from 'rxjs'; import { Select } from '@ngxs/store'; import { FormArray, FormBuilder, Validators } from '@angular/forms'; -import { Workbasket } from 'app/models/workbasket'; -import { WorkbasketAccessItems, customFieldCount } from 'app/models/workbasket-access-items'; -import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; -import { ACTION } from 'app/models/action'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { WorkbasketAccessItems, customFieldCount } from 'app/shared/models/workbasket-access-items'; +import { WorkbasketAccessItemsResource } from 'app/shared/models/workbasket-access-items-resource'; +import { ACTION } from 'app/shared/models/action'; -import { AlertModel, AlertType } from 'app/models/alert'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; import { SavingInformation, SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; 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 { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; +import { AccessIdDefinition } from 'app/shared/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 '../../../shared/models/errors'; +import { ErrorsService } from '../../../shared/services/errors/errors.service'; +import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../shared/models/customisation'; @Component({ selector: 'taskana-workbasket-access-items', diff --git a/web/src/app/administration/components/workbasket-details/workbasket-details.component.spec.ts b/web/src/app/administration/components/workbasket-details/workbasket-details.component.spec.ts index 2376da968..ee3b032e1 100644 --- a/web/src/app/administration/components/workbasket-details/workbasket-details.component.spec.ts +++ b/web/src/app/administration/components/workbasket-details/workbasket-details.component.spec.ts @@ -7,21 +7,21 @@ import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; import { of } from 'rxjs'; -import { Workbasket } from 'app/models/workbasket'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; -import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; -import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; -import { ICONTYPES } from 'app/models/type'; -import { Links } from 'app/models/links'; -import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; -import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; +import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource'; +import { WorkbasketAccessItemsResource } from 'app/shared/models/workbasket-access-items-resource'; +import { ICONTYPES } from 'app/shared/models/icon-types'; +import { Links } from 'app/shared/models/links'; +import { WorkbasketAccessItems } from 'app/shared/models/workbasket-access-items'; +import { LinksWorkbasketSummary } from 'app/shared/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 { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service'; +import { AlertService } from 'app/shared/services/alert/alert.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 { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { configureTests } from 'app/app.test.configuration'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; diff --git a/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts b/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts index 87b9cdbbb..f3cb16025 100644 --- a/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts +++ b/web/src/app/administration/components/workbasket-details/workbasket-details.component.ts @@ -2,17 +2,17 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { Workbasket } from 'app/models/workbasket'; -import { ACTION } from 'app/models/action'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { ACTION } from 'app/shared/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 { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service'; +import { DomainService } from 'app/shared/services/domain/domain.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'; -import { ErrorsService } from '../../../services/errors/errors.service'; +import { GeneralModalService } from '../../../shared/services/general-modal/general-modal.service'; +import { MessageModal } from '../../../shared/models/message-modal'; +import { ERROR_TYPES } from '../../../shared/models/errors'; +import { ErrorsService } from '../../../shared/services/errors/errors.service'; @Component({ selector: 'taskana-workbasket-details', diff --git a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts index a27a88caf..242b42ce1 100644 --- a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts +++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts @@ -4,21 +4,21 @@ import { of } from 'rxjs'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; -import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; -import { ICONTYPES } from 'app/models/type'; -import { Links } from 'app/models/links'; -import { FilterModel } from 'app/models/filter'; -import { Workbasket } from 'app/models/workbasket'; -import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; +import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; +import { ICONTYPES } from 'app/shared/models/icon-types'; +import { Links } from 'app/shared/models/links'; +import { Filter } from 'app/shared/models/filter'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { WorkbasketDistributionTargetsResource } from 'app/shared/models/workbasket-distribution-targets-resource'; 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 { AlertService } from 'app/shared/services/alert/alert.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; -import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; +import { LinksWorkbasketSummary } from 'app/shared/models/links-workbasket-summary'; import { configureTests } from 'app/app.test.configuration'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { WorkbasketDistributionTargetsComponent, Side } from './workbasket-distribution-targets.component'; @@ -94,7 +94,7 @@ describe('WorkbasketDistributionTargetsComponent', () => { it('should filter left list and keep selected elements as selected', () => { component.performFilter({ - filterBy: new FilterModel({ + filterBy: new Filter({ name: 'someName', owner: 'someOwner', description: 'someDescription', key: 'someKey' }), side: Side.LEFT diff --git a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts index 7bbe37906..2905e66a3 100644 --- a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts +++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts @@ -1,25 +1,25 @@ import { Component, Input, OnDestroy, SimpleChanges, OnChanges, ViewChild, ElementRef } from '@angular/core'; import { Subscription } from 'rxjs'; -import { Workbasket } from 'app/models/workbasket'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; -import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; -import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; -import { MessageModal } from 'app/models/message-modal'; -import { ACTION } from 'app/models/action'; -import { AlertModel, AlertType } from 'app/models/alert'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; +import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource'; +import { WorkbasketDistributionTargetsResource } from 'app/shared/models/workbasket-distribution-targets-resource'; +import { MessageModal } from 'app/shared/models/message-modal'; +import { ACTION } from 'app/shared/models/action'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { AlertService } from 'app/services/alert/alert.service'; +import { AlertService } from 'app/shared/services/alert/alert.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 { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; 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 { Page } from 'app/shared/models/page'; +import { OrientationService } from 'app/shared/services/orientation/orientation.service'; +import { Orientation } from 'app/shared/models/orientation'; +import { ERROR_TYPES } from '../../../shared/models/errors'; +import { ErrorsService } from '../../../shared/services/errors/errors.service'; export enum Side { LEFT, diff --git a/web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.ts b/web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.ts index 384c21590..634249b1d 100644 --- a/web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.ts +++ b/web/src/app/administration/components/workbasket-dual-list/workbasket-dual-list.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; -import { FilterModel } from 'app/models/filter'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; +import { Filter } from 'app/shared/models/filter'; import { expandDown } from 'app/shared/animations/expand.animation'; import { Side } from '../workbasket-distribution-targets/workbasket-distribution-targets.component'; @@ -13,7 +13,7 @@ import { Side } from '../workbasket-distribution-targets/workbasket-distribution export class WorkbasketDualListComponent implements OnInit { @Input() distributionTargets: Array; @Input() distributionTargetsSelected: Array; - @Output() performDualListFilter = new EventEmitter<{ filterBy: FilterModel, side: Side }>(); + @Output() performDualListFilter = new EventEmitter<{ filterBy: Filter, side: Side }>(); @Input() requestInProgress = false; @Input() loadingItems ? = false; @Input() side: Side; @@ -40,7 +40,7 @@ export class WorkbasketDualListComponent implements OnInit { this.scrolling.emit(this.side); } - performAvailableFilter(filterModel: FilterModel) { + performAvailableFilter(filterModel: Filter) { this.performDualListFilter.emit({ filterBy: filterModel, side: this.side }); } diff --git a/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts b/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts index 3c5d6dcb3..b2d3d01f9 100644 --- a/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts +++ b/web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts @@ -8,17 +8,17 @@ import { of } from 'rxjs'; import { Component } from '@angular/core'; import { Routes } from '@angular/router'; -import { Workbasket } from 'app/models/workbasket'; -import { ICONTYPES } from 'app/models/type'; -import { ACTION } from 'app/models/action'; -import { Links } from 'app/models/links'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { ICONTYPES } from 'app/shared/models/icon-types'; +import { ACTION } from 'app/shared/models/action'; +import { Links } from 'app/shared/models/links'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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 { AlertService } from 'app/shared/services/alert/alert.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { configureTests } from 'app/app.test.configuration'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; import { NgxsModule, Store } from '@ngxs/store'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { WorkbasketInformationComponent } from './workbasket-information.component'; diff --git a/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts b/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts index 38862922d..87a73c6fd 100644 --- a/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts +++ b/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts @@ -4,24 +4,24 @@ import { Observable, Subscription } from 'rxjs'; import { NgForm } from '@angular/forms'; import { Select } from '@ngxs/store'; -import { ICONTYPES } from 'app/models/type'; -import { ACTION } from 'app/models/action'; -import { customFieldCount, Workbasket } from 'app/models/workbasket'; -import { AlertModel, AlertType } from 'app/models/alert'; +import { ICONTYPES } from 'app/shared/models/icon-types'; +import { ACTION } from 'app/shared/models/action'; +import { customFieldCount, Workbasket } from 'app/shared/models/workbasket'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; 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 { AlertService } from 'app/shared/services/alert/alert.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/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 '../../../shared/models/errors'; +import { ErrorsService } from '../../../shared/services/errors/errors.service'; +import { CustomField, getCustomFields, WorkbasketsCustomisation } from '../../../shared/models/customisation'; @Component({ selector: 'taskana-workbasket-information', diff --git a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts index f5a216210..f761bd6f4 100644 --- a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts +++ b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts @@ -10,10 +10,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { SharedModule } from 'app/shared/shared.module'; import { AppModule } from 'app/app.module'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; -import { Links } from 'app/models/links'; -import { FilterModel } from 'app/models/filter'; -import { SortingModel } from 'app/models/sorting'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; +import { Links } from 'app/shared/models/links'; +import { Filter } from 'app/shared/models/filter'; +import { Sorting } from 'app/shared/models/sorting'; import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; @@ -93,8 +93,8 @@ describe('WorkbasketListToolbarComponent', () => { it('should emit performSorting when sorting is triggered', () => { - let sort: SortingModel; - const compareSort = new SortingModel(); + let sort: Sorting; + const compareSort = new Sorting(); component.performSorting.subscribe(value => { sort = value; }); component.sorting(compareSort); @@ -102,8 +102,8 @@ describe('WorkbasketListToolbarComponent', () => { }); it('should emit performFilter when filter is triggered', () => { - let filter: FilterModel; - const compareFilter = new FilterModel(); + let filter: Filter; + const compareFilter = new Filter(); component.performFilter.subscribe(value => { filter = value; }); component.filtering(compareFilter); diff --git a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts index 97db6cbe4..4638d4f70 100644 --- a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts +++ b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts @@ -1,16 +1,16 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { SortingModel } from 'app/models/sorting'; -import { FilterModel } from 'app/models/filter'; +import { Sorting } from 'app/shared/models/sorting'; +import { Filter } from 'app/shared/models/filter'; import { Subscription } from 'rxjs'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { TaskanaType } from 'app/models/taskana-type'; +import { TaskanaType } from 'app/shared/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 '../../../shared/services/errors/errors.service'; +import { ERROR_TYPES } from '../../../shared/models/errors'; @Component({ selector: 'taskana-workbasket-list-toolbar', @@ -21,8 +21,8 @@ import { ERROR_TYPES } from '../../../models/errors'; export class WorkbasketListToolbarComponent implements OnInit { @Input() workbaskets: Array; @Input() workbasketDefaultSortBy: string; - @Output() performSorting = new EventEmitter(); - @Output() performFilter = new EventEmitter(); + @Output() performSorting = new EventEmitter(); + @Output() performFilter = new EventEmitter(); workbasketServiceSubscription: Subscription; selectionToImport = TaskanaType.WORKBASKETS; sortingFields = new Map([['name', 'Name'], ['key', 'Key'], ['description', 'Description'], ['owner', 'Owner'], ['type', 'Type']]); @@ -44,11 +44,11 @@ export class WorkbasketListToolbarComponent implements OnInit { ngOnInit() { } - sorting(sort: SortingModel) { + sorting(sort: Sorting) { this.performSorting.emit(sort); } - filtering(filterBy: FilterModel) { + filtering(filterBy: Filter) { this.performFilter.emit(filterBy); } diff --git a/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts index 284c4486f..e73e4b629 100644 --- a/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts +++ b/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts @@ -7,19 +7,19 @@ import { HttpClientModule } from '@angular/common/http'; import { Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; -import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; -import { FilterModel } from 'app/models/filter'; -import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; +import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource'; +import { Filter } from 'app/shared/models/filter'; +import { LinksWorkbasketSummary } from 'app/shared/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.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { OrientationService } from 'app/services/orientation/orientation.service'; +import { OrientationService } from 'app/shared/services/orientation/orientation.service'; import { configureTests } from 'app/app.test.configuration'; -import { Page } from 'app/models/page'; +import { Page } from 'app/shared/models/page'; 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'; @@ -162,7 +162,7 @@ describe('WorkbasketListComponent', () => { }); it('should have performRequest with forced = true after performFilter is triggered', (() => { - const filter = new FilterModel({ + const filter = new Filter({ name: 'someName', owner: 'someOwner', description: 'someDescription', diff --git a/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts index 779ef6b91..21b148d88 100644 --- a/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts +++ b/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts @@ -2,14 +2,14 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; -import { WorkbasketSummary } from 'app/models/workbasket-summary'; -import { FilterModel } from 'app/models/filter'; -import { SortingModel } from 'app/models/sorting'; -import { Orientation } from 'app/models/orientation'; +import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource'; +import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; +import { Filter } from 'app/shared/models/filter'; +import { Sorting } from 'app/shared/models/sorting'; +import { Orientation } from 'app/shared/models/orientation'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { OrientationService } from 'app/services/orientation/orientation.service'; +import { OrientationService } from 'app/shared/services/orientation/orientation.service'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { ImportExportService } from 'app/administration/services/import-export.service'; @@ -30,8 +30,8 @@ export class WorkbasketListComponent implements OnInit, OnDestroy { cards: number = this.pageSize; workbasketDefaultSortBy: string = 'name'; - sort: SortingModel = new SortingModel(this.workbasketDefaultSortBy); - filterBy: FilterModel = new FilterModel({ name: '', owner: '', type: '', description: '', key: '' }); + sort: Sorting = new Sorting(this.workbasketDefaultSortBy); + filterBy: Filter = new Filter({ name: '', owner: '', type: '', description: '', key: '' }); @ViewChild('wbToolbar', { static: true }) private toolbarElement: ElementRef; @@ -79,12 +79,12 @@ export class WorkbasketListComponent implements OnInit, OnDestroy { this.router.navigate([{ outlets: { detail: [this.selectedId] } }], { relativeTo: this.route }); } - performSorting(sort: SortingModel) { + performSorting(sort: Sorting) { this.sort = sort; this.performRequest(); } - performFilter(filterBy: FilterModel) { + performFilter(filterBy: Filter) { this.filterBy = filterBy; this.performRequest(); } diff --git a/web/src/app/administration/services/classification-definition.service.ts b/web/src/app/administration/services/classification-definition.service.ts index 4f527269c..af82c6498 100644 --- a/web/src/app/administration/services/classification-definition.service.ts +++ b/web/src/app/administration/services/classification-definition.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { environment } from 'app/../environments/environment'; -import { ClassificationDefinition } from 'app/models/classification-definition'; +import { ClassificationDefinition } from 'app/shared/models/classification-definition'; import { TaskanaDate } from 'app/shared/util/taskana.date'; import { BlobGenerator } from 'app/shared/util/blob-generator'; diff --git a/web/src/app/administration/services/workbasket-definition.service.ts b/web/src/app/administration/services/workbasket-definition.service.ts index 04a505b70..4eb20d79c 100644 --- a/web/src/app/administration/services/workbasket-definition.service.ts +++ b/web/src/app/administration/services/workbasket-definition.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { environment } from 'environments/environment'; -import { WorkbasketDefinition } from 'app/models/workbasket-definition'; +import { WorkbasketDefinition } from 'app/shared/models/workbasket-definition'; import { TaskanaDate } from 'app/shared/util/taskana.date'; import { BlobGenerator } from 'app/shared/util/blob-generator'; diff --git a/web/src/app/app-routing.module.ts b/web/src/app/app-routing.module.ts index d0093eac0..2aafd5200 100644 --- a/web/src/app/app-routing.module.ts +++ b/web/src/app/app-routing.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { BusinessAdminGuard } from './guards/business-admin.guard'; -import { MonitorGuard } from './guards/monitor.guard'; -import { UserGuard } from './guards/user.guard'; -import { HistoryGuard } from './guards/history.guard'; -import { NoAccessComponent } from './components/no-access/no-access.component'; +import { BusinessAdminGuard } from './shared/guards/business-admin.guard'; +import { MonitorGuard } from './shared/guards/monitor.guard'; +import { UserGuard } from './shared/guards/user.guard'; +import { HistoryGuard } from './shared/guards/history.guard'; +import { NoAccessComponent } from './shared/components/no-access/no-access.component'; const appRoutes: Routes = [ { diff --git a/web/src/app/app.component.spec.ts b/web/src/app/app.component.spec.ts index d6514c359..d6ae8fffc 100644 --- a/web/src/app/app.component.spec.ts +++ b/web/src/app/app.component.spec.ts @@ -6,7 +6,7 @@ import { HttpClientModule } from '@angular/common/http'; import { SharedModule } from 'app/shared/shared.module'; import { AppComponent } from './app.component'; -import { NavBarComponent } from './components/nav-bar/nav-bar.component'; +import { NavBarComponent } from './shared/components/nav-bar/nav-bar.component'; describe('AppComponent', () => { let app; diff --git a/web/src/app/app.component.ts b/web/src/app/app.component.ts index fe43167b3..46017b016 100644 --- a/web/src/app/app.component.ts +++ b/web/src/app/app.component.ts @@ -2,16 +2,16 @@ import { Component, HostListener, OnDestroy, OnInit } from '@angular/core'; import { NavigationStart, Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; -import { MessageModal } from './models/message-modal'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; +import { MessageModal } from './shared/models/message-modal'; -import { GeneralModalService } from './services/general-modal/general-modal.service'; -import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service'; -import { OrientationService } from './services/orientation/orientation.service'; -import { SelectedRouteService } from './services/selected-route/selected-route'; +import { GeneralModalService } from './shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from './shared/services/request-in-progress/request-in-progress.service'; +import { OrientationService } from './shared/services/orientation/orientation.service'; +import { SelectedRouteService } from './shared/services/selected-route/selected-route'; import { UploadService } from './shared/services/upload/upload.service'; -import { ErrorModel } from './models/error-model'; -import { ErrorsService } from './services/errors/errors.service'; +import { ErrorModel } from './shared/models/error-model'; +import { ErrorsService } from './shared/services/errors/errors.service'; @Component({ selector: 'taskana-root', diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts index 1a7c9d547..482a2f04d 100644 --- a/web/src/app/app.module.ts +++ b/web/src/app/app.module.ts @@ -17,25 +17,25 @@ import { SharedModule } from 'app/shared/shared.module'; /** * Services */ -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { OrientationService } from 'app/services/orientation/orientation.service'; -import { SelectedRouteService } from 'app/services/selected-route/selected-route'; -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'; -import { NavBarComponent } from 'app/components/nav-bar/nav-bar.component'; -import { UserInformationComponent } from 'app/components/user-information/user-information.component'; -import { NoAccessComponent } from 'app/components/no-access/no-access.component'; -import { RemoveConfirmationService } from './services/remove-confirmation/remove-confirmation.service'; -import { FormsValidatorService } from './shared/services/forms/forms-validator.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { OrientationService } from 'app/shared/services/orientation/orientation.service'; +import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route'; +import { DomainService } from 'app/shared/services/domain/domain.service'; +import { StartupService } from 'app/shared/services/startup/startup.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service'; +import { TreeService } from 'app/shared/services/tree/tree.service'; +import { TitlesService } from 'app/shared/services/titles/titles.service'; +import { WindowRefService } from 'app/shared/services/window/window.service'; +import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; +import { NavBarComponent } from 'app/shared/components/nav-bar/nav-bar.component'; +import { UserInformationComponent } from 'app/shared/components/user-information/user-information.component'; +import { NoAccessComponent } from 'app/shared/components/no-access/no-access.component'; +import { RemoveConfirmationService } from './shared/services/remove-confirmation/remove-confirmation.service'; +import { FormsValidatorService } from './shared/services/forms-validator/forms-validator.service'; import { UploadService } from './shared/services/upload/upload.service'; -import { ErrorsService } from './services/errors/errors.service'; +import { ErrorsService } from './shared/services/errors/errors.service'; /** * Components */ @@ -44,14 +44,14 @@ import { AppRoutingModule } from './app-routing.module'; /** * Guards */ -import { DomainGuard } from './guards/domain.guard'; -import { BusinessAdminGuard } from './guards/business-admin.guard'; -import { MonitorGuard } from './guards/monitor.guard'; -import { UserGuard } from './guards/user.guard'; +import { DomainGuard } from './shared/guards/domain.guard'; +import { BusinessAdminGuard } from './shared/guards/business-admin.guard'; +import { MonitorGuard } from './shared/guards/monitor.guard'; +import { UserGuard } from './shared/guards/user.guard'; /** * Store */ -import { ClassificationCategoriesService } from './shared/services/classifications/classification-categories.service'; +import { ClassificationCategoriesService } from './shared/services/classification-categories/classification-categories.service'; import { environment } from '../environments/environment'; import { STATES } from './store'; diff --git a/web/src/app/app.test.configuration.ts b/web/src/app/app.test.configuration.ts index 28268b706..87d6c2f8d 100644 --- a/web/src/app/app.test.configuration.ts +++ b/web/src/app/app.test.configuration.ts @@ -3,21 +3,21 @@ import { getTestBed, TestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; +import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; import { AngularSvgIconModule } from 'angular-svg-icon'; -import { TaskanaEngineServiceMock } from './services/taskana-engine/taskana-engine.mock.service'; -import { TaskanaEngineService } from './services/taskana-engine/taskana-engine.service'; -import { DomainService } from './services/domain/domain.service'; -import { DomainServiceMock } from './services/domain/domain.service.mock'; -import { AlertService } from './services/alert/alert.service'; -import { GeneralModalService } from './services/general-modal/general-modal.service'; -import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service'; -import { OrientationService } from './services/orientation/orientation.service'; -import { SelectedRouteService } from './services/selected-route/selected-route'; -import { FormsValidatorService } from './shared/services/forms/forms-validator.service'; +import { TaskanaEngineServiceMock } from './shared/services/taskana-engine/taskana-engine.mock.service'; +import { TaskanaEngineService } from './shared/services/taskana-engine/taskana-engine.service'; +import { DomainService } from './shared/services/domain/domain.service'; +import { DomainServiceMock } from './shared/services/domain/domain.service.mock'; +import { AlertService } from './shared/services/alert/alert.service'; +import { GeneralModalService } from './shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from './shared/services/request-in-progress/request-in-progress.service'; +import { OrientationService } from './shared/services/orientation/orientation.service'; +import { SelectedRouteService } from './shared/services/selected-route/selected-route'; +import { FormsValidatorService } from './shared/services/forms-validator/forms-validator.service'; import { SharedModule } from './shared/shared.module'; export const configureTests = (configure: (testBed: TestBed) => void) => { diff --git a/web/src/app/app.test.module.ts b/web/src/app/app.test.module.ts index 4be34f42b..77f179976 100644 --- a/web/src/app/app.test.module.ts +++ b/web/src/app/app.test.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { TaskanaTypeAheadMockComponent } from 'app/shared/type-ahead/type-ahead.mock.component'; +import { TaskanaTypeAheadMockComponent } from 'app/shared/components/type-ahead/type-ahead.mock.component'; const MODULES = [ ]; diff --git a/web/src/app/history/services/task-query/task-query.service.ts b/web/src/app/history/services/task-query/task-query.service.ts index f29b92287..53ed3f0db 100644 --- a/web/src/app/history/services/task-query/task-query.service.ts +++ b/web/src/app/history/services/task-query/task-query.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { TaskHistoryEventData } from 'app/models/task-history-event'; -import { TaskHistoryEventResourceData } from 'app/models/task-history-event-resource'; -import { QueryParametersModel } from 'app/models/query-parameters'; +import { TaskHistoryEventData } from 'app/shared/models/task-history-event'; +import { TaskHistoryEventResourceData } from 'app/shared/models/task-history-event-resource'; +import { QueryParameters } from 'app/shared/models/query-parameters'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; -import { Direction } from 'app/models/sorting'; +import { Direction } from 'app/shared/models/sorting'; import { Observable, of } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { environment } from 'environments/environment'; @@ -74,7 +74,7 @@ export class TaskQueryService { created: string, allPages: boolean = false ): string { - const parameters = new QueryParametersModel(); + const parameters = new QueryParameters(); parameters.SORTBY = orderBy; parameters.SORTDIRECTION = sortDirection; parameters.TASK_ID_LIKE = taskId; diff --git a/web/src/app/history/task-query/task-query.component.ts b/web/src/app/history/task-query/task-query.component.ts index d016536ba..e1954e82f 100644 --- a/web/src/app/history/task-query/task-query.component.ts +++ b/web/src/app/history/task-query/task-query.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit } from '@angular/core'; -import { Direction, SortingModel } from 'app/models/sorting'; -import { OrientationService } from 'app/services/orientation/orientation.service'; +import { Direction, Sorting } from 'app/shared/models/sorting'; +import { OrientationService } from 'app/shared/services/orientation/orientation.service'; import { Subscription } from 'rxjs'; -import { Orientation } from 'app/models/orientation'; +import { Orientation } from 'app/shared/models/orientation'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { MessageModal } from 'app/models/message-modal'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { MessageModal } from 'app/shared/models/message-modal'; import { FormControl, FormGroup } from '@angular/forms'; -import { TaskHistoryEventResourceData } from 'app/models/task-history-event-resource'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { TaskHistoryEventData } from '../../models/task-history-event'; +import { TaskHistoryEventResourceData } from 'app/shared/models/task-history-event-resource'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { TaskHistoryEventData } from '../../shared/models/task-history-event'; import { TaskQueryService } from '../services/task-query/task-query.service'; -import { ErrorsService } from '../../services/errors/errors.service'; +import { ErrorsService } from '../../shared/services/errors/errors.service'; @Component({ selector: 'taskana-task-query', @@ -22,7 +22,7 @@ export class TaskQueryComponent implements OnInit { taskQueryResource: TaskHistoryEventResourceData; taskQuery: Array; taskQueryHeader = new TaskHistoryEventData(); - orderBy = new SortingModel(TaskanaQueryParameters.parameters.CREATED); + orderBy = new Sorting(TaskanaQueryParameters.parameters.CREATED); orientationSubscription: Subscription; taskQuerySubscription: Subscription; diff --git a/web/src/app/models/state.ts b/web/src/app/models/state.ts deleted file mode 100644 index d88cbcc32..000000000 --- a/web/src/app/models/state.ts +++ /dev/null @@ -1,4 +0,0 @@ -export class State { - state: string; - counter: number; -} diff --git a/web/src/app/monitor/components/classification-report/classification-report.component.ts b/web/src/app/monitor/components/classification-report/classification-report.component.ts index 20cba3d9f..26c35b4dc 100644 --- a/web/src/app/monitor/components/classification-report/classification-report.component.ts +++ b/web/src/app/monitor/components/classification-report/classification-report.component.ts @@ -3,7 +3,7 @@ import { RestConnectorService } from 'app/monitor/services/rest-connector.servic import { ChartData } from 'app/monitor/models/chart-data'; import { ReportData } from '../../models/report-data'; import { ChartColorsDefinition } from '../../models/chart-colors'; -import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; @Component({ selector: 'taskana-monitor-classification-tasks', diff --git a/web/src/app/monitor/components/task-report/task-report.component.ts b/web/src/app/monitor/components/task-report/task-report.component.ts index 9f630c427..5de773eaa 100644 --- a/web/src/app/monitor/components/task-report/task-report.component.ts +++ b/web/src/app/monitor/components/task-report/task-report.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ReportData } from 'app/monitor/models/report-data'; import { RestConnectorService } from '../../services/rest-connector.service'; -import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; @Component({ selector: 'taskana-monitor-tasks', diff --git a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts index c8c221e7a..a7c51c9cf 100644 --- a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts +++ b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts @@ -4,7 +4,7 @@ import { ChartData } from '../../models/chart-data'; import { ChartColorsDefinition } from '../../models/chart-colors'; import { RestConnectorService } from '../../services/rest-connector.service'; import { MetaInfoData } from '../../models/meta-info-data'; -import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; @Component({ selector: 'taskana-monitor-workbasket-due-date', diff --git a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts index cb36605c4..857eca219 100644 --- a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts +++ b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts @@ -4,7 +4,7 @@ import { ChartData } from '../../models/chart-data'; import { ChartColorsDefinition } from '../../models/chart-colors'; import { RestConnectorService } from '../../services/rest-connector.service'; import { MetaInfoData } from '../../models/meta-info-data'; -import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; @Component({ selector: 'taskana-monitor-workbasket-planned-date', diff --git a/web/src/app/monitor/monitor.module.ts b/web/src/app/monitor/monitor.module.ts index cce34de11..2b76831fc 100644 --- a/web/src/app/monitor/monitor.module.ts +++ b/web/src/app/monitor/monitor.module.ts @@ -6,6 +6,7 @@ import { ChartsModule } from 'ng2-charts'; import { TabsModule } from 'ngx-bootstrap/tabs'; import { HttpClientModule } from '@angular/common/http'; import { AngularSvgIconModule } from 'angular-svg-icon'; +import { MapToIterable } from 'app/shared/pipes/map-to-iterable.pipe'; import { MonitorRoutingModule } from './monitor-routing.module'; import { SharedModule } from '../shared/shared.module'; @@ -17,7 +18,6 @@ import { TimestampReportComponent } from './components/timestamp-report/timestam import { RestConnectorService } from './services/rest-connector.service'; -import { MapToIterable } from '../shared/pipes/mapToIterable/mapToIterable'; import { WorkbasketReportComponent } from './components/workbasket-report/workbasket-report.component'; import { WorkbasketReportPlannedDateComponent } from './components/workbasket-report-planned-date/workbasket-report-planned-date.component'; import { WorkbasketReportDueDateComponent } from './components/workbasket-report-due-date/workbasket-report-due-date.component'; diff --git a/web/src/app/shared/alert/alert.component.html b/web/src/app/shared/components/alert/alert.component.html similarity index 100% rename from web/src/app/shared/alert/alert.component.html rename to web/src/app/shared/components/alert/alert.component.html diff --git a/web/src/app/shared/alert/alert.component.scss b/web/src/app/shared/components/alert/alert.component.scss similarity index 100% rename from web/src/app/shared/alert/alert.component.scss rename to web/src/app/shared/components/alert/alert.component.scss diff --git a/web/src/app/shared/alert/alert.component.spec.ts b/web/src/app/shared/components/alert/alert.component.spec.ts similarity index 94% rename from web/src/app/shared/alert/alert.component.spec.ts rename to web/src/app/shared/components/alert/alert.component.spec.ts index 72fce3245..46fcf08b8 100644 --- a/web/src/app/shared/alert/alert.component.spec.ts +++ b/web/src/app/shared/components/alert/alert.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { AlertModel, AlertType } from 'app/models/alert'; -import { AlertService } from 'app/services/alert/alert.service'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; +import { AlertService } from 'app/shared/services/alert/alert.service'; import { AlertComponent } from './alert.component'; describe('AlertComponent', () => { diff --git a/web/src/app/shared/alert/alert.component.ts b/web/src/app/shared/components/alert/alert.component.ts similarity index 80% rename from web/src/app/shared/alert/alert.component.ts rename to web/src/app/shared/components/alert/alert.component.ts index 9c7053736..9fc699cd8 100644 --- a/web/src/app/shared/alert/alert.component.ts +++ b/web/src/app/shared/components/alert/alert.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { AlertModel } from 'app/models/alert'; -import { AlertService } from 'app/services/alert/alert.service'; -import { expandTop } from '../animations/expand.animation'; +import { AlertModel } from 'app/shared/models/alert'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { expandTop } from '../../animations/expand.animation'; @Component({ selector: 'taskana-alert', diff --git a/web/src/app/shared/date-picker/date-picker.component.html b/web/src/app/shared/components/date-picker/date-picker.component.html similarity index 100% rename from web/src/app/shared/date-picker/date-picker.component.html rename to web/src/app/shared/components/date-picker/date-picker.component.html diff --git a/web/src/app/shared/date-picker/date-picker.component.scss b/web/src/app/shared/components/date-picker/date-picker.component.scss similarity index 100% rename from web/src/app/shared/date-picker/date-picker.component.scss rename to web/src/app/shared/components/date-picker/date-picker.component.scss diff --git a/web/src/app/shared/date-picker/date-picker.component.spec.ts b/web/src/app/shared/components/date-picker/date-picker.component.spec.ts similarity index 100% rename from web/src/app/shared/date-picker/date-picker.component.spec.ts rename to web/src/app/shared/components/date-picker/date-picker.component.spec.ts diff --git a/web/src/app/shared/date-picker/date-picker.component.ts b/web/src/app/shared/components/date-picker/date-picker.component.ts similarity index 100% rename from web/src/app/shared/date-picker/date-picker.component.ts rename to web/src/app/shared/components/date-picker/date-picker.component.ts diff --git a/web/src/app/shared/dropdown/dropdown.component.html b/web/src/app/shared/components/dropdown/dropdown.component.html similarity index 100% rename from web/src/app/shared/dropdown/dropdown.component.html rename to web/src/app/shared/components/dropdown/dropdown.component.html diff --git a/web/src/app/shared/dropdown/dropdown.component.scss b/web/src/app/shared/components/dropdown/dropdown.component.scss similarity index 100% rename from web/src/app/shared/dropdown/dropdown.component.scss rename to web/src/app/shared/components/dropdown/dropdown.component.scss diff --git a/web/src/app/shared/dropdown/dropdown.component.spec.ts b/web/src/app/shared/components/dropdown/dropdown.component.spec.ts similarity index 100% rename from web/src/app/shared/dropdown/dropdown.component.spec.ts rename to web/src/app/shared/components/dropdown/dropdown.component.spec.ts diff --git a/web/src/app/shared/dropdown/dropdown.component.ts b/web/src/app/shared/components/dropdown/dropdown.component.ts similarity index 81% rename from web/src/app/shared/dropdown/dropdown.component.ts rename to web/src/app/shared/components/dropdown/dropdown.component.ts index b32dc40b1..b3042761d 100644 --- a/web/src/app/shared/dropdown/dropdown.component.ts +++ b/web/src/app/shared/components/dropdown/dropdown.component.ts @@ -1,6 +1,4 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { SortingModel } from '../../models/sorting'; -import { Classification } from '../../models/classification'; @Component({ selector: 'taskana-dropdown', diff --git a/web/src/app/shared/error-message-modal/error-modal.component.html b/web/src/app/shared/components/error-message-modal/error-modal.component.html similarity index 100% rename from web/src/app/shared/error-message-modal/error-modal.component.html rename to web/src/app/shared/components/error-message-modal/error-modal.component.html diff --git a/web/src/app/shared/error-message-modal/error-modal.component.scss b/web/src/app/shared/components/error-message-modal/error-modal.component.scss similarity index 100% rename from web/src/app/shared/error-message-modal/error-modal.component.scss rename to web/src/app/shared/components/error-message-modal/error-modal.component.scss diff --git a/web/src/app/shared/error-message-modal/error-modal.component.spec.ts b/web/src/app/shared/components/error-message-modal/error-modal.component.spec.ts similarity index 100% rename from web/src/app/shared/error-message-modal/error-modal.component.spec.ts rename to web/src/app/shared/components/error-message-modal/error-modal.component.spec.ts diff --git a/web/src/app/shared/error-message-modal/error-modal.component.ts b/web/src/app/shared/components/error-message-modal/error-modal.component.ts similarity index 100% rename from web/src/app/shared/error-message-modal/error-modal.component.ts rename to web/src/app/shared/components/error-message-modal/error-modal.component.ts diff --git a/web/src/app/shared/field-error-display/field-error-display.component.html b/web/src/app/shared/components/field-error-display/field-error-display.component.html similarity index 100% rename from web/src/app/shared/field-error-display/field-error-display.component.html rename to web/src/app/shared/components/field-error-display/field-error-display.component.html diff --git a/web/src/app/shared/field-error-display/field-error-display.component.scss b/web/src/app/shared/components/field-error-display/field-error-display.component.scss similarity index 100% rename from web/src/app/shared/field-error-display/field-error-display.component.scss rename to web/src/app/shared/components/field-error-display/field-error-display.component.scss diff --git a/web/src/app/shared/field-error-display/field-error-display.component.spec.ts b/web/src/app/shared/components/field-error-display/field-error-display.component.spec.ts similarity index 100% rename from web/src/app/shared/field-error-display/field-error-display.component.spec.ts rename to web/src/app/shared/components/field-error-display/field-error-display.component.spec.ts diff --git a/web/src/app/shared/field-error-display/field-error-display.component.ts b/web/src/app/shared/components/field-error-display/field-error-display.component.ts similarity index 100% rename from web/src/app/shared/field-error-display/field-error-display.component.ts rename to web/src/app/shared/components/field-error-display/field-error-display.component.ts diff --git a/web/src/app/shared/filter/filter.component.html b/web/src/app/shared/components/filter/filter.component.html similarity index 100% rename from web/src/app/shared/filter/filter.component.html rename to web/src/app/shared/components/filter/filter.component.html diff --git a/web/src/app/shared/filter/filter.component.scss b/web/src/app/shared/components/filter/filter.component.scss similarity index 100% rename from web/src/app/shared/filter/filter.component.scss rename to web/src/app/shared/components/filter/filter.component.scss diff --git a/web/src/app/shared/filter/filter.component.spec.ts b/web/src/app/shared/components/filter/filter.component.spec.ts similarity index 100% rename from web/src/app/shared/filter/filter.component.spec.ts rename to web/src/app/shared/components/filter/filter.component.spec.ts diff --git a/web/src/app/shared/filter/filter.component.ts b/web/src/app/shared/components/filter/filter.component.ts similarity index 86% rename from web/src/app/shared/filter/filter.component.ts rename to web/src/app/shared/components/filter/filter.component.ts index 929c81c09..c1e505262 100644 --- a/web/src/app/shared/filter/filter.component.ts +++ b/web/src/app/shared/components/filter/filter.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'; -import { ICONTYPES } from 'app/models/type'; -import { FilterModel } from 'app/models/filter'; -import { TaskanaType } from 'app/models/taskana-type'; +import { ICONTYPES } from 'app/shared/models/icon-types'; +import { Filter } from 'app/shared/models/filter'; +import { TaskanaType } from 'app/shared/models/taskana-type'; @Component({ selector: 'taskana-filter', @@ -19,9 +19,9 @@ export class FilterComponent implements OnInit { @Input() filterType = TaskanaType.WORKBASKETS; - @Output() performFilter = new EventEmitter(); + @Output() performFilter = new EventEmitter(); - filter: FilterModel; + filter: Filter; filterParamKeys = []; lastFilterKey: string; toggleDropDown = false; @@ -52,7 +52,7 @@ export class FilterComponent implements OnInit { } initializeFilterModel(): void { - this.filter = new FilterModel(this.filterParams); + this.filter = new Filter(this.filterParams); } checkUppercaseFilterType(filterType: string) { diff --git a/web/src/app/shared/general-message-modal/general-message-modal.component.html b/web/src/app/shared/components/general-message-modal/general-message-modal.component.html similarity index 100% rename from web/src/app/shared/general-message-modal/general-message-modal.component.html rename to web/src/app/shared/components/general-message-modal/general-message-modal.component.html diff --git a/web/src/app/shared/general-message-modal/general-message-modal.component.scss b/web/src/app/shared/components/general-message-modal/general-message-modal.component.scss similarity index 100% rename from web/src/app/shared/general-message-modal/general-message-modal.component.scss rename to web/src/app/shared/components/general-message-modal/general-message-modal.component.scss diff --git a/web/src/app/shared/general-message-modal/general-message-modal.component.spec.ts b/web/src/app/shared/components/general-message-modal/general-message-modal.component.spec.ts similarity index 100% rename from web/src/app/shared/general-message-modal/general-message-modal.component.spec.ts rename to web/src/app/shared/components/general-message-modal/general-message-modal.component.spec.ts diff --git a/web/src/app/shared/general-message-modal/general-message-modal.component.ts b/web/src/app/shared/components/general-message-modal/general-message-modal.component.ts similarity index 100% rename from web/src/app/shared/general-message-modal/general-message-modal.component.ts rename to web/src/app/shared/components/general-message-modal/general-message-modal.component.ts diff --git a/web/src/app/shared/master-and-detail/master-and-detail.component.html b/web/src/app/shared/components/master-and-detail/master-and-detail.component.html similarity index 100% rename from web/src/app/shared/master-and-detail/master-and-detail.component.html rename to web/src/app/shared/components/master-and-detail/master-and-detail.component.html diff --git a/web/src/app/shared/master-and-detail/master-and-detail.component.scss b/web/src/app/shared/components/master-and-detail/master-and-detail.component.scss similarity index 100% rename from web/src/app/shared/master-and-detail/master-and-detail.component.scss rename to web/src/app/shared/components/master-and-detail/master-and-detail.component.scss diff --git a/web/src/app/shared/master-and-detail/master-and-detail.component.spec.ts b/web/src/app/shared/components/master-and-detail/master-and-detail.component.spec.ts similarity index 96% rename from web/src/app/shared/master-and-detail/master-and-detail.component.spec.ts rename to web/src/app/shared/components/master-and-detail/master-and-detail.component.spec.ts index 8aedd943b..50883ae5a 100644 --- a/web/src/app/shared/master-and-detail/master-and-detail.component.spec.ts +++ b/web/src/app/shared/components/master-and-detail/master-and-detail.component.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { Router, Routes } from '@angular/router'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; -import { MasterAndDetailService } from '../../services/masterAndDetail/master-and-detail.service'; +import { MasterAndDetailService } from '../../services/master-and-detail/master-and-detail.service'; import { MasterAndDetailComponent } from './master-and-detail.component'; diff --git a/web/src/app/shared/master-and-detail/master-and-detail.component.ts b/web/src/app/shared/components/master-and-detail/master-and-detail.component.ts similarity index 94% rename from web/src/app/shared/master-and-detail/master-and-detail.component.ts rename to web/src/app/shared/components/master-and-detail/master-and-detail.component.ts index 889e72686..a47523b89 100644 --- a/web/src/app/shared/master-and-detail/master-and-detail.component.ts +++ b/web/src/app/shared/components/master-and-detail/master-and-detail.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router, ActivatedRoute, NavigationStart, RouterEvent } from '@angular/router'; -import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; +import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service'; @Component({ selector: 'taskana-master-and-detail', diff --git a/web/src/app/components/nav-bar/nav-bar.component.html b/web/src/app/shared/components/nav-bar/nav-bar.component.html similarity index 100% rename from web/src/app/components/nav-bar/nav-bar.component.html rename to web/src/app/shared/components/nav-bar/nav-bar.component.html diff --git a/web/src/app/components/nav-bar/nav-bar.component.scss b/web/src/app/shared/components/nav-bar/nav-bar.component.scss similarity index 100% rename from web/src/app/components/nav-bar/nav-bar.component.scss rename to web/src/app/shared/components/nav-bar/nav-bar.component.scss diff --git a/web/src/app/components/nav-bar/nav-bar.component.spec.ts b/web/src/app/shared/components/nav-bar/nav-bar.component.spec.ts similarity index 74% rename from web/src/app/components/nav-bar/nav-bar.component.spec.ts rename to web/src/app/shared/components/nav-bar/nav-bar.component.spec.ts index 104d58e43..3212add96 100644 --- a/web/src/app/components/nav-bar/nav-bar.component.spec.ts +++ b/web/src/app/shared/components/nav-bar/nav-bar.component.spec.ts @@ -5,14 +5,14 @@ import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; import { SharedModule } from 'app/shared/shared.module'; -import { UserInformationComponent } from 'app/components/user-information/user-information.component'; +import { UserInformationComponent } from 'app/shared/components/user-information/user-information.component'; -import { SelectedRouteService } from 'app/services/selected-route/selected-route'; -import { BusinessAdminGuard } from 'app/guards/business-admin.guard'; -import { MonitorGuard } from 'app/guards/monitor.guard'; -import { WindowRefService } from 'app/services/window/window.service'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route'; +import { BusinessAdminGuard } from 'app/shared/guards/business-admin.guard'; +import { MonitorGuard } from 'app/shared/guards/monitor.guard'; +import { WindowRefService } from 'app/shared/services/window/window.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { configureTests } from 'app/app.test.configuration'; import { NavBarComponent } from './nav-bar.component'; diff --git a/web/src/app/components/nav-bar/nav-bar.component.ts b/web/src/app/shared/components/nav-bar/nav-bar.component.ts similarity index 89% rename from web/src/app/components/nav-bar/nav-bar.component.ts rename to web/src/app/shared/components/nav-bar/nav-bar.component.ts index b3edb2920..ab8b0a71c 100644 --- a/web/src/app/components/nav-bar/nav-bar.component.ts +++ b/web/src/app/shared/components/nav-bar/nav-bar.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { environment } from 'environments/environment'; -import { SelectedRouteService } from 'app/services/selected-route/selected-route'; +import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route'; import { Subscription } from 'rxjs'; -import { DomainService } from 'app/services/domain/domain.service'; -import { BusinessAdminGuard } from 'app/guards/business-admin.guard'; -import { MonitorGuard } from 'app/guards/monitor.guard'; -import { WindowRefService } from 'app/services/window/window.service'; -import { UserGuard } from 'app/guards/user.guard'; +import { DomainService } from 'app/shared/services/domain/domain.service'; +import { BusinessAdminGuard } from 'app/shared/guards/business-admin.guard'; +import { MonitorGuard } from 'app/shared/guards/monitor.guard'; +import { WindowRefService } from 'app/shared/services/window/window.service'; +import { UserGuard } from 'app/shared/guards/user.guard'; import { expandRight } from 'app/shared/animations/expand.animation'; import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service'; @Component({ diff --git a/web/src/app/components/no-access/no-access.component.html b/web/src/app/shared/components/no-access/no-access.component.html similarity index 100% rename from web/src/app/components/no-access/no-access.component.html rename to web/src/app/shared/components/no-access/no-access.component.html diff --git a/web/src/app/components/no-access/no-access.component.scss b/web/src/app/shared/components/no-access/no-access.component.scss similarity index 100% rename from web/src/app/components/no-access/no-access.component.scss rename to web/src/app/shared/components/no-access/no-access.component.scss diff --git a/web/src/app/components/no-access/no-access.component.spec.ts b/web/src/app/shared/components/no-access/no-access.component.spec.ts similarity index 100% rename from web/src/app/components/no-access/no-access.component.spec.ts rename to web/src/app/shared/components/no-access/no-access.component.spec.ts diff --git a/web/src/app/components/no-access/no-access.component.ts b/web/src/app/shared/components/no-access/no-access.component.ts similarity index 82% rename from web/src/app/components/no-access/no-access.component.ts rename to web/src/app/shared/components/no-access/no-access.component.ts index 77ad9b909..215fe3227 100644 --- a/web/src/app/components/no-access/no-access.component.ts +++ b/web/src/app/shared/components/no-access/no-access.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { BusinessAdminGuard } from 'app/guards/business-admin.guard'; -import { MonitorGuard } from 'app/guards/monitor.guard'; -import { UserGuard } from 'app/guards/user.guard'; +import { BusinessAdminGuard } from 'app/shared/guards/business-admin.guard'; +import { MonitorGuard } from 'app/shared/guards/monitor.guard'; +import { UserGuard } from 'app/shared/guards/user.guard'; import { Router } from '@angular/router'; import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service'; diff --git a/web/src/app/shared/number-picker/number-picker.component.html b/web/src/app/shared/components/number-picker/number-picker.component.html similarity index 100% rename from web/src/app/shared/number-picker/number-picker.component.html rename to web/src/app/shared/components/number-picker/number-picker.component.html diff --git a/web/src/app/shared/number-picker/number-picker.component.scss b/web/src/app/shared/components/number-picker/number-picker.component.scss similarity index 100% rename from web/src/app/shared/number-picker/number-picker.component.scss rename to web/src/app/shared/components/number-picker/number-picker.component.scss diff --git a/web/src/app/shared/number-picker/number-picker.component.spec.ts b/web/src/app/shared/components/number-picker/number-picker.component.spec.ts similarity index 100% rename from web/src/app/shared/number-picker/number-picker.component.spec.ts rename to web/src/app/shared/components/number-picker/number-picker.component.spec.ts diff --git a/web/src/app/shared/number-picker/number-picker.component.ts b/web/src/app/shared/components/number-picker/number-picker.component.ts similarity index 100% rename from web/src/app/shared/number-picker/number-picker.component.ts rename to web/src/app/shared/components/number-picker/number-picker.component.ts diff --git a/web/src/app/shared/pagination/pagination.component.html b/web/src/app/shared/components/pagination/pagination.component.html similarity index 100% rename from web/src/app/shared/pagination/pagination.component.html rename to web/src/app/shared/components/pagination/pagination.component.html diff --git a/web/src/app/shared/pagination/pagination.component.scss b/web/src/app/shared/components/pagination/pagination.component.scss similarity index 100% rename from web/src/app/shared/pagination/pagination.component.scss rename to web/src/app/shared/components/pagination/pagination.component.scss diff --git a/web/src/app/shared/pagination/pagination.component.spec.ts b/web/src/app/shared/components/pagination/pagination.component.spec.ts similarity index 98% rename from web/src/app/shared/pagination/pagination.component.spec.ts rename to web/src/app/shared/components/pagination/pagination.component.spec.ts index 038081a05..83e93c0ac 100644 --- a/web/src/app/shared/pagination/pagination.component.spec.ts +++ b/web/src/app/shared/components/pagination/pagination.component.spec.ts @@ -3,7 +3,7 @@ import { SimpleChange } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { SharedModule } from 'app/shared/shared.module'; -import { Page } from 'app/models/page'; +import { Page } from 'app/shared/models/page'; import { configureTests } from 'app/app.test.configuration'; import { PaginationComponent } from './pagination.component'; diff --git a/web/src/app/shared/pagination/pagination.component.ts b/web/src/app/shared/components/pagination/pagination.component.ts similarity index 96% rename from web/src/app/shared/pagination/pagination.component.ts rename to web/src/app/shared/components/pagination/pagination.component.ts index fedb2f0ee..feb0fee57 100644 --- a/web/src/app/shared/pagination/pagination.component.ts +++ b/web/src/app/shared/components/pagination/pagination.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; -import { Page } from 'app/models/page'; +import { Page } from 'app/shared/models/page'; @Component({ selector: 'taskana-pagination', diff --git a/web/src/app/shared/progress-bar/progress-bar.component.html b/web/src/app/shared/components/progress-bar/progress-bar.component.html similarity index 100% rename from web/src/app/shared/progress-bar/progress-bar.component.html rename to web/src/app/shared/components/progress-bar/progress-bar.component.html diff --git a/web/src/app/shared/progress-bar/progress-bar.component.scss b/web/src/app/shared/components/progress-bar/progress-bar.component.scss similarity index 100% rename from web/src/app/shared/progress-bar/progress-bar.component.scss rename to web/src/app/shared/components/progress-bar/progress-bar.component.scss diff --git a/web/src/app/shared/progress-bar/progress-bar.component.spec.ts b/web/src/app/shared/components/progress-bar/progress-bar.component.spec.ts similarity index 100% rename from web/src/app/shared/progress-bar/progress-bar.component.spec.ts rename to web/src/app/shared/components/progress-bar/progress-bar.component.spec.ts diff --git a/web/src/app/shared/progress-bar/progress-bar.component.ts b/web/src/app/shared/components/progress-bar/progress-bar.component.ts similarity index 100% rename from web/src/app/shared/progress-bar/progress-bar.component.ts rename to web/src/app/shared/components/progress-bar/progress-bar.component.ts diff --git a/web/src/app/shared/remove-confirmation/remove-confirmation.component.html b/web/src/app/shared/components/remove-confirmation/remove-confirmation.component.html similarity index 100% rename from web/src/app/shared/remove-confirmation/remove-confirmation.component.html rename to web/src/app/shared/components/remove-confirmation/remove-confirmation.component.html diff --git a/web/src/app/shared/remove-confirmation/remove-confirmation.component.scss b/web/src/app/shared/components/remove-confirmation/remove-confirmation.component.scss similarity index 100% rename from web/src/app/shared/remove-confirmation/remove-confirmation.component.scss rename to web/src/app/shared/components/remove-confirmation/remove-confirmation.component.scss diff --git a/web/src/app/shared/remove-confirmation/remove-confirmation.component.spec.ts b/web/src/app/shared/components/remove-confirmation/remove-confirmation.component.spec.ts similarity index 100% rename from web/src/app/shared/remove-confirmation/remove-confirmation.component.spec.ts rename to web/src/app/shared/components/remove-confirmation/remove-confirmation.component.spec.ts diff --git a/web/src/app/shared/remove-confirmation/remove-confirmation.component.ts b/web/src/app/shared/components/remove-confirmation/remove-confirmation.component.ts similarity index 88% rename from web/src/app/shared/remove-confirmation/remove-confirmation.component.ts rename to web/src/app/shared/components/remove-confirmation/remove-confirmation.component.ts index 016df079d..6e0c767a1 100644 --- a/web/src/app/shared/remove-confirmation/remove-confirmation.component.ts +++ b/web/src/app/shared/components/remove-confirmation/remove-confirmation.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; +import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service'; declare let $: any; diff --git a/web/src/app/shared/sort/sort.component.html b/web/src/app/shared/components/sort/sort.component.html similarity index 100% rename from web/src/app/shared/sort/sort.component.html rename to web/src/app/shared/components/sort/sort.component.html diff --git a/web/src/app/shared/sort/sort.component.scss b/web/src/app/shared/components/sort/sort.component.scss similarity index 100% rename from web/src/app/shared/sort/sort.component.scss rename to web/src/app/shared/components/sort/sort.component.scss diff --git a/web/src/app/shared/sort/sort.component.spec.ts b/web/src/app/shared/components/sort/sort.component.spec.ts similarity index 96% rename from web/src/app/shared/sort/sort.component.spec.ts rename to web/src/app/shared/components/sort/sort.component.spec.ts index c7dac9098..f24f7f720 100644 --- a/web/src/app/shared/sort/sort.component.spec.ts +++ b/web/src/app/shared/components/sort/sort.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { configureTests } from 'app/app.test.configuration'; -import { Direction } from 'app/models/sorting'; +import { Direction } from 'app/shared/models/sorting'; import { SortComponent } from './sort.component'; describe('SortComponent', () => { diff --git a/web/src/app/shared/sort/sort.component.ts b/web/src/app/shared/components/sort/sort.component.ts similarity index 81% rename from web/src/app/shared/sort/sort.component.ts rename to web/src/app/shared/components/sort/sort.component.ts index f60164080..84fa13570 100644 --- a/web/src/app/shared/sort/sort.component.ts +++ b/web/src/app/shared/components/sort/sort.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { Direction, SortingModel } from 'app/models/sorting'; +import { Direction, Sorting } from 'app/shared/models/sorting'; @Component({ selector: 'taskana-sort', @@ -11,9 +11,9 @@ export class SortComponent implements OnInit { @Input() menuPosition = 'right'; @Input() defaultSortBy = 'key'; - @Output() performSorting = new EventEmitter(); + @Output() performSorting = new EventEmitter(); - sort: SortingModel = new SortingModel(); + sort: Sorting = new Sorting(); ngOnInit() { this.sort.sortBy = this.defaultSortBy; diff --git a/web/src/app/shared/spinner/spinner.component.html b/web/src/app/shared/components/spinner/spinner.component.html similarity index 100% rename from web/src/app/shared/spinner/spinner.component.html rename to web/src/app/shared/components/spinner/spinner.component.html diff --git a/web/src/app/shared/spinner/spinner.component.scss b/web/src/app/shared/components/spinner/spinner.component.scss similarity index 100% rename from web/src/app/shared/spinner/spinner.component.scss rename to web/src/app/shared/components/spinner/spinner.component.scss diff --git a/web/src/app/shared/spinner/spinner.component.spec.ts b/web/src/app/shared/components/spinner/spinner.component.spec.ts similarity index 87% rename from web/src/app/shared/spinner/spinner.component.spec.ts rename to web/src/app/shared/components/spinner/spinner.component.spec.ts index 9a1f230ca..b8126cdee 100644 --- a/web/src/app/shared/spinner/spinner.component.spec.ts +++ b/web/src/app/shared/components/spinner/spinner.component.spec.ts @@ -1,6 +1,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; import { SpinnerComponent } from './spinner.component'; describe('SpinnerComponent', () => { diff --git a/web/src/app/shared/spinner/spinner.component.ts b/web/src/app/shared/components/spinner/spinner.component.ts similarity index 100% rename from web/src/app/shared/spinner/spinner.component.ts rename to web/src/app/shared/components/spinner/spinner.component.ts diff --git a/web/src/app/shared/tree/tree.component.html b/web/src/app/shared/components/tree/tree.component.html similarity index 100% rename from web/src/app/shared/tree/tree.component.html rename to web/src/app/shared/components/tree/tree.component.html diff --git a/web/src/app/shared/tree/tree.component.scss b/web/src/app/shared/components/tree/tree.component.scss similarity index 100% rename from web/src/app/shared/tree/tree.component.scss rename to web/src/app/shared/components/tree/tree.component.scss diff --git a/web/src/app/shared/tree/tree.component.spec.ts b/web/src/app/shared/components/tree/tree.component.spec.ts similarity index 96% rename from web/src/app/shared/tree/tree.component.spec.ts rename to web/src/app/shared/components/tree/tree.component.spec.ts index 38c57c1a8..823fe14cb 100644 --- a/web/src/app/shared/tree/tree.component.spec.ts +++ b/web/src/app/shared/components/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/services/tree/tree.service'; +import { TreeService } from 'app/shared/services/tree/tree.service'; import { configureTests } from 'app/app.test.configuration'; import { NgxsModule } from '@ngxs/store'; import { TaskanaTreeComponent } from './tree.component'; import { ClassificationDefinition } from '../../models/classification-definition'; import { LinksClassification } from '../../models/links-classfication'; -import { ClassificationsService } from '../services/classifications/classifications.service'; +import { ClassificationsService } from '../../services/classifications/classifications.service'; @Component({ selector: 'tree-root', diff --git a/web/src/app/shared/tree/tree.component.ts b/web/src/app/shared/components/tree/tree.component.ts similarity index 97% rename from web/src/app/shared/tree/tree.component.ts rename to web/src/app/shared/components/tree/tree.component.ts index cf5ac21f2..c01332002 100644 --- a/web/src/app/shared/tree/tree.component.ts +++ b/web/src/app/shared/components/tree/tree.component.ts @@ -8,10 +8,10 @@ import { AfterViewChecked, OnInit, Output, ViewChild } from '@angular/core'; -import { TreeNodeModel } from 'app/models/tree-node'; +import { TreeNodeModel } from 'app/shared/models/tree-node'; import { ITreeOptions, KEYS, TreeComponent, TreeNode } from 'angular-tree-component'; -import { Pair } from 'app/models/pair'; +import { Pair } from 'app/shared/models/pair'; import { Observable, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import { Select } from '@ngxs/store'; @@ -20,7 +20,7 @@ import { EngineConfigurationSelectors } from 'app/store/engine-configuration-sto 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 { ClassificationsService } from '../../services/classifications/classifications.service'; import { ClassificationCategoryImages } from '../../models/customisation'; @Component({ diff --git a/web/src/app/shared/type-ahead/type-ahead.component.html b/web/src/app/shared/components/type-ahead/type-ahead.component.html similarity index 100% rename from web/src/app/shared/type-ahead/type-ahead.component.html rename to web/src/app/shared/components/type-ahead/type-ahead.component.html diff --git a/web/src/app/shared/type-ahead/type-ahead.component.scss b/web/src/app/shared/components/type-ahead/type-ahead.component.scss similarity index 100% rename from web/src/app/shared/type-ahead/type-ahead.component.scss rename to web/src/app/shared/components/type-ahead/type-ahead.component.scss diff --git a/web/src/app/shared/type-ahead/type-ahead.component.ts b/web/src/app/shared/components/type-ahead/type-ahead.component.ts similarity index 98% rename from web/src/app/shared/type-ahead/type-ahead.component.ts rename to web/src/app/shared/components/type-ahead/type-ahead.component.ts index cc20a6fd4..02bb3dde1 100644 --- a/web/src/app/shared/type-ahead/type-ahead.component.ts +++ b/web/src/app/shared/components/type-ahead/type-ahead.component.ts @@ -6,7 +6,7 @@ import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.serv import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { highlight } from 'app/shared/animations/validation.animation'; import { mergeMap } from 'rxjs/operators'; -import { AccessIdDefinition } from 'app/models/access-id'; +import { AccessIdDefinition } from 'app/shared/models/access-id'; @Component({ selector: 'taskana-type-ahead', diff --git a/web/src/app/shared/type-ahead/type-ahead.mock.component.ts b/web/src/app/shared/components/type-ahead/type-ahead.mock.component.ts similarity index 100% rename from web/src/app/shared/type-ahead/type-ahead.mock.component.ts rename to web/src/app/shared/components/type-ahead/type-ahead.mock.component.ts diff --git a/web/src/app/components/user-information/user-information.component.html b/web/src/app/shared/components/user-information/user-information.component.html similarity index 100% rename from web/src/app/components/user-information/user-information.component.html rename to web/src/app/shared/components/user-information/user-information.component.html diff --git a/web/src/app/components/user-information/user-information.component.scss b/web/src/app/shared/components/user-information/user-information.component.scss similarity index 100% rename from web/src/app/components/user-information/user-information.component.scss rename to web/src/app/shared/components/user-information/user-information.component.scss diff --git a/web/src/app/components/user-information/user-information.component.spec.ts b/web/src/app/shared/components/user-information/user-information.component.spec.ts similarity index 100% rename from web/src/app/components/user-information/user-information.component.spec.ts rename to web/src/app/shared/components/user-information/user-information.component.spec.ts diff --git a/web/src/app/components/user-information/user-information.component.ts b/web/src/app/shared/components/user-information/user-information.component.ts similarity index 72% rename from web/src/app/components/user-information/user-information.component.ts rename to web/src/app/shared/components/user-information/user-information.component.ts index 81691dd22..8f606ecfc 100644 --- a/web/src/app/components/user-information/user-information.component.ts +++ b/web/src/app/shared/components/user-information/user-information.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; -import { UserInfoModel } from 'app/models/user-info'; -import { expandDown } from '../../shared/animations/expand.animation'; +import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; +import { UserInfo } from 'app/shared/models/user-info'; +import { expandDown } from '../../animations/expand.animation'; @Component({ selector: 'taskana-user-information', @@ -10,7 +10,7 @@ import { expandDown } from '../../shared/animations/expand.animation'; animations: [expandDown], }) export class UserInformationComponent implements OnInit { - userInformation: UserInfoModel; + userInformation: UserInfo; roles = ''; showRoles = false; constructor(private taskanaEngineService: TaskanaEngineService) { } diff --git a/web/src/app/guards/business-admin.guard.ts b/web/src/app/shared/guards/business-admin.guard.ts similarity index 85% rename from web/src/app/guards/business-admin.guard.ts rename to web/src/app/shared/guards/business-admin.guard.ts index b370ba30d..8044c9a38 100644 --- a/web/src/app/guards/business-admin.guard.ts +++ b/web/src/app/shared/guards/business-admin.guard.ts @@ -1,6 +1,6 @@ import { CanActivate, Router } from '@angular/router'; import { Injectable } from '@angular/core'; -import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; @Injectable() export class BusinessAdminGuard implements CanActivate { diff --git a/web/src/app/guards/domain.guard.ts b/web/src/app/shared/guards/domain.guard.ts similarity index 90% rename from web/src/app/guards/domain.guard.ts rename to web/src/app/shared/guards/domain.guard.ts index c355c092d..f24edf174 100644 --- a/web/src/app/guards/domain.guard.ts +++ b/web/src/app/shared/guards/domain.guard.ts @@ -1,7 +1,7 @@ import { of } from 'rxjs'; import { CanActivate } from '@angular/router'; import { Injectable } from '@angular/core'; -import { DomainService } from 'app/services/domain/domain.service'; +import { DomainService } from 'app/shared/services/domain/domain.service'; import { catchError, map } from 'rxjs/operators'; import { ErrorsService } from '../services/errors/errors.service'; import { ERROR_TYPES } from '../models/errors'; diff --git a/web/src/app/guards/history.guard.ts b/web/src/app/shared/guards/history.guard.ts similarity index 92% rename from web/src/app/guards/history.guard.ts rename to web/src/app/shared/guards/history.guard.ts index e18486eb1..aade99e76 100644 --- a/web/src/app/guards/history.guard.ts +++ b/web/src/app/shared/guards/history.guard.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; import { Observable, of } from 'rxjs'; -import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; import { catchError, map } from 'rxjs/operators'; import { ERROR_TYPES } from '../models/errors'; import { ErrorsService } from '../services/errors/errors.service'; diff --git a/web/src/app/guards/monitor.guard.ts b/web/src/app/shared/guards/monitor.guard.ts similarity index 84% rename from web/src/app/guards/monitor.guard.ts rename to web/src/app/shared/guards/monitor.guard.ts index 42518f21b..721a320ee 100644 --- a/web/src/app/guards/monitor.guard.ts +++ b/web/src/app/shared/guards/monitor.guard.ts @@ -1,6 +1,6 @@ import { CanActivate, Router } from '@angular/router'; import { Injectable } from '@angular/core'; -import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; @Injectable() export class MonitorGuard implements CanActivate { diff --git a/web/src/app/guards/user.guard.ts b/web/src/app/shared/guards/user.guard.ts similarity index 84% rename from web/src/app/guards/user.guard.ts rename to web/src/app/shared/guards/user.guard.ts index a1da091d3..5b1a37e83 100644 --- a/web/src/app/guards/user.guard.ts +++ b/web/src/app/shared/guards/user.guard.ts @@ -1,6 +1,6 @@ import { CanActivate, Router } from '@angular/router'; import { Injectable } from '@angular/core'; -import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; @Injectable() export class UserGuard implements CanActivate { diff --git a/web/src/app/models/access-id.ts b/web/src/app/shared/models/access-id.ts similarity index 60% rename from web/src/app/models/access-id.ts rename to web/src/app/shared/models/access-id.ts index 9370121dc..af912139f 100644 --- a/web/src/app/models/access-id.ts +++ b/web/src/app/shared/models/access-id.ts @@ -1,4 +1,4 @@ -import { LinksClassification } from 'app/models/links-classfication'; +import { LinksClassification } from 'app/shared/models/links-classfication'; export class AccessIdDefinition { constructor( diff --git a/web/src/app/models/access-item-workbasket-resource.ts b/web/src/app/shared/models/access-item-workbasket-resource.ts similarity index 82% rename from web/src/app/models/access-item-workbasket-resource.ts rename to web/src/app/shared/models/access-item-workbasket-resource.ts index da5abe687..7a18381db 100644 --- a/web/src/app/models/access-item-workbasket-resource.ts +++ b/web/src/app/shared/models/access-item-workbasket-resource.ts @@ -1,7 +1,7 @@ import { Links } from './links'; import { AccessItemWorkbasket } from './access-item-workbasket'; -export class AccessItemsWorkbasketResource { +export class AccessItemWorkbasketResource { constructor( public accessItems: Array = [], public _links?: Links diff --git a/web/src/app/models/access-item-workbasket.ts b/web/src/app/shared/models/access-item-workbasket.ts similarity index 100% rename from web/src/app/models/access-item-workbasket.ts rename to web/src/app/shared/models/access-item-workbasket.ts diff --git a/web/src/app/models/action.ts b/web/src/app/shared/models/action.ts similarity index 100% rename from web/src/app/models/action.ts rename to web/src/app/shared/models/action.ts diff --git a/web/src/app/models/alert.ts b/web/src/app/shared/models/alert.ts similarity index 100% rename from web/src/app/models/alert.ts rename to web/src/app/shared/models/alert.ts diff --git a/web/src/app/models/classification-definition.ts b/web/src/app/shared/models/classification-definition.ts similarity index 91% rename from web/src/app/models/classification-definition.ts rename to web/src/app/shared/models/classification-definition.ts index 7b0c109ec..d7bb70f8a 100644 --- a/web/src/app/models/classification-definition.ts +++ b/web/src/app/shared/models/classification-definition.ts @@ -1,4 +1,4 @@ -import { LinksClassification } from 'app/models/links-classfication'; +import { LinksClassification } from 'app/shared/models/links-classfication'; export class ClassificationDefinition { constructor(public classificationId?: string, diff --git a/web/src/app/models/classification-resource.ts b/web/src/app/shared/models/classification-resource.ts similarity index 100% rename from web/src/app/models/classification-resource.ts rename to web/src/app/shared/models/classification-resource.ts diff --git a/web/src/app/models/classification.ts b/web/src/app/shared/models/classification.ts similarity index 89% rename from web/src/app/models/classification.ts rename to web/src/app/shared/models/classification.ts index 68c992518..0b732207c 100644 --- a/web/src/app/models/classification.ts +++ b/web/src/app/shared/models/classification.ts @@ -1,4 +1,4 @@ -import { Links } from 'app/models/links'; +import { Links } from 'app/shared/models/links'; export class Classification { constructor(public classificationId?: string, // newly created classifications don't have an id yet. diff --git a/web/src/app/models/customisation.ts b/web/src/app/shared/models/customisation.ts similarity index 100% rename from web/src/app/models/customisation.ts rename to web/src/app/shared/models/customisation.ts diff --git a/web/src/app/models/error-model.ts b/web/src/app/shared/models/error-model.ts similarity index 100% rename from web/src/app/models/error-model.ts rename to web/src/app/shared/models/error-model.ts diff --git a/web/src/app/models/errors.ts b/web/src/app/shared/models/errors.ts similarity index 100% rename from web/src/app/models/errors.ts rename to web/src/app/shared/models/errors.ts diff --git a/web/src/app/models/filter.ts b/web/src/app/shared/models/filter.ts similarity index 79% rename from web/src/app/models/filter.ts rename to web/src/app/shared/models/filter.ts index 82830d74f..24adca95a 100644 --- a/web/src/app/models/filter.ts +++ b/web/src/app/shared/models/filter.ts @@ -1,4 +1,4 @@ -export class FilterModel { +export class Filter { filterParams: any; constructor(filterParams?: any) { diff --git a/web/src/app/models/type.ts b/web/src/app/shared/models/icon-types.ts similarity index 100% rename from web/src/app/models/type.ts rename to web/src/app/shared/models/icon-types.ts diff --git a/web/src/app/models/links-classfication.ts b/web/src/app/shared/models/links-classfication.ts similarity index 100% rename from web/src/app/models/links-classfication.ts rename to web/src/app/shared/models/links-classfication.ts diff --git a/web/src/app/models/links-workbasket-summary.ts b/web/src/app/shared/models/links-workbasket-summary.ts similarity index 100% rename from web/src/app/models/links-workbasket-summary.ts rename to web/src/app/shared/models/links-workbasket-summary.ts diff --git a/web/src/app/models/links.ts b/web/src/app/shared/models/links.ts similarity index 100% rename from web/src/app/models/links.ts rename to web/src/app/shared/models/links.ts diff --git a/web/src/app/models/message-modal.ts b/web/src/app/shared/models/message-modal.ts similarity index 100% rename from web/src/app/models/message-modal.ts rename to web/src/app/shared/models/message-modal.ts diff --git a/web/src/app/models/orientation.ts b/web/src/app/shared/models/orientation.ts similarity index 100% rename from web/src/app/models/orientation.ts rename to web/src/app/shared/models/orientation.ts diff --git a/web/src/app/models/page.ts b/web/src/app/shared/models/page.ts similarity index 100% rename from web/src/app/models/page.ts rename to web/src/app/shared/models/page.ts diff --git a/web/src/app/models/pair.ts b/web/src/app/shared/models/pair.ts similarity index 100% rename from web/src/app/models/pair.ts rename to web/src/app/shared/models/pair.ts diff --git a/web/src/app/models/query-parameters.ts b/web/src/app/shared/models/query-parameters.ts similarity index 97% rename from web/src/app/models/query-parameters.ts rename to web/src/app/shared/models/query-parameters.ts index e3af094e3..4f6998a58 100644 --- a/web/src/app/models/query-parameters.ts +++ b/web/src/app/shared/models/query-parameters.ts @@ -1,5 +1,5 @@ -export class QueryParametersModel { +export class QueryParameters { SORTBY: string; SORTDIRECTION: string; // Filtering diff --git a/web/src/app/models/sorting.ts b/web/src/app/shared/models/sorting.ts similarity index 90% rename from web/src/app/models/sorting.ts rename to web/src/app/shared/models/sorting.ts index 9f3838071..66f64ade3 100644 --- a/web/src/app/models/sorting.ts +++ b/web/src/app/shared/models/sorting.ts @@ -4,7 +4,7 @@ export enum Direction { } -export class SortingModel { +export class Sorting { sortBy: string; sortDirection: string; constructor(sortBy: string = 'key', sortDirection: Direction = Direction.ASC) { diff --git a/web/src/app/models/task-history-event-resource.ts b/web/src/app/shared/models/task-history-event-resource.ts similarity index 100% rename from web/src/app/models/task-history-event-resource.ts rename to web/src/app/shared/models/task-history-event-resource.ts diff --git a/web/src/app/models/task-history-event.ts b/web/src/app/shared/models/task-history-event.ts similarity index 100% rename from web/src/app/models/task-history-event.ts rename to web/src/app/shared/models/task-history-event.ts diff --git a/web/src/app/models/taskana-type.ts b/web/src/app/shared/models/taskana-type.ts similarity index 100% rename from web/src/app/models/taskana-type.ts rename to web/src/app/shared/models/taskana-type.ts diff --git a/web/src/app/models/tree-node.ts b/web/src/app/shared/models/tree-node.ts similarity index 87% rename from web/src/app/models/tree-node.ts rename to web/src/app/shared/models/tree-node.ts index 7235a8f22..7d0291af0 100644 --- a/web/src/app/models/tree-node.ts +++ b/web/src/app/shared/models/tree-node.ts @@ -1,4 +1,4 @@ -import { Classification } from 'app/models/classification'; +import { Classification } from 'app/shared/models/classification'; export class TreeNodeModel extends Classification { constructor(public id?: string, diff --git a/web/src/app/models/user-info.ts b/web/src/app/shared/models/user-info.ts similarity index 82% rename from web/src/app/models/user-info.ts rename to web/src/app/shared/models/user-info.ts index c6040a1b8..45b249c25 100644 --- a/web/src/app/models/user-info.ts +++ b/web/src/app/shared/models/user-info.ts @@ -1,5 +1,5 @@ -export class UserInfoModel { +export class UserInfo { constructor( public userId: string = '', public groupIds: Array = [], diff --git a/web/src/app/models/version.ts b/web/src/app/shared/models/version.ts similarity index 67% rename from web/src/app/models/version.ts rename to web/src/app/shared/models/version.ts index 7a57b0c72..8071d5c99 100644 --- a/web/src/app/models/version.ts +++ b/web/src/app/shared/models/version.ts @@ -1,5 +1,5 @@ -export class VersionModel { +export class Version { constructor( public version: string = '' ) { } diff --git a/web/src/app/models/workbasket-access-items-resource.ts b/web/src/app/shared/models/workbasket-access-items-resource.ts similarity index 100% rename from web/src/app/models/workbasket-access-items-resource.ts rename to web/src/app/shared/models/workbasket-access-items-resource.ts diff --git a/web/src/app/models/workbasket-access-items.ts b/web/src/app/shared/models/workbasket-access-items.ts similarity index 100% rename from web/src/app/models/workbasket-access-items.ts rename to web/src/app/shared/models/workbasket-access-items.ts diff --git a/web/src/app/models/workbasket-definition.ts b/web/src/app/shared/models/workbasket-definition.ts similarity index 100% rename from web/src/app/models/workbasket-definition.ts rename to web/src/app/shared/models/workbasket-definition.ts diff --git a/web/src/app/models/workbasket-distribution-targets-resource.ts b/web/src/app/shared/models/workbasket-distribution-targets-resource.ts similarity index 100% rename from web/src/app/models/workbasket-distribution-targets-resource.ts rename to web/src/app/shared/models/workbasket-distribution-targets-resource.ts diff --git a/web/src/app/models/workbasket-resource.ts b/web/src/app/shared/models/workbasket-resource.ts similarity index 100% rename from web/src/app/models/workbasket-resource.ts rename to web/src/app/shared/models/workbasket-resource.ts diff --git a/web/src/app/models/workbasket-summary-resource.ts b/web/src/app/shared/models/workbasket-summary-resource.ts similarity index 88% rename from web/src/app/models/workbasket-summary-resource.ts rename to web/src/app/shared/models/workbasket-summary-resource.ts index 4e09e5719..d62bf8c4c 100644 --- a/web/src/app/models/workbasket-summary-resource.ts +++ b/web/src/app/shared/models/workbasket-summary-resource.ts @@ -1,4 +1,4 @@ -import { Page } from 'app/models/page'; +import { Page } from 'app/shared/models/page'; import { WorkbasketSummary } from './workbasket-summary'; import { LinksWorkbasketSummary } from './links-workbasket-summary'; diff --git a/web/src/app/models/workbasket-summary.ts b/web/src/app/shared/models/workbasket-summary.ts similarity index 93% rename from web/src/app/models/workbasket-summary.ts rename to web/src/app/shared/models/workbasket-summary.ts index 4f367df1a..86ade7d0b 100644 --- a/web/src/app/models/workbasket-summary.ts +++ b/web/src/app/shared/models/workbasket-summary.ts @@ -1,4 +1,4 @@ -import { ICONTYPES } from './type'; +import { ICONTYPES } from './icon-types'; import { Page } from './page'; import { Links } from './links'; diff --git a/web/src/app/models/workbasket.ts b/web/src/app/shared/models/workbasket.ts similarity index 97% rename from web/src/app/models/workbasket.ts rename to web/src/app/shared/models/workbasket.ts index 192b757e2..5daabd625 100644 --- a/web/src/app/models/workbasket.ts +++ b/web/src/app/shared/models/workbasket.ts @@ -1,5 +1,5 @@ import { Links } from './links'; -import { ICONTYPES } from './type'; +import { ICONTYPES } from './icon-types'; export class Workbasket { public static equals(org: Workbasket, comp: Workbasket): boolean { diff --git a/web/src/app/shared/pipes/date-time-zone/date-time-zone.pipe.spec.ts b/web/src/app/shared/pipes/date-time-zone.pipe.spec.ts similarity index 100% rename from web/src/app/shared/pipes/date-time-zone/date-time-zone.pipe.spec.ts rename to web/src/app/shared/pipes/date-time-zone.pipe.spec.ts diff --git a/web/src/app/shared/pipes/date-time-zone/date-time-zone.pipe.ts b/web/src/app/shared/pipes/date-time-zone.pipe.ts similarity index 87% rename from web/src/app/shared/pipes/date-time-zone/date-time-zone.pipe.ts rename to web/src/app/shared/pipes/date-time-zone.pipe.ts index 9551ade9c..b7e76353b 100644 --- a/web/src/app/shared/pipes/date-time-zone/date-time-zone.pipe.ts +++ b/web/src/app/shared/pipes/date-time-zone.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { TaskanaDate } from '../../util/taskana.date'; +import { TaskanaDate } from '../util/taskana.date'; @Pipe({ name: 'dateTimeZone' diff --git a/web/src/app/shared/pipes/mapToIterable/mapToIterable.ts b/web/src/app/shared/pipes/map-to-iterable.pipe.ts similarity index 100% rename from web/src/app/shared/pipes/mapToIterable/mapToIterable.ts rename to web/src/app/shared/pipes/map-to-iterable.pipe.ts diff --git a/web/src/app/shared/pipes/mapValues/map-values.pipe.ts b/web/src/app/shared/pipes/map-values.pipe.ts similarity index 100% rename from web/src/app/shared/pipes/mapValues/map-values.pipe.ts rename to web/src/app/shared/pipes/map-values.pipe.ts diff --git a/web/src/app/shared/pipes/numberToArray/numberToArray.ts b/web/src/app/shared/pipes/number-to-array.pipe.ts similarity index 100% rename from web/src/app/shared/pipes/numberToArray/numberToArray.ts rename to web/src/app/shared/pipes/number-to-array.pipe.ts diff --git a/web/src/app/shared/pipes/orderBy/orderBy.ts b/web/src/app/shared/pipes/order-by.pipe.ts similarity index 100% rename from web/src/app/shared/pipes/orderBy/orderBy.ts rename to web/src/app/shared/pipes/order-by.pipe.ts diff --git a/web/src/app/shared/pipes/removeNoneType/remove-none-type.pipe.ts b/web/src/app/shared/pipes/remove-empty-type.pipe.ts similarity index 100% rename from web/src/app/shared/pipes/removeNoneType/remove-none-type.pipe.ts rename to web/src/app/shared/pipes/remove-empty-type.pipe.ts diff --git a/web/src/app/shared/pipes/selectedWorkbasket/seleted-workbasket.pipe.ts b/web/src/app/shared/pipes/select-workbaskets.pipe.ts similarity index 100% rename from web/src/app/shared/pipes/selectedWorkbasket/seleted-workbasket.pipe.ts rename to web/src/app/shared/pipes/select-workbaskets.pipe.ts diff --git a/web/src/app/shared/pipes/spreadNumber/spread-number.ts b/web/src/app/shared/pipes/spread-number.pipe.ts similarity index 100% rename from web/src/app/shared/pipes/spreadNumber/spread-number.ts rename to web/src/app/shared/pipes/spread-number.pipe.ts diff --git a/web/src/app/shared/services/access-ids/access-ids.service.ts b/web/src/app/shared/services/access-ids/access-ids.service.ts index f7733cee7..ea85a07f8 100644 --- a/web/src/app/shared/services/access-ids/access-ids.service.ts +++ b/web/src/app/shared/services/access-ids/access-ids.service.ts @@ -1,19 +1,19 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; -import { AccessIdDefinition } from 'app/models/access-id'; +import { AccessIdDefinition } from 'app/shared/models/access-id'; import { Observable, of } from 'rxjs'; -import { AccessItemsWorkbasketResource } from 'app/models/access-item-workbasket-resource'; +import { AccessItemWorkbasketResource } from 'app/shared/models/access-item-workbasket-resource'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; -import { SortingModel } from 'app/models/sorting'; -import { QueryParametersModel } from 'app/models/query-parameters'; +import { Sorting } from 'app/shared/models/sorting'; +import { QueryParameters } from 'app/shared/models/query-parameters'; @Injectable({ providedIn: 'root' }) export class AccessIdsService { private url = `${environment.taskanaRestUrl}/v1/access-ids`; - private accessItemsRef: Observable = new Observable(); + private accessItemsRef: Observable = new Observable(); constructor( private httpClient: HttpClient ) { } @@ -32,11 +32,11 @@ export class AccessIdsService { accessIds: Array, accessIdLike?: string, workbasketKeyLike?: string, - sortModel: SortingModel = new SortingModel('workbasket-key'), + sortModel: Sorting = new Sorting('workbasket-key'), forceRequest: boolean = false - ): Observable { + ): Observable { if (forceRequest || !this.accessItemsRef) { - this.accessItemsRef = this.httpClient.get(encodeURI( + this.accessItemsRef = this.httpClient.get(encodeURI( `${environment.taskanaRestUrl}/v1/workbasket-access-items/${TaskanaQueryParameters.getQueryParameters( this.accessIdsParameters(sortModel, accessIds, @@ -50,16 +50,16 @@ export class AccessIdsService { removeAccessItemsPermissions(accessId: string) { return this.httpClient - .delete(`${environment.taskanaRestUrl}/v1/workbasket-access-items/?access-id=${accessId}`); + .delete(`${environment.taskanaRestUrl}/v1/workbasket-access-items/?access-id=${accessId}`); } private accessIdsParameters( - sortModel: SortingModel, + sortModel: Sorting, accessIds: Array, accessIdLike?: string, workbasketKeyLike?: string - ): QueryParametersModel { - const parameters = new QueryParametersModel(); + ): QueryParameters { + const parameters = new QueryParameters(); parameters.SORTBY = sortModel.sortBy; parameters.SORTDIRECTION = sortModel.sortDirection; parameters.ACCESSIDS = accessIds.map((values: AccessIdDefinition) => values.accessId).join('|'); diff --git a/web/src/app/services/alert/alert.service.spec.ts b/web/src/app/shared/services/alert/alert.service.spec.ts similarity index 100% rename from web/src/app/services/alert/alert.service.spec.ts rename to web/src/app/shared/services/alert/alert.service.spec.ts diff --git a/web/src/app/services/alert/alert.service.ts b/web/src/app/shared/services/alert/alert.service.ts similarity index 86% rename from web/src/app/services/alert/alert.service.ts rename to web/src/app/shared/services/alert/alert.service.ts index 879d155f3..128d2e19e 100644 --- a/web/src/app/services/alert/alert.service.ts +++ b/web/src/app/shared/services/alert/alert.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Subject, Observable } from 'rxjs'; -import { AlertModel } from 'app/models/alert'; +import { AlertModel } from 'app/shared/models/alert'; @Injectable() export class AlertService { diff --git a/web/src/app/shared/services/classifications/classification-categories.service.spec.ts b/web/src/app/shared/services/classification-categories/classification-categories.service.spec.ts similarity index 94% rename from web/src/app/shared/services/classifications/classification-categories.service.spec.ts rename to web/src/app/shared/services/classification-categories/classification-categories.service.spec.ts index 3dd79ab5a..b0d6b78b5 100644 --- a/web/src/app/shared/services/classifications/classification-categories.service.spec.ts +++ b/web/src/app/shared/services/classification-categories/classification-categories.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, async } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { Customisation, CustomisationContent } from 'app/models/customisation'; +import { Customisation, CustomisationContent } from 'app/shared/models/customisation'; import { ClassificationCategoriesService, missingIcon } from './classification-categories.service'; describe('ClassificationCategoriesService', () => { diff --git a/web/src/app/shared/services/classifications/classification-categories.service.ts b/web/src/app/shared/services/classification-categories/classification-categories.service.ts similarity index 94% rename from web/src/app/shared/services/classifications/classification-categories.service.ts rename to web/src/app/shared/services/classification-categories/classification-categories.service.ts index 118cab0f1..9e2e49184 100644 --- a/web/src/app/shared/services/classifications/classification-categories.service.ts +++ b/web/src/app/shared/services/classification-categories/classification-categories.service.ts @@ -5,7 +5,7 @@ import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import set from 'set-value'; -import { Customisation } from '../../../models/customisation'; +import { Customisation } from '../../models/customisation'; const customisationUrl = 'environments/data-sources/taskana-customization.json'; diff --git a/web/src/app/shared/services/classifications/classifications.service.ts b/web/src/app/shared/services/classifications/classifications.service.ts index d8fc24533..b020410df 100644 --- a/web/src/app/shared/services/classifications/classifications.service.ts +++ b/web/src/app/shared/services/classifications/classifications.service.ts @@ -5,14 +5,14 @@ import { combineLatest, Observable, Subject } from 'rxjs'; import { map, mergeMap, tap } from 'rxjs/operators'; import { Select, Store } from '@ngxs/store'; -import { Classification } from 'app/models/classification'; -import { ClassificationDefinition } from 'app/models/classification-definition'; +import { Classification } from 'app/shared/models/classification'; +import { ClassificationDefinition } from 'app/shared/models/classification-definition'; -import { ClassificationResource } from 'app/models/classification-resource'; -import { DomainService } from 'app/services/domain/domain.service'; +import { ClassificationResource } from 'app/shared/models/classification-resource'; +import { DomainService } from 'app/shared/services/domain/domain.service'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; -import { Direction } from 'app/models/sorting'; -import { QueryParametersModel } from 'app/models/query-parameters'; +import { Direction } from 'app/shared/models/sorting'; +import { QueryParameters } from 'app/shared/models/query-parameters'; import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors'; import { SetSelectedClassificationType } from 'app/store/classification-store/classification.actions'; @@ -32,8 +32,8 @@ export class ClassificationsService { private store: Store ) {} - private static classificationParameters(domain: string): QueryParametersModel { - const parameters = new QueryParametersModel(); + private static classificationParameters(domain: string): QueryParameters { + const parameters = new QueryParameters(); parameters.SORTBY = TaskanaQueryParameters.parameters.KEY; parameters.SORTDIRECTION = Direction.ASC; parameters.DOMAIN = domain; diff --git a/web/src/app/services/domain/domain.service.mock.ts b/web/src/app/shared/services/domain/domain.service.mock.ts similarity index 100% rename from web/src/app/services/domain/domain.service.mock.ts rename to web/src/app/shared/services/domain/domain.service.mock.ts diff --git a/web/src/app/services/domain/domain.service.spec.ts b/web/src/app/shared/services/domain/domain.service.spec.ts similarity index 91% rename from web/src/app/services/domain/domain.service.spec.ts rename to web/src/app/shared/services/domain/domain.service.spec.ts index 2b29749ef..865b18dfe 100644 --- a/web/src/app/services/domain/domain.service.spec.ts +++ b/web/src/app/shared/services/domain/domain.service.spec.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; import { HttpClient, HttpClientModule } from '@angular/common/http'; import { DomainService } from './domain.service'; -import { RequestInProgressService } from '../requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from '../request-in-progress/request-in-progress.service'; import { SelectedRouteService } from '../selected-route/selected-route'; @Component({ diff --git a/web/src/app/services/domain/domain.service.ts b/web/src/app/shared/services/domain/domain.service.ts similarity index 95% rename from web/src/app/services/domain/domain.service.ts rename to web/src/app/shared/services/domain/domain.service.ts index 0d1db8c2e..30018e342 100644 --- a/web/src/app/services/domain/domain.service.ts +++ b/web/src/app/shared/services/domain/domain.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, ReplaySubject } from 'rxjs'; import { Router } from '@angular/router'; -import { environment } from '../../../environments/environment'; -import { RequestInProgressService } from '../requestInProgress/request-in-progress.service'; +import { environment } from '../../../../environments/environment'; +import { RequestInProgressService } from '../request-in-progress/request-in-progress.service'; import { SelectedRouteService } from '../selected-route/selected-route'; @Injectable() diff --git a/web/src/app/services/errors/errors.service.spec.ts b/web/src/app/shared/services/errors/errors.service.spec.ts similarity index 100% rename from web/src/app/services/errors/errors.service.spec.ts rename to web/src/app/shared/services/errors/errors.service.spec.ts diff --git a/web/src/app/services/errors/errors.service.ts b/web/src/app/shared/services/errors/errors.service.ts similarity index 100% rename from web/src/app/services/errors/errors.service.ts rename to web/src/app/shared/services/errors/errors.service.ts diff --git a/web/src/app/shared/services/forms/forms-validator.service.ts b/web/src/app/shared/services/forms-validator/forms-validator.service.ts similarity index 95% rename from web/src/app/shared/services/forms/forms-validator.service.ts rename to web/src/app/shared/services/forms-validator/forms-validator.service.ts index 1a4a4dd63..e998140b6 100644 --- a/web/src/app/shared/services/forms/forms-validator.service.ts +++ b/web/src/app/shared/services/forms-validator/forms-validator.service.ts @@ -1,9 +1,9 @@ import { NgForm, FormArray } from '@angular/forms'; import { Injectable } from '@angular/core'; -import { AlertService } from 'app/services/alert/alert.service'; -import { AlertModel, AlertType } from 'app/models/alert'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.service'; -import { ERROR_TYPES } from '../../../models/errors'; +import { ERROR_TYPES } from '../../models/errors'; @Injectable() export class FormsValidatorService { diff --git a/web/src/app/services/general-modal/general-modal.service.ts b/web/src/app/shared/services/general-modal/general-modal.service.ts similarity index 85% rename from web/src/app/services/general-modal/general-modal.service.ts rename to web/src/app/shared/services/general-modal/general-modal.service.ts index c25c342ce..4153546f3 100644 --- a/web/src/app/services/general-modal/general-modal.service.ts +++ b/web/src/app/shared/services/general-modal/general-modal.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { MessageModal } from 'app/models/message-modal'; +import { MessageModal } from 'app/shared/models/message-modal'; @Injectable() export class GeneralModalService { diff --git a/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.spec.ts b/web/src/app/shared/services/http-client-interceptor/http-client-interceptor.service.spec.ts similarity index 73% rename from web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.spec.ts rename to web/src/app/shared/services/http-client-interceptor/http-client-interceptor.service.spec.ts index 99457986f..9c139e098 100644 --- a/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.spec.ts +++ b/web/src/app/shared/services/http-client-interceptor/http-client-interceptor.service.spec.ts @@ -1,8 +1,8 @@ import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { HttpClientInterceptor } from './http-client-interceptor.service'; describe('HttpExtensionService', () => { diff --git a/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts b/web/src/app/shared/services/http-client-interceptor/http-client-interceptor.service.ts similarity index 85% rename from web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts rename to web/src/app/shared/services/http-client-interceptor/http-client-interceptor.service.ts index 7de8089c5..867276e47 100644 --- a/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts +++ b/web/src/app/shared/services/http-client-interceptor/http-client-interceptor.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { environment } from 'environments/environment'; import { tap } from 'rxjs/operators'; -import { ErrorsService } from '../../../services/errors/errors.service'; -import { ERROR_TYPES } from '../../../models/errors'; +import { ErrorsService } from '../errors/errors.service'; +import { ERROR_TYPES } from '../../models/errors'; @Injectable() export class HttpClientInterceptor implements HttpInterceptor { diff --git a/web/src/app/services/masterAndDetail/master-and-detail.service.spec.ts b/web/src/app/shared/services/master-and-detail/master-and-detail.service.spec.ts similarity index 100% rename from web/src/app/services/masterAndDetail/master-and-detail.service.spec.ts rename to web/src/app/shared/services/master-and-detail/master-and-detail.service.spec.ts diff --git a/web/src/app/services/masterAndDetail/master-and-detail.service.ts b/web/src/app/shared/services/master-and-detail/master-and-detail.service.ts similarity index 100% rename from web/src/app/services/masterAndDetail/master-and-detail.service.ts rename to web/src/app/shared/services/master-and-detail/master-and-detail.service.ts diff --git a/web/src/app/services/orientation/orientation.service.spec.ts b/web/src/app/shared/services/orientation/orientation.service.spec.ts similarity index 100% rename from web/src/app/services/orientation/orientation.service.spec.ts rename to web/src/app/shared/services/orientation/orientation.service.spec.ts diff --git a/web/src/app/services/orientation/orientation.service.ts b/web/src/app/shared/services/orientation/orientation.service.ts similarity index 95% rename from web/src/app/services/orientation/orientation.service.ts rename to web/src/app/shared/services/orientation/orientation.service.ts index 178adca9e..8b758d1f0 100644 --- a/web/src/app/services/orientation/orientation.service.ts +++ b/web/src/app/shared/services/orientation/orientation.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Orientation } from 'app/models/orientation'; +import { Orientation } from 'app/shared/models/orientation'; import { BehaviorSubject, Observable } from 'rxjs'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; diff --git a/web/src/app/services/remove-confirmation/remove-confirmation.service.ts b/web/src/app/shared/services/remove-confirmation/remove-confirmation.service.ts similarity index 100% rename from web/src/app/services/remove-confirmation/remove-confirmation.service.ts rename to web/src/app/shared/services/remove-confirmation/remove-confirmation.service.ts diff --git a/web/src/app/services/requestInProgress/request-in-progress.service.ts b/web/src/app/shared/services/request-in-progress/request-in-progress.service.ts similarity index 100% rename from web/src/app/services/requestInProgress/request-in-progress.service.ts rename to web/src/app/shared/services/request-in-progress/request-in-progress.service.ts diff --git a/web/src/app/services/selected-route/selected-route.ts b/web/src/app/shared/services/selected-route/selected-route.ts similarity index 100% rename from web/src/app/services/selected-route/selected-route.ts rename to web/src/app/shared/services/selected-route/selected-route.ts diff --git a/web/src/app/services/startup-service/startup.service.spec.ts b/web/src/app/shared/services/startup/startup.service.spec.ts similarity index 97% rename from web/src/app/services/startup-service/startup.service.spec.ts rename to web/src/app/shared/services/startup/startup.service.spec.ts index 9e3c26031..3c4c379b5 100644 --- a/web/src/app/services/startup-service/startup.service.spec.ts +++ b/web/src/app/shared/services/startup/startup.service.spec.ts @@ -5,7 +5,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { StartupService } from './startup.service'; import { TaskanaEngineService } from '../taskana-engine/taskana-engine.service'; import { WindowRefService } from '../window/window.service'; -import { environment } from '../../../environments/environment'; +import { environment } from '../../../../environments/environment'; describe('StartupService', () => { const environmentFile = 'environments/data-sources/environment-information.json'; diff --git a/web/src/app/services/startup-service/startup.service.ts b/web/src/app/shared/services/startup/startup.service.ts similarity index 88% rename from web/src/app/services/startup-service/startup.service.ts rename to web/src/app/shared/services/startup/startup.service.ts index 396465193..994c68a43 100644 --- a/web/src/app/services/startup-service/startup.service.ts +++ b/web/src/app/shared/services/startup/startup.service.ts @@ -3,9 +3,9 @@ import { HttpClient } from '@angular/common/http'; import { Router } from '@angular/router'; import { environment } from 'app/../environments/environment'; import { Injectable, Injector } from '@angular/core'; -import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; import { map } from 'rxjs/operators'; -import { WindowRefService } from 'app/services/window/window.service'; +import { WindowRefService } from 'app/shared/services/window/window.service'; @Injectable() export class StartupService { diff --git a/web/src/app/services/taskana-engine/taskana-engine.mock.service.ts b/web/src/app/shared/services/taskana-engine/taskana-engine.mock.service.ts similarity index 72% rename from web/src/app/services/taskana-engine/taskana-engine.mock.service.ts rename to web/src/app/shared/services/taskana-engine/taskana-engine.mock.service.ts index d94d7b22c..f05532dc1 100644 --- a/web/src/app/services/taskana-engine/taskana-engine.mock.service.ts +++ b/web/src/app/shared/services/taskana-engine/taskana-engine.mock.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { of, Observable } from 'rxjs'; -import { UserInfoModel } from 'app/models/user-info'; -import { VersionModel } from '../../models/version'; +import { UserInfo } from 'app/shared/models/user-info'; +import { Version } from '../../models/version'; @Injectable() export class TaskanaEngineServiceMock { - currentUserInfo: UserInfoModel; + currentUserInfo: UserInfo; constructor( ) { @@ -14,7 +14,7 @@ export class TaskanaEngineServiceMock { // GET getUserInformation(): Promise { - this.currentUserInfo = new UserInfoModel('userid', [''], ['admin']); + this.currentUserInfo = new UserInfo('userid', [''], ['admin']); return of(undefined).toPromise(); } @@ -28,8 +28,8 @@ export class TaskanaEngineServiceMock { return false; } - getVersion(): Observable { - const version = new VersionModel('1.0.0'); + getVersion(): Observable { + const version = new Version('1.0.0'); return of(version); } diff --git a/web/src/app/services/taskana-engine/taskana-engine.service.ts b/web/src/app/shared/services/taskana-engine/taskana-engine.service.ts similarity index 82% rename from web/src/app/services/taskana-engine/taskana-engine.service.ts rename to web/src/app/shared/services/taskana-engine/taskana-engine.service.ts index 6d4b65acf..79eb09a22 100644 --- a/web/src/app/services/taskana-engine/taskana-engine.service.ts +++ b/web/src/app/shared/services/taskana-engine/taskana-engine.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { environment } from 'environments/environment'; -import { UserInfoModel } from 'app/models/user-info'; -import { VersionModel } from 'app/models/version'; +import { UserInfo } from 'app/shared/models/user-info'; +import { Version } from 'app/shared/models/version'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @Injectable() export class TaskanaEngineService { - currentUserInfo: UserInfoModel; + currentUserInfo: UserInfo; constructor( private httpClient: HttpClient @@ -34,8 +34,8 @@ export class TaskanaEngineService { return false; } - getVersion(): Observable { - return this.httpClient.get(`${environment.taskanaRestUrl}/v1/version`); + getVersion(): Observable { + return this.httpClient.get(`${environment.taskanaRestUrl}/v1/version`); } logout(): Observable { diff --git a/web/src/app/services/titles/titles.service.spec.ts b/web/src/app/shared/services/titles/titles.service.spec.ts similarity index 100% rename from web/src/app/services/titles/titles.service.spec.ts rename to web/src/app/shared/services/titles/titles.service.spec.ts diff --git a/web/src/app/services/titles/titles.service.ts b/web/src/app/shared/services/titles/titles.service.ts similarity index 100% rename from web/src/app/services/titles/titles.service.ts rename to web/src/app/shared/services/titles/titles.service.ts diff --git a/web/src/app/services/tree/tree.service.ts b/web/src/app/shared/services/tree/tree.service.ts similarity index 100% rename from web/src/app/services/tree/tree.service.ts rename to web/src/app/shared/services/tree/tree.service.ts diff --git a/web/src/app/services/window/window.service.ts b/web/src/app/shared/services/window/window.service.ts similarity index 100% rename from web/src/app/services/window/window.service.ts rename to web/src/app/shared/services/window/window.service.ts diff --git a/web/src/app/shared/services/workbasket/workbasket.service.ts b/web/src/app/shared/services/workbasket/workbasket.service.ts index 511847924..31cfb9b42 100644 --- a/web/src/app/shared/services/workbasket/workbasket.service.ts +++ b/web/src/app/shared/services/workbasket/workbasket.service.ts @@ -3,18 +3,18 @@ import { throwError as observableThrowError, Observable, Subject } from 'rxjs'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { environment } from 'environments/environment'; -import { Workbasket } from 'app/models/workbasket'; -import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; -import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; -import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; -import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; -import { Direction } from 'app/models/sorting'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { WorkbasketAccessItems } from 'app/shared/models/workbasket-access-items'; +import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource'; +import { WorkbasketAccessItemsResource } from 'app/shared/models/workbasket-access-items-resource'; +import { WorkbasketDistributionTargetsResource } from 'app/shared/models/workbasket-distribution-targets-resource'; +import { Direction } from 'app/shared/models/sorting'; -import { DomainService } from 'app/services/domain/domain.service'; +import { DomainService } from 'app/shared/services/domain/domain.service'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { mergeMap, tap, catchError } from 'rxjs/operators'; -import { QueryParametersModel } from 'app/models/query-parameters'; -import { WorkbasketResource } from '../../../models/workbasket-resource'; +import { QueryParameters } from 'app/shared/models/query-parameters'; +import { WorkbasketResource } from '../../models/workbasket-resource'; @Injectable() export class WorkbasketService { @@ -174,8 +174,8 @@ export class WorkbasketService { requiredPermission?: string, allPages?: boolean, domain?: string - ): QueryParametersModel { - const parameters = new QueryParametersModel(); + ): QueryParameters { + const parameters = new QueryParameters(); parameters.SORTBY = sortBy; parameters.SORTDIRECTION = order; parameters.NAME = name; diff --git a/web/src/app/shared/shared.module.ts b/web/src/app/shared/shared.module.ts index c31c554a8..40ca93aea 100644 --- a/web/src/app/shared/shared.module.ts +++ b/web/src/app/shared/shared.module.ts @@ -14,41 +14,41 @@ import { ClassificationsService } from 'app/shared/services/classifications/clas /** * Components */ -import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/general-message-modal.component'; -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'; +import { GeneralMessageModalComponent } from 'app/shared/components/general-message-modal/general-message-modal.component'; +import { SpinnerComponent } from 'app/shared/components/spinner/spinner.component'; +import { AlertComponent } from 'app/shared/components/alert/alert.component'; +import { MasterAndDetailComponent } from 'app/shared/components/master-and-detail/master-and-detail.component'; +import { TaskanaTreeComponent } from 'app/shared/components/tree/tree.component'; +import { TypeAheadComponent } from 'app/shared/components/type-ahead/type-ahead.component'; +import { RemoveConfirmationComponent } from 'app/shared/components/remove-confirmation/remove-confirmation.component'; +import { FilterComponent } from 'app/shared/components/filter/filter.component'; import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.component'; -import { FieldErrorDisplayComponent } from 'app/shared/field-error-display/field-error-display.component'; -import { ErrorModalComponent } from './error-message-modal/error-modal.component'; -import { SortComponent } from './sort/sort.component'; -import { PaginationComponent } from './pagination/pagination.component'; -import { NumberPickerComponent } from './number-picker/number-picker.component'; -import { ProgressBarComponent } from './progress-bar/progress-bar.component'; -import { DatePickerComponent } from './date-picker/date-picker.component'; -import { DropdownComponent } from './dropdown/dropdown.component'; +import { FieldErrorDisplayComponent } from 'app/shared/components/field-error-display/field-error-display.component'; +import { ErrorModalComponent } from './components/error-message-modal/error-modal.component'; +import { SortComponent } from './components/sort/sort.component'; +import { PaginationComponent } from './components/pagination/pagination.component'; +import { NumberPickerComponent } from './components/number-picker/number-picker.component'; +import { ProgressBarComponent } from './components/progress-bar/progress-bar.component'; +import { DatePickerComponent } from './components/date-picker/date-picker.component'; +import { DropdownComponent } from './components/dropdown/dropdown.component'; /** * Pipes */ -import { MapValuesPipe } from './pipes/mapValues/map-values.pipe'; -import { RemoveNoneTypePipe } from './pipes/removeNoneType/remove-none-type.pipe'; -import { SelectWorkBasketPipe } from './pipes/selectedWorkbasket/seleted-workbasket.pipe'; -import { SpreadNumberPipe } from './pipes/spreadNumber/spread-number'; -import { OrderBy } from './pipes/orderBy/orderBy'; -import { MapToIterable } from './pipes/mapToIterable/mapToIterable'; -import { NumberToArray } from './pipes/numberToArray/numberToArray'; -import { DateTimeZonePipe } from './pipes/date-time-zone/date-time-zone.pipe'; +import { MapValuesPipe } from './pipes/map-values.pipe'; +import { RemoveNoneTypePipe } from './pipes/remove-empty-type.pipe'; +import { SelectWorkBasketPipe } from './pipes/select-workbaskets.pipe'; +import { SpreadNumberPipe } from './pipes/spread-number.pipe'; +import { OrderBy } from './pipes/order-by.pipe'; +import { MapToIterable } from './pipes/map-to-iterable.pipe'; +import { NumberToArray } from './pipes/number-to-array.pipe'; +import { DateTimeZonePipe } from './pipes/date-time-zone.pipe'; /** * Services */ -import { HttpClientInterceptor } from './services/httpClientInterceptor/http-client-interceptor.service'; +import { HttpClientInterceptor } from './services/http-client-interceptor/http-client-interceptor.service'; import { AccessIdsService } from './services/access-ids/access-ids.service'; const MODULES = [ diff --git a/web/src/app/shared/util/query-parameters.spec.ts b/web/src/app/shared/util/query-parameters.spec.ts index 287bd4313..8b76a8a0c 100644 --- a/web/src/app/shared/util/query-parameters.spec.ts +++ b/web/src/app/shared/util/query-parameters.spec.ts @@ -1,5 +1,5 @@ -import { Direction } from 'app/models/sorting'; -import { QueryParametersModel } from 'app/models/query-parameters'; +import { Direction } from 'app/shared/models/sorting'; +import { QueryParameters } from 'app/shared/models/query-parameters'; import { TaskanaQueryParameters } from './query-parameters'; describe('TaskanaQueryParameters', () => { @@ -11,24 +11,24 @@ describe('TaskanaQueryParameters', () => { it('should create a empty query', () => { delete TaskanaQueryParameters.page; delete TaskanaQueryParameters.pageSize; - expect(TaskanaQueryParameters.getQueryParameters(new QueryParametersModel())).toBe('?'); + expect(TaskanaQueryParameters.getQueryParameters(new QueryParameters())).toBe('?'); TaskanaQueryParameters.page = 1; TaskanaQueryParameters.pageSize = 9; }); it('should create a query with pagin information', () => { - expect(TaskanaQueryParameters.getQueryParameters(new QueryParametersModel())).toBe('?page=1&page-size=9'); + expect(TaskanaQueryParameters.getQueryParameters(new QueryParameters())).toBe('?page=1&page-size=9'); }); it('should create a query separated with &', () => { - const parameters = new QueryParametersModel(); + const parameters = new QueryParameters(); parameters.SORTBY = TaskanaQueryParameters.parameters.KEY; parameters.SORTDIRECTION = Direction.ASC; expect(TaskanaQueryParameters.getQueryParameters(parameters).split('&').length).toBe(4); }); it('should remove last & from query', () => { - const parameters = new QueryParametersModel(); + const parameters = new QueryParameters(); parameters.SORTBY = TaskanaQueryParameters.parameters.KEY; parameters.SORTDIRECTION = Direction.ASC; expect(TaskanaQueryParameters.getQueryParameters(parameters).endsWith('?')).toBeFalsy(); diff --git a/web/src/app/shared/util/query-parameters.ts b/web/src/app/shared/util/query-parameters.ts index 00ef9c898..4f3245dd8 100644 --- a/web/src/app/shared/util/query-parameters.ts +++ b/web/src/app/shared/util/query-parameters.ts @@ -1,4 +1,4 @@ -import { QueryParametersModel } from 'app/models/query-parameters'; +import { QueryParameters } from 'app/shared/models/query-parameters'; export class TaskanaQueryParameters { static parameters = { @@ -57,7 +57,7 @@ export class TaskanaQueryParameters { static page = 1; static pageSize = 9; - public static getQueryParameters(queryParametersModel: QueryParametersModel): string { + public static getQueryParameters(queryParametersModel: QueryParameters): string { let query = '?'; Object.keys(queryParametersModel).forEach(key => { diff --git a/web/src/app/store/classification-store/classification.state.ts b/web/src/app/store/classification-store/classification.state.ts index 400a66f88..4bcdb5717 100644 --- a/web/src/app/store/classification-store/classification.state.ts +++ b/web/src/app/store/classification-store/classification.state.ts @@ -1,7 +1,7 @@ import { Action, State, StateContext } from '@ngxs/store'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; -import { CategoriesResponse, ClassificationCategoriesService } from '../../shared/services/classifications/classification-categories.service'; +import { CategoriesResponse, ClassificationCategoriesService } from '../../shared/services/classification-categories/classification-categories.service'; import { SetSelectedClassificationType } from './classification.actions'; class InitializeStore { diff --git a/web/src/app/store/engine-configuration-store/engine-configuration.selectors.ts b/web/src/app/store/engine-configuration-store/engine-configuration.selectors.ts index a2acffc86..426039f7d 100644 --- a/web/src/app/store/engine-configuration-store/engine-configuration.selectors.ts +++ b/web/src/app/store/engine-configuration-store/engine-configuration.selectors.ts @@ -1,4 +1,4 @@ -import { WorkbasketsCustomisation, ClassificationsCustomisation, AccessItemsCustomisation, TasksCustomisation, ClassificationCategoryImages } from 'app/models/customisation'; +import { WorkbasketsCustomisation, ClassificationsCustomisation, AccessItemsCustomisation, TasksCustomisation, ClassificationCategoryImages } from 'app/shared/models/customisation'; import { Selector } from '@ngxs/store'; import { EngineConfigurationStateModel, EngineConfigurationState } from './engine-configuration.state'; diff --git a/web/src/app/store/engine-configuration-store/engine-configuration.state.ts b/web/src/app/store/engine-configuration-store/engine-configuration.state.ts index ee65f0ffa..ec8973054 100644 --- a/web/src/app/store/engine-configuration-store/engine-configuration.state.ts +++ b/web/src/app/store/engine-configuration-store/engine-configuration.state.ts @@ -1,6 +1,6 @@ -import { Customisation } from 'app/models/customisation'; +import { Customisation } from 'app/shared/models/customisation'; import { State, NgxsOnInit, StateContext, Action } from '@ngxs/store'; -import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service'; +import { ClassificationCategoriesService } from 'app/shared/services/classification-categories/classification-categories.service'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; diff --git a/web/src/app/workplace/models/task-resource.ts b/web/src/app/workplace/models/task-resource.ts index 956feea55..e9e213627 100644 --- a/web/src/app/workplace/models/task-resource.ts +++ b/web/src/app/workplace/models/task-resource.ts @@ -1,5 +1,5 @@ -import { Page } from 'app/models/page'; -import { Links } from '../../models/links'; +import { Page } from 'app/shared/models/page'; +import { Links } from '../../shared/models/links'; import { Task } from './task'; export class TaskResource { diff --git a/web/src/app/workplace/models/task.ts b/web/src/app/workplace/models/task.ts index ade06e879..61a6d849a 100644 --- a/web/src/app/workplace/models/task.ts +++ b/web/src/app/workplace/models/task.ts @@ -1,5 +1,5 @@ -import { Classification } from 'app/models/classification'; -import { Workbasket } from 'app/models/workbasket'; +import { Classification } from 'app/shared/models/classification'; +import { Workbasket } from 'app/shared/models/workbasket'; import { ObjectReference } from './object-reference'; export class Task { diff --git a/web/src/app/workplace/services/task.service.ts b/web/src/app/workplace/services/task.service.ts index a62b4c1f2..ee8397e95 100644 --- a/web/src/app/workplace/services/task.service.ts +++ b/web/src/app/workplace/services/task.service.ts @@ -4,11 +4,11 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { TaskResource } from 'app/workplace/models/task-resource'; -import { Direction } from 'app/models/sorting'; +import { Direction } from 'app/shared/models/sorting'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { TaskanaDate } from 'app/shared/util/taskana.date'; import { map } from 'rxjs/operators'; -import { QueryParametersModel } from 'app/models/query-parameters'; +import { QueryParameters } from 'app/shared/models/query-parameters'; @Injectable() export class TaskService { @@ -109,8 +109,8 @@ export class TaskService { objRefTypeLike: string, objRefValueLike: string, allPages: boolean = false - ): QueryParametersModel { - const parameters = new QueryParametersModel(); + ): QueryParameters { + const parameters = new QueryParameters(); parameters.WORKBASKET_ID = basketId; parameters.SORTBY = sortBy; parameters.SORTDIRECTION = sortDirection; diff --git a/web/src/app/workplace/services/workplace.service.ts b/web/src/app/workplace/services/workplace.service.ts index 9eedf005f..b4b3eeecb 100644 --- a/web/src/app/workplace/services/workplace.service.ts +++ b/web/src/app/workplace/services/workplace.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { Workbasket } from 'app/models/workbasket'; +import { Workbasket } from 'app/shared/models/workbasket'; import { ObjectReference } from '../models/object-reference'; @Injectable() diff --git a/web/src/app/workplace/task/task.component.spec.ts b/web/src/app/workplace/task/task.component.spec.ts index c03e1c597..9344cf073 100644 --- a/web/src/app/workplace/task/task.component.spec.ts +++ b/web/src/app/workplace/task/task.component.spec.ts @@ -1,16 +1,16 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Routes } from '@angular/router'; -import { SpinnerComponent } from 'app/shared/spinner/spinner.component'; +import { SpinnerComponent } from 'app/shared/components/spinner/spinner.component'; import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClient, HttpClientModule } from '@angular/common/http'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { Component } from '@angular/core'; -import { DomainService } from 'app/services/domain/domain.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { SelectedRouteService } from 'app/services/selected-route/selected-route'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { DomainService } from 'app/shared/services/domain/domain.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; import { TaskService } from '../services/task.service'; import { TaskComponent } from './task.component'; diff --git a/web/src/app/workplace/task/task.component.ts b/web/src/app/workplace/task/task.component.ts index f637de3d7..04ebe80aa 100644 --- a/web/src/app/workplace/task/task.component.ts +++ b/web/src/app/workplace/task/task.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Task } from 'app/workplace/models/task'; -import { Workbasket } from 'app/models/workbasket'; +import { Workbasket } from 'app/shared/models/workbasket'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { TaskService } from 'app/workplace/services/task.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; diff --git a/web/src/app/workplace/taskdetails/general/general-fields.component.spec.ts b/web/src/app/workplace/taskdetails/general/general-fields.component.spec.ts index f341929fb..3f75370a4 100644 --- a/web/src/app/workplace/taskdetails/general/general-fields.component.spec.ts +++ b/web/src/app/workplace/taskdetails/general/general-fields.component.spec.ts @@ -3,17 +3,17 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; import { HttpClient, HttpClientModule } from '@angular/common/http'; -import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service'; -import { DomainService } from 'app/services/domain/domain.service'; +import { ClassificationCategoriesService } from 'app/shared/services/classification-categories/classification-categories.service'; +import { DomainService } from 'app/shared/services/domain/domain.service'; import { RouterTestingModule } from '@angular/router/testing'; import { Routes } from '@angular/router'; import { Component } from '@angular/core'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { SelectedRouteService } from 'app/services/selected-route/selected-route'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route'; import { configureTests } from 'app/app.test.configuration'; -import { ClassificationResource } from 'app/models/classification-resource'; -import { Classification } from 'app/models/classification'; -import { Links } from 'app/models/links'; +import { ClassificationResource } from 'app/shared/models/classification-resource'; +import { Classification } from 'app/shared/models/classification'; +import { Links } from 'app/shared/models/links'; import { TaskdetailsGeneralFieldsComponent } from './general-fields.component'; @Component({ diff --git a/web/src/app/workplace/taskdetails/general/general-fields.component.ts b/web/src/app/workplace/taskdetails/general/general-fields.component.ts index e25fb99e7..53ef8c268 100644 --- a/web/src/app/workplace/taskdetails/general/general-fields.component.ts +++ b/web/src/app/workplace/taskdetails/general/general-fields.component.ts @@ -1,14 +1,14 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild, SimpleChanges, OnChanges, HostListener } from '@angular/core'; import { Task } from 'app/workplace/models/task'; -import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; +import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; import { NgForm } from '@angular/forms'; -import { DomainService } from 'app/services/domain/domain.service'; +import { DomainService } from 'app/shared/services/domain/domain.service'; import { Select } from '@ngxs/store'; import { Observable } from 'rxjs'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { ClassificationsService } from '../../../shared/services/classifications/classifications.service'; -import { Classification } from '../../../models/classification'; -import { TasksCustomisation } from '../../../models/customisation'; +import { Classification } from '../../../shared/models/classification'; +import { TasksCustomisation } from '../../../shared/models/customisation'; @Component({ selector: 'taskana-task-details-general-fields', diff --git a/web/src/app/workplace/taskdetails/taskdetails.component.spec.ts b/web/src/app/workplace/taskdetails/taskdetails.component.spec.ts index 1dcef8285..54c29b4bc 100644 --- a/web/src/app/workplace/taskdetails/taskdetails.component.spec.ts +++ b/web/src/app/workplace/taskdetails/taskdetails.component.spec.ts @@ -1,15 +1,15 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SpinnerComponent } from 'app/shared/spinner/spinner.component'; +import { SpinnerComponent } from 'app/shared/components/spinner/spinner.component'; import { FormsModule } from '@angular/forms'; import { Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { Component } from '@angular/core'; import { HttpClient, HttpClientModule } from '@angular/common/http'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { AlertService } from 'app/services/alert/alert.service'; -import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; +import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; import { WorkplaceService } from '../services/workplace.service'; import { TaskService } from '../services/task.service'; import { TaskdetailsAttributeComponent } from './attribute/attribute.component'; diff --git a/web/src/app/workplace/taskdetails/taskdetails.component.ts b/web/src/app/workplace/taskdetails/taskdetails.component.ts index 4547cfa0c..8f1414d57 100644 --- a/web/src/app/workplace/taskdetails/taskdetails.component.ts +++ b/web/src/app/workplace/taskdetails/taskdetails.component.ts @@ -3,20 +3,20 @@ import { Subscription } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { TaskService } from 'app/workplace/services/task.service'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; +import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service'; import { Task } from 'app/workplace/models/task'; -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 { AlertModel, AlertType } from 'app/models/alert'; +import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; import { TaskanaDate } from 'app/shared/util/taskana.date'; import { ObjectReference } from 'app/workplace/models/object-reference'; -import { Workbasket } from 'app/models/workbasket'; +import { Workbasket } from 'app/shared/models/workbasket'; import { WorkplaceService } from 'app/workplace/services/workplace.service'; -import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; -import { ERROR_TYPES } from '../../models/errors'; -import { ErrorsService } from '../../services/errors/errors.service'; +import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service'; +import { ERROR_TYPES } from '../../shared/models/errors'; +import { ErrorsService } from '../../shared/services/errors/errors.service'; @Component({ selector: 'taskana-task-details', diff --git a/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.spec.ts b/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.spec.ts index 140ee26de..ca7daf9b8 100644 --- a/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.spec.ts +++ b/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, async, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { TypeaheadModule, ComponentLoaderFactory, PositioningService } from 'ngx-bootstrap'; -import { SortComponent } from 'app/shared/sort/sort.component'; -import { FilterComponent } from 'app/shared/filter/filter.component'; -import { MapValuesPipe } from 'app/shared/pipes/mapValues/map-values.pipe'; +import { SortComponent } from 'app/shared/components/sort/sort.component'; +import { FilterComponent } from 'app/shared/components/filter/filter.component'; +import { MapValuesPipe } from 'app/shared/pipes/map-values.pipe'; import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.component'; import { SvgIconComponent } from 'angular-svg-icon'; import { TaskService } from 'app/workplace/services/task.service'; import { HttpClient, HttpClientModule } from '@angular/common/http'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { DomainService } from 'app/services/domain/domain.service'; +import { DomainService } from 'app/shared/services/domain/domain.service'; import { RouterTestingModule } from '@angular/router/testing'; import { Routes } from '@angular/router'; import { Component } from '@angular/core'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { SelectedRouteService } from 'app/services/selected-route/selected-route'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route'; import { WorkplaceService } from 'app/workplace/services/workplace.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { TaskListToolbarComponent } from './task-list-toolbar.component'; diff --git a/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts b/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts index 3c5220e37..d3170f76c 100644 --- a/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts +++ b/web/src/app/workplace/taskmaster/task-list-toolbar/task-list-toolbar.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Task } from 'app/workplace/models/task'; -import { Workbasket } from 'app/models/workbasket'; +import { Workbasket } from 'app/shared/models/workbasket'; import { TaskService } from 'app/workplace/services/task.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { SortingModel } from 'app/models/sorting'; -import { FilterModel } from 'app/models/filter'; -import { TaskanaType } from 'app/models/taskana-type'; +import { Sorting } from 'app/shared/models/sorting'; +import { Filter } from 'app/shared/models/filter'; +import { TaskanaType } from 'app/shared/models/taskana-type'; import { expandDown } from 'app/shared/animations/expand.animation'; import { ActivatedRoute, Router, NavigationExtras } from '@angular/router'; import { WorkplaceService } from 'app/workplace/services/workplace.service'; @@ -23,8 +23,8 @@ export enum Search { }) export class TaskListToolbarComponent implements OnInit { @Input() taskDefaultSortBy: string; - @Output() performSorting = new EventEmitter(); - @Output() performFilter = new EventEmitter(); + @Output() performSorting = new EventEmitter(); + @Output() performFilter = new EventEmitter(); @Output() selectSearchType = new EventEmitter(); sortingFields = new Map([['name', 'Name'], ['priority', 'Priority'], ['due', 'Due'], ['planned', 'Planned']]); @@ -110,11 +110,11 @@ export class TaskListToolbarComponent implements OnInit { this.router.navigate(['']); } - sorting(sort: SortingModel) { + sorting(sort: Sorting) { this.performSorting.emit(sort); } - filtering(filterBy: FilterModel) { + filtering(filterBy: Filter) { this.performFilter.emit(filterBy); } diff --git a/web/src/app/workplace/taskmaster/task-list/task-list.component.spec.ts b/web/src/app/workplace/taskmaster/task-list/task-list.component.spec.ts index 6c59a2f6f..b271431d3 100644 --- a/web/src/app/workplace/taskmaster/task-list/task-list.component.spec.ts +++ b/web/src/app/workplace/taskmaster/task-list/task-list.component.spec.ts @@ -7,7 +7,7 @@ import { Routes } from '@angular/router'; import { Component, ChangeDetectorRef } from '@angular/core'; import { WorkplaceService } from 'app/workplace/services/workplace.service'; import { TaskListComponent } from './task-list.component'; -import { DateTimeZonePipe } from '../../../shared/pipes/date-time-zone/date-time-zone.pipe'; +import { DateTimeZonePipe } from '../../../shared/pipes/date-time-zone.pipe'; @Component({ diff --git a/web/src/app/workplace/taskmaster/task-master.component.spec.ts b/web/src/app/workplace/taskmaster/task-master.component.spec.ts index f05518dbd..a84c726ed 100644 --- a/web/src/app/workplace/taskmaster/task-master.component.spec.ts +++ b/web/src/app/workplace/taskmaster/task-master.component.spec.ts @@ -1,22 +1,22 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SvgIconComponent, SvgIconRegistryService } from 'angular-svg-icon'; -import { PaginationComponent } from 'app/shared/pagination/pagination.component'; +import { PaginationComponent } from 'app/shared/components/pagination/pagination.component'; import { FormsModule } from '@angular/forms'; import { TypeaheadModule, ComponentLoaderFactory, PositioningService } from 'ngx-bootstrap'; -import { SortComponent } from 'app/shared/sort/sort.component'; -import { FilterComponent } from 'app/shared/filter/filter.component'; -import { SpreadNumberPipe } from 'app/shared/pipes/spreadNumber/spread-number'; -import { MapValuesPipe } from 'app/shared/pipes/mapValues/map-values.pipe'; +import { SortComponent } from 'app/shared/components/sort/sort.component'; +import { FilterComponent } from 'app/shared/components/filter/filter.component'; +import { SpreadNumberPipe } from 'app/shared/pipes/spread-number.pipe'; +import { MapValuesPipe } from 'app/shared/pipes/map-values.pipe'; import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.component'; import { Component } from '@angular/core'; import { HttpClient, HttpClientModule } from '@angular/common/http'; -import { AlertService } from 'app/services/alert/alert.service'; -import { OrientationService } from 'app/services/orientation/orientation.service'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { OrientationService } from 'app/shared/services/orientation/orientation.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; -import { DomainService } from 'app/services/domain/domain.service'; -import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { SelectedRouteService } from 'app/services/selected-route/selected-route'; +import { DomainService } from 'app/shared/services/domain/domain.service'; +import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; +import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { WorkplaceService } from '../services/workplace.service'; import { TaskService } from '../services/task.service'; diff --git a/web/src/app/workplace/taskmaster/task-master.component.ts b/web/src/app/workplace/taskmaster/task-master.component.ts index 72428595f..55c041491 100644 --- a/web/src/app/workplace/taskmaster/task-master.component.ts +++ b/web/src/app/workplace/taskmaster/task-master.component.ts @@ -2,16 +2,16 @@ import { Component, OnDestroy, OnInit, ViewChild, ElementRef } from '@angular/co import { Task } from 'app/workplace/models/task'; import { TaskService } from 'app/workplace/services/task.service'; import { Subscription } from 'rxjs'; -import { SortingModel } from 'app/models/sorting'; -import { Workbasket } from 'app/models/workbasket'; -import { FilterModel } from 'app/models/filter'; -import { AlertService } from 'app/services/alert/alert.service'; -import { AlertModel, AlertType } from 'app/models/alert'; +import { Sorting } from 'app/shared/models/sorting'; +import { Workbasket } from 'app/shared/models/workbasket'; +import { Filter } from 'app/shared/models/filter'; +import { AlertService } from 'app/shared/services/alert/alert.service'; +import { AlertModel, AlertType } from 'app/shared/models/alert'; import { WorkplaceService } from 'app/workplace/services/workplace.service'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; -import { OrientationService } from 'app/services/orientation/orientation.service'; -import { Orientation } from 'app/models/orientation'; -import { Page } from 'app/models/page'; +import { OrientationService } from 'app/shared/services/orientation/orientation.service'; +import { Orientation } from 'app/shared/models/orientation'; +import { Page } from 'app/shared/models/page'; import { ObjectReference } from '../models/object-reference'; import { Search } from './task-list-toolbar/task-list-toolbar.component'; @@ -27,8 +27,8 @@ export class TaskMasterComponent implements OnInit, OnDestroy { currentBasket: Workbasket; selectedId = ''; taskDefaultSortBy: string = 'priority'; - sort: SortingModel = new SortingModel(this.taskDefaultSortBy); - filterBy: FilterModel = new FilterModel({ + sort: Sorting = new Sorting(this.taskDefaultSortBy); + filterBy: Filter = new Filter({ name: '', owner: '', priority: '', @@ -96,12 +96,12 @@ export class TaskMasterComponent implements OnInit, OnDestroy { } - performSorting(sort: SortingModel) { + performSorting(sort: Sorting) { this.sort = sort; this.getTasks(); } - performFilter(filterBy: FilterModel) { + performFilter(filterBy: Filter) { this.filterBy = filterBy; this.getTasks(); } diff --git a/web/src/app/workplace/workplace-routing.module.ts b/web/src/app/workplace/workplace-routing.module.ts index 63fae9094..cbc2957b4 100644 --- a/web/src/app/workplace/workplace-routing.module.ts +++ b/web/src/app/workplace/workplace-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { MasterAndDetailComponent } from '../shared/master-and-detail/master-and-detail.component'; +import { MasterAndDetailComponent } from '../shared/components/master-and-detail/master-and-detail.component'; import { TaskComponent } from './task/task.component'; import { TaskdetailsComponent } from './taskdetails/taskdetails.component'; import { TaskMasterComponent } from './taskmaster/task-master.component'; diff --git a/web/src/app/workplace/workplace.module.ts b/web/src/app/workplace/workplace.module.ts index 9ef11caa3..527c0246b 100644 --- a/web/src/app/workplace/workplace.module.ts +++ b/web/src/app/workplace/workplace.module.ts @@ -7,7 +7,7 @@ import { AlertModule, TypeaheadModule } from 'ngx-bootstrap'; import { AccordionModule } from 'ngx-bootstrap/accordion'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { SharedModule } from 'app/shared/shared.module'; -import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service'; +import { ClassificationCategoriesService } from 'app/shared/services/classification-categories/classification-categories.service'; import { WorkplaceRoutingModule } from './workplace-routing.module'; import { TaskListToolbarComponent } from './taskmaster/task-list-toolbar/task-list-toolbar.component'; diff --git a/web/src/test.ts b/web/src/test.ts index 555d36b52..11dc661ae 100644 --- a/web/src/test.ts +++ b/web/src/test.ts @@ -27,14 +27,10 @@ const contextAdministration = require.context('./app/administration', true, /\.s const contextWorplace = require.context('./app/workplace', true, /\.spec\.ts$/); // const contextMonitor = require.context('./app/monitor', true, /\.spec\.ts$/); const contextShared = require.context('./app/shared', true, /\.spec\.ts$/); -const contextAppComponents = require.context('./app/components', true, /\.spec\.ts$/); -const contextAppServices = require.context('./app/services', true, /\.spec\.ts$/); // And load the modules. contextAdministration.keys().map(contextAdministration); contextWorplace.keys().map(contextWorplace); // contextMonitor.keys().map(contextMonitor); contextShared.keys().map(contextShared); -contextAppComponents.keys().map(contextAppComponents); -contextAppServices.keys().map(contextAppServices); // Finally, start Karma to run the tests. __karma__.start();