Skip to content

[Shared UX] No data image placeholders #132376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cchaos merged 3 commits into from
May 18, 2022
Merged

[Shared UX] No data image placeholders #132376

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24df3e8
[NoDataViews] Changed image loading placeholder to a shaded panel
May 17, 2022
ec0bbc6
[NoDataCard] Wrapped image in EuiImage and gave it dimensions
May 17, 2022
2a33179
No backticks
May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import React from 'react';

import { EuiLoadingSpinner } from '@elastic/eui';
import { EuiPanel } from '@elastic/eui';

import { withSuspense } from '@kbn/shared-ux-utility';

Expand All @@ -20,5 +20,5 @@ export const LazyDataViewIllustration = React.lazy(() =>

export const DataViewIllustration = withSuspense(
LazyDataViewIllustration,
<EuiLoadingSpinner size="xl" />
<EuiPanel color="subdued" style={{ width: 226, height: 206 }} />
);
4 changes: 2 additions & 2 deletions ...s/kbn-shared-ux-components/src/empty_state/no_data_views/no_data_views.component.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import React from 'react';
import { mountWithIntl } from '@kbn/test-jest-helpers';
import { EuiButton, EuiPanel } from '@elastic/eui';
import { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
import { NoDataViews } from './no_data_views.component';
import { DocumentationLink } from './documentation_link';

Expand All @@ -21,7 +21,7 @@ describe('<NoDataViewsComponent />', () => {
dataViewsDocLink={'dummy'}
/>
);
expect(component.find(EuiPanel).length).toBe(1);
expect(component.find(EuiEmptyPrompt).length).toBe(1);
expect(component.find(EuiButton).length).toBe(1);
expect(component.find(DocumentationLink).length).toBe(1);
});
Expand Down
64 changes: 60 additions & 4 deletions ...mplate/no_data_page/no_data_card/__snapshots__/elastic_agent_card.component.test.tsx.snap
View file
Open in desktop

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

65 changes: 60 additions & 5 deletions ...rc/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap
View file
Open in desktop

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

18 changes: 16 additions & 2 deletions ...x-components/src/page_template/no_data_page/no_data_card/elastic_agent_card.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import React, { FunctionComponent } from 'react';
import { i18n } from '@kbn/i18n';
import { EuiTextColor } from '@elastic/eui';
import { EuiImage, EuiTextColor } from '@elastic/eui';
import { ElasticAgentCardProps } from './types';
import { NoDataCard } from './no_data_card';
import ElasticAgentCardIllustration from './assets/elastic_agent_card.svg';
Expand Down Expand Up @@ -64,5 +64,19 @@ export const ElasticAgentCardComponent: FunctionComponent<ElasticAgentCardCompon
isDisabled: true,
};

return <NoDataCard image={ElasticAgentCardIllustration} {...props} {...cardRest} />;
const image = (
<EuiImage
size="fullWidth"
style={{
width: `max(100%, 360px)`,
height: 240,
objectFit: `cover`,
background: `aliceblue`,
}}
url={ElasticAgentCardIllustration}
alt=""
/>
);

return <NoDataCard image={image} {...props} {...cardRest} />;
};
80 changes: 75 additions & 5 deletions ...ic/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap
View file
Open in desktop

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

18 changes: 16 additions & 2 deletions ...lugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import React, { FunctionComponent } from 'react';
import { i18n } from '@kbn/i18n';
import { CoreStart } from '@kbn/core/public';
import { EuiButton, EuiCard, EuiTextColor, EuiScreenReaderOnly } from '@elastic/eui';
import { EuiButton, EuiCard, EuiTextColor, EuiScreenReaderOnly, EuiImage } from '@elastic/eui';
import { useKibana } from '../../../context';
import { NoDataPageActions, NO_DATA_RECOMMENDED } from '../no_data_page';
import { RedirectAppLinks } from '../../../app_links';
Expand All @@ -35,10 +35,24 @@ export const ElasticAgentCard: FunctionComponent<ElasticAgentCardProps> = ({
services: { http, application },
} = useKibana<CoreStart>();
const addBasePath = http.basePath.prepend;
const image = addBasePath(`/plugins/kibanaReact/assets/elastic_agent_card.svg`);
const imageUrl = addBasePath(`/plugins/kibanaReact/assets/elastic_agent_card.svg`);
const canAccessFleet = application.capabilities.navLinks.integrations;
const hasCategory = category ? `/${category}` : '';

const image = (
<EuiImage
size="fullWidth"
style={{
width: `max(100%, 360px)`,
height: 240,
objectFit: `cover`,
background: `aliceblue`,

@majagrubic majagrubic May 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a nit: I don't think you need backticks here, regular '' should work.

@cchaos cchaos May 18, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, usually my IDE converts these on save, wonder why it didnt. Fixed 2a33179

}}
url={imageUrl}
alt=""
/>
);

if (!canAccessFleet) {
return (
<EuiCard
Expand Down