nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1191 Restructured shared component 

TSK-1191 Removed camelCase notation from file names


TSK-1191 Moved services


TSK-1191 Moved models


TSK-1191 Moved classification-types-selector to admin


TSK-1191 Moved components and guards


TSK-1191 Renamed some models


TSK-1191 Moved services into folders
This commit is contained in:
Sofie Hofmann 2020-04-21 16:30:35 +02:00
parent 54ec45a4aa
commit f8945ecfa7
225 changed files with 520 additions and 530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/app/administration/administration-routing.module.ts
View File

@ -3,10 +3,10 @@ import { Routes, RouterModule } from '@angular/router';
import { WorkbasketListComponent } from 'app/administration/components/workbasket-list/workbasket-list.component'; import { WorkbasketListComponent } from 'app/administration/components/workbasket-list/workbasket-list.component';
import { WorkbasketDetailsComponent } from 'app/administration/components/workbasket-details/workbasket-details.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 { ClassificationListComponent } from 'app/administration/components/classification-list/classification-list.component';
import { ClassificationDetailsComponent } from 'app/administration/components/classification-details/classification-details.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'; import { AccessItemsManagementComponent } from './components/access-items-management/access-items-management.component';
const routes: Routes = [ const routes: Routes = [

4
web/src/app/administration/administration.module.ts
View File

@ -7,8 +7,8 @@ import { SharedModule } from 'app/shared/shared.module';
import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { TreeModule } from 'angular-tree-component'; import { TreeModule } from 'angular-tree-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 { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service'; 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 { AccessItemsManagementComponent } from 'app/administration/components/access-items-management/access-items-management.component';
import { AdministrationRoutingModule } from './administration-routing.module'; import { AdministrationRoutingModule } from './administration-routing.module';
/** /**

8
web/src/app/administration/components/access-items-management/access-items-management.component.spec.ts
View File

@ -2,9 +2,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.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 { AccessIdDefinition } from 'app/models/access-id'; import { AccessIdDefinition } from 'app/shared/models/access-id';
import { AccessItemsWorkbasketResource } from 'app/models/access-item-workbasket-resource'; import { AccessItemWorkbasketResource } from 'app/shared/models/access-item-workbasket-resource';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { AccessItemsManagementComponent } from './access-items-management.component'; import { AccessItemsManagementComponent } from './access-items-management.component';
@ -30,7 +30,7 @@ describe('AccessItemsManagementComponent', () => {
component = fixture.componentInstance; component = fixture.componentInstance;
accessIdsService = testBed.get(AccessIdsService); accessIdsService = testBed.get(AccessIdsService);
spyOn(accessIdsService, 'getAccessItemsPermissions').and.returnValue(of(new Array<AccessIdDefinition>())); spyOn(accessIdsService, 'getAccessItemsPermissions').and.returnValue(of(new Array<AccessIdDefinition>()));
spyOn(accessIdsService, 'getAccessItemsInformation').and.returnValue(of(new AccessItemsWorkbasketResource())); spyOn(accessIdsService, 'getAccessItemsInformation').and.returnValue(of(new AccessItemWorkbasketResource()));
fixture.detectChanges(); fixture.detectChanges();
done(); done();
}); });

34
web/src/app/administration/components/access-items-management/access-items-management.component.ts
View File

@ -4,22 +4,22 @@ import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@ang
import { Observable, Subscription } from 'rxjs'; import { Observable, Subscription } from 'rxjs';
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service';
import { AccessItemsWorkbasketResource } from 'app/models/access-item-workbasket-resource'; import { AccessItemWorkbasketResource } from 'app/shared/models/access-item-workbasket-resource';
import { AccessItemWorkbasket } from 'app/models/access-item-workbasket'; import { AccessItemWorkbasket } from 'app/shared/models/access-item-workbasket';
import { SortingModel } from 'app/models/sorting'; import { Sorting } from 'app/shared/models/sorting';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service';
import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; 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 { AccessIdsService } from '../../../shared/services/access-ids/access-ids.service';
import { AccessIdDefinition } from '../../../models/access-id'; import { AccessIdDefinition } from '../../../shared/models/access-id';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../models/customisation'; import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../shared/models/customisation';
import { customFieldCount } from '../../../models/workbasket-access-items'; import { customFieldCount } from '../../../shared/models/workbasket-access-items';
@Component({ @Component({
selector: 'taskana-access-items-management', selector: 'taskana-access-items-management',
@ -38,7 +38,7 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy {
belongingGroups: Array<AccessIdDefinition>; belongingGroups: Array<AccessIdDefinition>;
sortingFields = new Map([['workbasket-key', 'Workbasket Key'], ['access-id', 'Access id']]); sortingFields = new Map([['workbasket-key', 'Workbasket Key'], ['access-id', 'Access id']]);
accessItemDefaultSortBy: string = 'workbasket-key'; accessItemDefaultSortBy: string = 'workbasket-key';
sortModel: SortingModel = new SortingModel(this.accessItemDefaultSortBy); sortModel: Sorting = new Sorting(this.accessItemDefaultSortBy);
isGroup: boolean; isGroup: boolean;
groupsKey = 'ou=groups'; groupsKey = 'ou=groups';
@ -117,7 +117,7 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy {
return this.formsValidatorService.isFieldValid(this.accessItemsGroups[index], field); return this.formsValidatorService.isFieldValid(this.accessItemsGroups[index], field);
} }
sorting(sort: SortingModel) { sorting(sort: Sorting) {
this.sortModel = sort; this.sortModel = sort;
this.searchForAccessItemsWorkbaskets(); this.searchForAccessItemsWorkbaskets();
} }
@ -132,7 +132,7 @@ export class AccessItemsManagementComponent implements OnInit, OnDestroy {
this.sortModel, this.sortModel,
true true
) )
.subscribe((accessItemsResource: AccessItemsWorkbasketResource) => { .subscribe((accessItemsResource: AccessItemWorkbasketResource) => {
this.setAccessItemsGroups(accessItemsResource ? accessItemsResource.accessItems : []); this.setAccessItemsGroups(accessItemsResource ? accessItemsResource.accessItems : []);
this.requestInProgressService.setRequestInProgress(false); this.requestInProgressService.setRequestInProgress(false);
}, },

18
web/src/app/administration/components/classification-details/classification-details.component.spec.ts
View File

@ -10,17 +10,17 @@ import { configureTests } from 'app/app.test.configuration';
import { NgxsModule, Store } from '@ngxs/store'; import { NgxsModule, Store } from '@ngxs/store';
import { ClassificationDefinition } from 'app/models/classification-definition'; import { ClassificationDefinition } from 'app/shared/models/classification-definition';
import { LinksClassification } from 'app/models/links-classfication'; import { LinksClassification } from 'app/shared/models/links-classfication';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.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 { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { TreeNodeModel } from 'app/models/tree-node'; import { TreeNodeModel } from 'app/shared/models/tree-node';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { TreeService } from 'app/services/tree/tree.service'; import { TreeService } from 'app/shared/services/tree/tree.service';
import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service';
import { ImportExportService } from 'app/administration/services/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export.service';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors'; import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors';

30
web/src/app/administration/components/classification-details/classification-details.component.ts
View File

@ -3,32 +3,32 @@ import { ActivatedRoute, Router } from '@angular/router';
import { Select, Store } from '@ngxs/store'; import { Select, Store } from '@ngxs/store';
import { Observable, Subscription, zip } from 'rxjs'; import { Observable, Subscription, zip } from 'rxjs';
import { ClassificationDefinition, customFieldCount } from 'app/models/classification-definition'; import { ClassificationDefinition, customFieldCount } from 'app/shared/models/classification-definition';
import { ACTION } from 'app/models/action'; import { ACTION } from 'app/shared/models/action';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { highlight } from 'app/shared/animations/validation.animation'; import { highlight } from 'app/shared/animations/validation.animation';
import { TaskanaDate } from 'app/shared/util/taskana.date'; import { TaskanaDate } from 'app/shared/util/taskana.date';
import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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 { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { TreeService } from 'app/services/tree/tree.service'; import { TreeService } from 'app/shared/services/tree/tree.service';
import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/shared/services/domain/domain.service';
import { Pair } from 'app/models/pair'; import { Pair } from 'app/shared/models/pair';
import { NgForm } from '@angular/forms'; 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 { ImportExportService } from 'app/administration/services/import-export.service';
import { map, take } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors'; import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
import { ClassificationCategoryImages, CustomField, getCustomFields } from '../../../models/customisation'; import { ClassificationCategoryImages, CustomField, getCustomFields } from '../../../shared/models/customisation';
@Component({ @Component({
selector: 'taskana-classification-details', selector: 'taskana-classification-details',

14
web/src/app/administration/components/classification-list/classification-list.component.spec.ts
View File

@ -7,20 +7,20 @@ import { Routes } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { AngularSvgIconModule } from 'angular-svg-icon'; 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 { 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 { 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 { ClassificationsService } from 'app/shared/services/classifications/classifications.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/shared/services/domain/domain.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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 { configureTests } from 'app/app.test.configuration'; 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 { ImportExportService } from 'app/administration/services/import-export.service';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { ClassificationListComponent } from './classification-list.component'; import { ClassificationListComponent } from './classification-list.component';

18
web/src/app/administration/components/classification-list/classification-list.component.ts
View File

@ -4,21 +4,21 @@ import { map } from 'rxjs/operators';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { Select } from '@ngxs/store'; import { Select } from '@ngxs/store';
import { TaskanaType } from 'app/models/taskana-type'; import { TaskanaType } from 'app/shared/models/taskana-type';
import { Classification } from 'app/models/classification'; import { Classification } from 'app/shared/models/classification';
import { TreeNodeModel } from 'app/models/tree-node'; import { TreeNodeModel } from 'app/shared/models/tree-node';
import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; 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 { ImportExportService } from 'app/administration/services/import-export.service';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors'; import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors';
import { ClassificationDefinition } from '../../../models/classification-definition'; import { ClassificationDefinition } from '../../../shared/models/classification-definition';
import { AlertModel, AlertType } from '../../../models/alert'; import { AlertModel, AlertType } from '../../../shared/models/alert';
import { AlertService } from '../../../services/alert/alert.service'; import { AlertService } from '../../../shared/services/alert/alert.service';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { ClassificationCategoryImages } from '../../../models/customisation'; import { ClassificationCategoryImages } from '../../../shared/models/customisation';
@Component({ @Component({
selector: 'taskana-classification-list', selector: 'taskana-classification-list',

0
web/src/app/shared/classification-types-selector/classification-types-selector.component.html → web/src/app/administration/components/classification-types-selector/classification-types-selector.component.html
View File

0
web/src/app/shared/classification-types-selector/classification-types-selector.component.scss → web/src/app/administration/components/classification-types-selector/classification-types-selector.component.scss
View File

0
web/src/app/shared/classification-types-selector/classification-types-selector.component.spec.ts → web/src/app/administration/components/classification-types-selector/classification-types-selector.component.spec.ts
View File

0
web/src/app/shared/classification-types-selector/classification-types-selector.component.ts → web/src/app/administration/components/classification-types-selector/classification-types-selector.component.ts
View File

4
web/src/app/administration/components/import-export/import-export.component.spec.ts
View File

@ -2,9 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.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 { 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 { AngularSvgIconModule } from 'angular-svg-icon';
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { ImportExportService } from 'app/administration/services/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export.service';

18
web/src/app/administration/components/import-export/import-export.component.ts
View File

@ -1,19 +1,19 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service';
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/shared/services/domain/domain.service';
import { TaskanaType } from 'app/models/taskana-type'; import { TaskanaType } from 'app/shared/models/taskana-type';
import { MessageModal } from 'app/models/message-modal'; import { MessageModal } from 'app/shared/models/message-modal';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service';
import { environment } from 'environments/environment'; import { environment } from 'environments/environment';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { UploadService } from 'app/shared/services/upload/upload.service'; import { UploadService } from 'app/shared/services/upload/upload.service';
import { ImportExportService } from 'app/administration/services/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export.service';
import { HttpErrorResponse } from '@angular/common/http'; import { HttpErrorResponse } from '@angular/common/http';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
import { ErrorModel } from '../../../models/error-model'; import { ErrorModel } from '../../../shared/models/error-model';
@Component({ @Component({
selector: 'taskana-import-export-component', selector: 'taskana-import-export-component',

2
web/src/app/administration/components/type-icon/icon-type.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
import { ICONTYPES } from 'app/models/type'; import { ICONTYPES } from 'app/shared/models/icon-types';
@Component({ @Component({
selector: 'taskana-icon-type', selector: 'taskana-icon-type',

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

@ -6,21 +6,21 @@ import { AngularSvgIconModule } from 'angular-svg-icon';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { Links } from 'app/models/links'; import { Links } from 'app/shared/models/links';
import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; import { WorkbasketAccessItems } from 'app/shared/models/workbasket-access-items';
import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; import { WorkbasketAccessItemsResource } from 'app/shared/models/workbasket-access-items-resource';
import { ICONTYPES } from 'app/models/type'; 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 { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; 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 { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.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 { 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 { NgxsModule, Store } from '@ngxs/store';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
import { WorkbasketAccessItemsComponent } from './workbasket-access-items.component'; import { WorkbasketAccessItemsComponent } from './workbasket-access-items.component';

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

@ -3,24 +3,24 @@ import { Observable, Subscription } from 'rxjs';
import { Select } from '@ngxs/store'; import { Select } from '@ngxs/store';
import { FormArray, FormBuilder, Validators } from '@angular/forms'; import { FormArray, FormBuilder, Validators } from '@angular/forms';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { WorkbasketAccessItems, customFieldCount } from 'app/models/workbasket-access-items'; import { WorkbasketAccessItems, customFieldCount } from 'app/shared/models/workbasket-access-items';
import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; import { WorkbasketAccessItemsResource } from 'app/shared/models/workbasket-access-items-resource';
import { ACTION } from 'app/models/action'; 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 { 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 { 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 { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
import { highlight } from 'app/shared/animations/validation.animation'; import { highlight } from 'app/shared/animations/validation.animation';
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service';
import { AccessIdDefinition } from 'app/models/access-id'; import { AccessIdDefinition } from 'app/shared/models/access-id';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../models/customisation'; import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../shared/models/customisation';
@Component({ @Component({
selector: 'taskana-workbasket-access-items', selector: 'taskana-workbasket-access-items',

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

@ -7,21 +7,21 @@ import { AngularSvgIconModule } from 'angular-svg-icon';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource';
import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; import { WorkbasketAccessItemsResource } from 'app/shared/models/workbasket-access-items-resource';
import { ICONTYPES } from 'app/models/type'; import { ICONTYPES } from 'app/shared/models/icon-types';
import { Links } from 'app/models/links'; import { Links } from 'app/shared/models/links';
import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; import { WorkbasketAccessItems } from 'app/shared/models/workbasket-access-items';
import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; import { LinksWorkbasketSummary } from 'app/shared/models/links-workbasket-summary';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service'; import { 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 { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
import { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { InfiniteScrollModule } from 'ngx-infinite-scroll';

16
web/src/app/administration/components/workbasket-details/workbasket-details.component.ts
View File

@ -2,17 +2,17 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { ACTION } from 'app/models/action'; import { ACTION } from 'app/shared/models/action';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/shared/services/domain/domain.service';
import { ImportExportService } from 'app/administration/services/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export.service';
import { GeneralModalService } from '../../../services/general-modal/general-modal.service'; import { GeneralModalService } from '../../../shared/services/general-modal/general-modal.service';
import { MessageModal } from '../../../models/message-modal'; import { MessageModal } from '../../../shared/models/message-modal';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
@Component({ @Component({
selector: 'taskana-workbasket-details', selector: 'taskana-workbasket-details',

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

@ -4,21 +4,21 @@ import { of } from 'rxjs';
import { AngularSvgIconModule } from 'angular-svg-icon'; import { AngularSvgIconModule } from 'angular-svg-icon';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { ICONTYPES } from 'app/models/type'; import { ICONTYPES } from 'app/shared/models/icon-types';
import { Links } from 'app/models/links'; import { Links } from 'app/shared/models/links';
import { FilterModel } from 'app/models/filter'; import { Filter } from 'app/shared/models/filter';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; import { WorkbasketDistributionTargetsResource } from 'app/shared/models/workbasket-distribution-targets-resource';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; 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 { 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 { 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 { configureTests } from 'app/app.test.configuration';
import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { WorkbasketDistributionTargetsComponent, Side } from './workbasket-distribution-targets.component'; 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', () => { it('should filter left list and keep selected elements as selected', () => {
component.performFilter({ component.performFilter({
filterBy: new FilterModel({ filterBy: new Filter({
name: 'someName', owner: 'someOwner', description: 'someDescription', key: 'someKey' name: 'someName', owner: 'someOwner', description: 'someDescription', key: 'someKey'
}), }),
side: Side.LEFT side: Side.LEFT

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

@ -1,25 +1,25 @@
import { Component, Input, OnDestroy, SimpleChanges, OnChanges, ViewChild, ElementRef } from '@angular/core'; import { Component, Input, OnDestroy, SimpleChanges, OnChanges, ViewChild, ElementRef } from '@angular/core';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource';
import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; import { WorkbasketDistributionTargetsResource } from 'app/shared/models/workbasket-distribution-targets-resource';
import { MessageModal } from 'app/models/message-modal'; import { MessageModal } from 'app/shared/models/message-modal';
import { ACTION } from 'app/models/action'; import { ACTION } from 'app/shared/models/action';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; 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 { SavingWorkbasketService, SavingInformation } 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 { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
import { Page } from 'app/models/page'; import { Page } from 'app/shared/models/page';
import { OrientationService } from 'app/services/orientation/orientation.service'; import { OrientationService } from 'app/shared/services/orientation/orientation.service';
import { Orientation } from 'app/models/orientation'; import { Orientation } from 'app/shared/models/orientation';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
export enum Side { export enum Side {
LEFT, LEFT,

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

@ -1,6 +1,6 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { FilterModel } from 'app/models/filter'; import { Filter } from 'app/shared/models/filter';
import { expandDown } from 'app/shared/animations/expand.animation'; import { expandDown } from 'app/shared/animations/expand.animation';
import { Side } from '../workbasket-distribution-targets/workbasket-distribution-targets.component'; 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 { export class WorkbasketDualListComponent implements OnInit {
@Input() distributionTargets: Array<WorkbasketSummary>; @Input() distributionTargets: Array<WorkbasketSummary>;
@Input() distributionTargetsSelected: Array<WorkbasketSummary>; @Input() distributionTargetsSelected: Array<WorkbasketSummary>;
@Output() performDualListFilter = new EventEmitter<{ filterBy: FilterModel, side: Side }>(); @Output() performDualListFilter = new EventEmitter<{ filterBy: Filter, side: Side }>();
@Input() requestInProgress = false; @Input() requestInProgress = false;
@Input() loadingItems ? = false; @Input() loadingItems ? = false;
@Input() side: Side; @Input() side: Side;
@ -40,7 +40,7 @@ export class WorkbasketDualListComponent implements OnInit {
this.scrolling.emit(this.side); this.scrolling.emit(this.side);
} }
performAvailableFilter(filterModel: FilterModel) { performAvailableFilter(filterModel: Filter) {
this.performDualListFilter.emit({ filterBy: filterModel, side: this.side }); this.performDualListFilter.emit({ filterBy: filterModel, side: this.side });
} }

16
web/src/app/administration/components/workbasket-information/workbasket-information.component.spec.ts
View File

@ -8,17 +8,17 @@ import { of } from 'rxjs';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Routes } from '@angular/router'; import { Routes } from '@angular/router';
import { Workbasket } from 'app/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { ICONTYPES } from 'app/models/type'; import { ICONTYPES } from 'app/shared/models/icon-types';
import { ACTION } from 'app/models/action'; import { ACTION } from 'app/shared/models/action';
import { Links } from 'app/models/links'; 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 { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.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 { configureTests } from 'app/app.test.configuration'; 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 { NgxsModule, Store } from '@ngxs/store';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
import { WorkbasketInformationComponent } from './workbasket-information.component'; import { WorkbasketInformationComponent } from './workbasket-information.component';

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

@ -4,24 +4,24 @@ import { Observable, Subscription } from 'rxjs';
import { NgForm } from '@angular/forms'; import { NgForm } from '@angular/forms';
import { Select } from '@ngxs/store'; import { Select } from '@ngxs/store';
import { ICONTYPES } from 'app/models/type'; import { ICONTYPES } from 'app/shared/models/icon-types';
import { ACTION } from 'app/models/action'; import { ACTION } from 'app/shared/models/action';
import { customFieldCount, Workbasket } from 'app/models/workbasket'; import { customFieldCount, Workbasket } from 'app/shared/models/workbasket';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { TaskanaDate } from 'app/shared/util/taskana.date'; import { TaskanaDate } from 'app/shared/util/taskana.date';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service';
import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets.service';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.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 { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; import { RemoveConfirmationService } from 'app/shared/services/remove-confirmation/remove-confirmation.service';
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
import { CustomField, getCustomFields, WorkbasketsCustomisation } from '../../../models/customisation'; import { CustomField, getCustomFields, WorkbasketsCustomisation } from '../../../shared/models/customisation';
@Component({ @Component({
selector: 'taskana-workbasket-information', selector: 'taskana-workbasket-information',

16
web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts
View File

@ -10,10 +10,10 @@ import { RouterTestingModule } from '@angular/router/testing';
import { SharedModule } from 'app/shared/shared.module'; import { SharedModule } from 'app/shared/shared.module';
import { AppModule } from 'app/app.module'; import { AppModule } from 'app/app.module';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { Links } from 'app/models/links'; import { Links } from 'app/shared/models/links';
import { FilterModel } from 'app/models/filter'; import { Filter } from 'app/shared/models/filter';
import { SortingModel } from 'app/models/sorting'; import { Sorting } from 'app/shared/models/sorting';
import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; 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', () => { it('should emit performSorting when sorting is triggered', () => {
let sort: SortingModel; let sort: Sorting;
const compareSort = new SortingModel(); const compareSort = new Sorting();
component.performSorting.subscribe(value => { sort = value; }); component.performSorting.subscribe(value => { sort = value; });
component.sorting(compareSort); component.sorting(compareSort);
@ -102,8 +102,8 @@ describe('WorkbasketListToolbarComponent', () => {
}); });
it('should emit performFilter when filter is triggered', () => { it('should emit performFilter when filter is triggered', () => {
let filter: FilterModel; let filter: Filter;
const compareFilter = new FilterModel(); const compareFilter = new Filter();
component.performFilter.subscribe(value => { filter = value; }); component.performFilter.subscribe(value => { filter = value; });
component.filtering(compareFilter); component.filtering(compareFilter);

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

@ -1,16 +1,16 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { SortingModel } from 'app/models/sorting'; import { Sorting } from 'app/shared/models/sorting';
import { FilterModel } from 'app/models/filter'; import { Filter } from 'app/shared/models/filter';
import { Subscription } from 'rxjs'; 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 { 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 { expandDown } from 'app/shared/animations/expand.animation';
import { ErrorsService } from '../../../services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
import { ERROR_TYPES } from '../../../models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';
@Component({ @Component({
selector: 'taskana-workbasket-list-toolbar', selector: 'taskana-workbasket-list-toolbar',
@ -21,8 +21,8 @@ import { ERROR_TYPES } from '../../../models/errors';
export class WorkbasketListToolbarComponent implements OnInit { export class WorkbasketListToolbarComponent implements OnInit {
@Input() workbaskets: Array<WorkbasketSummary>; @Input() workbaskets: Array<WorkbasketSummary>;
@Input() workbasketDefaultSortBy: string; @Input() workbasketDefaultSortBy: string;
@Output() performSorting = new EventEmitter<SortingModel>(); @Output() performSorting = new EventEmitter<Sorting>();
@Output() performFilter = new EventEmitter<FilterModel>(); @Output() performFilter = new EventEmitter<Filter>();
workbasketServiceSubscription: Subscription; workbasketServiceSubscription: Subscription;
selectionToImport = TaskanaType.WORKBASKETS; selectionToImport = TaskanaType.WORKBASKETS;
sortingFields = new Map([['name', 'Name'], ['key', 'Key'], ['description', 'Description'], ['owner', 'Owner'], ['type', 'Type']]); sortingFields = new Map([['name', 'Name'], ['key', 'Key'], ['description', 'Description'], ['owner', 'Owner'], ['type', 'Type']]);
@ -44,11 +44,11 @@ export class WorkbasketListToolbarComponent implements OnInit {
ngOnInit() { ngOnInit() {
} }
sorting(sort: SortingModel) { sorting(sort: Sorting) {
this.performSorting.emit(sort); this.performSorting.emit(sort);
} }
filtering(filterBy: FilterModel) { filtering(filterBy: Filter) {
this.performFilter.emit(filterBy); this.performFilter.emit(filterBy);
} }

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

@ -7,19 +7,19 @@ import { HttpClientModule } from '@angular/common/http';
import { Routes } from '@angular/router'; import { Routes } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource';
import { FilterModel } from 'app/models/filter'; import { Filter } from 'app/shared/models/filter';
import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; import { LinksWorkbasketSummary } from 'app/shared/models/links-workbasket-summary';
import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component';
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition.service';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition.service';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.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 { 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 { ImportExportService } from 'app/administration/services/import-export.service';
import { WorkbasketListToolbarComponent } from '../workbasket-list-toolbar/workbasket-list-toolbar.component'; import { WorkbasketListToolbarComponent } from '../workbasket-list-toolbar/workbasket-list-toolbar.component';
import { WorkbasketListComponent } from './workbasket-list.component'; import { WorkbasketListComponent } from './workbasket-list.component';
@ -162,7 +162,7 @@ describe('WorkbasketListComponent', () => {
}); });
it('should have performRequest with forced = true after performFilter is triggered', (() => { it('should have performRequest with forced = true after performFilter is triggered', (() => {
const filter = new FilterModel({ const filter = new Filter({
name: 'someName', name: 'someName',
owner: 'someOwner', owner: 'someOwner',
description: 'someDescription', description: 'someDescription',

20
web/src/app/administration/components/workbasket-list/workbasket-list.component.ts
View File

@ -2,14 +2,14 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; import { WorkbasketSummaryResource } from 'app/shared/models/workbasket-summary-resource';
import { WorkbasketSummary } from 'app/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { FilterModel } from 'app/models/filter'; import { Filter } from 'app/shared/models/filter';
import { SortingModel } from 'app/models/sorting'; import { Sorting } from 'app/shared/models/sorting';
import { Orientation } from 'app/models/orientation'; import { Orientation } from 'app/shared/models/orientation';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.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 { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
import { ImportExportService } from 'app/administration/services/import-export.service'; import { ImportExportService } from 'app/administration/services/import-export.service';
@ -30,8 +30,8 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
cards: number = this.pageSize; cards: number = this.pageSize;
workbasketDefaultSortBy: string = 'name'; workbasketDefaultSortBy: string = 'name';
sort: SortingModel = new SortingModel(this.workbasketDefaultSortBy); sort: Sorting = new Sorting(this.workbasketDefaultSortBy);
filterBy: FilterModel = new FilterModel({ name: '', owner: '', type: '', description: '', key: '' }); filterBy: Filter = new Filter({ name: '', owner: '', type: '', description: '', key: '' });
@ViewChild('wbToolbar', { static: true }) @ViewChild('wbToolbar', { static: true })
private toolbarElement: ElementRef; private toolbarElement: ElementRef;
@ -79,12 +79,12 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
this.router.navigate([{ outlets: { detail: [this.selectedId] } }], { relativeTo: this.route }); this.router.navigate([{ outlets: { detail: [this.selectedId] } }], { relativeTo: this.route });
} }
performSorting(sort: SortingModel) { performSorting(sort: Sorting) {
this.sort = sort; this.sort = sort;
this.performRequest(); this.performRequest();
} }
performFilter(filterBy: FilterModel) { performFilter(filterBy: Filter) {
this.filterBy = filterBy; this.filterBy = filterBy;
this.performRequest(); this.performRequest();
} }

2
web/src/app/administration/services/classification-definition.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { environment } from 'app/../environments/environment'; 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 { TaskanaDate } from 'app/shared/util/taskana.date';
import { BlobGenerator } from 'app/shared/util/blob-generator'; import { BlobGenerator } from 'app/shared/util/blob-generator';

2
web/src/app/administration/services/workbasket-definition.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { environment } from 'environments/environment'; 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 { TaskanaDate } from 'app/shared/util/taskana.date';
import { BlobGenerator } from 'app/shared/util/blob-generator'; import { BlobGenerator } from 'app/shared/util/blob-generator';

10
web/src/app/app-routing.module.ts
View File

@ -1,11 +1,11 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { BusinessAdminGuard } from './guards/business-admin.guard'; import { BusinessAdminGuard } from './shared/guards/business-admin.guard';
import { MonitorGuard } from './guards/monitor.guard'; import { MonitorGuard } from './shared/guards/monitor.guard';
import { UserGuard } from './guards/user.guard'; import { UserGuard } from './shared/guards/user.guard';
import { HistoryGuard } from './guards/history.guard'; import { HistoryGuard } from './shared/guards/history.guard';
import { NoAccessComponent } from './components/no-access/no-access.component'; import { NoAccessComponent } from './shared/components/no-access/no-access.component';
const appRoutes: Routes = [ const appRoutes: Routes = [
{ {

2
web/src/app/app.component.spec.ts
View File

@ -6,7 +6,7 @@ import { HttpClientModule } from '@angular/common/http';
import { SharedModule } from 'app/shared/shared.module'; import { SharedModule } from 'app/shared/shared.module';
import { AppComponent } from './app.component'; 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', () => { describe('AppComponent', () => {
let app; let app;

16
web/src/app/app.component.ts
View File

@ -2,16 +2,16 @@ import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
import { NavigationStart, Router } from '@angular/router'; import { NavigationStart, Router } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service'; import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service';
import { MessageModal } from './models/message-modal'; import { MessageModal } from './shared/models/message-modal';
import { GeneralModalService } from './services/general-modal/general-modal.service'; import { GeneralModalService } from './shared/services/general-modal/general-modal.service';
import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from './shared/services/request-in-progress/request-in-progress.service';
import { OrientationService } from './services/orientation/orientation.service'; import { OrientationService } from './shared/services/orientation/orientation.service';
import { SelectedRouteService } from './services/selected-route/selected-route'; import { SelectedRouteService } from './shared/services/selected-route/selected-route';
import { UploadService } from './shared/services/upload/upload.service'; import { UploadService } from './shared/services/upload/upload.service';
import { ErrorModel } from './models/error-model'; import { ErrorModel } from './shared/models/error-model';
import { ErrorsService } from './services/errors/errors.service'; import { ErrorsService } from './shared/services/errors/errors.service';
@Component({ @Component({
selector: 'taskana-root', selector: 'taskana-root',

46
web/src/app/app.module.ts
View File

@ -17,25 +17,25 @@ import { SharedModule } from 'app/shared/shared.module';
/** /**
* Services * Services
*/ */
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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 { OrientationService } from 'app/services/orientation/orientation.service'; import { OrientationService } from 'app/shared/services/orientation/orientation.service';
import { SelectedRouteService } from 'app/services/selected-route/selected-route'; import { SelectedRouteService } from 'app/shared/services/selected-route/selected-route';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/shared/services/domain/domain.service';
import { StartupService } from 'app/services/startup-service/startup.service'; import { StartupService } from 'app/shared/services/startup/startup.service';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { MasterAndDetailService } from 'app/shared/services/master-and-detail/master-and-detail.service';
import { TreeService } from 'app/services/tree/tree.service'; import { TreeService } from 'app/shared/services/tree/tree.service';
import { TitlesService } from 'app/services/titles/titles.service'; import { TitlesService } from 'app/shared/services/titles/titles.service';
import { WindowRefService } from 'app/services/window/window.service'; import { WindowRefService } from 'app/shared/services/window/window.service';
import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service';
import { NavBarComponent } from 'app/components/nav-bar/nav-bar.component'; import { NavBarComponent } from 'app/shared/components/nav-bar/nav-bar.component';
import { UserInformationComponent } from 'app/components/user-information/user-information.component'; import { UserInformationComponent } from 'app/shared/components/user-information/user-information.component';
import { NoAccessComponent } from 'app/components/no-access/no-access.component'; import { NoAccessComponent } from 'app/shared/components/no-access/no-access.component';
import { RemoveConfirmationService } from './services/remove-confirmation/remove-confirmation.service'; import { RemoveConfirmationService } from './shared/services/remove-confirmation/remove-confirmation.service';
import { FormsValidatorService } from './shared/services/forms/forms-validator.service'; import { FormsValidatorService } from './shared/services/forms-validator/forms-validator.service';
import { UploadService } from './shared/services/upload/upload.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 * Components
*/ */
@ -44,14 +44,14 @@ import { AppRoutingModule } from './app-routing.module';
/** /**
* Guards * Guards
*/ */
import { DomainGuard } from './guards/domain.guard'; import { DomainGuard } from './shared/guards/domain.guard';
import { BusinessAdminGuard } from './guards/business-admin.guard'; import { BusinessAdminGuard } from './shared/guards/business-admin.guard';
import { MonitorGuard } from './guards/monitor.guard'; import { MonitorGuard } from './shared/guards/monitor.guard';
import { UserGuard } from './guards/user.guard'; import { UserGuard } from './shared/guards/user.guard';
/** /**
* Store * 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 { environment } from '../environments/environment';
import { STATES } from './store'; import { STATES } from './store';

22
web/src/app/app.test.configuration.ts
View File

@ -3,21 +3,21 @@ import { getTestBed, TestBed } from '@angular/core/testing';
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/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 { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { AngularSvgIconModule } from 'angular-svg-icon'; import { AngularSvgIconModule } from 'angular-svg-icon';
import { TaskanaEngineServiceMock } from './services/taskana-engine/taskana-engine.mock.service'; import { TaskanaEngineServiceMock } from './shared/services/taskana-engine/taskana-engine.mock.service';
import { TaskanaEngineService } from './services/taskana-engine/taskana-engine.service'; import { TaskanaEngineService } from './shared/services/taskana-engine/taskana-engine.service';
import { DomainService } from './services/domain/domain.service'; import { DomainService } from './shared/services/domain/domain.service';
import { DomainServiceMock } from './services/domain/domain.service.mock'; import { DomainServiceMock } from './shared/services/domain/domain.service.mock';
import { AlertService } from './services/alert/alert.service'; import { AlertService } from './shared/services/alert/alert.service';
import { GeneralModalService } from './services/general-modal/general-modal.service'; import { GeneralModalService } from './shared/services/general-modal/general-modal.service';
import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from './shared/services/request-in-progress/request-in-progress.service';
import { OrientationService } from './services/orientation/orientation.service'; import { OrientationService } from './shared/services/orientation/orientation.service';
import { SelectedRouteService } from './services/selected-route/selected-route'; import { SelectedRouteService } from './shared/services/selected-route/selected-route';
import { FormsValidatorService } from './shared/services/forms/forms-validator.service'; import { FormsValidatorService } from './shared/services/forms-validator/forms-validator.service';
import { SharedModule } from './shared/shared.module'; import { SharedModule } from './shared/shared.module';
export const configureTests = (configure: (testBed: TestBed) => void) => { export const configureTests = (configure: (testBed: TestBed) => void) => {

2
web/src/app/app.test.module.ts
View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core'; 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 = [ const MODULES = [
]; ];

10
web/src/app/history/services/task-query/task-query.service.ts
View File

@ -1,9 +1,9 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { TaskHistoryEventData } from 'app/models/task-history-event'; import { TaskHistoryEventData } from 'app/shared/models/task-history-event';
import { TaskHistoryEventResourceData } from 'app/models/task-history-event-resource'; import { TaskHistoryEventResourceData } from 'app/shared/models/task-history-event-resource';
import { QueryParametersModel } from 'app/models/query-parameters'; import { QueryParameters } from 'app/shared/models/query-parameters';
import { TaskanaQueryParameters } from 'app/shared/util/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 { Observable, of } from 'rxjs';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { environment } from 'environments/environment'; import { environment } from 'environments/environment';
@ -74,7 +74,7 @@ export class TaskQueryService {
created: string, created: string,
allPages: boolean = false allPages: boolean = false
): string { ): string {
const parameters = new QueryParametersModel(); const parameters = new QueryParameters();
parameters.SORTBY = orderBy; parameters.SORTBY = orderBy;
parameters.SORTDIRECTION = sortDirection; parameters.SORTDIRECTION = sortDirection;
parameters.TASK_ID_LIKE = taskId; parameters.TASK_ID_LIKE = taskId;

20
web/src/app/history/task-query/task-query.component.ts
View File

@ -1,17 +1,17 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Direction, SortingModel } from 'app/models/sorting'; import { Direction, Sorting } from 'app/shared/models/sorting';
import { OrientationService } from 'app/services/orientation/orientation.service'; import { OrientationService } from 'app/shared/services/orientation/orientation.service';
import { Subscription } from 'rxjs'; 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 { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.service';
import { MessageModal } from 'app/models/message-modal'; import { MessageModal } from 'app/shared/models/message-modal';
import { FormControl, FormGroup } from '@angular/forms'; import { FormControl, FormGroup } from '@angular/forms';
import { TaskHistoryEventResourceData } from 'app/models/task-history-event-resource'; import { TaskHistoryEventResourceData } from 'app/shared/models/task-history-event-resource';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
import { TaskHistoryEventData } from '../../models/task-history-event'; import { TaskHistoryEventData } from '../../shared/models/task-history-event';
import { TaskQueryService } from '../services/task-query/task-query.service'; 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({ @Component({
selector: 'taskana-task-query', selector: 'taskana-task-query',
@ -22,7 +22,7 @@ export class TaskQueryComponent implements OnInit {
taskQueryResource: TaskHistoryEventResourceData; taskQueryResource: TaskHistoryEventResourceData;
taskQuery: Array<TaskHistoryEventData>; taskQuery: Array<TaskHistoryEventData>;
taskQueryHeader = new TaskHistoryEventData(); taskQueryHeader = new TaskHistoryEventData();
orderBy = new SortingModel(TaskanaQueryParameters.parameters.CREATED); orderBy = new Sorting(TaskanaQueryParameters.parameters.CREATED);
orientationSubscription: Subscription; orientationSubscription: Subscription;
taskQuerySubscription: Subscription; taskQuerySubscription: Subscription;

4
web/src/app/models/state.ts
View File

@ -1,4 +0,0 @@
export class State {
state: string;
counter: number;
}

2
web/src/app/monitor/components/classification-report/classification-report.component.ts
View File

@ -3,7 +3,7 @@ import { RestConnectorService } from 'app/monitor/services/rest-connector.servic
import { ChartData } from 'app/monitor/models/chart-data'; import { ChartData } from 'app/monitor/models/chart-data';
import { ReportData } from '../../models/report-data'; import { ReportData } from '../../models/report-data';
import { ChartColorsDefinition } from '../../models/chart-colors'; 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({ @Component({
selector: 'taskana-monitor-classification-tasks', selector: 'taskana-monitor-classification-tasks',

2
web/src/app/monitor/components/task-report/task-report.component.ts
View File

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ReportData } from 'app/monitor/models/report-data'; import { ReportData } from 'app/monitor/models/report-data';
import { RestConnectorService } from '../../services/rest-connector.service'; 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({ @Component({
selector: 'taskana-monitor-tasks', selector: 'taskana-monitor-tasks',

2
web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts
View File

@ -4,7 +4,7 @@ import { ChartData } from '../../models/chart-data';
import { ChartColorsDefinition } from '../../models/chart-colors'; import { ChartColorsDefinition } from '../../models/chart-colors';
import { RestConnectorService } from '../../services/rest-connector.service'; import { RestConnectorService } from '../../services/rest-connector.service';
import { MetaInfoData } from '../../models/meta-info-data'; 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({ @Component({
selector: 'taskana-monitor-workbasket-due-date', selector: 'taskana-monitor-workbasket-due-date',

2
web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts
View File

@ -4,7 +4,7 @@ import { ChartData } from '../../models/chart-data';
import { ChartColorsDefinition } from '../../models/chart-colors'; import { ChartColorsDefinition } from '../../models/chart-colors';
import { RestConnectorService } from '../../services/rest-connector.service'; import { RestConnectorService } from '../../services/rest-connector.service';
import { MetaInfoData } from '../../models/meta-info-data'; 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({ @Component({
selector: 'taskana-monitor-workbasket-planned-date', selector: 'taskana-monitor-workbasket-planned-date',

2
web/src/app/monitor/monitor.module.ts
View File

@ -6,6 +6,7 @@ import { ChartsModule } from 'ng2-charts';
import { TabsModule } from 'ngx-bootstrap/tabs'; import { TabsModule } from 'ngx-bootstrap/tabs';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { AngularSvgIconModule } from 'angular-svg-icon'; import { AngularSvgIconModule } from 'angular-svg-icon';
import { MapToIterable } from 'app/shared/pipes/map-to-iterable.pipe';
import { MonitorRoutingModule } from './monitor-routing.module'; import { MonitorRoutingModule } from './monitor-routing.module';
import { SharedModule } from '../shared/shared.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 { RestConnectorService } from './services/rest-connector.service';
import { MapToIterable } from '../shared/pipes/mapToIterable/mapToIterable';
import { WorkbasketReportComponent } from './components/workbasket-report/workbasket-report.component'; import { WorkbasketReportComponent } from './components/workbasket-report/workbasket-report.component';
import { WorkbasketReportPlannedDateComponent } from './components/workbasket-report-planned-date/workbasket-report-planned-date.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'; import { WorkbasketReportDueDateComponent } from './components/workbasket-report-due-date/workbasket-report-due-date.component';

0
web/src/app/shared/alert/alert.component.html → web/src/app/shared/components/alert/alert.component.html
View File

0
web/src/app/shared/alert/alert.component.scss → web/src/app/shared/components/alert/alert.component.scss
View File

4
web/src/app/shared/alert/alert.component.spec.ts → web/src/app/shared/components/alert/alert.component.spec.ts
View File

@ -1,8 +1,8 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { AlertModel, AlertType } from 'app/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { AlertComponent } from './alert.component'; import { AlertComponent } from './alert.component';
describe('AlertComponent', () => { describe('AlertComponent', () => {

6
web/src/app/shared/alert/alert.component.ts → web/src/app/shared/components/alert/alert.component.ts
View File

@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { AlertModel } from 'app/models/alert'; import { AlertModel } from 'app/shared/models/alert';
import { AlertService } from 'app/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { expandTop } from '../animations/expand.animation'; import { expandTop } from '../../animations/expand.animation';
@Component({ @Component({
selector: 'taskana-alert', selector: 'taskana-alert',

0
web/src/app/shared/date-picker/date-picker.component.html → web/src/app/shared/components/date-picker/date-picker.component.html
View File

0
web/src/app/shared/date-picker/date-picker.component.scss → web/src/app/shared/components/date-picker/date-picker.component.scss
View File

0
web/src/app/shared/date-picker/date-picker.component.spec.ts → web/src/app/shared/components/date-picker/date-picker.component.spec.ts
View File

0
web/src/app/shared/date-picker/date-picker.component.ts → web/src/app/shared/components/date-picker/date-picker.component.ts
View File

0
web/src/app/shared/dropdown/dropdown.component.html → web/src/app/shared/components/dropdown/dropdown.component.html
View File

0
web/src/app/shared/dropdown/dropdown.component.scss → web/src/app/shared/components/dropdown/dropdown.component.scss
View File

0
web/src/app/shared/dropdown/dropdown.component.spec.ts → web/src/app/shared/components/dropdown/dropdown.component.spec.ts
View File

2
web/src/app/shared/dropdown/dropdown.component.ts → web/src/app/shared/components/dropdown/dropdown.component.ts
View File

@ -1,6 +1,4 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { SortingModel } from '../../models/sorting';
import { Classification } from '../../models/classification';
@Component({ @Component({
selector: 'taskana-dropdown', selector: 'taskana-dropdown',

0
web/src/app/shared/error-message-modal/error-modal.component.html → web/src/app/shared/components/error-message-modal/error-modal.component.html
View File

0
web/src/app/shared/error-message-modal/error-modal.component.scss → web/src/app/shared/components/error-message-modal/error-modal.component.scss
View File

0
web/src/app/shared/error-message-modal/error-modal.component.spec.ts → web/src/app/shared/components/error-message-modal/error-modal.component.spec.ts
View File

0
web/src/app/shared/error-message-modal/error-modal.component.ts → web/src/app/shared/components/error-message-modal/error-modal.component.ts
View File

0
web/src/app/shared/field-error-display/field-error-display.component.html → web/src/app/shared/components/field-error-display/field-error-display.component.html
View File

0
web/src/app/shared/field-error-display/field-error-display.component.scss → web/src/app/shared/components/field-error-display/field-error-display.component.scss
View File

0
web/src/app/shared/field-error-display/field-error-display.component.spec.ts → web/src/app/shared/components/field-error-display/field-error-display.component.spec.ts
View File

0
web/src/app/shared/field-error-display/field-error-display.component.ts → web/src/app/shared/components/field-error-display/field-error-display.component.ts
View File

0
web/src/app/shared/filter/filter.component.html → web/src/app/shared/components/filter/filter.component.html
View File

0
web/src/app/shared/filter/filter.component.scss → web/src/app/shared/components/filter/filter.component.scss
View File

0
web/src/app/shared/filter/filter.component.spec.ts → web/src/app/shared/components/filter/filter.component.spec.ts
View File

12
web/src/app/shared/filter/filter.component.ts → web/src/app/shared/components/filter/filter.component.ts
View File

@ -1,7 +1,7 @@
import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'; import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
import { ICONTYPES } from 'app/models/type'; import { ICONTYPES } from 'app/shared/models/icon-types';
import { FilterModel } from 'app/models/filter'; import { Filter } from 'app/shared/models/filter';
import { TaskanaType } from 'app/models/taskana-type'; import { TaskanaType } from 'app/shared/models/taskana-type';
@Component({ @Component({
selector: 'taskana-filter', selector: 'taskana-filter',
@ -19,9 +19,9 @@ export class FilterComponent implements OnInit {
@Input() filterType = TaskanaType.WORKBASKETS; @Input() filterType = TaskanaType.WORKBASKETS;
@Output() performFilter = new EventEmitter<FilterModel>(); @Output() performFilter = new EventEmitter<Filter>();
filter: FilterModel; filter: Filter;
filterParamKeys = []; filterParamKeys = [];
lastFilterKey: string; lastFilterKey: string;
toggleDropDown = false; toggleDropDown = false;
@ -52,7 +52,7 @@ export class FilterComponent implements OnInit {
} }
initializeFilterModel(): void { initializeFilterModel(): void {
this.filter = new FilterModel(this.filterParams); this.filter = new Filter(this.filterParams);
} }
checkUppercaseFilterType(filterType: string) { checkUppercaseFilterType(filterType: string) {

0
web/src/app/shared/general-message-modal/general-message-modal.component.html → web/src/app/shared/components/general-message-modal/general-message-modal.component.html
View File

0
web/src/app/shared/general-message-modal/general-message-modal.component.scss → web/src/app/shared/components/general-message-modal/general-message-modal.component.scss
View File

0
web/src/app/shared/general-message-modal/general-message-modal.component.spec.ts → web/src/app/shared/components/general-message-modal/general-message-modal.component.spec.ts
View File

0
web/src/app/shared/general-message-modal/general-message-modal.component.ts → web/src/app/shared/components/general-message-modal/general-message-modal.component.ts
View File

0
web/src/app/shared/master-and-detail/master-and-detail.component.html → web/src/app/shared/components/master-and-detail/master-and-detail.component.html
View File

0
web/src/app/shared/master-and-detail/master-and-detail.component.scss → web/src/app/shared/components/master-and-detail/master-and-detail.component.scss
View File

2
web/src/app/shared/master-and-detail/master-and-detail.component.spec.ts → web/src/app/shared/components/master-and-detail/master-and-detail.component.spec.ts
View File

@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing';
import { Router, Routes } from '@angular/router'; import { Router, Routes } from '@angular/router';
import { AngularSvgIconModule } from 'angular-svg-icon'; import { AngularSvgIconModule } from 'angular-svg-icon';
import { HttpClientModule } from '@angular/common/http'; 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'; import { MasterAndDetailComponent } from './master-and-detail.component';

2
web/src/app/shared/master-and-detail/master-and-detail.component.ts → web/src/app/shared/components/master-and-detail/master-and-detail.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute, NavigationStart, RouterEvent } from '@angular/router'; 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({ @Component({
selector: 'taskana-master-and-detail', selector: 'taskana-master-and-detail',

0
web/src/app/components/nav-bar/nav-bar.component.html → web/src/app/shared/components/nav-bar/nav-bar.component.html
View File

0
web/src/app/components/nav-bar/nav-bar.component.scss → web/src/app/shared/components/nav-bar/nav-bar.component.scss
View File

14
web/src/app/components/nav-bar/nav-bar.component.spec.ts → web/src/app/shared/components/nav-bar/nav-bar.component.spec.ts
View File

@ -5,14 +5,14 @@ import { AngularSvgIconModule } from 'angular-svg-icon';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { SharedModule } from 'app/shared/shared.module'; 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 { SelectedRouteService } from 'app/shared/services/selected-route/selected-route';
import { BusinessAdminGuard } from 'app/guards/business-admin.guard'; import { BusinessAdminGuard } from 'app/shared/guards/business-admin.guard';
import { MonitorGuard } from 'app/guards/monitor.guard'; import { MonitorGuard } from 'app/shared/guards/monitor.guard';
import { WindowRefService } from 'app/services/window/window.service'; import { WindowRefService } from 'app/shared/services/window/window.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service'; import { GeneralModalService } from 'app/shared/services/general-modal/general-modal.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 { configureTests } from 'app/app.test.configuration'; import { configureTests } from 'app/app.test.configuration';
import { NavBarComponent } from './nav-bar.component'; import { NavBarComponent } from './nav-bar.component';

12
web/src/app/components/nav-bar/nav-bar.component.ts → web/src/app/shared/components/nav-bar/nav-bar.component.ts
View File

@ -1,12 +1,12 @@
import { Component, OnInit, OnDestroy } from '@angular/core'; import { Component, OnInit, OnDestroy } from '@angular/core';
import { environment } from 'environments/environment'; 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 { Subscription } from 'rxjs';
import { DomainService } from 'app/services/domain/domain.service'; import { DomainService } from 'app/shared/services/domain/domain.service';
import { BusinessAdminGuard } from 'app/guards/business-admin.guard'; import { BusinessAdminGuard } from 'app/shared/guards/business-admin.guard';
import { MonitorGuard } from 'app/guards/monitor.guard'; import { MonitorGuard } from 'app/shared/guards/monitor.guard';
import { WindowRefService } from 'app/services/window/window.service'; import { WindowRefService } from 'app/shared/services/window/window.service';
import { UserGuard } from 'app/guards/user.guard'; import { UserGuard } from 'app/shared/guards/user.guard';
import { expandRight } from 'app/shared/animations/expand.animation'; import { expandRight } from 'app/shared/animations/expand.animation';
import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service'; import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service';
@Component({ @Component({

0
web/src/app/components/no-access/no-access.component.html → web/src/app/shared/components/no-access/no-access.component.html
View File

0
web/src/app/components/no-access/no-access.component.scss → web/src/app/shared/components/no-access/no-access.component.scss
View File

0
web/src/app/components/no-access/no-access.component.spec.ts → web/src/app/shared/components/no-access/no-access.component.spec.ts
View File

6
web/src/app/components/no-access/no-access.component.ts → web/src/app/shared/components/no-access/no-access.component.ts
View File

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { BusinessAdminGuard } from 'app/guards/business-admin.guard'; import { BusinessAdminGuard } from 'app/shared/guards/business-admin.guard';
import { MonitorGuard } from 'app/guards/monitor.guard'; import { MonitorGuard } from 'app/shared/guards/monitor.guard';
import { UserGuard } from 'app/guards/user.guard'; import { UserGuard } from 'app/shared/guards/user.guard';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service'; import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service';

0
web/src/app/shared/number-picker/number-picker.component.html → web/src/app/shared/components/number-picker/number-picker.component.html
View File

0
web/src/app/shared/number-picker/number-picker.component.scss → web/src/app/shared/components/number-picker/number-picker.component.scss
View File

0
web/src/app/shared/number-picker/number-picker.component.spec.ts → web/src/app/shared/components/number-picker/number-picker.component.spec.ts
View File

0
web/src/app/shared/number-picker/number-picker.component.ts → web/src/app/shared/components/number-picker/number-picker.component.ts
View File

0
web/src/app/shared/pagination/pagination.component.html → web/src/app/shared/components/pagination/pagination.component.html
View File

0
web/src/app/shared/pagination/pagination.component.scss → web/src/app/shared/components/pagination/pagination.component.scss
View File

2
web/src/app/shared/pagination/pagination.component.spec.ts → web/src/app/shared/components/pagination/pagination.component.spec.ts
View File

@ -3,7 +3,7 @@ import { SimpleChange } from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { SharedModule } from 'app/shared/shared.module'; 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 { configureTests } from 'app/app.test.configuration';
import { PaginationComponent } from './pagination.component'; import { PaginationComponent } from './pagination.component';

2
web/src/app/shared/pagination/pagination.component.ts → web/src/app/shared/components/pagination/pagination.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; 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({ @Component({
selector: 'taskana-pagination', selector: 'taskana-pagination',

0
web/src/app/shared/progress-bar/progress-bar.component.html → web/src/app/shared/components/progress-bar/progress-bar.component.html
View File

0
web/src/app/shared/progress-bar/progress-bar.component.scss → web/src/app/shared/components/progress-bar/progress-bar.component.scss
View File

0
web/src/app/shared/progress-bar/progress-bar.component.spec.ts → web/src/app/shared/components/progress-bar/progress-bar.component.spec.ts
View File

0
web/src/app/shared/progress-bar/progress-bar.component.ts → web/src/app/shared/components/progress-bar/progress-bar.component.ts
View File

0
web/src/app/shared/remove-confirmation/remove-confirmation.component.html → web/src/app/shared/components/remove-confirmation/remove-confirmation.component.html
View File

0
web/src/app/shared/remove-confirmation/remove-confirmation.component.scss → web/src/app/shared/components/remove-confirmation/remove-confirmation.component.scss
View File

0
web/src/app/shared/remove-confirmation/remove-confirmation.component.spec.ts → web/src/app/shared/components/remove-confirmation/remove-confirmation.component.spec.ts
View File

2
web/src/app/shared/remove-confirmation/remove-confirmation.component.ts → web/src/app/shared/components/remove-confirmation/remove-confirmation.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core'; 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; declare let $: any;

Some files were not shown because too many files have changed in this diff Show More