You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/10/26 10:24:37 UTC
[2/6] kylin git commit: KYLIN-2082 straming config edit
KYLIN-2082 straming config edit
Signed-off-by: Jason <ji...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/92c823bb
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/92c823bb
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/92c823bb
Branch: refs/heads/KYLIN-1971
Commit: 92c823bb68c1280ae1ae48d325fa1c678a4c7812
Parents: 85717fe
Author: luguosheng <55...@qq.com>
Authored: Tue Oct 25 18:49:02 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue Oct 25 20:20:25 2016 +0800
----------------------------------------------------------------------
.../partials/cubeDesigner/streamingConfig.html | 153 ++++++++-----------
1 file changed, 64 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/92c823bb/webapp/app/partials/cubeDesigner/streamingConfig.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/streamingConfig.html b/webapp/app/partials/cubeDesigner/streamingConfig.html
index 0148ac3..8bdcd25 100644
--- a/webapp/app/partials/cubeDesigner/streamingConfig.html
+++ b/webapp/app/partials/cubeDesigner/streamingConfig.html
@@ -124,176 +124,151 @@
</accordion-group>
</accordion>
-
<hr/>
- <!--Advanced setting-->
<accordion>
- <accordion-group is-open="state.isStreamingAdOpen" ng-init="state.isStreamingAdOpen=true">
+
+ <accordion-group is-open="state.isParserHeaderOpen=true">
<accordion-heading>
- Advanced Setting
+ Parser Setting
<i class="pull-right glyphicon"
- ng-class="{'glyphicon-chevron-down': state.isStreamingAdOpen, 'glyphicon-chevron-right': !state.isStreamingAdOpen}"></i>
+ ng-class="{'glyphicon-chevron-down': state.isParserHeaderOpen, 'glyphicon-chevron-right': !state.isParserHeaderOpen}"></i>
</accordion-heading>
<div class="form-group middle-popover" ng-class="{'required':state.mode=='edit'}">
<div class="row">
<label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Timeout</b>
- <i class="fa fa-info-circle" kylinpopover placement="right" title="Timeout" template="TimeoutTip.html"></i>
+ <b>Parser Name</b>
+ <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Name" template="ParserName.html"></i>
</label>
<div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':form.cube_streaming_form.timeout.$invalid && (form.cube_streaming_form.timeout.$dirty||form.cube_streaming_form.$submitted)}">
- <input ng-if="state.mode=='edit'" name="timeout" required ng-model="kafkaMeta.timeout" type="text"
- placeholder="Input kafkaConfig timeout"
- ng-pattern="/^\+?[1-9][0-9]*$/"
+ ng-class="{'has-error':form.cube_streaming_form.parserName.$invalid && (form.cube_streaming_form.parserName.$dirty||form.cube_streaming_form.$submitted)}">
+ <input ng-if="state.mode=='edit'" name="parserName" required ng-model="kafkaMeta.parserName" type="text"
+ placeholder="Input kafkaConfig parserName"
class="form-control"/>
<small class="help-block"
- ng-show="!form.cube_streaming_form.timeout.$error.required && form.cube_streaming_form.timeout.$invalid && (form.cube_streaming_form.timeout.$dirty||form.cube_streaming_form.$submitted)">
- Kafka timeout is invalid.
+ ng-show="!form.cube_streaming_form.parserName.$error.required && form.cube_streaming_form.parserName.$invalid && (form.cube_streaming_form.parserName.$dirty||form.cube_streaming_form.$submitted)">
+ Kafka parser name is invalid.
</small>
<small class="help-block"
- ng-show="form.cube_streaming_form.timeout.$error.required && (form.cube_streaming_form.timeout.$dirty||form.cube_streaming_form.$submitted)">
- Kafka timeout is required.
+ ng-show="form.cube_streaming_form.parserName.$error.required && (form.cube_streaming_form.parserName.$dirty||form.cube_streaming_form.$submitted)">
+ Kafka parser name is required.
</small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.timeout}}</span>
+ <span ng-if="state.mode=='view'">{{kafkaMeta.parserName}}</span>
</div>
</div>
</div>
-
- <div class="form-group middle-popover" ng-class="{'required':state.mode=='edit'}">
+ <div class="form-group middle-popover" ng-if="state.mode=='edit'&&state.target!=='kfkConfig'" ng-class="{'required':state.mode=='edit'}">
<div class="row">
<label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Buffer Size</b>
- <i class="fa fa-info-circle" kylinpopover placement="right" title="Buffer Size" template="BufferSizecTip.html"></i>
+ <b>Parser Timestamp Field</b>
+ <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Timestamp Field" template="ParserTimestampFieldsTip.html"></i>
</label>
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':form.cube_streaming_form.bufferSize.$invalid && (form.cube_streaming_form.bufferSize.$dirty||form.cube_streaming_form.$submitted)}">
- <input ng-if="state.mode=='edit'" name="bufferSize" required ng-model="kafkaMeta.bufferSize" type="text"
- placeholder="Input kafkaConfig bufferSize"
- ng-pattern="/^\+?[1-9][0-9]*$/"
- class="form-control"/>
- <small class="help-block"
- ng-show="!form.cube_streaming_form.bufferSize.$error.required && form.cube_streaming_form.bufferSize.$invalid && (form.cube_streaming_form.bufferSize.$dirty||form.cube_streaming_form.$submitted)">
- Kafka bufferSize is invalid.
- </small>
- <small class="help-block"
- ng-show="form.cube_streaming_form.bufferSize.$error.required && (form.cube_streaming_form.bufferSize.$dirty||form.cube_streaming_form.$submitted)">
- Kafka bufferSize is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.bufferSize}}</span>
+ <div class="col-xs-12 col-sm-6 streamingParserCtr">
+ <select chosen ng-model="streamingCfg.parseTsColumn"
+ ng-options="column as column for column in streamingCfg.columnOptions "
+ ng-change="streamingTsColUpdate()"
+ data-placeholder="select a column"
+ class="chosen-select">
+ <option value=""></option>
+ </select>
</div>
</div>
</div>
-
<div class="form-group middle-popover" ng-class="{'required':state.mode=='edit'}">
<div class="row">
<label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Margin</b>
- <i class="fa fa-info-circle" kylinpopover placement="right" title="Margin" template="MarginTip.html"></i>
+ <b>Parser Properties</b>
+ <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Properties" template="ParserPropertiesTip.html"></i>
</label>
<div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':form.cube_streaming_form.margin.$invalid && (form.cube_streaming_form.margin.$dirty||form.cube_streaming_form.$submitted)}">
- <input ng-if="state.mode=='edit'" name="margin" required ng-model="kafkaMeta.margin" type="text"
- placeholder="Input kafkaConfig margin"
- ng-pattern="/^\+?[1-9][0-9]*$/"
+ ng-class="{'has-error':form.cube_streaming_form.parserProperties.$invalid && (form.cube_streaming_form.parserProperties.$dirty||form.cube_streaming_form.$submitted)}">
+ <input ng-if="state.mode=='edit'" name="parserProperties" required ng-model="kafkaMeta.parserProperties" type="text"
+ placeholder="configA=1;configB=2"
class="form-control"/>
<small class="help-block"
- ng-show="!form.cube_streaming_form.margin.$error.required && form.cube_streaming_form.margin.$invalid && (form.cube_streaming_form.margin.$dirty||form.cube_streaming_form.$submitted)">
- Kafka margin is invalid.
+ ng-show="!form.cube_streaming_form.parserProperties.$error.required && form.cube_streaming_form.parserProperties.$invalid && (form.cube_streaming_form.parserProperties.$dirty||form.cube_streaming_form.$submitted)">
+ Parser properties is invalid.
</small>
<small class="help-block"
- ng-show="form.cube_streaming_form.margin.$error.required && (form.cube_streaming_form.margin.$dirty||form.cube_streaming_form.$submitted)">
- Kafka margin is required.
+ ng-show="form.cube_streaming_form.parserProperties.$error.required && (form.cube_streaming_form.parserProperties.$dirty||form.cube_streaming_form.$submitted)">
+ Parser properties is required.
</small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.margin}}</span>
+ <span ng-if="state.mode=='view'">{{kafkaMeta.parserProperties}}</span>
</div>
</div>
</div>
</accordion-group>
</accordion>
-
<hr/>
+ <!--Advanced setting-->
<accordion>
-
- <accordion-group is-open="state.isParserHeaderOpen">
+ <accordion-group is-open="state.isStreamingAdOpen" ng-init="state.isStreamingAdOpen">
<accordion-heading>
- Parser Setting
+ Advanced Setting
<i class="pull-right glyphicon"
- ng-class="{'glyphicon-chevron-down': state.isParserHeaderOpen, 'glyphicon-chevron-right': !state.isParserHeaderOpen}"></i>
+ ng-class="{'glyphicon-chevron-down': state.isStreamingAdOpen, 'glyphicon-chevron-right': !state.isStreamingAdOpen}"></i>
</accordion-heading>
<div class="form-group middle-popover" ng-class="{'required':state.mode=='edit'}">
<div class="row">
<label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Parser Name</b>
- <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Name" template="ParserName.html"></i>
+ <b>Timeout</b>
+ <i class="fa fa-info-circle" kylinpopover placement="right" title="Timeout" template="TimeoutTip.html"></i>
</label>
<div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':form.cube_streaming_form.parserName.$invalid && (form.cube_streaming_form.parserName.$dirty||form.cube_streaming_form.$submitted)}">
- <input ng-if="state.mode=='edit'" name="parserName" required ng-model="kafkaMeta.parserName" type="text"
- placeholder="Input kafkaConfig parserName"
+ ng-class="{'has-error':form.cube_streaming_form.timeout.$invalid && (form.cube_streaming_form.timeout.$dirty||form.cube_streaming_form.$submitted)}">
+ <input ng-if="state.mode=='edit'" name="timeout" required ng-model="kafkaMeta.timeout" type="text"
+ placeholder="Input kafkaConfig timeout"
+ ng-pattern="/^\+?[1-9][0-9]*$/"
class="form-control"/>
<small class="help-block"
- ng-show="!form.cube_streaming_form.parserName.$error.required && form.cube_streaming_form.parserName.$invalid && (form.cube_streaming_form.parserName.$dirty||form.cube_streaming_form.$submitted)">
- Kafka parser name is invalid.
+ ng-show="!form.cube_streaming_form.timeout.$error.required && form.cube_streaming_form.timeout.$invalid && (form.cube_streaming_form.timeout.$dirty||form.cube_streaming_form.$submitted)">
+ Kafka timeout is invalid.
</small>
<small class="help-block"
- ng-show="form.cube_streaming_form.parserName.$error.required && (form.cube_streaming_form.parserName.$dirty||form.cube_streaming_form.$submitted)">
- Kafka parser name is required.
+ ng-show="form.cube_streaming_form.timeout.$error.required && (form.cube_streaming_form.timeout.$dirty||form.cube_streaming_form.$submitted)">
+ Kafka timeout is required.
</small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.parserName}}</span>
+ <span ng-if="state.mode=='view'">{{kafkaMeta.timeout}}</span>
</div>
</div>
</div>
- <div class="form-group middle-popover" ng-if="state.mode=='edit'&&state.target!=='kfkConfig'" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Parser Timestamp Field</b>
- <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Timestamp Field" template="ParserTimestampFieldsTip.html"></i>
- </label>
- <div class="col-xs-12 col-sm-6 streamingParserCtr">
- <select chosen ng-model="streamingCfg.parseTsColumn"
- ng-options="column as column for column in streamingCfg.columnOptions "
- ng-change="streamingTsColUpdate()"
- data-placeholder="select a column"
- class="chosen-select">
- <option value=""></option>
- </select>
- </div>
- </div>
- </div>
<div class="form-group middle-popover" ng-class="{'required':state.mode=='edit'}">
<div class="row">
<label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Parser Properties</b>
- <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Properties" template="ParserPropertiesTip.html"></i>
+ <b>Buffer Size</b>
+ <i class="fa fa-info-circle" kylinpopover placement="right" title="Buffer Size" template="BufferSizecTip.html"></i>
</label>
<div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':form.cube_streaming_form.parserProperties.$invalid && (form.cube_streaming_form.parserProperties.$dirty||form.cube_streaming_form.$submitted)}">
- <input ng-if="state.mode=='edit'" name="parserProperties" required ng-model="kafkaMeta.parserProperties" type="text"
- placeholder="configA=1;configB=2"
+ ng-class="{'has-error':form.cube_streaming_form.bufferSize.$invalid && (form.cube_streaming_form.bufferSize.$dirty||form.cube_streaming_form.$submitted)}">
+ <input ng-if="state.mode=='edit'" name="bufferSize" required ng-model="kafkaMeta.bufferSize" type="text"
+ placeholder="Input kafkaConfig bufferSize"
+ ng-pattern="/^\+?[1-9][0-9]*$/"
class="form-control"/>
<small class="help-block"
- ng-show="!form.cube_streaming_form.parserProperties.$error.required && form.cube_streaming_form.parserProperties.$invalid && (form.cube_streaming_form.parserProperties.$dirty||form.cube_streaming_form.$submitted)">
- Parser properties is invalid.
+ ng-show="!form.cube_streaming_form.bufferSize.$error.required && form.cube_streaming_form.bufferSize.$invalid && (form.cube_streaming_form.bufferSize.$dirty||form.cube_streaming_form.$submitted)">
+ Kafka bufferSize is invalid.
</small>
<small class="help-block"
- ng-show="form.cube_streaming_form.parserProperties.$error.required && (form.cube_streaming_form.parserProperties.$dirty||form.cube_streaming_form.$submitted)">
- Parser properties is required.
+ ng-show="form.cube_streaming_form.bufferSize.$error.required && (form.cube_streaming_form.bufferSize.$dirty||form.cube_streaming_form.$submitted)">
+ Kafka bufferSize is required.
</small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.parserProperties}}</span>
+ <span ng-if="state.mode=='view'">{{kafkaMeta.bufferSize}}</span>
</div>
</div>
</div>
+
</accordion-group>
</accordion>
+
+
</div>
</form>
</div>