move layer settings action to layer panel

elastic · Nov 14, 2022 · 3a326a4 · 3a326a4
1 parent 4152ecc
commit 3a326a4
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 47 deletions.
diff --git a/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx b/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
@@ -618,23 +618,6 @@ export function getFormBasedDatasource({
 
     getDropProps,
     onDrop,
-    getSupportedActionsForLayer(layerId, state, _, openLayerSettings) {
-      if (!openLayerSettings) {
-        return [];
-      }
-      return [
-        {
-          id: 'openLayerSettings',
-          displayName: i18n.translate('xpack.lens.indexPattern.layerSettingsAction', {
-            defaultMessage: 'Layer settings',
-          }),
-          execute: openLayerSettings,
-          icon: 'gear',
-          isCompatible: Boolean(state.layers[layerId]),
-          'data-test-subj': 'lnsLayerSettings',
-        },
-      ];
-    },
 
     getCustomWorkspaceRenderer: (
       state: FormBasedPrivateState,

diff --git a/...ens/public/editor_frame_service/editor_frame/config_panel/layer_actions/layer_actions.tsx b/...ens/public/editor_frame_service/editor_frame/config_panel/layer_actions/layer_actions.tsx
@@ -22,6 +22,7 @@ import type { LayerType } from '../../../..';
 import type { LayerAction, Visualization } from '../../../../types';
 import { getCloneLayerAction } from './clone_layer_action';
 import { getRemoveLayerAction } from './remove_layer_action';
+import { getOpenLayerSettingsAction } from './open_layer_settings';
 
 export interface LayerActionsProps {
   layerIndex: number;
@@ -36,6 +37,8 @@ export const getSharedActions = ({
   activeVisualization,
   isOnlyLayer,
   isTextBasedLanguage,
+  hasLayerSettings,
+  openLayerSettings,
   onCloneLayer,
   onRemoveLayer,
 }: {
@@ -48,8 +51,14 @@ export const getSharedActions = ({
   visualizationState: unknown;
   layerType?: LayerType;
   isTextBasedLanguage?: boolean;
+  hasLayerSettings: boolean;
+  openLayerSettings: () => void;
   core: Pick<CoreStart, 'overlays' | 'theme'>;
 }) => [
+  getOpenLayerSettingsAction({
+    hasLayerSettings,
+    openLayerSettings,
+  }),
   getCloneLayerAction({
     execute: onCloneLayer,
     layerIndex,

diff --git a/...blic/editor_frame_service/editor_frame/config_panel/layer_actions/open_layer_settings.tsx b/...blic/editor_frame_service/editor_frame/config_panel/layer_actions/open_layer_settings.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import type { LayerAction } from '../../../../types';
+
+export const getOpenLayerSettingsAction = (props: {
+  openLayerSettings: () => void;
+  hasLayerSettings: boolean;
+}): LayerAction => {
+  const displayName = i18n.translate('xpack.lens.layerActions.layerSettingsAction', {
+    defaultMessage: 'Layer settings',
+  });
+
+  return {
+    id: 'openLayerSettings',
+    displayName,
+    execute: props.openLayerSettings,
+    icon: 'gear',
+    isCompatible: props.hasLayerSettings,
+    'data-test-subj': 'lnsLayerSettings',
+  };
+};
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
@@ -51,6 +51,9 @@ import { onDropForVisualization, shouldRemoveSource } from './buttons/drop_targe
 import { getSharedActions } from './layer_actions/layer_actions';
 import { FlyoutContainer } from './flyout_container';
 
+// hide the random sampling settings from the UI
+const DISPLAY_RANDOM_SAMPLING_SETTINGS = false;
+
 const initialActiveDimensionState = {
   isNew: false,
 };
@@ -330,12 +333,6 @@ export function LayerPanel(
               );
             },
           })) || []),
-        ...(layerDatasource?.getSupportedActionsForLayer?.(
-          layerId,
-          layerDatasourceState,
-          (newState) => updateDatasource(datasourceId, newState),
-          () => setPanelSettingsOpen(true)
-        ) || []),
         ...getSharedActions({
           layerId,
           activeVisualization,
@@ -345,23 +342,25 @@ export function LayerPanel(
           layerType: activeVisualization.getLayerType(layerId, visualizationState),
           isOnlyLayer,
           isTextBasedLanguage,
+          hasLayerSettings: Boolean(
+            activeVisualization.renderLayerSettings ||
+              (layerDatasource?.renderLayerSettings && DISPLAY_RANDOM_SAMPLING_SETTINGS)
+          ),
+          openLayerSettings: () => setPanelSettingsOpen(true),
           onCloneLayer,
           onRemoveLayer: () => onRemoveLayer(layerId),
         }),
       ].filter((i) => i.isCompatible),
     [
       activeVisualization,
       core,
-      datasourceId,
       isOnlyLayer,
       isTextBasedLanguage,
       layerDatasource,
-      layerDatasourceState,
       layerId,
       layerIndex,
       onCloneLayer,
       onRemoveLayer,
-      updateDatasource,
       updateVisualization,
       visualizationState,
     ]
@@ -688,25 +687,25 @@ export function LayerPanel(
         >
           <div id={layerId}>
             <div className="lnsIndexPatternDimensionEditor--padded lnsIndexPatternDimensionEditor--collapseNext">
-              {layerDatasource?.renderLayerSettings && (
-                <NativeRenderer
-                  render={layerDatasource.renderLayerSettings}
-                  nativeProps={layerDatasourceConfigProps}
-                />
-              )}
-              {activeVisualization?.renderLayerSettings && (
+              {layerDatasource?.renderLayerSettings && DISPLAY_RANDOM_SAMPLING_SETTINGS && (
                 <>
-                  <EuiSpacer size="m" />
                   <NativeRenderer
-                    render={activeVisualization?.renderLayerSettings}
-                    nativeProps={{
-                      ...layerVisualizationConfigProps,
-                      setState: props.updateVisualization,
-                      panelRef: settingsPanelRef,
-                    }}
+                    render={layerDatasource.renderLayerSettings}
+                    nativeProps={layerDatasourceConfigProps}
                   />
+                  <EuiSpacer size="m" />
                 </>
               )}
+              {activeVisualization?.renderLayerSettings && (
+                <NativeRenderer
+                  render={activeVisualization?.renderLayerSettings}
+                  nativeProps={{
+                    ...layerVisualizationConfigProps,
+                    setState: props.updateVisualization,
+                    panelRef: settingsPanelRef,
+                  }}
+                />
+              )}
             </div>
           </div>
         </FlyoutContainer>

diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
@@ -489,13 +489,6 @@ export interface Datasource<T = unknown, P = unknown> {
    */
   getUsedDataViews: (state: T) => string[];
 
-  getSupportedActionsForLayer?: (
-    layerId: string,
-    state: T,
-    setState: StateSetter<T>,
-    openLayerSettings?: () => void
-  ) => LayerAction[];
-
   getDatasourceInfo: (
     state: T,
     references?: SavedObjectReference[],