fix some CI steps

elastic · Sep 15, 2022 · be509cb · be509cb
1 parent a78a867
commit be509cb
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/...ens/public/editor_frame_service/editor_frame/config_panel/layer_buttons/layer_buttons.tsx b/...ens/public/editor_frame_service/editor_frame/config_panel/layer_buttons/layer_buttons.tsx
@@ -39,9 +39,10 @@ const InContextMenuActions = (
     actions: LayerButtonsAction[];
   }
 ) => {
+  const dataTestSubject = 'lnsLayerSplitButton';
   const [isPopoverOpen, setPopover] = useState(false);
   const splitButtonPopoverId = useGeneratedHtmlId({
-    prefix: 'splitButtonPopover',
+    prefix: dataTestSubject,
   });
 
   const onButtonClick = useCallback(() => {
@@ -57,7 +58,7 @@ const InContextMenuActions = (
   const items = props.actions.map((i) => (
     <EuiContextMenuItem
       icon={<EuiIcon type={i.icon} title={i.displayName} color={i.color} />}
-      data-test-subj="lnsLayerClone"
+      data-test-subj={i['data-test-subj']}
       aria-label={i.displayName}
       title={i.displayName}
       onClick={() => {
@@ -83,6 +84,7 @@ const InContextMenuActions = (
               defaultMessage: `Layer actions`,
             })}
             onClick={onButtonClick}
+            data-test-subj={dataTestSubject}
           />
         }
         ownFocus={true}
@@ -124,13 +126,19 @@ export const LayerButtons = (props: LayerButtonsProps) => {
     if (compatibleActions.length > 1) {
       return <InContextMenuActions {...props} actions={compatibleActions} />;
     } else {
-      const { displayName, execute, icon, color } = compatibleActions[0];
+      const {
+        displayName,
+        execute,
+        icon,
+        color,
+        'data-test-subj': dataTestSubj,
+      } = compatibleActions[0];
       return (
         <EuiButtonIcon
           size="xs"
           iconType={icon}
           color={color}
-          data-test-subj="lnsLayerRemove"
+          data-test-subj={dataTestSubj}
           aria-label={displayName}
           title={displayName}
           onClick={execute}

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -29,7 +29,7 @@ import {
   IUiSettingsClient,
   SavedObjectsClientContract,
   HttpSetup,
-  CoreSetup,
+  CoreStart,
 } from '@kbn/core/public';
 import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { generateId } from '../../id_generator';
@@ -240,7 +240,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
           },
         },
       } as unknown as DataPublicPluginStart,
-      core: {} as CoreSetup,
+      core: {} as CoreStart,
       dimensionGroups: [],
       groupId: 'a',
       isFullscreen: false,

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx
@@ -19,7 +19,7 @@ import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 describe('Fields Accordion', () => {
   let defaultProps: FieldsAccordionProps;
   let indexPattern: IndexPattern;
-  let core: ReturnType<typeof coreMock['createSetup']>;
+  let core: ReturnType<typeof coreMock['createStart']>;
   let fieldProps: FieldItemSharedProps;
 
   beforeEach(() => {
@@ -42,7 +42,7 @@ describe('Fields Accordion', () => {
         },
       ],
     } as IndexPattern;
-    core = coreMock.createSetup();
+    core = coreMock.createStart();
     core.http.post.mockClear();
 
     fieldProps = {

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
@@ -190,7 +190,7 @@ export function getIndexPatternDatasource({
     },
 
     cloneLayer(state: IndexPatternPrivateState, layerId: string, newLayerId: string) {
-      console.log('data source: clone layer');
+      // @todo: wip
       return {
         ...state,
         layers: {

diff --git a/x-pack/plugins/lens/public/mocks/datasource_mock.ts b/x-pack/plugins/lens/public/mocks/datasource_mock.ts
@@ -44,6 +44,7 @@ export function createMockDatasource(id: string): DatasourceMock {
     toExpression: jest.fn((_frame, _state, _indexPatterns) => null),
     insertLayer: jest.fn((_state, _newLayerId) => ({})),
     removeLayer: jest.fn((_state, _layerId) => {}),
+    cloneLayer: jest.fn((_state, _layerId, _newLayerId) => {}),
     removeColumn: jest.fn((props) => {}),
     getLayers: jest.fn((_state) => []),
     uniqueLabels: jest.fn((_state) => ({})),

diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.ts b/x-pack/plugins/lens/public/state_management/lens_slice.ts
@@ -296,16 +296,18 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
         };
       }
     ) => {
+      // @todo: wip
+
       if (!state.activeDatasourceId || !state.visualization.activeId) {
         return state;
       }
 
       const activeVisualization = visualizationMap[state.visualization.activeId];
       const activeDatasource = datasourceMap[state.activeDatasourceId];
       // reuse the active datasource dataView id for the new layer
-      const currentDataViewsId = activeDatasource.getCurrentIndexPatternId(
-        state.datasourceStates[state.activeDatasourceId!].state
-      );
+      // const currentDataViewsId = activeDatasource.getCurrentIndexPatternId(
+      //   state.datasourceStates[state.activeDatasourceId!].state
+      // );
 
       const layerType = getLayerType(activeVisualization, state.visualization.state, layerId);
 
@@ -320,8 +322,6 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
         }
       );
 
-      console.log(state.datasourceStates);
-
       const { activeDatasourceState, activeVisualizationState } = addInitialValueIfAvailable({
         datasourceState: state.datasourceStates[state.activeDatasourceId].state,
         visualizationState: state.visualization.state,
@@ -332,17 +332,6 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
         layerType,
       });
 
-      console.log({
-        activeDatasourceState,
-        activeVisualizationState,
-        activeVisualization,
-        currentDataViewsId,
-        visualizationId,
-        layerId,
-        state,
-        newLayerId,
-      });
-
       state.visualization.state = activeVisualizationState;
       state.datasourceStates[state.activeDatasourceId].state = activeDatasourceState;
       state.stagedPreview = undefined;

diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
@@ -1300,6 +1300,9 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
     /** resets visualization/layer or removes a layer */
     async removeLayer(index: number = 0) {
       await retry.try(async () => {
+        if (await testSubjects.exists('lnsLayerSplitButton')) {
+          await testSubjects.click('lnsLayerSplitButton');
+        }
         await testSubjects.click(`lnsLayerRemove--${index}`);
         if (await testSubjects.exists('lnsLayerRemoveModal')) {
           await testSubjects.exists('lnsLayerRemoveConfirmButton');