diff --git a/frontend/src/constants/queryBuilder.ts b/frontend/src/constants/queryBuilder.ts index 6b3e6f0eb6..ed0fe0c09b 100644 --- a/frontend/src/constants/queryBuilder.ts +++ b/frontend/src/constants/queryBuilder.ts @@ -52,6 +52,7 @@ export const baseAutoCompleteIdKeysOrder: (keyof Omit< export const autocompleteType: Record = { resource: 'resource', tag: 'tag', + '': '', }; export const formulasNames: string[] = Array.from( @@ -111,10 +112,10 @@ export const initialAutocompleteData: BaseAutocompleteData = { { dataType: null, key: '', isColumn: null, type: null }, baseAutoCompleteIdKeysOrder, ), - dataType: null, + dataType: '', key: '', - isColumn: null, - type: null, + isColumn: false, + type: '', }; export const initialFilters: TagFilter = { diff --git a/frontend/src/container/ExplorerOrderBy/index.tsx b/frontend/src/container/ExplorerOrderBy/index.tsx index 5374510084..69f3b29580 100644 --- a/frontend/src/container/ExplorerOrderBy/index.tsx +++ b/frontend/src/container/ExplorerOrderBy/index.tsx @@ -33,7 +33,7 @@ function ExplorerOrderBy({ query, onChange }: OrderByFilterProps): JSX.Element { const keysOptions = createOptions(data?.payload?.attributeKeys || []); const customOptions = createOptions([ - { key: 'timestamp', isColumn: true, type: null, dataType: null }, + { key: 'timestamp', isColumn: true, type: '', dataType: '' }, ]); const baseOptions = [ diff --git a/frontend/src/container/MetricsApplication/MetricsPageQueries/DBCallQueries.ts b/frontend/src/container/MetricsApplication/MetricsPageQueries/DBCallQueries.ts index 9036b81abb..aa491a01fd 100644 --- a/frontend/src/container/MetricsApplication/MetricsPageQueries/DBCallQueries.ts +++ b/frontend/src/container/MetricsApplication/MetricsPageQueries/DBCallQueries.ts @@ -24,7 +24,7 @@ export const databaseCallsRPS = ({ key: WidgetKeys.SignozDBLatencyCount, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }, ]; const groupBy: BaseAutocompleteData[] = [ @@ -67,13 +67,13 @@ export const databaseCallsAvgDuration = ({ key: WidgetKeys.SignozDbLatencySum, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const autocompleteDataB: BaseAutocompleteData = { key: WidgetKeys.SignozDBLatencyCount, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const additionalItemsA: TagFilterItem[] = [ diff --git a/frontend/src/container/MetricsApplication/MetricsPageQueries/ExternalQueries.ts b/frontend/src/container/MetricsApplication/MetricsPageQueries/ExternalQueries.ts index 18038ecf0d..94f024bf25 100644 --- a/frontend/src/container/MetricsApplication/MetricsPageQueries/ExternalQueries.ts +++ b/frontend/src/container/MetricsApplication/MetricsPageQueries/ExternalQueries.ts @@ -35,13 +35,13 @@ export const externalCallErrorPercent = ({ key: WidgetKeys.SignozExternalCallLatencyCount, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const autocompleteDataB: BaseAutocompleteData = { key: WidgetKeys.SignozExternalCallLatencyCount, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const additionalItemsA: TagFilterItem[] = [ @@ -118,13 +118,13 @@ export const externalCallDuration = ({ dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.SignozExternalCallLatencySum, - type: null, + type: '', }; const autocompleteDataB: BaseAutocompleteData = { dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.SignozExternalCallLatencyCount, - type: null, + type: '', }; const expressions = [FORMULA.DATABASE_CALLS_AVG_DURATION]; const legendFormulas = ['Average Duration']; @@ -177,7 +177,7 @@ export const externalCallRpsByAddress = ({ dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.SignozExternalCallLatencyCount, - type: null, + type: '', }, ]; const filterItems: TagFilterItem[][] = [ @@ -218,13 +218,13 @@ export const externalCallDurationByAddress = ({ dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.SignozExternalCallLatencySum, - type: null, + type: '', }; const autocompleteDataB: BaseAutocompleteData = { dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.SignozExternalCallLatencyCount, - type: null, + type: '', }; const expressions = [FORMULA.DATABASE_CALLS_AVG_DURATION]; const legendFormulas = [legend]; diff --git a/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts b/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts index 92006961d9..91e365a0b8 100644 --- a/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts +++ b/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts @@ -42,7 +42,7 @@ export const latency = ({ : WidgetKeys.DurationNano, dataType: DataType.FLOAT64, isColumn: true, - type: isSpanMetricEnable ? null : MetricsType.Tag, + type: isSpanMetricEnable ? '' : MetricsType.Tag, }; const autocompleteData = Array(3).fill(newAutoCompleteData); @@ -101,21 +101,21 @@ export const apDexTracesQueryBuilderQueries = ({ dataType: DataType.FLOAT64, isColumn: true, key: '', - type: null, + type: '', }; const autoCompleteDataB: BaseAutocompleteData = { dataType: DataType.FLOAT64, isColumn: true, key: '', - type: null, + type: '', }; const autoCompleteDataC: BaseAutocompleteData = { dataType: DataType.FLOAT64, isColumn: true, key: '', - type: null, + type: '', }; const filterItemA: TagFilterItem[] = [ @@ -279,21 +279,21 @@ export const apDexMetricsQueryBuilderQueries = ({ key: WidgetKeys.SignozLatencyCount, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const autoCompleteDataB: BaseAutocompleteData = { key: WidgetKeys.Signoz_latency_bucket, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const autoCompleteDataC: BaseAutocompleteData = { key: WidgetKeys.Signoz_latency_bucket, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const filterItemA: TagFilterItem[] = [ @@ -460,7 +460,7 @@ export const operationPerSec = ({ key: WidgetKeys.SignozLatencyCount, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }, ]; @@ -512,13 +512,13 @@ export const errorPercentage = ({ key: WidgetKeys.SignozCallsTotal, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const autocompleteDataB: BaseAutocompleteData = { key: WidgetKeys.SignozCallsTotal, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const autocompleteData = [autocompleteDataA, autocompleteDataB]; diff --git a/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts b/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts index 42aac24d9f..9356d5e860 100644 --- a/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts +++ b/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts @@ -24,21 +24,21 @@ export const topOperationQueries = ({ key: WidgetKeys.Signoz_latency_bucket, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const errorRateAutoCompleteData: BaseAutocompleteData = { key: WidgetKeys.SignozCallsTotal, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const numOfCallAutoCompleteData: BaseAutocompleteData = { key: WidgetKeys.SignozLatencyCount, dataType: DataType.FLOAT64, isColumn: true, - type: null, + type: '', }; const latencyAndNumberOfCallAdditionalItems: TagFilterItem[] = [ diff --git a/frontend/src/container/OptionsMenu/useOptionsMenu.ts b/frontend/src/container/OptionsMenu/useOptionsMenu.ts index 6bc1700348..cd94cf1b80 100644 --- a/frontend/src/container/OptionsMenu/useOptionsMenu.ts +++ b/frontend/src/container/OptionsMenu/useOptionsMenu.ts @@ -54,7 +54,7 @@ const useOptionsMenu = ({ () => ({ searchText: '', aggregateAttribute: '', - tagType: null, + tagType: undefined, dataSource, aggregateOperator, }), diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx index efb8be717c..fb2770d0c4 100644 --- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx +++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx @@ -137,9 +137,9 @@ function QueryBuilderSearch({ id: uuid().slice(0, 8), key: filterAttribute ?? { key: tagKey, - dataType: null, - type: null, - isColumn: null, + dataType: '', + type: '', + isColumn: false, }, op: getOperatorValue(tagOperator), value: diff --git a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsQuery.ts b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsQuery.ts index 7214a7c912..f0eff8beda 100644 --- a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsQuery.ts +++ b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsQuery.ts @@ -22,21 +22,21 @@ export const serviceMetricsQuery = ( dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.Signoz_latency_bucket, - type: null, + type: '', }; const errorRateAutoCompleteData: BaseAutocompleteData = { dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.SignozCallsTotal, - type: null, + type: '', }; const operationPrSecondAutoCompleteData: BaseAutocompleteData = { dataType: DataType.FLOAT64, isColumn: true, key: WidgetKeys.SignozCallsTotal, - type: null, + type: '', }; const autocompleteData = [ diff --git a/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts b/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts index abb9bd2358..70226b650d 100644 --- a/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts +++ b/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts @@ -109,8 +109,8 @@ export const useFetchKeysAndValues = ( dataSource: query.dataSource, aggregateAttribute: query.aggregateAttribute.key, attributeKey: filterAttributeKey?.key ?? tagKey, - filterAttributeKeyDataType: filterAttributeKey?.dataType ?? null, - tagType: filterAttributeKey?.type ?? null, + filterAttributeKeyDataType: filterAttributeKey?.dataType ?? '', + tagType: filterAttributeKey?.type ?? '', searchText: isInNInOperator(tagOperator) ? tagValue[tagValue.length - 1]?.toString() ?? '' // last element of tagvalue will be always user search value : tagValue?.toString() ?? '', diff --git a/frontend/src/hooks/useResourceAttribute/utils.ts b/frontend/src/hooks/useResourceAttribute/utils.ts index 1e91f7b860..75187ab060 100644 --- a/frontend/src/hooks/useResourceAttribute/utils.ts +++ b/frontend/src/hooks/useResourceAttribute/utils.ts @@ -82,7 +82,7 @@ export const resourceAttributesToTagFilterItems = ( return queries.map((res) => ({ id: `${res.id}`, - key: { key: res.tagKey, isColumn: false, type: null, dataType: null }, + key: { key: res.tagKey, isColumn: false, type: '', dataType: '' }, op: `${res.operator}`, value: `${res.tagValue}`.split(','), })); diff --git a/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts b/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts index 38e0af531d..aa03c69a08 100644 --- a/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts +++ b/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts @@ -46,7 +46,7 @@ export const getPaginationQueryData: SetupPaginationQueryData = ({ id: uuid(), key: { key: 'id', - type: null, + type: '', dataType: 'string', isColumn: true, }, diff --git a/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts b/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts index 935467120a..2ce23c8b9b 100644 --- a/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts +++ b/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts @@ -1,15 +1,15 @@ export type LocalDataType = 'number' | 'string' | 'bool'; -export type DataType = 'int64' | 'float64' | 'string' | 'bool'; +export type DataType = 'int64' | 'float64' | 'string' | 'bool' | ''; -export type AutocompleteType = 'tag' | 'resource'; +export type AutocompleteType = 'tag' | 'resource' | ''; export interface BaseAutocompleteData { id?: string; - dataType: DataType | null; - isColumn: boolean | null; + dataType: DataType; + isColumn: boolean; key: string; - type: AutocompleteType | null; + type: AutocompleteType; } export interface IQueryAutocompleteResponse {