Skip to content
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.

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

feat(16355): remove error image and adjust error styles #745

Merged
merged 6 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
11 changes: 2 additions & 9 deletions src/components/ErrorMessage/ErrorMessage.module.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
.spinner {
.errorContainer {
display: flex;
flex-flow: column nowrap;
align-items: center;
margin: 2em;
margin: calc(var(--double-unit) * 2) var(--double-unit);
text-align: center;
}

.icon {
display: block;
width: 100px;
height: 100px;
margin: 1em;
}
9 changes: 4 additions & 5 deletions src/components/ErrorMessage/ErrorMessage.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import { Text } from '@konturio/ui-kit';
import clsx from 'clsx';
import { i18n } from '~core/localization';
import errorImage from './error-state-img.png';
import s from './ErrorMessage.module.css';

export function ErrorMessage({
message,
marginTop = '30%',
containerClass,
}: {
message?: string;
marginTop?: string;
containerClass?: string;
}) {
return (
<div className={s.spinner} style={{ marginTop }}>
<div className={clsx(s.errorContainer, containerClass)}>
<Text type="short-l">{message ?? i18n.t('errors.default')}</Text>
<img src={errorImage} alt="" className={s.icon} />
</div>
);
}
Binary file removed src/components/ErrorMessage/error-state-img.png
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.errorContainer {
margin-top: 80px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { focusedGeometryAtom } from '~core/focused_geometry/model';
import { advancedAnalyticsResourceAtom } from '~features/advanced_analytics_panel/atoms/advancedAnalyticsResource';
import { AdvancedAnalyticsEmptyState } from '~features/advanced_analytics_panel/components/AdvancedAnalyticsEmptyState/AdvancedAnalyticsEmptyState';
import { AdvancedAnalyticsDataList } from '~features/advanced_analytics_panel/components/AdvancedAnalyticsDataList/AdvancedAnalyticsDataList';
import s from './AdvancedAnalyticsContainer.module.css';

export const AdvancedAnalyticsContainer = () => {
const [{ error, loading, data }] = useAtom(advancedAnalyticsResourceAtom);
Expand All @@ -21,13 +22,15 @@ export const AdvancedAnalyticsContainer = () => {
return statesToComponents({
init: <AdvancedAnalyticsEmptyState />,
loading: <LoadingSpinner />,
error: (errorMessage) => <ErrorMessage message={errorMessage} />,
error: (errorMessage) => (
<ErrorMessage message={errorMessage} containerClass={s.errorContainer} />
),
ready: (dataList) => {
const geometry = focusedGeometry?.geometry as GeoJSON.FeatureCollection;
if (geometry.features && geometry.features.length == 0) {
if (geometry.features && geometry.features.length === 0) {
return <AnalyticsEmptyState />;
}
if (dataList?.length == 0) {
if (dataList?.length === 0) {
return <AdvancedAnalyticsEmptyState />;
}
return <AdvancedAnalyticsDataList data={dataList} />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,11 @@ const BivariateMatrixContainer = ({ className }: BivariateMatrixContainerProps)
<LoadingSpinner />
</div>
),
error: () => (
<div className={s.errorContainer}>
<ErrorMessage
marginTop="0"
message={i18n.t('bivariate.matrix.loading_error')}
/>
</div>
error: (
<ErrorMessage
message={i18n.t('bivariate.matrix.loading_error')}
containerClass={s.errorContainer}
/>
),
ready: () => (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,13 @@ export function EpisodesTimelinePanel() {
>
<div>
{statesToComponents({
loading: (
<LoadingSpinner marginTop="16px" message={i18n.t('loading_episodes')} />
),
error: (errorMessage) => (
<ErrorMessage marginTop="16px" message={errorMessage} />
),
loading: <LoadingSpinner message={i18n.t('loading_episodes')} />,
error: (errorMessage) => <ErrorMessage message={errorMessage} />,
ready: (episodes) =>
episodes.data ? (
<EpisodesTimeline episodes={episodes.data} />
) : (
<ErrorMessage marginTop="16px" message={'no_episodes'} />
<ErrorMessage message={'no_episodes'} />
),
})}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
align-items: center;
}

.errorContainer {
margin-top: 80px;
}

.height100vh {
height: 100vh;
}
Expand Down
4 changes: 3 additions & 1 deletion src/features/events_list/components/FullState/FullState.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ export function FullState({
<div className={s.scrollable}>
{statesToComponents({
loading: <LoadingSpinner message={i18n.t('loading_events')} />,
error: (errorMessage) => <ErrorMessage message={errorMessage} />,
error: (errorMessage) => (
<ErrorMessage message={errorMessage} containerClass={s.errorContainer} />
),
ready: (eventsList) => (
<>
<Virtuoso
Expand Down
Loading