[grid] Refining the UI configuration to allow sub paths work properly.

diemol · diemol · commit a1430636faa3 · 2023-04-19T23:58:21.000+02:00
Fixes #11647
diff --git a/java/test/org/openqa/selenium/grid/gridui/OverallGridTest.java b/java/test/org/openqa/selenium/grid/gridui/OverallGridTest.java
@@ -81,7 +81,7 @@ public void tearDown() {
 
   @Test
   void shouldReportConcurrencyZeroPercentWhenGridIsStartedWithoutLoad() {
-    driver.get(whereIs(server, "/ui/index.html#/sessions"));
+    driver.get(whereIs(server, "/ui#/sessions"));
 
     WebElement concurrency = wait
       .until(visibilityOfElementLocated(By.cssSelector("div[data-testid='concurrency-usage']")));
@@ -91,7 +91,7 @@ void shouldReportConcurrencyZeroPercentWhenGridIsStartedWithoutLoad() {
 
   @Test
   void shouldShowOneNodeRegistered() {
-    driver.get(whereIs(server, "/ui/index.html#"));
+    driver.get(whereIs(server, "/ui"));
 
     List<WebElement> nodeInfoIcons = wait
       .until(visibilityOfAllElementsLocatedBy(By.cssSelector("button[data-testid*='node-info-']")));
@@ -102,7 +102,7 @@ void shouldShowOneNodeRegistered() {
   @Test
   void shouldIncrementSessionCountWhenSessionStarts() {
     remoteWebDriver = new RemoteWebDriver(server.getUrl(), Browser.detect().getCapabilities());
-    driver.get(whereIs(server, "/ui/index.html#/sessions"));
+    driver.get(whereIs(server, "/ui#/sessions"));
 
     wait.until(textToBe(By.cssSelector("div[data-testid='session-count']"), "1"));
   }
diff --git a/javascript/grid-ui/package.json b/javascript/grid-ui/package.json
@@ -35,7 +35,7 @@
     "lint": "ts-standard && eslint --ext '.js,.ts,.tsx' src",
     "lint-fix": "ts-standard --fix && eslint --ext '.js,.ts,.tsx' src"
   },
-  "homepage": "/ui",
+  "homepage": "./ui",
   "browserslist": {
     "production": [
       ">0.2%",
diff --git a/javascript/grid-ui/src/config.ts b/javascript/grid-ui/src/config.ts
@@ -9,5 +9,5 @@ export const GridConfig = {
   serverUri:
     process.env.NODE_ENV === 'development'
       ? 'http://localhost:4444/graphql'
-      : document.location.protocol + '//' + document.location.host + '/graphql'
+      : document.location.protocol + '//' + document.location.host + document.location.pathname.replace("/ui", "") + '/graphql'
 }

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ export const GridConfig = {`
`9`	`9`	`serverUri:`
`10`	`10`	`process.env.NODE_ENV === 'development'`
`11`	`11`	`? 'http://localhost:4444/graphql'`
`12`		`- : document.location.protocol + '//' + document.location.host + '/graphql'`
	`12`	`+ : document.location.protocol + '//' + document.location.host + document.location.pathname.replace("/ui", "") + '/graphql'`
`13`	`13`	`}`