pass the current value of the entry text box into the completion func…

…tion - and avoid bugette if we don't find any endpoint completions
hawtio · Jul 10, 2013 · 5b93642 · 5b93642
1 parent 5d58cb7
commit 5b93642
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/hawtio-web/src/main/webapp/app/activemq/html/browseQueue.html b/hawtio-web/src/main/webapp/app/activemq/html/browseQueue.html
@@ -115,7 +115,7 @@
         <ng-pluralize count="gridOptions.selectedItems.length"
                       when="{'1': 'message', 'other': '{} messages'}"></ng-pluralize>
         to: <input type="text" ng-model="queueName" placeholder="Queue name"
-                   typeahead="title for title in queueNames() | filter:$viewValue" typeahead-editable='true'></p>
+                   typeahead="title for title in queueNames($viewValue) | filter:$viewValue" typeahead-editable='true'></p>
       <p>
         You cannot undo this operation.<br>
         Though after the move you can always move the

diff --git a/hawtio-web/src/main/webapp/app/activemq/js/browse.ts b/hawtio-web/src/main/webapp/app/activemq/js/browse.ts
@@ -156,7 +156,7 @@ module ActiveMQ {
       }
     };
 
-    $scope.queueNames = () => {
+    $scope.queueNames = (completionText) => {
       var queuesFolder = getSelectionQueuesFolder(workspace);
       return (queuesFolder) ? queuesFolder.children.map(n => n.title) : [];
     };

diff --git a/hawtio-web/src/main/webapp/app/camel/js/endpointChooser.ts b/hawtio-web/src/main/webapp/app/camel/js/endpointChooser.ts
@@ -222,17 +222,14 @@ module Camel {
     });
 
     $scope.endpointCompletions = (completionText) => {
-      var answer = [];
+      var answer = null;
       var mbean = findCamelContextMBean();
       var componentName = $scope.selectedComponentName;
       var endpointParameters = {};
-      console.log("component " + $scope.selectedComponentName + " endpointPath " +  $scope.endpointPath + " completion text: " + completionText);
-      // TODO bit of a hack here - for scope issues sometimes the endpointPath is defined in a child scope!
-      //var completionText = $scope.endpointPath || $scope.$$childHead.endpointPath || "";
       if (mbean && componentName && completionText) {
         answer = $scope.jolokia.execute(mbean, 'completeEndpointPath', componentName, endpointParameters, completionText, onSuccess(null, silentOptions));
       }
-      return answer;
+      return answer || [];
     };
 
     $scope.loadEndpointNames = () => {