fix: fixes

Author: sareyu

src/containers/Tenant/Diagnostics/TopQueries/RunningQueriesData.tsx

@@ -24,7 +24,7 @@ interface Props {
 export const RunningQueriesData = ({database, onRowClick, rowClassName}: Props) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const filters = useTypedSelector((state) => state.executeTopQueries);
-    const {currentData, isFetching, error} = topQueriesApi.useGetRunningQueriesQuery(
+    const {currentData, isLoading, error} = topQueriesApi.useGetRunningQueriesQuery(
         {
             database,
             filters,
@@ -41,7 +41,7 @@ export const RunningQueriesData = ({database, onRowClick, rowClassName}: Props)
     return (
         <React.Fragment>
             {error ? <ResponseError error={parseQueryErrorToString(error)} /> : null}
-            <TableWithControlsLayout.Table loading={isFetching && !data.length}>
+            <TableWithControlsLayout.Table loading={isLoading}>
                 <ResizeableDataTable
                     emptyDataMessage={i18n('no-data')}
                     columnsWidthLSKey={RUNNING_QUERIES_COLUMNS_WIDTH_LS_KEY}

src/containers/Tenant/Diagnostics/TopQueries/TopQueriesData.tsx

@@ -22,7 +22,7 @@ interface Props {
 export const TopQueriesData = ({database, onRowClick, rowClassName}: Props) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const filters = useTypedSelector((state) => state.executeTopQueries);
-    const {currentData, isFetching, error} = topQueriesApi.useGetTopQueriesQuery(
+    const {currentData, isLoading, error} = topQueriesApi.useGetTopQueriesQuery(
         {
             database,
             filters,
@@ -44,7 +44,7 @@ export const TopQueriesData = ({database, onRowClick, rowClassName}: Props) => {
     return (
         <React.Fragment>
             {error ? <ResponseError error={parseQueryErrorToString(error)} /> : null}
-            <TableWithControlsLayout.Table loading={isFetching && currentData === undefined}>
+            <TableWithControlsLayout.Table loading={isLoading}>
                 <ResizeableDataTable
                     emptyDataMessage={i18n('no-data')}
                     columnsWidthLSKey={TOP_QUERIES_COLUMNS_WIDTH_LS_KEY}

src/store/reducers/executeTopQueries/executeTopQueries.ts

@@ -98,9 +98,7 @@ export const topQueriesApi = api.injectEndpoints({
                         ? `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`;
+                    const queryText = `SELECT UserSID, QueryStartAt, Query as QueryText, ApplicationName from \`.sys/query_sessions\` WHERE ${filterConditions || 'true'}  ORDER BY SessionStartAt limit 100`;
 
                     const response = await window.api.sendQuery(
                         {
@@ -117,6 +115,13 @@ export const topQueriesApi = api.injectEndpoints({
 
                     const data = parseQueryAPIExecuteResponse(response);
 
+                    /* filter running queries query itself */
+                    if (data?.resultSets?.[0]?.result) {
+                        data.resultSets[0].result = data.resultSets[0].result.filter(
+                            (item) => item.QueryText !== queryText,
+                        );
+                    }
+
                     return {data};
                 } catch (error) {
                     return {error};