Lint code

plasmabio · Jan 18, 2024 · 8debc9a · 8debc9a
1 parent 11b2ad1
commit 8debc9a
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 51 deletions.
diff --git a/frontend/src/environments/main.tsx b/frontend/src/environments/main.tsx
@@ -4,33 +4,36 @@ import '@fontsource/roboto/500.css';
 import '@fontsource/roboto/700.css';
 
 import { createRoot } from 'react-dom/client';
+
 import { JupyterhubContext } from '../common/JupyterhubContext';
 import App, { IAppProps } from './App';
 
 const rootElement = document.getElementById('environments-root');
-const root = createRoot(rootElement!);
-const dataElement = document.getElementById('tljh-page-data');
-let configData: IAppProps = {
-  images: [],
-  default_cpu_limit: '2',
-  default_mem_limit: '2G'
-};
-if (dataElement) {
-  configData = JSON.parse(dataElement.textContent || '') as IAppProps;
-}
-const jhData = (window as any).jhdata;
-const { base_url, xsrf_token, user, prefix, admin_access } = jhData;
+if (rootElement) {
+  const root = createRoot(rootElement);
+  const dataElement = document.getElementById('tljh-page-data');
+  let configData: IAppProps = {
+    images: [],
+    default_cpu_limit: '2',
+    default_mem_limit: '2G'
+  };
+  if (dataElement) {
+    configData = JSON.parse(dataElement.textContent || '') as IAppProps;
+  }
+  const jhData = (window as any).jhdata;
+  const { base_url, xsrf_token, user, prefix, admin_access } = jhData;
 
-root.render(
-  <JupyterhubContext.Provider
-    value={{
-      baseUrl: base_url,
-      xsrfToken: xsrf_token,
-      user,
-      prefix,
-      adminAccess: admin_access
-    }}
-  >
-    <App {...configData} />
-  </JupyterhubContext.Provider>
-);
+  root.render(
+    <JupyterhubContext.Provider
+      value={{
+        baseUrl: base_url,
+        xsrfToken: xsrf_token,
+        user,
+        prefix,
+        adminAccess: admin_access
+      }}
+    >
+      <App {...configData} />
+    </JupyterhubContext.Provider>
+  );
+}
diff --git a/frontend/src/servers/OpenServerButton.tsx b/frontend/src/servers/OpenServerButton.tsx
@@ -43,7 +43,7 @@ function _OpenServerButton(props: IOpenServerButton) {
 
       setProgress(data.progress ?? 0);
     };
-  }, [jhData, setProgress]);
+  }, [jhData, setProgress, props.serverName]);
 
   return (
     <Fragment>

diff --git a/frontend/src/servers/main.tsx b/frontend/src/servers/main.tsx
@@ -9,30 +9,33 @@ import { JupyterhubContext } from '../common/JupyterhubContext';
 import App, { IAppProps } from './App';
 
 const rootElement = document.getElementById('servers-root');
-const root = createRoot(rootElement!);
 
-const dataElement = document.getElementById('tljh-page-data');
-let configData: IAppProps = {
-  images: [],
-  server_data: [],
-  allow_named_servers: false,
-  named_server_limit_per_user: 0
-};
-if (dataElement) {
-  configData = JSON.parse(dataElement.textContent || '') as IAppProps;
+if (rootElement) {
+  const root = createRoot(rootElement);
+
+  const dataElement = document.getElementById('tljh-page-data');
+  let configData: IAppProps = {
+    images: [],
+    server_data: [],
+    allow_named_servers: false,
+    named_server_limit_per_user: 0
+  };
+  if (dataElement) {
+    configData = JSON.parse(dataElement.textContent || '') as IAppProps;
+  }
+  const jhData = (window as any).jhdata;
+  const { base_url, xsrf_token, user, prefix, admin_access } = jhData;
+  root.render(
+    <JupyterhubContext.Provider
+      value={{
+        baseUrl: base_url,
+        xsrfToken: xsrf_token,
+        user,
+        prefix,
+        adminAccess: admin_access
+      }}
+    >
+      <App {...configData} />
+    </JupyterhubContext.Provider>
+  );
 }
-const jhData = (window as any).jhdata;
-const { base_url, xsrf_token, user, prefix, admin_access } = jhData;
-root.render(
-  <JupyterhubContext.Provider
-    value={{
-      baseUrl: base_url,
-      xsrfToken: xsrf_token,
-      user,
-      prefix,
-      adminAccess: admin_access
-    }}
-  >
-    <App {...configData} />
-  </JupyterhubContext.Provider>
-);