innov
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
Web_Manager_Develope
Linda 8 years ago
parent d048c64a82 85a9d2dfae
commit 00a1fee4fc
17 changed files with 124 additions and 27 deletions
Show Stats Download Patch File Download Diff File

5
d.ts/developer/ts/fileMigrationTask.d.ts vendored
Unescape View File

@ -0,0 +1,5 @@
/// <reference path="../../includes.d.ts" />
/// <reference path="developerPlugin.d.ts" />
declare module Developer {
var KubeTaskController: ng.IModule;
}

4
d.ts/kubernetes/ts/fileMigrationTask.d.ts vendored
Unescape View File

@ -0,0 +1,4 @@
/// <reference path="../../includes.d.ts" />
declare module Developer {
var KubeTaskController: ng.IModule;
}

1
d.ts/kubernetes/ts/kubernetesHelpers.d.ts vendored
Unescape View File

@ -2,6 +2,7 @@
/// <reference path="kubernetesInterfaces.d.ts" />
/// <reference path="utilHelpers.d.ts" />
/// <reference path="readPlacedivision.d.ts" />
/// <reference path="../../configs/ts/ConfigsHelper.d.ts" />
declare module Kubernetes {
var context: string;
var hash: string;

1
defs.d.ts vendored
Unescape View File

@ -17,6 +17,7 @@
/// <reference path="d.ts/developer/ts/dataManagerModel.d.ts"/>
/// <reference path="d.ts/developer/ts/developerEnrichers.d.ts"/>
/// <reference path="d.ts/developer/ts/environmentPanel.d.ts"/>
/// <reference path="d.ts/developer/ts/fileMigrationTask.d.ts"/>
/// <reference path="d.ts/developer/ts/home.d.ts"/>
/// <reference path="d.ts/developer/ts/jenkinsJob.d.ts"/>
/// <reference path="d.ts/developer/ts/jenkinsJobs.d.ts"/>

36
dist/hawtio-kubernetes.js vendored
View File

File diff suppressed because one or more lines are too long

13
plugins/configs/html/glusterfsSetting.html
Unescape View File

@ -35,8 +35,17 @@
</th>
</tr>
<tr ng-repeat="row in volume.brick track by $index" class="row.class">
<td ng-repeat="col in row" class="col.class">
<span class="col.class">{{col.title}}</span>
<td >
<span class="">服务器{{$index+1}}</span>
</td>
<td >
<span class="">{{row.ip}}</span>
</td>
<td >
<span class="">存储路径:{{row.path}}</span>
</td>
<td >
<span class="">已用{{row.usedSize}}/共{{row.availableSize}}</span>
</td>
</tr>
</table>

2
plugins/configs/html/kubeClusterSetting.html
Unescape View File

@ -35,7 +35,7 @@
<button class="btn sj_btn_blue" type='submit' style="color:#fff;">
<span class="glyphicon glyphicon-save "></span> 保存
</button>
<button class="btn sj_btn_grey" type='submit'>
<button class="btn sj_btn_grey" ng-click='cancel()'>
<span class="glyphicon glyphicon-remove "></span> 取消
</button>
</div>

5
plugins/configs/ts/configsDataService.ts
Unescape View File

@ -58,8 +58,9 @@ module Configs{
url : "/java/console/api/volume/list",
success : function(data) {
if(data){
result = data;
}
result = data;
}
console.log(data);
}
});
this.cluster = result;

0
plugins/developer/html/overview → plugins/configs/ts/fileMigrationTask.html
Unescape View File

8
plugins/configs/ts/kubeClusterSetting.ts
Unescape View File

@ -72,6 +72,12 @@ module Configs{
removeElementsByValue($scope.tableForm, [{key: "name", value: "序号"},{key: "name", value: "连接状态"},{key: "name", value: "操作"}]);
}
$scope.cancel = () => {
$scope.tableForm =null;
$scope.add = false;
$scope.edit = false;
}
$scope.onSubmit = () => {
$scope.edit = false;
$scope.add = false;
@ -101,6 +107,6 @@ module Configs{
}
});
//removeElementByValue($scope.model, data._id, "_id");
}) ;
});
}]);
}

16
plugins/developer/html/fileMigrationTask.html
Unescape View File

@ -0,0 +1,16 @@
<div ng-controller="Developer.KubeTaskController">
<div class="row">
<div hawtio-breadcrumbs></div>
</div>
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="container-content ">
<div class="row align-center mb10" ng-hide="model.oracleParam.length">
<p class="alert alert-info">当前没有可以查看的任务列表！</p>
</div>
<div class="row mb10" ng-show="model.oracleParam.length">
<table class="table table-bordered table-striped sj_content_table" hawtio-simple-table="tableConfig" />
</div>
</div>
</div>

0
plugins/developer/html/overview.html
Unescape View File

14
plugins/developer/html/workspaces.html
Unescape View File

@ -71,18 +71,20 @@
<label class="col-sm-3 control-label sj_contro_label" for="selectedItem ">
请选择迁移集群
</label>
<select ng-model="migrationClick.selectedItem " class="col-sm-3 sj_modal_select" title="name of the new namespace " id="selectedItem " ng-options="x.name for x in configs.cluster " />
<select ng-model="migrationClick.selectedItem " class="col-sm-3 sj_modal_select" title="name of the new namespace " id="selectedItem " ng-options="x.name for x in volumes " />
</div>
<div class="form-group mt10">
<div class="col-sm-12 alert alert-warning sj_alert-warning">
<span class="help-block" ng-show="!volumes || volumes.length == 0">
<div class="form-group">
<div class="col-sm-12 alert alert-warning" ng-show="!volumes || volumes.length == 0">
<span class="help-block" >
当前没有可以迁移的集群,请在数据集群配置页面进行配置！
</span>
</div>
</div>
<div>
<treecontrol class="tree-classic" tree-model="x.folder" options="treeOptions" on-selection="showSelected(node)" selected-node="selectNode">
<div ng-hide= "!volumes || volumes.length == 0">
<treecontrol class="tree-classic" tree-model="migrationClick.selectedItem.folder" options="treeOptions" on-selection="showSelected(node)" selected-node="selectNode">
{{node.name}}
</treecontrol>
</div>

7
plugins/developer/ts/fileMigrationTask.ts
Unescape View File

@ -0,0 +1,7 @@
/// <reference path="../../includes.ts"/>
/// <reference path="developerPlugin.ts"/>
module Developer {
export var KubeTaskController = controller("KubeTaskController", ["$scope", ($scope) => {
}]);
}

14
plugins/developer/ts/workspaces.ts
Unescape View File

@ -31,6 +31,7 @@ module Developer {
labelSelected: "a8"
}
}
//配置数据表格需要显示的内容及显示格式
$scope.tableConfig = {
data: 'model.data',
@ -176,7 +177,9 @@ module Developer {
open: (selected) =>{
var migrationClick = $scope.migrationClick;
if($scope.volumes && $scope.volumes instanceof Array && $scope.volumes.length >0)
migrationClick.selectedItem = $scope.volumes[0];
migrationClick.selectedItem = $scope.volumes[0];
console.log(migrationClick.selectedItem.folder.childNodes);
migrationClick.dialog.open();
},
close: () => {
@ -202,16 +205,19 @@ module Developer {
path: item.dataPath+"app/",
isTarget: "false"
}, (rc) =>{
Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "create", Kubernetes.getName(rc), 0);
$location.path('/kubernetes/namespace/default/replicationControllers');
Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "create", Kubernetes.getName(rc), 0);
});
});
$timeout(() => {
$location.path('/kubernetes/namespace/default/replicationControllers');
}, 200);
}
function init($scope,$location,$routeParams){
$scope.model.updateModel();
if(ConfigsModel.cluster!=null)
$scope.volumes = ConfigsModel.cluster;
$scope.volumes = ConfigsModel.cluster;
//创建二级菜单
$scope.subTabConfig = Developer.createCurrentSubNavBar($scope, $location, $routeParams);
$scope.navbarItems =[{

16
plugins/kubernetes/html/fileMigrationTask.html
Unescape View File

@ -0,0 +1,16 @@
<div ng-controller="Developer.KubeTaskController">
<div class="row">
<div hawtio-breadcrumbs></div>
</div>
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="container-content ">
<div class="row align-center mb10" ng-hide="model.oracleParam.length">
<p class="alert alert-info">当前没有可以查看的任务列表！</p>
</div>
<div class="row mb10" ng-show="model.oracleParam.length">
<table class="table table-bordered table-striped sj_content_table" hawtio-simple-table="tableConfig" />
</div>
</div>
</div>

9
plugins/kubernetes/ts/kubernetesHelpers.ts
Unescape View File

@ -2,6 +2,7 @@
/// <reference path="kubernetesInterfaces.ts"/>
/// <reference path="utilHelpers.ts"/>
/// <reference path="readPlacedivision.ts"/>
/// <reference path="../../configs/ts/ConfigsHelper.ts"/>
module Kubernetes {
export var context = '/kubernetes';
@ -1738,13 +1739,13 @@ module Kubernetes {
export function createRC(obj, onCompleteFn = null){
var client = Kubernetes.createKubernetesClient('replicationcontrollers','default');
var RCTemplate = new resourceRCTemplate();
var rcTemplate = RCTemplate.createRC(obj);
console.log(JSON.stringify(rcTemplate));
client.put(rcTemplate, function(obj) {
console.log("Created: ", obj);
var rcTemplate = RCTemplate.createRC(obj);
client.put(rcTemplate, function(obj) {
if (angular.isFunction(onCompleteFn)) {
onCompleteFn(obj);
}
},(err) =>{
console.log(err);
});
}

Write Preview
Loading…
Cancel
Save