Improved ?_extra=extras to show selected and available, refs #262

simonw · Feb 8, 2023 · 21568f9 · 21568f9
1 parent 732285c
commit 21568f9
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/datasette/views/table.py b/datasette/views/table.py
@@ -1850,11 +1850,17 @@ async def extra_request():
 
     async def extra_extras():
         "Available ?_extra= blocks"
-        return [{
-            "name": key[len("extra_"):],
-            "doc": fn.__doc__,
-        } for key, fn in registry._registry.items()
-        if key.startswith("extra_")]
+        return {
+            "available": [
+                {
+                    "name": key[len("extra_") :],
+                    "doc": fn.__doc__,
+                }
+                for key, fn in registry._registry.items()
+                if key.startswith("extra_")
+            ],
+            "selected": list(extras),
+        }
 
     registry = Registry(
         extra_count,
@@ -1888,18 +1894,6 @@ async def extra_extras():
 
     return Response.json(data)
 
-    return Response.json(
-        {
-            "debug": {
-
-            },
-            "sql": sql,
-            "next": next_value,
-            "rows": [dict(r) for r in results.rows],
-        },
-        default=repr,
-    )
-
 
 async def _next_value_and_url(
     datasette,