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

rel=alternate JSON for queries and database pages, closes #1620

Browse source
This commit is contained in:
Simon Willison 2022-02-02 13:21:11 -08:00
commit b72b2423c7
7 changed files with 91 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
datasette/templates/database.html
View file

@ -3,7 +3,8 @@
{% block title %}{{ database }}{% endblock %}
{% block extra_head %}
{{ super() }}
{{- super() -}}
<link rel="alternate" type="application/json+datasette" href="{{ alternate_url_json }}">
{% include "_codemirror.html" %}
{% endblock %}

3
datasette/templates/query.html
View file

@ -3,7 +3,8 @@
{% block title %}{{ database }}{% if query and query.sql %}: {{ query.sql }}{% endif %}{% endblock %}
{% block extra_head %}
{{ super() }}
{{- super() -}}
<link rel="alternate" type="application/json+datasette" href="{{ alternate_url_json }}">
{% if columns %}
<style>
@media only screen and (max-width: 576px) {

32
datasette/views/database.py
View file

@ -123,6 +123,10 @@ class DatabaseView(DataView):
attached_databases = [d.name for d in await db.attached_databases()]
alternate_url_json = self.ds.absolute_url(
request,
self.ds.urls.path(path_with_format(request=request, format="json")),
)
return (
{
"database": database,
@ -140,6 +144,7 @@ class DatabaseView(DataView):
),
},
{
"alternate_url_json": alternate_url_json,
"database_actions": database_actions,
"show_hidden": request.args.get("_show_hidden"),
"editable": True,
@ -148,6 +153,11 @@ class DatabaseView(DataView):
and not db.is_mutable
and not db.is_memory,
"attached_databases": attached_databases,
"_extra_headers": {
"Link": '{}; rel="alternate"; type="application/json+datasette"'.format(
alternate_url_json
)
},
},
(f"database-{to_css_class(database)}.html", "database.html"),
)
@ -308,7 +318,14 @@ class QueryView(DataView):
else:
async def extra_template():
alternate_url_json = self.ds.absolute_url(
request,
self.ds.urls.path(
path_with_format(request=request, format="json")
),
)
return {
"alternate_url_json": alternate_url_json,
"request": request,
"path_with_added_args": path_with_added_args,
"path_with_removed_args": path_with_removed_args,
@ -316,6 +333,11 @@ class QueryView(DataView):
"canned_query": canned_query,
"success_message": request.args.get("_success") or "",
"canned_write": True,
"_extra_headers": {
"Link": '{}; rel="alternate"; type="application/json+datasette"'.format(
alternate_url_json
)
},
}
return (
@ -448,7 +470,12 @@ class QueryView(DataView):
show_hide_link = path_with_added_args(request, {"_hide_sql": 1})
show_hide_text = "hide"
hide_sql = show_hide_text == "show"
alternate_url_json = self.ds.absolute_url(
request,
self.ds.urls.path(path_with_format(request=request, format="json")),
)
return {
"alternate_url_json": alternate_url_json,
"display_rows": display_rows,
"custom_sql": True,
"named_parameter_values": named_parameter_values,
@ -462,6 +489,11 @@ class QueryView(DataView):
"show_hide_text": show_hide_text,
"show_hide_hidden": markupsafe.Markup(show_hide_hidden),
"hide_sql": hide_sql,
"_extra_headers": {
"Link": '{}; rel="alternate"; type="application/json+datasette"'.format(
alternate_url_json
)
},
}
return (