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!

Remove fileType from translations JSON

Blue Mouse41557afee3a7
diff --git a/web/app/lib/models/Project.ts b/web/app/lib/models/Project.ts
index f761bb03c..f63ed9f9c 100644
--- a/web/app/lib/models/Project.ts
+++ b/web/app/lib/models/Project.ts
@@ -172,11 +172,15 @@ export interface AnalyticsFunnel {
dropoffPercStep: number
}
+export const IMPORT_PROVIDERS = ['umami', 'simple-analytics', 'fathom'] as const
+
+export type Provider = (typeof IMPORT_PROVIDERS)[number]
+
export interface DataImport {
id: number
importId: number
projectId: string
- provider: string
+ provider: Provider
status: 'pending' | 'processing' | 'completed' | 'failed'
dateFrom: string | null
dateTo: string | null
diff --git a/web/app/pages/Project/Settings/components/DataImportTab.tsx b/web/app/pages/Project/Settings/components/DataImportTab.tsx
index 98959b102..1fb9bd5fd 100644
--- a/web/app/pages/Project/Settings/components/DataImportTab.tsx
+++ b/web/app/pages/Project/Settings/components/DataImportTab.tsx
@@ -14,7 +14,11 @@ import dayjs from 'dayjs'
import { Trans, useTranslation } from 'react-i18next'
import { useFetcher } from 'react-router'
-import { DataImport } from '~/lib/models/Project'
+import {
+ type DataImport,
+ type Provider,
+ IMPORT_PROVIDERS,
+} from '~/lib/models/Project'
import type { ProjectSettingsActionData } from '~/routes/projects.settings.$id'
import Modal from '~/ui/Modal'
import Loader from '~/ui/Loader'
@@ -24,8 +28,6 @@ import UmamiSVG from '~/ui/icons/Umami'
import SimpleAnalyticsSVG from '~/ui/icons/SimpleAnalytics'
import FathomSVG from '~/ui/icons/Fathom'
-const PROVIDERS = ['fathom', 'simple-analytics', 'umami'] as const
-
const PROVIDER_ICONS: Record<
string,
React.ComponentType<{ className?: string }>
@@ -35,11 +37,17 @@ const PROVIDER_ICONS: Record<
fathom: FathomSVG,
}
-const PROVIDER_DISPLAY_NAMES: Record<string, string> = {
+const PROVIDER_DISPLAY_NAMES = {
umami: 'Umami',
'simple-analytics': 'Simple Analytics',
fathom: 'Fathom Analytics',
-}
+} as const
+
+const PROVIDER_FILE_TYPES = {
+ umami: '.zip',
+ 'simple-analytics': '.csv',
+ fathom: '.csv',
+} as const
const STATUS_ICONS = {
pending: ClockIcon,
@@ -97,7 +105,9 @@ export default function DataImportTab({ projectId }: DataImportTabProps) {
const { t } = useTranslation('common')
const [imports, setImports] = useState<DataImport[]>([])
const [loading, setLoading] = useState(true)
- const [selectedProvider, setSelectedProvider] = useState<string | null>(null)
+ const [selectedProvider, setSelectedProvider] = useState<Provider | null>(
+ null,
+ )
const [deleteTarget, setDeleteTarget] = useState<DataImport | null>(null)
const pollRef = useRef<ReturnType<typeof setInterval> | null>(null)
@@ -241,22 +251,20 @@ export default function DataImportTab({ projectId }: DataImportTabProps) {
</Text>
<div className='mt-4 grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3'>
- {PROVIDERS.map((providerId) => {
- const Icon = PROVIDER_ICONS[providerId] || FileTextIcon
+ {IMPORT_PROVIDERS.map((provider) => {
+ const Icon = PROVIDER_ICONS[provider] || FileTextIcon
const hasActive = imports.some(
(i) => i.status === 'pending' || i.status === 'processing',
)
- const name = PROVIDER_DISPLAY_NAMES[providerId] || providerId
- const fileType = t(
- `project.settings.dataImport.${providerId}.fileType`,
- )
+ const name = PROVIDER_DISPLAY_NAMES[provider] || provider
+ const fileType = PROVIDER_FILE_TYPES[provider] || ''
return (
<button
- key={providerId}
+ key={provider}
type='button'
disabled={hasActive}
- onClick={() => setSelectedProvider(providerId)}
+ onClick={() => setSelectedProvider(provider)}
className={cx(
'group relative flex flex-col items-start rounded-lg border p-4 text-left transition-all',
hasActive
@@ -288,7 +296,7 @@ export default function DataImportTab({ projectId }: DataImportTabProps) {
colour='inherit'
className='mt-2 text-gray-500 dark:text-gray-400'
>
- {t(`project.settings.dataImport.${providerId}.description`)}
+ {t(`project.settings.dataImport.${provider}.description`)}
</Text>
</button>
)
diff --git a/web/public/locales/en.json b/web/public/locales/en.json
index 037b6f004..c0d8d449e 100644
--- a/web/public/locales/en.json
+++ b/web/public/locales/en.json
@@ -1798,16 +1798,13 @@
"statusFailed": "Failed",
"uploadInstructions": "Please select your export file. Once started, the data will be imported in the background. Please allow for some time to complete. To learn more how to export 3rd party providers data, <1>see our docs</1>.",
"umami": {
- "description": "Import pageviews and custom events from Umami export",
- "fileType": ".zip"
+ "description": "Import pageviews and custom events from Umami export"
},
"simple-analytics": {
- "description": "Import pageviews and events from Simple Analytics export",
- "fileType": ".csv"
+ "description": "Import pageviews and events from Simple Analytics export"
},
"fathom": {
- "description": "Import pageviews and events from Fathom Analytics export",
- "fileType": ".csv"
+ "description": "Import pageviews and events from Fathom Analytics export"
}
},
"captcha": {