Skip to content

feat(RunningQueries): add userSID search #1462

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
merged 3 commits into from
Oct 16, 2024
Merged

feat(RunningQueries): add userSID search #1462

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98c5610
feat(RunningQueries): add userSID search
sareyu Oct 14, 2024
8915093
fix: fixes
sareyu Oct 16, 2024
00166e7
fix: tests
astandrik Oct 16, 2024
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
13 changes: 11 additions & 2 deletions src/containers/Tenant/Diagnostics/TopQueries/RunningQueriesData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {ResponseError} from '../../../../components/Errors/ResponseError';
import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
import {topQueriesApi} from '../../../../store/reducers/executeTopQueries/executeTopQueries';
import type {KeyValueRow} from '../../../../types/api/query';
import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
import {parseQueryErrorToString} from '../../../../utils/query';
import {QUERY_TABLE_SETTINGS} from '../../utils/constants';
Expand All @@ -16,9 +17,11 @@ import i18n from './i18n';

interface Props {
database: string;
onRowClick: (query: string) => void;
rowClassName: string;
}

export const RunningQueriesData = ({database}: Props) => {
export const RunningQueriesData = ({database, onRowClick, rowClassName}: Props) => {
const [autoRefreshInterval] = useAutoRefreshInterval();
const filters = useTypedSelector((state) => state.executeTopQueries);
const {currentData, isFetching, error} = topQueriesApi.useGetRunningQueriesQuery(
Expand All @@ -31,16 +34,22 @@ export const RunningQueriesData = ({database}: Props) => {

const data = currentData?.resultSets?.[0].result || [];

const handleRowClick = (row: KeyValueRow) => {
return onRowClick(row.QueryText as string);
};

return (
<React.Fragment>
{error ? <ResponseError error={parseQueryErrorToString(error)} /> : null}
<TableWithControlsLayout.Table loading={isFetching && data === undefined}>
<TableWithControlsLayout.Table loading={isFetching && !data.length}>
Copy link
Member

@artemmufazalov artemmufazalov Oct 15, 2024

Choose a reason for hiding this comment

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

You should change it to something like in TopQueriesData:

loading={isFetching && currentData === undefined}

Or not initialize data with an empty array and use data === undefined

Currently, loader is shown on autorefresh when there is no data, because it is isFetching=true and data.length=0

<ResizeableDataTable
emptyDataMessage={i18n('no-data')}
columnsWidthLSKey={RUNNING_QUERIES_COLUMNS_WIDTH_LS_KEY}
columns={RUNNING_QUERIES_COLUMNS}
data={data}
settings={QUERY_TABLE_SETTINGS}
onRowClick={handleRowClick}
rowClassName={() => rowClassName}
/>
</TableWithControlsLayout.Table>
</React.Fragment>
Expand Down
8 changes: 3 additions & 5 deletions src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ export const TopQueries = ({tenantName}: TopQueriesProps) => {
dispatch(setTopQueriesFilters(value));
};

const DataComponent = isTopQueries ? TopQueriesData : RunningQueriesData;

return (
<TableWithControlsLayout>
<TableWithControlsLayout.Controls>
Expand All @@ -115,11 +117,7 @@ export const TopQueries = ({tenantName}: TopQueriesProps) => {
/>
) : null}
</TableWithControlsLayout.Controls>
{isTopQueries ? (
<TopQueriesData database={tenantName} onRowClick={onRowClick} />
) : (
<RunningQueriesData database={tenantName} />
)}
<DataComponent database={tenantName} onRowClick={onRowClick} rowClassName={b('row')} />
</TableWithControlsLayout>
);
};
8 changes: 3 additions & 5 deletions src/containers/Tenant/Diagnostics/TopQueries/TopQueriesData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/Re
import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
import {topQueriesApi} from '../../../../store/reducers/executeTopQueries/executeTopQueries';
import type {KeyValueRow} from '../../../../types/api/query';
import {cn} from '../../../../utils/cn';
import {isSortableTopQueriesProperty} from '../../../../utils/diagnostics';
import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
import {parseQueryErrorToString} from '../../../../utils/query';
Expand All @@ -14,14 +13,13 @@ import {QUERY_TABLE_SETTINGS} from '../../utils/constants';
import {TOP_QUERIES_COLUMNS, TOP_QUERIES_COLUMNS_WIDTH_LS_KEY} from './getTopQueriesColumns';
import i18n from './i18n';

const b = cn('kv-top-queries');

interface Props {
database: string;
onRowClick: (query: string) => void;
rowClassName: string;
}

export const TopQueriesData = ({database, onRowClick}: Props) => {
export const TopQueriesData = ({database, onRowClick, rowClassName}: Props) => {
const [autoRefreshInterval] = useAutoRefreshInterval();
const filters = useTypedSelector((state) => state.executeTopQueries);
const {currentData, isFetching, error} = topQueriesApi.useGetTopQueriesQuery(
Expand Down Expand Up @@ -54,7 +52,7 @@ export const TopQueriesData = ({database, onRowClick}: Props) => {
data={data || []}
settings={QUERY_TABLE_SETTINGS}
onRowClick={handleRowClick}
rowClassName={() => b('row')}
rowClassName={() => rowClassName}
/>
</TableWithControlsLayout.Table>
</React.Fragment>
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Tenant/Diagnostics/TopQueries/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"no-data": "No data",
"filter.text.placeholder": "Search by query text...",
"filter.text.placeholder": "Search by query text or userSID...",
"mode_top": "Top",
"mode_running": "Running",
"col_user": "User",
Expand Down
5 changes: 4 additions & 1 deletion src/store/reducers/executeTopQueries/executeTopQueries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ export const topQueriesApi = api.injectEndpoints({
{signal},
) => {
try {
const filterConditions = filters?.text ? `Query ILIKE '%${filters.text}%'` : '';
const filterConditions = filters?.text
? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
: '';

const commonQueryPart = `SELECT UserSID, QueryStartAt, Query as QueryText, ApplicationName from \`.sys/query_sessions\` WHERE ${filterConditions || 'true'}`;

const queryText = `${commonQueryPart} AND Query NOT LIKE '${commonQueryPart}%' ORDER BY SessionStartAt limit 100`;
Expand Down
4 changes: 3 additions & 1 deletion src/store/reducers/executeTopQueries/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export function getFiltersConditions(path: string, filters?: TopQueriesFilters)
}

if (filters?.text) {
conditions.push(`QueryText ILIKE '%${filters.text}%'`);
conditions.push(
`(QueryText ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%')`,
);
}

return conditions.join(' AND ');
Expand Down
Loading