github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Better handling of errors for count all button, refs #2408

Browse source
This commit is contained in:
Simon Willison 2024-08-21 19:56:02 -07:00
commit dc288056b8
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
datasette/templates/table.html
View file

@ -42,7 +42,7 @@
{% if count or human_description_en %} {% if count or human_description_en %}
<h3> <h3>
{% if count == count_limit + 1 %}&gt;{{ "{:,}".format(count_limit) }} rows {% if count == count_limit + 1 %}&gt;{{ "{:,}".format(count_limit) }} rows
{% if allow_execute_sql and query.sql %} <a class="count-sql" style="font-size: 0.8em; padding-left: 0.5em" href="{{ urls.database_query(database, count_sql) }}">count all rows</a>{% endif %} {% if allow_execute_sql and query.sql %} <a class="count-sql" style="font-size: 0.8em;" href="{{ urls.database_query(database, count_sql) }}">count all</a>{% endif %}
{% elif count or count == 0 %}{{ "{:,}".format(count) }} row{% if count == 1 %}{% else %}s{% endif %}{% endif %} {% elif count or count == 0 %}{{ "{:,}".format(count) }} row{% if count == 1 %}{% else %}s{% endif %}{% endif %}
{% if human_description_en %}{{ human_description_en }}{% endif %} {% if human_description_en %}{{ human_description_en }}{% endif %}
</h3> </h3>
@ -180,7 +180,7 @@
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const countLink = document.querySelector('a.count-sql'); const countLink = document.querySelector('a.count-sql');
if (countLink) { if (countLink) {
countLink.addEventListener('click', function(ev) { countLink.addEventListener('click', async function(ev) {
ev.preventDefault(); ev.preventDefault();
// Replace countLink with span with same style attribute // Replace countLink with span with same style attribute
const span = document.createElement('span'); const span = document.createElement('span');
@ -189,14 +189,23 @@ document.addEventListener('DOMContentLoaded', function() {
countLink.replaceWith(span); countLink.replaceWith(span);
countLink.setAttribute('disabled', 'disabled'); countLink.setAttribute('disabled', 'disabled');
let url = countLink.href.replace(/(\?|$)/, '.json$1'); let url = countLink.href.replace(/(\?|$)/, '.json$1');
fetch(url) try {
.then(response => response.json()) const response = await fetch(url);
.then(data => { console.log({response});
const count = data['rows'][0]['count(*)']; const data = await response.json();
const formattedCount = count.toLocaleString(); console.log({data});
span.closest('h3').textContent = formattedCount + ' rows'; if (!response.ok) {
}) console.log('throw error');
.catch(error => countLink.textContent = 'error'); throw new Error(data.title || data.error);
}
const count = data['rows'][0]['count(*)'];
const formattedCount = count.toLocaleString();
span.closest('h3').textContent = formattedCount + ' rows';
} catch (error) {
console.log('Update', span, 'with error message', error);
span.textContent = error.message;
span.style.color = 'red';
}
}); });
} }
}); });