Merge branch '7.x' into backport/7.x/pr-88675

Author: kibanamachine

src/plugins/dashboard/public/application/listing/dashboard_listing.tsx

@@ -9,16 +9,15 @@
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import React, { Fragment, useCallback, useEffect, useMemo } from 'react';
-
 import { attemptLoadDashboardByTitle } from '../lib';
 import { DashboardAppServices, DashboardRedirect } from '../types';
 import { getDashboardBreadcrumb, dashboardListingTable } from '../../dashboard_strings';
 import { ApplicationStart, SavedObjectsFindOptionsReference } from '../../../../../core/public';
-
 import { syncQueryStateWithUrl } from '../../services/data';
 import { IKbnUrlStateStorage } from '../../services/kibana_utils';
 import { TableListView, useKibana } from '../../services/kibana_react';
 import { SavedObjectsTaggingApi } from '../../services/saved_objects_tagging_oss';
+import { getDashboardListItemLink } from './get_dashboard_list_item_link';
 
 export interface DashboardListingProps {
   kbnUrlStateStorage: IKbnUrlStateStorage;
@@ -83,8 +82,13 @@ export const DashboardListing = ({
 
   const tableColumns = useMemo(
     () =>
-      getTableColumns((id) => redirectTo({ destination: 'dashboard', id }), savedObjectsTagging),
-    [savedObjectsTagging, redirectTo]
+      getTableColumns(
+        core.application,
+        kbnUrlStateStorage,
+        core.uiSettings.get('state:storeInSessionStorage'),
+        savedObjectsTagging
+      ),
+    [core.application, core.uiSettings, kbnUrlStateStorage, savedObjectsTagging]
   );
 
   const noItemsFragment = useMemo(
@@ -99,7 +103,6 @@ export const DashboardListing = ({
     (filter: string) => {
       let searchTerm = filter;
       let references: SavedObjectsFindOptionsReference[] | undefined;
-
       if (savedObjectsTagging) {
         const parsed = savedObjectsTagging.ui.parseSearchQuery(filter, {
           useName: true,
@@ -164,17 +167,25 @@ export const DashboardListing = ({
 };
 
 const getTableColumns = (
-  redirectTo: (id?: string) => void,
+  application: ApplicationStart,
+  kbnUrlStateStorage: IKbnUrlStateStorage,
+  useHash: boolean,
   savedObjectsTagging?: SavedObjectsTaggingApi
 ) => {
   return [
     {
       field: 'title',
       name: dashboardListingTable.getTitleColumnName(),
       sortable: true,
-      render: (field: string, record: { id: string; title: string }) => (
+      render: (field: string, record: { id: string; title: string; timeRestore: boolean }) => (
         <EuiLink
-          onClick={() => redirectTo(record.id)}
+          href={getDashboardListItemLink(
+            application,
+            kbnUrlStateStorage,
+            useHash,
+            record.id,
+            record.timeRestore
+          )}
           data-test-subj={`dashboardListingTitleLink-${record.title.split(' ').join('-')}`}
         >
           {field}

src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts

@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+
+import { getDashboardListItemLink } from './get_dashboard_list_item_link';
+import { ApplicationStart } from 'kibana/public';
+import { esFilters } from '../../../../data/public';
+import { createHashHistory } from 'history';
+import { createKbnUrlStateStorage } from '../../../../kibana_utils/public';
+import { GLOBAL_STATE_STORAGE_KEY } from '../../url_generator';
+
+const DASHBOARD_ID = '13823000-99b9-11ea-9eb6-d9e8adceb647';
+
+const application = ({
+  getUrlForApp: jest.fn((appId: string, options?: { path?: string; absolute?: boolean }) => {
+    return `/app/${appId}${options?.path}`;
+  }),
+} as unknown) as ApplicationStart;
+
+const history = createHashHistory();
+const kbnUrlStateStorage = createKbnUrlStateStorage({
+  history,
+  useHash: false,
+});
+kbnUrlStateStorage.set(GLOBAL_STATE_STORAGE_KEY, { time: { from: 'now-7d', to: 'now' } });
+
+describe('listing dashboard link', () => {
+  test('creates a link to a dashboard without the timerange query if time is saved on the dashboard', async () => {
+    const url = getDashboardListItemLink(
+      application,
+      kbnUrlStateStorage,
+      false,
+      DASHBOARD_ID,
+      true
+    );
+    expect(url).toMatchInlineSnapshot(`"/app/dashboards#/view/${DASHBOARD_ID}?_g=()"`);
+  });
+
+  test('creates a link to a dashboard with the timerange query if time is not saved on the dashboard', async () => {
+    const url = getDashboardListItemLink(
+      application,
+      kbnUrlStateStorage,
+      false,
+      DASHBOARD_ID,
+      false
+    );
+    expect(url).toMatchInlineSnapshot(
+      `"/app/dashboards#/view/${DASHBOARD_ID}?_g=(time:(from:now-7d,to:now))"`
+    );
+  });
+});
+
+describe('when global time changes', () => {
+  beforeEach(() => {
+    kbnUrlStateStorage.set(GLOBAL_STATE_STORAGE_KEY, {
+      time: {
+        from: '2021-01-05T11:45:53.375Z',
+        to: '2021-01-21T11:46:00.990Z',
+      },
+    });
+  });
+
+  test('propagates the correct time on the query', async () => {
+    const url = getDashboardListItemLink(
+      application,
+      kbnUrlStateStorage,
+      false,
+      DASHBOARD_ID,
+      false
+    );
+    expect(url).toMatchInlineSnapshot(
+      `"/app/dashboards#/view/${DASHBOARD_ID}?_g=(time:(from:'2021-01-05T11:45:53.375Z',to:'2021-01-21T11:46:00.990Z'))"`
+    );
+  });
+});
+
+describe('when global refreshInterval changes', () => {
+  beforeEach(() => {
+    kbnUrlStateStorage.set(GLOBAL_STATE_STORAGE_KEY, {
+      refreshInterval: { pause: false, value: 300 },
+    });
+  });
+
+  test('propagates the refreshInterval on the query', async () => {
+    const url = getDashboardListItemLink(
+      application,
+      kbnUrlStateStorage,
+      false,
+      DASHBOARD_ID,
+      false
+    );
+    expect(url).toMatchInlineSnapshot(
+      `"/app/dashboards#/view/${DASHBOARD_ID}?_g=(refreshInterval:(pause:!f,value:300))"`
+    );
+  });
+});
+
+describe('when global filters change', () => {
+  beforeEach(() => {
+    const filters = [
+      {
+        meta: {
+          alias: null,
+          disabled: false,
+          negate: false,
+        },
+        query: { query: 'q1' },
+      },
+      {
+        meta: {
+          alias: null,
+          disabled: false,
+          negate: false,
+        },
+        query: { query: 'q1' },
+        $state: {
+          store: esFilters.FilterStateStore.GLOBAL_STATE,
+        },
+      },
+    ];
+    kbnUrlStateStorage.set(GLOBAL_STATE_STORAGE_KEY, {
+      filters,
+    });
+  });
+
+  test('propagates the filters on the query', async () => {
+    const url = getDashboardListItemLink(
+      application,
+      kbnUrlStateStorage,
+      false,
+      DASHBOARD_ID,
+      false
+    );
+    expect(url).toMatchInlineSnapshot(
+      `"/app/dashboards#/view/${DASHBOARD_ID}?_g=(filters:!((meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1)),('$state':(store:globalState),meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))))"`
+    );
+  });
+});

src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+import { ApplicationStart } from 'kibana/public';
+import { QueryState } from '../../../../data/public';
+import { setStateToKbnUrl } from '../../../../kibana_utils/public';
+import { createDashboardEditUrl, DashboardConstants } from '../../dashboard_constants';
+import { GLOBAL_STATE_STORAGE_KEY } from '../../url_generator';
+import { IKbnUrlStateStorage } from '../../services/kibana_utils';
+
+export const getDashboardListItemLink = (
+  application: ApplicationStart,
+  kbnUrlStateStorage: IKbnUrlStateStorage,
+  useHash: boolean,
+  id: string,
+  timeRestore: boolean
+) => {
+  let url = application.getUrlForApp(DashboardConstants.DASHBOARDS_ID, {
+    path: `#${createDashboardEditUrl(id)}`,
+  });
+  const globalStateInUrl = kbnUrlStateStorage.get<QueryState>(GLOBAL_STATE_STORAGE_KEY) || {};
+
+  if (timeRestore) {
+    delete globalStateInUrl.time;
+    delete globalStateInUrl.refreshInterval;
+  }
+  url = setStateToKbnUrl<QueryState>(GLOBAL_STATE_STORAGE_KEY, globalStateInUrl, { useHash }, url);
+  return url;
+};

src/plugins/data/public/ui/query_string_input/query_string_input.test.tsx

@@ -89,7 +89,7 @@ describe('QueryStringInput', () => {
     jest.clearAllMocks();
   });
 
-  it('Should render the given query', async () => {
+  it.skip('Should render the given query', async () => {
     const { getByText } = render(
       wrapQueryStringInputInContext({
         query: kqlQuery,

src/plugins/discover/public/application/angular/discover.js

@@ -24,7 +24,6 @@ import {
 import { getSortArray } from './doc_table';
 import * as columnActions from './doc_table/actions/columns';
 import indexTemplateLegacy from './discover_legacy.html';
-import indexTemplateGrid from './discover_datagrid.html';
 import { addHelpMenuToAppChrome } from '../components/help_menu/help_menu_util';
 import { discoverResponseHandler } from './response_handler';
 import {
@@ -112,9 +111,7 @@ app.config(($routeProvider) => {
   };
   const discoverRoute = {
     ...defaults,
-    template: getServices().uiSettings.get('doc_table:legacy', true)
-      ? indexTemplateLegacy
-      : indexTemplateGrid,
+    template: indexTemplateLegacy,
     reloadOnSearch: false,
     resolve: {
       savedObjects: function ($route, Promise) {

src/plugins/discover/public/application/angular/discover_legacy.html

@@ -1,5 +1,5 @@
 <discover-app>
-  <discover-legacy
+  <discover
     fetch="fetch"
     fetch-counter="fetchCounter"
     fetch-error="fetchError"
@@ -31,5 +31,5 @@
     update-saved-query-id="updateSavedQueryId"
     use-new-fields-api="useNewFieldsApi"
   >
-  </discover-legacy>
+  </discover>
 </discover-app>

src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx

@@ -9,8 +9,11 @@
 import angular, { auto, ICompileService, IScope } from 'angular';
 import { render } from 'react-dom';
 import React, { useRef, useEffect } from 'react';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { getServices, IIndexPattern } from '../../../kibana_services';
 import { IndexPatternField } from '../../../../../data/common/index_patterns';
+
 export type AngularScope = IScope;
 
 export interface AngularDirective {
@@ -83,9 +86,11 @@ export interface DocTableLegacyProps {
   indexPattern: IIndexPattern;
   minimumVisibleRows: number;
   onAddColumn?: (column: string) => void;
+  onBackToTop: () => void;
   onSort?: (sort: string[][]) => void;
   onMoveColumn?: (columns: string, newIdx: number) => void;
   onRemoveColumn?: (column: string) => void;
+  sampleSize: number;
   sort?: string[][];
   useNewFieldsApi?: boolean;
 }
@@ -120,5 +125,31 @@ export function DocTableLegacy(renderProps: DocTableLegacyProps) {
       return renderFn(ref.current, renderProps);
     }
   }, [renderFn, renderProps]);
-  return <div ref={ref} />;
+  return (
+    <div>
+      <div ref={ref} />
+      {renderProps.rows.length === renderProps.sampleSize ? (
+        <div
+          className="dscTable__footer"
+          data-test-subj="discoverDocTableFooter"
+          tabIndex={-1}
+          id="discoverBottomMarker"
+        >
+          <FormattedMessage
+            id="discover.howToSeeOtherMatchingDocumentsDescription"
+            defaultMessage="These are the first {sampleSize} documents matching
+                  your search, refine your search to see others."
+            values={{ sampleSize: renderProps.sampleSize }}
+          />
+          <EuiButtonEmpty onClick={renderProps.onBackToTop}>
+            <FormattedMessage id="discover.backToTopLinkText" defaultMessage="Back to top." />
+          </EuiButtonEmpty>
+        </div>
+      ) : (
+        <span tabIndex={-1} id="discoverBottomMarker">
+          &#8203;
+        </span>
+      )}
+    </div>
+  );
 }

src/plugins/discover/public/application/components/create_discover_directive.ts

@@ -17,18 +17,21 @@ export function createDiscoverDirective(reactDirective: any) {
     ['histogramData', { watchDepth: 'reference' }],
     ['hits', { watchDepth: 'reference' }],
     ['indexPattern', { watchDepth: 'reference' }],
+    ['minimumVisibleRows', { watchDepth: 'reference' }],
     ['onAddColumn', { watchDepth: 'reference' }],
     ['onAddFilter', { watchDepth: 'reference' }],
     ['onChangeInterval', { watchDepth: 'reference' }],
+    ['onMoveColumn', { watchDepth: 'reference' }],
     ['onRemoveColumn', { watchDepth: 'reference' }],
     ['onSetColumns', { watchDepth: 'reference' }],
+    ['onSkipBottomButtonClick', { watchDepth: 'reference' }],
     ['onSort', { watchDepth: 'reference' }],
     ['opts', { watchDepth: 'reference' }],
     ['resetQuery', { watchDepth: 'reference' }],
     ['resultState', { watchDepth: 'reference' }],
     ['rows', { watchDepth: 'reference' }],
+    ['savedSearch', { watchDepth: 'reference' }],
     ['searchSource', { watchDepth: 'reference' }],
-    ['setColumns', { watchDepth: 'reference' }],
     ['setIndexPattern', { watchDepth: 'reference' }],
     ['showSaveQuery', { watchDepth: 'reference' }],
     ['state', { watchDepth: 'reference' }],