From 14625f1b7901abbf4b1b2d4f4a897294055e2b76 Mon Sep 17 00:00:00 2001 From: Marta Bondyra Date: Mon, 2 Nov 2020 17:15:01 +0100 Subject: [PATCH] no message --- x-pack/plugins/lens/public/drag_drop/drag_drop.test.tsx | 4 ++-- x-pack/plugins/lens/public/drag_drop/drag_drop.tsx | 6 ++++-- x-pack/plugins/lens/public/drag_drop/providers.tsx | 2 +- .../editor_frame/config_panel/layer_panel.test.tsx | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/lens/public/drag_drop/drag_drop.test.tsx b/x-pack/plugins/lens/public/drag_drop/drag_drop.test.tsx index c79f0c697e6e2..8d381dff351c9 100644 --- a/x-pack/plugins/lens/public/drag_drop/drag_drop.test.tsx +++ b/x-pack/plugins/lens/public/drag_drop/drag_drop.test.tsx @@ -302,10 +302,10 @@ describe('DragDrop', () => { component.find('[data-test-subj="lnsDragDrop-reorderableDrop"]').at(2).simulate('dragover'); expect(component.find('[data-test-subj="lnsDragDrop"]').at(0).prop('style')).toEqual({}); expect(component.find('[data-test-subj="lnsDragDrop"]').at(1).prop('style')).toEqual({ - transform: 'translateY(-4px)', + transform: 'translateY(-8px)', }); expect(component.find('[data-test-subj="lnsDragDrop"]').at(2).prop('style')).toEqual({ - transform: 'translateY(-4px)', + transform: 'translateY(-8px)', }); component.find('[data-test-subj="lnsDragDrop-reorderableDrop"]').at(2).simulate('dragleave'); diff --git a/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx b/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx index e27cfc4cbf597..c0e01ad93fe83 100644 --- a/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx +++ b/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx @@ -312,8 +312,9 @@ const getKeyboardReorderMessageMoved = ( prevPosition: number ) => i18n.translate('xpack.lens.dragDrop.elementMoved', { - defaultMessage: `You have moved the item ${itemLabel} from position {prevPosition} to position {position}`, + defaultMessage: `You have moved the item {itemLabel} from position {prevPosition} to position {position}`, values: { + itemLabel, position, prevPosition, }, @@ -321,8 +322,9 @@ const getKeyboardReorderMessageMoved = ( const getKeyboardReorderMessageLifted = (itemLabel: string, position: number) => i18n.translate('xpack.lens.dragDrop.elementLifted', { - defaultMessage: `You have lifted an item ${itemLabel} in position {position}`, + defaultMessage: `You have lifted an item {itemLabel} in position {position}`, values: { + itemLabel, position, }, }); diff --git a/x-pack/plugins/lens/public/drag_drop/providers.tsx b/x-pack/plugins/lens/public/drag_drop/providers.tsx index d65af459f8c88..46247fd981134 100644 --- a/x-pack/plugins/lens/public/drag_drop/providers.tsx +++ b/x-pack/plugins/lens/public/drag_drop/providers.tsx @@ -171,7 +171,7 @@ export function ReorderProvider({
-

+

{state.keyboardReorderMessage}

diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx index ce21d113217d4..56425326c1ce1 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx @@ -198,7 +198,8 @@ describe('LayerPanel', () => { const group = component .find(EuiFormRow) - .findWhere((e) => e.prop('error') === 'Required dimension'); + .findWhere((e) => e.prop('error')?.props?.children === 'Required dimension'); + expect(group).toHaveLength(1); });