fix: Loading settings

This commit is contained in:
Myzel394 2023-02-12 21:20:04 +01:00
parent 28e645abcb
commit 785a712eb7

View File

@ -13,7 +13,7 @@ import SettingsForm from "~/route-widgets/GlobalSettingsRoute/SettingsForm"
export default function GlobalSettingsRoute(): ReactElement { export default function GlobalSettingsRoute(): ReactElement {
const queryKey = ["get_admin_settings"] const queryKey = ["get_admin_settings"]
const query = useQuery<AdminSettings, AxiosError>(queryKey, async () => { const query = useQuery<AdminSettings, AxiosError>(queryKey, async () => {
const settings = getAdminSettings() const settings = await getAdminSettings()
return _.mergeWith({}, DEFAULT_ADMIN_SETTINGS, settings, (o, s) => return _.mergeWith({}, DEFAULT_ADMIN_SETTINGS, settings, (o, s) =>
_.isNull(s) ? o : s, _.isNull(s) ? o : s,