Merge branch 'develop' into 513-dashboard

This commit is contained in:
Palash 2022-07-04 13:24:01 +05:30 committed by GitHub
commit 2cffe0c53e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 12 deletions

View File

@ -102,6 +102,11 @@ export const AxiosAlertManagerInstance = axios.create({
export const ApiV2Instance = axios.create({
baseURL: `${ENVIRONMENT.baseURL}${apiV2}`,
});
ApiV2Instance.interceptors.response.use(
interceptorsResponse,
interceptorRejected,
);
ApiV2Instance.interceptors.request.use(interceptorsRequestResponse);
AxiosAlertManagerInstance.interceptors.response.use(
interceptorsResponse,

View File

@ -7,17 +7,13 @@ export const getYAxisFormattedValue = (
let decimalPrecision: number | undefined;
const parsedValue = getValueFormat(format)(
parseFloat(value),
12,
12,
undefined,
undefined,
undefined,
);
try {
const decimalSplitted = parsedValue.text.split('.');
if (
decimalSplitted.length === 1 ||
parseFloat(parsedValue.text) === parseInt(parsedValue.text, 10)
) {
if (decimalSplitted.length === 1) {
decimalPrecision = 0;
} else {
const decimalDigits = decimalSplitted[1].split('');

View File

@ -143,17 +143,23 @@ export async function GetMetricQueryRange({
`API responded with ${response.statusCode} - ${response.error}`,
);
}
if (response.payload?.data?.result) {
response.payload.data.result = response.payload.data.result.map(
(queryData) => {
const newQueryData = queryData;
newQueryData.legend = legendMap[queryData.queryName];
newQueryData.legend = legendMap[queryData.queryName]; // Adds the legend if it is already defined by the user.
// If metric names is an empty object
if (isEmpty(queryData.metric)) {
newQueryData.metric[queryData.queryName] = queryData.queryName;
newQueryData.legend = queryData.queryName;
// If metrics list is empty && the user haven't defined a legend then add the legend equal to the name of the query.
if (!newQueryData.legend) {
newQueryData.legend = queryData.queryName;
}
// If name of the query and the legend if inserted is same then add the same to the metrics object.
if (queryData.queryName === newQueryData.legend) {
newQueryData.metric[queryData.queryName] = queryData.queryName;
}
}
return queryData;
return newQueryData;
},
);
}