Open assignment in Jupyter after app is ready

helxplatform · Feb 19, 2024 · 8bd9262 · 8bd9262
1 parent fb74d00
commit 8bd9262
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/contexts/workspaces-context/api.types.ts b/src/contexts/workspaces-context/api.types.ts
@@ -224,6 +224,7 @@ export interface IWorkspacesAPI {
      */
     loginSAMLUNC(): Promise<void>
     loginSAMLGoogle(): Promise<void>
+    loginSAMLGithub(): Promise<void>
     logout(fetchOptions?: AxiosRequestConfig): Promise<LogoutResponse>
     /** May throw a WhitelistRequiredError */
     getActiveUser(fetchOptions?: AxiosRequestConfig): Promise<User|null>

diff --git a/src/views/splash-screen.js b/src/views/splash-screen.js
@@ -85,7 +85,8 @@ export const SplashScreenView = withWorkspaceAuthentication((props) => {
         );
     }
     else {
-        window.location = decoded_url;
+        window.location = decoded_url
+        return null
     }
 
 })
diff --git a/src/views/workspaces/eduhelx-assignment-view.tsx b/src/views/workspaces/eduhelx-assignment-view.tsx
@@ -152,6 +152,13 @@ export const EduhelxAssignmentView = withWorkspaceAuthentication(() => {
         setCurrentStep((currentStep) => currentStep + 1)
     }, [])
 
+    const openJupyter = async () => {
+        if (!app) return
+        const instances = await api.getAppInstances()
+        const appInstance = instances.find(({ aid }) => aid === app.app_id)!
+        window.location.href = appInstance.url
+    }
+
     const steps = useMemo(() => {
         const steps: any[] = [
             {
@@ -170,7 +177,7 @@ export const EduhelxAssignmentView = withWorkspaceAuthentication(() => {
                 key: 2,
                 title: 'Finished',
                 icon: <CheckOutlined />,
-                content: <RedirectingPane done={ () => console.log("Done!") } />
+                content: <RedirectingPane done={ () => openJupyter() } />
             }
         ]
         if (failed) {