IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

tslint: added 1 more rule, #12918

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-08-30 07:47:46 +02:00
parent 0bb249096f
commit c960af098a
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/components/json_explorer/helpers.ts
+10 -10
View File
@@ -21,7 +21,7 @@ export function isObject(value: any): boolean {
* From http://stackoverflow.com/a/332429 * From http://stackoverflow.com/a/332429
* *
*/ */
export function getObjectName(object: Object): string { export function getObjectName(object: object): string {
if (object === undefined) { if (object === undefined) {
return ''; return '';
} }
@@ -44,7 +44,7 @@ export function getObjectName(object: Object): string {
/* /*
* Gets type of an object. Returns "null" for null objects * Gets type of an object. Returns "null" for null objects
*/ */
export function getType(object: Object): string { export function getType(object: object): string {
if (object === null) { if (object === null) {
return 'null'; return 'null';
} }
@@ -54,7 +54,7 @@ export function getType(object: Object): string {
/* /*
* Generates inline preview for a JavaScript object based on a value * Generates inline preview for a JavaScript object based on a value
*/ */
export function getValuePreview(object: Object, value: string): string { export function getValuePreview(object: object, value: string): string {
const type = getType(object); const type = getType(object);
if (type === 'null' || type === 'undefined') { if (type === 'null' || type === 'undefined') {
@@ -79,15 +79,15 @@ export function getValuePreview(object: Object, value: string): string {
/* /*
* Generates inline preview for a JavaScript object * Generates inline preview for a JavaScript object
*/ */
export function getPreview(object: string): string { let value = '';
let value = ''; export function getPreview(obj: object): string {
if (isObject(object)) { if (isObject(obj)) {
value = getObjectName(object); value = getObjectName(obj);
if (Array.isArray(object)) { if (Array.isArray(obj)) {
value += '[' + object.length + ']'; value += '[' + obj.length + ']';
} }
} else { } else {
value = getValuePreview(object, object); value = getValuePreview(obj, obj.toString());
} }
return value; return value;
} }
public/app/features/dashboard/export_data/export_data_modal.ts
+2 -2
View File
@@ -5,9 +5,9 @@ import appEvents from 'app/core/app_events';
export class ExportDataModalCtrl { export class ExportDataModalCtrl {
private data: any[]; private data: any[];
private panel: string; private panel: string;
asRows: Boolean = true; asRows = true;
dateTimeFormat = 'YYYY-MM-DDTHH:mm:ssZ'; dateTimeFormat = 'YYYY-MM-DDTHH:mm:ssZ';
excel: false; excel = false;
export() { export() {
if (this.panel === 'table') { if (this.panel === 'table') {
tslint.json
+6
View File
@@ -5,6 +5,12 @@
"ban": [true, "ban": [true,
{"name": "Array", "message": "tsstyle#array-constructor"} {"name": "Array", "message": "tsstyle#array-constructor"}
], ],
"ban-types": [true,
["Object", "Use {} instead."],
["String", "Use 'string' instead."],
["Number", "Use 'number' instead."],
["Boolean", "Use 'boolean' instead."]
],
"interface-name": [true, "never-prefix"], "interface-name": [true, "never-prefix"],
"no-string-throw": true, "no-string-throw": true,
"no-unused-expression": true, "no-unused-expression": true,