📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
improved alert settings page
Blue Mouse69cde1d597bf
diff --git a/public/locales/en.json b/public/locales/en.jsonindex 8118befe6..21c6f852d 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -410,6 +410,31 @@"render": "Browser render","response": "Response Time"},+ "alert": {+ "create": "Create an alert",+ "settingsOf": "Settings of {{name}}",+ "name": "Alert name",+ "metric": "Query metric",+ "condition": "Trigger when the metric is",+ "threshold": "Threshold",+ "time": "During the last",+ "xMinutes": "{{amount}} minutes",+ "xHours": "{{amount}} hours",+ "xHour": "{{amount}} hour",+ "enabled": "Alert enabled",+ "enabledHint": "Disabled alerts will not notify you of any events.",+ "conditions": {+ "greater_than": "Greater than",+ "greater_equal_than": "Greater or equal to",+ "less_than": "Less than",+ "less_equal_than": "Less or equal to"+ },+ "metrics": {+ "page_views": "Page views",+ "unique_page_views": "Unique sessions",+ "online_users": "Online users"+ }+ },"docs": {"titles": {"start": "Getting Started",diff --git a/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsx b/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsxindex a8b677318..e538f5f6d 100644--- a/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsx+++ b/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.jsx@@ -13,6 +13,9 @@ import _split from 'lodash/split'import _keys from 'lodash/keys'import _filter from 'lodash/filter'import _map from 'lodash/map'+import _reduce from 'lodash/reduce'+import _values from 'lodash/values'+import _findKey from 'lodash/findKey'import _includes from 'lodash/includes'import _toNumber from 'lodash/toNumber'import { clsx as cx } from 'clsx'@@ -22,7 +25,7 @@ import Button from 'ui/Button'import Checkbox from 'ui/Checkbox'import Modal from 'ui/Modal'import {- PROJECT_TABS, QueryCondition, QueryMetric, QueryTime,+ PROJECT_TABS, QUERY_CONDITION, QUERY_METRIC, QUERY_TIME,} from 'redux/constants'import { createAlert, updateAlert, deleteAlert } from 'api'import { withAuthentication, auth } from 'hoc/protected'@@ -39,12 +42,60 @@ const ProjectAlertsSettings = ({ alerts, setProjectAlerts, showError }) => {const [form, setForm] = useState({pid,name: '',+ queryTime: QUERY_TIME.LAST_1_HOUR,+ queryCondition: QUERY_CONDITION.GREATER_THAN,+ queryMetric: QUERY_METRIC.PAGE_VIEWS,+ active: true,})const [validated, setValidated] = useState(false)const [errors, setErrors] = useState({})const [beenSubmitted, setBeenSubmitted] = useState(false)const [showModal, setShowModal] = useState(false)+ const queryTimeTMapping = useMemo(() => {+ const values = _values(QUERY_TIME)++ return _reduce(values, (prev, curr) => {+ const [_, amount, metric] = _split(curr, '_')+ let translated++ if (metric === 'minutes') {+ translated = t('alert.xMinutes', { amount })+ }++ if (metric === 'hour') {+ translated = t('alert.xHour', { amount })+ }++ if (metric === 'hours') {+ translated = t('alert.xHours', { amount })+ }++ return {+ ...prev,+ [curr]: translated,+ }+ }, {})+ }, [t])++ const queryConditionTMapping = useMemo(() => {+ const values = _values(QUERY_CONDITION)++ return _reduce(values, (prev, curr) => ({+ ...prev,+ [curr]: t(`alert.conditions.${curr}`),+ }), {})+ }, [t])++ const queryMetricTMapping = useMemo(() => {+ const values = _values(QUERY_METRIC)++ return _reduce(values, (prev, curr) => ({+ ...prev,+ [curr]: t(`alert.metrics.${curr}`),+ }), {})+ }, [t])+useEffect(() => {if (!_isEmpty(alert)) {setForm(alert)@@ -130,7 +181,9 @@ const ProjectAlertsSettings = ({ alerts, setProjectAlerts, showError }) => {}}- const title = isSettings ? `${'Update'} ${form.name}` : t('Create alert')+ const title = isSettings ? t('alert.settingsOf', {+ name: form.name,+ }) : t('alert.create')return (<Title title={title}>@@ -143,61 +196,67 @@ const ProjectAlertsSettings = ({ alerts, setProjectAlerts, showError }) => {<h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>{title}</h2>- <h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.general')}- </h3><Inputname='name'id='name'type='text'- label={t('project.settings.name')}+ label={t('alert.name')}value={form.name}- placeholder='My awesome project'+ placeholder='Your alert label'className='mt-4'onChange={handleInput}error={beenSubmitted ? errors.name : null}/>+ <Checkbox+ checked={Boolean(form.active)}+ onChange={handleInput}+ name='active'+ id='active'+ className='mt-4'+ label={t('alert.enabled')}+ hint={t('alert.enabledHint')}+ /><div className='mt-4'><Selectname='queryMetric'id='queryMetric'- label={t('alert.settings.queryMetric')}- items={_keys(QueryMetric)}- keyExtractor={item => item}- labelExtractor={item => {- return QueryMetric[item]+ label={t('alert.metric')}+ items={_values(queryMetricTMapping)}+ title={queryMetricTMapping[form.queryMetric]}+ onSelect={(item) => {+ const key = _findKey(queryMetricTMapping, predicate => predicate === item)++ setForm(prevForm => ({+ ...prevForm,+ queryMetric: key,+ }))}}- title={form.queryMetric || 'Select query metric'}- onSelect={(item) => setForm(prevForm => ({- ...prevForm,- queryMetric: item,- }))}/></div><div className='mt-4'><Selectname='queryCondition'id='queryCondition'- label={t('alert.settings.queryCondition')}- items={_keys(QueryCondition)}- keyExtractor={item => item}- labelExtractor={item => {- return QueryCondition[item]+ label={t('alert.condition')}+ items={_values(queryConditionTMapping)}+ title={queryConditionTMapping[form.queryCondition]}+ onSelect={(item) => {+ const key = _findKey(queryConditionTMapping, predicate => predicate === item)++ setForm(prevForm => ({+ ...prevForm,+ queryCondition: key,+ }))}}- title={form.queryCondition || 'Select query condition'}- onSelect={(item) => setForm(prevForm => ({- ...prevForm,- queryCondition: item,- }))}/></div><Inputname='queryValue'id='queryValue'type='text'- label={t('project.alerts.queryValue')}+ label={t('alert.threshold')}value={form.queryValue}- placeholder='1-999'+ placeholder='10'className='mt-4'onChange={handleInput}error={beenSubmitted ? errors.queryValue : null}@@ -206,31 +265,22 @@ const ProjectAlertsSettings = ({ alerts, setProjectAlerts, showError }) => {<Selectname='queryTime'id='queryTime'- label={t('alert.settings.queryTime')}- items={_keys(QueryTime)}- keyExtractor={item => item}- labelExtractor={item => {- return QueryTime[item]+ label={t('alert.time')}+ items={_values(queryTimeTMapping)}+ title={queryTimeTMapping[form.queryTime]}+ onSelect={(item) => {+ const key = _findKey(queryTimeTMapping, predicate => predicate === item)++ setForm(prevForm => ({+ ...prevForm,+ queryTime: key,+ }))}}- title={form.queryTime || 'Select query time'}- onSelect={(item) => setForm(prevForm => ({- ...prevForm,- queryTime: item,- }))}/></div>- {!isSettings ? (- <div className='mt-5 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>- {t('common.cancel')}- </Button>- <Button type='submit' primary regular>- {t('common.save')}- </Button>- </div>- ) : (+ {isSettings ? (<div className='flex justify-between items-center mt-5'>- <Button className='ml-2' onClick={() => setShowModal(true)} danger semiSmall>+ <Button onClick={() => setShowModal(true)} danger semiSmall><ExclamationTriangleIcon className='w-5 h-5 mr-1' />{t('project.settings.delete')}</Button>@@ -243,6 +293,15 @@ const ProjectAlertsSettings = ({ alerts, setProjectAlerts, showError }) => {</Button></div></div>+ ) : (+ <div className='mt-5 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>+ {t('common.cancel')}+ </Button>+ <Button type='submit' primary regular>+ {t('common.save')}+ </Button>+ </div>)}</form><Modaldiff --git a/src/redux/constants/index.js b/src/redux/constants/index.jsindex afe007157..408d3023d 100644--- a/src/redux/constants/index.js+++ b/src/redux/constants/index.js@@ -204,20 +204,20 @@ export const PROJECT_TABS = {alerts: 'alerts',}-export const QueryMetric = {+export const QUERY_METRIC = {PAGE_VIEWS: 'page_views',UNIQUE_PAGE_VIEWS: 'unique_page_views',ONLINE_USERS: 'online_users',}-export const QueryCondition = {+export const QUERY_CONDITION = {GREATER_THAN: 'greater_than',GREATER_EQUAL_THAN: 'greater_equal_than',LESS_THAN: 'less_than',LESS_EQUAL_THAN: 'less_equal_than',}-export const QueryTime = {+export const QUERY_TIME = {LAST_15_MINUTES: 'last_15_minutes',LAST_30_MINUTES: 'last_30_minutes',LAST_1_HOUR: 'last_1_hour',