GraphNG: remove y-axis position control from series color picker in the legend (#30302)

packages/grafana-ui/src/components/ColorPicker/SeriesColorPickerPopover.tsx

@@ -12,11 +12,9 @@ export interface SeriesColorPickerPopoverProps extends ColorPickerProps, Popover
 
 
 export const SeriesColorPickerPopover: FunctionComponent<SeriesColorPickerPopoverProps> = props => {
 export const SeriesColorPickerPopover: FunctionComponent<SeriesColorPickerPopoverProps> = props => {
   const { yaxis, onToggleAxis, color, ...colorPickerProps } = props;
   const { yaxis, onToggleAxis, color, ...colorPickerProps } = props;
-  return (
-    <ColorPickerPopover
-      {...colorPickerProps}
-      color={color || '#000000'}
-      customPickers={{
+
+  const customPickers = onToggleAxis
+    ? {
         yaxis: {
         yaxis: {
           name: 'Y-Axis',
           name: 'Y-Axis',
           tabComponent() {
           tabComponent() {
@@ -36,9 +34,9 @@ export const SeriesColorPickerPopover: FunctionComponent<SeriesColorPickerPopove
             );
             );
           },
           },
         },
         },
-      }}
-    />
-  );
+      }
+    : undefined;
+  return <ColorPickerPopover {...colorPickerProps} color={color || '#000000'} customPickers={customPickers} />;
 };
 };
 
 
 interface AxisSelectorProps {
 interface AxisSelectorProps {

packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx

@@ -27,7 +27,6 @@ export const VizLegendListItem: React.FunctionComponent<Props> = ({ item, onSeri
             onSeriesColorChange(item.label, color);
             onSeriesColorChange(item.label, color);
           }
           }
         }}
         }}
-        yAxis={item.yAxis}
       />
       />
       <div
       <div
         onClick={event => {
         onClick={event => {

packages/grafana-ui/src/components/VizLegend/VizLegendSeriesIcon.tsx

@@ -5,28 +5,14 @@ import { SeriesIcon } from './SeriesIcon';
 interface Props {
 interface Props {
   disabled: boolean;
   disabled: boolean;
   color: string;
   color: string;
-  yAxis: number;
   onColorChange: (color: string) => void;
   onColorChange: (color: string) => void;
-  onToggleAxis?: () => void;
 }
 }
 
 
-export const VizLegendSeriesIcon: React.FunctionComponent<Props> = ({
-  disabled,
-  yAxis,
-  color,
-  onColorChange,
-  onToggleAxis,
-}) => {
+export const VizLegendSeriesIcon: React.FunctionComponent<Props> = ({ disabled, color, onColorChange }) => {
   return disabled ? (
   return disabled ? (
     <SeriesIcon color={color} />
     <SeriesIcon color={color} />
   ) : (
   ) : (
-    <SeriesColorPicker
-      yaxis={yAxis}
-      color={color}
-      onChange={onColorChange}
-      onToggleAxis={onToggleAxis}
-      enableNamedColors
-    >
+    <SeriesColorPicker color={color} onChange={onColorChange} enableNamedColors>
       {({ ref, showColorPicker, hideColorPicker }) => (
       {({ ref, showColorPicker, hideColorPicker }) => (
         <SeriesIcon
         <SeriesIcon
           color={color}
           color={color}

packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx

@@ -35,7 +35,6 @@ export const LegendTableItem: React.FunctionComponent<Props> = ({
                 onSeriesColorChange(item.label, color);
                 onSeriesColorChange(item.label, color);
               }
               }
             }}
             }}
-            yAxis={item.yAxis}
           />
           />
           <div
           <div
             onClick={event => {
             onClick={event => {