Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: having filter removing payload #2706

Merged
merged 13 commits into from May 18, 2023
Merged

fix: having filter removing payload #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
544d5ad
fix: having filter removing payload
yeshev May 17, 2023
32d84b8
Merge branch 'develop' into fix/autocomplete_filters
palashgdev May 17, 2023
90ecb7c
Merge branch 'develop' into fix/autocomplete_filters
makeavish May 17, 2023
0cdb298
Merge branch 'develop' into fix/autocomplete_filters
palashgdev May 17, 2023
7e1fa45
fix: aggregate filter and group by filter
yeshev May 17, 2023
5fc4c23
Merge branch 'fix/autocomplete_filters' of https://github.com/SigNoz/…
yeshev May 17, 2023
c368c6e
Merge branch 'develop' into fix/autocomplete_filters
techchintan May 17, 2023
d0a8b62
Merge branch 'develop' into fix/autocomplete_filters
palashgdev May 17, 2023
0cf367c
Merge branch 'develop' into fix/autocomplete_filters
srikanthccv May 18, 2023
b76b19d
Merge branch 'develop' into fix/autocomplete_filters
srikanthccv May 18, 2023
4430e95
Merge branch 'develop' into fix/autocomplete_filters
ankitnayan May 18, 2023
0aa2fcd
fix: operators labels and divider
yeshev May 18, 2023
bad5750
Merge branch 'develop' into fix/autocomplete_filters
srikanthccv May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions frontend/src/api/queryBuilder/getAggregateAttribute.ts
View file
Open in desktop
Expand Up @@ -6,7 +6,11 @@ import createQueryParams from 'lib/createQueryParams';
import { ErrorResponse, SuccessResponse } from 'types/api';
// ** Types
import { IGetAggregateAttributePayload } from 'types/api/queryBuilder/getAggregatorAttribute';
import { IQueryAutocompleteResponse } from 'types/api/queryBuilder/queryAutocompleteResponse';
import {
BaseAutocompleteData,
IQueryAutocompleteResponse,
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { v4 as uuid } from 'uuid';

export const getAggregateAttribute = async ({
aggregateOperator,
Expand All @@ -26,11 +30,15 @@ export const getAggregateAttribute = async ({
})}`,
);

const payload: BaseAutocompleteData[] =
response.data.data.attributeKeys?.map((item) => ({ ...item, id: uuid() })) ||
[];

return {
statusCode: 200,
error: null,
message: response.statusText,
payload: response.data.data,
payload: { attributeKeys: payload },
};
} catch (e) {
return ErrorResponseHandler(e as AxiosError);
Expand Down
12 changes: 10 additions & 2 deletions frontend/src/api/queryBuilder/getAttributeKeys.ts
View file
Open in desktop
Expand Up @@ -5,7 +5,11 @@ import createQueryParams from 'lib/createQueryParams';
import { ErrorResponse, SuccessResponse } from 'types/api';
// ** Types
import { IGetAttributeKeysPayload } from 'types/api/queryBuilder/getAttributeKeys';
import { IQueryAutocompleteResponse } from 'types/api/queryBuilder/queryAutocompleteResponse';
import {
BaseAutocompleteData,
IQueryAutocompleteResponse,
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { v4 as uuid } from 'uuid';

export const getAggregateKeys = async ({
aggregateOperator,
Expand All @@ -28,11 +32,15 @@ export const getAggregateKeys = async ({
})}&tagType=${tagType}`,
);

const payload: BaseAutocompleteData[] =
response.data.data.attributeKeys?.map((item) => ({ ...item, id: uuid() })) ||
[];

return {
statusCode: 200,
error: null,
message: response.statusText,
payload: response.data.data,
payload: { attributeKeys: payload },
};
} catch (e) {
return ErrorResponseHandler(e as AxiosError);
Expand Down
20 changes: 14 additions & 6 deletions frontend/src/constants/queryBuilder.ts
View file
Open in desktop
Expand Up @@ -10,20 +10,27 @@ import {
import {
BoolOperators,
DataSource,
LogsAggregatorOperator,
MetricAggregateOperator,
NumberOperators,
PanelTypeKeys,
QueryAdditionalFilter,
ReduceOperators,
StringOperators,
TracesAggregatorOperator,
} from 'types/common/queryBuilder';
import { SelectOption } from 'types/common/select';
import { v4 as uuid } from 'uuid';

import {
logsAggregateOperatorOptions,
metricAggregateOperatorOptions,
tracesAggregateOperatorOptions,
} from './queryBuilderOperators';

export const MAX_FORMULAS = 20;
export const MAX_QUERIES = 26;

export const selectValueDivider = '--';

export const formulasNames: string[] = Array.from(
Array(MAX_FORMULAS),
(_, i) => `F${i + 1}`,
Expand All @@ -37,10 +44,10 @@ export enum QueryBuilderKeys {
GET_ATTRIBUTE_KEY = 'GET_ATTRIBUTE_KEY',
}

export const mapOfOperators: Record<DataSource, string[]> = {
metrics: Object.values(MetricAggregateOperator),
logs: Object.values(LogsAggregatorOperator),
traces: Object.values(TracesAggregatorOperator),
export const mapOfOperators = {
metrics: metricAggregateOperatorOptions,
logs: logsAggregateOperatorOptions,
traces: tracesAggregateOperatorOptions,
};

export const mapOfFilters: Record<DataSource, QueryAdditionalFilter[]> = {
Expand Down Expand Up @@ -78,6 +85,7 @@ export const initialHavingValues: HavingForm = {
};

export const initialAggregateAttribute: IBuilderQuery['aggregateAttribute'] = {
id: uuid(),
dataType: null,
key: '',
isColumn: null,
Expand Down