Remove unused hub client

plasmabio · Apr 3, 2024 · 8361cb9 · 8361cb9
1 parent e716fd5
commit 8361cb9
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 27 deletions.
diff --git a/src/common/AxiosContext.tsx b/src/common/AxiosContext.tsx
@@ -2,9 +2,8 @@ import { createContext, useContext } from 'react';
 import { AxiosClient } from './axiosclient';
 
 export const AxiosContext = createContext<{
-  hubClient: AxiosClient;
   serviceClient: AxiosClient;
-}>({ hubClient: new AxiosClient({}), serviceClient: new AxiosClient({}) });
+}>({ serviceClient: new AxiosClient({}) });
 
 export const useAxios = () => {
   return useContext(AxiosContext);

diff --git a/src/common/axiosclient.ts b/src/common/axiosclient.ts
@@ -2,8 +2,6 @@ import urlJoin from 'url-join';
 import { encodeUriComponents } from './utils';
 import axios, { AxiosInstance } from 'axios';
 
-export const API_PREFIX = 'api';
-export const SPAWN_PREFIX = 'spawn';
 export class AxiosClient {
   constructor(options: AxiosClient.IOptions) {
     this._baseUrl = options.baseUrl ?? '';
@@ -15,14 +13,13 @@ export class AxiosClient {
 
   async request<T = any>(args: {
     method: 'get' | 'post' | 'put' | 'option' | 'delete';
-    prefix?: 'api' | 'spawn';
     path: string;
     query?: string;
     data?: { [key: string]: any } | FormData;
     params?: { [key: string]: string };
   }): Promise<T> {
     const { method, path, params } = args;
-    const prefix = args.prefix ?? '';
+    const prefix = 'api';
     const data = args.data ?? {};
     let url = urlJoin(prefix, encodeUriComponents(path));
     if (args.query) {

diff --git a/src/environments/App.tsx b/src/environments/App.tsx
@@ -20,12 +20,6 @@ export interface IAppProps {
 export default function App(props: IAppProps) {
   const jhData = useJupyterhub();
 
-  const hubClient = useMemo(() => {
-    const baseUrl = jhData.hubPrefix;
-    const xsrfToken = jhData.xsrfToken;
-    return new AxiosClient({ baseUrl, xsrfToken });
-  }, [jhData]);
-
   const serviceClient = useMemo(() => {
     const baseUrl = jhData.servicePrefix;
     const xsrfToken = jhData.xsrfToken;
@@ -34,7 +28,7 @@ export default function App(props: IAppProps) {
 
   return (
     <ThemeProvider theme={customTheme}>
-      <AxiosContext.Provider value={{ hubClient, serviceClient }}>
+      <AxiosContext.Provider value={{ serviceClient }}>
         <ScopedCssBaseline>
           <Stack sx={{ padding: 1 }} spacing={1}>
             <NewEnvironmentDialog

diff --git a/src/environments/NewEnvironmentDialog.tsx b/src/environments/NewEnvironmentDialog.tsx
@@ -15,7 +15,6 @@ import {
 } from '@mui/material';
 import { Fragment, memo, useCallback, useMemo, useState } from 'react';
 
-import { API_PREFIX } from '../common/axiosclient';
 import { useAxios } from '../common/AxiosContext';
 import { SmallTextField } from '../common/SmallTextField';
 import { ENV_PREFIX } from './types';
@@ -174,7 +173,6 @@ function _NewEnvironmentDialog(props: INewEnvironmentDialogProps) {
             data.password = data.password ?? '';
             const response = await axios.serviceClient.request({
               method: 'post',
-              prefix: API_PREFIX,
               path: ENV_PREFIX,
               data
             });

diff --git a/src/environments/RemoveEnvironmentButton.tsx b/src/environments/RemoveEnvironmentButton.tsx
@@ -5,7 +5,6 @@ import { memo, useCallback } from 'react';
 import { useAxios } from '../common/AxiosContext';
 import { ButtonWithConfirm } from '../common/ButtonWithConfirm';
 import { ENV_PREFIX } from './types';
-import { API_PREFIX } from '../common/axiosclient';
 
 interface IRemoveEnvironmentButton {
   name: string;
@@ -18,7 +17,6 @@ function _RemoveEnvironmentButton(props: IRemoveEnvironmentButton) {
   const removeEnv = useCallback(async () => {
     const response = await axios.serviceClient.request({
       method: 'delete',
-      prefix: API_PREFIX,
       path: ENV_PREFIX,
       data: { name: props.image }
     });

diff --git a/src/servers/App.tsx b/src/servers/App.tsx
@@ -22,12 +22,6 @@ export interface IAppProps {
 export default function App(props: IAppProps) {
   const jhData = useJupyterhub();
 
-  const hubClient = useMemo(() => {
-    const baseUrl = jhData.hubPrefix;
-    const xsrfToken = jhData.xsrfToken;
-    return new AxiosClient({ baseUrl, xsrfToken });
-  }, [jhData]);
-
   const serviceClient = useMemo(() => {
     const baseUrl = jhData.servicePrefix;
     const xsrfToken = jhData.xsrfToken;
@@ -36,7 +30,7 @@ export default function App(props: IAppProps) {
 
   return (
     <ThemeProvider theme={customTheme}>
-      <AxiosContext.Provider value={{ hubClient, serviceClient }}>
+      <AxiosContext.Provider value={{ serviceClient }}>
         <ScopedCssBaseline>
           <Stack sx={{ padding: 1 }} spacing={1}>
             <NewServerDialog

diff --git a/src/servers/NewServerDialog.tsx b/src/servers/NewServerDialog.tsx
@@ -76,7 +76,6 @@ function _NewServerDialog(props: INewServerDialogProps) {
       setLoading(true);
       await axios.serviceClient.request({
         method: 'post',
-        prefix: 'api',
         path: SERVER_PREFIX,
         data
       });

diff --git a/src/servers/OpenServerButton.tsx b/src/servers/OpenServerButton.tsx
@@ -26,7 +26,6 @@ function _OpenServerButton(props: IOpenServerButton) {
     try {
       await axios.serviceClient.request({
         method: 'post',
-        prefix: 'api',
         path: SERVER_PREFIX,
         data
       });

diff --git a/src/servers/RemoveServerButton.tsx b/src/servers/RemoveServerButton.tsx
@@ -19,7 +19,6 @@ function _RemoveServerButton(props: IRemoveServerButton) {
       await axios.serviceClient.request({
         method: 'delete',
         path: SERVER_PREFIX,
-        prefix: 'api',
         data: {
           userName: jhData.user,
           serverName: props.server