Use Node config to disable delete session on UI

Author: VietND96

java/src/org/openqa/selenium/grid/node/config/NodeFlags.java

@@ -19,6 +19,7 @@
 
 import static org.openqa.selenium.grid.config.StandardGridRoles.NODE_ROLE;
 import static org.openqa.selenium.grid.node.config.NodeOptions.DEFAULT_CONNECTION_LIMIT;
+import static org.openqa.selenium.grid.node.config.NodeOptions.DEFAULT_DELETE_SESSION_ON_UI;
 import static org.openqa.selenium.grid.node.config.NodeOptions.DEFAULT_DETECT_DRIVERS;
 import static org.openqa.selenium.grid.node.config.NodeOptions.DEFAULT_DRAIN_AFTER_SESSION_COUNT;
 import static org.openqa.selenium.grid.node.config.NodeOptions.DEFAULT_ENABLE_BIDI;
@@ -241,6 +242,13 @@ public class NodeFlags implements HasRoles {
   @ConfigValue(section = NODE_SECTION, name = "drain-after-session-count", example = "1")
   public int drainAfterSessionCount = DEFAULT_DRAIN_AFTER_SESSION_COUNT;
 
+  @Parameter(
+      names = {"--delete-session-on-ui"},
+      arity = 1,
+      description = "Enable capability to support deleting session on Grid UI. True by default")
+  @ConfigValue(section = NODE_SECTION, name = "delete-session-on-ui", example = "true")
+  public Boolean deleteSessionOnUi = DEFAULT_DELETE_SESSION_ON_UI;
+
   @Parameter(
       names = {"--enable-cdp"},
       arity = 1,

java/src/org/openqa/selenium/grid/node/config/NodeOptions.java

@@ -77,6 +77,7 @@ public class NodeOptions {
   public static final int DEFAULT_SESSION_TIMEOUT = 300;
   public static final int DEFAULT_DRAIN_AFTER_SESSION_COUNT = 0;
   public static final int DEFAULT_CONNECTION_LIMIT = 10;
+  public static final boolean DEFAULT_DELETE_SESSION_ON_UI = true;
   public static final boolean DEFAULT_ENABLE_CDP = true;
   public static final boolean DEFAULT_ENABLE_BIDI = true;
   static final String NODE_SECTION = "node";
@@ -303,6 +304,13 @@ public int getDrainAfterSessionCount() {
         DEFAULT_DRAIN_AFTER_SESSION_COUNT);
   }
 
+  @VisibleForTesting
+  boolean isSessionDeletedOnUi() {
+    return config
+        .getBool(NODE_SECTION, "delete-session-on-ui")
+        .orElse(DEFAULT_DELETE_SESSION_ON_UI);
+  }
+
   @VisibleForTesting
   boolean isVncEnabled() {
     List<String> vncEnvVars = DEFAULT_VNC_ENV_VARS;
@@ -750,6 +758,10 @@ public Capabilities enhanceStereotype(Capabilities capabilities) {
               .setCapability("se:vncEnabled", true)
               .setCapability("se:noVncPort", noVncPort());
     }
+    if (isSessionDeletedOnUi()) {
+      capabilities =
+          new PersistentCapabilities(capabilities).setCapability("se:deleteSessionOnUi", true);
+    }
     if (isManagedDownloadsEnabled() && canConfigureDownloadsDir(capabilities)) {
       capabilities = new PersistentCapabilities(capabilities).setCapability(ENABLE_DOWNLOADS, true);
     }

javascript/grid-ui/src/components/RunningSessions/RunningSessions.tsx

@@ -301,9 +301,6 @@ function RunningSessions (props) {
         } else {
           setRowOpen('')
         }
-      } else if (response.status === 403) {
-        setFeedbackMessage('Session deletion is blocked by configuration')
-        setFeedbackSeverity('error')
       } else {
         setFeedbackMessage('Failed to delete session')
         setFeedbackSeverity('error')
@@ -377,6 +374,15 @@ function RunningSessions (props) {
     }
   }
 
+  const hasDeleteSessionCapability = (capabilitiesStr: string): boolean => {
+    try {
+      const capabilities = JSON.parse(capabilitiesStr as string)
+      return capabilities['se:deleteSessionOnUi'] === true
+    } catch (e) {
+      return false
+    }
+  }
+
   const rows = sessions.map((session) => {
     const sessionData = createSessionData(
       session.id,
@@ -614,14 +620,16 @@ function RunningSessions (props) {
                                 </Typography>
                               </DialogContent>
                               <DialogActions>
-                                <Button
-                                  onClick={() => handleDeleteConfirmation(row.id as string, 'info')}
-                                  color='error'
-                                  variant='contained'
-                                  sx={{ marginRight: 1 }}
-                                >
-                                  Delete
-                                </Button>
+                                {hasDeleteSessionCapability(row.capabilities as string) && (
+                                  <Button
+                                    onClick={() => handleDeleteConfirmation(row.id as string, 'info')}
+                                    color='error'
+                                    variant='contained'
+                                    sx={{ marginRight: 1 }}
+                                  >
+                                    Delete
+                                  </Button>
+                                )}
                                 <Button
                                   onClick={() => setRowOpen('')}
                                   color='primary'
@@ -689,9 +697,6 @@ function RunningSessions (props) {
           <Typography>
             Are you sure you want to delete this session? This action cannot be undone.
           </Typography>
-          <Typography variant="body2" color="text.secondary" sx={{ mt: 2, fontStyle: 'italic' }}>
-            Hint: Set config `--blocked-delete-session` when starting Router/Hub to block deletion of any session.
-          </Typography>
         </DialogContent>
         <DialogActions>
           <Button

javascript/grid-ui/src/tests/components/RunningSessions.test.tsx

@@ -101,6 +101,7 @@ const sessionWithWebSocketUrl: SessionInfo = {
     "se:cdp": "ws://localhost:4444/selenium/session/2103faaea8600e41a1e86f4189779e66/se/cdp",
     "se:cdpVersion": "136.0.7103.113",
     "se:containerName": "0ca4ada66da5",
+    "se:deleteSessionOnUi": true,
     "se:downloadsEnabled": true,
     "se:gridWebSocketUrl": "ws://localhost:4444/selenium/session/2103faaea8600e41a1e86f4189779e66",
     "se:noVncPort": 7900,
@@ -139,7 +140,8 @@ const sessionWithoutWebSocketUrl: SessionInfo = {
   capabilities: JSON.stringify({
     "browserName": "chrome",
     "browserVersion": "88.0.4324.182",
-    "platformName": "windows"
+    "platformName": "windows",
+    "se:deleteSessionOnUi": true
   }),
   startTime: '27/05/2025 13:13:05',
   uri: 'http://localhost:4444',
@@ -286,7 +288,7 @@ describe('Session deletion functionality', () => {
     expect(screen.getByText('Are you sure you want to delete this session? This action cannot be undone.')).toBeInTheDocument()
 
     expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: /delete/i, exact: true })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /delete/i })).toBeInTheDocument()
   })
 
   it('uses window.location.origin for URL construction with se:gridWebSocketUrl', async () => {
@@ -302,7 +304,7 @@ describe('Session deletion functionality', () => {
     const deleteButton = screen.getByRole('button', { name: /delete/i })
     await user.click(deleteButton)
 
-    const confirmButton = screen.getByRole('button', { name: /delete/i, exact: true })
+    const confirmButton = screen.getByRole('button', { name: /delete/i })
     await user.click(confirmButton)
 
     expect(global.fetch).toHaveBeenCalledWith(
@@ -329,7 +331,7 @@ describe('Session deletion functionality', () => {
     const deleteButton = screen.getByRole('button', { name: /delete/i })
     await user.click(deleteButton)
 
-    const confirmButton = screen.getByRole('button', { name: /delete/i, exact: true })
+    const confirmButton = screen.getByRole('button', { name: /delete/i })
     await user.click(confirmButton)
 
     const expectedUrl = window.location.href.split('/ui')[0] + '/session/' + sessionWithoutWsData.id
@@ -358,7 +360,7 @@ describe('Session deletion functionality', () => {
     const deleteButton = screen.getByRole('button', { name: /delete/i })
     await user.click(deleteButton)
 
-    const confirmButton = screen.getByRole('button', { name: /delete/i, exact: true })
+    const confirmButton = screen.getByRole('button', { name: /delete/i })
     await user.click(confirmButton)
 
     await waitFor(() => {
@@ -389,4 +391,24 @@ describe('Session deletion functionality', () => {
 
     expect(global.fetch).not.toHaveBeenCalled()
   })
+
+  it('does not show delete button when session does not have se:deleteSessionOnUi capability', async () => {
+    const sessionWithoutDeleteCapability = {
+      ...sessionWithWsData,
+      capabilities: JSON.stringify({
+        "browserName": "chrome",
+        "browserVersion": "136.0.7103.113",
+        "platformName": "linux"
+      })
+    }
+
+    render(<RunningSessions sessions={[sessionWithoutDeleteCapability]} origin={origin} />)
+
+    const user = userEvent.setup()
+    const sessionRow = screen.getByText(sessionWithoutDeleteCapability.id).closest('tr')
+
+    await user.click(within(sessionRow as HTMLElement).getByTestId('InfoIcon'))
+
+    expect(screen.queryByRole('button', { name: /delete/i })).not.toBeInTheDocument()
+  })
 })