Merge branch '2.x' into bump-axios-2.x

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.test.tsx

@@ -181,4 +181,47 @@ describe('DataSourceSelectable', () => {
  ];
  expect(optionTexts).toEqual(expectedIndexPatternSortedOrder);
  });
+
+ it('should allow display and selection of duplicated index patterns based on unique key', async () => {
+ const mockDataSourceOptionListWithDuplicates = [
+ {
+ label: 'Index patterns',
+ options: [
+ { label: 'duplicate-index-pattern', key: 'unique-key-1' },
+ { label: 'unique-index-pattern-1', key: 'unique-key-2' },
+ { label: 'duplicate-index-pattern', key: 'unique-key-3' },
+ { label: 'unique-index-pattern-2', key: 'unique-key-4' },
+ ],
+ },
+ ] as any;
+
+ const handleSelect = jest.fn();
+
+ render(
+ <DataSourceSelectable
+ dataSources={[
+ ({
+ getDataSet: jest.fn().mockResolvedValue([]),
+ getType: jest.fn().mockReturnValue('DEFAULT_INDEX_PATTERNS'),
+ getName: jest.fn().mockReturnValue('Index patterns'),
+ } as unknown) as DataSourceType,
+ ]}
+ dataSourceOptionList={mockDataSourceOptionListWithDuplicates}
+ selectedSources={selectedSourcesMock}
+ onDataSourceSelect={handleSelect}
+ setDataSourceOptionList={setDataSourceOptionListMock}
+ onGetDataSetError={onFetchDataSetErrorMock}
+ />
+ );
+
+ const button = screen.getByLabelText('Open list of options');
+ fireEvent.click(button);
+
+ const optionsToSelect = screen.getAllByText('duplicate-index-pattern');
+ fireEvent.click(optionsToSelect[1]);
+
+ expect(handleSelect).toHaveBeenCalledWith(
+ expect.objectContaining([{ key: 'unique-key-3', label: 'duplicate-index-pattern' }])
+ );
+ });
 });

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.tsx

@@ -52,6 +52,7 @@ export const getSourceOptions = (dataSource: DataSourceType, dataSet: DataSetTyp
  ...optionContent,
  label: dataSet.title,
  value: dataSet.id,
+ key: dataSet.id,
  };
  }
  return {

src/plugins/discover/public/application/components/data_grid/data_grid_table.tsx

@@ -46,6 +46,7 @@ export interface DataGridTableProps {
  isContextView?: boolean;
  isLoading?: boolean;
  showPagination?: boolean;
+ scrollToTop?: () => void;
 }
 
 export const DataGridTable = ({
@@ -67,6 +68,7 @@ export const DataGridTable = ({
  isContextView = false,
  isLoading = false,
  showPagination,
+ scrollToTop,
 }: DataGridTableProps) => {
  const services = getServices();
  const [inspectedHit, setInspectedHit] = useState<OpenSearchSearchHit | undefined>();
@@ -179,6 +181,7 @@ export const DataGridTable = ({
  isShortDots={isShortDots}
  hideTimeColumn={hideTimeColumn}
  defaultSortOrder={defaultSortOrder}
+ scrollToTop={scrollToTop}
  />
  ),
  [
@@ -197,6 +200,7 @@ export const DataGridTable = ({
  defaultSortOrder,
  hideTimeColumn,
  isShortDots,
+ scrollToTop,
  ]
  );
 

src/plugins/discover/public/application/components/default_discover_table/default_discover_table.tsx

@@ -33,6 +33,7 @@ export interface DefaultDiscoverTableProps {
  hideTimeColumn: boolean;
  defaultSortOrder: SortDirection;
  showPagination?: boolean;
+ scrollToTop?: () => void;
 }
 
 export const LegacyDiscoverTable = ({
@@ -52,6 +53,7 @@ export const LegacyDiscoverTable = ({
  hideTimeColumn,
  defaultSortOrder,
  showPagination,
+ scrollToTop,
 }: DefaultDiscoverTableProps) => {
  const displayedColumns = getLegacyDisplayedColumns(
  columns,
@@ -173,7 +175,7 @@ export const LegacyDiscoverTable = ({
  values={{ sampleSize }}
  />
 
- <EuiButtonEmpty onClick={() => window.scrollTo(0, 0)}>
+ <EuiButtonEmpty onClick={scrollToTop}>
  <FormattedMessage id="discover.backToTopLinkText" defaultMessage="Back to top." />
  </EuiButtonEmpty>
  </EuiCallOut>

src/plugins/discover/public/application/view_components/canvas/discover_table.tsx

@@ -12,7 +12,6 @@ import {
  addColumn,
  moveColumn,
  removeColumn,
- reorderColumn,
  setColumns,
  setSort,
  useDispatch,
@@ -27,9 +26,10 @@ import { popularizeField } from '../../helpers/popularize_field';
 
 interface Props {
  rows?: OpenSearchSearchHit[];
+ scrollToTop?: () => void;
 }
 
-export const DiscoverTable = ({ rows }: Props) => {
+export const DiscoverTable = ({ rows, scrollToTop }: Props) => {
  const { services } = useOpenSearchDashboards<DiscoverViewServices>();
  const {
  uiSettings,
@@ -115,6 +115,7 @@ export const DiscoverTable = ({ rows }: Props) => {
  displayTimeColumn={displayTimeColumn}
  title={savedSearch?.id ? savedSearch.title : ''}
  description={savedSearch?.id ? savedSearch.description : ''}
+ scrollToTop={scrollToTop}
  />
  );
 };

src/plugins/discover/public/application/view_components/canvas/index.tsx

@@ -24,6 +24,7 @@ import './discover_canvas.scss';
 
 // eslint-disable-next-line import/no-default-export
 export default function DiscoverCanvas({ setHeaderActionMenu, history }: ViewProps) {
+ const panelRef = useRef<HTMLDivElement>(null);
  const { data$, refetch$, indexPattern } = useDiscoverContext();
  const {
  services: { uiSettings },
@@ -89,9 +90,15 @@ export default function DiscoverCanvas({ setHeaderActionMenu, history }: ViewPro
  }, [dispatch, filteredColumns, indexPattern]);
 
  const timeField = indexPattern?.timeFieldName ? indexPattern.timeFieldName : undefined;
+ const scrollToTop = () => {
+ if (panelRef.current) {
+ panelRef.current.scrollTop = 0;
+ }
+ };
 
  return (
  <EuiPanel
+ panelRef={panelRef}
  hasBorder={false}
  hasShadow={false}
  color="transparent"
@@ -114,7 +121,7 @@ export default function DiscoverCanvas({ setHeaderActionMenu, history }: ViewPro
  {fetchState.status === ResultStatus.READY && (
  <EuiPanel hasShadow={false} paddingSize="none" className="dscCanvas_results">
  <MemoizedDiscoverChartContainer {...fetchState} />
- <MemoizedDiscoverTable rows={rows} />
+ <MemoizedDiscoverTable rows={rows} scrollToTop={scrollToTop} />
  </EuiPanel>
  )}
  </EuiPanel>