github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Optimize EditorConfigProvider merging logic (#40250) (#40346)

Browse source
This commit is contained in:
Tim Roes 2019-07-04 13:26:22 +02:00 • committed by GitHub
parent b165d8dab7
commit 7eabd2a069
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/legacy/ui/public/vis/editors/config/editor_config_providers.ts
View file

@ -78,7 +78,7 @@ class EditorConfigProviderRegistry {
current: EditorParamConfig,
merged: EditorParamConfig,
paramName: string
): { fixedValue?: any; base?: number } {
): { fixedValue: unknown } | { base: number } | {} {
if (
this.isFixedParam(current) &&
this.isFixedParam(merged) &&
@ -128,37 +128,26 @@ class EditorConfigProviderRegistry {
current: TimeIntervalParam,
merged: EditorParamConfig,
paramName: string
): { timeBase?: string; default?: string } {
): { timeBase: string; default: string } {
if (current.default !== current.timeBase) {
throw new Error(`Tried to provide differing default and timeBase values for ${paramName}.`);
}
if (this.isTimeBaseParam(current) && this.isTimeBaseParam(merged)) {
if (this.isTimeBaseParam(merged)) {
// In case both had where interval values, just use the least common multiple between both intervals
try {
const timeBase = leastCommonInterval(current.timeBase, merged.timeBase);
return {
default: timeBase,
timeBase,
};
} catch (e) {
throw e;
}
const timeBase = leastCommonInterval(current.timeBase, merged.timeBase);
return {
default: timeBase,
timeBase,
};
}
if (this.isTimeBaseParam(current)) {
try {
parseEsInterval(current.timeBase);
return {
default: current.timeBase,
timeBase: current.timeBase,
};
} catch (e) {
throw e;
}
}
return {};
// This code is simply here to throw an error in case the `timeBase` is not a valid ES interval
parseEsInterval(current.timeBase);
return {
default: current.timeBase,
timeBase: current.timeBase,
};
}
private mergeConfigs(configs: EditorConfig[]): EditorConfig {