Permalink
Browse files

OOZIE-6 Custom filters and User Column for Coordinator jobs

  • Loading branch information...
1 parent 31586bb commit 1d19a90f2352e74379e9f471d69ce5986f48adc9 @kirann kirann committed with Mohammad Kamrul Islam Aug 4, 2011
Showing with 47 additions and 5 deletions.
  1. +1 −0 release-log.txt
  2. +46 −5 webapp/src/main/webapp/oozie-console.js
View
1 release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 3.1.0 release
+OOZIE-6 Custom filters option and User information column added to Coordinator jobs section of Oozie Web Console
OOZIE-124 Update documentation for job-type in WS API
OOZIE-81 Add an email action to Oozie
OOZIE-113 merge changes for OOZIE-101 to ActionEndXCommand
View
51 webapp/src/main/webapp/oozie-console.js
@@ -593,6 +593,12 @@ function coordJobDetailsPopup(response, request) {
width: 200,
value: jobDetails["status"]
}, {
+ fieldLabel: 'User',
+ editable: false,
+ name: 'status',
+ width: 200,
+ value: jobDetails["user"]
+ }, {
fieldLabel: 'Frequency',
editable: false,
name: 'frequency',
@@ -873,7 +879,7 @@ function bundleJobDetailsPopup(response, request) {
var bundleJobName = jobDetails["bundleJobName"];
var jobActionStatus = new Ext.data.JsonStore({
data: jobDetails["bundleCoordJobs"],
- fields: ['coordJobId', 'coordJobName', 'coordJobPath', 'frequency', 'timeUnit', 'nextMaterializedTime', 'status', 'startTime', 'endTime', 'pauseTime']
+ fields: ['coordJobId', 'coordJobName', 'coordJobPath', 'frequency', 'timeUnit', 'nextMaterializedTime', 'status', 'startTime', 'endTime', 'pauseTime','user']
});
var formFieldSet = new Ext.form.FieldSet({
@@ -968,6 +974,11 @@ function bundleJobDetailsPopup(response, request) {
sortable: true,
dataIndex: 'status'
}, {
+ header: "User",
+ width: 80,
+ sortable: true,
+ dataIndex: 'user'
+ }, {
header: "Frequency",
width: 80,
sortable: true,
@@ -1123,7 +1134,7 @@ var coord_jobs_store = new Ext.data.JsonStore({
totalProperty: 'total',
autoLoad: true,
root: 'coordinatorjobs',
- fields: ['coordJobId', 'coordJobName', 'status', 'frequency', 'timeUnit', 'startTime', 'nextMaterializedTime'],
+ fields: ['coordJobId', 'coordJobName', 'status', 'user', 'frequency', 'timeUnit', 'startTime', 'nextMaterializedTime'],
proxy: new Ext.data.HttpProxy({
url: getOozieBase() + 'jobs'
})
@@ -1225,6 +1236,15 @@ var refreshDoneJobsAction = new Ext.Action({
}
});
+var refreshCoordCustomJobsAction = new Ext.Action({
+ text: 'status=KILLED',
+ handler: function() {
+ coord_jobs_store.baseParams.filter = this.text;
+ coord_jobs_store.reload();
+ }
+});
+
+
var refreshCoordActiveJobsAction = new Ext.Action({
text: 'Active Jobs',
handler: function() {
@@ -1325,6 +1345,20 @@ var changeFilterAction = new Ext.Action({
}
});
+var changeCoordFilterAction = new Ext.Action({
+ text: 'Custom Filter',
+ handler: function() {
+ Ext.Msg.prompt('Filter Criteria', 'Filter text:', function(btn, text) {
+ if (btn == 'ok' && text) {
+ refreshCoordCustomJobsAction.setText(text);
+ coord_jobs_store.baseParams.filter = text;
+ coord_jobs_store.reload();
+ }
+ });
+ }
+});
+
+
var getSupportedVersions = new Ext.Action({
text: 'Checking server for supported versions...',
handler: function() {
@@ -1651,7 +1685,12 @@ function initConsole() {
header: "Status",
width: 80,
sortable: true,
- dataIndex: 'status'
+ dataIndex: 'status'
+ }, {
+ header: "User",
+ width: 80,
+ sortable: true,
+ dataIndex: 'user'
}, {
header: "frequency",
width: 70,
@@ -1684,8 +1723,10 @@ function initConsole() {
handler: function() {
coord_jobs_store.reload();
}
- }, refreshCoordAllJobsAction, refreshCoordActiveJobsAction, refreshCoordDoneJobsAction,
- {
+ }, refreshCoordAllJobsAction, refreshCoordActiveJobsAction, refreshCoordDoneJobsAction,{
+ text: 'Custom Filter',
+ menu: [refreshCoordCustomJobsAction, changeCoordFilterAction, helpFilterAction ]
+ }, {
xtype: 'tbfill'
}, checkStatus, serverVersion],
title: 'Coordinator Jobs',

0 comments on commit 1d19a90

Please sign in to comment.