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

ux(): more changes to influxdb query editor

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-20 18:01:25 +01:00
parent a5a244767a
commit bd6a68bfe5
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
public/app/plugins/datasource/influxdb/partials/query.editor.html
View File

@ -1,6 +1,6 @@
<query-editor-row ctrl="ctrl"> <query-editor-row ctrl="ctrl">
<div ng-hide="ctrl.target.rawQuery" class="gf-form-inline"> <div ng-hide="ctrl.target.rawQuery" class="gf-form-inline">
<label class="gf-form-label query-keyword width-6">FROM</label> <label class="gf-form-label query-keyword width-7">FROM</label>
<metric-segment segment="ctrl.policySegment" get-options="ctrl.getPolicySegments()" on-change="ctrl.policyChanged()"></metric-segment> <metric-segment segment="ctrl.policySegment" get-options="ctrl.getPolicySegments()" on-change="ctrl.policyChanged()"></metric-segment>
<metric-segment segment="ctrl.measurementSegment" get-options="ctrl.getMeasurements()" on-change="ctrl.measurementChanged()"></metric-segment> <metric-segment segment="ctrl.measurementSegment" get-options="ctrl.getMeasurements()" on-change="ctrl.measurementChanged()"></metric-segment>
@ -22,9 +22,7 @@
<div ng-hide="ctrl.target.rawQuery"> <div ng-hide="ctrl.target.rawQuery">
<div class="gf-form-inline query-editor-secondary-row" ng-repeat="selectParts in ctrl.queryModel.selectModels"> <div class="gf-form-inline query-editor-secondary-row" ng-repeat="selectParts in ctrl.queryModel.selectModels">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label query-keyword width-6"> <label class="gf-form-label query-keyword width-7">SELECT</label>
<span ng-show="$index === 0">SELECT</span>
</label>
<influx-query-part-editor <influx-query-part-editor
ng-repeat="part in selectParts" ng-repeat="part in selectParts"
@ -39,43 +37,27 @@
dropdown-typeahead="ctrl.selectMenu" dropdown-typeahead="ctrl.selectMenu"
dropdown-typeahead-on-select="ctrl.addSelectPart(selectParts, $item, $subItem)"> dropdown-typeahead-on-select="ctrl.addSelectPart(selectParts, $item, $subItem)">
</label> </label>
</div> </div>
</div> </div>
<div class="gf-form-inline query-editor-secondary-row">
<div ng-hide="ctrl.target.rawQuery" ng-if="false"> <div class="gf-form">
<div class="tight-form" ng-repeat="selectParts in ctrl.queryModel.selectModels"> <label class="gf-form-label query-keyword width-7">GROUP BY</label>
<ul class="tight-form-list"> <influx-query-part-editor
<li class="tight-form-item query-keyword tight-form-align" style="width: 75px;"> class="gf-form-label tight-form-func"
<span ng-show="$index === 0">SELECT</span> ng-repeat="part in ctrl.queryModel.groupByParts"
</li> part="part"
<li ng-repeat="part in selectParts"> remove-action="ctrl.removeGroupByPart(part, $index)"
<influx-query-part-editor part="part" class="tight-form-item tight-form-func" remove-action="ctrl.removeSelectPart(selectParts, part)" part-updated="ctrl.selectPartUpdated(selectParts, part)" get-options="ctrl.getPartOptions(part)"></influx-query-part-editor> part-updated="ctrl.refresh();"
</li> get-options="ctrl.getPartOptions(part)">
<li class="dropdown" dropdown-typeahead="ctrl.selectMenu" dropdown-typeahead-on-select="ctrl.addSelectPart(selectParts, $item, $subItem)"> </influx-query-part-editor>
</li> <metric-segment segment="ctrl.groupBySegment" get-options="ctrl.getGroupByOptions()" on-change="ctrl.groupByAction(part, $index)"></metric-segment>
</ul> </div>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item query-keyword tight-form-align" style="width: 75px;">
<span>GROUP BY</span>
</li>
<li ng-repeat="part in ctrl.queryModel.groupByParts">
<influx-query-part-editor part="part" class="tight-form-item tight-form-func" remove-action="ctrl.removeGroupByPart(part, $index)" part-updated="ctrl.refresh();" get-options="ctrl.getPartOptions(part)"></influx-query-part-editor>
</li>
<li>
<metric-segment segment="ctrl.groupBySegment" get-options="ctrl.getGroupByOptions()" on-change="ctrl.groupByAction(part, $index)"></metric-segment>
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="gf-form-inline query-editor-secondary-row"> <div class="gf-form-inline query-editor-secondary-row">
<div class="gf-form max-width-30"> <div class="gf-form max-width-30">
<label class="gf-form-label query-keyword">ALIAS BY</label> <label class="gf-form-label query-keyword width-7">ALIAS BY</label>
<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.refresh()"> <input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.refresh()">
</div> </div>
<div class="gf-form"> <div class="gf-form">