Skip to content

Commit

Permalink
Add more user friendly operations to screens.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtho11
mtho11 committed Feb 23, 2015
1 parent 8a95b9c commit c30b643
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 3 deletions.
19 changes: 16 additions & 3 deletions dist/hawkular-metrics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ var HawkularMetrics;
HawtioNav.add(metricsTab);
HawkularMetrics.log.debug("loaded Metrics Plugin");
}]);
HawkularMetrics._module.directive('ngEnter', function () {
return function (scope, element, attrs) {
element.bind("keydown keypress", function (event) {
if (event.which === 13) {
scope.$apply(function () {
scope.$eval(attrs.ngEnter);
});
event.preventDefault();
}
});
};
});
hawtioPluginLoader.addModule(HawkularMetrics.pluginName);
})(HawkularMetrics || (HawkularMetrics = {}));

Expand All @@ -49,11 +61,12 @@ var HawkularMetrics;
this.HawkularInventory = HawkularInventory;
this.resourceUrl = resourceUrl;
this.tenantId = 'test';
this.httpUriPart = 'http://';
$scope.vm = this;
this.resourceUrl = 'http://';
this.resourceUrl = this.httpUriPart;
}
AddUrlController.prototype.addUrl = function (resourceId) {
var cleanedResourceId = resourceId.substr(7);
var cleanedResourceId = resourceId.substr(this.httpUriPart.length);
this.$log.debug("Adding Url to backend: " + cleanedResourceId);
this.HawkularInventory.Resource.save({ tenantId: this.tenantId }, cleanedResourceId);
this.HawkularInventory.Metric.save({ tenantId: this.tenantId, resourceId: cleanedResourceId }, 'status.time');
Expand Down Expand Up @@ -296,7 +309,7 @@ var HawkularMetrics;
}]);
})(HawkularMetrics || (HawkularMetrics = {}));

angular.module("hawkular-metrics-templates", []).run(["$templateCache", function($templateCache) {$templateCache.put("plugins/metrics/html/add-url.html","<div class=\"row\" ng-controller=\"HawkularMetrics.AddUrlController\" style=\"margin-left: 10px;\">\n <h1>Welcome Brian!</h1>\n\n <h2>Collect metrics from a website that you want to monitor.</h2>\n\n <form class=\"form-horizontal\" name=\"addUrlForm\" role=\"form\" novalidate>\n <div class=\"form-group input\">\n <div class=\"col-lg-6 col-sm-8 col-xs-12 align-center\">\n <div class=\"input-group\">\n <input type=\"url\" class=\"form-control input-lg\" name=\"resourceUrl\" ng-model=\"vm.resourceUrl\"\n ng-model-options=\"{ updateOn: \'default blur\'}\"\n placeholder=\"Enter a website URL (e.g., http://mysite.com/home)\" required >\n <span class=\"error-message\"\n ng-show=\"addUrlForm.resourceUrl.$dirty && addUrlForm.resourceUrl.$error.required\">The URL you entered is not valid. Please enter a valid URL.</span>\n\n <span class=\"input-group-btn\">\n <button class=\"btn btn-primary btn-lg\" type=\"button\" ng-disabled=\"!addUrlForm.$valid\"\n ng-click=\"vm.addUrl(vm.resourceUrl)\">Get Metrics\n </button>\n </span>\n </div>\n </div>\n </div>\n </form>\n</div>\n");
angular.module("hawkular-metrics-templates", []).run(["$templateCache", function($templateCache) {$templateCache.put("plugins/metrics/html/add-url.html","<div class=\"row\" ng-controller=\"HawkularMetrics.AddUrlController\" style=\"margin-left: 10px;\">\n <h1>Welcome Brian!</h1>\n\n <h2>Collect metrics from a website that you want to monitor.</h2>\n\n <form class=\"form-horizontal\" name=\"addUrlForm\" role=\"form\" novalidate>\n <div class=\"form-group input\">\n <div class=\"col-lg-6 col-sm-8 col-xs-12 align-center\">\n <div class=\"input-group\">\n <input type=\"url\" class=\"form-control input-lg\" name=\"resourceUrl\" ng-model=\"vm.resourceUrl\"\n ng-model-options=\"{ updateOn: \'default blur\'}\"\n ng-enter=\"vm.addUrl(vm.resourceUrl)\"\n placeholder=\"Enter a website URL (e.g., http://mysite.com/home)\" required >\n <span class=\"error-message\"\n ng-show=\"addUrlForm.resourceUrl.$dirty && addUrlForm.resourceUrl.$error.required\">The URL you entered is not valid. Please enter a valid URL.</span>\n\n <span class=\"input-group-btn\">\n <button class=\"btn btn-primary btn-lg\" type=\"button\" ng-disabled=\"!addUrlForm.$valid\"\n ng-click=\"vm.addUrl(vm.resourceUrl)\">Get Metrics\n </button>\n </span>\n </div>\n </div>\n </div>\n </form>\n</div>\n");
$templateCache.put("plugins/metrics/html/metrics-selection.html","<div class=\"row\" ng-controller=\"HawkularMetrics.MetricsSelectionController\">\n <div class=\"col-md-12\">\n <h1>Metrics Selection: TBD</h1>\n TBD\n </div>\n</div>\n");
$templateCache.put("plugins/metrics/html/metrics-view.html","<div class=\"panel panel-default\" style=\"width:880px\" ng-controller=\"MetricsViewController as vm\">\n <div class=\"panel-body\">\n <div class=\"well\">\n <small style=\"margin-left: 15px\" class=\"graphDateTimeRangeLabel\"></small>\n\n <form class=\"form-horizontal\" name=\"chartForm\" role=\"form\" novalidate>\n\n <div class=\"form-group\">\n <label class=\"col-sm-2 control-label\">Metric ID:</label>\n\n <div class=\"col-sm-5\">\n <input type=\"text\" class=\"form-control\" name=\"searchId\" ng-model=\"vm.searchId\"\n ng-model-options=\"{ updateOn: \'default blur\', debounce: { \'default\': 700, \'blur\': 0 } }\"\n placeholder=\"Enter Id...\" required ng-minlength=\"1\">\n <span class=\"error-message\"\n ng-show=\"chartForm.searchId.$dirty && chartForm.searchId.$error.required\"> * Required.</span>\n <span class=\"help-block\">Example: 100, apache3.cpu1 </span>\n </div>\n </div>\n\n <!--<div class=\"row\">-->\n <!--<div class=\"col-md-12\">-->\n <!--<relative-time-range-button-bar style=\"margin-left: 140px;\"-->\n <!--start-time-stamp=\"vm.startTimestamp\"-->\n <!--end-time-stamp=\"vm..endTimeStamp\">-->\n <!--</relative-time-range-button-bar>-->\n\n <!--<input type=\"text\" style=\"margin-left: 20px;text-align: center;\" ng-model=\"vm.dateRange\" readonly disbabled/>-->\n <!--<p></p>-->\n <!--</div>-->\n <!--</div>-->\n\n <!--<div class=\"form-group\">-->\n <!--<label class=\"col-sm-2 control-label\">Start</label>-->\n\n <!--<div class=\"col-sm-6\">-->\n <!--<div class=\"dropdown\">-->\n <!--<a class=\"dropdown-toggle\" id=\"dropdownStart\" role=\"button\" data-toggle=\"dropdown\"-->\n <!--data-target=\"#\" href=\"#\">-->\n <!--<div class=\"input-group\">-->\n <!--<input type=\"text\" class=\"form-control\"-->\n <!--data-ng-model=\"vm.startTimeStamp\">-->\n <!--<span class=\"input-group-addon\"><i class=\"glyphicon glyphicon-calendar\"></i></span>-->\n <!--</div>-->\n <!--</a>-->\n <!--<ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"dLabel\">-->\n <!--<datetimepicker data-ng-model=\"vm.startTimeStamp\"-->\n <!--data-datetimepicker-config=\"{ dropdownSelector: \'#dropdownStart\' }\"/>-->\n <!--</ul>-->\n <!--</div>-->\n <!--</div>-->\n <!--</div>-->\n\n\n <!--<div class=\"form-group\">-->\n <!--<label class=\"col-sm-2 control-label\">End</label>-->\n\n <!--<div class=\"col-sm-6\">-->\n\n <!--<div class=\"dropdown\">-->\n <!--<a class=\"dropdown-toggle\" id=\"dropdownEnd\" role=\"button\" data-toggle=\"dropdown\"-->\n <!--data-target=\"#\" href=\"#\">-->\n <!--<div class=\"input-group\">-->\n <!--<input type=\"text\" class=\"form-control\"-->\n <!--data-ng-model=\"vm.endTimeStamp\">-->\n <!--<span class=\"input-group-addon\"><i-->\n <!--class=\"glyphicon glyphicon-calendar\"></i></span>-->\n <!--</div>-->\n <!--</a>-->\n <!--<ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"dLabel\">-->\n <!--<datetimepicker data-ng-model=\"vm.endTimeStamp\"-->\n <!--data-datetimepicker-config=\"{ dropdownSelector: \'#dropdownEnd\' }\"/>-->\n <!--</ul>-->\n <!--</div>-->\n <!--</div>-->\n <!--</div>-->\n\n <div class=\"form-group\">\n <div class=\"col-sm-offset-2 col-sm-10\">\n <button type=\"button\" class=\"btn btn-primary\"\n ng-disabled=\"!chartForm.$valid\"\n ng-click=\"vm.refreshChartDataNow()\">Refresh\n </button>\n </div>\n </div>\n </div>\n </form>\n </div>\n\n\n <div ng-show=\"vm.chartData.dataPoints.length > 1\">\n <div id=\"stackedBarChart\" style=\"height:270px\">\n <!-- HINT: colors for the chart can be changed in the d3-chart.css -->\n <hawkular-chart\n data=\"{{vm.chartData.dataPoints}}\"\n chart-type=\"bar\"\n show-avg-line=\"{{vm.showAvgLine}}\"\n hide-high-low-values=\"{{vm.hideHighLowValues}}\"\n chart-title=\"{{\'Metrics Id: \'+vm.searchId}}\"\n chart-height=\"250\"></hawkular-chart>\n </div>\n\n <div style=\"margin-top: 30px;\">\n <button class=\"btn btn-sm\" ng-click=\"vm.showPreviousTimeRange()\" style=\"margin-left:90px;\"\n ng-show=\"vm.chartData.dataPoints.length > 2\">&lt;&lt; Prev.\n </button>\n <button class=\"btn btn-sm\" style=\"float:right;margin-right: 90px;\" ng-click=\"vm.showNextTimeRange()\"\n ng-show=\"vm.chartData.dataPoints.length > 2\" ng-disabled=\"!vm.hasNext();\">Next &gt;&gt;</button>\n </div>\n <br/>\n\n </div>\n</div>\n</div>\n");
$templateCache.put("plugins/metrics/html/overview.html","<div class=\"row\" ng-controller=\"HawkularMetrics.OverviewController\">\n <div class=\"col-md-12\">\n <h1>Overview: TBD</h1>\n TBD\n </div>\n</div>\n");}]); hawtioPluginLoader.addModule("hawkular-metrics-templates");
1 change: 1 addition & 0 deletions plugins/metrics/d.ts/metrics/ts/addUrlPage.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ declare module HawkularMetrics {
resourceUrl: string;
static $inject: string[];
tenantId: string;
httpUriPart: string;
constructor($location: ng.ILocationService, $scope: any, $log: ng.ILogService, HawkularInventory: any, resourceUrl: string);
addUrl(resourceId: string): void;
}
Expand Down
1 change: 1 addition & 0 deletions plugins/metrics/plugins/metrics/html/add-url.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ <h2>Collect metrics from a website that you want to monitor.</h2>
<div class="input-group">
<input type="url" class="form-control input-lg" name="resourceUrl" ng-model="vm.resourceUrl"
ng-model-options="{ updateOn: 'default blur'}"
ng-enter="vm.addUrl(vm.resourceUrl)"
placeholder="Enter a website URL (e.g., http://mysite.com/home)" required >
<span class="error-message"
ng-show="addUrlForm.resourceUrl.$dirty && addUrlForm.resourceUrl.$error.required">The URL you entered is not valid. Please enter a valid URL.</span>
Expand Down
14 changes: 14 additions & 0 deletions plugins/metrics/plugins/metrics/ts/metricsPlugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,20 @@ module HawkularMetrics {
log.debug("loaded Metrics Plugin");
}]);

_module.directive('ngEnter', function () {
return function (scope, element, attrs) {
element.bind("keydown keypress", function (event) {
if(event.which === 13) {
scope.$apply(function (){
scope.$eval(attrs.ngEnter);
});

event.preventDefault();
}
});
};
});


hawtioPluginLoader.addModule(HawkularMetrics.pluginName);
}

0 comments on commit c30b643

Please sign in to comment.