From cf9d5c358f77ff77f830373850d3f44d3ca5238f Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 22 May 2018 17:23:29 +0200 Subject: [PATCH] TSK-505 --- .../administration/administration.module.ts | 2 +- .../classification-list.component.spec.ts | 2 +- .../import-export.component.spec.ts | 2 +- .../access-items.component.spec.ts | 2 +- .../access-items/access-items.component.ts | 2 +- .../distribution-targets.component.spec.ts | 2 +- .../distribution-targets.component.ts | 2 +- .../workbasket-information.component.spec.ts | 2 +- .../workbasket-information.component.ts | 2 +- .../workbasket-details.component.spec.ts | 2 +- .../details/workbasket-details.component.ts | 2 +- .../workbasket-list-toolbar.component.spec.ts | 2 +- .../workbasket-list-toolbar.component.ts | 2 +- .../list/workbasket-list.component.spec.ts | 2 +- .../master/list/workbasket-list.component.ts | 2 +- .../services/workbasket/workbasket.service.ts | 12 ++++++++++- .../workplace/services/workbasket.service.ts | 20 ------------------- web/src/app/workplace/task/task.component.ts | 2 +- .../workbasket-selector.component.ts | 2 +- web/src/app/workplace/workplace.module.ts | 2 +- 20 files changed, 29 insertions(+), 39 deletions(-) rename web/src/app/{administration => }/services/workbasket/workbasket.service.ts (94%) delete mode 100644 web/src/app/workplace/services/workbasket.service.ts diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts index 96f3b6d7b..6e0f57214 100644 --- a/web/src/app/administration/administration.module.ts +++ b/web/src/app/administration/administration.module.ts @@ -32,7 +32,7 @@ import { SortComponent } from './components/sort/sort.component'; /** * Services */ -import { WorkbasketService } from './services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { SavingWorkbasketService } from './services/saving-workbaskets/saving-workbaskets.service'; import { ClassificationDefinitionService } from './services/classification-definition/classification-definition.service'; import { WorkbasketDefinitionService } from './services/workbasket-definition/workbasket-definition.service'; diff --git a/web/src/app/administration/classification/master/list/classification-list.component.spec.ts b/web/src/app/administration/classification/master/list/classification-list.component.spec.ts index d212eb80f..a138549f9 100644 --- a/web/src/app/administration/classification/master/list/classification-list.component.spec.ts +++ b/web/src/app/administration/classification/master/list/classification-list.component.spec.ts @@ -17,7 +17,7 @@ import { ClassificationTypesSelectorComponent } from 'app/shared/classification- import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.component'; import { MapValuesPipe } from 'app/shared/pipes/mapValues/map-values.pipe'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service'; import { AlertService } from 'app/services/alert/alert.service'; import { ClassificationsService } from 'app/administration/services/classifications/classifications.service'; diff --git a/web/src/app/administration/components/import-export/import-export.component.spec.ts b/web/src/app/administration/components/import-export/import-export.component.spec.ts index c69c26e31..ba33de017 100644 --- a/web/src/app/administration/components/import-export/import-export.component.spec.ts +++ b/web/src/app/administration/components/import-export/import-export.component.spec.ts @@ -1,7 +1,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {ImportExportComponent} from './import-export.component'; -import {WorkbasketService} from '../../services/workbasket/workbasket.service'; +import {WorkbasketService} from 'app/services/workbasket/workbasket.service'; import {ClassificationDefinitionService} from 'app/administration/services/classification-definition/classification-definition.service'; import {WorkbasketDefinitionService} from '../../services/workbasket-definition/workbasket-definition.service'; import {AlertService} from 'app/services/alert/alert.service'; diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts b/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts index ddc172a54..98f6fd0c6 100644 --- a/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts +++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts @@ -19,7 +19,7 @@ import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/g import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { DomainService } from 'app/services/domain/domain.service'; diff --git a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts index 3a0548486..73cb9a486 100644 --- a/web/src/app/administration/workbasket/details/access-items/access-items.component.ts +++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts @@ -10,7 +10,7 @@ import { AlertModel, AlertType } from 'app/models/alert'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { TitlesService } from 'app/services/titles/titles.service'; diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts index 869b55268..3a4d88e5a 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts +++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts @@ -13,7 +13,7 @@ import { FilterModel } from 'app/models/filter'; import { Workbasket } from 'app/models/workbasket'; import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts index cbe49c80c..66fa67713 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts +++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts @@ -10,7 +10,7 @@ import { ErrorModel } from 'app/models/modal-error'; import { ACTION } from 'app/models/action'; import { AlertModel, AlertType } from 'app/models/alert'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts b/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts index e0d2fe94e..43aa45c97 100644 --- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts +++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketInformationComponent } from './workbasket-information.component'; import { FormsModule, ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { AngularSvgIconModule } from 'angular-svg-icon'; diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts index 2d1f63f3b..3dea7ad2f 100644 --- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts +++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts @@ -14,7 +14,7 @@ import { TaskanaDate } from 'app/shared/util/taskana.date'; import { AlertService } from 'app/services/alert/alert.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; import { TitlesService } from 'app/services/titles/titles.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service'; diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts b/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts index 88b847dd7..1f53ba640 100644 --- a/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts +++ b/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts @@ -18,7 +18,7 @@ import { Links } from 'app/models/links'; import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { AlertService } from 'app/services/alert/alert.service'; import { SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service'; diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.ts b/web/src/app/administration/workbasket/details/workbasket-details.component.ts index 2b488d54c..e44ff349d 100644 --- a/web/src/app/administration/workbasket/details/workbasket-details.component.ts +++ b/web/src/app/administration/workbasket/details/workbasket-details.component.ts @@ -10,7 +10,7 @@ import { ErrorModel } from 'app/models/modal-error'; import { ACTION } from 'app/models/action'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service' +import { WorkbasketService } from 'app/services/workbasket/workbasket.service' import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service' import { DomainService } from 'app/services/domain/domain.service'; diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts index 8496d84ca..4aba9eb84 100644 --- a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts @@ -22,7 +22,7 @@ import { IconTypeComponent } from 'app/administration/components/type-icon/icon- import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar.component'; import { ImportExportComponent } from 'app/administration/components/import-export/import-export.component'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service'; diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts index b4628e9d2..bb6ad6a8b 100644 --- a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts @@ -11,7 +11,7 @@ import { AlertModel, AlertType } from 'app/models/alert'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { AlertService } from 'app/services/alert/alert.service'; import { ImportType } from 'app/models/import-type'; diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts b/web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts index 8a69460fa..e8251827b 100644 --- a/web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts @@ -24,7 +24,7 @@ import { ImportExportComponent } from 'app/administration/components/import-expo import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; @Component({ selector: 'taskana-dummy-detail', diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list.component.ts b/web/src/app/administration/workbasket/master/list/workbasket-list.component.ts index 7dbebaeca..908511eee 100644 --- a/web/src/app/administration/workbasket/master/list/workbasket-list.component.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list.component.ts @@ -11,7 +11,7 @@ import { FilterModel } from 'app/models/filter' import { SortingModel } from 'app/models/sorting'; import { Orientation } from 'app/models/orientation'; -import { WorkbasketService } from 'app/administration/services/workbasket/workbasket.service' +import { WorkbasketService } from 'app/services/workbasket/workbasket.service' import { OrientationService } from 'app/services/orientation/orientation.service'; @Component({ diff --git a/web/src/app/administration/services/workbasket/workbasket.service.ts b/web/src/app/services/workbasket/workbasket.service.ts similarity index 94% rename from web/src/app/administration/services/workbasket/workbasket.service.ts rename to web/src/app/services/workbasket/workbasket.service.ts index ce5bc11b6..367edd40c 100644 --- a/web/src/app/administration/services/workbasket/workbasket.service.ts +++ b/web/src/app/services/workbasket/workbasket.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; -import { environment } from 'app/../environments/environment'; +import { environment } from 'environments/environment'; import { Workbasket } from 'app/models/workbasket'; import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; @@ -12,10 +12,14 @@ import { Direction } from 'app/models/sorting'; import { DomainService } from 'app/services/domain/domain.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import {WorkbasketResource} from '../../models/workbasket-resource'; @Injectable() export class WorkbasketService { + workbasketKey: string; + workbasketName: string; + public workBasketSelected = new Subject(); public workBasketSaved = new Subject(); @@ -92,6 +96,12 @@ export class WorkbasketService { getWorkBasket(id: string): Observable { return this.httpClient.get(`${environment.taskanaRestUrl}/v1/workbaskets/${id}`); } + + // GET + getAllWorkBaskets(): Observable { + return this.httpClient.get(`${environment.taskanaRestUrl}/v1/workbaskets?required-permission=OPEN`); + } + // POST createWorkbasket(workbasket: Workbasket): Observable { return this.httpClient diff --git a/web/src/app/workplace/services/workbasket.service.ts b/web/src/app/workplace/services/workbasket.service.ts deleted file mode 100644 index 22f9e46f2..000000000 --- a/web/src/app/workplace/services/workbasket.service.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Injectable } from '@angular/core'; - -import { environment } from 'app/../environments/environment'; -import { Observable } from 'rxjs/Observable'; -import { HttpClient } from '@angular/common/http'; -import {WorkbasketResource} from 'app/models/workbasket-resource'; - -@Injectable() -export class WorkbasketService { - url = `${environment.taskanaRestUrl}/v1/workbaskets`; - workbasketKey: string; - workbasketName: string; - - constructor(private httpClient: HttpClient) { - } - - getAllWorkBaskets(): Observable { - return this.httpClient.get(`${this.url}?required-permission=OPEN`); - } -} diff --git a/web/src/app/workplace/task/task.component.ts b/web/src/app/workplace/task/task.component.ts index 9126bd02e..6ae2e3816 100644 --- a/web/src/app/workplace/task/task.component.ts +++ b/web/src/app/workplace/task/task.component.ts @@ -4,7 +4,7 @@ import {Task} from 'app/workplace/models/task'; import {Workbasket} from 'app/models/workbasket'; import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser'; import {TaskService} from 'app/workplace/services/task.service'; -import {WorkbasketService} from 'app/workplace/services/workbasket.service'; +import {WorkbasketService} from 'app/services/workbasket/workbasket.service'; @Component({ diff --git a/web/src/app/workplace/workbasket-selector/workbasket-selector.component.ts b/web/src/app/workplace/workbasket-selector/workbasket-selector.component.ts index 01d1afd07..e25341509 100644 --- a/web/src/app/workplace/workbasket-selector/workbasket-selector.component.ts +++ b/web/src/app/workplace/workbasket-selector/workbasket-selector.component.ts @@ -2,7 +2,7 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core'; import {Task} from 'app/workplace/models/task'; import {Workbasket} from 'app/models/workbasket'; import {TaskService} from 'app/workplace/services/task.service'; -import {WorkbasketService} from 'app/workplace/services/workbasket.service'; +import {WorkbasketService} from 'app/services/workbasket/workbasket.service'; @Component({ selector: 'taskana-workbasket-selector', diff --git a/web/src/app/workplace/workplace.module.ts b/web/src/app/workplace/workplace.module.ts index a7fe52dbc..c781baf77 100644 --- a/web/src/app/workplace/workplace.module.ts +++ b/web/src/app/workplace/workplace.module.ts @@ -18,7 +18,7 @@ import { CodeComponent } from './components/code/code.component'; import { OrderTasksByPipe } from './util/orderTasksBy.pipe'; import {TaskService} from './services/task.service'; -import {WorkbasketService} from './services/workbasket.service'; +import {WorkbasketService} from 'app/services/workbasket/workbasket.service'; import {SharedModule} from '../shared/shared.module'; import {CustomHttpClientInterceptor} from './services/custom-http-interceptor/custom-http-interceptor.service';