From 6e2ceb9efb34de3b606b4e4b19cacb3ccaff2803 Mon Sep 17 00:00:00 2001 From: Yevhen Shevchenko <90138953+yeshev@users.noreply.github.com> Date: Fri, 19 May 2023 17:01:04 +0300 Subject: [PATCH] fix: alerts formula (#2733) * fix: alerts formula * fix: use formula regexp --------- Co-authored-by: Srikanth Chekuri --- .../queryBuilderMappers/mapQueryDataFromApi.ts | 15 +++++++++++---- frontend/src/types/common/queryBuilder.ts | 5 ----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts index b1e9521fd9..04b1add490 100644 --- a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts +++ b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts @@ -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 }); } }); diff --git a/frontend/src/types/common/queryBuilder.ts b/frontend/src/types/common/queryBuilder.ts index 127a78c746..c8f3fa2e30 100644 --- a/frontend/src/types/common/queryBuilder.ts +++ b/frontend/src/types/common/queryBuilder.ts @@ -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;