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!

UserSettings components to ts

kruzhambus09418a87646e
diff --git a/src/pages/UserSettings/components/Integrations.jsx b/src/pages/UserSettings/components/Integrations.tsx
similarity index 84%
rename from src/pages/UserSettings/components/Integrations.jsx
rename to src/pages/UserSettings/components/Integrations.tsx
index 43d5a75bc..35464bb55 100644
--- a/src/pages/UserSettings/components/Integrations.jsx
+++ b/src/pages/UserSettings/components/Integrations.tsx
@@ -10,8 +10,14 @@ import Input from 'ui/Input'
import Button from 'ui/Button'
import Telegram from 'ui/icons/Telegram'
import { removeTgIntegration } from 'api'
-
-const getAvailableIntegrations = t => ([
+import { IUser } from 'redux/models/IUser'
+
+const getAvailableIntegrations = (t: (key: string) => string): {
+ name: string,
+ key: string,
+ description: string,
+ Icon: React.FC<React.SVGProps<SVGSVGElement>>,
+}[] => ([
{
name: 'Telegram',
key: 'telegram',
@@ -20,24 +26,31 @@ const getAvailableIntegrations = t => ([
},
])
-const TG_BOT_URL = 'https://t.me/swetrixbot'
-const TG_BOT_USERNAME = '@swetrixbot'
+const TG_BOT_URL: string = 'https://t.me/swetrixbot'
+const TG_BOT_USERNAME: string = '@swetrixbot'
const Integrations = ({
user, updateUserData, handleIntegrationSave, genericError,
+}: {
+ user: IUser,
+ updateUserData: (data: Partial<IUser>) => void,
+ handleIntegrationSave: (data: Partial<IUser>, cb: () => void) => void,
+ genericError: (message: string) => void,
}) => {
- const { t } = useTranslation('common')
+ const { t }: {
+ t: (key: string) => string,
+ } = useTranslation('common')
const available = getAvailableIntegrations(t)
- const [integrationConfigurating, setIntegrationConfigurating] = useState(null)
- const [tgChatId, setTgChatId] = useState(null)
- const [isIntegrationLoading, setIsIntegrationLoading] = useState(false)
- const [isRemovalLoading, setIsRemovalLoading] = useState(false)
+ const [integrationConfigurating, setIntegrationConfigurating] = useState<string | null>(null)
+ const [tgChatId, setTgChatId] = useState<string | null>(null)
+ const [isIntegrationLoading, setIsIntegrationLoading] = useState<boolean>(false)
+ const [isRemovalLoading, setIsRemovalLoading] = useState<boolean>(false)
- const setupIntegration = (key) => () => {
+ const setupIntegration = (key: string) => () => {
setIntegrationConfigurating(key)
}
- const addIntegration = (key) => () => {
+ const addIntegration = (key: string) => () => {
if (isIntegrationLoading) {
return
}
@@ -53,7 +66,7 @@ const Integrations = ({
}
}
- const getIntegrationStatus = (key) => {
+ const getIntegrationStatus = (key: string) => {
if (key === 'telegram') {
return {
connected: user.telegramChatId,
@@ -65,7 +78,7 @@ const Integrations = ({
return {}
}
- const removeIntegration = async (key) => {
+ const removeIntegration = async (key: string) => {
if (isRemovalLoading) {
return
}
@@ -74,7 +87,11 @@ const Integrations = ({
setIsRemovalLoading(true)
try {
- await removeTgIntegration(user.telegramChatId)
+ if (user.telegramChatId) {
+ await removeTgIntegration(user.telegramChatId)
+ } else {
+ throw new Error('No chat ID')
+ }
updateUserData({
isTelegramChatIdConfirmed: false,
telegramChatId: null,
@@ -105,6 +122,7 @@ const Integrations = ({
</Button>
<p className='text-base max-w-prose text-gray-900 dark:text-gray-50'>
<Trans
+ // @ts-ignore
t={t}
i18nKey='profileSettings.integrationsList.tgHint'
components={{
@@ -120,7 +138,7 @@ const Integrations = ({
<Input
type='text'
label={t('profileSettings.chatID')}
- value={tgChatId}
+ value={tgChatId || ''}
placeholder={t('profileSettings.chatID')}
className='sm:col-span-3'
onChange={(e) => setTgChatId(e.target.value)}
diff --git a/src/pages/UserSettings/components/NoSharedProjects.jsx b/src/pages/UserSettings/components/NoSharedProjects.tsx
similarity index 79%
rename from src/pages/UserSettings/components/NoSharedProjects.jsx
rename to src/pages/UserSettings/components/NoSharedProjects.tsx
index cf72e6711..f04daf5ef 100644
--- a/src/pages/UserSettings/components/NoSharedProjects.jsx
+++ b/src/pages/UserSettings/components/NoSharedProjects.tsx
@@ -1,6 +1,8 @@
import React from 'react'
-const NoSharedProjects = ({ t }) => (
+const NoSharedProjects = ({ t }: {
+ t: (key: string) => string,
+}): JSX.Element => (
<div className='flex flex-col py-6 sm:px-6 lg:px-8'>
<div className='max-w-7xl w-full mx-auto text-gray-900 dark:text-gray-50'>
<h2 className='text-2xl mb-4 text-center leading-snug'>
diff --git a/src/pages/UserSettings/components/ProjectList.jsx b/src/pages/UserSettings/components/ProjectList.tsx
similarity index 81%
rename from src/pages/UserSettings/components/ProjectList.jsx
rename to src/pages/UserSettings/components/ProjectList.tsx
index 5a1bb6ff5..b87fbd9e4 100644
--- a/src/pages/UserSettings/components/ProjectList.jsx
+++ b/src/pages/UserSettings/components/ProjectList.tsx
@@ -8,19 +8,35 @@ import Modal from 'ui/Modal'
import {
deleteShareProject, acceptShareProject,
} from 'api'
+import { ISharedProject } from 'redux/models/ISharedProject'
const ProjectList = ({
item, removeShareProject, removeProject, setProjectsShareData, setUserShareData,
userSharedUpdate, sharedProjectError,
+}: {
+ item: ISharedProject,
+ removeShareProject: (id: string) => void,
+ removeProject: (id: string) => void,
+ setProjectsShareData: (data: Partial<ISharedProject>, id: string, shared?: boolean) => void,
+ setUserShareData: (data: Partial<ISharedProject>, id: string) => void,
+ userSharedUpdate: (message: string) => void,
+ sharedProjectError: (message: string) => void,
}) => {
- const { t, i18n: { language } } = useTranslation('common')
+ const { t, i18n: { language } }: {
+ t: (key: string, options?: {
+ [key: string]: string | number,
+ }) => string,
+ i18n: {
+ language: string,
+ },
+ } = useTranslation('common')
- const [showDeleteModal, setShowDeleteModal] = useState(false)
+ const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false)
const {
created, confirmed, id, role, project,
} = item
- const deleteProject = async (pid) => {
+ const deleteProject = async (pid: string) => {
try {
await deleteShareProject(pid)
removeShareProject(pid)
diff --git a/src/pages/UserSettings/components/TwoFA.jsx b/src/pages/UserSettings/components/TwoFA.tsx
similarity index 83%
rename from src/pages/UserSettings/components/TwoFA.jsx
rename to src/pages/UserSettings/components/TwoFA.tsx
index 6cae1d077..a1873c4b4 100644
--- a/src/pages/UserSettings/components/TwoFA.jsx
+++ b/src/pages/UserSettings/components/TwoFA.tsx
@@ -12,21 +12,34 @@ import {
} from 'api'
import { setAccessToken } from 'utils/accessToken'
import { setRefreshToken } from 'utils/refreshToken'
+import { IUser } from 'redux/models/IUser'
const TwoFA = ({
user, dontRemember, updateUserData, genericError,
+}: {
+ user: IUser,
+ dontRemember: boolean,
+ updateUserData: (data: Partial<IUser>) => void,
+ genericError: (message: string) => void,
}) => {
- const { t } = useTranslation('common')
- const [twoFAConfigurating, setTwoFAConfigurating] = useState(false)
- const [twoFADisabling, setTwoFADisabling] = useState(false)
- const [twoFAConfigData, setTwoFAConfigData] = useState({}) // { secret, otpauthUrl }
- const [isTwoFaLoading, setIsTwoFaLoading] = useState(false)
+ const { t }: {
+ t: (key: string, options?: {
+ [key: string]: string | number,
+ }) => string,
+ } = useTranslation('common')
+ const [twoFAConfigurating, setTwoFAConfigurating] = useState<boolean>(false)
+ const [twoFADisabling, setTwoFADisabling] = useState<boolean>(false)
+ const [twoFAConfigData, setTwoFAConfigData] = useState<{
+ secret?: string,
+ otpauthUrl?: string,
+ }>({}) // { secret, otpauthUrl }
+ const [isTwoFaLoading, setIsTwoFaLoading] = useState<boolean>(false)
const [twoFACode, setTwoFACode] = useState('')
- const [twoFACodeError, setTwoFACodeError] = useState(null)
- const [twoFARecovery, setTwoFARecovery] = useState(null)
+ const [twoFACodeError, setTwoFACodeError] = useState<string | null>(null)
+ const [twoFARecovery, setTwoFARecovery] = useState<string | null>(null)
const { isTwoFactorAuthenticationEnabled } = user
- const handle2FAInput = (event) => {
+ const handle2FAInput = (event: React.ChangeEvent<HTMLInputElement>) => {
const { target: { value } } = event
setTwoFACode(value)
setTwoFACodeError(null)
@@ -96,7 +109,7 @@ const TwoFA = ({
}
}
- const callFnOnKeyPress = (fn, key = 'Enter') => (e) => {
+ const callFnOnKeyPress = (fn: (e: any) => void, key = 'Enter') => (e: any) => {
e.stopPropagation()
if (e.key === key) {
fn(e)
@@ -177,10 +190,10 @@ const TwoFA = ({
{t('profileSettings.2faDesc')}
</p>
<div className='mt-4 p-4 bg-white w-max'>
- <QRCode value={twoFAConfigData.otpauthUrl} />
+ <QRCode value={twoFAConfigData?.otpauthUrl || ''} />
</div>
<p className='text-base whitespace-pre-line mt-2 text-gray-900 dark:text-gray-50'>
- {t('profileSettings.2faQRAlt', { key: twoFAConfigData.secret })}
+ {t('profileSettings.2faQRAlt', { key: twoFAConfigData?.secret || '' })}
</p>
<div className='flex items-center mt-4'>
<Input
diff --git a/src/redux/models/ISharedProject.ts b/src/redux/models/ISharedProject.ts
index 1a9e9eaf2..5d175f751 100644
--- a/src/redux/models/ISharedProject.ts
+++ b/src/redux/models/ISharedProject.ts
@@ -1,11 +1,11 @@
import { IProject } from './IProject'
export interface ISharedProject {
- id?: string
- confirmed?: boolean
- role?: string
- created?: string
- updated?: string
- project?: IProject
- uiHidden?: boolean
+ id: string
+ confirmed: boolean
+ role: string
+ created: string
+ updated: string
+ project: IProject
+ uiHidden: boolean
}
diff --git a/src/redux/models/IUser.ts b/src/redux/models/IUser.ts
index 8d0bf7624..77c65f80b 100644
--- a/src/redux/models/IUser.ts
+++ b/src/redux/models/IUser.ts
@@ -25,7 +25,7 @@ export interface IUser {
nextBillDate: string | null
cancellationEffectiveDate: string | null
apiKey: string | null
- telegramChatId: string
+ telegramChatId: string | null
isTelegramChatIdConfirmed: boolean
timeFormat: string
sharedProjects: ISharedProject[]