|
@@ -344,7 +344,7 @@ var Assist = function (vm, initial) {
|
|
|
self.column = ko.computed(function () {
|
|
self.column = ko.computed(function () {
|
|
|
var column = self.path().split(/[.]/)[2];
|
|
var column = self.path().split(/[.]/)[2];
|
|
|
return column ? column : null;
|
|
return column ? column : null;
|
|
|
- });
|
|
|
|
|
|
|
+ });
|
|
|
self.privileges = ko.observableArray();
|
|
self.privileges = ko.observableArray();
|
|
|
self.roles = ko.observableArray();
|
|
self.roles = ko.observableArray();
|
|
|
self.isDiffMode = ko.observable(false);
|
|
self.isDiffMode = ko.observable(false);
|
|
@@ -701,11 +701,11 @@ var Assist = function (vm, initial) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
self.fetchHivePath = function (optionalPath, loadCallback) {
|
|
self.fetchHivePath = function (optionalPath, loadCallback) {
|
|
|
- self.isLoadingTree(true);
|
|
|
|
|
-
|
|
|
|
|
var _originalPath = typeof optionalPath != "undefined" ? optionalPath : self.path();
|
|
var _originalPath = typeof optionalPath != "undefined" ? optionalPath : self.path();
|
|
|
|
|
|
|
|
if (_originalPath.split(".").length < 3) {
|
|
if (_originalPath.split(".").length < 3) {
|
|
|
|
|
+ self.isLoadingTree(true);
|
|
|
|
|
+
|
|
|
var _path = _originalPath.replace('.', '/');
|
|
var _path = _originalPath.replace('.', '/');
|
|
|
var request = {
|
|
var request = {
|
|
|
url: '/security/api/hive/fetch_hive_path',
|
|
url: '/security/api/hive/fetch_hive_path',
|
|
@@ -734,6 +734,7 @@ var Assist = function (vm, initial) {
|
|
|
else if (data.columns && data.columns.length > 0) {
|
|
else if (data.columns && data.columns.length > 0) {
|
|
|
self.addColumns(_originalPath, data.columns, _hasCallback);
|
|
self.addColumns(_originalPath, data.columns, _hasCallback);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
self.isLoadingTree(false);
|
|
self.isLoadingTree(false);
|
|
|
|
|
|
|
|
if (_hasCallback) {
|
|
if (_hasCallback) {
|
|
@@ -1018,13 +1019,15 @@ var HiveViewModel = function (initial) {
|
|
|
return {
|
|
return {
|
|
|
'server': self.assist.server(),
|
|
'server': self.assist.server(),
|
|
|
'db': paths[0] ? paths[0] : null,
|
|
'db': paths[0] ? paths[0] : null,
|
|
|
- 'table': paths[1] ? paths[1] : null
|
|
|
|
|
|
|
+ 'table': paths[1] ? paths[1] : null,
|
|
|
|
|
+ 'column': paths[2] ? paths[2] : null
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
return {
|
|
return {
|
|
|
'server': self.assist.server(),
|
|
'server': self.assist.server(),
|
|
|
'db': self.assist.db(),
|
|
'db': self.assist.db(),
|
|
|
- 'table': self.assist.table()
|
|
|
|
|
|
|
+ 'table': self.assist.table(),
|
|
|
|
|
+ 'column': self.assist.column(),
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|