Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Add resetAxis, Param funcs

Browse source
This commit is contained in:
1ambda 2017-03-17 21:44:18 +09:00
parent 2370682fc1
commit da2370c4bb
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
View file

@ -20,7 +20,7 @@ limitations under the License.
<span style="vertical-align: middle; display: inline-block; margin-top: 3px;">Charts</span>
<span style="float: right;">
<div class="btn-group" role="group" aria-label="...">
<div type="button" ng-click="clearChartConfig()"
<div type="button" ng-click="resetAxisConfig()"
class="btn btn-default" style="padding: 2px 5px 2px 5px;">
<i class="fa fa-trash-o" aria-hidden="true"></i>
</div>
@ -195,7 +195,7 @@ limitations under the License.
class="btn btn-default" style="padding: 2px 5px 2px 5px;">
<i class="fa fa-floppy-o" aria-hidden="true"></i>
</div>
<div type="button" ng-click="clearParameterConfig()"
<div type="button" ng-click="resetParameterConfig()"
class="btn btn-default" style="padding: 2px 5px 2px 5px;">
<i class="fa fa-trash-o" aria-hidden="true"></i>
</div>

30
zeppelin-web/src/app/tabledata/advanced-transformation-util.js
View file

@ -188,9 +188,12 @@ export function removeDuplicatedColumnsInMultiDimensionAxis(config, axisSpec) {
return config
}
export function clearChartConfig(config) {
delete config.axis /** Object: persisted axis for each chart */
config.axis = {}
export function clearAxisConfig(config) {
delete config.axis /** Object: persisted axis for each chart */
}
export function initAxisConfig(config, remove) {
if (!config.axis) { config.axis = {} }
const spec = config.spec
const availableCharts = getAvailableChartNames(spec.charts)
@ -214,9 +217,17 @@ export function clearChartConfig(config) {
}
}
export function resetAxisConfig(config) {
clearAxisConfig(config)
initAxisConfig(config)
}
export function clearParameterConfig(config) {
delete config.parameter /** Object: persisted parameter for each chart */
config.parameter = {}
}
export function initParameterConfig(config, remove) {
if (!config.parameter) { config.parameter = {} }
const spec = config.spec
const availableCharts = getAvailableChartNames(spec.charts)
@ -238,6 +249,11 @@ export function clearParameterConfig(config) {
}
}
export function resetParameterConfig(config) {
clearParameterConfig(config)
initParameterConfig(config)
}
export function initializeConfig(config, spec) {
const currentVersion = JSON.stringify(spec)
if (!config.spec || !config.spec.version || config.spec.version !== currentVersion) {
@ -245,6 +261,8 @@ export function initializeConfig(config, spec) {
delete config.chart /** Object: contains current, available chart */
delete config.spec /** Object: axis, parameter spec for each chart */
config.panel = { columnPanelOpened: true, parameterPanelOpened: false, }
clearAxisConfig(config)
clearParameterConfig(config)
delete config.axisSpecs /** Object: persisted axisSpecs for each chart */
delete config.paramSpecs /** Object: persisted paramSpecs for each chart */
@ -261,10 +279,10 @@ export function initializeConfig(config, spec) {
}
/** initialize config.axis, config.axisSpecs for each chart */
clearChartConfig(config)
initAxisConfig(config)
/** initialize config.parameter for each chart */
clearParameterConfig(config)
initParameterConfig(config)
return config
}

10
zeppelin-web/src/app/tabledata/advanced-transformation.js
View file

@ -17,7 +17,7 @@ import Transformation from './transformation';
import {
getCurrentChart, getCurrentChartAxis, getCurrentChartParam,
getCurrentChartAxisSpecs, getCurrentChartParamSpecs,
initializeConfig, clearChartConfig, clearParameterConfig,
initializeConfig, resetAxisConfig, resetParameterConfig,
isAggregatorAxis, isGroupAxis, isKeyAxis, isSingleDimensionAxis,
removeDuplicatedColumnsInMultiDimensionAxis, applyMaxAxisCount, getColumnsFromAxis,
getTransformer,
@ -47,13 +47,13 @@ class AdvancedTransformation extends Transformation {
config: configInstance,
columns: self.columns,
clearChartConfig: () => {
clearChartConfig(configInstance)
resetAxisConfig: () => {
resetAxisConfig(configInstance)
self.emitConfig(configInstance)
},
clearParameterConfig: () => {
clearParameterConfig(configInstance)
resetParameterConfig: () => {
resetParameterConfig(configInstance)
self.emitConfig(configInstance)
},