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

Rename ?_nofacets=1 to ?_nofacet=1, refs #1353

Browse source
This commit is contained in:
Simon Willison 2021-06-01 08:55:28 -07:00
commit 8bde6c5461
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
datasette/views/base.py
View file

@ -264,11 +264,11 @@ class DataView(BaseView):
async def as_csv(self, request, database, hash, **kwargs): async def as_csv(self, request, database, hash, **kwargs):
stream = request.args.get("_stream") stream = request.args.get("_stream")
# Do not calculate facets: # Do not calculate facets:
if not request.args.get("_nofacets"): if not request.args.get("_nofacet"):
if not request.query_string: if not request.query_string:
new_query_string = "_nofacets=1" new_query_string = "_nofacet=1"
else: else:
new_query_string = request.query_string + "&_nofacets=1" new_query_string = request.query_string + "&_nofacet=1"
new_scope = dict( new_scope = dict(
request.scope, query_string=new_query_string.encode("latin-1") request.scope, query_string=new_query_string.encode("latin-1")
) )

4
datasette/views/table.py
View file

@ -731,7 +731,7 @@ class TableView(RowTableShared):
) )
) )
if not request.args.get("_nofacets"): if not request.args.get("_nofacet"):
for facet in facet_instances: for facet in facet_instances:
( (
instance_facet_results, instance_facet_results,
@ -829,7 +829,7 @@ class TableView(RowTableShared):
self.ds.setting("suggest_facets") self.ds.setting("suggest_facets")
and self.ds.setting("allow_facet") and self.ds.setting("allow_facet")
and not _next and not _next
and not request.args.get("_nofacets") and not request.args.get("_nofacet")
): ):
for facet in facet_instances: for facet in facet_instances:
suggested_facets.extend(await facet.suggest()) suggested_facets.extend(await facet.suggest())

2
docs/json_api.rst
View file

@ -383,7 +383,7 @@ Special table arguments
``?_facet_size=100`` ``?_facet_size=100``
Increase the number of facet results returned for each facet. Use ``?_facet_size=max`` for the maximum available size, determined by :ref:`setting_max_returned_rows`. Increase the number of facet results returned for each facet. Use ``?_facet_size=max`` for the maximum available size, determined by :ref:`setting_max_returned_rows`.
``?_nofacets=1`` ``?_nofacet=1``
Disable all facets and facet suggestions for this page, including any defined by :ref:`facets_metadata`. Disable all facets and facet suggestions for this page, including any defined by :ref:`facets_metadata`.
``?_trace=1`` ``?_trace=1``

10
tests/test_api.py
View file

@ -1669,13 +1669,13 @@ def test_suggest_facets_off():
assert [] == client.get("/fixtures/facetable.json").json["suggested_facets"] assert [] == client.get("/fixtures/facetable.json").json["suggested_facets"]
@pytest.mark.parametrize("nofacets", (True, False)) @pytest.mark.parametrize("nofacet", (True, False))
def test_nofacets(app_client, nofacets): def test_nofacet(app_client, nofacet):
path = "/fixtures/facetable.json?_facet=state" path = "/fixtures/facetable.json?_facet=state"
if nofacets: if nofacet:
path += "&_nofacets=1" path += "&_nofacet=1"
response = app_client.get(path) response = app_client.get(path)
if nofacets: if nofacet:
assert response.json["suggested_facets"] == [] assert response.json["suggested_facets"] == []
assert response.json["facet_results"] == {} assert response.json["facet_results"] == {}
else: else:

4
tests/test_csv.py
View file

@ -105,8 +105,8 @@ def test_custom_sql_csv_blob_columns(app_client):
assert "text/plain; charset=utf-8" == response.headers["content-type"] assert "text/plain; charset=utf-8" == response.headers["content-type"]
assert response.text == ( assert response.text == (
"rowid,data\r\n" "rowid,data\r\n"
'1,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacets=1&_blob_column=data&_blob_hash=f3088978da8f9aea479ffc7f631370b968d2e855eeb172bea7f6c7a04262bb6d"\r\n' '1,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacet=1&_blob_column=data&_blob_hash=f3088978da8f9aea479ffc7f631370b968d2e855eeb172bea7f6c7a04262bb6d"\r\n'
'2,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacets=1&_blob_column=data&_blob_hash=b835b0483cedb86130b9a2c280880bf5fadc5318ddf8c18d0df5204d40df1724"\r\n' '2,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacet=1&_blob_column=data&_blob_hash=b835b0483cedb86130b9a2c280880bf5fadc5318ddf8c18d0df5204d40df1724"\r\n'
"3,\r\n" "3,\r\n"
) )