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!

fix: create captcha if you have more than 10 projects

kruzhambusb15822bc3484
diff --git a/src/api/index.ts b/src/api/index.ts
index 0068f7634..dda9a8441 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -14,7 +14,7 @@ import { getRefreshToken, removeRefreshToken } from 'utils/refreshToken'
import { DEFAULT_ALERTS_TAKE, isSelfhosted } from 'redux/constants'
import { IUser } from 'redux/models/IUser'
import { IAuth } from 'redux/models/IAuth'
-import { IProject, IOverall } from 'redux/models/IProject'
+import { IProject, IOverall, IProjectNames } from 'redux/models/IProject'
import { IAlerts } from 'redux/models/IAlerts'
import { ISharedProject } from 'redux/models/ISharedProject'
import { ISubscribers } from 'redux/models/ISubscribers'
@@ -865,3 +865,14 @@ export const processSSOToken = (token: string, hash: string) =>
? error.response.data
: error.response.data.message
})
+
+export const getProjectsNames = () =>
+ api
+ .get('project/names')
+ .then((response): IProjectNames[] => response.data)
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message)
+ ? error.response.data
+ : error.response.data.message
+ })
diff --git a/src/pages/Captcha/Settings/CaptchaSettings.tsx b/src/pages/Captcha/Settings/CaptchaSettings.tsx
index 2f595f158..856ab564d 100644
--- a/src/pages/Captcha/Settings/CaptchaSettings.tsx
+++ b/src/pages/Captcha/Settings/CaptchaSettings.tsx
@@ -23,7 +23,7 @@ import Title from 'components/Title'
import { withAuthentication, auth } from 'hoc/protected'
import { isSelfhosted } from 'redux/constants'
import {
- createProject, updateProject, deleteCaptchaProject, resetCaptchaProject, reGenerateCaptchaSecretKey,
+ createProject, updateProject, deleteCaptchaProject, resetCaptchaProject, reGenerateCaptchaSecretKey, getProjectsNames,
} from 'api'
import Input from 'ui/Input'
import Button from 'ui/Button'
@@ -33,7 +33,7 @@ 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 { ICaptchaProject, IProject, IProjectNames } from 'redux/models/IProject'
import { IUser } from 'redux/models/IUser'
const MAX_NAME_LENGTH = 50
@@ -112,6 +112,7 @@ const CaptchaSettings = ({
const [projectSaving, setProjectSaving] = useState<boolean>(false)
const [tab, setTab] = useState<string>(tabForCreateCaptcha[0].name)
const [reuseProjectId, setReuseProjectId] = useState()
+ const [allProjectsNames, setAllProjectsNames] = useState<IProjectNames[]>([])
const [copied, setCopied] = useState(false)
const [captchaSecretKey, setCaptchaSecretKey] = useState(project?.captchaSecretKey)
const [showRegenerateSecret, setShowRegenerateSecret] = useState(false)
@@ -272,7 +273,7 @@ const CaptchaSettings = ({
setBeenSubmitted(true)
if (tab === tabForInheritance) {
- const data = _find(analyticsProjects, (item) => `${item.name} | ${item.id}` === reuseProjectId)
+ const data = _find(allProjectsNames || analyticsProjects, (item) => `${item.name} | ${item.id}` === reuseProjectId)
if (_isEmpty(data)) {
showError('Select project or select corect project')
@@ -313,6 +314,22 @@ const CaptchaSettings = ({
}
}
+ const getAllProjectsNames = async () => {
+ await getProjectsNames()
+ .then((res) => {
+ setAllProjectsNames(res)
+ }).catch((e) => {
+ console.log(e)
+ })
+ }
+
+ useEffect(() => {
+ if (tab === tabForInheritance && _isEmpty(allProjectsNames)) {
+ getAllProjectsNames()
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [tab])
+
return (
<Title title={title}>
<div
@@ -328,7 +345,7 @@ const CaptchaSettings = ({
{t('profileSettings.general')}
</h3>
<div className='mt-6'>
- {(!isSettings && _filter(analyticsProjects, (item) => !item.isCaptchaProject).length > 0) && (
+ {(!isSettings && (allProjectsNames || _filter(analyticsProjects, (item) => !item?.isCaptchaProject).length > 0)) && (
<nav className='-mb-px flex space-x-8'>
{_map(tabForCreateCaptcha, (tabCaptcha) => (
<button
@@ -377,7 +394,7 @@ const CaptchaSettings = ({
title={_isEmpty(reuseProjectId) ? 'select project' : reuseProjectId}
label={t('profileSettings.selectProject')}
className='w-full'
- items={_filter(analyticsProjects, (item) => !item.isCaptchaProject)}
+ items={allProjectsNames || _filter(analyticsProjects, (item) => !item.isCaptchaProject)}
labelExtractor={(item) => `${item.name} | ${item.id}`}
keyExtractor={(item) => item.id}
onSelect={(item) => setReuseProjectId(item)}
diff --git a/src/redux/models/IProject.ts b/src/redux/models/IProject.ts
index c5f75f407..c929c6d73 100644
--- a/src/redux/models/IProject.ts
+++ b/src/redux/models/IProject.ts
@@ -29,6 +29,11 @@ export interface IShareOwnerProject {
user: IUserShareProject
}
+export interface IProjectNames {
+ name: string
+ id: string
+}
+
export interface IProject {
id: string
name: string