chore: use common MB3_API_URL

Author: michaelwenk

Dockerfile-server

@@ -17,5 +17,4 @@ COPY api/schemas ./cmd/mb3server/swagger-ui/schemas
 COPY entrypoint-mb3server.sh ./cmd/mb3server/entrypoint-mb3server.sh
 
 EXPOSE 8080
-ENTRYPOINT cd cmd/mb3server && sh entrypoint-mb3server.sh "${MB3_API_URL_EXTERNAL}"
-
+ENTRYPOINT cd cmd/mb3server && sh entrypoint-mb3server.sh "${MB3_API_URL}"

charts/massbank3-server/templates/configmap.yaml

@@ -14,4 +14,5 @@ data:
   SIMILARITY_SERVICE_COSINE_HOST: "massbank3-similarity-service-service"
   SIMILARITY_SERVICE_COSINE_PORT: "8080"
   EXPORT_SERVICE_HOST: "massbank3-export-service-service"
-  EXPORT_SERVICE_PORT: "8080"
+  EXPORT_SERVICE_PORT: "8080"
+  MB3_API_URL: "https://{{ .Values.host }}/{{ .Values.pathPrefix }}-api"

compose/docker-compose.yaml

@@ -1,5 +1,6 @@
 services:
   postgres:
+    # platform: linux/amd64
     image: quay.io/massbank/postgres-bingo:v15-bingo-1.26.0
     restart: always
     ports:
@@ -47,9 +48,10 @@ services:
       SIMILARITY_SERVICE_COSINE_PORT: 8080
       EXPORT_SERVICE_HOST: export-service
       EXPORT_SERVICE_PORT: 8080
-      MB3_API_URL_EXTERNAL: ${MB3_API_URL_EXTERNAL}
+      MB3_API_URL: ${MB3_API_URL}
 
   similarity-service:
+    # platform: linux/amd64
     image: quay.io/massbank/massbank3-similarity-service:latest
     restart: always
     #    ports:
@@ -73,6 +75,7 @@ services:
       - similarity-service
 
   export-service:
+    # platform: linux/amd64
     image: quay.io/massbank/massbank3-export-service:latest
     restart: always
     ports:
@@ -88,7 +91,7 @@ services:
       context: ../web-frontend
       dockerfile: Dockerfile-frontend
     environment:
-      MB3_API_URL: "http://${MB3_API_HOST}:${MB3_API_PORT}"
+      MB3_API_URL: "${MB3_API_URL}"
       MB3_API_URL_INTERNAL: "http://${MB3_SERVER_HOST}:${MB3_SERVER_PORT}"
       MB3_FRONTEND_URL: "http://${MB3_FRONTEND_HOST}:${MB3_FRONTEND_PORT}"
       MB3_FRONTEND_BASE_URL: "${MB3_FRONTEND_BASE_URL}"

compose/env.dist

@@ -123,8 +123,8 @@ DISTRIBUTOR_TEXT="This website is hosted and distributed by ..."
 DISTRIBUTOR_URL=""
 
 # ---------------------------
-# API server from external
+# API server (from external)
 # ---------------------------
 
-# The URL of the API server from external
-MB3_API_URL_EXTERNAL=http://${MB3_API_HOST}:${MB3_API_PORT}/v1
+# The URL of the API server (from external)
+MB3_API_URL=http://${MB3_API_HOST}:${MB3_API_PORT}/v1

web-frontend/server.ts

@@ -96,7 +96,7 @@ const buildRecordMetadata = async (_accession: string) => {
 };
 
 async function getLastmodDate() {
-  let url = backendUrlInternal + '/v1/metadata';
+  let url = backendUrlInternal + '/metadata';
   const searchResultMetadata: Metadata | undefined = await fetchData(url);
   const timestampMetadata = searchResultMetadata?.timestamp;
   url = exportServiceUrlInternal + '/version';
@@ -148,7 +148,7 @@ baseRouter.get('/robots.txt', async (req: Request, res: Response) => {
 // serve sitemap index for search engines
 baseRouter.get('/sitemap.xml', async (req: Request, res: Response) => {
   try {
-    const url: string = backendUrlInternal + '/v1/records/count';
+    const url: string = backendUrlInternal + '/records/count';
     const searchResultRecordCount: number | undefined = await fetchData(url);
     const hitsCount: number = searchResultRecordCount
       ? searchResultRecordCount
@@ -217,7 +217,7 @@ baseRouter.get(/\/sitemap_\d+\.xml/, async (req: Request, res: Response) => {
   try {
     const index = Number(req.originalUrl.split('_')[1].split('.')[0]);
 
-    const url = backendUrlInternal + '/v1/records/search';
+    const url = backendUrlInternal + '/records/search';
     const searchResult = (await fetchData(url)) as SearchResult;
     const hits: Hit[] = searchResult.data ? (searchResult.data as Hit[]) : [];
 

web-frontend/src/elements/result/ResultPanel.tsx

@@ -103,7 +103,7 @@ function ResultPanel({
 
       const records: (Record | undefined)[] = [];
       for (const accession of accessions) {
-        const url = backendUrl + '/v1/records/' + accession + '/simple';
+        const url = backendUrl + '/records/' + accession + '/simple';
 
         const record = await fetchData(url);
 

web-frontend/src/elements/routes/pages/about/ServiceStatusView.tsx

@@ -27,7 +27,7 @@ function ServiceStatusView() {
     setIsLoading(true);
 
     try {
-      const response = await axios.get(`${backendUrl}/v1/status`);
+      const response = await axios.get(`${backendUrl}/status`);
       if (response.status === 200) {
         setErrorApi(null);
         const statusResult = response.data as StatusResult;

web-frontend/src/elements/routes/pages/content/ContentView.tsx

@@ -52,11 +52,11 @@ function ContentView() {
 
       let _browseContent: ContentFilterOptions | undefined = formDataContent;
       if (!_browseContent) {
-        const url = backendUrl + '/v1/filter/browse';
+        const url = backendUrl + '/filter/browse';
         _browseContent = (await fetchData(url)) as ContentFilterOptions;
       } else {
         const searchParams = buildSearchParams(_browseContent);
-        const url = backendUrl + '/v1/filter/browse';
+        const url = backendUrl + '/filter/browse';
         _browseContent = (await fetchData(
           url,
           searchParams,
@@ -65,7 +65,7 @@ function ContentView() {
       initFlags(_browseContent);
       setPropertyFilterOptions(_browseContent);
 
-      const url = backendUrl + '/v1/metadata';
+      const url = backendUrl + '/metadata';
       const metadata = (await fetchData(url)) as Metadata;
       setMetadata(metadata);
 
@@ -79,7 +79,7 @@ function ContentView() {
       setIsSearching(true);
 
       const searchParams = buildSearchParams(formDataContent);
-      const url = backendUrl + '/v1/records/search';
+      const url = backendUrl + '/records/search';
       const searchResult = (await fetchData(url, searchParams)) as SearchResult;
 
       let _hits: Hit[] = searchResult.data ? (searchResult.data as Hit[]) : [];

web-frontend/src/elements/routes/pages/search/SearchView.tsx

@@ -65,11 +65,11 @@ function SearchView() {
 
       let _browseContent: ContentFilterOptions | undefined = formDataContent;
       if (!_browseContent) {
-        const url = backendUrl + '/v1/filter/browse';
+        const url = backendUrl + '/filter/browse';
         _browseContent = (await fetchData(url)) as ContentFilterOptions;
       } else {
         const builtSearchParams = buildSearchParams(_browseContent);
-        const url = backendUrl + '/v1/filter/browse';
+        const url = backendUrl + '/filter/browse';
         _browseContent = (await fetchData(
           url,
           builtSearchParams,
@@ -115,7 +115,7 @@ function SearchView() {
         }
       }
 
-      const url = backendUrl + '/v1/records/search';
+      const url = backendUrl + '/records/search';
       const searchResult = (await fetchData(
         url,
         builtSearchParams,

web-frontend/src/utils/request/fetchRecord.ts

@@ -1,7 +1,7 @@
 import fetchData from './fetchData';
 
 async function getRecord(id: string, backendUrl: string) {
-  const url = backendUrl + '/v1/records/' + id;
+  const url = backendUrl + '/records/' + id;
   return await fetchData(url);
 }