Skip to content

Commit

Permalink
added basic completion of header names for JMS for #5
Browse files Browse the repository at this point in the history
  • Loading branch information
jstrachan committed Apr 24, 2013
1 parent bdeed91 commit 8a9972a
Show file tree
Hide file tree
Showing 7 changed files with 2,560 additions and 418 deletions.
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/camel/html/sendMessage.html
Expand Up @@ -12,7 +12,7 @@
<table style="width: 100%">
<tr ng-repeat="header in headers">
<td style="width: 45%">
<input type="text" style="width: 100%" ng-model="header.name" placeholder="Name of the message header">
<input type="text" style="width: 100%" ng-model="header.name" typeahead="header for header in defaultHeaderNames() | filter:$viewValue">
</td>
<td style="width: 55%">
<input type="text" style="width: 100%" ng-model="header.value" placeholder="Value of the message header">
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/camel/js/camelPlugin.ts
Expand Up @@ -10,7 +10,7 @@ module Camel {
var contextToolBar = "app/camel/html/attributeToolBarContext.html";


angular.module(pluginName, ['bootstrap', 'ngResource', 'hawtioCore']).
angular.module(pluginName, ['bootstrap', 'ui.bootstrap', 'ngResource', 'hawtioCore']).
config(($routeProvider) => {
$routeProvider.
when('/camel/browseEndpoint', {templateUrl: 'app/camel/html/browseEndpoint.html'}).
Expand Down
41 changes: 41 additions & 0 deletions hawtio-web/src/main/webapp/app/camel/js/data.ts
@@ -0,0 +1,41 @@
module Camel {
export var jmsHeaderSchema = {
definitions: {
headers: {
properties: {
JMSCorrelationID: {
type: "java.lang.String"
},
JMSDeliveryMode: {
"type": "string",
"enum": [
"PERSISTENT",
"NON_PERSISTENT"
]
},
JMSDestination: {
type: "javax.jms.Destination"
},
JMSExpiration: {
type: "long"
},
JMSPriority: {
type: "int"
},
JMSReplyTo: {
type: "javax.jms.Destination"
},
JMSType: {
type: "java.lang.String"
},
JMSXGroupId: {
type: "java.lang.String"
}
}
},
"javax.jms.Destination": {
type: "java.lang.String"
}
}
};
}
179 changes: 98 additions & 81 deletions hawtio-web/src/main/webapp/app/camel/js/send.ts
@@ -1,102 +1,119 @@
module Camel {
export function SendMessageController($scope, workspace:Workspace, localStorage) {
var LANGUAGE_FORMAT_PREFERENCE = "defaultLanguageFormat";
var sourceFormat = workspace.getLocalStorage(LANGUAGE_FORMAT_PREFERENCE) || "javascript";
$scope.message = "";
// TODO Remove this if possible
$scope.codeMirror = undefined;
var options = {
mode: {
name: sourceFormat
},
// Quick hack to get the codeMirror instance.
onChange: function(codeMirror) {
if(!$scope.codeMirror) {
$scope.codeMirror = codeMirror;
}
export function SendMessageController($scope, workspace:Workspace, localStorage) {
var LANGUAGE_FORMAT_PREFERENCE = "defaultLanguageFormat";
var sourceFormat = workspace.getLocalStorage(LANGUAGE_FORMAT_PREFERENCE) || "javascript";
$scope.message = "";
// TODO Remove this if possible
$scope.codeMirror = undefined;
var options = {
mode: {
name: sourceFormat
},
// Quick hack to get the codeMirror instance.
onChange: function (codeMirror) {
if (!$scope.codeMirror) {
$scope.codeMirror = codeMirror;
}
};
$scope.codeMirrorOptions = CodeEditor.createEditorSettings(options);
}
};
$scope.codeMirrorOptions = CodeEditor.createEditorSettings(options);

$scope.headers = [];
$scope.headers = [];

$scope.addHeader = () => {
$scope.headers.push({name: "", value: ""});
};
$scope.addHeader = () => {
$scope.headers.push({name: "", value: ""});
};

// lets add a default header
$scope.addHeader();
// lets add a default header
$scope.addHeader();

$scope.removeHeader = (header) => {
$scope.headers = $scope.headers.remove(header);
};
$scope.removeHeader = (header) => {
$scope.headers = $scope.headers.remove(header);
};

// TODO Find out what this does
$scope.$watch('workspace.selection', function () {
workspace.moveIfViewInvalid();
});
//$scope.defaultHeaderNames = [ "JMSPriority", "JMSType", "breadCrumbId" ];
$scope.defaultHeaderNames = () => {
var answer = [];
if (isJmsEndpoint()) {
angular.forEach(Camel.jmsHeaderSchema.definitions.headers.properties, (value, name) => {
answer.push(name);
});
}
return answer;
};

/** save the sourceFormat in preferences for later
* Note, this would be controller specific preferences and not the global, overriding, preferences */
// TODO Use ng-selected="changeSourceFormat()" - Although it seemed to fire multiple times..
$scope.$watch('codeMirrorOptions.mode.name', function(newValue, oldValue) {
workspace.setLocalStorage(LANGUAGE_FORMAT_PREFERENCE, newValue)
});
// TODO Find out what this does
$scope.$watch('workspace.selection', function () {
workspace.moveIfViewInvalid();
});

var sendWorked = () => {
$scope.message = "";
notification("success", "Message sent!");
};
/** save the sourceFormat in preferences for later
* Note, this would be controller specific preferences and not the global, overriding, preferences */
// TODO Use ng-selected="changeSourceFormat()" - Although it seemed to fire multiple times..
$scope.$watch('codeMirrorOptions.mode.name', function (newValue, oldValue) {
workspace.setLocalStorage(LANGUAGE_FORMAT_PREFERENCE, newValue)
});

$scope.autoFormat = () => {
setTimeout(() => {
CodeEditor.autoFormatEditor($scope.codeMirror);
}, 50);
};
var sendWorked = () => {
$scope.message = "";
notification("success", "Message sent!");
};

$scope.sendMessage = () => {
var body = $scope.message;
var selection = workspace.selection;
if (selection) {
var mbean = selection.objectName;
if (mbean) {
var headers = null;
if ($scope.headers.length) {
headers = {};
angular.forEach($scope.headers, (object) => {
var key = object.name;
if (key) {
headers[key] = object.value;
}
});
}
$scope.autoFormat = () => {
setTimeout(() => {
CodeEditor.autoFormatEditor($scope.codeMirror);
}, 50);
};

var jolokia = workspace.jolokia;
// if camel then use a different operation on the camel context mbean
var callback = onSuccess(sendWorked);
if (selection.domain === "org.apache.camel") {
var uri = selection.title;
mbean = getSelectionCamelContextMBean(workspace);
if (mbean) {
if (headers) {
jolokia.execute(mbean, "sendBodyAndHeaders(java.lang.String, java.lang.Object, java.util.Map)", uri, body, headers, callback);
} else {
jolokia.execute(mbean, "sendStringBody(java.lang.String, java.lang.String)", uri, body, callback);
}
} else {
notification("error", "Could not find CamelContext MBean!");
$scope.sendMessage = () => {
var body = $scope.message;
var selection = workspace.selection;
if (selection) {
var mbean = selection.objectName;
if (mbean) {
var headers = null;
if ($scope.headers.length) {
headers = {};
angular.forEach($scope.headers, (object) => {
var key = object.name;
if (key) {
headers[key] = object.value;
}
} else {
var user = localStorage["activemqUserName"];
var pwd = localStorage["activemqPassword"];
});
}

var jolokia = workspace.jolokia;
// if camel then use a different operation on the camel context mbean
var callback = onSuccess(sendWorked);
if (selection.domain === "org.apache.camel") {
var uri = selection.title;
mbean = getSelectionCamelContextMBean(workspace);
if (mbean) {
if (headers) {
jolokia.execute(mbean, "sendTextMessage(java.util.Map, java.lang.String, java.lang.String, java.lang.String)", headers, body, user, pwd, callback);
jolokia.execute(mbean, "sendBodyAndHeaders(java.lang.String, java.lang.Object, java.util.Map)", uri, body, headers, callback);
} else {
jolokia.execute(mbean, "sendTextMessage(java.lang.String, java.lang.String, java.lang.String)", body, user, pwd, callback);
jolokia.execute(mbean, "sendStringBody(java.lang.String, java.lang.String)", uri, body, callback);
}
} else {
notification("error", "Could not find CamelContext MBean!");
}
} else {
var user = localStorage["activemqUserName"];
var pwd = localStorage["activemqPassword"];
if (headers) {
jolokia.execute(mbean, "sendTextMessage(java.util.Map, java.lang.String, java.lang.String, java.lang.String)", headers, body, user, pwd, callback);
} else {
jolokia.execute(mbean, "sendTextMessage(java.lang.String, java.lang.String, java.lang.String)", body, user, pwd, callback);
}
}
}
};
}
};

function isJmsEndpoint() {
// TODO check for the jms/activemq endpoint in camel or if its an activemq endpoint
//var selection = workspace.selection;
return true;
}
}
}
3 changes: 2 additions & 1 deletion hawtio-web/src/main/webapp/index.html
Expand Up @@ -157,7 +157,8 @@

<!-- AngularUI -->
<script type="text/javascript" src="lib/angular-ui.js"></script>
<script type="text/javascript" src="lib/ui-bootstrap-tpls-0.1.0.min.js"></script>
<script type="text/javascript" src="lib/ui-bootstrap-0.2.0.min.js"></script>
<script type="text/javascript" src="lib/ui-bootstrap-tpls-0.2.0.min.js"></script>

<!-- helper libraries -->
<script type="text/javascript" src="lib/sugar-1.3.6-custom.min.js"></script>
Expand Down

0 comments on commit 8a9972a

Please sign in to comment.