|
@@ -600,6 +600,8 @@
|
|
|
notebook.id(data.history_id);
|
|
notebook.id(data.history_id);
|
|
|
notebook.uuid(data.history_uuid);
|
|
notebook.uuid(data.history_uuid);
|
|
|
notebook.isHistory(true);
|
|
notebook.isHistory(true);
|
|
|
|
|
+// notebook.isSaved(true);
|
|
|
|
|
+ notebook.parentUuid(data.history_parent_uuid);
|
|
|
|
|
|
|
|
notebook.history.unshift(
|
|
notebook.history.unshift(
|
|
|
notebook._makeHistoryRecord(
|
|
notebook._makeHistoryRecord(
|
|
@@ -998,12 +1000,13 @@
|
|
|
var self = this;
|
|
var self = this;
|
|
|
|
|
|
|
|
self.id = ko.observable(typeof notebook.id != "undefined" && notebook.id != null ? notebook.id : null);
|
|
self.id = ko.observable(typeof notebook.id != "undefined" && notebook.id != null ? notebook.id : null);
|
|
|
- self.uuid = ko.observable(typeof notebook.uuid != "undefined" && notebook.uuid != null ? notebook.uuid : UUID());
|
|
|
|
|
- self.parentUuid = ko.observable(typeof notebook.parentUuid != "undefined" && notebook.parentUuid != null ? notebook.parentUuid : null);
|
|
|
|
|
|
|
+ self.uuid = ko.observable(typeof notebook.uuid != "undefined" && notebook.uuid != null ? notebook.uuid : UUID());
|
|
|
self.name = ko.observable(typeof notebook.name != "undefined" && notebook.name != null ? notebook.name : 'My Notebook');
|
|
self.name = ko.observable(typeof notebook.name != "undefined" && notebook.name != null ? notebook.name : 'My Notebook');
|
|
|
self.description = ko.observable(typeof notebook.description != "undefined" && notebook.description != null ? notebook.description: '');
|
|
self.description = ko.observable(typeof notebook.description != "undefined" && notebook.description != null ? notebook.description: '');
|
|
|
self.type = ko.observable(typeof notebook.type != "undefined" && notebook.type != null ? notebook.type : 'notebook');
|
|
self.type = ko.observable(typeof notebook.type != "undefined" && notebook.type != null ? notebook.type : 'notebook');
|
|
|
- self.isHistory = ko.observable(typeof notebook.is_history != "undefined" && notebook.is_history != null ? notebook.is_history : false);
|
|
|
|
|
|
|
+ self.isHistory = ko.observable(typeof notebook.is_history != "undefined" && notebook.is_history != null ? notebook.is_history : false);
|
|
|
|
|
+ self.parentUuid = ko.observable(typeof notebook.parentUuid != "undefined" && notebook.parentUuid != null ? notebook.parentUuid : null); // History parent
|
|
|
|
|
+ self.isSaved = ko.observable(typeof notebook.isSaved != "undefined" && notebook.isSaved != null ? notebook.isSaved : false);
|
|
|
self.snippets = ko.observableArray();
|
|
self.snippets = ko.observableArray();
|
|
|
self.selectedSnippet = ko.observable(vm.availableSnippets().length > 0 ? vm.availableSnippets()[0].type() : 'NO_SNIPPETS');
|
|
self.selectedSnippet = ko.observable(vm.availableSnippets().length > 0 ? vm.availableSnippets()[0].type() : 'NO_SNIPPETS');
|
|
|
self.creatingSessionLocks = ko.observableArray();
|
|
self.creatingSessionLocks = ko.observableArray();
|
|
@@ -1015,7 +1018,6 @@
|
|
|
|
|
|
|
|
self.history = ko.observableArray([]);
|
|
self.history = ko.observableArray([]);
|
|
|
// TODO: Move fetchHistory and clearHistory into the Snippet and drop self.selectedSnippet
|
|
// TODO: Move fetchHistory and clearHistory into the Snippet and drop self.selectedSnippet
|
|
|
-
|
|
|
|
|
self.getSession = function (session_type) {
|
|
self.getSession = function (session_type) {
|
|
|
var _s = null;
|
|
var _s = null;
|
|
|
$.each(self.sessions(), function (index, s) {
|
|
$.each(self.sessions(), function (index, s) {
|
|
@@ -1186,6 +1188,7 @@
|
|
|
id: self.id,
|
|
id: self.id,
|
|
|
uuid: self.uuid,
|
|
uuid: self.uuid,
|
|
|
parentUuid: self.parentUuid,
|
|
parentUuid: self.parentUuid,
|
|
|
|
|
+ isSaved: self.isSaved,
|
|
|
sessions: self.sessions,
|
|
sessions: self.sessions,
|
|
|
type: self.type
|
|
type: self.type
|
|
|
};
|
|
};
|
|
@@ -1199,6 +1202,8 @@
|
|
|
}, function (data) {
|
|
}, function (data) {
|
|
|
if (data.status == 0) {
|
|
if (data.status == 0) {
|
|
|
self.id(data.id);
|
|
self.id(data.id);
|
|
|
|
|
+ self.isSaved(true);
|
|
|
|
|
+ self.isHistory(false);
|
|
|
$(document).trigger("info", data.message);
|
|
$(document).trigger("info", data.message);
|
|
|
if (vm.editorMode){
|
|
if (vm.editorMode){
|
|
|
hueUtils.changeURL('/notebook/editor?editor=' + data.id);
|
|
hueUtils.changeURL('/notebook/editor?editor=' + data.id);
|
|
@@ -1415,6 +1420,14 @@
|
|
|
self.isFullscreenMode = ko.observable(false);
|
|
self.isFullscreenMode = ko.observable(false);
|
|
|
self.successUrl = ko.observable(options.success_url);
|
|
self.successUrl = ko.observable(options.success_url);
|
|
|
self.isOptimizerEnabled = ko.observable(options.is_optimizer_enabled);
|
|
self.isOptimizerEnabled = ko.observable(options.is_optimizer_enabled);
|
|
|
|
|
+ self.canSave = ko.computed(function() {
|
|
|
|
|
+ // Saved query or history but history coming from a saved query
|
|
|
|
|
+ return self.selectedNotebook() && (
|
|
|
|
|
+ self.selectedNotebook().isSaved() ||
|
|
|
|
|
+ //(! self.selectedNotebook().isSaved() && self.selectedNotebook().isHistory() && self.selectedNotebook().parentUuid()) ||
|
|
|
|
|
+ (self.selectedNotebook().isHistory() && self.selectedNotebook().parentUuid())
|
|
|
|
|
+ );
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
self.sqlSourceTypes = [];
|
|
self.sqlSourceTypes = [];
|
|
|
|
|
|
|
@@ -1574,6 +1587,7 @@
|
|
|
self.saveAsNotebook = function () {
|
|
self.saveAsNotebook = function () {
|
|
|
self.selectedNotebook().id(null);
|
|
self.selectedNotebook().id(null);
|
|
|
self.selectedNotebook().uuid(UUID());
|
|
self.selectedNotebook().uuid(UUID());
|
|
|
|
|
+ self.selectedNotebook().parentUuid(null);
|
|
|
self.saveNotebook();
|
|
self.saveNotebook();
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|