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!

Move project enabled / disabled checkbox to danger zone

Blue Mouse70121a376b30
diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsx
index 2b06a6952..4af2725eb 100644
--- a/web/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx
@@ -315,6 +315,7 @@ const ProjectSettings = () => {
? initialProject.ipBlacklist
: _join(initialProject.ipBlacklist, ', '),
countryBlacklist: initialProject.countryBlacklist || [],
+ active: initialProject.active !== false,
botsProtectionLevel:
(initialProject.botsProtectionLevel as 'off' | 'basic') || 'basic',
gscPropertyUri: initialProject.gscPropertyUri || null,
@@ -675,6 +676,7 @@ const ProjectSettings = () => {
const formData = new FormData()
formData.set('intent', 'update-project')
if (data.name) formData.set('name', data.name)
+ formData.set('active', data.active ? 'true' : 'false')
formData.set('public', data.public ? 'true' : 'false')
formData.set(
'isPasswordProtected',
@@ -1359,7 +1361,7 @@ const ProjectSettings = () => {
) : null}
{activeTab === 'danger' && activeTabConfig ? (
- <>
+ <form onSubmit={handleSubmit}>
<TabHeader
icon={activeTabConfig.icon}
label={activeTabConfig.label}
@@ -1367,13 +1369,18 @@ const ProjectSettings = () => {
iconColorClass={activeTabConfig.iconColor}
/>
<DangerZone
+ isActive={Boolean(form.active)}
+ onToggleActive={(active) =>
+ setForm((prev) => ({ ...prev, active }))
+ }
+ isSaving={isSaving}
setShowTransfer={setShowTransfer}
setShowReset={setShowReset}
setShowDelete={setShowDelete}
isDeleting={isDeleting}
setResetting={isResetting}
/>
- </>
+ </form>
) : null}
</section>
</div>
diff --git a/web/app/pages/Project/Settings/tabs/AccessSettings.tsx b/web/app/pages/Project/Settings/tabs/AccessSettings.tsx
index 2f886ceb8..883c34bf7 100644
--- a/web/app/pages/Project/Settings/tabs/AccessSettings.tsx
+++ b/web/app/pages/Project/Settings/tabs/AccessSettings.tsx
@@ -7,7 +7,6 @@ import Select from '~/ui/Select'
interface AccessSettingsProps {
form: {
- active?: boolean
public?: boolean
isPasswordProtected?: boolean
organisationId?: string
@@ -32,21 +31,6 @@ const AccessSettings = ({
<h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>
{t('project.settings.access')}
</h3>
- <Checkbox
- checked={Boolean(form.active)}
- onChange={(checked) =>
- setForm((prev: any) => ({
- ...prev,
- active: checked,
- }))
- }
- name='active'
- classes={{
- label: 'mt-2',
- }}
- label={t('project.settings.enabled')}
- hint={t('project.settings.enabledHint')}
- />
<Checkbox
checked={Boolean(form.public)}
onChange={(checked) => {
diff --git a/web/app/pages/Project/Settings/tabs/DangerZone.tsx b/web/app/pages/Project/Settings/tabs/DangerZone.tsx
index dde2d8d63..597ad6839 100644
--- a/web/app/pages/Project/Settings/tabs/DangerZone.tsx
+++ b/web/app/pages/Project/Settings/tabs/DangerZone.tsx
@@ -2,12 +2,17 @@ import {
ArrowsLeftRightIcon,
ArrowCounterClockwiseIcon,
TrashIcon,
+ PowerIcon,
} from '@phosphor-icons/react'
import { useTranslation } from 'react-i18next'
import Button from '~/ui/Button'
+import Checkbox from '~/ui/Checkbox'
interface DangerZoneProps {
+ isActive: boolean
+ onToggleActive: (active: boolean) => void
+ isSaving: boolean
setShowTransfer: (show: boolean) => void
setShowReset: (show: boolean) => void
setShowDelete: (show: boolean) => void
@@ -16,6 +21,9 @@ interface DangerZoneProps {
}
const DangerZone = ({
+ isActive,
+ onToggleActive,
+ isSaving,
setShowTransfer,
setShowReset,
setShowDelete,
@@ -26,11 +34,22 @@ const DangerZone = ({
return (
<div>
- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>
- Danger zone
- </h3>
-
<div className='mt-4 space-y-3'>
+ <div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'>
+ <div className='flex items-start'>
+ <PowerIcon className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' />
+ <div className='ml-3 flex-1'>
+ <Checkbox
+ checked={isActive}
+ onChange={onToggleActive}
+ name='active'
+ label={t('project.settings.enabled')}
+ hint={t('project.settings.enabledHint')}
+ />
+ </div>
+ </div>
+ </div>
+
<div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'>
<div className='flex items-start'>
<ArrowsLeftRightIcon className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' />
@@ -102,6 +121,12 @@ const DangerZone = ({
</div>
</div>
</div>
+
+ <div className='mt-4 flex flex-wrap justify-center gap-2 sm:justify-between'>
+ <Button type='submit' loading={isSaving} primary regular>
+ {t('common.save')}
+ </Button>
+ </div>
</div>
)
}