5.1.1 (#655)

* fixes 654 and 653.
* fixes error message UI on query template
* 5.1.1

Author: chrisclark

AUTHORS

@@ -29,4 +29,4 @@ The following people have contributed to django-sql-explorer:
 - Calum Smith
 - Steven Luoma
 
-A full list of contributors can be found on Github; https://github.com/explorerhq/django-sql-explorer/graphs/contributors
+A full list of contributors can be found on Github; https://github.com/explorerhq/sql-explorer/graphs/contributors

HISTORY.rst

@@ -1,7 +1,7 @@
 __version_info__ = {
     "major": 5,
     "minor": 1,
-    "patch": 0,
+    "patch": 1,
     "releaselevel": "final",
     "serial": 0
 }

explorer/__init__.py

@@ -233,8 +233,8 @@ export class ExplorerEditor {
             element.addEventListener('click', toggleFavorite);
         });
 
-        document.getElementById('show_schema_button').addEventListener('click', this.showSchema.bind(this));
-        document.getElementById('hide_schema_button').addEventListener('click', this.hideSchema.bind(this));
+        document.getElementById('show_schema_button')?.addEventListener('click', this.showSchema.bind(this));
+        document.getElementById('hide_schema_button')?.addEventListener('click', this.hideSchema.bind(this));
 
 
         $("#format_button").click(function(e) {

explorer/src/js/explorer.js

@@ -9,28 +9,24 @@ function searchFocus() {
 
 export function setupSchema() {
 
-    let hasControls = document.getElementById('collapse_all');
-    if (hasControls) {
-        let options = {
-            valueNames: ['app-name'],
-            handlers: {'updated': [searchFocus]}
-        };
+    let options = {
+        valueNames: ['app-name'],
+        handlers: {'updated': [searchFocus]}
+    };
 
-        new List('schema-contents', options);
+    new List('schema-contents', options);
 
-
-        document.getElementById('collapse_all').addEventListener('click', function () {
-            document.querySelectorAll('.schema-table').forEach(function (element) {
-                element.style.display = 'none';
-            });
+    document.getElementById('collapse_all').addEventListener('click', function () {
+        document.querySelectorAll('.schema-table').forEach(function (element) {
+            element.style.display = 'none';
         });
+    });
 
-        document.getElementById('expand_all').addEventListener('click', function () {
-            document.querySelectorAll('.schema-table').forEach(function (element) {
-                element.style.display = '';
-            });
+    document.getElementById('expand_all').addEventListener('click', function () {
+        document.querySelectorAll('.schema-table').forEach(function (element) {
+            element.style.display = '';
         });
-    }
+    });
 
     document.querySelectorAll('.schema-header').forEach(function (header) {
         header.addEventListener('click', function () {

explorer/src/js/schema.js

@@ -33,11 +33,11 @@ <h2>
                 {% endif %}
                 {{ form.non_field_errors }}
                 <div class="my-3 form-floating">
+                    <input class="form-control" id="id_title" maxlength="255" name="title" type="text" {% if not can_change %}disabled{% endif %} value="{{ form.title.value|default_if_none:"" }}" />
+                    <label for="id_title" class="form-label">{% translate "Title" %}</label>
                     {% if form.title.errors %}{% for error in form.title.errors %}
                         <div class="alert alert-danger">{{ error|escape }}</div>
                     {% endfor %}{% endif %}
-                    <input class="form-control" id="id_title" maxlength="255" name="title" type="text" {% if not can_change %}disabled{% endif %} value="{{ form.title.value|default_if_none:"" }}" />
-                    <label for="id_title" class="form-label">{% translate "Title" %}</label>
                 </div>
                 {% if form.connections|length > 1 and can_change %}
                     <div class="mb-3 form-floating">
@@ -46,21 +46,22 @@ <h2>
                     </div>
                 {% else %}
                     {# still need to submit the connection, just hide the UI element #}
-                    <div class="hidden">
+                    <div class="d-none">
                       {{ form.connection }}
                     </div>
+                    <div>{{ form.connection.value }}</div>
                 {% endif %}
                 <div class="mb-3 form-floating">
-                    {% if form.description.errors %}
-                        <div class="alert alert-danger">{{ form.description.errors }}</div>
-                    {% endif %}
                     <textarea
                         id="id_description" class="form-control" cols="40" name="description"
                         {% if not can_change %}disabled{% endif %} rows="2"
                     >{{ form.description.value|default_if_none:"" }}</textarea>
                     <label for="id_description" class="form-label">
                         {% translate "Description"%}
                     </label>
+                    {% if form.description.errors %}
+                        <div class="alert alert-danger">{{ form.description.errors }}</div>
+                    {% endif %}
                 </div>
                 {% if form.sql.errors %}
                     {% for error in form.sql.errors %}
@@ -121,7 +122,7 @@ <h2>
                                 {% translate "Format" %}
                             </button>
                         {% else %}
-                            <button id="refresh_button" type="button" class="btn btn-default">{% translate "Refresh" %}</button>
+                            <button id="refresh_button" type="button" class="btn btn-outline-primary">{% translate "Refresh" %}</button>
                             {% export_buttons query %}
                         {% endif %}
                     </div>

explorer/templates/explorer/query.html

@@ -15,12 +15,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/explorerhq/django-sql-explorer.git"
+    "url": "git+https://github.com/explorerhq/sql-explorer.git"
   },
   "author": "Chris Clark",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/explorerhq/django-sql-explorer/issues"
+    "url": "https://github.com/explorerhq/sql-explorer/issues"
   },
   "homepage": "https://www.sqlexplorer.io",
   "dependencies": {

package.json

@@ -55,7 +55,7 @@ def requirements(fname):
     project_urls={
       "Changes": "https://django-sql-explorer.readthedocs.io/en/latest/history.html",
       "Documentation": "https://django-sql-explorer.readthedocs.io/en/latest/",
-      "Issues": "https://github.com/explorerhq/django-sql-explorer/issues"
+      "Issues": "https://github.com/explorerhq/sql-explorer/issues"
     },
     packages=["explorer"],
     long_description=long_description,