Skip to content

Add footer to results table so status is always visible #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 26, 2024
Merged

Add footer to results table so status is always visible #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
102be11
Add footer to results table so status is always visible
davecharron Mar 25, 2024
890803e
Remove ellipses from "More available" message
davecharron Mar 25, 2024
f33b579
Use pre-defined Theme color property
davecharron Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/views/html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ export function getHeader(options: {withCollapsed?: boolean} = {}): string {
top: 0; /* Don't forget this, required for the stickiness */
}

tfoot tr {
background-color: var(--vscode-multiDiffEditor-headerBackground);
text-align: left;
position: sticky; /* Lock the footer row to the bottom so it's always visible as rows are scrolled */
bottom: 0; /* Don't forget this, required for the stickiness */
}

#resultset th,
#resultset td {
padding: 5px 15px;
Expand Down
67 changes: 34 additions & 33 deletions src/views/results/html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,27 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
*/
const vscode = acquireVsCodeApi();
const basicSelect = ${JSON.stringify(basicSelect)};
const htmlTableId = 'resultset';
const statusId = 'status';
const messageSpanId = 'messageSpan';

let myQueryId = '';

let mustLoadHeaders = true;
let needToInitializeTable = true;
let totalRows = 0;
let noMoreRows = false;
let isFetching = false;

window.addEventListener("load", main);
function main() {
let Observer = new IntersectionObserver(function(entries) {
new IntersectionObserver(function(entries) {
// isIntersecting is true when element and viewport are overlapping
// isIntersecting is false when element and viewport don't overlap
if(entries[0].isIntersecting === true) {
if (isFetching === false && noMoreRows === false) {
fetchNextPage();
}
}
}, { threshold: [0] });

Observer.observe(document.getElementById("nextButton"));
}, { threshold: [0] }).observe(document.getElementById(messageSpanId));

window.addEventListener('message', event => {
const data = event.data;
Expand All @@ -85,21 +86,21 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
isFetching = false;
noMoreRows = data.isDone;

if (mustLoadHeaders && event.data.columnList) {
setHeaders('resultset', event.data.columnList);
mustLoadHeaders = false;
if (needToInitializeTable && event.data.columnList) {
initializeTable(event.data.columnList);
needToInitializeTable = false;
}

if (data.rows && data.rows.length > 0) {
totalRows += data.rows.length;
appendRows('resultset', data.rows);
appendRows(data.rows);
}

const nextButton = document.getElementById("nextButton");
if (data.rows === undefined && totalRows === 0) {
nextButton.innerText = 'Query executed with no result set returned. Rows affected: ' + data.update_count;
document.getElementById(messageSpanId).innerText = 'Statement executed with no result set returned. Rows affected: ' + data.update_count;
} else {
nextButton.innerText = noMoreRows ? ('Loaded ' + totalRows + '. End of data') : ('Loaded ' + totalRows + '. Fetching more...');
document.getElementById(statusId).innerText = noMoreRows ? ('Loaded ' + totalRows + '. End of data') : ('Loaded ' + totalRows + '. More available.');
document.getElementById(messageSpanId).style.visibility = "hidden";
}
break;

Expand All @@ -124,27 +125,26 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
document.getElementById("spinnerContent").style.display = 'none';
}

function setHeaders(tableId, columns) {
var tHeadRef = document.getElementById(tableId).getElementsByTagName('thead')[0];
tHeadRef.innerHTML = '';

// Insert a row at the end of table
var newRow = tHeadRef.insertRow();

columns.forEach(colName => {
// Insert a cell at the end of the row
var newCell = newRow.insertCell();

// Append a text node to the cell
var newText = document.createTextNode(colName);
newCell.appendChild(newText);
});
function initializeTable(columns) {
// Initialize the header
var header = document.getElementById(htmlTableId).getElementsByTagName('thead')[0];
header.innerHTML = '';
var headerRow = header.insertRow();
columns.forEach(colName => headerRow.insertCell().appendChild(document.createTextNode(colName)));

// Initialize the footer
var footer = document.getElementById(htmlTableId).getElementsByTagName('tfoot')[0];
footer.innerHTML = '';
var newCell = footer.insertRow().insertCell();
newCell.colSpan = columns.length;
newCell.id = statusId;
newCell.appendChild(document.createTextNode(' '));
}

function appendRows(tableId, arrayOfObjects) {
var tBodyRef = document.getElementById(tableId).getElementsByTagName('tbody')[0];
function appendRows(rows) {
var tBodyRef = document.getElementById(htmlTableId).getElementsByTagName('tbody')[0];

for (const row of arrayOfObjects) {
for (const row of rows) {
// Insert a row at the end of table
var newRow = tBodyRef.insertRow()

Expand All @@ -170,8 +170,9 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
<table id="resultset">
<thead></thead>
<tbody></tbody>
</table>
<p id="nextButton"></p>
<tfoot></tfoot>
</table>
<p id="messageSpan"></p>
<div id="spinnerContent" class="center-screen">
<p id="loadingText">Running statement</p>
<span class="loader"></span>
Expand Down