gCubeSystem
/
information-system-gui
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed URL for JHipster REST API

This commit is contained in:
Maria Teresa Paratore 2023-12-11 15:48:15 +01:00
parent a64bfc97dc
commit 90c432b18f
5 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/app/config/app-properties.ts
View File

@ -1,5 +0,0 @@
export class appProperties {
public static BASEURL_API = "http://localhost:8081/api/";
//public static BASEURL_API = "http://localhost:8080/api/";
}

3
src/main/webapp/app/home/home.component.html
View File

@ -2,8 +2,7 @@
<div [ngSwitch]="account !== null">
<div *ngSwitchCase="true">
<div class="alert alert-success">
<h3 id="home-logged-message" *ngIf="account" jhiTranslate="home.logged.message"
[translateValues]="{ username: account.login }">You are logged in as user "{{account.login}}"</h3>
<h3 id="home-logged-message" *ngIf="account">You are logged in as user "{{account.login}}"</h3>
</div>
<div *ngIf="isLoading" class="loader-container">

8
src/main/webapp/app/services/contexts-loader.service.ts
View File

@ -3,8 +3,8 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs';
import { appProperties } from 'app/config/app-properties';
import { IContextNode } from './i-context-node';
import { ApplicationConfigService } from 'app/core/config/application-config.service';
@Injectable({
providedIn: 'root',
@ -15,11 +15,13 @@ export class ContextsLoaderService {
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
constructor(private http: HttpClient) {}
constructor(private http: HttpClient, private applicationConfigService: ApplicationConfigService) {}
fetchAll(): Observable<IContextNode[]> {
return this.http.get<IContextNode[]>(appProperties.BASEURL_API + 'is/allcontexts');
//return this.http.get<IContextNode[]>(appProperties.BASEURL_API + 'is/allcontexts');
const resourceUrl = this.applicationConfigService.getEndpointFor('api/is/allcontexts');
return this.http.get<IContextNode[]>(resourceUrl);
}

20
src/main/webapp/app/services/resources-impl.service.ts
View File

@ -1,10 +1,10 @@
/* eslint-disable no-console */
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable, Subject } from 'rxjs';
import { appProperties } from 'app/config/app-properties';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { IHostingNode } from './i-hosting-node';
import { IEService } from './i-e-service';
import { ApplicationConfigService } from 'app/core/config/application-config.service';
@Injectable({
providedIn: 'root'
@ -12,33 +12,30 @@ import { IEService } from './i-e-service';
export class ResourcesImplService {
//public isLoading: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
httpOptions = {
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
private loading: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
constructor(private http: HttpClient) { }
constructor(private http: HttpClient, private applicationConfigService: ApplicationConfigService) { }
public isLoading():Observable<any>{
return this.loading;
}
//TODO: qui va messo parametro per paginazione
//TODO: paginate when APIs are ready
fetchResourceImpls(ctx:string, type:string): Observable<any[]> {
const SERVICE_URL = appProperties.BASEURL_API+'is/resourceinstances';
//console.debug("******SIAMO NEL SERVIZIO:");
//console.debug(SERVICE_URL);
const resourceUrl = this.applicationConfigService.getEndpointFor('api/is/resourceinstances');
let queryParams = new HttpParams();
queryParams = queryParams.append("currentContext",ctx).append("resourceType",type);
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
if(type==='HostingNode'){
//console.debug("******GETTING HOSTING NODE*****");
return this.http.get<IHostingNode[]>(SERVICE_URL,{params:queryParams});
return this.http.get<IHostingNode[]>(resourceUrl,{params:queryParams});
}
if(type==='EService'){
return this.http.get<IEService[]>(SERVICE_URL,{params:queryParams});
return this.http.get<IEService[]>(resourceUrl,{params:queryParams});
}
return new Observable<any[]>();
}
@ -46,10 +43,11 @@ export class ResourcesImplService {
getJsonDetails(ctx:string, type:string, uid: string): Observable<string> {
const SERVICE_URL = appProperties.BASEURL_API+'is/resourcejson';
const resourceUrl = this.applicationConfigService.getEndpointFor('api/is/resourcejson');
// const SERVICE_URL = appProperties.BASEURL_API+'is/resourcejson';
let queryParams = new HttpParams();
queryParams = queryParams.append("currentContext",ctx).append("resourceType",type).append("uid",uid);
return this.http.get<string>(SERVICE_URL,{params:queryParams});
return this.http.get<string>(resourceUrl,{params:queryParams});
}
}

8
src/main/webapp/app/services/restypes.service.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs';
import { IResource} from './i-resource';
import { appProperties } from 'app/config/app-properties';
import { ApplicationConfigService } from 'app/core/config/application-config.service';
@Injectable({
providedIn: 'root',
@ -13,12 +13,14 @@ export class RestypesService {
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
constructor(private http: HttpClient) {}
constructor(private http: HttpClient, private applicationConfigService: ApplicationConfigService){}
//TODO: pipe per gestione errori
fetchAll(): Observable<IResource[]> {
return this.http.get<IResource[]>(appProperties.BASEURL_API+'is/resourcetypes');
//return this.http.get<IResource[]>(appProperties.BASEURL_API+'is/resourcetypes');
const resourceUrl = this.applicationConfigService.getEndpointFor('api/is/resourcetypes');
return this.http.get<IResource[]>(resourceUrl);
}