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!

Alerts view to ts

kruzhambus8932af29829a
diff --git a/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx b/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
index db3f7f5b1..8d9659c54 100644
--- a/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
+++ b/src/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
@@ -46,7 +46,7 @@ const ProjectAlertsSettings = ({
user: IUser
setProjectAlertsTotal: (num: number) => void
total: number
-}) => {
+}): JSX.Element => {
const history = useHistory()
const { id, pid }: {
id: string
diff --git a/src/pages/Project/Alerts/View/ProjectAlertsView.container.jsx b/src/pages/Project/Alerts/View/ProjectAlertsView.container.tsx
similarity index 78%
rename from src/pages/Project/Alerts/View/ProjectAlertsView.container.jsx
rename to src/pages/Project/Alerts/View/ProjectAlertsView.container.tsx
index c3c417e7e..892c5b14f 100644
--- a/src/pages/Project/Alerts/View/ProjectAlertsView.container.jsx
+++ b/src/pages/Project/Alerts/View/ProjectAlertsView.container.tsx
@@ -1,8 +1,8 @@
import { connect } from 'react-redux'
-
+import { StateType } from 'redux/store'
import ProjectAlerts from './ProjectAlertsView'
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: StateType) => ({
alerts: state.ui.alerts.alerts,
loading: state.ui.alerts.loading,
user: state.auth.user,
diff --git a/src/pages/Project/Alerts/View/ProjectAlertsView.jsx b/src/pages/Project/Alerts/View/ProjectAlertsView.tsx
similarity index 85%
rename from src/pages/Project/Alerts/View/ProjectAlertsView.jsx
rename to src/pages/Project/Alerts/View/ProjectAlertsView.tsx
index 58ece219d..d6a8610f5 100644
--- a/src/pages/Project/Alerts/View/ProjectAlertsView.jsx
+++ b/src/pages/Project/Alerts/View/ProjectAlertsView.tsx
@@ -21,12 +21,24 @@ import routes from 'routes'
import Button from 'ui/Button'
import PaidFeature from 'modals/PaidFeature'
import { QUERY_METRIC, PLAN_LIMITS } from 'redux/constants'
+import { IAlerts } from 'redux/models/IAlerts'
+import { IUser } from 'redux/models/IUser'
const ProjectAlerts = ({
projectId, alerts, loading, user, total, authenticated,
-}) => {
- const { t, i18n: { language } } = useTranslation()
- const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)
+}: {
+ projectId: string,
+ alerts: IAlerts[],
+ loading: boolean,
+ user: IUser,
+ total: number,
+ authenticated: boolean,
+}): JSX.Element => {
+ const { t, i18n: { language } }: {
+ t: (key: string) => string,
+ i18n: { language: string },
+ } = useTranslation()
+ const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState<boolean>(false)
const history = useHistory()
const limits = PLAN_LIMITS[user?.planCode]
@@ -37,7 +49,9 @@ const ProjectAlerts = ({
return _filter(alerts, ({ pid }) => pid === projectId)
}, [projectId, alerts, loading])
- const queryMetricTMapping = useMemo(() => {
+ const queryMetricTMapping: {
+ [key: string]: string,
+ } = useMemo(() => {
const values = _values(QUERY_METRIC)
return _reduce(values, (prev, curr) => ({
@@ -73,12 +87,14 @@ const ProjectAlerts = ({
large
onClick={handleNewAlert}
>
- {isLimitReached ? (
- <CurrencyDollarIcon className='w-5 h-5 mr-1' />
- ) : (
- <FolderPlusIcon className='w-5 h-5 mr-1' />
- )}
- {t('alert.add')}
+ <>
+ {isLimitReached ? (
+ <CurrencyDollarIcon className='w-5 h-5 mr-1' />
+ ) : (
+ <FolderPlusIcon className='w-5 h-5 mr-1' />
+ )}
+ {t('alert.add')}
+ </>
</Button>
</>
)}
@@ -106,10 +122,12 @@ const ProjectAlerts = ({
secondary
large
>
- {isLimitReached && (
- <CurrencyDollarIcon className='w-5 h-5 mr-1' />
- )}
- {t('alert.add')}
+ <>
+ {isLimitReached && (
+ <CurrencyDollarIcon className='w-5 h-5 mr-1' />
+ )}
+ {t('alert.add')}
+ </>
</Button>
</div>
)}
@@ -161,8 +179,10 @@ const ProjectAlerts = ({
secondary
large
>
- <PencilSquareIcon className='w-4 h-4 mr-1' />
- {t('common.edit')}
+ <>
+ <PencilSquareIcon className='w-4 h-4 mr-1' />
+ {t('common.edit')}
+ </>
</Button>
</div>
diff --git a/src/pages/Project/Alerts/View/index.jsx b/src/pages/Project/Alerts/View/index.tsx
similarity index 100%
rename from src/pages/Project/Alerts/View/index.jsx
rename to src/pages/Project/Alerts/View/index.tsx