mirror of
https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz
synced 2025-08-15 03:25:53 +08:00
fix: onRun Query offset is made zero (#4083)
This commit is contained in:
parent
9fb32acf6d
commit
0a77c7ab85
@ -27,4 +27,5 @@ export enum QueryParams {
|
|||||||
viewName = 'viewName',
|
viewName = 'viewName',
|
||||||
viewKey = 'viewKey',
|
viewKey = 'viewKey',
|
||||||
expandedWidgetId = 'expandedWidgetId',
|
expandedWidgetId = 'expandedWidgetId',
|
||||||
|
pagination = 'pagination',
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import { ResizeTable } from 'components/ResizeTable';
|
import { ResizeTable } from 'components/ResizeTable';
|
||||||
import { LOCALSTORAGE } from 'constants/localStorage';
|
import { LOCALSTORAGE } from 'constants/localStorage';
|
||||||
|
import { QueryParams } from 'constants/query';
|
||||||
import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
|
import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
|
||||||
import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
|
import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
|
||||||
import { useOptionsMenu } from 'container/OptionsMenu';
|
import { useOptionsMenu } from 'container/OptionsMenu';
|
||||||
import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
|
import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
|
||||||
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
|
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
|
||||||
import { Pagination, URL_PAGINATION } from 'hooks/queryPagination';
|
import { Pagination } from 'hooks/queryPagination';
|
||||||
import useDragColumns from 'hooks/useDragColumns';
|
import useDragColumns from 'hooks/useDragColumns';
|
||||||
import { getDraggedColumns } from 'hooks/useDragColumns/utils';
|
import { getDraggedColumns } from 'hooks/useDragColumns/utils';
|
||||||
import useUrlQueryData from 'hooks/useUrlQueryData';
|
import useUrlQueryData from 'hooks/useUrlQueryData';
|
||||||
@ -44,7 +45,7 @@ function ListView(): JSX.Element {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
|
const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
|
||||||
URL_PAGINATION,
|
QueryParams.pagination,
|
||||||
);
|
);
|
||||||
|
|
||||||
const { data, isFetching, isError } = useGetQueryRange(
|
const { data, isFetching, isError } = useGetQueryRange(
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
import { Typography } from 'antd';
|
import { Typography } from 'antd';
|
||||||
import { ResizeTable } from 'components/ResizeTable';
|
import { ResizeTable } from 'components/ResizeTable';
|
||||||
|
import { QueryParams } from 'constants/query';
|
||||||
import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
|
import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
|
||||||
import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
|
import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
|
||||||
import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
|
import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
|
||||||
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
|
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
|
||||||
import { Pagination, URL_PAGINATION } from 'hooks/queryPagination';
|
import { Pagination } from 'hooks/queryPagination';
|
||||||
import useUrlQueryData from 'hooks/useUrlQueryData';
|
import useUrlQueryData from 'hooks/useUrlQueryData';
|
||||||
import { memo, useMemo } from 'react';
|
import { memo, useMemo } from 'react';
|
||||||
import { useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
@ -24,7 +25,7 @@ function TracesView(): JSX.Element {
|
|||||||
>((state) => state.globalTime);
|
>((state) => state.globalTime);
|
||||||
|
|
||||||
const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
|
const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
|
||||||
URL_PAGINATION,
|
QueryParams.pagination,
|
||||||
);
|
);
|
||||||
|
|
||||||
const { data, isLoading } = useGetQueryRange(
|
const { data, isLoading } = useGetQueryRange(
|
||||||
|
@ -1,3 +1 @@
|
|||||||
export const URL_PAGINATION = 'pagination';
|
|
||||||
|
|
||||||
export const DEFAULT_PER_PAGE_OPTIONS: number[] = [25, 50, 100, 200];
|
export const DEFAULT_PER_PAGE_OPTIONS: number[] = [25, 50, 100, 200];
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
|
import { QueryParams } from 'constants/query';
|
||||||
import { ControlsProps } from 'container/Controls';
|
import { ControlsProps } from 'container/Controls';
|
||||||
import useUrlQueryData from 'hooks/useUrlQueryData';
|
import useUrlQueryData from 'hooks/useUrlQueryData';
|
||||||
import { useCallback, useEffect, useMemo } from 'react';
|
import { useCallback, useEffect, useMemo } from 'react';
|
||||||
|
|
||||||
import { DEFAULT_PER_PAGE_OPTIONS, URL_PAGINATION } from './config';
|
import { DEFAULT_PER_PAGE_OPTIONS } from './config';
|
||||||
import { Pagination } from './types';
|
import { Pagination } from './types';
|
||||||
import {
|
import {
|
||||||
checkIsValidPaginationData,
|
checkIsValidPaginationData,
|
||||||
@ -22,7 +23,7 @@ const useQueryPagination = (
|
|||||||
query: paginationQuery,
|
query: paginationQuery,
|
||||||
queryData: paginationQueryData,
|
queryData: paginationQueryData,
|
||||||
redirectWithQuery: redirectWithCurrentPagination,
|
redirectWithQuery: redirectWithCurrentPagination,
|
||||||
} = useUrlQueryData<Pagination>(URL_PAGINATION);
|
} = useUrlQueryData<Pagination>(QueryParams.pagination);
|
||||||
|
|
||||||
const handleCountItemsPerPageChange = useCallback(
|
const handleCountItemsPerPageChange = useCallback(
|
||||||
(newLimit: Pagination['limit']) => {
|
(newLimit: Pagination['limit']) => {
|
||||||
|
@ -494,6 +494,20 @@ export function QueryBuilderProvider({
|
|||||||
unit: query.unit || initialQueryState.unit,
|
unit: query.unit || initialQueryState.unit,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const pagination = urlQuery.get(QueryParams.pagination);
|
||||||
|
|
||||||
|
if (pagination) {
|
||||||
|
const parsedPagination = JSON.parse(pagination);
|
||||||
|
|
||||||
|
urlQuery.set(
|
||||||
|
QueryParams.pagination,
|
||||||
|
JSON.stringify({
|
||||||
|
limit: parsedPagination.limit,
|
||||||
|
offset: 0,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
urlQuery.set(
|
urlQuery.set(
|
||||||
QueryParams.compositeQuery,
|
QueryParams.compositeQuery,
|
||||||
encodeURIComponent(JSON.stringify(currentGeneratedQuery)),
|
encodeURIComponent(JSON.stringify(currentGeneratedQuery)),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user