[grid] Respecting page origin for Live View

Fixes #9980
SeleniumHQ · Nov 5, 2021 · ca9b451 · ca9b451
1 parent e04552f
commit ca9b451
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/javascript/grid-ui/src/components/RunningSessions/RunningSessions.tsx b/javascript/grid-ui/src/components/RunningSessions/RunningSessions.tsx
@@ -78,13 +78,23 @@ function createSessionData (
   nodeId: string,
   nodeUri: string,
   sessionDurationMillis: number,
-  slot: any
+  slot: any,
+  hostname: string
 ): SessionData {
   const parsed = JSON.parse(capabilities) as Capabilities
   const browserName = parsed.browserName
   const browserVersion = parsed.browserVersion ?? parsed.version
   const platformName = parsed.platformName ?? parsed.platform
-  const vnc: string = parsed['se:vnc'] ?? ''
+  let vnc: string = parsed['se:vnc'] ?? ''
+  if (vnc.length > 0) {
+    try {
+      const url = new URL(vnc)
+      url.hostname = hostname
+      vnc = url.href
+    } catch (error) {
+      console.log(error)
+    }
+  }
   const name: string = parsed['se:name'] ?? id
   return {
     id,
@@ -242,6 +252,7 @@ const useStyles = (theme: Theme): StyleRules => createStyles(
 
 interface RunningSessionsProps {
   sessions: SessionData[]
+  hostname: string
   classes: any
 }
 
@@ -362,8 +373,16 @@ class RunningSessions extends React.Component<RunningSessionsProps, RunningSessi
   }
 
   render (): ReactNode {
-    const { sessions, classes } = this.props
-    const { dense, order, orderBy, page, rowOpen, rowLiveViewOpen, rowsPerPage } = this.state
+    const { sessions, hostname, classes } = this.props
+    const {
+      dense,
+      order,
+      orderBy,
+      page,
+      rowOpen,
+      rowLiveViewOpen,
+      rowsPerPage
+    } = this.state
 
     const rows = sessions.map((session) => {
       return createSessionData(
@@ -374,7 +393,8 @@ class RunningSessions extends React.Component<RunningSessionsProps, RunningSessi
         session.nodeId,
         session.nodeUri,
         session.sessionDurationMillis,
-        session.slot
+        session.slot,
+        hostname
       )
     })
     const emptyRows = rowsPerPage - Math.min(rowsPerPage, rows.length - page * rowsPerPage)

diff --git a/javascript/grid-ui/src/screens/Sessions/Sessions.tsx b/javascript/grid-ui/src/screens/Sessions/Sessions.tsx
@@ -117,8 +117,12 @@ class Sessions extends React.Component<SessionsProps, SessionsState> {
 
     return (
       <Grid container spacing={3}>
-        <RunningSessions sessions={data.sessionsInfo.sessions} />
-        <QueuedSessions sessionQueueRequests={data.sessionsInfo.sessionQueueRequests} />
+        <RunningSessions
+          sessions={data.sessionsInfo.sessions}
+          hostname={window.location.hostname}
+        />
+        <QueuedSessions
+          sessionQueueRequests={data.sessionsInfo.sessionQueueRequests}/>
       </Grid>
     )
   }