diff --git a/web/src/app/monitor/services/monitor.service.ts b/web/src/app/monitor/services/monitor.service.ts index 29118e9d4..a96a7e07a 100644 --- a/web/src/app/monitor/services/monitor.service.ts +++ b/web/src/app/monitor/services/monitor.service.ts @@ -7,7 +7,7 @@ import { ReportData } from '../models/report-data'; import { asUrlQueryString } from '../../shared/util/query-parameters-v2'; import { TaskState } from '../../shared/models/task-state'; -const monitorUrl = '/v1/monitor/'; +const monitorUrl = '/v1/monitor'; @Injectable() export class MonitorService { @@ -18,7 +18,7 @@ export class MonitorService { states: [TaskState.READY, TaskState.CLAIMED, TaskState.COMPLETED] }; return this.httpClient.get( - `${environment.taskanaRestUrl + monitorUrl}task-status-report${asUrlQueryString(queryParams)}` + `${environment.taskanaRestUrl + monitorUrl}/task-status-report${asUrlQueryString(queryParams)}` ); } @@ -27,7 +27,7 @@ export class MonitorService { states: [TaskState.READY, TaskState.CLAIMED, TaskState.COMPLETED] }; return this.httpClient.get( - `${environment.taskanaRestUrl + monitorUrl}workbasket-report${asUrlQueryString(queryParams)}` + `${environment.taskanaRestUrl + monitorUrl}/workbasket-report${asUrlQueryString(queryParams)}` ); } @@ -37,16 +37,16 @@ export class MonitorService { states: [TaskState.READY, TaskState.CLAIMED, TaskState.COMPLETED] }; return this.httpClient.get( - `${environment.taskanaRestUrl + monitorUrl}workbasket-report${asUrlQueryString(queryParams)}` + `${environment.taskanaRestUrl + monitorUrl}/workbasket-report${asUrlQueryString(queryParams)}` ); } getClassificationTasksReport(): Observable { - return this.httpClient.get(`${environment.taskanaRestUrl + monitorUrl}classification-report`); + return this.httpClient.get(`${environment.taskanaRestUrl + monitorUrl}/classification-report`); } getDailyEntryExitReport(): Observable { - return this.httpClient.get(`${environment.taskanaRestUrl + monitorUrl}timestamp-report`); + return this.httpClient.get(`${environment.taskanaRestUrl + monitorUrl}/timestamp-report`); } getChartData(source: ReportData): ChartData[] { @@ -67,7 +67,7 @@ export class MonitorService { }; return this.httpClient.get( - `${environment.taskanaRestUrl + monitorUrl}workbasket-priority-report${asUrlQueryString(queryParams)}` + `${environment.taskanaRestUrl + monitorUrl}/workbasket-priority-report${asUrlQueryString(queryParams)}` ); } } diff --git a/web/src/app/shared/services/access-ids/access-ids.service.ts b/web/src/app/shared/services/access-ids/access-ids.service.ts index 5f2f405f7..5c96c0363 100644 --- a/web/src/app/shared/services/access-ids/access-ids.service.ts +++ b/web/src/app/shared/services/access-ids/access-ids.service.ts @@ -52,7 +52,7 @@ export class AccessIdsService { removeAccessItemsPermissions(accessId: string) { return this.httpClient.delete( - `${environment.taskanaRestUrl}/v1/workbasket-access-items/?access-id=${accessId}` + `${environment.taskanaRestUrl}/v1/workbasket-access-items?access-id=${accessId}` ); } } diff --git a/web/src/app/shared/services/classifications/classifications.service.ts b/web/src/app/shared/services/classifications/classifications.service.ts index 8b7fbb770..8331feb2c 100644 --- a/web/src/app/shared/services/classifications/classifications.service.ts +++ b/web/src/app/shared/services/classifications/classifications.service.ts @@ -23,7 +23,7 @@ export class ClassificationsService { ) {} get url(): string { - return this.startupService.getTaskanaRestUrl() + '/v1/classifications/'; + return this.startupService.getTaskanaRestUrl() + '/v1/classifications'; } // GET @@ -39,7 +39,7 @@ export class ClassificationsService { // GET getClassification(id: string): Observable { - return this.httpClient.get(`${this.url}${id}`); + return this.httpClient.get(`${this.url}/${id}`); } // POST @@ -49,11 +49,11 @@ export class ClassificationsService { // PUT putClassification(classification: Classification): Observable { - return this.httpClient.put(`${this.url}${classification.classificationId}`, classification); + return this.httpClient.put(`${this.url}/${classification.classificationId}`, classification); } // DELETE deleteClassification(id: string): Observable { - return this.httpClient.delete(`${this.url}${id}`); + return this.httpClient.delete(`${this.url}/${id}`); } } diff --git a/web/src/app/v2/task-routing/services/routing-upload.service.ts b/web/src/app/v2/task-routing/services/routing-upload.service.ts index 2a14d3a01..ccedbd689 100644 --- a/web/src/app/v2/task-routing/services/routing-upload.service.ts +++ b/web/src/app/v2/task-routing/services/routing-upload.service.ts @@ -9,7 +9,7 @@ export class RoutingUploadService { constructor(private httpClient: HttpClient, private startupService: StartupService) {} get url(): string { - return this.startupService.getTaskanaRestUrl() + '/v1/routing-rules/default/'; + return this.startupService.getTaskanaRestUrl() + '/v1/routing-rules/default'; } uploadRoutingRules(file: File) { diff --git a/web/src/app/workplace/components/task-processing/task-processing.component.ts b/web/src/app/workplace/components/task-processing/task-processing.component.ts index e5a02addf..2041b025a 100644 --- a/web/src/app/workplace/components/task-processing/task-processing.component.ts +++ b/web/src/app/workplace/components/task-processing/task-processing.component.ts @@ -19,7 +19,7 @@ export class TaskProcessingComponent implements OnInit, OnDestroy { routeSubscription: Subscription; regex = /\${(.*?)}/g; - address = 'https://bing.com/'; + address = 'https://bing.com'; link: SafeResourceUrl; task: Task = null; @@ -59,7 +59,7 @@ export class TaskProcessingComponent implements OnInit, OnDestroy { const classification = await this.classificationService .getClassification(this.task.classificationSummary.classificationId) .toPromise(); - this.address = this.extractUrl(classification.applicationEntryPoint) || `${this.address}/?q=${this.task.name}`; + this.address = this.extractUrl(classification.applicationEntryPoint) || `${this.address}?q=${this.task.name}`; this.link = this.sanitizer.bypassSecurityTrustResourceUrl(this.address); this.getWorkbaskets(); this.requestInProgressService.setRequestInProgress(false);