clean up

pinterest · May 20, 2020 · 761ba1a · 761ba1a
1 parent cd3cc18
commit 761ba1a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/datahub/webapp/components/DataDocChartCell/DataDocChartComposer.tsx b/datahub/webapp/components/DataDocChartCell/DataDocChartComposer.tsx
@@ -731,15 +731,15 @@ const DataDocChartComposerComponent: React.FunctionComponent<
                     type="react-select"
                     options={[
                         {
-                            value: true,
-                            label: 'Show Values',
+                            value: 0,
+                            label: 'Hide Values',
                         },
                         {
-                            value: false,
-                            label: 'Hide Values',
+                            value: 1,
+                            label: 'Show Values',
                         },
                         {
-                            value: 'auto',
+                            value: 2,
                             label: 'Show Values without Overlap',
                         },
                     ]}
@@ -1020,13 +1020,11 @@ function formValsToMeta(vals: IChartFormValues, meta: IDataChartCellMeta) {
         // labels
         draft.title = vals.title;
         draft.visual.legend_position = vals.legendPosition;
-        if (vals.valueDisplay) {
-            draft.visual.values = {
-                display: vals.valueDisplay === 'auto' ? 2 : 1,
-                position: vals.valuePosition,
-                alignment: vals.valueAlignment,
-            };
-        }
+        draft.visual.values = {
+            display: vals.valueDisplay ?? 0,
+            position: vals.valuePosition,
+            alignment: vals.valueAlignment,
+        };
     });
     return updatedMeta;
 }

diff --git a/datahub/webapp/const/dataDocChart.ts b/datahub/webapp/const/dataDocChart.ts
@@ -171,7 +171,7 @@ export interface IChartFormValues {
 
     title: string;
     legendPosition: 'top' | 'bottom' | 'right' | 'left';
-    valueDisplay: true | false | 'auto';
+    valueDisplay: number;
     valuePosition: 'center' | 'start' | 'end';
     valueAlignment:
         | 'center'

diff --git a/datahub/webapp/lib/chart/chart-meta-processing.ts b/datahub/webapp/lib/chart/chart-meta-processing.ts
@@ -123,12 +123,7 @@ export function mapMetaToFormVals(
         // labels
         title: meta.title || '',
         legendPosition: meta.visual.legend_position || 'top',
-        valueDisplay:
-            meta.visual.values?.display === 1
-                ? true
-                : meta.visual.values?.display === 2
-                ? 'auto'
-                : false,
+        valueDisplay: meta.visual.values?.display ?? 0,
         valuePosition: meta.visual.values?.position,
         valueAlignment: meta.visual.values?.alignment,
     };