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!

made weekly reports a paid tier only feature

Blue Mouseed51fa775236
diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.jsx
index 8f4a42988..9de73dd40 100644
--- a/src/pages/UserSettings/UserSettings.jsx
+++ b/src/pages/UserSettings/UserSettings.jsx
@@ -10,18 +10,21 @@ import _findIndex from 'lodash/findIndex'
import _map from 'lodash/map'
import _keys from 'lodash/keys'
import _isString from 'lodash/isString'
-import { EnvelopeIcon, ExclamationTriangleIcon, ArrowDownTrayIcon } from '@heroicons/react/24/outline'
+import {
+ EnvelopeIcon, ExclamationTriangleIcon, ArrowDownTrayIcon, CurrencyDollarIcon,
+} from '@heroicons/react/24/outline'
import QRCode from 'react-qr-code'
import PropTypes from 'prop-types'
import dayjs from 'dayjs'
-import { reportFrequencies, DEFAULT_TIMEZONE } from 'redux/constants'
+import { reportFrequencies, DEFAULT_TIMEZONE, WEEKLY_REPORT_FREQUENCY } from 'redux/constants'
import Title from 'components/Title'
import Input from 'ui/Input'
import Button from 'ui/Button'
import Modal from 'ui/Modal'
import Beta from 'ui/Beta'
import Select from 'ui/Select'
+import PaidFeature from 'modals/PaidFeature'
import TimezonePicker from 'ui/TimezonePicker'
import {
isValidEmail, isValidPassword, MIN_PASSWORD_CHARS,
@@ -358,7 +361,7 @@ const UserSettings = ({
removeProject, removeShareProject, setUserShareData, setProjectsShareData, language,
userSharedUpdate, sharedProjectError, updateUserData, login, genericError, onApiKeyGenerate, onApiKeyDelete,
}) => {
- const { user, dontRemember } = useSelector(state => state.auth)
+ const { user, dontRemember, isPaidTierUsed } = useSelector(state => state.auth)
const [form, setForm] = useState({
email: user.email || '',
@@ -366,6 +369,7 @@ const UserSettings = ({
repeat: '',
})
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)
@@ -454,6 +458,25 @@ const UserSettings = ({
}
}
+ const _setReportFrequency = (value) => {
+ if (!isPaidTierUsed && value === WEEKLY_REPORT_FREQUENCY) {
+ setIsPaidFeatureOpened(true)
+ return
+ }
+
+ setReportFrequency(value)
+ }
+
+ const reportIconExtractor = (_, index) => {
+ if (!isPaidTierUsed && reportFrequencies[index] === WEEKLY_REPORT_FREQUENCY) {
+ return (
+ <CurrencyDollarIcon className='w-5 h-5 mr-1' />
+ )
+ }
+
+ return null
+ }
+
return (
<Title title={t('titles.profileSettings')}>
<div className='min-h-min-footer bg-gray-50 dark:bg-gray-800 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>
@@ -529,7 +552,8 @@ const UserSettings = ({
label={t('profileSettings.frequency')}
className='w-full'
items={translatedFrequencies}
- onSelect={(f) => setReportFrequency(reportFrequencies[_findIndex(translatedFrequencies, freq => freq === f)])}
+ iconExtractor={reportIconExtractor}
+ onSelect={(f) => _setReportFrequency(reportFrequencies[_findIndex(translatedFrequencies, freq => freq === f)])}
/>
</div>
</div>
@@ -661,6 +685,10 @@ const UserSettings = ({
</div>
</form>
+ <PaidFeature
+ isOpened={isPaidFeatureOpened}
+ onClose={() => setIsPaidFeatureOpened(false)}
+ />
<Modal
onClose={() => setShowExportModal(false)}
onSubmit={() => { setShowExportModal(false); onExport(user.exportedAt) }}
diff --git a/src/redux/constants/index.js b/src/redux/constants/index.js
index 68e4a1e70..f17573b47 100644
--- a/src/redux/constants/index.js
+++ b/src/redux/constants/index.js
@@ -78,7 +78,9 @@ export const tbsFormatMapper = {
export const FREE_TIER_KEY = 'free'
-export const reportFrequencies = ['weekly', 'monthly', 'never']
+// a dedicated variable is needed for paid tier checking
+export const WEEKLY_REPORT_FREQUENCY = 'weekly'
+export const reportFrequencies = [WEEKLY_REPORT_FREQUENCY, 'monthly', 'never']
export const GDPR_EXPORT_TIMEFRAME = 14 // days
diff --git a/src/ui/Select.jsx b/src/ui/Select.jsx
index 20a486415..f1f71e33c 100644
--- a/src/ui/Select.jsx
+++ b/src/ui/Select.jsx
@@ -6,7 +6,7 @@ import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/24/solid'
import _map from 'lodash/map'
const Select = ({
- title, label, className, items, labelExtractor, keyExtractor, onSelect,
+ title, label, className, items, labelExtractor, keyExtractor, iconExtractor, onSelect,
}) => (
<Listbox className={className} value={title} onChange={onSelect}>
{({ open }) => (
@@ -31,34 +31,44 @@ const Select = ({
static
className='absolute z-10 mt-1 w-full bg-white dark:bg-gray-700 shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm'
>
- {_map(items, (item) => (
+ {_map(items, (item, index) => (
<Listbox.Option
- key={keyExtractor ? keyExtractor(item) : item}
+ key={keyExtractor ? keyExtractor(item, index) : item}
className={({ active }) => cx('dark:text-white cursor-default select-none relative py-2 pl-8 pr-4', {
'text-white bg-indigo-600': active,
'text-gray-900': !active,
})}
- value={labelExtractor ? labelExtractor(item) : item}
+ value={labelExtractor ? labelExtractor(item, index) : item}
>
{({ selected, active }) => (
<>
- <span className={cx(selected ? 'font-semibold' : 'font-normal', 'block truncate capitalize')}>
- {labelExtractor ? labelExtractor(item) : item}
+ <span
+ className={cx('block truncate capitalize', {
+ 'font-semibold': selected,
+ 'font-normal': !selected,
+ })}
+ >
+ {labelExtractor ? labelExtractor(item, index) : item}
</span>
- {selected ? (
+ {iconExtractor && (
<span
- className={cx(
- 'absolute inset-y-0 left-0 flex items-center pl-1.5',
- {
- 'text-white': active,
- 'text-indigo-600': !active,
- },
- )}
+ className={cx('absolute inset-y-0 left-0 flex items-center pl-1.5')}
+ >
+ {iconExtractor(item, index)}
+ </span>
+ )}
+
+ {selected && (
+ <span
+ className={cx('absolute inset-y-0 left-0 flex items-center pl-1.5', {
+ 'text-white': active,
+ 'text-indigo-600': !active,
+ })}
>
<CheckIcon className='h-5 w-5' aria-hidden='true' />
</span>
- ) : null}
+ )}
</>
)}
</Listbox.Option>
@@ -79,6 +89,7 @@ Select.propTypes = {
])),
className: PropTypes.string,
labelExtractor: PropTypes.func,
+ iconExtractor: PropTypes.func,
keyExtractor: PropTypes.func,
label: PropTypes.string,
}
@@ -87,6 +98,7 @@ Select.defaultProps = {
className: '',
labelExtractor: null,
keyExtractor: null,
+ iconExtractor: null,
label: '',
items: [],
}