Skip to content

Commit

Permalink
chore: Expand error detail on screencapture (apache#25519)
Browse files Browse the repository at this point in the history
  • Loading branch information
justinpark authored Oct 4, 2023
1 parent 89eefca commit 67e5d10
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
24 changes: 24 additions & 0 deletions superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import React from 'react';
import userEvent from '@testing-library/user-event';
import { render, screen } from 'spec/helpers/testing-library';
import { supersetTheme } from '@superset-ui/core';
import { isCurrentUserBot } from 'src/utils/isBot';
import ErrorAlert from './ErrorAlert';
import { ErrorLevel, ErrorSource } from './types';

Expand All @@ -31,6 +32,10 @@ jest.mock(
<span role="img" aria-label={fileName.replace('_', '-')} />,
);

jest.mock('src/utils/isBot', () => ({
isCurrentUserBot: jest.fn(),
}));

const mockedProps = {
body: 'Error body',
level: 'warning' as ErrorLevel,
Expand All @@ -41,6 +46,14 @@ const mockedProps = {
description: 'we are unable to connect db.',
};

beforeEach(() => {
(isCurrentUserBot as jest.Mock).mockReturnValue(false);
});

afterEach(() => {
jest.clearAllMocks();
});

test('should render', () => {
const { container } = render(<ErrorAlert {...mockedProps} />);
expect(container).toBeInTheDocument();
Expand Down Expand Up @@ -100,6 +113,17 @@ test('should render the See more button', () => {
expect(screen.getByText('See more')).toBeInTheDocument();
});

test('should render the error subtitle and body defaultly for the screen capture request', () => {
const seemoreProps = {
...mockedProps,
source: 'explore' as ErrorSource,
};
(isCurrentUserBot as jest.Mock).mockReturnValue(true);
render(<ErrorAlert {...seemoreProps} />);
expect(screen.getByText('Error subtitle')).toBeInTheDocument();
expect(screen.getByText('Error body')).toBeInTheDocument();
});

test('should render the modal', () => {
render(<ErrorAlert {...mockedProps} />, { useRedux: true });
const button = screen.getByText('See more');
Expand Down
6 changes: 4 additions & 2 deletions superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { styled, useTheme, t } from '@superset-ui/core';
import { noOp } from 'src/utils/common';
import Modal from 'src/components/Modal';
import Button from 'src/components/Button';
import { isCurrentUserBot } from 'src/utils/isBot';

import Icons from 'src/components/Icons';
import { ErrorLevel, ErrorSource } from './types';
Expand Down Expand Up @@ -102,9 +103,10 @@ export default function ErrorAlert({
const theme = useTheme();

const [isModalOpen, setIsModalOpen] = useState(false);
const [isBodyExpanded, setIsBodyExpanded] = useState(false);
const [isBodyExpanded, setIsBodyExpanded] = useState(isCurrentUserBot());

const isExpandable = ['explore', 'sqllab'].includes(source);
const isExpandable =
isCurrentUserBot() || ['explore', 'sqllab'].includes(source);
const iconColor = theme.colors[level].base;

return (
Expand Down

0 comments on commit 67e5d10

Please sign in to comment.