Fix based on the review.

Kuznietsov · May 31, 2021 · 3d9d1d8 · 3d9d1d8
1 parent b0058e1
commit 3d9d1d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/src/plugins/vis_type_timeseries/public/application/components/color_rules.tsx b/src/plugins/vis_type_timeseries/public/application/components/color_rules.tsx
@@ -49,7 +49,7 @@ export interface ColorRulesOperator {
  label: string;
  method: Operator;
  value?: unknown;
- isValueConstant?: boolean;
+ hideValueSelector?: boolean;
 }
 
 const defaultSecondaryName = i18n.translate(
@@ -92,7 +92,7 @@ export const colorRulesOperatorsList: ColorRulesOperator[] = [
  defaultMessage: 'empty',
  }),
  method: Operator.Empty,
- isValueConstant: true,
+ hideValueSelector: true,
  },
 ];
 
@@ -148,7 +148,7 @@ export class ColorRules extends Component<ColorRulesProps> {
  (operator) => model.operator === operator.method
  );
 
- const hideValueSelectorField = selectedOperator?.isValueConstant ?? false;
+ const hideValueSelectorField = selectedOperator?.hideValueSelector ?? false;
  const labelStyle = { marginBottom: 0 };
 
  let secondary;

diff --git a/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.ts b/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.ts
@@ -13,7 +13,7 @@ import {
  commonAddSupportOfDualIndexSelectionModeInTSVB,
  commonHideTSVBLastValueIndicator,
  commonRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel,
- commonAddEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRules,
+ commonAddEmptyValueColorRule,
 } from '../migrations/visualization_common_migrations';
 
 const byValueAddSupportOfDualIndexSelectionModeInTSVB = (state: SerializableState) => {
@@ -37,12 +37,10 @@ const byValueRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel = (state: Serial
  };
 };
 
-const byValueAddEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRule = (
- state: SerializableState
-) => {
+const byValueAddEmptyValueColorRule = (state: SerializableState) => {
  return {
  ...state,
- savedVis: commonAddEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRules(state.savedVis),
+ savedVis: commonAddEmptyValueColorRule(state.savedVis),
  };
 };
 
@@ -57,8 +55,7 @@ export const visualizeEmbeddableFactory = (): EmbeddableRegistryDefinition => {
  byValueHideTSVBLastValueIndicator,
  byValueRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel
  )(state),
- '7.14.0': (state) =>
- flow(byValueAddEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRule)(state),
+ '7.14.0': (state) => flow(byValueAddEmptyValueColorRule)(state),
  },
  };
 };
diff --git a/src/plugins/visualizations/server/migrations/visualization_common_migrations.ts b/src/plugins/visualizations/server/migrations/visualization_common_migrations.ts
@@ -46,9 +46,7 @@ export const commonRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel = (visStat
  return visState;
 };
 
-export const commonAddEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRules = (
- visState: any
-) => {
+export const commonAddEmptyValueColorRule = (visState: any) => {
  if (visState && visState.type === 'metrics') {
  const params: any = get(visState, 'params') || {};
 

diff --git a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
@@ -15,7 +15,7 @@ import {
  commonAddSupportOfDualIndexSelectionModeInTSVB,
  commonHideTSVBLastValueIndicator,
  commonRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel,
- commonAddEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRules,
+ commonAddEmptyValueColorRule,
 } from './visualization_common_migrations';
 
 const migrateIndexPattern: SavedObjectMigrationFn<any, any> = (doc) => {
@@ -980,9 +980,7 @@ const addEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRules: SavedObje
  } catch (e) {
  // Let it go, the data is invalid and we'll leave it as is
  }
- const newVisState = commonAddEmptyValueRuleForSavedObjectsWithLessAndGreaterThenZeroRules(
- visState
- );
+ const newVisState = commonAddEmptyValueColorRule(visState);
 
  return {
  ...doc,