correctly get data-api url

yorek · yorek · commit e0c0b7ca67fd · 2025-09-27T11:18:33.000-07:00
diff --git a/client-v2/build/index.html b/client-v2/build/index.html
@@ -12,7 +12,7 @@
     <link rel="apple-touch-icon" href="/MS-icon.png" />
     <link rel="manifest" href="/manifest.json" />
     <title>Azure SQL Samples Search with AI</title>
-    <script type="module" crossorigin src="/assets/index-BejuQtoH.js"></script>
+    <script type="module" crossorigin src="/assets/index-CLifuDVM.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-D93C6ejO.css">
   </head>
   <body>
diff --git a/client-v2/src/middleware/ProxyMiddleware.ts b/client-v2/src/middleware/ProxyMiddleware.ts
diff --git a/client-v2/src/store/slices/SearchSlice.ts b/client-v2/src/store/slices/SearchSlice.ts
@@ -1,5 +1,5 @@
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
-import { HttpClient } from '../../utils/httpClient';
+import { HttpClient, getDataAPIUrl } from '../../utils/httpClient';
 import SearchState from './SearchState';
 import Sample from '../../types/Sample';
 
@@ -8,7 +8,7 @@ const delay = (ms: number | undefined) => new Promise(resolve => setTimeout(reso
 
 // async search total samples
 export const getTotalSamplesAsync = createAsyncThunk<number>('search/getTotalSamples', async () => {
-  const response = await HttpClient.get(`${import.meta.env.VITE_API_URL}countSamples`, {
+  const response = await HttpClient.get(`${getDataAPIUrl()}countSamples`, {
     withCredentials: false,
     headers: {
       'Content-Type': 'application/json',
@@ -20,7 +20,7 @@ export const getTotalSamplesAsync = createAsyncThunk<number>('search/getTotalSam
 
 // async list all samples
 export const getAllSamplesAsync = createAsyncThunk<Sample[]>('search/getAllSamplesAsync', async () => {
-  const response = await HttpClient.get(`${import.meta.env.VITE_API_URL}samples`, {
+  const response = await HttpClient.get(`${getDataAPIUrl()}samples`, {
     withCredentials: false,
     headers: {
       'Content-Type': 'application/json',
@@ -32,7 +32,7 @@ export const getAllSamplesAsync = createAsyncThunk<Sample[]>('search/getAllSampl
 
 // async list latest samples
 export const getLatestSamplesAsync = createAsyncThunk<Sample[]>('search/getLatestSamples', async () => {
-  const response = await HttpClient.get(`${import.meta.env.VITE_API_URL}latestSamples`, {
+  const response = await HttpClient.get(`${getDataAPIUrl()}latestSamples`, {
     withCredentials: false,
     headers: {
       'Content-Type': 'application/json',
@@ -44,7 +44,7 @@ export const getLatestSamplesAsync = createAsyncThunk<Sample[]>('search/getLates
 
 // async search specific samples
 export const searchSamplesAsync = createAsyncThunk<Sample[], string>('search/searchSamplesAsync', async (query: string) => {
-  const response = await HttpClient.get(`${import.meta.env.VITE_API_URL}findSamples?text=${query}`, {
+  const response = await HttpClient.get(`${getDataAPIUrl()}findSamples?text=${query}`, {
     withCredentials: false,
     headers: {
       'Content-Type': 'application/json',
@@ -57,7 +57,7 @@ export const searchSamplesAsync = createAsyncThunk<Sample[], string>('search/sea
 // delete a sample
 export const deleteSampleAsync = createAsyncThunk<number, string>('search/deleteSampleAsync', async (id: string) => {
   await delay(1000).then(async () => { // for better user experience
-    await HttpClient.delete(`${import.meta.env.VITE_API_URL}deleteSample`, {
+    await HttpClient.delete(`${getDataAPIUrl()}deleteSample`, {
       data: { id: id, url: null },
       withCredentials: false,
       headers: {
@@ -72,7 +72,7 @@ export const deleteSampleAsync = createAsyncThunk<number, string>('search/delete
 
 // get the details
 export const getSampleDetailsAsync = createAsyncThunk<Sample, string>('search/getSampleDetailsAsync', async (id: string) => {
-  const response = await HttpClient.post(`${import.meta.env.VITE_API_URL}sampleDetails`, { id: id, url: null }, {
+  const response = await HttpClient.post(`${getDataAPIUrl()}sampleDetails`, { id: id, url: null }, {
     // withCredentials: false,
     headers: {
       'Content-Type': 'application/json',
@@ -85,7 +85,7 @@ export const getSampleDetailsAsync = createAsyncThunk<Sample, string>('search/ge
 
 // create a sample
 export const createSampleAsync = createAsyncThunk<number, string>('search/createSampleAsync', async (payload: string) => {
-  const response = await HttpClient.post(`${import.meta.env.VITE_API_URL}createSample`, { payload: payload }, {
+  const response = await HttpClient.post(`${getDataAPIUrl()}createSample`, { payload: payload }, {
     // withCredentials: false,
     headers: {
       'Content-Type': 'application/json',
diff --git a/client-v2/src/utils/httpClient.ts b/client-v2/src/utils/httpClient.ts
@@ -103,6 +103,13 @@ export class HttpClient {
   }
 }
 
+function getDataAPIUrl() {
+  if (import.meta.env.VITE_API_URL) {
+    return import.meta.env.VITE_API_URL;
+  }
+  return './data-api/rest/';
+}
+
 // Export the retry function for custom use cases
-export { withRetry, DEFAULT_RETRY_CONFIG };
+export { getDataAPIUrl, withRetry, DEFAULT_RETRY_CONFIG };
 export type { RetryConfig };

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,13 @@ export class HttpClient {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
	`106`	`+function getDataAPIUrl() {`
	`107`	`+ if (import.meta.env.VITE_API_URL) {`
	`108`	`+ return import.meta.env.VITE_API_URL;`
	`109`	`+ }`
	`110`	`+ return './data-api/rest/';`
	`111`	`+}`
	`112`	`+`
`106`	`113`	`// Export the retry function for custom use cases`
`107`		`-export { withRetry, DEFAULT_RETRY_CONFIG };`
	`114`	`+export { getDataAPIUrl, withRetry, DEFAULT_RETRY_CONFIG };`
`108`	`115`	`export type { RetryConfig };`