Merge branch 'gh-4032' of https://github.com/SigNoz/signoz into gh-4032

SigNoz · Dec 1, 2023 · b513daf · b513daf
2 parents 26a6390 + d60851e
commit b513daf
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
diff --git a/.github/workflows/staging-deployment.yaml b/.github/workflows/staging-deployment.yaml
@@ -29,7 +29,7 @@ jobs:
             export PATH="/usr/local/go/bin/:$PATH" # needed for Golang to work
             docker system prune --force
             docker pull signoz/signoz-otel-collector:main
-            docker pull signoz/signoz/signoz-schema-migrator:main
+            docker pull signoz/signoz-schema-migrator:main
             cd ~/signoz
             git status
             git add .

diff --git a/frontend/src/components/ExplorerCard/utils.ts b/frontend/src/components/ExplorerCard/utils.ts
@@ -153,7 +153,7 @@ export const deleteViewHandler = ({
 			if (viewId === viewKey) {
 				redirectWithQueryBuilderData(
 					updateAllQueriesOperators(
-						initialQueriesMap.traces,
+						initialQueriesMap[sourcePage],
 						panelType || PANEL_TYPES.LIST,
 						sourcePage,
 					),

diff --git a/frontend/src/constants/query.ts b/frontend/src/constants/query.ts
@@ -27,4 +27,5 @@ export enum QueryParams {
 	viewName = 'viewName',
 	viewKey = 'viewKey',
 	expandedWidgetId = 'expandedWidgetId',
+	pagination = 'pagination',
 }
diff --git a/frontend/src/container/TracesExplorer/ListView/index.tsx b/frontend/src/container/TracesExplorer/ListView/index.tsx
@@ -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(

diff --git a/frontend/src/container/TracesExplorer/TracesView/index.tsx b/frontend/src/container/TracesExplorer/TracesView/index.tsx
@@ -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(

diff --git a/frontend/src/hooks/queryPagination/config.ts b/frontend/src/hooks/queryPagination/config.ts
@@ -1,3 +1 @@
-export const URL_PAGINATION = 'pagination';
-
 export const DEFAULT_PER_PAGE_OPTIONS: number[] = [25, 50, 100, 200];
diff --git a/frontend/src/hooks/queryPagination/useQueryPagination.ts b/frontend/src/hooks/queryPagination/useQueryPagination.ts
@@ -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']) => {

diff --git a/frontend/src/providers/QueryBuilder.tsx b/frontend/src/providers/QueryBuilder.tsx
@@ -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)),