Fix config value from BE config (#375)

* Fix config value from BE config * Use lowercase for consistency
SciCatProject · Oct 2, 2024 · 9188866 · 9188866
1 parent 9c79efe
commit 9188866
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 16 deletions.
diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
@@ -19,6 +19,7 @@ export interface AppConfig {
   logoBanner: string | null;
   logoWidth?: string;
   retrieveToEmail: RetrieveDestinations | undefined;
+  lbBaseUrl: string | null;
 }
 
 export class RetrieveDestinations {

diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,11 +1,12 @@
-import { TestBed, waitForAsync } from "@angular/core/testing";
+import { fakeAsync, TestBed, waitForAsync } from "@angular/core/testing";
 import { RouterTestingModule } from "@angular/router/testing";
 import { AppComponent } from "./app.component";
 import { APP_CONFIG } from "./app-config.module";
 import { MatToolbarModule } from "@angular/material/toolbar";
 import { HttpClientModule } from "@angular/common/http";
 import { APP_DYN_CONFIG } from "./app-config.service";
 import { MockAppConfigService } from "./shared/MockStubs";
+import { LoopBackConfig } from "./shared/sdk";
 
 describe("AppComponent", () => {
   beforeEach(waitForAsync(() => {
@@ -35,4 +36,13 @@ describe("AppComponent", () => {
     const app = fixture.componentInstance;
     expect(app.title).toEqual("ESS Public Data Repository test");
   });
+
+  it(`should test app config values'`, fakeAsync(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(app.config.scicatBaseUrl).toEqual("https://scicat.esss.se");
+    expect(app.config.lbBaseUrl).toEqual("https://scicat.esss.se/api");
+    expect(LoopBackConfig.getPath()).toEqual("https://scicat.esss.se/api");
+  }));
 });
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -33,7 +33,7 @@ export class AppComponent implements OnInit {
   }
 
   ngOnInit() {
-    LoopBackConfig.setBaseURL(this.config.scicatBaseUrl);
+    LoopBackConfig.setBaseURL(this.config.lbBaseUrl);
     console.log("API Path: ", LoopBackConfig.getPath());
     console.log("API Version: ", LoopBackConfig.getApiVersion());
   }

diff --git a/src/app/shared/MockStubs.ts b/src/app/shared/MockStubs.ts
@@ -111,7 +111,7 @@ export class MockAppConfigService extends AppConfigService {
     accessInstructions:
       "Instructions: Login with brightness username and password",
     scicatBaseUrl: "https://scicat.esss.se",
-    lbBaseUrl: "https://scicat.esss.se",
+    lbBaseUrl: "https://scicat.esss.se/api",
     retrieveToEmail: {
       option: "URLs",
       username: "lp_service",

diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
@@ -11,7 +11,7 @@ export const environment = {
   directMongoAccess: false,
   doiBaseUrl: "https://doi.org/",
   facility: "psi",
-  lbBaseURL: "https://doi2.psi.ch:3001",
+  lbBaseUrl: "https://doi2.psi.ch:3001",
   oaiProviderRoute: "https://doi2.psi.ch/oaipmh/Publication",
   production: true,
   scicatBaseUrl: null,

diff --git a/src/environments/environment.dmsc.ts b/src/environments/environment.dmsc.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "ess",
-  lbBaseURL: "https://kubetest02.dm.esss.dk:32223",
+  lbBaseUrl: "https://kubetest02.dm.esss.dk:32223",
   oaiProviderRoute: null,
   production: false,
   scicatBaseUrl: "https://scicat.esss.se",

diff --git a/src/environments/environment.dmscdev.ts b/src/environments/environment.dmscdev.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "ess",
-  lbBaseURL: "https://catamelservice.esss.dk:30003",
+  lbBaseUrl: "https://catamelservice.esss.dk:30003",
   oaiProviderRoute: null,
   production: false,
   scicatBaseUrl: "https://scicat.esss.se",

diff --git a/src/environments/environment.dmscprod.ts b/src/environments/environment.dmscprod.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "ess",
-  lbBaseURL: "https://scicatapi.esss.dk",
+  lbBaseUrl: "https://scicatapi.esss.dk",
   oaiProviderRoute: null,
   production: true,
   scicatBaseUrl: "https://scicat.esss.se",

diff --git a/src/environments/environment.docker.ts b/src/environments/environment.docker.ts
@@ -10,7 +10,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "ess",
-  lbBaseURL: "http://127.0.0.1:3000",
+  lbBaseUrl: "http://127.0.0.1:3000",
   oaiProviderRoute: null,
   production: false,
   scicatBaseUrl: "https://scicat.esss.se",

diff --git a/src/environments/environment.essdev.ts b/src/environments/environment.essdev.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "ess",
-  lbBaseURL: "https://scitest.esss.lu.se",
+  lbBaseUrl: "https://scitest.esss.lu.se",
   oaiProviderRoute: null,
   production: false,
   scicatBaseUrl: "https://scitest.esss.lu.se",

diff --git a/src/environments/environment.essprod.ts b/src/environments/environment.essprod.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "ess",
-  lbBaseURL: "https://scicat.ess.eu",
+  lbBaseUrl: "https://scicat.ess.eu",
   oaiProviderRoute: null,
   production: true,
   scicatBaseUrl: "https://scicat.ess.eu",

diff --git a/src/environments/environment.maxivdemo.ts b/src/environments/environment.maxivdemo.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "maxiv",
-  lbBaseURL: "https://scicat-demo.maxiv.lu.se",
+  lbBaseUrl: "https://scicat-demo.maxiv.lu.se",
   oaiProviderRoute: null,
   production: true,
   scicatBaseUrl: "https://scicat-demo.maxiv.lu.se",

diff --git a/src/environments/environment.maxivdev.ts b/src/environments/environment.maxivdev.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "maxiv",
-  lbBaseURL: "https://scicat-test.maxiv.lu.se",
+  lbBaseUrl: "https://scicat-test.maxiv.lu.se",
   oaiProviderRoute: null,
   production: true,
   scicatBaseUrl: "https://scicat-test.maxiv.lu.se",

diff --git a/src/environments/environment.maxivprod.ts b/src/environments/environment.maxivprod.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "maxiv",
-  lbBaseURL: "https://scicat.maxiv.lu.se",
+  lbBaseUrl: "https://scicat.maxiv.lu.se",
   oaiProviderRoute: null,
   production: true,
   scicatBaseUrl: "https://scicat.maxiv.lu.se",

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -6,7 +6,7 @@ export const environment = {
   directMongoAccess: false,
   doiBaseUrl: "https://doi.org/",
   facility: "psi",
-  lbBaseURL: "https://doi.psi.ch:3001",
+  lbBaseUrl: "https://doi.psi.ch:3001",
   oaiProviderRoute: "https://doi.psi.ch/oaipmh/Publication",
   production: true,
   scicatBaseUrl: null,

diff --git a/src/environments/environment.qa.ts b/src/environments/environment.qa.ts
@@ -4,7 +4,7 @@ export const environment = {
   directMongoAccess: false,
   doiBaseUrl: "https://doi.org/",
   facility: "PSI",
-  lbBaseURL: "https://dacat-qa.psi.ch",
+  lbBaseUrl: "https://dacat-qa.psi.ch",
   oaiProviderRoute: null,
   production: true,
   scicatBaseUrl: null,

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -9,7 +9,7 @@ export const environment = {
   directMongoAccess: true,
   doiBaseUrl: "https://doi.org/",
   facility: "ess",
-  lbBaseURL: "http://localhost:3000",
+  lbBaseUrl: "http://localhost:3000",
   oaiProviderRoute: "http://127.0.0.1:3001",
   production: false,
   scicatBaseUrl: "https://scicat.esss.se",