GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-14 00:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: onRun Query offset is made zero (#4083)

Browse Source
This commit is contained in:
Palash Gupta 2023-11-30 18:41:26 +05:30 committed by GitHub
parent 9fb32acf6d
commit 0a77c7ab85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/constants/query.ts
View File

@ -27,4 +27,5 @@ export enum QueryParams {
viewName = 'viewName',
viewKey = 'viewKey',
expandedWidgetId = 'expandedWidgetId',
pagination = 'pagination',
}

5
frontend/src/container/TracesExplorer/ListView/index.tsx
View File

@ -1,11 +1,12 @@
import { ResizeTable } from 'components/ResizeTable';
import { LOCALSTORAGE } from 'constants/localStorage';
import { QueryParams } from 'constants/query';
import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
import { useOptionsMenu } from 'container/OptionsMenu';
import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { Pagination, URL_PAGINATION } from 'hooks/queryPagination';
import { Pagination } from 'hooks/queryPagination';
import useDragColumns from 'hooks/useDragColumns';
import { getDraggedColumns } from 'hooks/useDragColumns/utils';
import useUrlQueryData from 'hooks/useUrlQueryData';
@ -44,7 +45,7 @@ function ListView(): JSX.Element {
);
const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
URL_PAGINATION,
QueryParams.pagination,
);
const { data, isFetching, isError } = useGetQueryRange(

5
frontend/src/container/TracesExplorer/TracesView/index.tsx
View File

@ -1,10 +1,11 @@
import { Typography } from 'antd';
import { ResizeTable } from 'components/ResizeTable';
import { QueryParams } from 'constants/query';
import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { Pagination, URL_PAGINATION } from 'hooks/queryPagination';
import { Pagination } from 'hooks/queryPagination';
import useUrlQueryData from 'hooks/useUrlQueryData';
import { memo, useMemo } from 'react';
import { useSelector } from 'react-redux';
@ -24,7 +25,7 @@ function TracesView(): JSX.Element {
>((state) => state.globalTime);
const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
URL_PAGINATION,
QueryParams.pagination,
);
const { data, isLoading } = useGetQueryRange(

2
frontend/src/hooks/queryPagination/config.ts
View File

@ -1,3 +1 @@
export const URL_PAGINATION = 'pagination';
export const DEFAULT_PER_PAGE_OPTIONS: number[] = [25, 50, 100, 200];

5
frontend/src/hooks/queryPagination/useQueryPagination.ts
View File

@ -1,8 +1,9 @@
import { QueryParams } from 'constants/query';
import { ControlsProps } from 'container/Controls';
import useUrlQueryData from 'hooks/useUrlQueryData';
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 {
checkIsValidPaginationData,
@ -22,7 +23,7 @@ const useQueryPagination = (
query: paginationQuery,
queryData: paginationQueryData,
redirectWithQuery: redirectWithCurrentPagination,
} = useUrlQueryData<Pagination>(URL_PAGINATION);
} = useUrlQueryData<Pagination>(QueryParams.pagination);
const handleCountItemsPerPageChange = useCallback(
(newLimit: Pagination['limit']) => {

14
frontend/src/providers/QueryBuilder.tsx
View File

@ -494,6 +494,20 @@ export function QueryBuilderProvider({
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(
QueryParams.compositeQuery,
encodeURIComponent(JSON.stringify(currentGeneratedQuery)),