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

Show enabled facets in flexbox columns, refs #255

Browse source
This commit is contained in:
Simon Willison 2018-05-15 22:06:05 -07:00 • committed by Simon Willison
commit 91bf5f56bb
3 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
datasette/static/app.css
View file

@ -231,3 +231,22 @@ a.not-underlined {
.not-underlined .underlined { .not-underlined .underlined {
text-decoration: underline; text-decoration: underline;
} }
.facet-results {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.facet-info {
width: 250px;
margin-right: 20px;
}
.facet-info li,
.facet-info ul {
margin: 0;
padding: 0;
}
.facet-info ul {
padding-left: 1.25em;
margin-bottom: 1em;
}

26
datasette/templates/table.html
View file

@ -98,17 +98,23 @@
<p>Suggested facets: {% for facet in suggested_facets %}<a href="{{ facet.toggle_url }}">{{ facet.name }}</a>{% if not loop.last %}, {% endif %}{% endfor %} <p>Suggested facets: {% for facet in suggested_facets %}<a href="{{ facet.toggle_url }}">{{ facet.name }}</a>{% if not loop.last %}, {% endif %}{% endfor %}
{% endif %} {% endif %}
{% for facet_name, facet_info in facet_results.items() %} {% if facet_results %}
<p><strong><a href="{{ path_with_removed_args(request, {'_facet': facet_name}) }}">{{ facet_name }}</a></strong></p> <div class="facet-results">
<ul> {% for facet_info in sorted_facet_results %}
{% for facet_value in facet_info.results %} <div class="facet-info facet-{{ database|to_css_class }}-{{ table|to_css_class }}-{{ facet_info.name|to_css_class }}">
<li><a href="{{ facet_value.toggle_url }}">{{ facet_value.label }}</a> {{ "{:,}".format(facet_value.count) }}</li> <p><strong>{{ facet_info.name }}</strong> (<a href="{{ path_with_removed_args(request, {'_facet': facet_info['name']}) }}">-</a>)</p>
<ul>
{% for facet_value in facet_info.results %}
<li><a href="{{ facet_value.toggle_url }}">{{ facet_value.label }}</a> {{ "{:,}".format(facet_value.count) }}</li>
{% endfor %}
{% if facet_info.truncated %}
<li>...</li>
{% endif %}
</ul>
</div>
{% endfor %} {% endfor %}
{% if facet_info.truncated %} </div>
<li>...</li> {% endif %}
{% endif %}
</ul>
{% endfor %}
{% include custom_rows_and_columns_templates %} {% include custom_rows_and_columns_templates %}

17
datasette/views/table.py
View file

@ -555,17 +555,21 @@ class TableView(RowTableShared):
) )
try: try:
facet_rows = await self.execute( facet_rows = await self.execute(
name, facet_sql, params, truncate=False, custom_time_limit=200 name, facet_sql, params,
truncate=False, custom_time_limit=200
) )
facet_results_values = []
facet_results[column] = { facet_results[column] = {
"name": column, "name": column,
"results": [], "results": facet_results_values,
"truncated": len(facet_rows) > FACET_SIZE, "truncated": len(facet_rows) > FACET_SIZE,
} }
facet_rows = facet_rows[:FACET_SIZE] facet_rows = facet_rows[:FACET_SIZE]
# Attempt to expand foreign keys into labels # Attempt to expand foreign keys into labels
values = [row["value"] for row in facet_rows] values = [row["value"] for row in facet_rows]
expanded = (await self.expand_foreign_keys(name, table, column, values)) expanded = (await self.expand_foreign_keys(
name, table, column, values
))
for row in facet_rows: for row in facet_rows:
selected = str(other_args.get(column)) == str(row["value"]) selected = str(other_args.get(column)) == str(row["value"])
if selected: if selected:
@ -576,7 +580,7 @@ class TableView(RowTableShared):
toggle_path = path_with_added_args( toggle_path = path_with_added_args(
request, {column: row["value"]} request, {column: row["value"]}
) )
facet_results[column]["results"].append({ facet_results_values.append({
"value": row["value"], "value": row["value"],
"label": expanded.get( "label": expanded.get(
(column, row["value"]), (column, row["value"]),
@ -710,6 +714,11 @@ class TableView(RowTableShared):
"display_columns": display_columns, "display_columns": display_columns,
"filter_columns": filter_columns, "filter_columns": filter_columns,
"display_rows": display_rows, "display_rows": display_rows,
"sorted_facet_results": sorted(
facet_results.values(),
key=lambda f: len(f["results"]),
reverse=True
),
"is_sortable": any(c["sortable"] for c in display_columns), "is_sortable": any(c["sortable"] for c in display_columns),
"path_with_replaced_args": path_with_replaced_args, "path_with_replaced_args": path_with_replaced_args,
"path_with_removed_args": path_with_removed_args, "path_with_removed_args": path_with_removed_args,