Skip to content

Commit

Permalink
remove explicit basePath from ML Hub datasets so it will read basePat…
Browse files Browse the repository at this point in the history
…h implicitly from or deployment url
  • Loading branch information
dhannywi committed Jul 16, 2024
1 parent 6bd3ec5 commit 19ff0d7
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 30 deletions.
3 changes: 0 additions & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/basePath.ts

This file was deleted.

4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetCard, Error> = {}
) => {
// 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<Datasets.RespDatasetCard, Error>(
[QueryKeys.details, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDataset, Error> = {}
) => {
// 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<Datasets.RespDataset, Error>(
[QueryKeys.details, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetsObject, Error> = {}
) => {
// 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<Datasets.RespDatasetsObject, Error>(
[QueryKeys.list, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetsObject, Error> = {}
) => {
// 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<Datasets.RespDatasetsObject, Error>(
[QueryKeys.listByAuthor, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetsObject, Error> = {}
) => {
// 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<Datasets.RespDatasetsObject, Error>(
[QueryKeys.listByLanguage, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetsObject, Error> = {}
) => {
// 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<Datasets.RespDatasetsObject, Error>(
[QueryKeys.listByQuery, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetsObject, Error> = {}
) => {
// 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<Datasets.RespDatasetsObject, Error>(
[QueryKeys.listBySizeCategory, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetsObject, Error> = {}
) => {
// 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<Datasets.RespDatasetsObject, Error>(
[QueryKeys.listByTask, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Datasets.RespDatasetDownload, Error> = {}
) => {
// 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<Datasets.RespDatasetDownload, Error>(
[QueryKeys.listDownloadLinks, params, accessToken],
// Default to no token. This will generate a 403 when calling the list function
Expand Down

0 comments on commit 19ff0d7

Please sign in to comment.