From 225a345baa29ed4cf8fa74e18b43c82194830c78 Mon Sep 17 00:00:00 2001
From: Palash gupta <palash@signoz.io>
Date: Tue, 29 Mar 2022 00:02:16 +0530
Subject: [PATCH 01/10] chore: getTagValue api is added

---
 frontend/src/api/trace/getTagValue.ts | 28 +++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 frontend/src/api/trace/getTagValue.ts

diff --git a/frontend/src/api/trace/getTagValue.ts b/frontend/src/api/trace/getTagValue.ts
new file mode 100644
index 0000000000..25156d32ef
--- /dev/null
+++ b/frontend/src/api/trace/getTagValue.ts
@@ -0,0 +1,28 @@
+import axios from 'api';
+import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
+import { AxiosError } from 'axios';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+import { PayloadProps, Props } from 'types/api/trace/getTagValue';
+
+const getTagValue = async (
+	props: Props,
+): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
+	try {
+		const response = await axios.post<PayloadProps>(`/getTagValues`, {
+			start: props.start.toString(),
+			end: props.end.toString(),
+			tagKey: props.tagKey,
+		});
+
+		return {
+			statusCode: 200,
+			error: null,
+			message: 'Success',
+			payload: response.data,
+		};
+	} catch (error) {
+		return ErrorResponseHandler(error as AxiosError);
+	}
+};
+
+export default getTagValue;

From d4d1104a5328c574165f99da2ed02d9fe9c834f1 Mon Sep 17 00:00:00 2001
From: Palash gupta <palash@signoz.io>
Date: Tue, 29 Mar 2022 00:02:56 +0530
Subject: [PATCH 02/10] WIP: value suggestion is added

---
 .../AllTags/Tag/DebounceSelect/index.tsx      | 63 +++++++++++++++++++
 .../Trace/Search/AllTags/Tag/config.ts        | 32 ++++++++++
 .../Trace/Search/AllTags/Tag/index.tsx        | 25 +++++---
 .../Trace/Search/AllTags/Tag/styles.ts        |  6 --
 frontend/src/types/api/trace/getTagValue.ts   | 11 ++++
 5 files changed, 123 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
 create mode 100644 frontend/src/container/Trace/Search/AllTags/Tag/config.ts
 create mode 100644 frontend/src/types/api/trace/getTagValue.ts

diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
new file mode 100644
index 0000000000..1971947820
--- /dev/null
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
@@ -0,0 +1,63 @@
+import { Select, Spin } from 'antd';
+import { SelectProps } from 'antd/es/select';
+import debounce from 'lodash-es/debounce';
+import React, { useRef, useState } from 'react';
+
+export interface DebounceSelectProps<ValueType = any>
+	extends Omit<SelectProps<ValueType>, 'options' | 'children'> {
+	fetchOptions: (search: string) => Promise<ValueType[]>;
+	debounceTimeout: number;
+}
+
+function DebounceSelect<
+	ValueType extends {
+		key?: string;
+		label: React.ReactNode;
+		value: string | number;
+	} = never
+>({
+	fetchOptions,
+	debounceTimeout = 800,
+	...props
+}: DebounceSelectProps): JSX.Element {
+	const [fetching, setFetching] = useState(false);
+	const [options, setOptions] = useState<ValueType[]>([]);
+	const fetchRef = useRef(0);
+
+	const debounceFetcher = React.useMemo(() => {
+		const loadOptions = (value: string): void => {
+			fetchRef.current += 1;
+			const fetchId = fetchRef.current;
+			setOptions([]);
+			setFetching(true);
+
+			fetchOptions(value).then((newOptions) => {
+				if (fetchId !== fetchRef.current) {
+					// for fetch callback order
+					return;
+				}
+
+				setOptions(newOptions);
+				setFetching(false);
+			});
+		};
+
+		return debounce(loadOptions, debounceTimeout);
+	}, [fetchOptions, debounceTimeout]);
+
+	return (
+		<Select<ValueType>
+			labelInValue
+			filterOption={false}
+			onSearch={debounceFetcher}
+			notFoundContent={fetching ? <Spin size="small" /> : null}
+			style={{ minWidth: '170px' }}
+			// as all other props are from SelectProps only
+			// eslint-disable-next-line react/jsx-props-no-spreading
+			{...props}
+			options={options}
+		/>
+	);
+}
+
+export default DebounceSelect;
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/config.ts b/frontend/src/container/Trace/Search/AllTags/Tag/config.ts
new file mode 100644
index 0000000000..07ee042621
--- /dev/null
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/config.ts
@@ -0,0 +1,32 @@
+import getTagValue from 'api/trace/getTagValue';
+
+// Usage of DebounceSelect
+export interface TagValue {
+	label: string;
+	value: string;
+}
+
+export async function fetchTag(
+	globalStart: number,
+	globalEnd: number,
+	tagKey: string,
+): Promise<TagValue[]> {
+	const response = await getTagValue({
+		end: globalEnd,
+		start: globalStart,
+		tagKey,
+	});
+
+	if (response.statusCode !== 200 || !response.payload) {
+		return [];
+	}
+
+	console.log(response.payload);
+
+	return [
+		{
+			label: 'asd',
+			value: 'asd',
+		},
+	];
+}
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
index e6ad17956f..8bcf15757a 100644
--- a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
@@ -3,14 +3,12 @@ import { Select } from 'antd';
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
+import { GlobalReducer } from 'types/reducer/globalTime';
 import { TraceReducer } from 'types/reducer/trace';
 
-import {
-	Container,
-	IconContainer,
-	SelectComponent,
-	ValueSelect,
-} from './styles';
+import { fetchTag, TagValue } from './config';
+import DebounceSelect from './DebounceSelect';
+import { Container, IconContainer, SelectComponent } from './styles';
 import TagsKey from './TagKey';
 
 const { Option } = Select;
@@ -35,6 +33,9 @@ const AllMenu: AllMenuProps[] = [
 
 function SingleTags(props: AllTagsProps): JSX.Element {
 	const traces = useSelector<AppState, TraceReducer>((state) => state.traces);
+	const globalReducer = useSelector<AppState, GlobalReducer>(
+		(state) => state.globalTime,
+	);
 
 	const { tag, onCloseHandler, setLocalSelectedTags, index } = props;
 	const {
@@ -80,7 +81,15 @@ function SingleTags(props: AllTagsProps): JSX.Element {
 				))}
 			</SelectComponent>
 
-			<ValueSelect
+			<DebounceSelect
+				fetchOptions={(): Promise<TagValue[]> =>
+					fetchTag(globalReducer.minTime, globalReducer.maxTime, selectedKey[0])
+				}
+				debounceTimeout={300}
+				mode="tags"
+			/>
+
+			{/* <ValueSelect
 				value={selectedValues}
 				onChange={(value): void => {
 					setLocalSelectedTags((tags) => [
@@ -94,7 +103,7 @@ function SingleTags(props: AllTagsProps): JSX.Element {
 					]);
 				}}
 				mode="tags"
-			/>
+			/> */}
 
 			<IconContainer role="button" onClick={(): void => onDeleteTagHandler(index)}>
 				<CloseOutlined />
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/styles.ts b/frontend/src/container/Trace/Search/AllTags/Tag/styles.ts
index 8da702197d..347bc287f2 100644
--- a/frontend/src/container/Trace/Search/AllTags/Tag/styles.ts
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/styles.ts
@@ -15,12 +15,6 @@ export const SelectComponent = styled(Select)`
 	}
 `;
 
-export const ValueSelect = styled(Select)`
-	&&& {
-		width: 100%;
-	}
-`;
-
 export const Container = styled.div`
 	&&& {
 		display: flex;
diff --git a/frontend/src/types/api/trace/getTagValue.ts b/frontend/src/types/api/trace/getTagValue.ts
new file mode 100644
index 0000000000..221be8dfba
--- /dev/null
+++ b/frontend/src/types/api/trace/getTagValue.ts
@@ -0,0 +1,11 @@
+import { GlobalReducer } from 'types/reducer/globalTime';
+
+export interface Props {
+	start: GlobalReducer['minTime'];
+	end: GlobalReducer['maxTime'];
+	tagKey: string;
+}
+
+export interface PayloadProps {
+	key: string;
+}

From 5556d1d6fc8f87f343669a36ba0b49745f57f6f9 Mon Sep 17 00:00:00 2001
From: Palash gupta <palash@signoz.io>
Date: Tue, 29 Mar 2022 09:59:50 +0530
Subject: [PATCH 03/10] feat: tag value suggestion is updated

---
 .../AllTags/Tag/DebounceSelect/index.tsx      |  2 +-
 .../Trace/Search/AllTags/Tag/config.ts        | 12 ++++-------
 .../Trace/Search/AllTags/Tag/index.tsx        | 21 ++++++++++---------
 frontend/src/types/api/trace/getTagValue.ts   |  6 ++++--
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
index 1971947820..2576e782e0 100644
--- a/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
@@ -51,7 +51,7 @@ function DebounceSelect<
 			filterOption={false}
 			onSearch={debounceFetcher}
 			notFoundContent={fetching ? <Spin size="small" /> : null}
-			style={{ minWidth: '170px' }}
+			style={{ width: '170px' }}
 			// as all other props are from SelectProps only
 			// eslint-disable-next-line react/jsx-props-no-spreading
 			{...props}
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/config.ts b/frontend/src/container/Trace/Search/AllTags/Tag/config.ts
index 07ee042621..ce414a5f15 100644
--- a/frontend/src/container/Trace/Search/AllTags/Tag/config.ts
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/config.ts
@@ -21,12 +21,8 @@ export async function fetchTag(
 		return [];
 	}
 
-	console.log(response.payload);
-
-	return [
-		{
-			label: 'asd',
-			value: 'asd',
-		},
-	];
+	return response.payload.map((e) => ({
+		label: e.tagValues,
+		value: e.tagValues,
+	}));
 }
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
index 8bcf15757a..37b42347a1 100644
--- a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
@@ -83,27 +83,22 @@ function SingleTags(props: AllTagsProps): JSX.Element {
 
 			<DebounceSelect
 				fetchOptions={(): Promise<TagValue[]> =>
-					fetchTag(globalReducer.minTime, globalReducer.maxTime, selectedKey[0])
+					fetchTag(globalReducer.minTime, globalReducer.maxTime, selectedKey[index])
 				}
 				debounceTimeout={300}
-				mode="tags"
-			/>
-
-			{/* <ValueSelect
-				value={selectedValues}
-				onChange={(value): void => {
+				onSelect={(value: Value): void => {
 					setLocalSelectedTags((tags) => [
 						...tags.slice(0, index),
 						{
 							Key: selectedKey,
 							Operator: selectedOperator,
-							Values: value as string[],
+							Values: [...selectedValues, value.value],
 						},
 						...tags.slice(index + 1, tags.length),
 					]);
 				}}
-				mode="tags"
-			/> */}
+				mode="multiple"
+			/>
 
 			<IconContainer role="button" onClick={(): void => onDeleteTagHandler(index)}>
 				<CloseOutlined />
@@ -121,4 +116,10 @@ interface AllTagsProps {
 	>;
 }
 
+interface Value {
+	key: string;
+	label: string;
+	value: string;
+}
+
 export default SingleTags;
diff --git a/frontend/src/types/api/trace/getTagValue.ts b/frontend/src/types/api/trace/getTagValue.ts
index 221be8dfba..e90975d1d5 100644
--- a/frontend/src/types/api/trace/getTagValue.ts
+++ b/frontend/src/types/api/trace/getTagValue.ts
@@ -6,6 +6,8 @@ export interface Props {
 	tagKey: string;
 }
 
-export interface PayloadProps {
-	key: string;
+interface Value {
+	tagValues: string;
 }
+
+export type PayloadProps = Value[];

From 1d28ceb3d78095801161b4242b651d6fcf08cb57 Mon Sep 17 00:00:00 2001
From: Ahsan Barkati <ahsanbarkati@gmail.com>
Date: Fri, 1 Apr 2022 11:22:25 +0530
Subject: [PATCH 04/10] feat(query-service): Add cold storage support in getTTL
 API (#922)

* Add cold storage support in getTTL API
---
 .../app/clickhouseReader/reader.go            |  72 ++++++++++--------
 pkg/query-service/app/parser.go               |   2 +-
 pkg/query-service/model/response.go           |   6 +-
 pkg/query-service/tests/cold_storage_test.go  |  72 ++++++++++++++++++
 .../tests/test-deploy/data/signoz.db          | Bin 0 -> 32768 bytes
 5 files changed, 119 insertions(+), 33 deletions(-)
 create mode 100644 pkg/query-service/tests/test-deploy/data/signoz.db

diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go
index 167aa6236a..de49aa0e49 100644
--- a/pkg/query-service/app/clickhouseReader/reader.go
+++ b/pkg/query-service/app/clickhouseReader/reader.go
@@ -13,6 +13,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -44,8 +45,8 @@ import (
 	"github.com/prometheus/prometheus/util/strutil"
 
 	"go.signoz.io/query-service/constants"
-	"go.signoz.io/query-service/model"
 	am "go.signoz.io/query-service/integrations/alertManager"
+	"go.signoz.io/query-service/model"
 	"go.uber.org/zap"
 )
 
@@ -75,7 +76,7 @@ type ClickHouseReader struct {
 	remoteStorage   *remote.Storage
 	ruleManager     *rules.Manager
 	promConfig      *config.Config
-	alertManager		am.Manager
+	alertManager    am.Manager
 }
 
 // NewTraceReader returns a TraceReader for the database
@@ -95,7 +96,7 @@ func NewReader(localDB *sqlx.DB) *ClickHouseReader {
 	return &ClickHouseReader{
 		db:              db,
 		localDB:         localDB,
-		alertManager:		 alertManager,
+		alertManager:    alertManager,
 		operationsTable: options.primary.OperationsTable,
 		indexTable:      options.primary.IndexTable,
 		errorTable:      options.primary.ErrorTable,
@@ -850,7 +851,6 @@ func (r *ClickHouseReader) EditChannel(receiver *am.Receiver, id string) (*am.Re
 
 }
 
-
 func (r *ClickHouseReader) CreateChannel(receiver *am.Receiver) (*am.Receiver, *model.ApiError) {
 
 	tx, err := r.localDB.Begin()
@@ -860,8 +860,8 @@ func (r *ClickHouseReader) CreateChannel(receiver *am.Receiver) (*am.Receiver, *
 
 	channel_type := getChannelType(receiver)
 	receiverString, _ := json.Marshal(receiver)
-	
-	// todo: check if the channel name already exists, raise an error if so 
+
+	// todo: check if the channel name already exists, raise an error if so
 
 	{
 		stmt, err := tx.Prepare(`INSERT INTO notification_channels (created_at, updated_at, name, type, data) VALUES($1,$2,$3,$4,$5);`)
@@ -884,7 +884,7 @@ func (r *ClickHouseReader) CreateChannel(receiver *am.Receiver) (*am.Receiver, *
 		tx.Rollback()
 		return nil, apiError
 	}
-	
+
 	err = tx.Commit()
 	if err != nil {
 		zap.S().Errorf("Error in commiting transaction for INSERT to notification_channels\n", err)
@@ -2602,7 +2602,6 @@ func (r *ClickHouseReader) GetDisks(ctx context.Context) (*[]model.DiskItem, *mo
 			fmt.Errorf("error while getting disks. Err=%v", err)}
 	}
 
-
 	zap.S().Infof("Got response: %+v\n", diskItems)
 
 	return &diskItems, nil
@@ -2610,29 +2609,33 @@ func (r *ClickHouseReader) GetDisks(ctx context.Context) (*[]model.DiskItem, *mo
 
 func (r *ClickHouseReader) GetTTL(ctx context.Context, ttlParams *model.GetTTLParams) (*model.GetTTLResponseItem, *model.ApiError) {
 
-	parseTTL := func(queryResp string) int {
-		values := strings.Split(queryResp, " ")
-		N := len(values)
-		ttlIdx := -1
+	parseTTL := func(queryResp string) (int, int) {
 
-		for i := 0; i < N; i++ {
-			if strings.Contains(values[i], "toIntervalSecond") {
-				ttlIdx = i
-				break
+		zap.S().Debugf("Parsing TTL from: %s", queryResp)
+		deleteTTLExp := regexp.MustCompile(`toIntervalSecond\(([0-9]*)\)`)
+		moveTTLExp := regexp.MustCompile(`toIntervalSecond\(([0-9]*)\) TO VOLUME`)
+
+		var delTTL, moveTTL int = -1, -1
+
+		m := deleteTTLExp.FindStringSubmatch(queryResp)
+		if len(m) > 1 {
+			seconds_int, err := strconv.Atoi(m[1])
+			if err != nil {
+				return -1, -1
 			}
-		}
-		if ttlIdx == -1 {
-			return ttlIdx
+			delTTL = seconds_int / 3600
 		}
 
-		output := strings.SplitN(values[ttlIdx], "(", 2)
-		timePart := strings.Trim(output[1], ")")
-		seconds_int, err := strconv.Atoi(timePart)
-		if err != nil {
-			return -1
+		m = moveTTLExp.FindStringSubmatch(queryResp)
+		if len(m) > 1 {
+			seconds_int, err := strconv.Atoi(m[1])
+			if err != nil {
+				return -1, -1
+			}
+			moveTTL = seconds_int / 3600
 		}
-		ttl_hrs := seconds_int / 3600
-		return ttl_hrs
+
+		return delTTL, moveTTL
 	}
 
 	getMetricsTTL := func() (*model.DBResponseTTL, *model.ApiError) {
@@ -2671,7 +2674,8 @@ func (r *ClickHouseReader) GetTTL(ctx context.Context, ttlParams *model.GetTTLPa
 			return nil, err
 		}
 
-		return &model.GetTTLResponseItem{TracesTime: parseTTL(dbResp.EngineFull)}, nil
+		delTTL, moveTTL := parseTTL(dbResp.EngineFull)
+		return &model.GetTTLResponseItem{TracesTime: delTTL, TracesMoveTime: moveTTL}, nil
 
 	case constants.MetricsTTL:
 		dbResp, err := getMetricsTTL()
@@ -2679,7 +2683,9 @@ func (r *ClickHouseReader) GetTTL(ctx context.Context, ttlParams *model.GetTTLPa
 			return nil, err
 		}
 
-		return &model.GetTTLResponseItem{MetricsTime: parseTTL(dbResp.EngineFull)}, nil
+		delTTL, moveTTL := parseTTL(dbResp.EngineFull)
+		return &model.GetTTLResponseItem{MetricsTime: delTTL, MetricsMoveTime: moveTTL}, nil
+
 	}
 	db1, err := getTracesTTL()
 	if err != nil {
@@ -2690,9 +2696,15 @@ func (r *ClickHouseReader) GetTTL(ctx context.Context, ttlParams *model.GetTTLPa
 	if err != nil {
 		return nil, err
 	}
+	tracesDelTTL, tracesMoveTTL := parseTTL(db1.EngineFull)
+	metricsDelTTL, metricsMoveTTL := parseTTL(db2.EngineFull)
 
-	return &model.GetTTLResponseItem{TracesTime: parseTTL(db1.EngineFull), MetricsTime: parseTTL(db2.EngineFull)}, nil
-
+	return &model.GetTTLResponseItem{
+		TracesTime:      tracesDelTTL,
+		TracesMoveTime:  tracesMoveTTL,
+		MetricsTime:     metricsDelTTL,
+		MetricsMoveTime: metricsMoveTTL,
+	}, nil
 }
 
 func (r *ClickHouseReader) GetErrors(ctx context.Context, queryParams *model.GetErrorsParams) (*[]model.Error, *model.ApiError) {
diff --git a/pkg/query-service/app/parser.go b/pkg/query-service/app/parser.go
index 3e3abc6c79..ae9abc5204 100644
--- a/pkg/query-service/app/parser.go
+++ b/pkg/query-service/app/parser.go
@@ -914,7 +914,7 @@ func parseTTLParams(r *http.Request) (*model.TTLParams, error) {
 		if err != nil {
 			return nil, fmt.Errorf("Not a valid toCold TTL duration %v", toColdDuration)
 		}
-		if toColdParsed.Seconds() >= durationParsed.Seconds() {
+		if toColdParsed.Seconds() != 0 && toColdParsed.Seconds() >= durationParsed.Seconds() {
 			return nil, fmt.Errorf("Delete TTL should be greater than cold storage move TTL.")
 		}
 	}
diff --git a/pkg/query-service/model/response.go b/pkg/query-service/model/response.go
index bbee7224e9..8d4bd4b766 100644
--- a/pkg/query-service/model/response.go
+++ b/pkg/query-service/model/response.go
@@ -283,8 +283,10 @@ type DBResponseTTL struct {
 }
 
 type GetTTLResponseItem struct {
-	MetricsTime int `json:"metrics_ttl_duration_hrs"`
-	TracesTime  int `json:"traces_ttl_duration_hrs"`
+	MetricsTime     int `json:"metrics_ttl_duration_hrs,omitempty"`
+	MetricsMoveTime int `json:"metrics_move_ttl_duration_hrs,omitempty"`
+	TracesTime      int `json:"traces_ttl_duration_hrs,omitempty"`
+	TracesMoveTime  int `json:"traces_move_ttl_duration_hrs,omitempty"`
 }
 
 type DBResponseMinMaxDuration struct {
diff --git a/pkg/query-service/tests/cold_storage_test.go b/pkg/query-service/tests/cold_storage_test.go
index f748db30dc..8159805a56 100644
--- a/pkg/query-service/tests/cold_storage_test.go
+++ b/pkg/query-service/tests/cold_storage_test.go
@@ -1,6 +1,7 @@
 package tests
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -8,6 +9,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"go.signoz.io/query-service/model"
 )
 
 const (
@@ -102,6 +104,76 @@ func TestSetTTL(t *testing.T) {
 	fmt.Printf("=== Found %d objects in Minio\n", count)
 }
 
+func getTTL(t *testing.T, table string) *model.GetTTLResponseItem {
+	req := endpoint + fmt.Sprintf("/api/v1/settings/ttl?type=%s", table)
+	if len(table) == 0 {
+		req = endpoint + "/api/v1/settings/ttl"
+	}
+
+	resp, err := client.Get(req)
+	require.NoError(t, err)
+
+	defer resp.Body.Close()
+	b, err := ioutil.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	res := &model.GetTTLResponseItem{}
+	require.NoError(t, json.Unmarshal(b, res))
+	return res
+}
+
+func TestGetTTL(t *testing.T) {
+	r, err := setTTL("traces", "s3", "3600s", "7200s")
+	require.NoError(t, err)
+	require.Contains(t, string(r), "successfully set up")
+
+	resp := getTTL(t, "traces")
+	require.Equal(t, 1, resp.TracesMoveTime)
+	require.Equal(t, 2, resp.TracesTime)
+
+	r, err = setTTL("metrics", "s3", "3600s", "7200s")
+	require.NoError(t, err)
+	require.Contains(t, string(r), "successfully set up")
+
+	resp = getTTL(t, "metrics")
+	require.Equal(t, 1, resp.MetricsMoveTime)
+	require.Equal(t, 2, resp.MetricsTime)
+
+	r, err = setTTL("traces", "s3", "36000s", "72000s")
+	require.NoError(t, err)
+	require.Contains(t, string(r), "successfully set up")
+
+	resp = getTTL(t, "")
+	require.Equal(t, 10, resp.TracesMoveTime)
+	require.Equal(t, 20, resp.TracesTime)
+	require.Equal(t, 1, resp.MetricsMoveTime)
+	require.Equal(t, 2, resp.MetricsTime)
+
+	r, err = setTTL("metrics", "s3", "15h", "50h")
+	require.NoError(t, err)
+	require.Contains(t, string(r), "successfully set up")
+
+	resp = getTTL(t, "")
+	require.Equal(t, 10, resp.TracesMoveTime)
+	require.Equal(t, 20, resp.TracesTime)
+	require.Equal(t, 15, resp.MetricsMoveTime)
+	require.Equal(t, 50, resp.MetricsTime)
+
+	r, err = setTTL("metrics", "s3", "0s", "0s")
+	require.NoError(t, err)
+	require.Contains(t, string(r), "successfully set up")
+
+	r, err = setTTL("traces", "s3", "0s", "0s")
+	require.NoError(t, err)
+	require.Contains(t, string(r), "successfully set up")
+
+	resp = getTTL(t, "")
+	require.Equal(t, 0, resp.TracesMoveTime)
+	require.Equal(t, 0, resp.TracesTime)
+	require.Equal(t, 0, resp.MetricsMoveTime)
+	require.Equal(t, 0, resp.MetricsTime)
+}
+
 func TestMain(m *testing.M) {
 	if err := startCluster(); err != nil {
 		fmt.Println(err)
diff --git a/pkg/query-service/tests/test-deploy/data/signoz.db b/pkg/query-service/tests/test-deploy/data/signoz.db
new file mode 100644
index 0000000000000000000000000000000000000000..c19319ab3476b0101d7f73bdf31e884b5e9f3590
GIT binary patch
literal 32768
zcmeI(-%i?490%}Lgo+ztvWwmx?;zR@22po6<~m12RBW?(v2+J|h)tly{z>Mg_z=6^
zv+Nmsh-G_#UGB7stcVb@n>G116x#DUJ@ofEr%g_vrzZ`|XQb=6ed?2nur7$A@R|@o
z5Yl{I;p=Ew<{RNUTEx-DjL)?2{Pc4!|67or91Ckd^556K=6*f(a^Lta76?E90uX=z
z1Rwwb2qa!$NF+&C6!F^gX}iY)kGaOcWnJbnyTiQ6{gu6zTGLdb)!sBzG8rX>)oj)>
zNxiA5`)Z3Ex9W$r))_fa&qz(zj_OT*_@Ua=ws^fD;59Y%qehxXeAOF`u+;KuwqsxR
zoxr<qW)vrH)ps?$p^*~Vd#~;t6ylXhp|n*l7Q<G~sdqH+nW+y<>a!UwmG4@5c)(q2
ztJ&gkGcCzGJK}W^5!sG!b*&EdEyp%G=hU`Y&zoA9iD6BxvXEHEWjq_x;1i!PE#K<1
zm|YNM`*_@@{D7D^(VO)XT@A_n%fUo2EHzn=@vpq^iu)djg4Cz+_PAC(laW8|h=OIC
z?2C8N<Fhq`2EG&R8&eUC^3-DKs<14{vMdf?MDT9VV_x)@j=@Gn3qj6<T0HCHR7T$1
z6wjg)z02BT7eRCp-6D*3mt!YCQMVBG(H5^-y!s$Y^2UZZyo}m3sdwIXsB3!Tt)*B?
z<MPEU9$bch4T^sqaeSCQ93hpZjJ&_`*a#V?VU)+)DSo4k=JvVpj=P@t+b$A-00bZa
z0SG_<0uX=z1Rwwb2tZ(lz-k!7{C|cJLJ)ue1Rwwb2tWV=5P$##AOL~n3xvP_i}{}d
ze_??D1Rwwb2tWV=5P$##AOHafKp^=7&%~6HoqWUy|Nl>Z$07p=KmY;|fB*y_009U<
z00Izzz&ruW|K|xI4gm;200Izz00bZa0SG_<0uV^P0G|I(ejg$O2tWV=5P$##AOHaf
zKmY;|fWSO~+voppg#69CnutRH0uX=z1Rwwb2tWV=5P$##An;!a6vecluVlAbrNpX~
cD&<nQtyImIU8QZB+X{QNYgW6vwA884KelF*mH+?%

literal 0
HcmV?d00001


From 1b28a4e6f504a7f780bcd67508bf2e5d23e85a10 Mon Sep 17 00:00:00 2001
From: palash-signoz <palash@signoz.io>
Date: Fri, 1 Apr 2022 15:43:58 +0530
Subject: [PATCH 05/10] chore: links are updated for all dashboard and promql
 (#908)

---
 frontend/src/container/ListOfDashboard/index.tsx                | 2 +-
 .../container/NewWidget/LeftContainer/QuerySection/Query.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/container/ListOfDashboard/index.tsx b/frontend/src/container/ListOfDashboard/index.tsx
index 8828d748f2..492da5c846 100644
--- a/frontend/src/container/ListOfDashboard/index.tsx
+++ b/frontend/src/container/ListOfDashboard/index.tsx
@@ -157,7 +157,7 @@ function ListOfAllDashboard(): JSX.Element {
 								<TextToolTip
 									{...{
 										text: `More details on how to create dashboards`,
-										url: 'https://signoz.io/docs/userguide/metrics-dashboard',
+										url: 'https://signoz.io/docs/userguide/dashboards',
 									}}
 								/>
 
diff --git a/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx b/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx
index 97aa24d180..916771eece 100644
--- a/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx
+++ b/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx
@@ -114,7 +114,7 @@ function Query({
 					<TextToolTip
 						{...{
 							text: `More details on how to plot metrics graphs`,
-							url: 'https://signoz.io/docs/userguide/prometheus-metrics/',
+							url: 'https://signoz.io/docs/userguide/send-metrics/#related-videos',
 						}}
 					/>
 				</ButtonContainer>

From d085506d3e16f71f46de37d8289c1fd5b762495a Mon Sep 17 00:00:00 2001
From: palash-signoz <palash@signoz.io>
Date: Fri, 1 Apr 2022 15:47:39 +0530
Subject: [PATCH 06/10] bug: logged in check is added in the useEffect (#921)

---
 frontend/src/container/AppLayout/index.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/container/AppLayout/index.tsx b/frontend/src/container/AppLayout/index.tsx
index 84f7d237e2..5a9051c215 100644
--- a/frontend/src/container/AppLayout/index.tsx
+++ b/frontend/src/container/AppLayout/index.tsx
@@ -27,6 +27,12 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 		}
 	}, [isLoggedIn, isSignUpPage]);
 
+	useEffect(() => {
+		if (isLoggedIn) {
+			history.push(ROUTES.APPLICATION);
+		}
+	}, [isLoggedIn]);
+
 	return (
 		<Layout>
 			{!isSignUpPage && <SideNav />}

From a566b5dc971a7971868a0575495d201d936dceff Mon Sep 17 00:00:00 2001
From: palash-signoz <palash@signoz.io>
Date: Fri, 1 Apr 2022 17:59:44 +0530
Subject: [PATCH 07/10] bug: no service and loading check are added (#934)

---
 .../src/modules/Servicemap/ServiceMap.tsx     | 28 +++++------
 frontend/src/store/actions/serviceMap.ts      | 46 ++++++++++---------
 frontend/src/store/actions/types.ts           | 14 ++++--
 frontend/src/store/reducers/serviceMap.ts     |  7 +++
 4 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/frontend/src/modules/Servicemap/ServiceMap.tsx b/frontend/src/modules/Servicemap/ServiceMap.tsx
index 9d07892fa5..7408fe206d 100644
--- a/frontend/src/modules/Servicemap/ServiceMap.tsx
+++ b/frontend/src/modules/Servicemap/ServiceMap.tsx
@@ -1,12 +1,13 @@
 /* eslint-disable  */
 //@ts-nocheck
 
+import { Card } from 'antd';
 import Spinner from 'components/Spinner';
 import React, { useEffect, useRef } from 'react';
 import { ForceGraph2D } from 'react-force-graph';
 import { connect } from 'react-redux';
 import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { getDetailedServiceMapItems, getServiceMapItems } from 'store/actions';
+import { getDetailedServiceMapItems, ServiceMapStore } from 'store/actions';
 import { AppState } from 'store/reducers';
 import styled from 'styled-components';
 import { GlobalTime } from 'types/actions/globalTime';
@@ -31,9 +32,8 @@ const Container = styled.div`
 `;
 
 interface ServiceMapProps extends RouteComponentProps<any> {
-	serviceMap: serviceMapStore;
+	serviceMap: ServiceMapStore;
 	globalTime: GlobalTime;
-	getServiceMapItems: (time: GlobalTime) => void;
 	getDetailedServiceMapItems: (time: GlobalTime) => void;
 }
 interface graphNode {
@@ -53,29 +53,32 @@ export interface graphDataType {
 function ServiceMap(props: ServiceMapProps): JSX.Element {
 	const fgRef = useRef();
 
-	const {
-		getDetailedServiceMapItems,
-		getServiceMapItems,
-		globalTime,
-		serviceMap,
-	} = props;
+	const { getDetailedServiceMapItems, globalTime, serviceMap } = props;
 
 	useEffect(() => {
 		/*
 			Call the apis only when the route is loaded.
 			Check this issue: https://github.com/SigNoz/signoz/issues/110
 		 */
-		getServiceMapItems(globalTime);
 		getDetailedServiceMapItems(globalTime);
-	}, [globalTime, getServiceMapItems, getDetailedServiceMapItems]);
+	}, [globalTime, getDetailedServiceMapItems]);
 
 	useEffect(() => {
 		fgRef.current && fgRef.current.d3Force('charge').strength(-400);
 	});
-	if (!serviceMap.items.length || !serviceMap.services.length) {
+
+	if (serviceMap.loading) {
 		return <Spinner size="large" tip="Loading..." />;
 	}
 
+	if (!serviceMap.loading && serviceMap.items.length === 0) {
+		return (
+			<Container>
+				<Card>No Service Found</Card>
+			</Container>
+		);
+	}
+
 	const zoomToService = (value: string): void => {
 		fgRef &&
 			fgRef.current &&
@@ -149,7 +152,6 @@ const mapStateToProps = (
 
 export default withRouter(
 	connect(mapStateToProps, {
-		getServiceMapItems,
 		getDetailedServiceMapItems,
 	})(ServiceMap),
 );
diff --git a/frontend/src/store/actions/serviceMap.ts b/frontend/src/store/actions/serviceMap.ts
index be5a84a239..a6f079a7eb 100644
--- a/frontend/src/store/actions/serviceMap.ts
+++ b/frontend/src/store/actions/serviceMap.ts
@@ -7,6 +7,7 @@ import { ActionTypes } from './types';
 export interface ServiceMapStore {
 	items: ServicesMapItem[];
 	services: ServicesItem[];
+	loading: boolean;
 }
 
 export interface ServicesItem {
@@ -37,38 +38,39 @@ export interface ServicesAction {
 	payload: ServicesItem[];
 }
 
-export const getServiceMapItems = (globalTime: GlobalTime) => {
-	return async (dispatch: Dispatch): Promise<void> => {
-		dispatch<ServiceMapItemAction>({
-			type: ActionTypes.getServiceMapItems,
-			payload: [],
-		});
-
-		const requestString = `/serviceMapDependencies?start=${globalTime.minTime}&end=${globalTime.maxTime}`;
-
-		const response = await api.get<ServicesMapItem[]>(requestString);
-
-		dispatch<ServiceMapItemAction>({
-			type: ActionTypes.getServiceMapItems,
-			payload: response.data,
-		});
+export interface ServiceMapLoading {
+	type: ActionTypes.serviceMapLoading;
+	payload: {
+		loading: ServiceMapStore['loading'];
 	};
-};
+}
 
 export const getDetailedServiceMapItems = (globalTime: GlobalTime) => {
 	return async (dispatch: Dispatch): Promise<void> => {
-		dispatch<ServicesAction>({
-			type: ActionTypes.getServices,
-			payload: [],
-		});
-
 		const requestString = `/services?start=${globalTime.minTime}&end=${globalTime.maxTime}`;
 
-		const response = await api.get<ServicesItem[]>(requestString);
+		const serviceMapDependencies = `/serviceMapDependencies?start=${globalTime.minTime}&end=${globalTime.maxTime}`;
+
+		const [serviceMapDependenciesResponse, response] = await Promise.all([
+			api.get<ServicesMapItem[]>(serviceMapDependencies),
+			api.get<ServicesItem[]>(requestString),
+		]);
 
 		dispatch<ServicesAction>({
 			type: ActionTypes.getServices,
 			payload: response.data,
 		});
+
+		dispatch<ServiceMapItemAction>({
+			type: ActionTypes.getServiceMapItems,
+			payload: serviceMapDependenciesResponse.data,
+		});
+
+		dispatch<ServiceMapLoading>({
+			type: ActionTypes.serviceMapLoading,
+			payload: {
+				loading: false,
+			},
+		});
 	};
 };
diff --git a/frontend/src/store/actions/types.ts b/frontend/src/store/actions/types.ts
index c15ea00286..702997d49b 100644
--- a/frontend/src/store/actions/types.ts
+++ b/frontend/src/store/actions/types.ts
@@ -1,14 +1,22 @@
-import { ServiceMapItemAction, ServicesAction } from './serviceMap';
+import {
+	ServiceMapItemAction,
+	ServiceMapLoading,
+	ServicesAction,
+} from './serviceMap';
 import { GetUsageDataAction } from './usage';
 
 export enum ActionTypes {
-	updateTraceFilters = 'UPDATE_TRACES_FILTER',
 	updateTimeInterval = 'UPDATE_TIME_INTERVAL',
 	getServiceMapItems = 'GET_SERVICE_MAP_ITEMS',
 	getServices = 'GET_SERVICES',
 	getUsageData = 'GET_USAGE_DATE',
 	fetchTraces = 'FETCH_TRACES',
 	fetchTraceItem = 'FETCH_TRACE_ITEM',
+	serviceMapLoading = 'UPDATE_SERVICE_MAP_LOADING',
 }
 
-export type Action = GetUsageDataAction | ServicesAction | ServiceMapItemAction;
+export type Action =
+	| GetUsageDataAction
+	| ServicesAction
+	| ServiceMapItemAction
+	| ServiceMapLoading;
diff --git a/frontend/src/store/reducers/serviceMap.ts b/frontend/src/store/reducers/serviceMap.ts
index ef7cd21496..18ec21a9ec 100644
--- a/frontend/src/store/reducers/serviceMap.ts
+++ b/frontend/src/store/reducers/serviceMap.ts
@@ -3,6 +3,7 @@ import { Action, ActionTypes, ServiceMapStore } from 'store/actions';
 const initialState: ServiceMapStore = {
 	items: [],
 	services: [],
+	loading: true,
 };
 
 export const ServiceMapReducer = (
@@ -20,6 +21,12 @@ export const ServiceMapReducer = (
 				...state,
 				services: action.payload,
 			};
+		case ActionTypes.serviceMapLoading: {
+			return {
+				...state,
+				loading: action.payload.loading,
+			};
+		}
 		default:
 			return state;
 	}

From 53e7037f48ec4d8abf8ac33a1b15c5996d7bb5bd Mon Sep 17 00:00:00 2001
From: Naman Jain <naman@dgraph.io>
Date: Sat, 2 Apr 2022 16:15:03 +0530
Subject: [PATCH 08/10] fix: run go vet to fix some issues with json tag (#936)

Co-authored-by: Naman Jain <jain_n@apple.com>
---
 pkg/query-service/godruid/queries.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/query-service/godruid/queries.go b/pkg/query-service/godruid/queries.go
index 5fb518f908..ffdeee002d 100644
--- a/pkg/query-service/godruid/queries.go
+++ b/pkg/query-service/godruid/queries.go
@@ -62,7 +62,7 @@ type QueryScan struct {
 	Limit        int64                  `json:"limit,omitempty"`
 	Offset       int64                  `json:"offset,omitempty"`
 	BatchSize    int64                  `json:"batchSize,omitempty"`
-	Order        string                 `json:"order",omitempty`
+	Order        string                 `json:"order,omitempty"`
 	ResultFormat string                 `json:"resultFormat"`
 	Context      map[string]interface{} `json:"context,omitempty"`
 
@@ -189,7 +189,7 @@ type TimeBoundaryItem struct {
 
 type TimeBoundary struct {
 	MinTime string `json:"minTime"`
-	MaxTime string `json:"minTime"`
+	MaxTime string `json:"maxTime"`
 }
 
 func (q *QueryTimeBoundary) setup() { q.QueryType = "timeBoundary" }

From 32e8e489280cb7832ef7532d87febc8bc2555497 Mon Sep 17 00:00:00 2001
From: Palash gupta <palash@signoz.io>
Date: Mon, 4 Apr 2022 08:24:28 +0530
Subject: [PATCH 09/10] chore: behaviour for dropdown is updated

---
 .../AllTags/Tag/DebounceSelect/index.tsx      | 63 -----------------
 .../Trace/Search/AllTags/Tag/TagValue.tsx     | 69 +++++++++++++++++++
 .../Trace/Search/AllTags/Tag/config.ts        | 28 --------
 .../Trace/Search/AllTags/Tag/index.tsx        | 38 ++++------
 4 files changed, 81 insertions(+), 117 deletions(-)
 delete mode 100644 frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
 create mode 100644 frontend/src/container/Trace/Search/AllTags/Tag/TagValue.tsx
 delete mode 100644 frontend/src/container/Trace/Search/AllTags/Tag/config.ts

diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
deleted file mode 100644
index 2576e782e0..0000000000
--- a/frontend/src/container/Trace/Search/AllTags/Tag/DebounceSelect/index.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Select, Spin } from 'antd';
-import { SelectProps } from 'antd/es/select';
-import debounce from 'lodash-es/debounce';
-import React, { useRef, useState } from 'react';
-
-export interface DebounceSelectProps<ValueType = any>
-	extends Omit<SelectProps<ValueType>, 'options' | 'children'> {
-	fetchOptions: (search: string) => Promise<ValueType[]>;
-	debounceTimeout: number;
-}
-
-function DebounceSelect<
-	ValueType extends {
-		key?: string;
-		label: React.ReactNode;
-		value: string | number;
-	} = never
->({
-	fetchOptions,
-	debounceTimeout = 800,
-	...props
-}: DebounceSelectProps): JSX.Element {
-	const [fetching, setFetching] = useState(false);
-	const [options, setOptions] = useState<ValueType[]>([]);
-	const fetchRef = useRef(0);
-
-	const debounceFetcher = React.useMemo(() => {
-		const loadOptions = (value: string): void => {
-			fetchRef.current += 1;
-			const fetchId = fetchRef.current;
-			setOptions([]);
-			setFetching(true);
-
-			fetchOptions(value).then((newOptions) => {
-				if (fetchId !== fetchRef.current) {
-					// for fetch callback order
-					return;
-				}
-
-				setOptions(newOptions);
-				setFetching(false);
-			});
-		};
-
-		return debounce(loadOptions, debounceTimeout);
-	}, [fetchOptions, debounceTimeout]);
-
-	return (
-		<Select<ValueType>
-			labelInValue
-			filterOption={false}
-			onSearch={debounceFetcher}
-			notFoundContent={fetching ? <Spin size="small" /> : null}
-			style={{ width: '170px' }}
-			// as all other props are from SelectProps only
-			// eslint-disable-next-line react/jsx-props-no-spreading
-			{...props}
-			options={options}
-		/>
-	);
-}
-
-export default DebounceSelect;
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/TagValue.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/TagValue.tsx
new file mode 100644
index 0000000000..378001bec4
--- /dev/null
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/TagValue.tsx
@@ -0,0 +1,69 @@
+import { Select } from 'antd';
+import { DefaultOptionType } from 'antd/lib/select';
+import getTagValue from 'api/trace/getTagValue';
+import useFetch from 'hooks/useFetch';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { AppState } from 'store/reducers';
+import { PayloadProps, Props } from 'types/api/trace/getTagValue';
+import { GlobalReducer } from 'types/reducer/globalTime';
+import { TraceReducer } from 'types/reducer/trace';
+
+import { Value } from '.';
+import { SelectComponent } from './styles';
+
+function TagValue(props: TagValueProps): JSX.Element {
+	const { tag, setLocalSelectedTags, index, tagKey } = props;
+	const {
+		Key: selectedKey,
+		Operator: selectedOperator,
+		Values: selectedValues,
+	} = tag;
+
+	const globalReducer = useSelector<AppState, GlobalReducer>(
+		(state) => state.globalTime,
+	);
+
+	const valueSuggestion = useFetch<PayloadProps, Props>(getTagValue, {
+		end: globalReducer.maxTime,
+		start: globalReducer.minTime,
+		tagKey,
+	});
+
+	return (
+		<SelectComponent
+			onSelect={(value: unknown): void => {
+				if (typeof value === 'string') {
+					setLocalSelectedTags((tags) => [
+						...tags.slice(0, index),
+						{
+							Key: selectedKey,
+							Operator: selectedOperator,
+							Values: [...selectedValues, value],
+						},
+						...tags.slice(index + 1, tags.length),
+					]);
+				}
+			}}
+			loading={valueSuggestion.loading || false}
+		>
+			{valueSuggestion.payload &&
+				valueSuggestion.payload.map((suggestion) => (
+					<Select.Option key={suggestion.tagValues} value={suggestion.tagValues}>
+						{suggestion.tagValues}
+					</Select.Option>
+				))}
+		</SelectComponent>
+	);
+}
+
+interface TagValueProps {
+	index: number;
+	tag: FlatArray<TraceReducer['selectedTags'], 1>;
+	setLocalSelectedTags: React.Dispatch<
+		React.SetStateAction<TraceReducer['selectedTags']>
+	>;
+	tagKey: string;
+}
+
+export default TagValue;
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/config.ts b/frontend/src/container/Trace/Search/AllTags/Tag/config.ts
deleted file mode 100644
index ce414a5f15..0000000000
--- a/frontend/src/container/Trace/Search/AllTags/Tag/config.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import getTagValue from 'api/trace/getTagValue';
-
-// Usage of DebounceSelect
-export interface TagValue {
-	label: string;
-	value: string;
-}
-
-export async function fetchTag(
-	globalStart: number,
-	globalEnd: number,
-	tagKey: string,
-): Promise<TagValue[]> {
-	const response = await getTagValue({
-		end: globalEnd,
-		start: globalStart,
-		tagKey,
-	});
-
-	if (response.statusCode !== 200 || !response.payload) {
-		return [];
-	}
-
-	return response.payload.map((e) => ({
-		label: e.tagValues,
-		value: e.tagValues,
-	}));
-}
diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
index 37b42347a1..ad9b0e7972 100644
--- a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
+++ b/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx
@@ -3,13 +3,11 @@ import { Select } from 'antd';
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
-import { GlobalReducer } from 'types/reducer/globalTime';
 import { TraceReducer } from 'types/reducer/trace';
 
-import { fetchTag, TagValue } from './config';
-import DebounceSelect from './DebounceSelect';
 import { Container, IconContainer, SelectComponent } from './styles';
 import TagsKey from './TagKey';
+import TagValue from './TagValue';
 
 const { Option } = Select;
 
@@ -33,9 +31,6 @@ const AllMenu: AllMenuProps[] = [
 
 function SingleTags(props: AllTagsProps): JSX.Element {
 	const traces = useSelector<AppState, TraceReducer>((state) => state.traces);
-	const globalReducer = useSelector<AppState, GlobalReducer>(
-		(state) => state.globalTime,
-	);
 
 	const { tag, onCloseHandler, setLocalSelectedTags, index } = props;
 	const {
@@ -69,7 +64,6 @@ function SingleTags(props: AllTagsProps): JSX.Element {
 				tag={tag}
 				setLocalSelectedTags={setLocalSelectedTags}
 			/>
-
 			<SelectComponent
 				onChange={onChangeOperatorHandler}
 				value={AllMenu.find((e) => e.key === selectedOperator)?.value || ''}
@@ -81,24 +75,16 @@ function SingleTags(props: AllTagsProps): JSX.Element {
 				))}
 			</SelectComponent>
 
-			<DebounceSelect
-				fetchOptions={(): Promise<TagValue[]> =>
-					fetchTag(globalReducer.minTime, globalReducer.maxTime, selectedKey[index])
-				}
-				debounceTimeout={300}
-				onSelect={(value: Value): void => {
-					setLocalSelectedTags((tags) => [
-						...tags.slice(0, index),
-						{
-							Key: selectedKey,
-							Operator: selectedOperator,
-							Values: [...selectedValues, value.value],
-						},
-						...tags.slice(index + 1, tags.length),
-					]);
-				}}
-				mode="multiple"
-			/>
+			{selectedKey[0] ? (
+				<TagValue
+					index={index}
+					tag={tag}
+					setLocalSelectedTags={setLocalSelectedTags}
+					tagKey={selectedKey[0]}
+				/>
+			) : (
+				<SelectComponent />
+			)}
 
 			<IconContainer role="button" onClick={(): void => onDeleteTagHandler(index)}>
 				<CloseOutlined />
@@ -116,7 +102,7 @@ interface AllTagsProps {
 	>;
 }
 
-interface Value {
+export interface Value {
 	key: string;
 	label: string;
 	value: string;

From 6c4c814b3ff79e137803f629d81a5e560265e48d Mon Sep 17 00:00:00 2001
From: palash-signoz <palash@signoz.io>
Date: Mon, 4 Apr 2022 10:25:15 +0530
Subject: [PATCH 10/10] bug: pathname check is added (#948)

---
 frontend/src/container/AppLayout/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/container/AppLayout/index.tsx b/frontend/src/container/AppLayout/index.tsx
index 5a9051c215..5230ca5bae 100644
--- a/frontend/src/container/AppLayout/index.tsx
+++ b/frontend/src/container/AppLayout/index.tsx
@@ -28,10 +28,10 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 	}, [isLoggedIn, isSignUpPage]);
 
 	useEffect(() => {
-		if (isLoggedIn) {
+		if (isLoggedIn && pathname === ROUTES.SIGN_UP) {
 			history.push(ROUTES.APPLICATION);
 		}
-	}, [isLoggedIn]);
+	}, [isLoggedIn, pathname]);
 
 	return (
 		<Layout>