Skip to content

Commit

Permalink
type fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomThomson committed Dec 2, 2020
1 parent e95cec4 commit 1adda50
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import { DashboardContainer } from '../embeddable';
import { getSampleDashboardInput } from '../test_helpers';

import { coreMock } from '../../../../../core/public/mocks';
import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
import { CoreStart } from 'kibana/public';
import { AddToLibraryAction } from '.';
import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
Expand Down Expand Up @@ -63,6 +63,8 @@ beforeEach(async () => {
overlays: coreStart.overlays,
savedObjectMetaData: {} as any,
uiActions: {} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreStart.http,
};

container = new DashboardContainer(getSampleDashboardInput(), containerOptions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import { DashboardContainer, DashboardPanelState } from '../embeddable';
import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';

import { coreMock } from '../../../../../core/public/mocks';
import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
import { CoreStart } from 'kibana/public';
import { ClonePanelAction } from '.';
import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
Expand Down Expand Up @@ -62,6 +62,8 @@ beforeEach(async () => {
overlays: coreStart.overlays,
savedObjectMetaData: {} as any,
uiActions: {} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreStart.http,
};
const input = getSampleDashboardInput({
panels: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
ContactCardEmbeddableInput,
ContactCardEmbeddableOutput,
} from '../../../../embeddable/public/lib/test_samples';
import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';

const { setup, doStart } = embeddablePluginMock.createInstance();

Expand All @@ -53,6 +54,8 @@ beforeEach(async () => {
overlays: {} as any,
savedObjectMetaData: {} as any,
uiActions: {} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreMock.createStart().http,
};
const input = getSampleDashboardInput({
panels: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import { DashboardContainer } from '../embeddable';
import { getSampleDashboardInput } from '../test_helpers';

import { coreMock } from '../../../../../core/public/mocks';
import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
import { CoreStart } from 'kibana/public';
import { LibraryNotificationAction, UnlinkFromLibraryAction } from '.';
import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
Expand Down Expand Up @@ -69,6 +69,8 @@ beforeEach(async () => {
overlays: coreStart.overlays,
savedObjectMetaData: {} as any,
uiActions: {} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreStart.http,
};

container = new DashboardContainer(getSampleDashboardInput(), containerOptions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
LibraryNotificationProps,
} from './library_notification_popover';
import { CoreStart } from '../../../../../core/public';
import { coreMock } from '../../../../../core/public/mocks';
import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
import { findTestSubject } from '@elastic/eui/lib/test';
import { EuiPopover } from '@elastic/eui';
import { isErrorEmbeddable } from '../../../../embeddable/public';
Expand Down Expand Up @@ -64,6 +64,8 @@ describe('LibraryNotificationPopover', () => {
overlays: coreStart.overlays,
savedObjectMetaData: {} as any,
uiActions: {} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreStart.http,
};

container = new DashboardContainer(getSampleDashboardInput(), containerOptions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { ReplacePanelAction } from './replace_panel_action';
import { DashboardContainer } from '../embeddable';
import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';

import { coreMock } from '../../../../../core/public/mocks';
import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
import { CoreStart } from 'kibana/public';
import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
import { isErrorEmbeddable } from '../../../../embeddable/public';
Expand Down Expand Up @@ -55,6 +55,8 @@ beforeEach(async () => {
overlays: coreStart.overlays,
savedObjectMetaData: {} as any,
uiActions: {} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreStart.http,
};
const input = getSampleDashboardInput({
panels: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
} from '../../../../embeddable/public';
import { DashboardContainer } from '../embeddable';
import { getSampleDashboardInput } from '../test_helpers';
import { coreMock } from '../../../../../core/public/mocks';
import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
import { CoreStart } from 'kibana/public';
import { UnlinkFromLibraryAction } from '.';
import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
Expand Down Expand Up @@ -63,6 +63,8 @@ beforeEach(async () => {
overlays: coreStart.overlays,
savedObjectMetaData: {} as any,
uiActions: {} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreStart.http,
};

container = new DashboardContainer(getSampleDashboardInput(), containerOptions);
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dashboard/public/application/dashboard_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export function DashboardApp({
lastReloadRequestTime,
dashboardCapabilities,
query: data.query,
// switchViewMode,
switchViewMode,
}),
});
if (changes) {
Expand All @@ -157,7 +157,7 @@ export function DashboardApp({
history,
data.query,
embedSettings,
// switchViewMode,
switchViewMode,
data.search.session,
dashboardCapabilities,
state.dashboardContainer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { InputTimeRange, TimefilterContract, TimeRange } from 'src/plugins/data/
import { ViewMode } from 'src/plugins/embeddable/public';
import { createKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
import { DashboardContainer, DashboardContainerInput } from '.';
import { DashboardContainerOptions } from './embeddable/dashboard_container';
import { DashboardContainerServices } from './embeddable/dashboard_container';
import { embeddablePluginMock } from '../../../embeddable/public/mocks';

describe('DashboardState', function () {
Expand Down Expand Up @@ -71,7 +71,7 @@ describe('DashboardState', function () {
panels: {} as DashboardContainerInput['panels'],
};
const input = { ...defaultInput, ...(initialInput ?? {}) };
return new DashboardContainer(input, { embeddable: doStart() } as DashboardContainerOptions);
return new DashboardContainer(input, { embeddable: doStart() } as DashboardContainerServices);
}

describe('syncTimefilterWithDashboard', function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ import React from 'react';
import { mountWithIntl } from '@kbn/test/jest';
import { skip } from 'rxjs/operators';
import { DashboardGrid, DashboardGridProps } from './dashboard_grid';
import { DashboardContainer, DashboardContainerOptions } from '../dashboard_container';
import { DashboardContainer, DashboardContainerServices } from '../dashboard_container';
import { getSampleDashboardInput } from '../../test_helpers';
import { KibanaContextProvider } from '../../../../../kibana_react/public';
import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
import {
CONTACT_CARD_EMBEDDABLE,
ContactCardEmbeddableFactory,
} from '../../../../../embeddable/public/lib/test_samples';
import { coreMock, uiSettingsServiceMock } from '../../../../../../core/public/mocks';

let dashboardContainer: DashboardContainer | undefined;

Expand All @@ -58,7 +59,7 @@ function prepare(props?: Partial<DashboardGridProps>) {
},
},
});
const options: DashboardContainerOptions = {
const options: DashboardContainerServices = {
application: {} as any,
embeddable: {
getTriggerCompatibleActions: (() => []) as any,
Expand All @@ -76,6 +77,8 @@ function prepare(props?: Partial<DashboardGridProps>) {
uiActions: {
getTriggerCompatibleActions: (() => []) as any,
} as any,
uiSettings: uiSettingsServiceMock.createStartContract(),
http: coreMock.createStart().http,
};
dashboardContainer = new DashboardContainer(initialInput, options);
const defaultTestProps: DashboardGridProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ export interface DashboardListingProps {
title?: string;
}

// saved object client does not support sorting by title because title is only mapped as analyzed
// the legacy implementation got around this by pulling `listingLimit` items and doing client side sorting
// and not supporting server-side paging.
// This component does not try to tackle these problems (yet) and is just feature matching the legacy component
// TODO support server side sorting/paging once title and description are sortable on the server.
export const DashboardListing = ({
title,
redirectTo,
Expand All @@ -52,23 +47,23 @@ export const DashboardListing = ({
services: {
core,
data,
chrome,
savedObjects,
savedDashboards,
savedObjectsClient,
savedObjectsTagging,
dashboardCapabilities,
chrome: { setBreadcrumbs },
},
} = useKibana<DashboardAppServices>();

// Set breadcrumbs useEffect
useEffect(() => {
chrome.setBreadcrumbs([
setBreadcrumbs([
{
text: dashboardBreadcrumb,
},
]);
}, [chrome]);
}, [setBreadcrumbs]);

// Load by Title useEffect
useEffect(() => {
Expand Down Expand Up @@ -160,6 +155,7 @@ export const DashboardListing = ({
: [];
}, [savedObjectsTagging]);

const { entityName, tableCaption, tableListTitle, entityNamePlural } = dashboardListingTable;
return (
<TableListView
createItem={hideWriteControls ? undefined : () => redirectTo({ destination: 'dashboard' })}
Expand All @@ -169,16 +165,18 @@ export const DashboardListing = ({
initialFilter={initialFilter ?? defaultFilter}
toastNotifications={core.notifications.toasts}
headingId="dashboardListingHeading"
noItemsFragment={noItemsFragment}
searchFilters={searchFilters}
tableColumns={tableColumns}
listingLimit={listingLimit}
findItems={fetchItems}
rowHeader="title"
entityName={dashboardListingTable.entityName}
tableCaption={dashboardListingTable.tableCaption}
tableListTitle={dashboardListingTable.tableListTitle}
entityNamePlural={dashboardListingTable.entityNamePlural}
{...{
entityNamePlural,
noItemsFragment,
tableListTitle,
searchFilters,
tableCaption,
listingLimit,
tableColumns,
entityName,
}}
/>
);
};
Expand Down

0 comments on commit 1adda50

Please sign in to comment.