Skip to content

Commit

Permalink
Closes #2505 - removed some more trailing slashes
Browse files Browse the repository at this point in the history
  • Loading branch information
holgerhagen committed Mar 5, 2024
1 parent 1d59ca4 commit 8b7c002
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions web/src/app/monitor/services/monitor.service.ts
Expand Up @@ -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 {
Expand All @@ -18,7 +18,7 @@ export class MonitorService {
states: [TaskState.READY, TaskState.CLAIMED, TaskState.COMPLETED]
};
return this.httpClient.get<ReportData>(
`${environment.taskanaRestUrl + monitorUrl}task-status-report${asUrlQueryString(queryParams)}`
`${environment.taskanaRestUrl + monitorUrl}/task-status-report${asUrlQueryString(queryParams)}`
);
}

Expand All @@ -27,7 +27,7 @@ export class MonitorService {
states: [TaskState.READY, TaskState.CLAIMED, TaskState.COMPLETED]
};
return this.httpClient.get<ReportData>(
`${environment.taskanaRestUrl + monitorUrl}workbasket-report${asUrlQueryString(queryParams)}`
`${environment.taskanaRestUrl + monitorUrl}/workbasket-report${asUrlQueryString(queryParams)}`
);
}

Expand All @@ -37,16 +37,16 @@ export class MonitorService {
states: [TaskState.READY, TaskState.CLAIMED, TaskState.COMPLETED]
};
return this.httpClient.get<ReportData>(
`${environment.taskanaRestUrl + monitorUrl}workbasket-report${asUrlQueryString(queryParams)}`
`${environment.taskanaRestUrl + monitorUrl}/workbasket-report${asUrlQueryString(queryParams)}`
);
}

getClassificationTasksReport(): Observable<ReportData> {
return this.httpClient.get<ReportData>(`${environment.taskanaRestUrl + monitorUrl}classification-report`);
return this.httpClient.get<ReportData>(`${environment.taskanaRestUrl + monitorUrl}/classification-report`);
}

getDailyEntryExitReport(): Observable<ReportData> {
return this.httpClient.get<ReportData>(`${environment.taskanaRestUrl + monitorUrl}timestamp-report`);
return this.httpClient.get<ReportData>(`${environment.taskanaRestUrl + monitorUrl}/timestamp-report`);
}

getChartData(source: ReportData): ChartData[] {
Expand All @@ -67,7 +67,7 @@ export class MonitorService {
};

return this.httpClient.get<ReportData>(
`${environment.taskanaRestUrl + monitorUrl}workbasket-priority-report${asUrlQueryString(queryParams)}`
`${environment.taskanaRestUrl + monitorUrl}/workbasket-priority-report${asUrlQueryString(queryParams)}`
);
}
}
Expand Up @@ -52,7 +52,7 @@ export class AccessIdsService {

removeAccessItemsPermissions(accessId: string) {
return this.httpClient.delete<WorkbasketAccessItemsRepresentation>(
`${environment.taskanaRestUrl}/v1/workbasket-access-items/?access-id=${accessId}`
`${environment.taskanaRestUrl}/v1/workbasket-access-items?access-id=${accessId}`
);
}
}
Expand Up @@ -23,7 +23,7 @@ export class ClassificationsService {
) {}

get url(): string {
return this.startupService.getTaskanaRestUrl() + '/v1/classifications/';
return this.startupService.getTaskanaRestUrl() + '/v1/classifications';
}

// GET
Expand All @@ -39,7 +39,7 @@ export class ClassificationsService {

// GET
getClassification(id: string): Observable<Classification> {
return this.httpClient.get<Classification>(`${this.url}${id}`);
return this.httpClient.get<Classification>(`${this.url}/${id}`);
}

// POST
Expand All @@ -49,11 +49,11 @@ export class ClassificationsService {

// PUT
putClassification(classification: Classification): Observable<Classification> {
return this.httpClient.put<Classification>(`${this.url}${classification.classificationId}`, classification);
return this.httpClient.put<Classification>(`${this.url}/${classification.classificationId}`, classification);
}

// DELETE
deleteClassification(id: string): Observable<string> {
return this.httpClient.delete<string>(`${this.url}${id}`);
return this.httpClient.delete<string>(`${this.url}/${id}`);
}
}
Expand Up @@ -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) {
Expand Down

0 comments on commit 8b7c002

Please sign in to comment.