web: display WS/WSS as method

mhils · mhils · commit a0e04a783304 · 2022-03-19T14:44:02.000+01:00
diff --git a/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowColumnsSpec.tsx.snap b/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowColumnsSpec.tsx.snap
@@ -177,7 +177,7 @@ exports[`should render columns: method 1`] = `
         <td
           class="col-method"
         >
-          GET
+          WSS
         </td>
       </tr>
     </tbody>
diff --git a/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowRowSpec.tsx.snap b/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowRowSpec.tsx.snap
@@ -34,7 +34,7 @@ exports[`FlowRow 1`] = `
         <td
           class="col-method"
         >
-          GET
+          WSS
         </td>
         <td
           class="col-status"
diff --git a/web/src/js/components/FlowTable/FlowColumns.tsx b/web/src/js/components/FlowTable/FlowColumns.tsx
@@ -107,8 +107,18 @@ path.headerName = 'Path'
 path.sortKey = flow => mainPath(flow)
 
 export const method: FlowColumn = ({flow}) => {
+    let method;
+    if(flow.type === "http") {
+        if(flow.websocket) {
+            method = flow.client_conn.tls_established ? "WSS" : "WS";
+        } else {
+            method = flow.request.method;
+        }
+    } else {
+        method = flow.type.toUpperCase();
+    }
     return (
-        <td className="col-method">{flow.type === "http" ? flow.request.method : flow.type.toUpperCase()}</td>
+        <td className="col-method">{method}</td>
     )
 };
 method.headerName = 'Method'

Original file line number	Diff line number	Diff line change
@@ -177,7 +177,7 @@ exports[`should render columns: method 1`] = `
`177`	`177`	`<td`
`178`	`178`	`class="col-method"`
`179`	`179`	`>`
`180`		`- GET`
	`180`	`+ WSS`
`181`	`181`	`</td>`
`182`	`182`	`</tr>`
`183`	`183`	`</tbody>`