Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Interpreter Create form

Browse source
This commit is contained in:
Damien Corneau 2015-06-18 12:38:05 +09:00
parent bdde389b1a
commit 25a3a631ce
3 changed files with 46 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
zeppelin-web/src/app/app.js
View file

@ -61,7 +61,6 @@ angular
};
})
.config(function ($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'app/home/home.html',

2
zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
View file

@ -30,7 +30,7 @@
</tr>
<tr ng-repeat="(key, value) in newInterpreterSetting.properties">
<td>{{key}}</td>
<td><textarea msd-elastic ng-model="value.value"></textarea></td>
<td><textarea msd-elastic ng-model="value.value" ng-init="value.value = value.defaultValue"></textarea></td>
<td>{{value.description}}</td>
<td>
<div class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">

98
zeppelin-web/src/app/interpreter/interpreter.controller.js
View file

@ -25,32 +25,34 @@
angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope, $route, $routeParams, $location, $rootScope,
$http, baseUrlSrv) {
var interpreterSettingsTmp = [];
$scope.interpreterSettings = [];
$scope.availableInterpreters = {};
$scope.showAddNewSetting = false;
var getInterpreterSettings = function() {
$http.get(baseUrlSrv.getRestApiBase()+'/interpreter/setting').
success(function(data, status, headers, config) {
$scope.interpreterSettings = data.body;
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
success(function(data, status, headers, config) {
$scope.interpreterSettings = data.body;
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
};
var getAvailableInterpreters = function() {
$http.get(baseUrlSrv.getRestApiBase()+'/interpreter').
success(function(data, status, headers, config) {
$scope.availableInterpreters = data.body;
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
success(function(data, status, headers, config) {
$scope.availableInterpreters = data.body;
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
};
var emptyNewProperty = function(object) {
angular.extend(object, {propertyValue: '', propertyKey: ''});
};
var removeTMPSettings = function(index) {
interpreterSettingsTmp.splice(index, 1);
};
@ -65,14 +67,14 @@ angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope,
if (!result) {
return;
}
var index = _.findIndex($scope.interpreterSettings, { 'id': settingId });
var request = {
option : angular.copy($scope.interpreterSettings[index].option),
properties : angular.copy($scope.interpreterSettings[index].properties),
};
$http.put(baseUrlSrv.getRestApiBase() + '/interpreter/setting/' + settingId, request).
success(function(data, status, headers, config) {
@ -98,15 +100,15 @@ angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope,
return;
}
console.log('Delete setting %o', settingId);
$http.delete(baseUrlSrv.getRestApiBase() + '/interpreter/setting/' + settingId).
success(function(data, status, headers, config) {
var index = _.findIndex($scope.interpreterSettings, { 'id': settingId });
$scope.interpreterSettings.splice(index, 1);
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
success(function(data, status, headers, config) {
var index = _.findIndex($scope.interpreterSettings, { 'id': settingId });
$scope.interpreterSettings.splice(index, 1);
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
};
$scope.newInterpreterGroupChange = function() {
@ -120,13 +122,13 @@ angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope,
}
$http.put(baseUrlSrv.getRestApiBase() + '/interpreter/setting/restart/' + settingId).
success(function(data, status, headers, config) {
success(function(data, status, headers, config) {
var index = _.findIndex($scope.interpreterSettings, { 'id': settingId });
$scope.interpreterSettings[index] = data.body;
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
};
$scope.addNewInterpreterSetting = function() {
@ -134,32 +136,27 @@ angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope,
alert('Please determine name and interpreter');
return;
}
if (_.findIndex($scope.interpreterSettings, { 'name': $scope.newInterpreterSetting.name }) >= 0) {
alert('Name ' + $scope.newInterpreterSetting.name + ' already exists');
return;
}
var newSetting = {
name : $scope.newInterpreterSetting.name,
group : $scope.newInterpreterSetting.group,
option : $scope.newInterpreterSetting.option,
properties : {}
};
var newSetting = angular.copy($scope.newInterpreterSetting);
for (var p in $scope.newInterpreterSetting.properties) {
newSetting.properties[p] = $scope.newInterpreterSetting.properties[p].value;
}
$http.post(baseUrlSrv.getRestApiBase()+'/interpreter/setting', newSetting).
success(function(data, status, headers, config) {
$scope.resetNewInterpreterSetting();
getInterpreterSettings();
$scope.showAddNewSetting = false;
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
success(function(data, status, headers, config) {
$scope.resetNewInterpreterSetting();
getInterpreterSettings();
$scope.showAddNewSetting = false;
}).
error(function(data, status, headers, config) {
console.log('Error %o %o', status, data.message);
});
};
@ -196,19 +193,14 @@ angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope,
// Add new property from create form
var index = _.findIndex($scope.interpreterSettings, { 'id': settingId });
var setting = $scope.interpreterSettings[index];
setting.properties[setting.propertyKey] = setting.propertyValue;
emptyNewProperty(setting);
}
};
var init = function() {
// when interpreter page opened after seeing non-default looknfeel note, the css remains unchanged. that's what interpreter page want. Force set default looknfeel.
$rootScope.$broadcast('setLookAndFeel', 'default');
$scope.interpreterSettings = [];
$scope.availableInterpreters = {};
$scope.resetNewInterpreterSetting();
getInterpreterSettings();
getAvailableInterpreters();
};