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!

Consolidate error / success states UI with StatusPage

Blue Mousedb43c54cb89c
diff --git a/docs/package-lock.json b/docs/package-lock.json
index 78c8b0849..22a39bb8a 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -27,7 +27,7 @@
"prettier": "^3.6.2"
},
"engines": {
- "node": ">=16.16"
+ "node": ">=24.9.0"
}
},
"node_modules/@algolia/abtesting": {
@@ -13191,23 +13191,6 @@
}
}
},
- "node_modules/tailwindcss/node_modules/yaml": {
- "version": "2.8.2",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
- "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
- "license": "ISC",
- "optional": true,
- "peer": true,
- "bin": {
- "yaml": "bin.mjs"
- },
- "engines": {
- "node": ">= 14.6"
- },
- "funding": {
- "url": "https://github.com/sponsors/eemeli"
- }
- },
"node_modules/tapable": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
diff --git a/web/app/pages/Auth/Socialised/index.tsx b/web/app/pages/Auth/Socialised/index.tsx
index 0c16720b0..8054b7b34 100644
--- a/web/app/pages/Auth/Socialised/index.tsx
+++ b/web/app/pages/Auth/Socialised/index.tsx
@@ -1,13 +1,11 @@
-import { CheckCircleIcon, XCircleIcon } from '@heroicons/react/24/solid'
import _replace from 'lodash/replace'
import _split from 'lodash/split'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { Link } from 'react-router'
import { processSSOToken, processSSOTokenCommunityEdition } from '~/api'
import { isSelfhosted, SSO_PROVIDERS } from '~/lib/constants'
-import Loader from '~/ui/Loader'
+import StatusPage from '~/ui/StatusPage'
import routes from '~/utils/routes'
const Socialised = () => {
@@ -35,6 +33,7 @@ const Socialised = () => {
const processCode = async () => {
if (!state || !provider) {
setIsError(true)
+ setLoading(false)
return
}
@@ -50,6 +49,7 @@ const Socialised = () => {
if (!_code) {
setIsError(true)
+ setLoading(false)
return
}
@@ -66,6 +66,7 @@ const Socialised = () => {
const processCodeCommunityEdition = async () => {
if (!state || !code) {
setIsError(true)
+ setLoading(false)
return
}
@@ -76,6 +77,7 @@ const Socialised = () => {
await processSSOTokenCommunityEdition(code, state, `${window.location.origin}${routes.socialised}`)
} catch (reason) {
setIsError(true)
+ setLoading(false)
console.error(`[ERROR] Error while processing OIDC code: ${reason}`)
} finally {
setLoading(false)
@@ -92,61 +94,26 @@ const Socialised = () => {
}, [])
if (loading) {
- return (
- <div className='min-h-page bg-gray-50 dark:bg-slate-900'>
- <Loader />
- </div>
- )
+ return <StatusPage loading />
}
if (isError) {
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('auth.socialisation.failed')}
- </h1>
- <p className='mt-1 max-w-prose text-base whitespace-pre-line text-gray-700 dark:text-gray-300'>
- {t('auth.socialisation.failedDesc')}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('auth.socialisation.failed')}
+ description={t('auth.socialisation.failedDesc')}
+ actions={[{ label: t('notFoundPage.support'), to: routes.contact }]}
+ />
)
}
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <CheckCircleIcon className='h-12 w-12 text-green-500 dark:text-green-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('auth.socialisation.authSuccess')}
- </h1>
- <p className='mt-1 max-w-prose text-base whitespace-pre-line text-gray-700 dark:text-gray-300'>
- {t('auth.socialisation.successDesc')}
- </p>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='success'
+ title={t('auth.socialisation.authSuccess')}
+ description={t('auth.socialisation.successDesc')}
+ />
)
}
diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsx
index 6ee941a65..70a3edc2f 100644
--- a/web/app/pages/Dashboard/Dashboard.tsx
+++ b/web/app/pages/Dashboard/Dashboard.tsx
@@ -3,10 +3,10 @@ import _isEmpty from 'lodash/isEmpty'
import _keys from 'lodash/keys'
import _map from 'lodash/map'
import _size from 'lodash/size'
-import { StretchHorizontalIcon, LayoutGridIcon, SearchIcon, XIcon, FolderPlusIcon, CircleXIcon } from 'lucide-react'
+import { StretchHorizontalIcon, LayoutGridIcon, SearchIcon, XIcon, FolderPlusIcon } from 'lucide-react'
import React, { useState, useEffect, useRef, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
-import { Link, useLoaderData, useNavigate, useSearchParams } from 'react-router'
+import { useLoaderData, useNavigate, useSearchParams } from 'react-router'
import { ClientOnly } from 'remix-utils/client-only'
import { toast } from 'sonner'
@@ -23,6 +23,7 @@ import Input from '~/ui/Input'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
import Select from '~/ui/Select'
+import StatusPage from '~/ui/StatusPage'
import { Text } from '~/ui/Text'
import { setCookie } from '~/utils/cookie'
import routes from '~/utils/routes'
@@ -333,38 +334,15 @@ const Dashboard = () => {
if (error && isLoading === false) {
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <CircleXIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <Text as='h1' size='4xl' weight='bold' className='sm:text-5xl'>
- {t('apiNotifications.somethingWentWrong')}
- </Text>
- <Text as='p' size='2xl' weight='medium' colour='secondary' className='mt-4'>
- {t('apiNotifications.errorCode', { error })}
- </Text>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Organisations/Organisations.tsx b/web/app/pages/Organisations/Organisations.tsx
index 7955ede50..8dd16b4b3 100644
--- a/web/app/pages/Organisations/Organisations.tsx
+++ b/web/app/pages/Organisations/Organisations.tsx
@@ -1,5 +1,4 @@
import { BuildingOffice2Icon } from '@heroicons/react/24/outline'
-import { XCircleIcon } from '@heroicons/react/24/solid'
import _isEmpty from 'lodash/isEmpty'
import _map from 'lodash/map'
import _size from 'lodash/size'
@@ -21,6 +20,7 @@ import Input from '~/ui/Input'
import Loader from '~/ui/Loader'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
+import StatusPage from '~/ui/StatusPage'
import { Text } from '~/ui/Text'
import routes from '~/utils/routes'
@@ -134,38 +134,15 @@ const Organisations = () => {
if (error && isLoading === false) {
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Organisations/Settings/index.tsx b/web/app/pages/Organisations/Settings/index.tsx
index 6e1cf4085..124e169c2 100644
--- a/web/app/pages/Organisations/Settings/index.tsx
+++ b/web/app/pages/Organisations/Settings/index.tsx
@@ -1,11 +1,10 @@
-import { XCircleIcon } from '@heroicons/react/24/outline'
import _isEmpty from 'lodash/isEmpty'
import _keys from 'lodash/keys'
import _size from 'lodash/size'
import { Trash2Icon } from 'lucide-react'
import React, { useState, useEffect, useCallback, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
-import { Link, useNavigate } from 'react-router'
+import { useNavigate } from 'react-router'
import { toast } from 'sonner'
import { transferProject, getOrganisation, updateOrganisation, deleteOrganisation } from '~/api'
@@ -18,6 +17,7 @@ import Button from '~/ui/Button'
import Input from '~/ui/Input'
import Loader from '~/ui/Loader'
import Modal from '~/ui/Modal'
+import StatusPage from '~/ui/StatusPage'
import routes from '~/utils/routes'
import People from './People'
@@ -219,38 +219,15 @@ const OrganisationSettings = () => {
if (error && !isLoading) {
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Project/Settings/Emails/ConfirmReportsShare/index.tsx b/web/app/pages/Project/Settings/Emails/ConfirmReportsShare/index.tsx
index 24ff45b8f..af7c7aea7 100644
--- a/web/app/pages/Project/Settings/Emails/ConfirmReportsShare/index.tsx
+++ b/web/app/pages/Project/Settings/Emails/ConfirmReportsShare/index.tsx
@@ -1,10 +1,9 @@
-import { CheckCircleIcon, XCircleIcon } from '@heroicons/react/24/solid'
import { useState, useEffect, memo } from 'react'
import { useTranslation } from 'react-i18next'
-import { useParams, Link } from 'react-router'
+import { useParams } from 'react-router'
import { confirmSubscriberInvite } from '~/api'
-import Loader from '~/ui/Loader'
+import StatusPage from '~/ui/StatusPage'
import routes from '~/utils/routes'
const ConfirmReportsShare = () => {
@@ -38,67 +37,28 @@ const ConfirmReportsShare = () => {
}, []) // eslint-disable-line
if (loading) {
- return (
- <div className='min-h-page bg-gray-50 dark:bg-slate-900'>
- <Loader />
- </div>
- )
+ return <StatusPage loading />
}
if (error) {
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>{error}</h1>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <Link
- to={routes.dashboard}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('common.dashboard')}
- </Link>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={error}
+ actions={[
+ { label: t('common.dashboard'), to: routes.dashboard, primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <CheckCircleIcon className='h-12 w-12 text-green-500 dark:text-green-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.acceptInvitation')}
- </h1>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <Link
- to={routes.dashboard}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('common.dashboard')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='success'
+ title={t('apiNotifications.acceptInvitation')}
+ actions={[{ label: t('common.dashboard'), to: routes.dashboard, primary: true }]}
+ />
)
}
diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsx
index d6419846f..a5cdbf4dc 100644
--- a/web/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx
@@ -1,4 +1,3 @@
-import { XCircleIcon } from '@heroicons/react/24/outline'
import cx from 'clsx'
import _filter from 'lodash/filter'
import _includes from 'lodash/includes'
@@ -60,6 +59,7 @@ import Input from '~/ui/Input'
import Loader from '~/ui/Loader'
import Modal from '~/ui/Modal'
import MultiSelect from '~/ui/MultiSelect'
+import StatusPage from '~/ui/StatusPage'
import Select from '~/ui/Select'
// Select is used inside tab components
import countries from '~/utils/isoCountries'
@@ -710,38 +710,15 @@ const ProjectSettings = () => {
if (error && !isLoading) {
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
index 561eb3eb6..b073c6637 100644
--- a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
+++ b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
@@ -1,4 +1,3 @@
-import { XCircleIcon } from '@heroicons/react/24/outline'
import cx from 'clsx'
import dayjs from 'dayjs'
import _isEmpty from 'lodash/isEmpty'
@@ -35,6 +34,7 @@ import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
+import StatusPage from '~/ui/StatusPage'
import { Text } from '~/ui/Text'
import routes from '~/utils/routes'
@@ -357,38 +357,15 @@ const ProjectAlerts = () => {
if (error && isLoading === false) {
return (
- <div className='bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
index 8967467fc..2f2204026 100644
--- a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
+++ b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
@@ -1,4 +1,3 @@
-import { XCircleIcon } from '@heroicons/react/24/outline'
import cx from 'clsx'
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime'
@@ -18,7 +17,6 @@ import {
} from 'lucide-react'
import { useState, useEffect, useMemo, useRef, useCallback, memo } from 'react'
import { useTranslation } from 'react-i18next'
-import { Link } from 'react-router'
import { toast } from 'sonner'
import {
@@ -40,6 +38,7 @@ import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
+import StatusPage from '~/ui/StatusPage'
import { Text } from '~/ui/Text'
import routes from '~/utils/routes'
@@ -468,38 +467,15 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsVi
if (error && isLoading === false && _isEmpty(experiments)) {
return (
- <div className='bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
index c3342cc59..9de7f262b 100644
--- a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
+++ b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
@@ -1,4 +1,3 @@
-import { XCircleIcon } from '@heroicons/react/24/outline'
import cx from 'clsx'
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime'
@@ -47,6 +46,7 @@ import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
+import StatusPage from '~/ui/StatusPage'
import { Switch } from '~/ui/Switch'
import { Text } from '~/ui/Text'
import { nFormatter } from '~/utils/generic'
@@ -738,38 +738,15 @@ const FeatureFlagsView = ({ period, from = '', to = '', timezone }: FeatureFlags
if (error && isLoading === false) {
return (
- <div className='bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Project/tabs/Goals/GoalsView.tsx b/web/app/pages/Project/tabs/Goals/GoalsView.tsx
index 490b067e0..c41f137ea 100644
--- a/web/app/pages/Project/tabs/Goals/GoalsView.tsx
+++ b/web/app/pages/Project/tabs/Goals/GoalsView.tsx
@@ -1,4 +1,3 @@
-import { XCircleIcon } from '@heroicons/react/24/outline'
import type { ChartOptions } from 'billboard.js'
import { area, bar } from 'billboard.js'
import cx from 'clsx'
@@ -20,7 +19,6 @@ import {
} from 'lucide-react'
import { useState, useEffect, useMemo, useRef, useCallback } from 'react'
import { useTranslation } from 'react-i18next'
-import { Link } from 'react-router'
import { toast } from 'sonner'
import {
@@ -52,6 +50,7 @@ import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
import ProgressRing from '~/ui/ProgressRing'
+import StatusPage from '~/ui/StatusPage'
import { Text } from '~/ui/Text'
import { nFormatter } from '~/utils/generic'
import routes from '~/utils/routes'
@@ -631,38 +630,15 @@ const GoalsView = ({ period, from = '', to = '', timezone }: GoalsViewProps) =>
if (error && isLoading === false) {
return (
- <div className='bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx b/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
index a399037f2..39f05247a 100644
--- a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
+++ b/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
@@ -1,10 +1,9 @@
-import { XCircleIcon } from '@heroicons/react/24/outline'
import cx from 'clsx'
import _isEmpty from 'lodash/isEmpty'
import { DownloadIcon } from 'lucide-react'
import { useState, useEffect, useMemo, useRef } from 'react'
import { useTranslation } from 'react-i18next'
-import { Link, useSearchParams } from 'react-router'
+import { useSearchParams } from 'react-router'
import { getSessions, getSession } from '~/api'
import { Session, SessionDetails as SessionDetailsType } from '~/lib/models/Project'
@@ -19,6 +18,7 @@ import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjec
import Spin from '~/ui/icons/Spin'
import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
+import StatusPage from '~/ui/StatusPage'
import routes from '~/utils/routes'
const SESSIONS_TAKE = 30
@@ -237,38 +237,15 @@ const SessionsView = ({ tnMapping, rotateXAxis }: SessionsViewProps) => {
if (error && sessionsLoading === false) {
return (
- <div className='bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('apiNotifications.somethingWentWrong')}
- </h1>
- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>
- {t('apiNotifications.errorCode', { error })}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <button
- type='button'
- onClick={() => window.location.reload()}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden'
- >
- {t('dashboard.reloadPage')}
- </button>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('apiNotifications.somethingWentWrong')}
+ description={t('apiNotifications.errorCode', { error })}
+ actions={[
+ { label: t('dashboard.reloadPage'), onClick: () => window.location.reload(), primary: true },
+ { label: t('notFoundPage.support'), to: routes.contact },
+ ]}
+ />
)
}
diff --git a/web/app/routes/gsc-connected.tsx b/web/app/routes/gsc-connected.tsx
index 79881d2ec..65ebd3074 100644
--- a/web/app/routes/gsc-connected.tsx
+++ b/web/app/routes/gsc-connected.tsx
@@ -1,13 +1,12 @@
-import { XCircleIcon } from '@heroicons/react/24/solid'
import _replace from 'lodash/replace'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { Link, redirect, useNavigate } from 'react-router'
+import { redirect, useNavigate } from 'react-router'
import type { SitemapFunction } from 'remix-sitemap'
import { processGSCToken } from '~/api'
import { isSelfhosted } from '~/lib/constants'
-import Loader from '~/ui/Loader'
+import StatusPage from '~/ui/StatusPage'
import routes from '~/utils/routes'
export async function loader() {
@@ -69,40 +68,17 @@ export default function GscConnected() {
}, [navigate])
if (loading) {
- return (
- <div className='min-h-page bg-gray-50 dark:bg-slate-900'>
- <Loader />
- </div>
- )
+ return <StatusPage loading />
}
if (isError) {
return (
- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>
- <div className='mx-auto max-w-max'>
- <main className='sm:flex'>
- <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
- <div className='sm:ml-6'>
- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>
- {t('gsc.failed')}
- </h1>
- <p className='mt-1 max-w-prose text-base whitespace-pre-line text-gray-700 dark:text-gray-300'>
- {t('gsc.failedDesc')}
- </p>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <Link
- to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
- >
- {t('notFoundPage.support')}
- </Link>
- </div>
- </div>
- </main>
- </div>
- </div>
+ <StatusPage
+ type='error'
+ title={t('gsc.failed')}
+ description={t('gsc.failedDesc')}
+ actions={[{ label: t('notFoundPage.support'), to: routes.contact }]}
+ />
)
}
diff --git a/web/app/ui/StatusPage.tsx b/web/app/ui/StatusPage.tsx
index 7e14d137f..d00aec893 100644
--- a/web/app/ui/StatusPage.tsx
+++ b/web/app/ui/StatusPage.tsx
@@ -16,12 +16,23 @@ interface ActionLink {
primary?: boolean
}
+interface ActionButton {
+ label: string
+ onClick: () => void
+ primary?: boolean
+}
+
+type Action = ActionLink | ActionButton
+
+const isActionLink = (action: Action): action is ActionLink => 'to' in action
+
interface StatusPageProps {
loading?: boolean
type?: StatusType
title?: string
+ description?: string
icon?: ReactNode
- actions?: ActionLink[]
+ actions?: Action[]
}
const iconMap: Record<StatusType, ReactNode> = {
@@ -36,7 +47,7 @@ const iconBgMap: Record<StatusType, string> = {
info: 'bg-amber-100 dark:bg-amber-500/10',
}
-const StatusPage = ({ loading, type = 'success', title, icon, actions }: StatusPageProps) => {
+const StatusPage = ({ loading, type = 'success', title, description, icon, actions }: StatusPageProps) => {
const { t } = useTranslation('common')
if (loading) {
@@ -65,22 +76,44 @@ const StatusPage = ({ loading, type = 'success', title, icon, actions }: StatusP
</Text>
) : null}
+ {description ? (
+ <Text as='p' size='base' colour='secondary' className='mt-2'>
+ {description}
+ </Text>
+ ) : null}
+
{actions && actions.length > 0 ? (
<div className='mt-6 flex flex-wrap items-center justify-center gap-3'>
- {actions.map((action) => (
- <Link
- key={action.to}
- to={action.to}
- className={cn(
- 'inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-none',
- action.primary
- ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-500 dark:bg-slate-800 dark:hover:bg-slate-700'
- : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-500 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-slate-700',
- )}
- >
- {action.label}
- </Link>
- ))}
+ {actions.map((action, index) =>
+ isActionLink(action) ? (
+ <Link
+ key={action.to}
+ to={action.to}
+ className={cn(
+ 'inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-none',
+ action.primary
+ ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-500 dark:bg-slate-800 dark:hover:bg-slate-700'
+ : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-500 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-slate-700',
+ )}
+ >
+ {action.label}
+ </Link>
+ ) : (
+ <button
+ key={index}
+ type='button'
+ onClick={action.onClick}
+ className={cn(
+ 'inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-none',
+ action.primary
+ ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-500 dark:bg-slate-800 dark:hover:bg-slate-700'
+ : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-500 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-slate-700',
+ )}
+ >
+ {action.label}
+ </button>
+ ),
+ )}
</div>
) : null}
</div>