GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-07-28 22:31:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: alerts formula (#2733)

Browse Source 
* fix: alerts formula

* fix: use formula regexp

---------

Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
This commit is contained in:
Yevhen Shevchenko 2023-05-19 17:01:04 +03:00 committed by GitHub
parent 02035ebd82
commit 6e2ceb9efb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts
View File

@ -1,5 +1,10 @@
import { initialQueryBuilderFormValues } from 'constants/queryBuilder';
import { isQuery, QueryBuilderData } from 'types/common/queryBuilder';
import { FORMULA_REGEXP } from 'constants/regExp';
import {
IBuilderFormula,
IBuilderQuery,
} from 'types/api/queryBuilder/queryBuilderData';
import { QueryBuilderData } from 'types/common/queryBuilder';
import { QueryDataResourse } from 'types/common/queryBuilderMappers.types';
export const mapQueryDataFromApi = (
@ -9,10 +14,12 @@ export const mapQueryDataFromApi = (
const queryFormulas: QueryBuilderData['queryFormulas'] = [];
Object.entries(data).forEach(([, value]) => {
if (isQuery(value)) {
queryData.push({ ...initialQueryBuilderFormValues, ...value });
if (FORMULA_REGEXP.test(value.queryName)) {
const formula = value as IBuilderFormula;
queryFormulas.push(formula);
} else {
queryFormulas.push(value);
const query = value as IBuilderQuery;
queryData.push({ ...initialQueryBuilderFormValues, ...query });
}
});

5
frontend/src/types/common/queryBuilder.ts
View File

@ -147,11 +147,6 @@ export type QueryBuilderData = {
queryFormulas: IBuilderFormula[];
};
export const isQuery = (
query: IBuilderFormula | IBuilderQuery,
): query is IBuilderQuery =>
'dataSource' in query && 'aggregateOperator' in query;
export type QueryBuilderContextType = {
queryBuilderData: QueryBuilderData;
initialDataSource: DataSource | null;