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 bug with redux & improvment captchasettings

kruzhambuse58b3a8953ac
diff --git a/src/App.js b/src/App.js
index db59113c8..8048f0e5c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -50,6 +50,7 @@ const Changelog = lazy(() => import('pages/Changelog'))
const About = lazy(() => import('pages/About'))
const ProjectAlertsSettings = lazy(() => import('pages/Project/Alerts/Settings'))
const CookiePolicy = lazy(() => import('pages/CookiePolicy'))
+const CaptchaSettings = lazy(() => import('pages/Captcha/Settings'))
const minimalFooterPages = [
'/projects', '/dashboard', '/settings', '/contact',
@@ -207,6 +208,8 @@ const App = () => {
<Route path={routes.alert_settings} component={ProjectAlertsSettings} exact />
<Route path={routes.create_alert} component={ProjectAlertsSettings} exact />
<Route path={routes.cookiePolicy} component={CookiePolicy} exact />
+ <Route path={routes.captchaSettings} component={CaptchaSettings} exact />
+ <Route path={routes.new_captcha} component={CaptchaSettings} exact />
<Route path='*' component={NotFound} />
</Switch>
</Suspense>
diff --git a/src/pages/Captcha/Settings/CaptchaSettings.container.jsx b/src/pages/Captcha/Settings/CaptchaSettings.container.jsx
index e27992c0f..7b27c4749 100644
--- a/src/pages/Captcha/Settings/CaptchaSettings.container.jsx
+++ b/src/pages/Captcha/Settings/CaptchaSettings.container.jsx
@@ -5,11 +5,14 @@ import { errorsActions } from 'redux/actions/errors'
import CaptchaSettings from './CaptchaSettings'
-const mapStateToProps = (state) => ({
- projects: state.ui.projects.captchaProjects,
- isLoading: state.ui.projects.isLoadingCaptcha,
- user: state.auth.user,
-})
+const mapStateToProps = (state) => {
+ console.log(state)
+ return {
+ projects: state.ui.projects.captchaProjects,
+ isLoading: state.ui.projects.isLoadingCaptcha,
+ user: state.auth.user,
+ }
+}
const mapDispatchToProps = (dispatch) => ({
updateProjectFailed: (message) => {
diff --git a/src/pages/Captcha/Settings/CaptchaSettings.jsx b/src/pages/Captcha/Settings/CaptchaSettings.jsx
index 922c8055b..7a3982336 100644
--- a/src/pages/Captcha/Settings/CaptchaSettings.jsx
+++ b/src/pages/Captcha/Settings/CaptchaSettings.jsx
@@ -47,11 +47,11 @@ const CaptchaSettings = ({
const project = useMemo(() => _find(projects, p => p.id === id) || {}, [projects, id])
const isSettings = !_isEmpty(id) && (_replace(routes.project_settings, ':id', id) === pathname)
const history = useHistory()
-
const [form, setForm] = useState({
name: '',
id: id || nanoid(),
public: false,
+ isCaptcha: true,
})
const [validated, setValidated] = useState(false)
const [errors, setErrors] = useState({})
diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.js
index d3a81991f..6896afba9 100644
--- a/src/redux/actions/ui/index.js
+++ b/src/redux/actions/ui/index.js
@@ -243,9 +243,9 @@ const removeCaptchProject = (pid) => ({
payload: { pid },
})
-const setTotalCaptcha = (totalCaptcha) => ({
+const setTotalCaptcha = (total) => ({
type: types.SET_CAPTCHA_PROJECTS_TOTAL,
- payload: { totalCaptcha },
+ payload: { total },
})
const setDashboardPaginationPageCaptcha = (page) => ({
@@ -255,10 +255,10 @@ const setDashboardPaginationPageCaptcha = (page) => ({
},
})
-const setCaptchaLoading = (captchaLoading) => ({
+const setCaptchaLoading = (isLoading) => ({
type: types.SET_CAPTCHA_PROJECTS_LOADING,
payload: {
- captchaLoading,
+ isLoading,
},
})
diff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.js
index 7c07f2be1..cd5e20d8c 100644
--- a/src/redux/reducers/ui/projects.js
+++ b/src/redux/reducers/ui/projects.js
@@ -48,10 +48,10 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {
}
case types.SET_CAPTCHA_PROJECTS: {
- const { projects } = payload
+ const { captchaProjects } = payload
return {
...state,
- captchaProjects: projects,
+ captchaProjects,
isLoadingCaptcha: false,
}
}
diff --git a/src/redux/sagas/ui/load_projects.js b/src/redux/sagas/ui/load_projects.js
index 0085f60df..274d0623d 100644
--- a/src/redux/sagas/ui/load_projects.js
+++ b/src/redux/sagas/ui/load_projects.js
@@ -47,6 +47,8 @@ export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHB
...res,
overall: overall?.[res.id],
}))
+ console.log(results)
+ console.log(total)
if (isCaptcha) {
yield put(UIActions.setCaptchaProjects(results))