Skip to content

Commit 5b845a6

Browse files
Extract table of sessions and links
1 parent 86bf3e1 commit 5b845a6

File tree

4 files changed

+28
-17
lines changed

4 files changed

+28
-17
lines changed

deps/rabbitmq_management/priv/www/js/tmpl/sessions-list.ejs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% if (sessions.length > 0) { %>
2-
<table class="list">
2+
<table class="list" id="sessions">
33
<thead>
44
<tr>
55
<th>Channel number</th>
@@ -18,7 +18,7 @@
1818
for (var i = 0; i < sessions.length; i++) {
1919
var session = sessions[i];
2020
%>
21-
<tr>
21+
<tr class="session">
2222
<td class="c"><%= fmt_string(session.channel_number) %></td>
2323
<td class="c"><%= fmt_string(session.handle_max) %></td>
2424
<td class="c"><%= fmt_string(session.next_incoming_id) %></td>
@@ -30,9 +30,9 @@
3030
</tr>
3131
<% if (session.incoming_links.length > 0) { %>
3232
<tr>
33-
<td colspan="8">
33+
<td colspan="8" >
3434
<p>Incoming Links (<%=(session.incoming_links.length)%>) <span class="help" id="incoming-links"></span></p>
35-
<table class="list">
35+
<table class="list" id="incoming-links">
3636
<thead>
3737
<tr>
3838
<th>Link handle</th>
@@ -50,7 +50,7 @@
5050
for (var j = 0; j < session.incoming_links.length; j++) {
5151
var in_link = session.incoming_links[j];
5252
%>
53-
<tr>
53+
<tr class="link">
5454
<td class="c"><%= fmt_string(in_link.handle) %></td>
5555
<td class="c"><%= fmt_string(in_link.link_name) %></td>
5656
<td class="c"><%= fmt_string(in_link.target_address) %></td>
@@ -68,9 +68,9 @@
6868
<% } %>
6969
<% if (session.outgoing_links.length > 0) { %>
7070
<tr>
71-
<td colspan="8">
71+
<td colspan="8" >
7272
<p>Outgoing Links (<%=(session.outgoing_links.length)%>) <span class="help" id="outgoing-links"></span></p>
73-
<table class="list">
73+
<table class="list" id="outgoing-links">
7474
<thead>
7575
<tr>
7676
<th>Link handle</th>
@@ -88,7 +88,7 @@
8888
for (var k = 0; k < session.outgoing_links.length; k++) {
8989
var out_link = session.outgoing_links[k];
9090
%>
91-
<tr>
91+
<tr class="link">
9292
<td class="c"><%= fmt_string(out_link.handle) %></td>
9393
<td class="c"><%= fmt_string(out_link.link_name) %></td>
9494
<td class="c"><%= fmt_string(out_link.source_address) %></td>

selenium/test/connections/amqp10/sessions-for-monitoring-user.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,19 @@ describe('Given an amqp10 connection opened, listed and clicked on it', function
5959
connections_table = await connectionsPage.getConnectionsTable(20)
6060
assert.equal(1, connections_table.length)
6161
await connectionsPage.clickOnConnection(2)
62-
console.log("clicked on connection")
6362
await connectionPage.isLoaded()
6463
})
6564

6665

6766
it('can list session information', async function () {
68-
let session_table = await connectionPage.list_sessions()
69-
console.log("sessions " + session_table)
67+
let a = await connectionPage.list_sessions()
68+
console.log(a.length + " sessions")
69+
for(var i = 0; i < a.length; i++) {
70+
console.log(a[i].length + " columns " + a[i])
71+
for(var z = 0; z < a[i].length; z++) {
72+
console.log(a[i][z]);
73+
}
74+
}
7075
})
7176

7277
it('can list link information', async function () {

selenium/test/pageobjects/BasePage.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,10 @@ module.exports = class BasePage {
125125
}
126126

127127

128-
async getTable(locator, firstNColumns) {
129-
const table = await this.waitForDisplayed(locator)
130-
const rows = await table.findElements(By.css('tbody tr'))
128+
async getTable(tableLocator, firstNColumns, rowClass) {
129+
const table = await this.waitForDisplayed(tableLocator)
130+
const rows = await table.findElements(rowClass == undefined ?
131+
By.css('tbody tr') : By.css('tbody tr.' + rowClass))
131132
let table_model = []
132133
for (let row of rows) {
133134
let columns = await row.findElements(By.css('td'))

selenium/test/pageobjects/ConnectionPage.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ const BasePage = require('./BasePage')
55

66
const OVERVIEW_SECTION = By.css('div#main div.section#connection-overview-section')
77
const SESSIONS_SECTION = By.css('div#main div.section#connection-sessions-section')
8-
const SESSIONS_TABLE = By.css('div.section#connection-sessions-section table.list')
8+
const SESSIONS_TABLE = By.css('div.section#connection-sessions-section table.list#sessions')
9+
const INCOMING_LINKS_TABLE = By.css('div.section#connection-sessions-section table.list#incoming-links')
10+
const OUTCOMING_LINKS_TABLE = By.css('div.section#connection-sessions-section table.list#outgoing-links')
911
const CONNECTION_NAME = By.css('div#main h2')
1012

1113

@@ -17,8 +19,11 @@ module.exports = class ConnectionPage extends BasePage {
1719
return this.getText(CONNECTION_NAME)
1820
}
1921
async list_sessions() {
20-
// maybe ensure the section is expanded
2122
await this.waitForDisplayed(SESSIONS_SECTION)
22-
return this.getTable(SESSIONS_TABLE)
23+
return {
24+
sessions : await this.getTable(SESSIONS_TABLE, 100, "session"),
25+
incoming_links : await this.getTable(INCOMING_LINKS_TABLE, 100, "link"),
26+
outgoing_links : await this.getTable(OUTCOMING_LINKS_TABLE, 100, "link")
27+
}
2328
}
2429
}

0 commit comments

Comments
 (0)