Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

more improvements

Blue Mouse6d13ae034f1c
diff --git a/public/locales/en.json b/public/locales/en.json
index 21c6f852d..47dee7352 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -60,7 +60,8 @@
"disable": "Disable",
"copied": "Copied",
"new": "New",
- "loading": "Loading.."
+ "loading": "Loading..",
+ "edit": "Edit"
},
"main": {
"ukrSupport": "Support the Ukrainian army to fight Russian invasion.",
@@ -412,7 +413,13 @@
},
"alert": {
"create": "Create an alert",
+ "add": "Add Alert",
+ "delete": "Delete alert",
+ "lastTriggered": "Last Triggered",
+ "never": "Never",
+ "qDelete": "Delete the alert?",
"settingsOf": "Settings of {{name}}",
+ "deleteHint": "This action is irreversible.\nThe alert and all the data related to it will be deleted from our servers.",
"name": "Alert name",
"metric": "Query metric",
"condition": "Trigger when the metric is",
diff --git a/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsx b/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsx
index e538f5f6d..e0e224dd1 100644
--- a/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsx
+++ b/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsx
@@ -282,7 +282,7 @@ const ProjectAlertsSettings = ({ alerts, setProjectAlerts, showError }) => {
<div className='flex justify-between items-center mt-5'>
<Button onClick={() => setShowModal(true)} danger semiSmall>
<ExclamationTriangleIcon className='w-5 h-5 mr-1' />
- {t('project.settings.delete')}
+ {t('alert.delete')}
</Button>
<div className='flex justify-between items-center'>
<Button className='mr-2 border-indigo-100 dark:text-gray-50 dark:border-gray-700 dark:bg-gray-700 dark:hover:bg-gray-600' onClick={onCancel} secondary regular>
@@ -307,10 +307,10 @@ const ProjectAlertsSettings = ({ alerts, setProjectAlerts, showError }) => {
<Modal
onClose={() => setShowModal(false)}
onSubmit={onDelete}
- submitText={t('project.alerts.delete')}
+ submitText={t('alert.delete')}
closeText={t('common.close')}
- title={t('project.alerts.qDelete')}
- message={t('project.alerts.deleteHint')}
+ title={t('alert.qDelete')}
+ message={t('alert.deleteHint')}
submitType='danger'
type='error'
isOpened={showModal}
diff --git a/src/pages/Project/Alerts/View/ProjectAlertsView.container.jsx b/src/pages/Project/Alerts/View/ProjectAlertsView.container.jsx
index bb5dcf259..10b7cc556 100644
--- a/src/pages/Project/Alerts/View/ProjectAlertsView.container.jsx
+++ b/src/pages/Project/Alerts/View/ProjectAlertsView.container.jsx
@@ -1,6 +1,5 @@
import { connect } from 'react-redux'
import { errorsActions } from 'redux/actions/errors'
-import UIActions from 'redux/actions/ui'
import ProjectAlerts from './ProjectAlertsView'
diff --git a/src/pages/Project/Alerts/View/ProjectAlertsView.jsx b/src/pages/Project/Alerts/View/ProjectAlertsView.jsx
index 446c86ae2..210a20e59 100644
--- a/src/pages/Project/Alerts/View/ProjectAlertsView.jsx
+++ b/src/pages/Project/Alerts/View/ProjectAlertsView.jsx
@@ -1,16 +1,32 @@
-import React, { useEffect, useState } from 'react'
-import Button from 'ui/Button'
+import React, { useMemo } from 'react'
+import dayjs from 'dayjs'
import _map from 'lodash/map'
import _isEmpty from 'lodash/isEmpty'
import _replace from 'lodash/replace'
+import _values from 'lodash/values'
+import _reduce from 'lodash/reduce'
import routes from 'routes'
import { useHistory } from 'react-router-dom'
+import { useTranslation } from 'react-i18next'
+
+import Button from 'ui/Button'
+import { QUERY_METRIC } from 'redux/constants'
const ProjectAlerts = ({
projectId, alerts, loading,
}) => {
+ const { t, i18n: { language } } = useTranslation()
const history = useHistory()
+ const queryMetricTMapping = useMemo(() => {
+ const values = _values(QUERY_METRIC)
+
+ return _reduce(values, (prev, curr) => ({
+ ...prev,
+ [curr]: t(`alert.metrics.${curr}`),
+ }), {})
+ }, [t])
+
return (
<div>
<div className='flex justify-between items-center'>
@@ -24,36 +40,45 @@ const ProjectAlerts = ({
history.push(_replace(routes.create_alert, ':pid', projectId))
}}
>
- Add Alert
+ {t('alert.add')}
</Button>
</div>
<div className='mt-4'>
{loading && (
- <div>Loading...</div>
+ <div>
+ {t('common.loading')}
+ </div>
)}
{(!loading && !_isEmpty(alerts)) && (
<div className='flex flex-col'>
- {_map(alerts, (alert) => (
- <div key={alert.id} className='flex flex-col bg-white dark:bg-gray-800 rounded-lg shadow-lg p-4 mb-4'>
+ {_map(alerts, ({ id, name, queryMetric, lastTriggered }) => (
+ <div key={id} className='flex flex-col bg-white dark:bg-gray-800 rounded-lg shadow-lg p-4 mb-4'>
<div className='flex justify-between items-center'>
<div className='flex flex-col'>
- <div className='text-lg font-bold dark:text-white text-gray-800'>{alert.name}</div>
- <div className='text-sm dark:text-gray-400 text-gray-600'>{alert.queryMetric}</div>
+ <div className='text-lg font-bold dark:text-white text-gray-800'>{name}</div>
+ <div className='text-sm dark:text-gray-400 text-gray-600'>{queryMetricTMapping[queryMetric]}</div>
</div>
<div className='flex flex-col'>
- <div className='text-sm dark:text-gray-400 text-gray-600'>Last Triggered</div>
- <div className='text-lg font-bold dark:text-white text-gray-800'>1 hour ago</div>
+ <div className='text-sm dark:text-gray-400 text-gray-600'>
+ {t('alert.lastTriggered')}
+ </div>
+ <div className='text-lg font-bold dark:text-white text-gray-800'>
+ {lastTriggered
+ ? (language === 'en'
+ ? dayjs(lastTriggered).locale(language).format('MMMM D, YYYY')
+ : dayjs(lastTriggered).locale(language).format('D MMMM, YYYY'))
+ : t('alert.never')}
+ </div>
</div>
<Button
- className='mt-4'
- type='button'
- secondary
- large
onClick={() => {
- history.push(_replace(_replace(routes.alert_settings, ':pid', projectId), ':id', alert.id))
+ history.push(_replace(_replace(routes.alert_settings, ':pid', projectId), ':id', id))
}}
+ className='dark:text-gray-50 dark:bg-gray-700 dark:hover:bg-gray-600'
+ secondary
+ large
>
- edit
+ {t('common.edit')}
</Button>
</div>
</div>