diff --git a/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx b/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx index ac3d1660e..bc32fa765 100644 --- a/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx +++ b/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx @@ -108,7 +108,7 @@ const StatusBox = ({ title, value, status }) => { }; StatusBox.propTypes = { - title: PropTypes.string, + title: PropTypes.string.isRequired, value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired, status: PropTypes.string, }; diff --git a/client/src/Pages/Incidents/Components/StatusBoxes/index.jsx b/client/src/Pages/Incidents/Components/StatusBoxes/index.jsx index 9d4193743..6ba2f1820 100644 --- a/client/src/Pages/Incidents/Components/StatusBoxes/index.jsx +++ b/client/src/Pages/Incidents/Components/StatusBoxes/index.jsx @@ -2,10 +2,12 @@ import PropTypes from "prop-types"; import { Stack } from "@mui/material"; import StatusBox from "./StatusBox"; import { useTheme } from "@emotion/react"; +import { useTranslation } from "react-i18next"; import SkeletonLayout from "./skeleton"; const StatusBoxes = ({ isLoading, summary }) => { const theme = useTheme(); + const { t } = useTranslation(); if (isLoading) return ; return ( { justifyContent="space-between" > diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 8d26f75fd..d39be206e 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -385,7 +385,8 @@ "incidentsOptionsHeader": "Incidents for:", "incidentsOptionsHeaderFilterAll": "All", "incidentsOptionsHeaderFilterBy": "Filter by:", - "incidentsOptionsHeaderFilterCannotResolve": "Cannot resolve", + "incidentsOptionsHeaderTotalIncidents": "Total Incidents", + "incidentsOptionsHeaderFilterCannotResolve": "Cannot Resolve", "incidentsOptionsHeaderFilterDown": "Down", "incidentsOptionsHeaderFilterResolved": "Resolved", "incidentsOptionsHeaderLastDay": "Last day", diff --git a/server/db/mongo/modules/checkModule.js b/server/db/mongo/modules/checkModule.js index 7c9682557..fb0cc539e 100755 --- a/server/db/mongo/modules/checkModule.js +++ b/server/db/mongo/modules/checkModule.js @@ -5,7 +5,7 @@ import PageSpeedCheck from "../../models/PageSpeedCheck.js"; import User from "../../models/User.js"; import logger from "../../../utils/logger.js"; import { ObjectId } from "mongodb"; -import { buildChecksAndSummaryByTeamIdPipeline } from "./checkModuleQueries.js"; +import { buildChecksSummaryByTeamIdPipeline } from "./checkModuleQueries.js"; const SERVICE_NAME = "checkModule"; const dateRangeLookup = { @@ -318,12 +318,12 @@ const getChecksSummaryByTeamId = async ({ teamId }) => { teamId: new ObjectId(teamId), }; const checks = await Check.aggregate( - buildChecksAndSummaryByTeamIdPipeline({ matchStage }) + buildChecksSummaryByTeamIdPipeline({ matchStage }) ); return checks[0].summary; } catch (error) { error.service = SERVICE_NAME; - error.method = "getChecksAndSummaryByTeamId"; + error.method = "getChecksSummaryByTeamId"; throw error; } }; diff --git a/server/db/mongo/modules/checkModuleQueries.js b/server/db/mongo/modules/checkModuleQueries.js index 097389a52..7795fb6dc 100644 --- a/server/db/mongo/modules/checkModuleQueries.js +++ b/server/db/mongo/modules/checkModuleQueries.js @@ -1,4 +1,4 @@ -const buildChecksAndSummaryByTeamIdPipeline = ({ matchStage }) => { +const buildChecksSummaryByTeamIdPipeline = ({ matchStage }) => { return [ { $match: matchStage }, { @@ -45,4 +45,4 @@ const buildChecksAndSummaryByTeamIdPipeline = ({ matchStage }) => { ]; }; -export { buildChecksAndSummaryByTeamIdPipeline }; +export { buildChecksSummaryByTeamIdPipeline };