Skip to content

Commit

Permalink
fix: use environment based baseHref for HTTP service calls (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
fredrikmonsen authored Aug 12, 2024
1 parent 67ea1ef commit d2c10a1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@ Thumbs.db

# Environment files
environment.stage.ts
environment.development.ts
2 changes: 1 addition & 1 deletion nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ server {
return 200 "Healthy\n";
}

location ^~ /api {
location ^~ /moki/api {
proxy_pass https://%API_HOST_URL%/papi/;
}
}
9 changes: 6 additions & 3 deletions src/app/services/production.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@ import {DigitizedItemBuilder} from "../builders/digitized-item.builder";
import {ItemEvent} from "../models/item-event.model";
import {ItemEventBuilder} from "../builders/item-event.builder";
import {MaterialTypeEnum} from "../enums/material-type.enum";
import {environment} from "../../environments/environment";

@Injectable({
providedIn: 'root',

})
export class ProductionService {

private baseUrl = `${environment.baseHref}/api`

constructor(
private http: HttpClient
) { }

searchByUrn(searchQuery: string): Observable<DigitizedItem | undefined> {
return this.http.get<DigitizedItem>(`/api/proddb/${searchQuery}`).pipe(
return this.http.get<DigitizedItem>(`${this.baseUrl}/proddb/${searchQuery}`).pipe(
map(item => new DigitizedItemBuilder(item).build()),
mergeMap(item => {
if (item.id && (item.type === MaterialTypeEnum.NewspaperBundle || item.type === MaterialTypeEnum.PeriodicalBundle)) {
Expand Down Expand Up @@ -58,7 +61,7 @@ export class ProductionService {
}

getEventsById(id: number): Observable<ItemEvent[]> {
return this.http.get<ItemEvent[]>(`/api/proddb/${id}/events`).pipe(
return this.http.get<ItemEvent[]>(`${this.baseUrl}/proddb/${id}/events`).pipe(
map(items => items.map(item => new ItemEventBuilder(item).build())),
// TODO: Change sort to follow actual step order
map(items => items.sort((a, b) => {
Expand All @@ -69,7 +72,7 @@ export class ProductionService {
}

getRelatedItems(id: number): Observable<DigitizedItem[]> {
return this.http.get<DigitizedItem[]>(`/api/proddb/${id}/children`).pipe(
return this.http.get<DigitizedItem[]>(`${this.baseUrl}/proddb/${id}/children`).pipe(
map(items => items.map(item => new DigitizedItemBuilder(item).build()))
);
}
Expand Down
4 changes: 4 additions & 0 deletions src/environments/environment.development.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export const environment = {
relationUrl: '/relation',
baseHref: ''
};
2 changes: 1 addition & 1 deletion src/environments/environment.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const environment = {
papiUrl: '/papi',
relationUrl: '/relation',
baseHref: '/moki'
};

0 comments on commit d2c10a1

Please sign in to comment.