fix: move example plugins to correct directory, dynamically set datas…

…ette version string
simonw · Jul 11, 2023 · 4b6fa80 · 4b6fa80
1 parent a134f91
commit 4b6fa80
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/datasette/static/datasette-manager.js b/datasette/static/datasette-manager.js
@@ -32,7 +32,7 @@ const DOM_SELECTORS = {
  * For now, manually synced with datasette/version.py
  */
 const datasetteManager = {
-  VERSION: '1.0a2',
+  VERSION: window.datasetteVersion,
 
 
   // TODO: Should order of registration matter more?

diff --git a/datasette/templates/base.html b/datasette/templates/base.html
@@ -7,6 +7,7 @@
 {% for url in extra_css_urls %}
     <link rel="stylesheet" href="{{ url.url }}"{% if url.get("sri") %} integrity="{{ url.sri }}" crossorigin="anonymous"{% endif %}>
 {% endfor %}
+<script> window.datasetteVersion = '{{ datasette_version }}'; </script>
 <script src="{{ urls.static('datasette-manager.js') }}" defer></script>
 {% for url in extra_js_urls %}
     <script {% if url.module %}type="module" {% endif %}src="{{ url.url }}"{% if url.get("sri") %} integrity="{{ url.sri }}" crossorigin="anonymous"{% endif %}></script>

diff --git a/demos/plugins/example_js_manager_plugins.py → ...gins/static/example_js_manager_plugins.py b/demos/plugins/example_js_manager_plugins.py → ...gins/static/example_js_manager_plugins.py
@@ -2,6 +2,8 @@
 
 # Test command:
 # datasette fixtures.db  --plugins-dir=demos/plugins/
+# datasette fixtures.db \ --plugins-dir=demos/plugins/
+#                       \ --static static:demos/plugins/static
 
 # Create a set with view names that qualify for this JS, since plugins won't do anything on other pages
 # Same pattern as in Nteract data explorer

diff --git a/...s/plugins/static/table-example-plugins.js → ...s/plugins/static/table-example-plugins.js b/...s/plugins/static/table-example-plugins.js → ...s/plugins/static/table-example-plugins.js