From e61b0a4d673b74e99b84c1d075b910db1412a323 Mon Sep 17 00:00:00 2001 From: Raj Kamal Singh <1133322+rkssisodiya@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:04:54 +0530 Subject: [PATCH 1/5] fix: handle prevPipelineData being undefined in PipelineExpandView footer (#3264) Co-authored-by: Palash Gupta --- .../PipelinePage/PipelineListsView/PipelineExpandView.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/container/PipelinePage/PipelineListsView/PipelineExpandView.tsx b/frontend/src/container/PipelinePage/PipelineListsView/PipelineExpandView.tsx index 89dbc4d87d..39dc60b2f7 100644 --- a/frontend/src/container/PipelinePage/PipelineListsView/PipelineExpandView.tsx +++ b/frontend/src/container/PipelinePage/PipelineListsView/PipelineExpandView.tsx @@ -193,7 +193,8 @@ function PipelineExpandView({ }, [setActionType]); const footer = useCallback((): JSX.Element | undefined => { - if (prevPipelineData.length === 0 || isEditingActionMode) { + const prevPipelinesCount = prevPipelineData?.length || 0; + if (prevPipelinesCount === 0 || isEditingActionMode) { return ( From 7fb29ad2ee559b99145362ec8bbb948b4e81eaea Mon Sep 17 00:00:00 2001 From: Palash Gupta Date: Fri, 4 Aug 2023 12:25:01 +0530 Subject: [PATCH 2/5] fix: tabs is updated (#3260) --- .../LogsExplorerViews/LogsExplorerViews.styled.ts | 8 -------- frontend/src/container/LogsExplorerViews/index.tsx | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styled.ts b/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styled.ts index a73fe526fb..712c89361b 100644 --- a/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styled.ts +++ b/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styled.ts @@ -1,13 +1,5 @@ -import { Tabs } from 'antd'; -import { themeColors } from 'constants/theme'; import styled from 'styled-components'; -export const TabsStyled = styled(Tabs)` - & .ant-tabs-nav { - background-color: ${themeColors.lightBlack}; - } -`; - export const ActionsWrapper = styled.div` display: flex; justify-content: flex-end; diff --git a/frontend/src/container/LogsExplorerViews/index.tsx b/frontend/src/container/LogsExplorerViews/index.tsx index 49f5aa13b5..d0fb3e4c20 100644 --- a/frontend/src/container/LogsExplorerViews/index.tsx +++ b/frontend/src/container/LogsExplorerViews/index.tsx @@ -1,4 +1,4 @@ -import { TabsProps } from 'antd'; +import { Tabs, TabsProps } from 'antd'; import TabLabel from 'components/TabLabel'; import { QueryParams } from 'constants/query'; import { @@ -40,7 +40,7 @@ import { import { DataSource, StringOperators } from 'types/common/queryBuilder'; import { GlobalReducer } from 'types/reducer/globalTime'; -import { ActionsWrapper, TabsStyled } from './LogsExplorerViews.styled'; +import { ActionsWrapper } from './LogsExplorerViews.styled'; function LogsExplorerViews(): JSX.Element { const { notifications } = useNotifications(); @@ -480,7 +480,7 @@ function LogsExplorerViews(): JSX.Element { /> )} - Date: Fri, 4 Aug 2023 10:31:54 +0300 Subject: [PATCH 3/5] fix: remove incorrect API request on the logs explorer page (#3266) --- frontend/src/container/LogsContextList/index.tsx | 1 + frontend/src/container/LogsExplorerViews/index.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/container/LogsContextList/index.tsx b/frontend/src/container/LogsContextList/index.tsx index 0433a5f636..7037a386aa 100644 --- a/frontend/src/container/LogsContextList/index.tsx +++ b/frontend/src/container/LogsContextList/index.tsx @@ -103,6 +103,7 @@ function LogsContextList({ PANEL_TYPES.LIST, { keepPreviousData: true, + enabled: !!requestData, onSuccess: handleSuccess, }, ); diff --git a/frontend/src/container/LogsExplorerViews/index.tsx b/frontend/src/container/LogsExplorerViews/index.tsx index d0fb3e4c20..6eb50af93d 100644 --- a/frontend/src/container/LogsExplorerViews/index.tsx +++ b/frontend/src/container/LogsExplorerViews/index.tsx @@ -154,7 +154,7 @@ function LogsExplorerViews(): JSX.Element { panelType, { keepPreviousData: true, - enabled: !isLimit, + enabled: !isLimit && !!requestData, }, { ...(timeRange && From 10141a207bb8ac65602c939e112cb4cbd4bf8a33 Mon Sep 17 00:00:00 2001 From: Palash Gupta Date: Sun, 6 Aug 2023 20:50:33 +0530 Subject: [PATCH 4/5] fix: channels new key is updated (#3271) --- frontend/src/pages/AlertChannelCreate/config.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/AlertChannelCreate/config.tsx b/frontend/src/pages/AlertChannelCreate/config.tsx index fad322c119..7587565dc5 100644 --- a/frontend/src/pages/AlertChannelCreate/config.tsx +++ b/frontend/src/pages/AlertChannelCreate/config.tsx @@ -13,7 +13,7 @@ export const alertsRoutesConfig = [ { Component: (): JSX.Element => , name: t('routes.alert_channels'), - route: ROUTES.ALL_CHANNELS, - key: ROUTES.ALL_CHANNELS, + route: ROUTES.CHANNELS_NEW, + key: ROUTES.CHANNELS_NEW, }, ]; From afd893b8b521413694d65db5e783972d89e25435 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Sun, 6 Aug 2023 21:17:12 +0530 Subject: [PATCH 5/5] chore: bump version to v0.25.3 --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 8220c0905b..d273e996bf 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -137,7 +137,7 @@ services: condition: on-failure query-service: - image: signoz/query-service:0.25.2 + image: signoz/query-service:0.25.3 command: ["-config=/root/config/prometheus.yml"] # ports: # - "6060:6060" # pprof port @@ -166,7 +166,7 @@ services: <<: *clickhouse-depend frontend: - image: signoz/frontend:0.25.2 + image: signoz/frontend:0.25.3 deploy: restart_policy: condition: on-failure diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 55fd8844a2..bcf6135274 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -153,7 +153,7 @@ services: # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md` query-service: - image: signoz/query-service:${DOCKER_TAG:-0.25.2} + image: signoz/query-service:${DOCKER_TAG:-0.25.3} container_name: query-service command: ["-config=/root/config/prometheus.yml"] # ports: @@ -181,7 +181,7 @@ services: <<: *clickhouse-depend frontend: - image: signoz/frontend:${DOCKER_TAG:-0.25.2} + image: signoz/frontend:${DOCKER_TAG:-0.25.3} container_name: frontend restart: on-failure depends_on: