IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

separate label in template from type

Browse Source
This commit is contained in:
Sven Klemm 2018-05-21 11:44:37 +02:00
parent e93276b1f8
commit 3af4e4e0d6
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/sql_part/sql_part.ts
View File

@ -2,6 +2,7 @@ import _ from 'lodash';
export class SqlPartDef { export class SqlPartDef {
type: string; type: string;
label: string;
params: any[]; params: any[];
defaultParams: any[]; defaultParams: any[];
renderer: any; renderer: any;
@ -10,6 +11,7 @@ export class SqlPartDef {
constructor(options: any) { constructor(options: any) {
this.type = options.type; this.type = options.type;
this.label = options.label;
this.params = options.params; this.params = options.params;
this.defaultParams = options.defaultParams; this.defaultParams = options.defaultParams;
this.renderer = options.renderer; this.renderer = options.renderer;

2
public/app/core/components/sql_part/sql_part_editor.ts
View File

@ -4,7 +4,7 @@ import coreModule from 'app/core/core_module';
var template = ` var template = `
<div class="dropdown cascade-open"> <div class="dropdown cascade-open">
<a ng-click="showActionsMenu()" class="query-part-name pointer dropdown-toggle" data-toggle="dropdown">{{part.def.type}}</a> <a ng-click="showActionsMenu()" class="query-part-name pointer dropdown-toggle" data-toggle="dropdown">{{part.def.label}}</a>
<span>(</span><span class="query-part-parameters"></span><span>)</span> <span>(</span><span class="query-part-parameters"></span><span>)</span>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ng-repeat="action in partActions"> <li ng-repeat="action in partActions">

5
public/app/plugins/datasource/postgres/query_part.ts
View File

@ -85,6 +85,7 @@ function addColumnStrategy(selectParts, partModel, query) {
register({ register({
type: 'column', type: 'column',
label: 'Column:',
addStrategy: addColumnStrategy, addStrategy: addColumnStrategy,
params: [{ type: 'column', dynamicLookup: true }], params: [{ type: 'column', dynamicLookup: true }],
defaultParams: ['value'], defaultParams: ['value'],
@ -93,6 +94,7 @@ register({
register({ register({
type: 'aggregate', type: 'aggregate',
label: 'Aggregate:',
addStrategy: replaceAggregationAddStrategy, addStrategy: replaceAggregationAddStrategy,
params: [{name: 'name', type: 'string', dynamicLookup: true}], params: [{name: 'name', type: 'string', dynamicLookup: true}],
defaultParams: ['avg'], defaultParams: ['avg'],
@ -101,6 +103,7 @@ register({
register({ register({
type: 'math', type: 'math',
label: 'Math:',
addStrategy: addMathStrategy, addStrategy: addMathStrategy,
params: [{ name: 'expr', type: 'string' }], params: [{ name: 'expr', type: 'string' }],
defaultParams: [' / 100'], defaultParams: [' / 100'],
@ -109,6 +112,7 @@ register({
register({ register({
type: 'alias', type: 'alias',
label: 'Alias:',
addStrategy: addAliasStrategy, addStrategy: addAliasStrategy,
params: [{ name: 'name', type: 'string', quote: 'double' }], params: [{ name: 'name', type: 'string', quote: 'double' }],
defaultParams: ['alias'], defaultParams: ['alias'],
@ -118,6 +122,7 @@ register({
register({ register({
type: 'time', type: 'time',
label: 'time',
params: [ params: [
{ {
name: 'interval', name: 'interval',