📈 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
UserSettings to ts
kruzhambuse95828c0c405
diff --git a/src/pages/UserSettings/UserSettings.container.jsx b/src/pages/UserSettings/UserSettings.container.jsxdeleted file mode 100644index 650a5ff38..000000000--- a/src/pages/UserSettings/UserSettings.container.jsx+++ /dev/null@@ -1,93 +0,0 @@-import { connect } from 'react-redux'-import UIActions from 'redux/reducers/ui'-import { errorsActions } from 'redux/reducers/errors'-import { authActions } from 'redux/reducers/auth'-import { alertsActions } from 'redux/reducers/alerts'-import { trackCustom } from 'utils/analytics'--import UserSettings from './UserSettings'--const mapStateToProps = (state) => {- return {- user: state.auth.user,- dontRemember: state.auth.dontRemember,- isPaidTierUsed: state.auth.isPaidTierUsed,- // themeType: state.ui.theme.type,- }-}--const mapDispatchToProps = (dispatch) => ({- onGDPRExportFailed: (message) => {- dispatch(errorsActions.GDPRExportFailed(message))- },- onDelete: (t, onSuccess) => {- dispatch(- authActions.deleteAccountAsync(- (error) => dispatch(- errorsActions.deleteAccountFailed(error),- ),- () => {- trackCustom('ACCOUNT_DELETED')- onSuccess()- },- t,- ),- )- },- updateUserData: (data) => {- dispatch(authActions.updateUserData(data))- },- onDeleteProjectCache: () => {- dispatch(UIActions.deleteProjectCache())- },- userSharedUpdate: (message) => {- dispatch(alertsActions.userSharedUpdate(message))- },- sharedProjectError: (message) => {- dispatch(errorsActions.sharedProjectFailed(message))- },- genericError: (message) => {- dispatch(errorsActions.genericError(message))- },- removeProject: (projectId) => {- dispatch(UIActions.removeProject(projectId, true))- },- removeShareProject: (id) => {- dispatch(authActions.deleteShareProject(id))- },- setProjectsShareData: (data, id) => {- dispatch(UIActions.setProjectsShareData(data, id, true))- },- setUserShareData: (data, id) => {- dispatch(authActions.setUserShareData(data, id))- },- updateProfileFailed: (message) => {- dispatch(errorsActions.updateProfileFailed(message))- },- accountUpdated: (message) => {- dispatch(alertsActions.accountUpdated(message))- },- updateUserProfileAsync: (data, successMessage, callback = () => {}) => {- dispatch(- authActions.updateUserProfileAsync(- data,- (res) => {- if (res) {- dispatch(- alertsActions.accountUpdated(successMessage),- )- }- callback(res)- },- ),- )- },- setAPIKey: (apiKey) => {- dispatch(authActions.setApiKey(apiKey))- },- // setThemeType: (theme) => {- // dispatch(UIActions.setThemeType(theme))- // },-})--export default connect(mapStateToProps, mapDispatchToProps)(UserSettings)diff --git a/src/pages/UserSettings/UserSettings.container.tsx b/src/pages/UserSettings/UserSettings.container.tsxnew file mode 100644index 000000000..53c5ae818--- /dev/null+++ b/src/pages/UserSettings/UserSettings.container.tsx@@ -0,0 +1,125 @@+import { connect } from 'react-redux'+import UIActions from 'redux/reducers/ui'+import { errorsActions } from 'redux/reducers/errors'+import { authActions } from 'redux/reducers/auth'+import { alertsActions } from 'redux/reducers/alerts'+import { trackCustom } from 'utils/analytics'+import { StateType, AppDispatch } from 'redux/store'+import sagaActions from 'redux/sagas/actions'+import { IUser } from 'redux/models/IUser'+import { ISharedProject } from 'redux/models/ISharedProject'++import UserSettings from './UserSettings'++const mapStateToProps = (state: StateType) => {+ return {+ user: state.auth.user,+ dontRemember: state.auth.dontRemember,+ isPaidTierUsed: state.auth.isPaidTierUsed,+ // themeType: state.ui.theme.type,+ }+}++const mapDispatchToProps = (dispatch: AppDispatch) => ({+ onGDPRExportFailed: (message: string) => {+ dispatch(errorsActions.genericError({+ message,+ }))+ },+ onDelete: (t: (key: string) => string, onSuccess: {+ (): void,+ }) => {+ dispatch(+ sagaActions.deleteAccountAsync(+ (error: string) => dispatch(+ errorsActions.deleteAccountFailed({+ message: error,+ }),+ ),+ () => {+ trackCustom('ACCOUNT_DELETED')+ onSuccess()+ },+ t,+ ),+ )+ },+ updateUserData: (data: IUser) => {+ dispatch(authActions.updateUserData(data))+ },+ onDeleteProjectCache: () => {+ dispatch(UIActions.deleteProjectCache({}))+ },+ userSharedUpdate: (message: string) => {+ dispatch(alertsActions.userSharedUpdate({+ message,+ }))+ },+ sharedProjectError: (message: string) => {+ dispatch(errorsActions.sharedProjectFailed({+ message,+ }))+ },+ genericError: (message: string) => {+ dispatch(errorsActions.genericError({+ message,+ }))+ },+ removeProject: (projectId: string) => {+ dispatch(UIActions.removeProject({+ pid: projectId,+ shared: true,+ }))+ },+ removeShareProject: (id: string) => {+ dispatch(authActions.deleteShareProject(id))+ },+ setProjectsShareData: (data: Partial<ISharedProject>, id: string) => {+ dispatch(UIActions.setProjectsShareData({+ data,+ id,+ shared: true,+ }))+ },+ setUserShareData: (data: Partial<ISharedProject>, id: string) => {+ dispatch(authActions.setUserShareData({+ data,+ id,+ }))+ },+ updateProfileFailed: (message: string) => {+ dispatch(errorsActions.updateUserProfileFailed({+ message,+ }))+ },+ accountUpdated: (message: string) => {+ dispatch(alertsActions.accountUpdated({+ message,+ }))+ },+ updateUserProfileAsync: (data: Partial<IUser>, successMessage: string, callback = (e: any) => {}) => {+ dispatch(+ sagaActions.updateUserProfileAsync(+ data,+ (res: any) => {+ if (res) {+ dispatch(+ alertsActions.accountUpdated({+ message: successMessage,+ }),+ )+ }+ callback(res)+ },+ ),+ )+ },+ setAPIKey: (apiKey: string) => {+ dispatch(authActions.setApiKey(apiKey))+ },+ // setThemeType: (theme) => {+ // dispatch(UIActions.setThemeType(theme))+ // },+})++export default connect(mapStateToProps, mapDispatchToProps)(UserSettings)diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.tsxsimilarity index 83%rename from src/pages/UserSettings/UserSettings.jsxrename to src/pages/UserSettings/UserSettings.tsxindex c458009ed..200c5d43d 100644--- a/src/pages/UserSettings/UserSettings.jsx+++ b/src/pages/UserSettings/UserSettings.tsx@@ -21,6 +21,8 @@ import {reportFrequencies, DEFAULT_TIMEZONE, WEEKLY_REPORT_FREQUENCY, CONFIRMATION_TIMEOUT,GDPR_REQUEST, GDPR_EXPORT_TIMEFRAME, TimeFormat,} from 'redux/constants'+import { IUser } from 'redux/models/IUser'+import { ISharedProject } from 'redux/models/ISharedProject'import Title from 'components/Title'import { withAuthentication, auth } from 'hoc/protected'import Input from 'ui/Input'@@ -46,40 +48,78 @@ dayjs.extend(utc)const timeFormatArray = _map(TimeFormat, (key) => key)+interface IProps {+ onDelete: (t: (key: string) => string, callback: () => void) => void,+ onDeleteProjectCache: () => void,+ removeProject: (id: string) => void,+ removeShareProject: (id: string) => void,+ setUserShareData: (data: Partial<ISharedProject>, id: string) => void,+ setProjectsShareData: (data: Partial<ISharedProject>, id: string) => void,+ userSharedUpdate: (message: string) => void,+ sharedProjectError: (message: string) => void,+ updateUserData: (data: Partial<IUser>) => void,+ genericError: (message: string) => void,+ onGDPRExportFailed: (message: string) => void,+ updateProfileFailed: (message: string) => void,+ updateUserProfileAsync: (data: IUser, onSuccess: () => void, onError: () => void) => void,+ accountUpdated: (t: string) => void,+ setAPIKey: (key: string | null) => void,+ user: IUser,+ dontRemember: boolean,+ isPaidTierUsed: boolean,+}++interface IForm extends Partial<IUser> {+ repeat: string,+ password: string,+ email: string+}+const UserSettings = ({onDelete, onDeleteProjectCache, removeProject, removeShareProject, setUserShareData,setProjectsShareData, userSharedUpdate, sharedProjectError, updateUserData,genericError, onGDPRExportFailed, updateProfileFailed, updateUserProfileAsync,accountUpdated, setAPIKey, user, dontRemember, isPaidTierUsed, // setThemeType, themeType,-}) => {+}: IProps): JSX.Element => {const history = useHistory()- const { t, i18n: { language } } = useTranslation('common')-- const [form, setForm] = useState({+ const { t, i18n: { language } }: {+ t: (key: string, options?: {+ [key: string]: string | number | null,+ }) => string,+ i18n: {+ language: string,+ },+ } = useTranslation('common')++ const [form, setForm] = useState<IForm>({email: user.email || '',password: '',repeat: '',timeFormat: user.timeFormat || TimeFormat['12-hour'],})- const [timezone, setTimezone] = useState(user.timezone || DEFAULT_TIMEZONE)- const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)- const [timezoneChanged, setTimezoneChanged] = useState(false)- const [reportFrequency, setReportFrequency] = useState(user.reportFrequency)- const [validated, setValidated] = useState(false)- const [errors, setErrors] = useState({})- const [beenSubmitted, setBeenSubmitted] = useState(false)- const [showModal, setShowModal] = useState(false)- const [showAPIDeleteModal, setShowAPIDeleteModal] = useState(false)- const [showExportModal, setShowExportModal] = useState(false)- const [error, setError] = useState(null)- const [copied, setCopied] = useState(false)- const translatedFrequencies = _map(reportFrequencies, (key) => t(`profileSettings.${key}`)) // useMemo(_map(reportFrequencies, (key) => t(`profileSettings.${key}`)), [t])- const translatedTimeFormat = _map(TimeFormat, (key) => t(`profileSettings.${key}`)) // useMemo(_map(TimeFormat, (key) => t(`profileSettings.${key}`)), [t])+ const [timezone, setTimezone] = useState<string>(user.timezone || DEFAULT_TIMEZONE)+ const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState<boolean>(false)+ const [timezoneChanged, setTimezoneChanged] = useState<boolean>(false)+ const [reportFrequency, setReportFrequency] = useState<string>(user.reportFrequency)+ const [validated, setValidated] = useState<boolean>(false)+ const [errors, setErrors] = useState<{+ [key: string]: string,+ }>({})+ const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)+ const [showModal, setShowModal] = useState<boolean>(false)+ const [showAPIDeleteModal, setShowAPIDeleteModal] = useState<boolean>(false)+ const [showExportModal, setShowExportModal] = useState<boolean>(false)+ const [error, setError] = useState<null | string>(null)+ const [copied, setCopied] = useState<boolean>(false)+ const translatedFrequencies: string[] = _map(reportFrequencies, (key) => t(`profileSettings.${key}`)) // useMemo(_map(reportFrequencies, (key) => t(`profileSettings.${key}`)), [t])+ const translatedTimeFormat: string[] = _map(TimeFormat, (key) => t(`profileSettings.${key}`)) // useMemo(_map(TimeFormat, (key) => t(`profileSettings.${key}`)), [t])const copyTimerRef = useRef(null)const validate = () => {- const allErrors = {}+ const allErrors = {} as {+ [key: string]: string,+ }if (!isValidEmail(form.email)) {allErrors.email = t('auth.common.badEmailError')@@ -99,7 +139,7 @@ const UserSettings = ({setValidated(valid)}- const onSubmit = (data, callback = () => { }) => {+ const onSubmit = (data: any, callback = () => { }) => {delete data.repeat// eslint-disable-next-line no-restricted-syntaxfor (const key in data) {@@ -108,7 +148,7 @@ const UserSettings = ({}}- updateUserProfileAsync(data, t('profileSettings.updated'), callback)+ updateUserProfileAsync(data, () => t('profileSettings.updated'), callback)}useEffect(() => {@@ -117,16 +157,17 @@ const UserSettings = ({useEffect(() => {return () => {+ // @ts-ignoreclearTimeout(copyTimerRef.current)}}, [])- const _setTimezone = (value) => {+ const _setTimezone = (value: string) => {setTimezoneChanged(true)setTimezone(value)}- const handleInput = event => {+ const handleInput = (event: React.ChangeEvent<HTMLInputElement>) => {const { target } = eventconst value = target.type === 'checkbox' ? target.checked : target.value@@ -136,7 +177,7 @@ const UserSettings = ({}))}- const handleSubmit = e => {+ const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {e.preventDefault()e.stopPropagation()setBeenSubmitted(true)@@ -162,7 +203,7 @@ const UserSettings = ({}}- const handleIntegrationSave = (data, callback = () => {}) => {+ const handleIntegrationSave = (data: any, callback = () => {}) => {setBeenSubmitted(true)if (validated) {@@ -184,7 +225,7 @@ const UserSettings = ({}}- const _setReportFrequency = (value) => {+ const _setReportFrequency = (value: string) => {if (!isPaidTierUsed && value === WEEKLY_REPORT_FREQUENCY) {setIsPaidFeatureOpened(true)return@@ -193,7 +234,7 @@ const UserSettings = ({setReportFrequency(value)}- const reportIconExtractor = (_, index) => {+ const reportIconExtractor = (_: any, index: number) => {if (!isPaidTierUsed && reportFrequencies[index] === WEEKLY_REPORT_FREQUENCY) {return (<CurrencyDollarIcon className='w-5 h-5 mr-1' />@@ -203,10 +244,11 @@ const UserSettings = ({return null}- const setToClipboard = (value) => {+ const setToClipboard = (value: string) => {if (!copied) {navigator.clipboard.writeText(value)setCopied(true)+ // @ts-ignorecopyTimerRef.current = setTimeout(() => {setCopied(false)}, 2000)@@ -219,7 +261,7 @@ const UserSettings = ({})}- const onExport = async (exportedAt) => {+ const onExport = async (exportedAt: string) => {try {if (getCookie(GDPR_REQUEST) || (!_isNull(exportedAt) && !dayjs().isAfter(dayjs.utc(exportedAt).add(GDPR_EXPORT_TIMEFRAME, 'day'), 'day'))) {onGDPRExportFailed(t('profileSettings.tryAgainInXDays', { amount: GDPR_EXPORT_TIMEFRAME }))@@ -231,11 +273,11 @@ const UserSettings = ({accountUpdated(t('profileSettings.reportSent'))setCookie(GDPR_REQUEST, true, 1209600) // setting cookie for 14 days} catch (e) {- updateProfileFailed(e)+ updateProfileFailed(e as string)}}- const onEmailConfirm = async (errorCallback) => {+ const onEmailConfirm = async (errorCallback: any) => {if (getCookie(CONFIRMATION_TIMEOUT)) {updateProfileFailed(t('profileSettings.confTimeout'))return@@ -251,7 +293,7 @@ const UserSettings = ({errorCallback(t('profileSettings.noConfLeft'))}} catch (e) {- updateProfileFailed(e)+ updateProfileFailed(e as string)}}@@ -260,7 +302,7 @@ const UserSettings = ({const res = await generateApiKey()setAPIKey(res.apiKey)} catch (e) {- updateProfileFailed(e)+ updateProfileFailed(e as string)}}@@ -269,7 +311,7 @@ const UserSettings = ({await deleteApiKey()setAPIKey(null)} catch (e) {- updateProfileFailed(e)+ updateProfileFailed(e as string)}}@@ -455,16 +497,18 @@ const UserSettings = ({<div className='group relative'><Buttontype='button'- onClick={() => setToClipboard(user.apiKey)}+ onClick={() => setToClipboard(user.apiKey || '')}className='opacity-70 hover:opacity-100'noBorder>- <ClipboardDocumentIcon className='w-6 h-6' />- {copied && (- <div className='animate-appear bg-white dark:bg-gray-700 cursor-auto rounded p-1 absolute sm:top-0 top-0.5 right-8 text-xs text-green-600'>- {t('common.copied')}- </div>- )}+ <>+ <ClipboardDocumentIcon className='w-6 h-6' />+ {copied && (+ <div className='animate-appear bg-white dark:bg-gray-700 cursor-auto rounded p-1 absolute sm:top-0 top-0.5 right-8 text-xs text-green-600'>+ {t('common.copied')}+ </div>+ )}+ </></Button></div></div>@@ -537,8 +581,6 @@ const UserSettings = ({<ProjectListkey={item.id}item={item}- language={language}- t={t}removeProject={removeProject}removeShareProject={removeShareProject}setUserShareData={setUserShareData}@@ -560,7 +602,6 @@ const UserSettings = ({<hr className='mt-5 border-gray-200 dark:border-gray-600' />{!user.isActive && (<div- href='#'className='flex cursor-pointer mt-4 pl-0 underline text-blue-600 hover:text-indigo-800 dark:hover:text-indigo-600'onClick={() => onEmailConfirm(setError)}>@@ -570,12 +611,16 @@ const UserSettings = ({)}<div className='flex justify-between mt-4'><Button onClick={() => setShowExportModal(true)} semiSmall primary>- <ArrowDownTrayIcon className='w-5 h-5 mr-1' />- {t('profileSettings.requestExport')}+ <>+ <ArrowDownTrayIcon className='w-5 h-5 mr-1' />+ {t('profileSettings.requestExport')}+ </></Button><Button className='ml-3' onClick={() => setShowModal(true)} semiSmall danger>- <ExclamationTriangleIcon className='w-5 h-5 mr-1' />- {t('profileSettings.delete')}+ <>+ <ExclamationTriangleIcon className='w-5 h-5 mr-1' />+ {t('profileSettings.delete')}+ </></Button></div></form>@@ -624,7 +669,7 @@ const UserSettings = ({/><ModalonClose={() => {- setError('')+ setError(null)}}closeText={t('common.gotIt')}type='error'diff --git a/src/pages/UserSettings/index.jsx b/src/pages/UserSettings/index.tsxsimilarity index 100%rename from src/pages/UserSettings/index.jsxrename to src/pages/UserSettings/index.tsxdiff --git a/src/redux/reducers/auth.ts b/src/redux/reducers/auth.tsindex 9662311ae..f325985cd 100644--- a/src/redux/reducers/auth.ts+++ b/src/redux/reducers/auth.ts@@ -67,7 +67,7 @@ const authSlice = createSlice({const projects = _filter(state.user?.sharedProjects, (item) => item.id !== payload)state.user = { ...state.user, sharedProjects: projects }},- setUserShareData: (state, { payload }: PayloadAction<{ data: ISharedProject, id: string }>) => {+ setUserShareData: (state, { payload }: PayloadAction<{ data: Partial<ISharedProject>, id: string }>) => {const projects = _map(state.user?.sharedProjects, (item) => {if (item.id === payload.id) {return { ...item, ...payload.data }diff --git a/src/redux/reducers/ui/cache.ts b/src/redux/reducers/ui/cache.tsindex 8bd52a0f1..aa087f244 100644--- a/src/redux/reducers/ui/cache.ts+++ b/src/redux/reducers/ui/cache.ts@@ -56,9 +56,13 @@ const cacheSlice = createSlice({setCaptchaProjectCache(state, { payload }: PayloadAction<{ pid: string, key: string, data: any }>) {state.captchaAnalytics[payload.pid][payload.key] = payload.data},- deleteProjectCache(state, { payload }: PayloadAction<{ pid: string, period: string, timeBucket: string }>) {+ deleteProjectCache(state, { payload }: PayloadAction<{ pid?: string, period?: string, timeBucket?: string }>) {const { pid, period, timeBucket } = payload- const key = getProjectCacheKey(period, timeBucket)+ let key: string++ if (period && timeBucket) {+ key = getProjectCacheKey(period, timeBucket)+ }if (_isEmpty(period) || _isEmpty(timeBucket)) {if (_isEmpty(pid)) {@@ -66,7 +70,9 @@ const cacheSlice = createSlice({}state.analytics = _filter(state.analytics, (project) => project !== pid)}- state.analytics[pid] = _filter(state.analytics[pid], (ckey) => ckey !== key)+ if (pid) {+ state.analytics[pid] = _filter(state.analytics[pid], (ckey) => ckey !== key)+ }},deleteCaptchaProjectCache(state, { payload }: PayloadAction<{ pid: string, period?: string, timeBucket?: string }>) {const { pid, period, timeBucket } = payloaddiff --git a/src/redux/reducers/ui/projects.ts b/src/redux/reducers/ui/projects.tsindex 527208ae0..350df4422 100644--- a/src/redux/reducers/ui/projects.ts+++ b/src/redux/reducers/ui/projects.ts@@ -167,7 +167,7 @@ const projectsSlice = createSlice({]}},- setProjectsShareData(state, { payload }: PayloadAction<{ data: IProject | ISharedProject, id: string, shared?: boolean }>) {+ setProjectsShareData(state, { payload }: PayloadAction<{ data: Partial<IProject> | Partial<ISharedProject>, id: string, shared?: boolean }>) {const { data, id, shared = false } = payloadif (shared) {diff --git a/src/redux/sagas/actions/index.ts b/src/redux/sagas/actions/index.tsindex 693ebaeaa..ad0940d59 100644--- a/src/redux/sagas/actions/index.ts+++ b/src/redux/sagas/actions/index.ts@@ -58,12 +58,12 @@ const emailVerifyAsync = (data: {payload: { data, successfulCallback, errorCallback },})-const updateUserProfileAsync = (data: IUser, callback = () => { }) => ({+const updateUserProfileAsync = (data: Partial<IUser>, callback = (item: any) => {}) => ({type: types.UPDATE_USER_PROFILE_ASYNC,payload: { data, callback },})-const deleteAccountAsync = (errorCallback?: (e: string) => {}, successCallback?: (str: string) => {}, t?: (str: string) => {}) => {+const deleteAccountAsync = (errorCallback?: (e: string) => {}, successCallback?: (str?: string) => void, t?: (str: string) => {}) => {const refreshToken = getRefreshToken()logoutApi(refreshToken)diff --git a/src/ui/Select.tsx b/src/ui/Select.tsxindex d93788d8c..1f64f158b 100644--- a/src/ui/Select.tsx+++ b/src/ui/Select.tsx@@ -14,7 +14,7 @@ const Select = ({items: any[],labelExtractor?: (item: any, index: number) => string,keyExtractor?: (item: any, index: number) => string,- iconExtractor?: (item: any, index: number) => JSX.Element,+ iconExtractor?: (item: any, index: number) => JSX.Element | null,onSelect: (item: any) => void,}): JSX.Element => (// @ts-ignorediff --git a/src/utils/cookie.ts b/src/utils/cookie.tsindex 25b3e4038..7db8f1b7f 100644--- a/src/utils/cookie.ts+++ b/src/utils/cookie.ts@@ -14,7 +14,7 @@ export const getCookie = (key: string) => {return null}-export const setCookie = (key: string, value: string | number, maxAge = 3600, sameSite = 'strict') => {+export const setCookie = (key: string, value: string | number | boolean, maxAge = 3600, sameSite = 'strict') => {document.cookie = `${key}=${value}; max-age=${maxAge}; path=/; SameSite=${sameSite}${COOKIE_SUFFIX}`}