Skip to content

Business intelligence made simple

No more to lose unsaved SQL when refreshing "queries/new" page (#182)

Fred Liang428dd58efcce
diff --git a/app/assets/javascripts/blazer/application.js b/app/assets/javascripts/blazer/application.js
index 05f9438b..407b5751 100644
--- a/app/assets/javascripts/blazer/application.js
+++ b/app/assets/javascripts/blazer/application.js
@@ -16,6 +16,7 @@
//= require ./routes
//= require ./queries
//= require ./fuzzysearch
+//= require ./draft_store
Vue.config.devtools = false
@@ -76,4 +77,3 @@ function preventBackspaceNav() {
}
preventBackspaceNav()
-
diff --git a/app/assets/javascripts/blazer/draft_store.js b/app/assets/javascripts/blazer/draft_store.js
new file mode 100644
index 00000000..f96bb8e1
--- /dev/null
+++ b/app/assets/javascripts/blazer/draft_store.js
@@ -0,0 +1,24 @@
+var DraftStore = {
+ isSessionStorageSupported: function () {
+ return typeof (Storage) !== "undefined"
+ },
+
+ saveDraft: function (value) {
+ if (!this.isSessionStorageSupported()) { return }
+ sessionStorage.setItem(this._tabID(), value)
+ },
+
+ restoreDraft: function () {
+ if (!this.isSessionStorageSupported()) { return }
+ return sessionStorage.getItem(this._tabID())
+ },
+
+ removeDraft: function () {
+ if (!this.isSessionStorageSupported()) { return }
+ return sessionStorage.removeItem(this._tabID())
+ },
+
+ _tabID: function () {
+ return sessionStorage._tabID ? sessionStorage._tabID : sessionStorage._tabID = ("blazer-query-" + Math.random())
+ }
+}
diff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erb
index 00a99f33..5f297d99 100644
--- a/app/views/blazer/queries/_form.html.erb
+++ b/app/views/blazer/queries/_form.html.erb
@@ -67,6 +67,7 @@
<script>
<%= blazer_js_var "params", variable_params %>
<%= blazer_js_var "previewStatement", Hash[Blazer.data_sources.map { |k, v| [k, (v.preview_statement rescue "")] }] %>
+ var new_record = <%= @query.new_record? && @query.statement.blank? %>;
var app = new Vue({
el: "#app",
@@ -165,7 +166,16 @@
this.editor = editor
+ if (new_record) {
+ var draftSQL = DraftStore.restoreDraft()
+ if (draftSQL) {
+ editor.setValue(draftSQL)
+ $("#query_statement").val(draftSQL)
+ }
+ }
+
editor.getSession().on("change", function () {
+ if (new_record) { DraftStore.saveDraft(editor.getValue()) }
$("#query_statement").val(editor.getValue())
_this.adjustHeight()
})
@@ -237,4 +247,5 @@
this.showEditor()
}
})
+ $("form").submit(function() { DraftStore.removeDraft() })
</script>