📈 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
Cpatcha Settings to ts
kruzhambus6a1dd2595b2c
diff --git a/src/pages/Captcha/Settings/CaptchaSettings.container.jsx b/src/pages/Captcha/Settings/CaptchaSettings.container.jsxdeleted file mode 100644index 21c6c0275..000000000--- a/src/pages/Captcha/Settings/CaptchaSettings.container.jsx+++ /dev/null@@ -1,45 +0,0 @@-import { connect } from 'react-redux'-import UIActions from 'redux/reducers/ui'-import { alertsActions } from 'redux/reducers/alerts'-import { errorsActions } from 'redux/reducers/errors'--import CaptchaSettings from './CaptchaSettings'--const mapStateToProps = (state) => ({- projects: state.ui.projects.captchaProjects,- analyticsProjects: state.ui.projects.projects,- isLoading: state.ui.projects.isLoadingCaptcha,- user: state.auth.user,-})--const mapDispatchToProps = (dispatch) => ({- updateProjectFailed: (message) => {- dispatch(errorsActions.updateProjectFailed(message))- },- createNewProjectFailed: (message) => {- dispatch(errorsActions.createNewProjectFailed(message))- },- newProject: (message) => {- dispatch(alertsActions.newProject(message))- },- projectDeleted: (message) => {- dispatch(alertsActions.projectDeleted(message))- },- deleteProjectFailed: (message) => {- dispatch(errorsActions.deleteProjectFailed(message))- },- loadProjects: () => {- UIActions.loadProjectsCaptcha()- },- removeProject: (pid) => {- dispatch(UIActions.removeCaptchProject(pid))- },- deleteProjectCache: (pid) => {- dispatch(UIActions.deleteCaptchaProjectCache(pid))- },- showError: (message) => {- dispatch(errorsActions.genericError(message))- },-})--export default connect(mapStateToProps, mapDispatchToProps)(CaptchaSettings)diff --git a/src/pages/Captcha/Settings/CaptchaSettings.container.tsx b/src/pages/Captcha/Settings/CaptchaSettings.container.tsxnew file mode 100644index 000000000..54b8edfb9--- /dev/null+++ b/src/pages/Captcha/Settings/CaptchaSettings.container.tsx@@ -0,0 +1,60 @@+import { connect } from 'react-redux'+import UIActions from 'redux/reducers/ui'+import sagaActions from 'redux/sagas/actions'+import { alertsActions } from 'redux/reducers/alerts'+import { errorsActions } from 'redux/reducers/errors'+import { StateType, AppDispatch } from 'redux/store'+import CaptchaSettings from './CaptchaSettings'++const mapStateToProps = (state: StateType) => ({+ projects: state.ui.projects.captchaProjects,+ analyticsProjects: state.ui.projects.projects,+ isLoading: state.ui.projects.isLoadingCaptcha,+ user: state.auth.user,+})++const mapDispatchToProps = (dispatch: AppDispatch) => ({+ updateProjectFailed: (message: string) => {+ dispatch(errorsActions.updateProjectFailed({+ message,+ }))+ },+ createNewProjectFailed: (message: string) => {+ dispatch(errorsActions.createNewProjectFailed({+ message,+ }))+ },+ newProject: (message: string) => {+ dispatch(alertsActions.generateAlerts({+ message,+ }))+ },+ projectDeleted: (message: string) => {+ dispatch(alertsActions.generateAlerts({+ message,+ }))+ },+ deleteProjectFailed: (message: string) => {+ dispatch(errorsActions.deleteProjectFailed({+ message,+ }))+ },+ loadProjects: () => {+ sagaActions.loadProjectsCaptcha()+ },+ removeProject: (pid: string) => {+ dispatch(UIActions.removeCaptchaProject(pid))+ },+ deleteProjectCache: (pid: string) => {+ dispatch(UIActions.deleteCaptchaProjectCache({+ pid,+ }))+ },+ showError: (message: string) => {+ dispatch(errorsActions.genericError({+ message,+ }))+ },+})++export default connect(mapStateToProps, mapDispatchToProps)(CaptchaSettings)diff --git a/src/pages/Captcha/Settings/CaptchaSettings.jsx b/src/pages/Captcha/Settings/CaptchaSettings.tsxsimilarity index 82%rename from src/pages/Captcha/Settings/CaptchaSettings.jsxrename to src/pages/Captcha/Settings/CaptchaSettings.tsxindex 964d94c3c..7ed724d9a 100644--- a/src/pages/Captcha/Settings/CaptchaSettings.jsx+++ b/src/pages/Captcha/Settings/CaptchaSettings.tsx@@ -16,6 +16,7 @@ import _keys from 'lodash/keys'import _map from 'lodash/map'import _filter from 'lodash/filter'import _includes from 'lodash/includes'+import _omit from 'lodash/omit'import PropTypes from 'prop-types'import { ExclamationTriangleIcon, TrashIcon, ClipboardDocumentIcon } from '@heroicons/react/24/outline'@@ -33,6 +34,8 @@ import Select from 'ui/Select'import { nanoid } from 'utils/random'import { trackCustom } from 'utils/analytics'import routes from 'routes'+import { ICaptchaProject, IProject } from 'redux/models/IProject'+import { IUser } from 'redux/models/IUser'const MAX_NAME_LENGTH = 50const MAX_ORIGINS_LENGTH = 300@@ -49,37 +52,72 @@ const tabForCreateCaptcha = [{const tabForNew = 'new'const tabForInheritance = 'inheritance'+// add to interface IProject new fields isCaptcha+interface IForm extends ICaptchaProject {+ isCaptcha?: boolean+ public?: boolean+ id: string+ name: string+ origins?: string+ ipBlacklist?: string+}+const CaptchaSettings = ({updateProjectFailed, createNewProjectFailed, newProject, projectDeleted, deleteProjectFailed,loadProjects, isLoading, projects, showError, removeProject, user,deleteProjectCache, analyticsProjects,-}) => {- const { t } = useTranslation('common')+}: {+ updateProjectFailed: (error: string) => void,+ createNewProjectFailed: (error: string) => void,+ newProject: (message: string) => void,+ projectDeleted: (message: string) => void,+ deleteProjectFailed: (error: string) => void,+ loadProjects: () => void,+ isLoading: boolean,+ projects: ICaptchaProject[],+ showError: (error: string) => void,+ removeProject: (pid: string) => void,+ user: IUser,+ deleteProjectCache: (pid: string) => void,+ analyticsProjects: IProject[],+}): JSX.Element => {+ const { t }: {+ t: (key: string, options?: {+ [key: string]: string | number | boolean | undefined+ }) => string,+ } = useTranslation('common')const { pathname } = useLocation()- const { id } = useParams()- const project = useMemo(() => _find([...projects, ...analyticsProjects], p => p.id === id) || {}, [projects, analyticsProjects, id])- const isSettings = !_isEmpty(id) && (_replace(routes.captcha_settings, ':id', id) === pathname)+ const { id }: {+ id: string,+ } = useParams()+ const project: ICaptchaProject | IProject = useMemo(() => _find([...projects, ...analyticsProjects], p => p.id === id) || {} as IProject | ICaptchaProject, [projects, analyticsProjects, id])+ const isSettings: boolean = !_isEmpty(id) && (_replace(routes.captcha_settings, ':id', id) === pathname)const history = useHistory()- const [form, setForm] = useState({+ const [form, setForm] = useState<IForm>({name: '',id: id || nanoid(),public: false,isCaptcha: true,})- const [validated, setValidated] = useState(false)- const [errors, setErrors] = useState({})- const [beenSubmitted, setBeenSubmitted] = useState(false)- const [showDelete, setShowDelete] = useState(false)- const [showReset, setShowReset] = useState(false)- const [projectDeleting, setProjectDeleting] = useState(false)- const [projectResetting, setProjectResetting] = useState(false)- const [projectSaving, setProjectSaving] = useState(false)- const [tab, setTab] = useState(tabForCreateCaptcha[0].name)+ const [validated, setValidated] = useState<boolean>(false)+ const [errors, setErrors] = useState<{+ name?: string,+ id?: string,+ origins?: string,+ ipBlacklist?: string+ }>({})+ const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)+ const [showDelete, setShowDelete] = useState<boolean>(false)+ const [showReset, setShowReset] = useState<boolean>(false)+ const [projectDeleting, setProjectDeleting] = useState<boolean>(false)+ const [projectResetting, setProjectResetting] = useState<boolean>(false)+ const [projectSaving, setProjectSaving] = useState<boolean>(false)+ const [tab, setTab] = useState<string>(tabForCreateCaptcha[0].name)const [reuseProjectId, setReuseProjectId] = useState()const [copied, setCopied] = useState(false)- const [captchaSecretKey, setCaptchaSecretKey] = useState(project.captchaSecretKey)+ const [captchaSecretKey, setCaptchaSecretKey] = useState(project?.captchaSecretKey)const [showRegenerateSecret, setShowRegenerateSecret] = useState(false)- const copyTimerRef = useRef(null)+ const copyTimerRef = useRef<HTMLDivElement>(null)useEffect(() => {if (!user.isActive && !isSelfhosted) {@@ -101,13 +139,13 @@ const CaptchaSettings = ({}}, [user, project, isLoading, isSettings, history, showError, projectDeleting, t])- const onSubmit = async (data) => {+ const onSubmit = async (data: IForm) => {if (!projectSaving) {setProjectSaving(true)try {- const formalisedData = {+ const formalisedData: IProject = {...data,- origins: _isEmpty(data.origins) ? null : _map(_split(data.origins, ','), (origin) => {+ origins: _isEmpty(data.origins) ? null : _map(_split(data.origins as string, ','), (origin) => {try {if (_includes(origin, 'localhost')) {return origin@@ -117,7 +155,7 @@ const CaptchaSettings = ({return origin}}),- ipBlacklist: _isEmpty(data.ipBlacklist) ? null : _split(data.ipBlacklist, ','),+ ipBlacklist: _isEmpty(data.ipBlacklist) ? null : _split(data.ipBlacklist as string, ','),}if (isSettings) {await updateProject(id, formalisedData)@@ -130,7 +168,10 @@ const CaptchaSettings = ({}await updateProject(formalisedData.id, formalisedData)} else {- await createProject(formalisedData)+ await createProject({+ id: formalisedData.id,+ name: formalisedData.name,+ })}trackCustom('PROJECT_CREATED')newProject(t('project.settings.created'))@@ -140,9 +181,9 @@ const CaptchaSettings = ({history.push(routes.dashboard)} catch (e) {if (isSettings) {- updateProjectFailed(e)+ updateProjectFailed(e as string)} else {- createNewProjectFailed(e)+ createNewProjectFailed(e as string)}} finally {setProjectSaving(false)@@ -160,7 +201,7 @@ const CaptchaSettings = ({projectDeleted(t('project.settings.deleted'))history.push(routes.dashboard)} catch (e) {- deleteProjectFailed(e)+ deleteProjectFailed(e as string)} finally {setProjectDeleting(false)}@@ -177,7 +218,7 @@ const CaptchaSettings = ({projectDeleted(t('project.settings.resetted'))history.push(routes.dashboard)} catch (e) {- deleteProjectFailed(e)+ deleteProjectFailed(e as string)} finally {setProjectResetting(false)}@@ -185,7 +226,11 @@ const CaptchaSettings = ({}const validate = () => {- const allErrors = {}+ const allErrors = {} as {+ name?: string,+ origins?: string,+ ipBlacklist?: string+ }if (_isEmpty(form.name) && tabForInheritance !== tab) {allErrors.name = t('project.settings.noNameError')@@ -212,7 +257,7 @@ const CaptchaSettings = ({validate()}, [form]) // eslint-disable-line- const handleInput = event => {+ const handleInput = (event: React.ChangeEvent<HTMLInputElement>) => {const { target } = eventconst value = target.type === 'checkbox' ? target.checked : target.value@@ -222,7 +267,7 @@ const CaptchaSettings = ({}))}- const handleSubmit = e => {+ const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {e.preventDefault()e.stopPropagation()setBeenSubmitted(true)@@ -234,7 +279,7 @@ const CaptchaSettings = ({showError('Select project or select corect project')}- onSubmit({ ...data, isCaptcha: true })+ onSubmit({ ...data as IForm, isCaptcha: true })return}@@ -254,14 +299,15 @@ const CaptchaSettings = ({const res = await reGenerateCaptchaSecretKey(id)setCaptchaSecretKey(res)} catch (e) {- showError(e)+ showError(e as string)}}- const setToClipboard = (value) => {+ const setToClipboard = (value: string) => {if (!copied) {navigator.clipboard.writeText(value)setCopied(true)+ // @ts-ignorecopyTimerRef.current = setTimeout(() => {setCopied(false)}, 2000)@@ -394,12 +440,14 @@ const CaptchaSettings = ({className='opacity-70 hover:opacity-100'noBorder>- <ClipboardDocumentIcon className='w-6 h-6' />- {copied && (+ <>+ <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>@@ -448,18 +496,20 @@ const CaptchaSettings = ({{t('common.save')}</Button></div>- {!project.shared && (- <div className='flex flex-wrap items-center justify-end'>- <Button onClick={() => !projectResetting && setShowReset(true)} loading={projectDeleting} semiDanger semiSmall>+ <div className='flex flex-wrap items-center justify-end'>+ <Button onClick={() => !projectResetting && setShowReset(true)} loading={projectDeleting} semiDanger semiSmall>+ <><TrashIcon className='w-5 h-5 mr-1' />{t('project.settings.reset')}- </Button>- <Button className='ml-2' onClick={() => !projectDeleting && setShowDelete(true)} loading={projectDeleting} danger semiSmall>+ </>+ </Button>+ <Button className='ml-2' onClick={() => !projectDeleting && setShowDelete(true)} loading={projectDeleting} danger semiSmall>+ <><ExclamationTriangleIcon className='w-5 h-5 mr-1' />{t('project.settings.delete')}- </Button>- </div>- )}+ </>+ </Button>+ </div></div><hr className='mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' /></>diff --git a/src/pages/Captcha/Settings/index.jsx b/src/pages/Captcha/Settings/index.tsxsimilarity index 100%rename from src/pages/Captcha/Settings/index.jsxrename to src/pages/Captcha/Settings/index.tsxdiff --git a/src/redux/models/IProject.ts b/src/redux/models/IProject.tsindex d3babe996..34543614a 100644--- a/src/redux/models/IProject.ts+++ b/src/redux/models/IProject.ts@@ -29,17 +29,17 @@ export interface IShareOwnerProject {export interface IProject {id: stringname: string- origins: string[]- ipBlacklist: string[] | null- active: boolean- public: boolean- isAnalyticsProject: boolean- isCaptchaProject: boolean- isCaptchaEnabled: boolean- captchaSecretKey: string | null- created: string- share: IShareOwnerProject[]- isOwner: boolean+ origins?: string[] | string | null+ ipBlacklist?: string[] | null | string+ active?: boolean+ public?: boolean+ isAnalyticsProject?: boolean+ isCaptchaProject?: boolean+ isCaptchaEnabled?: boolean+ captchaSecretKey?: string | null+ created?: string+ share?: IShareOwnerProject[]+ isOwner?: booleanoverall?: IOveralllive?: numberuiHidden?: boolean@@ -48,16 +48,17 @@ export interface IProject {export interface ICaptchaProject {id: stringname: string- origins: string[]- ipBlacklist: string[] | null- active: boolean- public: boolean- isAnalyticsProject: boolean- isCaptchaProject: boolean- isCaptchaEnabled: boolean- captchaSecretKey: string | null- created: string- isOwner: boolean- overall: IOverall- live: number+ origins?: string[] | string | null+ ipBlacklist?: string[] | null | string+ active?: boolean+ public?: boolean+ isAnalyticsProject?: boolean+ isCaptchaProject?: boolean+ isCaptchaEnabled?: boolean+ captchaSecretKey?: string | null+ created?: string+ isOwner?: boolean+ overall?: IOverall+ live?: number+ uiHidden?: boolean}diff --git a/src/redux/reducers/ui/cache.ts b/src/redux/reducers/ui/cache.tsindex 45291ec73..cb8f6b605 100644--- a/src/redux/reducers/ui/cache.ts+++ b/src/redux/reducers/ui/cache.ts@@ -68,9 +68,13 @@ const cacheSlice = createSlice({}state.analytics[pid] = _filter(state.analytics[pid], (ckey) => ckey !== key)},- deleteCaptchaProjectCache(state, { payload }: PayloadAction<{ pid: string, period: string, timeBucket: string }>) {+ deleteCaptchaProjectCache(state, { payload }: PayloadAction<{ pid: string, period?: string, timeBucket?: string }>) {const { pid, period, timeBucket } = payload- const key = getProjectCaptchaCacheKey(period, timeBucket)+ let key: string++ if (period && timeBucket) {+ key = getProjectCaptchaCacheKey(period, timeBucket)+ }if (_isEmpty(period) || _isEmpty(timeBucket)) {if (_isEmpty(pid)) {diff --git a/src/ui/Select.tsx b/src/ui/Select.tsxindex 9679c777a..d93788d8c 100644--- a/src/ui/Select.tsx+++ b/src/ui/Select.tsx@@ -8,7 +8,7 @@ import _map from 'lodash/map'const Select = ({title, label, className, items, labelExtractor, keyExtractor, iconExtractor, onSelect,}: {- title: string,+ title?: string,label: string,className?: string,items: any[],