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!

Implemented fetching uptime monitors

Blue Mouse39c4947e4d12
diff --git a/app/api/index.ts b/app/api/index.ts
index 864fd725c..b75831ed1 100644
--- a/app/api/index.ts
+++ b/app/api/index.ts
@@ -11,7 +11,7 @@ import { authActions } from 'redux/reducers/auth'
import sagaActions from 'redux/sagas/actions'
import { getAccessToken, removeAccessToken, setAccessToken } from 'utils/accessToken'
import { getRefreshToken, removeRefreshToken } from 'utils/refreshToken'
-import { DEFAULT_ALERTS_TAKE, API_URL } from 'redux/constants'
+import { DEFAULT_ALERTS_TAKE, API_URL, DEFAULT_MONITORS_TAKE } from 'redux/constants'
import { IUser } from 'redux/models/IUser'
import { IAuth } from 'redux/models/IAuth'
import { IProject, IOverall, IProjectNames } from 'redux/models/IProject'
@@ -987,6 +987,23 @@ export const deleteAlert = (id: string) =>
export interface ICreateMonitor extends Omit<Monitor, 'id' | 'createdAt' | 'updatedAt'> {}
+export const getAllMonitors = (take: number = DEFAULT_MONITORS_TAKE, skip: number = 0) =>
+ api
+ .get(`project/monitors?take=${take}&skip=${skip}`)
+ .then(
+ (
+ response,
+ ): {
+ results: Monitor[]
+ total: number
+ page_total: number
+ } => response.data,
+ )
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
+ })
+
export const createMonitor = (pid: string, data: ICreateMonitor) =>
api
.post(`project/${pid}/monitor`, data)
diff --git a/app/pages/Project/uptime/View.tsx b/app/pages/Project/uptime/View.tsx
index abee61dc3..4e361430c 100644
--- a/app/pages/Project/uptime/View.tsx
+++ b/app/pages/Project/uptime/View.tsx
@@ -3,7 +3,7 @@ import _map from 'lodash/map'
import _isEmpty from 'lodash/isEmpty'
import _replace from 'lodash/replace'
import _filter from 'lodash/filter'
-import { useNavigate } from '@remix-run/react'
+import { Link, useNavigate } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import { useDispatch, useSelector } from 'react-redux'
import {
@@ -35,51 +35,52 @@ import { Monitor } from 'redux/models/Uptime'
interface IMonitorCard {
monitor: Monitor
deleteMonitor: (id: string) => void
- openMonitor: (id: string) => void
}
-const MonitorCard = ({ monitor, openMonitor, deleteMonitor }: IMonitorCard): JSX.Element => {
+const MonitorCard = ({ monitor, deleteMonitor }: IMonitorCard): JSX.Element => {
const { t } = useTranslation()
const [showDeleteModal, setShowDeleteModal] = useState(false)
return (
<>
- <li
- onClick={() => openMonitor(monitor.id)}
- className='min-h-[120px] cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 hover:bg-gray-100 dark:border-slate-800/25 dark:bg-[#162032] dark:hover:bg-slate-800'
- >
- <div className='px-4 py-4'>
- <div className='flex justify-between'>
- <div>
- <p className='flex items-center gap-x-2 text-lg text-slate-900 dark:text-gray-50'>
- <span className='font-semibold'>{monitor.name}</span>
- {/* <Separator />
+ <Link to={_replace(_replace(routes.uptime_settings, ':pid', monitor.projectId), ':id', monitor.id)}>
+ <li className='min-h-[120px] cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 hover:bg-gray-100 dark:border-slate-800/25 dark:bg-[#162032] dark:hover:bg-slate-800'>
+ <div className='px-4 py-4'>
+ <div className='flex justify-between'>
+ <div>
+ <p className='flex items-center gap-x-2 text-lg text-slate-900 dark:text-gray-50'>
+ <span className='font-semibold'>{monitor.name}</span>
+ {/* <Separator />
<span>{queryMetric}</span> */}
- </p>
- </div>
- <div className='flex gap-2'>
- <AdjustmentsVerticalIcon
- role='button'
- aria-label={t('common.settings')}
- onClick={(e) => {
- e.stopPropagation()
- openMonitor(monitor.id)
- }}
- className='h-6 w-6 text-gray-800 hover:text-gray-900 dark:text-slate-400 dark:hover:text-slate-500'
- />
- <TrashIcon
- onClick={(e) => {
- e.stopPropagation()
- setShowDeleteModal(true)
- }}
- role='button'
- aria-label={t('common.delete')}
- className='h-6 w-6 text-gray-800 hover:text-gray-900 dark:text-slate-400 dark:hover:text-slate-500'
- />
+ </p>
+ </div>
+ <div className='flex gap-2'>
+ <Link
+ to={_replace(_replace(routes.uptime_settings, ':pid', monitor.projectId), ':id', monitor.id)}
+ onClick={(e) => {
+ e.stopPropagation()
+ }}
+ >
+ <AdjustmentsVerticalIcon
+ role='button'
+ aria-label={t('common.settings')}
+ className='h-6 w-6 text-gray-800 hover:text-gray-900 dark:text-slate-400 dark:hover:text-slate-500'
+ />
+ </Link>
+ <TrashIcon
+ onClick={(e) => {
+ e.stopPropagation()
+ setShowDeleteModal(true)
+ }}
+ role='button'
+ aria-label={t('common.delete')}
+ className='h-6 w-6 text-gray-800 hover:text-gray-900 dark:text-slate-400 dark:hover:text-slate-500'
+ />
+ </div>
</div>
</div>
- </div>
- </li>
+ </li>
+ </Link>
<Modal
onClose={() => setShowDeleteModal(false)}
onSubmit={() => deleteMonitor(monitor.id)}
@@ -202,14 +203,7 @@ const Uptime = ({ projectId }: UptimeProps): JSX.Element => {
{!loading && !_isEmpty(projectMonitors) && (
<ul className='mt-4 grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>
{_map(projectMonitors, (monitor) => (
- <MonitorCard
- key={monitor.id}
- monitor={monitor}
- openMonitor={(id) => {
- navigate(_replace(_replace(routes.uptime_settings, ':pid', projectId), ':id', id))
- }}
- deleteMonitor={onDelete}
- />
+ <MonitorCard key={monitor.id} monitor={monitor} deleteMonitor={onDelete} />
))}
<AddMonitor handleNewMonitor={handleNewMonitor} isLimitReached={isLimitReached} />
</ul>
diff --git a/app/redux/constants/index.ts b/app/redux/constants/index.ts
index 6f9034a11..49aee3a3b 100644
--- a/app/redux/constants/index.ts
+++ b/app/redux/constants/index.ts
@@ -592,7 +592,8 @@ export const THEME_TYPE: IStringObject = {
christmas: 'christmas',
}
-export const DEFAULT_ALERTS_TAKE: number = 100
+export const DEFAULT_ALERTS_TAKE = 100
+export const DEFAULT_MONITORS_TAKE = 100
const EUR = {
symbol: '€',
diff --git a/app/redux/sagas/actions/index.ts b/app/redux/sagas/actions/index.ts
index 88af5c9a8..fbfb3f3d0 100644
--- a/app/redux/sagas/actions/index.ts
+++ b/app/redux/sagas/actions/index.ts
@@ -38,6 +38,11 @@ const loadProjectAlerts = (take?: number, skip?: number) => ({
payload: { take, skip },
})
+const loadMonitors = (take?: number, skip?: number) => ({
+ type: types.LOAD_MONITORS,
+ payload: { take, skip },
+})
+
const loginAsync = (
credentials: {
email: string
@@ -191,6 +196,7 @@ const sagaActions = {
loadMetainfo,
loadUsageinfo,
updateShowLiveVisitorsInTitle,
+ loadMonitors,
}
export default sagaActions
diff --git a/app/redux/sagas/actions/types.ts b/app/redux/sagas/actions/types.ts
index d0844c159..e88526d3d 100644
--- a/app/redux/sagas/actions/types.ts
+++ b/app/redux/sagas/actions/types.ts
@@ -5,6 +5,7 @@ const sagaTypes = Object.freeze({
LOAD_USAGEINFO: 'LOAD_USAGEINFO',
LOAD_SHARED_PROJECTS: 'LOAD_SHARED_PROJECTS',
LOAD_PROJECT_ALERTS: 'LOAD_PROJECT_ALERTS',
+ LOAD_MONITORS: 'LOAD_MONITORS',
LOGIN_ASYNC: 'LOGIN_ASYNC',
SIGNUP_ASYNC: 'SIGNUP_ASYNC',
EMAIL_VERIFY_ASYNC: 'EMAIL_VERIFY_ASYNC',
diff --git a/app/redux/sagas/auth/workers/signin.ts b/app/redux/sagas/auth/workers/signin.ts
index 3745c1561..1698e2a28 100644
--- a/app/redux/sagas/auth/workers/signin.ts
+++ b/app/redux/sagas/auth/workers/signin.ts
@@ -44,6 +44,7 @@ export default function* singinWorker({ payload: { credentials, callback } }: IS
yield put(sagaActions.loadSharedProjects())
yield put(sagaActions.loadProjectsCaptcha())
yield put(sagaActions.loadProjectAlerts())
+ yield put(sagaActions.loadMonitors())
callback(true, false)
} catch (error) {
// @ts-ignore
diff --git a/app/redux/sagas/auth/workers/signup.ts b/app/redux/sagas/auth/workers/signup.ts
index 95dd64b75..9c928cca5 100644
--- a/app/redux/sagas/auth/workers/signup.ts
+++ b/app/redux/sagas/auth/workers/signup.ts
@@ -50,6 +50,7 @@ export default function* signupWorder({
yield put(sagaActions.loadProjects())
yield put(sagaActions.loadSharedProjects())
yield put(sagaActions.loadProjectAlerts())
+ yield put(sagaActions.loadMonitors())
callback(true)
} catch (error: unknown) {
// @ts-ignore
diff --git a/app/redux/sagas/auth/workers/sso_auth.ts b/app/redux/sagas/auth/workers/sso_auth.ts
index b64497d69..d0a6815bb 100644
--- a/app/redux/sagas/auth/workers/sso_auth.ts
+++ b/app/redux/sagas/auth/workers/sso_auth.ts
@@ -78,6 +78,7 @@ export default function* ssoAuth({ payload: { callback, dontRemember, t, provide
yield put(sagaActions.loadSharedProjects())
yield put(sagaActions.loadProjectsCaptcha())
yield put(sagaActions.loadProjectAlerts())
+ yield put(sagaActions.loadMonitors())
yield put(authActions.finishLoading())
callback(true, false)
return
diff --git a/app/redux/sagas/ui/index.ts b/app/redux/sagas/ui/index.ts
index 21e55af4c..f36a2e4e7 100644
--- a/app/redux/sagas/ui/index.ts
+++ b/app/redux/sagas/ui/index.ts
@@ -12,27 +12,27 @@ import loadUsageinfo from './load_usageinfo'
import logout from './logout'
import loadSharedProjects from './load_shared_projects'
import loadProjectAlerts from './load_alerts'
+import loadMonitors from './load_monitors'
function* mainUISaga() {
yield fork(initialise)
yield fork(liveVisitors)
yield fork(isEventsAvailable)
yield fork(generalStats)
- // @ts-ignore
+ // @ts-expect-error
yield takeEvery(sagaTypes.LOAD_PROJECTS, loadProjects)
- // @is-ignore
yield takeEvery(sagaTypes.LOAD_METAINFO, loadMetainfo)
- // @is-ignore
yield takeEvery(sagaTypes.LOAD_USAGEINFO, loadUsageinfo)
- // @ts-ignore
+ // @ts-expect-error
yield takeEvery(sagaTypes.LOAD_SHARED_PROJECTS, loadSharedProjects)
yield takeEvery(sagaTypes.LOAD_EXTENSIONS, loadExtensions)
- // @ts-ignore
yield takeEvery(sagaTypes.LOGOUT, logout)
- // @ts-ignore
+ // @ts-expect-error
yield takeLatest(sagaTypes.SHARE_VERIFY_ASYNC, shareVerify)
- // @ts-ignore
+ // @ts-expect-error
yield takeLatest(sagaTypes.LOAD_PROJECT_ALERTS, loadProjectAlerts)
+ // @ts-expect-error
+ yield takeLatest(sagaTypes.LOAD_MONITORS, loadMonitors)
}
export default mainUISaga
diff --git a/app/redux/sagas/ui/initialise.ts b/app/redux/sagas/ui/initialise.ts
index 334ae6d0e..34dbba4b0 100644
--- a/app/redux/sagas/ui/initialise.ts
+++ b/app/redux/sagas/ui/initialise.ts
@@ -21,6 +21,7 @@ export default function* initialise() {
yield put(sagaActions.loadProjectsCaptcha())
yield put(sagaActions.loadExtensions())
yield put(sagaActions.loadProjectAlerts())
+ yield put(sagaActions.loadMonitors())
}
if (!isSelfhosted) {
diff --git a/app/redux/sagas/ui/load_monitors.ts b/app/redux/sagas/ui/load_monitors.ts
new file mode 100644
index 000000000..6ad0af6e9
--- /dev/null
+++ b/app/redux/sagas/ui/load_monitors.ts
@@ -0,0 +1,37 @@
+import { put, call } from 'redux-saga/effects'
+import _isString from 'lodash/isString'
+import UIActions from 'redux/reducers/ui'
+import { errorsActions } from 'redux/reducers/errors'
+import { DEFAULT_MONITORS_TAKE, isSelfhosted } from 'redux/constants'
+const { getAllMonitors } = require('api')
+
+export default function* loadMonitors({ payload: { take = DEFAULT_MONITORS_TAKE, skip = 0 } }) {
+ if (isSelfhosted) {
+ yield put(UIActions.setMonitorsLoading(false))
+ return
+ }
+
+ try {
+ yield put(UIActions.setMonitorsLoading(true))
+ const { results, total, page_total: pageTotal } = yield call(getAllMonitors, take, skip)
+
+ yield put(UIActions.setMonitors(results))
+ yield put(
+ UIActions.setMonitorsTotal({
+ total,
+ pageTotal,
+ }),
+ )
+ } catch (e: unknown) {
+ const { message } = e as { message: string }
+ if (_isString(message)) {
+ yield put(
+ errorsActions.setError({
+ message,
+ }),
+ )
+ }
+ } finally {
+ yield put(UIActions.setMonitorsLoading(false))
+ }
+}
diff --git a/app/routes/projects.$pid.uptime.settings.$id.tsx b/app/routes/projects.$pid.uptime.settings.$id.tsx
index 952e17bdb..72d65c067 100644
--- a/app/routes/projects.$pid.uptime.settings.$id.tsx
+++ b/app/routes/projects.$pid.uptime.settings.$id.tsx
@@ -1,5 +1,5 @@
-import ProjectAlertsSettings from 'pages/Project/Alerts/Settings'
+import UptimeSettings from 'pages/Project/uptime/Settings'
export default function Index() {
- return <ProjectAlertsSettings />
+ return <UptimeSettings />
}