Skip to content

Commit

Permalink
[Dashboard] Add visualization from dasbhoard empty screen (elastic#52670
Browse files Browse the repository at this point in the history
)

* [Dashboard] Add visualization from dasbhoard empty screen

* Fixing linting errors

* Fixing i18n error

* Fixing unit test that was causing typecheck failure
  • Loading branch information
Maja Grubic committed Dec 12, 2019
1 parent 8dce594 commit 3f8851c
Show file tree
Hide file tree
Showing 12 changed files with 773 additions and 67 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,15 @@ describe('DashboardEmptyScreen', () => {
const paragraph = findTestSubject(component, 'linkToVisualizeParagraph');
expect(paragraph.length).toBe(0);
});

test('when specified, prop onVisualizeClick is called correctly', () => {
const onVisualizeClick = jest.fn();
const component = mountComponent({
...defaultProps,
...{ showLinkToVisualize: true, onVisualizeClick },
});
const button = findTestSubject(component, 'addVisualizationButton');
button.simulate('click');
expect(onVisualizeClick).toHaveBeenCalled();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import _ from 'lodash';
import { i18n } from '@kbn/i18n';
import React from 'react';
import angular from 'angular';
import { uniq, noop } from 'lodash';
import { uniq } from 'lodash';

import { Subscription } from 'rxjs';
import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen';
Expand Down Expand Up @@ -53,6 +53,7 @@ import {
ErrorEmbeddable,
ViewMode,
openAddPanelFlyout,
EmbeddableFactoryNotFoundError,
} from '../../../embeddable_api/public/np_ready/public';
import { DashboardAppState, NavAction, ConfirmModalFn, SavedDashboardPanel } from './types';

Expand Down Expand Up @@ -145,16 +146,20 @@ export class DashboardAppController {
}
$scope.showSaveQuery = dashboardCapabilities.saveQuery as boolean;

$scope.getShouldShowEditHelp = () =>
const getShouldShowEditHelp = () =>
!dashboardStateManager.getPanels().length &&
dashboardStateManager.getIsEditMode() &&
!dashboardConfig.getHideWriteControls();

$scope.getShouldShowViewHelp = () =>
const getShouldShowViewHelp = () =>
!dashboardStateManager.getPanels().length &&
dashboardStateManager.getIsViewMode() &&
!dashboardConfig.getHideWriteControls();

const addVisualization = () => {
navActions[TopNavIds.VISUALIZE]();
};

const updateIndexPatterns = (container?: DashboardContainer) => {
if (!container || isErrorEmbeddable(container)) {
return;
Expand Down Expand Up @@ -189,7 +194,7 @@ export class DashboardAppController {
showLinkToVisualize: shouldShowEditHelp,
};
if (shouldShowEditHelp) {
emptyScreenProps.onVisualizeClick = noop;
emptyScreenProps.onVisualizeClick = addVisualization;
}
return emptyScreenProps;
};
Expand All @@ -205,8 +210,8 @@ export class DashboardAppController {
if (dashboardContainer && !isErrorEmbeddable(dashboardContainer)) {
expandedPanelId = dashboardContainer.getInput().expandedPanelId;
}
const shouldShowEditHelp = $scope.getShouldShowEditHelp();
const shouldShowViewHelp = $scope.getShouldShowViewHelp();
const shouldShowEditHelp = getShouldShowEditHelp();
const shouldShowViewHelp = getShouldShowViewHelp();
return {
id: dashboardStateManager.savedDashboard.id || '',
filters: queryFilter.getFilters(),
Expand Down Expand Up @@ -261,8 +266,8 @@ export class DashboardAppController {
dashboardContainer = container;

dashboardContainer.renderEmpty = () => {
const shouldShowEditHelp = $scope.getShouldShowEditHelp();
const shouldShowViewHelp = $scope.getShouldShowViewHelp();
const shouldShowEditHelp = getShouldShowEditHelp();
const shouldShowViewHelp = getShouldShowViewHelp();
const isEmptyState = shouldShowEditHelp || shouldShowViewHelp;
return isEmptyState ? (
<DashboardEmptyScreen {...getEmptyScreenProps(shouldShowEditHelp)} />
Expand Down Expand Up @@ -759,7 +764,17 @@ export class DashboardAppController {
}
};

navActions[TopNavIds.VISUALIZE] = async () => {};
navActions[TopNavIds.VISUALIZE] = async () => {
const type = 'visualization';
const factory = embeddables.getEmbeddableFactory(type);
if (!factory) {
throw new EmbeddableFactoryNotFoundError(type);
}
const explicitInput = await factory.getExplicitInput();
if (dashboardContainer) {
await dashboardContainer.addNewEmbeddable(type, explicitInput);
}
};

navActions[TopNavIds.OPTIONS] = anchorElement => {
showOptionsPopover({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/
import React from 'react';
import { I18nProvider, FormattedMessage } from '@kbn/i18n/react';
import { I18nProvider } from '@kbn/i18n/react';
import {
EuiIcon,
EuiLink,
Expand All @@ -26,6 +26,7 @@ import {
EuiPageBody,
EuiPage,
EuiText,
EuiButton,
} from '@elastic/eui';
import * as constants from './dashboard_empty_screen_constants';

Expand All @@ -38,23 +39,20 @@ export interface DashboardEmptyScreenProps {
export function DashboardEmptyScreen({
showLinkToVisualize,
onLinkClick,
onVisualizeClick,
}: DashboardEmptyScreenProps) {
const linkToVisualizeParagraph = (
<EuiText data-test-subj="linkToVisualizeParagraph">
<p>
<FormattedMessage
id="kbn.dashboard.addVisualizationDescription3"
defaultMessage="If you haven't set up any visualizations yet, {visualizeAppLink} to create your first visualization"
values={{
visualizeAppLink: (
<a className="euiLink" href="#/visualize">
{constants.visualizeAppLinkTest}
</a>
),
}}
/>
</p>
</EuiText>
<p data-test-subj="linkToVisualizeParagraph">
<EuiButton
iconSide="right"
fill
iconType="arrowDown"
onClick={onVisualizeClick}
data-test-subj="addVisualizationButton"
>
{constants.createNewVisualizationButton}
</EuiButton>
</p>
);
const paragraph = (
description1: string,
Expand Down Expand Up @@ -96,7 +94,7 @@ export function DashboardEmptyScreen({
);
return (
<I18nProvider>
<EuiPage className="dshStartScreen" restrictWidth={'36em'}>
<EuiPage className="dshStartScreen" restrictWidth="36em">
<EuiPageBody>
<EuiPageContent verticalPosition="center" horizontalPosition="center">
<EuiIcon type="dashboardApp" size="xxl" color="subdued" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,9 @@ export const visualizeAppLinkTest: string = i18n.translate(
defaultMessage: 'visit the Visualize app',
}
);
export const createNewVisualizationButton: string = i18n.translate(
'kbn.dashboard.createNewVisualizationButton',
{
defaultMessage: 'Create new',
}
);
Loading

0 comments on commit 3f8851c

Please sign in to comment.