From 19ff0d7e409cd5694f17c143a18b4e49a8e2a1e8 Mon Sep 17 00:00:00 2001 From: dhannywi Date: Tue, 16 Jul 2024 19:09:46 +0000 Subject: [PATCH] remove explicit basePath from ML Hub datasets so it will read basePath implicitly from or deployment url --- lib/tapisui-hooks/src/ml-hub/datasets/basePath.ts | 3 --- lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts | 4 +--- lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts | 4 +--- lib/tapisui-hooks/src/ml-hub/datasets/useList.ts | 4 +--- lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts | 4 +--- lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts | 4 +--- lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts | 4 +--- .../src/ml-hub/datasets/useListBySizeCategory.ts | 4 +--- lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts | 4 +--- lib/tapisui-hooks/src/ml-hub/datasets/useListDownloadLinks.ts | 4 +--- 10 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 lib/tapisui-hooks/src/ml-hub/datasets/basePath.ts diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/basePath.ts b/lib/tapisui-hooks/src/ml-hub/datasets/basePath.ts deleted file mode 100644 index 78c52f51a..000000000 --- a/lib/tapisui-hooks/src/ml-hub/datasets/basePath.ts +++ /dev/null @@ -1,3 +0,0 @@ -const basePath = 'https://hub.pods.tacc.tapis.io'; - -export default basePath; diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts index 6ee758655..65f5a2cbb 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useCardDetails = ( params: Datasets.GetDatasetCardRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.details, params, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts index 79c43101f..268774e2c 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useDetails = ( params: Datasets.GetDatasetRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.details, params, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useList.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useList.ts index 6b493a05f..eac1f285f 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useList.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useList.ts @@ -3,13 +3,11 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useList = ( options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.list, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts index 3becf332b..b46831d82 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useListByAuthor = ( params: Datasets.ListDatasetsByAuthorRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.listByAuthor, params, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts index 6c79b2a45..a1e5340c8 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useListByLanguage = ( params: Datasets.ListDatasetsByLanguageRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.listByLanguage, params, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts index 260e3ad89..feb0910c9 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useListByQuery = ( params: Datasets.ListDatasetsByQueryRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.listByQuery, params, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useListBySizeCategory.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useListBySizeCategory.ts index 46c0161b3..0f5a08222 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useListBySizeCategory.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useListBySizeCategory.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useListBySizeCategory = ( params: Datasets.ListDatasetsBySizeCategoryRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.listBySizeCategory, params, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts index 83aaff42c..00bbadf70 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useListByTask = ( params: Datasets.ListDatasetsByTaskRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.listByTask, params, accessToken], // Default to no token. This will generate a 403 when calling the list function diff --git a/lib/tapisui-hooks/src/ml-hub/datasets/useListDownloadLinks.ts b/lib/tapisui-hooks/src/ml-hub/datasets/useListDownloadLinks.ts index 45f199f72..0f978064b 100644 --- a/lib/tapisui-hooks/src/ml-hub/datasets/useListDownloadLinks.ts +++ b/lib/tapisui-hooks/src/ml-hub/datasets/useListDownloadLinks.ts @@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api'; import { Datasets } from '@tapis/tapis-typescript'; import { useTapisConfig } from '../../'; import QueryKeys from './queryKeys'; -import basePath from './basePath'; // remove if ml-hub is listed in NGINX const useListDownloadLinks = ( params: Datasets.DownloadDatasetRequest, options: QueryObserverOptions = {} ) => { - // const { accessToken, basePath } = useTapisConfig(); - const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX + const { accessToken, basePath } = useTapisConfig(); const result = useQuery( [QueryKeys.listDownloadLinks, params, accessToken], // Default to no token. This will generate a 403 when calling the list function