ChartFieldAggregateOptions: Remove asOverlay option

Author: labkey-alan

packages/components/src/internal/components/chart/ChartFieldAggregateOptions.tsx

@@ -1,6 +1,4 @@
 import React, { FC, memo, useCallback, useMemo } from 'react';
-import { OverlayTrigger } from '../../OverlayTrigger';
-import { Popover } from '../../Popover';
 import { RadioGroupInput } from '../forms/input/RadioGroupInput';
 
 import { ChartConfig, ChartConfigSetter, ChartFieldInfo, ChartTypeInfo } from './models';
@@ -22,15 +20,14 @@ const ERROR_BAR_TYPES = [
 ];
 
 interface OwnProps {
-    asOverlay?: boolean; // TODO: defaults to true, but is always passed as false. Can be removed?
     chartConfig: ChartConfig;
     field: ChartFieldInfo;
     selectedType: ChartTypeInfo;
     setChartConfig: ChartConfigSetter;
 }
 
 export const ChartFieldAggregateOptions: FC<OwnProps> = memo(props => {
-    const { asOverlay = true, chartConfig, field, selectedType, setChartConfig } = props;
+    const { chartConfig, field, selectedType, setChartConfig } = props;
     const yMeasure = Array.isArray(chartConfig.measures.y) ? chartConfig.measures.y[0] : chartConfig.measures.y;
     // Some older charts stored aggregate as an object that looked like: { label: 'Mean', value: 'MEAN' }
     const aggregateValue = Utils.isObject(yMeasure.aggregate) ? yMeasure.aggregate.value : yMeasure.aggregate;
@@ -84,7 +81,7 @@ export const ChartFieldAggregateOptions: FC<OwnProps> = memo(props => {
     const onAggregateChange = useCallback((_: never, value: string) => onChange('aggregate', value), [onChange]);
     const onErrorBarValueChange = useCallback((value: string) => onChange('errorBars', value), [onChange]);
 
-    const inputs = (
+    return (
         <>
             <div>
                 <label>
@@ -114,24 +111,5 @@ export const ChartFieldAggregateOptions: FC<OwnProps> = memo(props => {
             </div>
         </>
     );
-
-    if (!asOverlay) {
-        return inputs;
-    }
-
-    return (
-        <div className="field-option-icon">
-            <OverlayTrigger
-                overlay={
-                    <Popover id="chart-field-option-popover" placement="left">
-                        {inputs}
-                    </Popover>
-                }
-                triggerType="click"
-            >
-                <span className="fa fa-gear" />
-            </OverlayTrigger>
-        </div>
-    );
 });
 ChartFieldAggregateOptions.displayName = 'ChartFieldAggregateOptions';

packages/components/src/internal/components/chart/ChartFieldOption.tsx

@@ -129,7 +129,6 @@ export const ChartFieldOption: FC<OwnProps> = memo(props => {
                     >
                         {measure && showAggregateOptions && (
                             <ChartFieldAggregateOptions
-                                asOverlay={false}
                                 chartConfig={chartConfig}
                                 field={field}
                                 selectedType={selectedType}

packages/components/src/internal/components/chart/ChartFieldRangeScaleOptions.tsx

@@ -23,8 +23,6 @@ interface OwnProps extends PropsWithChildren {
 
 export const ChartFieldRangeScaleOptions: FC<OwnProps> = memo(props => {
     const { scale, onScaleChange, showScaleTrans, children } = props;
-    const placement = useMemo(() => (!showScaleTrans && children ? 'left' : 'bottom'), [showScaleTrans, children]);
-
     const scaleTransOptions = useMemo(() => {
         return SCALE_TRANS_TYPES.map(option => ({ ...option, selected: scale.trans === option.value }));
     }, [scale.trans]);