Myzel394/kleckrelay
1
0
Fork 0
mirror of https://github.com/Myzel394/kleckrelay-website.git synced 2025-06-18 23:45:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix default settings loaded correctly for global settings form

Browse Source
This commit is contained in:
Myzel394 2023-02-10 20:17:12 +01:00
parent 82a3641a6d
commit 8f925072cc
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/constants/admin-settings.ts Normal file
View File

@ -0,0 +1,14 @@
import {AdminSettings} from "~/server-types"
export const DEFAULT_ADMIN_SETTINGS: AdminSettings = {
randomEmailIdMinLength: 6,
randomEmailIdChars: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
randomEmailLengthIncreaseOnPercentage: 0.0005,
customEmailSuffixLength: 4,
customEmailSuffixChars: "0123456789",
userEmailEnableOtherRelays: true,
userEmailEnableDisposableEmails: false,
imageProxyStorageLifeTimeInHours: 24,
enableImageProxy: true,
allowStatistics: true,
}

20
src/routes/GlobalSettingsRoute.tsx
View File

@ -1,15 +1,23 @@
import {ReactElement} from "react"
import {useQuery} from "@tanstack/react-query"
import {AdminSettings} from "~/server-types"
import {AxiosError} from "axios"
import _ from "lodash"
import {useQuery} from "@tanstack/react-query"
import {AdminSettings} from "~/server-types"
import {getAdminSettings} from "~/apis"
import {QueryResult} from "~/components"
import {useTranslation} from "react-i18next"
import SettingsForm from "~/route-widgets/GlobalSettingsRoute/SettingForm"
import {DEFAULT_ADMIN_SETTINGS} from "~/constants/admin-settings"
import SettingsForm from "~/route-widgets/GlobalSettingsRoute/SettingsForm"
export default function GlobalSettingsRoute(): ReactElement {
const {t} = useTranslation()
const query = useQuery<AdminSettings, AxiosError>(["get_admin_settings"], getAdminSettings)
const query = useQuery<AdminSettings, AxiosError>(["get_admin_settings"], async () => {
const settings = getAdminSettings()
return _.mergeWith({}, DEFAULT_ADMIN_SETTINGS, settings, (o, s) =>
_.isNull(s) ? o : s,
) as AdminSettings
})
return (
<QueryResult<AdminSettings> query={query}>