Skip to content
Merged
Changes from all 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
60 changes: 47 additions & 13 deletions src/containers/Tenant/Query/Issues/Issues.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
TriangleExclamationFill,
} from '@gravity-ui/icons';
import type {IconData} from '@gravity-ui/uikit';
import {ArrowToggle, Button, Icon} from '@gravity-ui/uikit';
import {ArrowToggle, Button, Icon, Link} from '@gravity-ui/uikit';

import ShortyString from '../../../../components/ShortyString/ShortyString';
import type {ErrorResponse, IssueMessage} from '../../../../types/api/query';
Expand Down Expand Up @@ -107,7 +107,6 @@ function Issue({
}) {
const [isExpand, setIsExpand] = React.useState(true);
const severity = getSeverity(issue.severity);
const position = getIssuePosition(issue);

const issues = issue.issues;
const hasIssues = Array.isArray(issues) && issues.length > 0;
Expand All @@ -132,17 +131,7 @@ function Issue({
</Button>
)}
{hideSeverity ? null : <IssueSeverity severity={severity} />}

<span className={blockIssue('message')}>
{position && (
<span className={blockIssue('place-text')} title="Position">
{position}
</span>
)}
<div className={blockIssue('message-text')}>
<ShortyString value={issue.message} expandLabel={'Show full message'} />
</div>
</span>
<IssueText issue={issue} />
{issue.issue_code ? (
<span className={blockIssue('code')}>Code: {issue.issue_code}</span>
) : null}
Expand All @@ -156,6 +145,51 @@ function Issue({
);
}

interface IssueTextProps {
issue: IssueMessage;
}

function IssueText({issue}: IssueTextProps) {
const position = getIssuePosition(issue);

const ydbEditor = window.ydbEditor;

const getIssue = () => {
return (
<span className={blockIssue('message')}>
{position && (
<span className={blockIssue('place-text')} title="Position">
{position}
</span>
)}
<div className={blockIssue('message-text')}>
<ShortyString value={issue.message} expandLabel={'Show full message'} />
</div>
</span>
);
};

const {row, column} = issue.position ?? {};
const isIssueClickable = isNumeric(row) && ydbEditor;
if (!isIssueClickable) {
return getIssue();
}

const onIssueClickHandler = () => {
const monacoPosition = {lineNumber: row, column: column ?? 0};

ydbEditor.setPosition(monacoPosition);
ydbEditor.revealPositionInCenterIfOutsideViewport(monacoPosition);
ydbEditor.focus();
};

return (
<Link href="#" extraProps={{draggable: false}} onClick={onIssueClickHandler} view="primary">
{getIssue()}
</Link>
);
}

function IssueList(props: {issues: IssueMessage[]; expanded: boolean; level: number}) {
const {issues, level, expanded} = props;
return (
Expand Down
Loading