summaryrefslogtreecommitdiff
path: root/web/source/settings/admin/settings.js
diff options
context:
space:
mode:
authorLibravatar f0x52 <f0x@cthu.lu>2023-01-18 14:45:14 +0100
committerLibravatar GitHub <noreply@github.com>2023-01-18 14:45:14 +0100
commit9b139b632098e6741b10fa87ff6224dcb5045947 (patch)
treec72b5c666ed01db7d1a18e531e5e01e07f504a46 /web/source/settings/admin/settings.js
parent[chore] Change default sqlite busy timeout to 5m (#1352) (diff)
downloadgotosocial-9b139b632098e6741b10fa87ff6224dcb5045947.tar.xz
[frogend] Settings refactor (#1318)
* yakshave new form field structure * fully refactor user profile settings form * use rtk query api for profile settings * refactor user post settings * refactor password change form * refactor admin settings * FormWithData structure for user forms * admin actions refactor * whitespace * fix user settings data prop * remove superfluous logging * cleanup old code * refactor federation/suspend (overview, detail) * mostly abstracted (emoji) checkbox list * refactor parse-from-toot * refactor custom-emoji, progress on federation bulk * loading icon styling to prevent big spinny * refactor federation import-export interface * cleanup old files * [chore] Update/add license headers for 2023 * redux fixes * text-field exports * appease the linter * refactor authentication with RTK Query * fix login/logout state transition weirdness * fixes/cleanup * small linter-related fixes * add eslint license header check, fix existing files * remove old code, clarify comment * clarify suspend on subdomains * collapse if/else * fa-fw width info comment
Diffstat (limited to 'web/source/settings/admin/settings.js')
-rw-r--r--web/source/settings/admin/settings.js107
1 files changed, 62 insertions, 45 deletions
diff --git a/web/source/settings/admin/settings.js b/web/source/settings/admin/settings.js
index c3b8e9d91..c0a9eabbe 100644
--- a/web/source/settings/admin/settings.js
+++ b/web/source/settings/admin/settings.js
@@ -19,88 +19,105 @@
"use strict";
const React = require("react");
-const Redux = require("react-redux");
-const Submit = require("../components/submit");
+const query = require("../lib/query");
-const api = require("../lib/api");
-const submit = require("../lib/submit");
+const {
+ useTextInput,
+ useFileInput
+} = require("../lib/form");
-const adminActions = require("../redux/reducers/instances").actions;
+const useFormSubmit = require("../lib/form/submit");
const {
TextInput,
TextArea,
- File
-} = require("../components/form-fields").formFields(adminActions.setAdminSettingsVal, (state) => state.instances.adminSettings);
-
-module.exports = function AdminSettings() {
- const dispatch = Redux.useDispatch();
- const instance = Redux.useSelector(state => state.instances.adminSettings);
+ FileInput
+} = require("../components/form/inputs");
- const [errorMsg, setError] = React.useState("");
- const [statusMsg, setStatus] = React.useState("");
+const FormWithData = require("../lib/form/form-with-data");
+const MutationButton = require("../components/form/mutation-button");
- const updateSettings = submit(
- () => dispatch(api.admin.updateInstance()),
- {setStatus, setError}
+module.exports = function AdminSettings() {
+ return (
+ <FormWithData
+ dataQuery={query.useInstanceQuery}
+ DataForm={AdminSettingsForm}
+ />
);
+};
+
+function AdminSettingsForm({ data: instance }) {
+ const form = {
+ title: useTextInput("title", { defaultValue: instance.title }),
+ thumbnail: useFileInput("thumbnail", { withPreview: true }),
+ thumbnailDesc: useTextInput("thumbnail_description", { defaultValue: instance.thumbnail_description }),
+ shortDesc: useTextInput("short_description", { defaultValue: instance.short_description }),
+ description: useTextInput("description", { defaultValue: instance.description }),
+ contactUser: useTextInput("contact_username", { defaultValue: instance.contact_account?.username }),
+ contactEmail: useTextInput("contact_email", { defaultValue: instance.email }),
+ terms: useTextInput("terms", { defaultValue: instance.terms })
+ };
+
+ const [submitForm, result] = useFormSubmit(form, query.useUpdateInstanceMutation());
return (
- <div>
+ <form onSubmit={submitForm}>
<h1>Instance Settings</h1>
<TextInput
- id="title"
- name="Title"
- placeHolder="My GoToSocial instance"
+ field={form.title}
+ label="Title"
+ placeholder="My GoToSocial instance"
/>
<div className="file-upload">
<h3>Instance thumbnail</h3>
<div>
- <img className="preview avatar" src={instance.thumbnail} alt={instance.thumbnail ? `Thumbnail image for the instance` : "No instance thumbnail image set"} />
- <File
- id="thumbnail"
- fileType="image/*"
+ <img className="preview avatar" src={form.thumbnail.previewValue ?? instance.thumbnail} alt={form.thumbnailDesc.value ?? (instance.thumbnail ? `Thumbnail image for the instance` : "No instance thumbnail image set")} />
+ <FileInput
+ field={form.thumbnail}
+ accept="image/*"
/>
</div>
</div>
<TextInput
- id="thumbnail_description"
- name="Instance thumbnail description"
- placeHolder="A cute little picture of a smiling sloth."
+ field={form.thumbnailDesc}
+ label="Instance thumbnail description"
+ placeholder="A cute drawing of a smiling sloth."
/>
<TextArea
- id="short_description"
- name="Short description"
- placeHolder="A small testing instance for the GoToSocial alpha."
+ field={form.shortDesc}
+ label="Short description"
+ placeholder="A small testing instance for the GoToSocial alpha software."
/>
+
<TextArea
- id="description"
- name="Full description"
- placeHolder="A small testing instance for the GoToSocial alpha."
+ field={form.description}
+ label="Full description"
+ placeholder="A small testing instance for the GoToSocial alpha software. Just trying it out, my main instance is https://example.com"
/>
<TextInput
- id="contact_account.username"
- name="Contact user (local account username)"
- placeHolder="admin"
+ field={form.contactUser}
+ label="Contact user (local account username)"
+ placeholder="admin"
/>
+
<TextInput
- id="email"
- name="Contact email"
- placeHolder="admin@example.com"
+ field={form.contactEmail}
+ label="Contact email"
+ placeholder="admin@example.com"
/>
<TextArea
- id="terms"
- name="Terms & Conditions"
- placeHolder=""
+ field={form.terms}
+ label="Terms & Conditions"
+ placeholder=""
/>
- <Submit onClick={updateSettings} label="Save" errorMsg={errorMsg} statusMsg={statusMsg} />
- </div>
+ <MutationButton label="Save" result={result} />
+ </form>
);
-}; \ No newline at end of file
+} \ No newline at end of file