Skip to content

Commit

Permalink
added radix rule and changed files to follow rule (grafana#13153)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ijin08 authored and torkelo committed Sep 5, 2018
1 parent 5d87aa2 commit 2b74b1c
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion public/app/containers/Explore/TimePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function parseTime(value, isUtc = false, asString = false) {
return value;
}
if (!isNaN(value)) {
const epoch = parseInt(value);
const epoch = parseInt(value, 10);
const m = isUtc ? moment.utc(epoch) : moment(epoch);
return asString ? m.format(DATE_FORMAT) : m;
}
Expand Down
2 changes: 1 addition & 1 deletion public/app/core/utils/rangeutil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export function describeTextRange(expr: any) {
const parts = /^now([-+])(\d+)(\w)/.exec(expr);
if (parts) {
const unit = parts[3];
const amount = parseInt(parts[2]);
const amount = parseInt(parts[2], 10);
const span = spans[unit];
if (span) {
opt.display = isLast ? 'Last ' : 'Next ';
Expand Down
2 changes: 1 addition & 1 deletion public/app/features/dashboard/time_srv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class TimeSrv {
}

if (!isNaN(value)) {
const epoch = parseInt(value);
const epoch = parseInt(value, 10);
return moment.utc(epoch);
}

Expand Down
2 changes: 1 addition & 1 deletion public/app/features/dashboard/view_state_srv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class DashboardViewState {

getQueryStringState() {
const state = this.$location.search();
state.panelId = parseInt(state.panelId) || null;
state.panelId = parseInt(state.panelId, 10) || null;
state.fullscreen = state.fullscreen ? true : null;
state.edit = state.edit === 'true' || state.edit === true || null;
state.editview = state.editview || null;
Expand Down
2 changes: 1 addition & 1 deletion public/app/features/panel/solo_panel_ctrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class SoloPanelCtrl {
appEvents.emit('toggle-sidemenu-hidden');

const params = $location.search();
panelId = parseInt(params.panelId);
panelId = parseInt(params.panelId, 10);

$scope.onAppEvent('dashboard-initialized', $scope.initPanelScope);

Expand Down
2 changes: 1 addition & 1 deletion public/app/features/playlist/playlist_edit_ctrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class PlaylistEditCtrl {
filterFoundPlaylistItems() {
this.filteredDashboards = _.reject(this.dashboardresult, playlistItem => {
return _.find(this.playlistItems, listPlaylistItem => {
return parseInt(listPlaylistItem.value) === playlistItem.id;
return parseInt(listPlaylistItem.value, 10) === playlistItem.id;
});
});

Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/datasource/elasticsearch/bucket_agg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export class ElasticBucketAggCtrl {
const id = _.reduce(
$scope.target.bucketAggs.concat($scope.target.metrics),
(max, val) => {
return parseInt(val.id) > max ? parseInt(val.id) : max;
return parseInt(val.id, 10) > max ? parseInt(val.id, 10) : max;
},
0
);
Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/datasource/elasticsearch/metric_agg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export class ElasticMetricAggCtrl {
const id = _.reduce(
$scope.target.bucketAggs.concat($scope.target.metrics),
(max, val) => {
return parseInt(val.id) > max ? parseInt(val.id) : max;
return parseInt(val.id, 10) > max ? parseInt(val.id, 10) : max;
},
0
);
Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/datasource/influxdb/datasource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export default class InfluxDatasource {

const parts = /^now-(\d+)([d|h|m|s])$/.exec(date);
if (parts) {
const amount = parseInt(parts[1]);
const amount = parseInt(parts[1], 10);
const unit = parts[2];
return 'now() - ' + amount + unit;
}
Expand Down
4 changes: 2 additions & 2 deletions public/app/plugins/datasource/opentsdb/datasource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,11 @@ export default class OpenTsDatasource {
};

if (target.counterMax && target.counterMax.length) {
query.rateOptions.counterMax = parseInt(target.counterMax);
query.rateOptions.counterMax = parseInt(target.counterMax, 10);
}

if (target.counterResetValue && target.counterResetValue.length) {
query.rateOptions.resetValue = parseInt(target.counterResetValue);
query.rateOptions.resetValue = parseInt(target.counterResetValue, 10);
}

if (tsdbVersion >= 2) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class ResultTransformer {

metricLabel = this.createMetricLabel(metricData.metric, options);

const stepMs = parseInt(options.step) * 1000;
const stepMs = parseInt(options.step, 10) * 1000;
let baseTimestamp = start * 1000;

if (metricData.values === undefined) {
Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/panel/graph/threshold_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class ThresholdManager {
function stopped() {
// calculate graph level
let graphValue = plot.c2p({ left: 0, top: posTop }).y;
graphValue = parseInt(graphValue.toFixed(0));
graphValue = parseInt(graphValue.toFixed(0), 10);
model.value = graphValue;

handleElem.off('mousemove', dragging);
Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/panel/heatmap/heatmap_data_converter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ function pushToYBuckets(buckets, bucketNum, value, point, bounds) {
let count = 1;
// Use the 3rd argument as scale/count
if (point.length > 3) {
count = parseInt(point[2]);
count = parseInt(point[2], 10);
}
if (buckets[bucketNum]) {
buckets[bucketNum].values.push(value);
Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/panel/singlestat/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {

const bgColor = config.bootData.user.lightTheme ? 'rgb(230,230,230)' : 'rgb(38,38,38)';

const fontScale = parseInt(panel.valueFontSize) / 100;
const fontScale = parseInt(panel.valueFontSize, 10) / 100;
const fontSize = Math.min(dimension / 5, 100) * fontScale;
// Reduce gauge width if threshold labels enabled
const gaugeWidthReduceRatio = panel.gauge.thresholdLabels ? 1.5 : 1;
Expand Down
2 changes: 1 addition & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"one-line": [true, "check-open-brace", "check-catch", "check-else"],
"only-arrow-functions": [true, "allow-declarations", "allow-named-functions"],
"prefer-const": true,
"radix": false,
"radix": true,
"typedef-whitespace": [
true,
{
Expand Down

0 comments on commit 2b74b1c

Please sign in to comment.