< go back
-
+
);
}
};
-function EmojiDetailData({emojiId}) {
- const {currentData: emoji, isLoading, error} = query.useGetEmojiQuery(emojiId);
+function EmojiDetailForm({ data: emoji }) {
+ const form = {
+ id: useValue("id", emoji.id),
+ category: useComboBoxInput("category", { defaultValue: emoji.category }),
+ image: useFileInput("image", {
+ withPreview: true,
+ maxSize: 50 * 1024 // TODO: get from instance api
+ })
+ };
- if (error) {
- return (
-
- {error.status}: {error.data.error}
-
- );
- } else if (isLoading) {
- return (
-
-
- );
- } else {
- return
- 
+
+ deleteEmoji(emoji.id)}
+ className="danger"
+ showError={false}
+ result={deleteResult}
+ />
- {emoji.shortcode}
-
-
+
);
-}
-
-function DeleteButton({id}) {
- // TODO: confirmation dialog?
- const [deleteEmoji, deleteResult] = query.useDeleteEmojiMutation();
-
- let text = "Delete";
- if (deleteResult.isLoading) {
- text = "Deleting...";
- }
-
- if (deleteResult.isSuccess) {
- return Modify this emoji {modifyResult.isLoading && "(processing..)"}
- - {modifyResult.error &&
- {modifyResult.error.status}: {modifyResult.error.data.error}
-
}
+ Custom Emoji (local)
- {error && + {error &&{error}
}
{isLoading
- ?
{emoji.length == 0 && "No local emoji yet, add one below"}
{Object.entries(emojiByCategory).map(([category, entries]) => {
- return ;
+ return
);
}
-function EmojiCategory({category, entries}) {
+function EmojiCategory({ category, entries, baseUrl }) {
return (
{category}
- {searchResult}
+
{entries.map((e) => {
return (
-
- {/* */}
+
- 
+
);
diff --git a/web/source/settings/admin/emoji/local/use-shortcode.js b/web/source/settings/admin/emoji/local/use-shortcode.js
new file mode 100644
index 000000000..109914b8b
--- /dev/null
+++ b/web/source/settings/admin/emoji/local/use-shortcode.js
@@ -0,0 +1,61 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see
- {isLoading && Custom Emoji (remote)
- {error && + {error &&{error}
}
{isLoading
- ? {error.data.error}
}
- {shortcode}: {msg}
-
- )));
- } else {
- setError(e);
- }
- });
- }
+ const buttonsInactive = form.selectedEmoji.someSelected
+ ? {}
+ : {
+ disabled: true,
+ title: "No emoji selected, cannot perform any actions"
+ };
return (
This {type == "statuses" ? "toot" : "account"} uses the following custom emoji, select the ones you want to copy/disable:
-
);
}
-function EmojiEntry({ emoji, localEmojiCodes, updateEmoji, checked }) {
- const [onShortcodeChange, _resetShortcode, { shortcode, shortcodeRef, shortcodeValid }] = useTextInput("shortcode", {
+function ErrorList({ errors }) {
+ return (
+
-
- {emojiList.map((emoji) => (
- updateEmoji(emoji.shortcode, value)}
- checked={emojiState[emoji.shortcode].checked}
- />
- ))}
-
+
+ One or multiple emoji failed to process:
+ {errors.map(([shortcode, err]) => (
+
+ );
+}
+
+function EmojiEntry({ entry: emoji, localEmojiCodes, onChange }) {
+ const shortcodeField = useTextInput("shortcode", {
defaultValue: emoji.shortcode,
validator: function validateShortcode(code) {
- return (checked && localEmojiCodes.has(code))
+ return (emoji.checked && localEmojiCodes.has(code))
? "Shortcode already in use"
: "";
}
});
React.useEffect(() => {
- updateEmoji({ valid: shortcodeValid });
+ onChange({ valid: shortcodeField.valid });
/* eslint-disable-next-line react-hooks/exhaustive-deps */
- }, [shortcodeValid]);
+ }, [shortcodeField.valid]);
return (
-
+
);
}
\ No newline at end of file
diff --git a/web/source/settings/admin/federation.js b/web/source/settings/admin/federation.js
deleted file mode 100644
index b7658f444..000000000
--- a/web/source/settings/admin/federation.js
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
+ {shortcode}: {err}
+
+ ))}
+
-
- );
- }
-
- return (
- Federation
-
-
- Federation
- Here you can see an overview of blocked instances. - -
-
-
- Blocked instances
- -
- {filteredInstances.map((entry) => {
- return (
-
-
-
- {entry.domain}
-
-
- {new Date(entry.created_at).toLocaleString()}
-
-
-
- );
- })}
-
-
-
- );
-}
-
-function InstancePageWrapped() {
- /* We wrap the component to generate formFields with a setter depending on the domain
- if formFields() is used inside the same component that is re-rendered with their state,
- inputs get re-created on every change, causing them to lose focus, and bad performance
- */
- let [_match, {domain}] = useRoute(`${base}/:domain`);
-
- if (domain == "view") { // from form field submission
- let realDomain = (new URL(document.location)).searchParams.get("domain");
- if (realDomain == undefined) {
- return Import / Export reset
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }/>
-
- -
- {errorMsg.length > 0 &&
-
- {errorMsg}
- }
- {statusMsg.length > 0 &&
- {statusMsg}
- }
-
-
- {entry.new
- ? "No stored block yet, you can add one below:"
- : Editing domain blocks is not implemented yet, check here for progress.
- }
-
-
- );
-}
\ No newline at end of file
diff --git a/web/source/settings/admin/federation/detail.js b/web/source/settings/admin/federation/detail.js
new file mode 100644
index 000000000..7324a42a5
--- /dev/null
+++ b/web/source/settings/admin/federation/detail.js
@@ -0,0 +1,146 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see Federation settings for: {domain}
- {entry.new
- ? "No stored block yet, you can add one below:"
- : Editing domain blocks is not implemented yet, check here for progress.
- }
-
-
- {entry.new
- ?
- :
- }
-
- {errorMsg.length > 0 &&
-
- {errorMsg}
- }
- {statusMsg.length > 0 &&
- {statusMsg}
- }
-
+
+ Editing domain blocks isn't implemented yet, check here for progress
+
+ );
+ }
+
+ return (
+
+
+ {infoContent}
+
+ );
+};
+
+function DomainBlockForm({ defaultDomain, block = {} }) {
+ const isExistingBlock = block.domain != undefined;
+
+ const disabledForm = isExistingBlock
+ ? {
+ disabled: true,
+ title: "Domain suspensions currently cannot be edited."
+ }
+ : {};
+
+ const form = {
+ domain: useTextInput("domain", { defaultValue: block.domain ?? defaultDomain }),
+ obfuscate: useBoolInput("obfuscate", { defaultValue: block.obfuscate }),
+ commentPrivate: useTextInput("private_comment", { defaultValue: block.private_comment }),
+ commentPublic: useTextInput("public_comment", { defaultValue: block.public_comment })
+ };
+
+ const [submitForm, addResult] = useFormSubmit(form, query.useAddInstanceBlockMutation(), { changedOnly: false });
+
+ const [removeBlock, removeResult] = query.useRemoveInstanceBlockMutation({ fixedCacheKey: block.id });
+
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/web/source/settings/admin/federation/import-export.js b/web/source/settings/admin/federation/import-export.js
new file mode 100644
index 000000000..a11174b1f
--- /dev/null
+++ b/web/source/settings/admin/federation/import-export.js
@@ -0,0 +1,307 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see
+ {infoContent}
+ + { + parseResult.reset(); + setLocation(baseUrl); + }}> + < back + Confirm import: +
+Import / Export suspended domains
+ +
+
+
+ {parseResult.error &&
+ {entry[commentType]}
+ + ); +} \ No newline at end of file diff --git a/web/source/settings/components/submit.jsx b/web/source/settings/admin/federation/index.js similarity index 59% rename from web/source/settings/components/submit.jsx rename to web/source/settings/admin/federation/index.js index 2a1b864e3..beaa6e1c5 100644 --- a/web/source/settings/components/submit.jsx +++ b/web/source/settings/admin/federation/index.js @@ -19,17 +19,26 @@ "use strict"; const React = require("react"); +const { Switch, Route } = require("wouter"); -module.exports = function Submit({onClick, label, errorMsg, statusMsg}) { +const baseUrl = `/settings/admin/federation`; + +const InstanceOverview = require("./overview"); +const InstanceDetail = require("./detail"); +const InstanceImportExport = require("./import-export"); + +module.exports = function Federation({ }) { return ( -
-
- {errorMsg.length > 0 &&
-
+ {errorMsg}
- }
- {statusMsg.length > 0 &&
- {statusMsg}
- }
- Federation
+ +
+
+ Or use the bulk import/export interface
+
+ );
+};
\ No newline at end of file
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);
+ FileInput
+} = require("../components/form/inputs");
+
+const FormWithData = require("../lib/form/form-with-data");
+const MutationButton = require("../components/form/mutation-button");
module.exports = function AdminSettings() {
- const dispatch = Redux.useDispatch();
- const instance = Redux.useSelector(state => state.instances.adminSettings);
-
- const [errorMsg, setError] = React.useState("");
- const [statusMsg, setStatus] = React.useState("");
-
- const updateSettings = submit(
- () => dispatch(api.admin.updateInstance()),
- {setStatus, setError}
+ return (
+ Suspended instances
+
+ Suspending a domain blocks all current and future accounts on that instance. Stored content will be removed,
+ and no more data is sent to the remote server.
+ This extends to all subdomains as well, so blocking 'example.com' also includes 'social.example.com'.
+
+
+ {blockedInstancesList.length} blocked instance{blockedInstancesList.length != 1 ? "s" : ""} {filtered > 0 && `(${filtered} filtered by search)`}
+
+
+
+ {filteredInstances.map((entry) => {
+ return (
+
+
+
+ {entry.domain}
+
+
+ {new Date(entry.created_at).toLocaleString()}
+
+
+
+ );
+ })}
+
+
+
+
+
+ );
+ } else if (error != undefined) {
+ content = (
+
+
+ );
+ }
+
+ if (loginState == "login" && isSuccess) {
+ return GoToSocial Settings
+ {content} + {showLogin &&
+
+ );
+ } else if (result.isSuccess) {
+ return (
+
+
+ );
+ }
+
+ return (
+
+ );
+};
\ No newline at end of file
diff --git a/web/source/settings/components/back-button.jsx b/web/source/settings/components/back-button.jsx
index d95f82a73..9e849dee0 100644
--- a/web/source/settings/components/back-button.jsx
+++ b/web/source/settings/components/back-button.jsx
@@ -21,7 +21,7 @@
const React = require("react");
const { Link } = require("wouter");
-module.exports = function BackButton({to}) {
+module.exports = function BackButton({ to }) {
return (
< back
diff --git a/web/source/settings/components/check-list.jsx b/web/source/settings/components/check-list.jsx
new file mode 100644
index 000000000..1276d5dbf
--- /dev/null
+++ b/web/source/settings/components/check-list.jsx
@@ -0,0 +1,58 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see
+
+ {Object.values(field.value).map((entry) => (
+ field.onChange(entry.key, value)}
+ entry={entry}
+ Component={Component}
+ componentProps={componentProps}
+ />
+ ))}
+
+ );
+};
+
+function CheckListEntry({ entry, onChange, Component, componentProps }) {
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/web/source/settings/components/combo-box.jsx b/web/source/settings/components/combo-box.jsx
index 07d4abb6c..aaa56daac 100644
--- a/web/source/settings/components/combo-box.jsx
+++ b/web/source/settings/components/combo-box.jsx
@@ -26,21 +26,21 @@ const {
ComboboxPopover,
} = require("ariakit/combobox");
-module.exports = function ComboBox({state, items, label, placeHolder, children}) {
+module.exports = function ComboBox({ field, items, label, children, ...inputProps }) {
return (
-
+
{items.map(([key, value]) => (
{value}
diff --git a/web/source/settings/components/error.jsx b/web/source/settings/components/error.jsx
index 5d808c467..bc64bf9ec 100644
--- a/web/source/settings/components/error.jsx
+++ b/web/source/settings/components/error.jsx
@@ -20,7 +20,7 @@
const React = require("react");
-module.exports = function ErrorFallback({error, resetErrorBoundary}) {
+function ErrorFallback({ error, resetErrorBoundary }) {
return (
);
-};
\ No newline at end of file
+}
+
+function Error({ error }) {
+ /* eslint-disable-next-line no-console */
+ console.error("Rendering error:", error);
+ let message;
+
+ if (error.data != undefined) { // RTK Query error with data
+ if (error.status) {
+ message = (<>
+ {error.status}: {error.data.error}
+ {error.data.error_description &&
+
@@ -28,7 +28,7 @@ module.exports = function ErrorFallback({error, resetErrorBoundary}) {
GoToSocial issue tracker
{" or "}
Matrix support room.
-
Include the details below:
+
Include the details below:
{error.name}: {error.message}
@@ -41,4 +41,43 @@ module.exports = function ErrorFallback({error, resetErrorBoundary}) {
+ {error.data.error_description} +
+ } + ); + } else { + message = error.data.error; + } + } else if (error.name != undefined || error.type != undefined) { // JS error + message = (<> + {error.type && error.name}: {error.message} + ); + } else if (error.status && typeof error.error == "string") { + message = (<> + {error.status}: {error.error} + ); + } else { + message = error.message ?? error; + } + + return ( +
+ {message}
+
+ );
+}
+
+module.exports = { ErrorFallback, Error };
\ No newline at end of file
diff --git a/web/source/settings/components/fake-profile.jsx b/web/source/settings/components/fake-profile.jsx
index 8afccf2cc..c326605d9 100644
--- a/web/source/settings/components/fake-profile.jsx
+++ b/web/source/settings/components/fake-profile.jsx
@@ -19,24 +19,21 @@
"use strict";
const React = require("react");
-const Redux = require("react-redux");
-
-module.exports = function FakeProfile({}) {
- const account = Redux.useSelector(state => state.user.profile);
+module.exports = function FakeProfile({ avatar, header, display_name, username, role }) {
return ( // Keep in sync with web/template/profile.tmpl
- 
+ 
- 
- 
+
diff --git a/web/source/settings/components/fake-toot.jsx b/web/source/settings/components/fake-toot.jsx
index 836ac62f8..b6e05154e 100644
--- a/web/source/settings/components/fake-toot.jsx
+++ b/web/source/settings/components/fake-toot.jsx
@@ -19,16 +19,21 @@
"use strict";
const React = require("react");
-const Redux = require("react-redux");
-module.exports = function FakeToot({children}) {
- const account = Redux.useSelector((state) => state.user.profile);
+const query = require("../lib/query");
+
+module.exports = function FakeToot({ children }) {
+ const { data: account = {
+ avatar: "/assets/default_avatars/GoToSocial_icon1.png",
+ display_name: "",
+ username: ""
+ } } = query.useVerifyCredentialsQuery();
return (
{account.display_name.trim().length > 0 ? account.display_name : account.username}
+ {display_name.trim().length > 0 ? display_name : username}
-
@{account.username}
- {(account.role && account.role != "user") &&
- {account.role}
+ @{username}
+ {(role && role != "user") &&
+ {role}
}
-
+
{account.display_name.trim().length > 0 ? account.display_name : account.username}
@{account.username}
diff --git a/web/source/settings/components/form-fields.jsx b/web/source/settings/components/form-fields.jsx
deleted file mode 100644
index 7b393b3ef..000000000
--- a/web/source/settings/components/form-fields.jsx
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
-
- );
-};
\ No newline at end of file
diff --git a/web/source/settings/components/nav-button.jsx b/web/source/settings/components/nav-button.jsx
index 127193471..ef4717c89 100644
--- a/web/source/settings/components/nav-button.jsx
+++ b/web/source/settings/components/nav-button.jsx
@@ -21,7 +21,7 @@
const React = require("react");
const { Link, useRoute } = require("wouter");
-module.exports = function NavButton({href, name}) {
+module.exports = function NavButton({ href, name }) {
const [isActive] = useRoute(`${href}/:anything?`);
return (
diff --git a/web/source/settings/index.js b/web/source/settings/index.js
index fb9eb79f7..6de72581e 100644
--- a/web/source/settings/index.js
+++ b/web/source/settings/index.js
@@ -18,20 +18,16 @@
"use strict";
-const Promise = require("bluebird");
const React = require("react");
const ReactDom = require("react-dom/client");
-const Redux = require("react-redux");
-const { Switch, Route, Redirect } = require("wouter");
const { Provider } = require("react-redux");
const { PersistGate } = require("redux-persist/integration/react");
+const { Switch, Route, Redirect } = require("wouter");
+
+const query = require("./lib/query");
const { store, persistor } = require("./redux");
-const api = require("./lib/api");
-const oauth = require("./redux/reducers/oauth").actions;
-const { AuthenticationError } = require("./lib/errors");
-
-const Login = require("./components/login");
+const AuthorizationGate = require("./components/authorization");
const Loading = require("./components/loading");
require("./style.css");
@@ -46,7 +42,7 @@ const nav = {
adminOnly: true,
"Instance Settings": require("./admin/settings.js"),
"Actions": require("./admin/actions"),
- "Federation": require("./admin/federation.js"),
+ "Federation": require("./admin/federation"),
},
"Custom Emoji": {
adminOnly: true,
@@ -57,123 +53,37 @@ const nav = {
const { sidebar, panelRouter } = require("./lib/get-views")(nav);
-function App() {
- const dispatch = Redux.useDispatch();
+function App({ account }) {
+ const isAdmin = account.role == "admin";
+ const [logoutQuery] = query.useLogoutMutation();
- const { loginState, isAdmin } = Redux.useSelector((state) => state.oauth);
- const reduxTempStatus = Redux.useSelector((state) => state.temporary.status);
-
- const [errorMsg, setErrorMsg] = React.useState();
- const [tokenChecked, setTokenChecked] = React.useState(false);
-
- React.useEffect(() => {
- if (loginState == "login" || loginState == "callback") {
- Promise.try(() => {
- // Process OAUTH authorization token from URL if available
- if (loginState == "callback") {
- let urlParams = new URLSearchParams(window.location.search);
- let code = urlParams.get("code");
-
- if (code == undefined) {
- setErrorMsg(new Error("Waiting for OAUTH callback but no ?code= provided. You can try logging in again:"));
- } else {
- return dispatch(api.oauth.tokenize(code));
- }
- }
- }).then(() => {
- // Fetch current instance info
- return dispatch(api.instance.fetch());
- }).then(() => {
- // Check currently stored auth token for validity if available
- return dispatch(api.user.fetchAccount());
- }).then(() => {
- setTokenChecked(true);
-
- return dispatch(api.oauth.checkIfAdmin());
- }).catch((e) => {
- if (e instanceof AuthenticationError) {
- dispatch(oauth.remove());
- e.message = "Stored OAUTH token no longer valid, please log in again.";
- }
- setErrorMsg(e);
- console.error(e);
- });
- }
- }, [loginState, dispatch]);
-
- let ErrorElement = null;
- if (errorMsg != undefined) {
- ErrorElement = (
-
- {defaultLabel ? label : null} {field}
- {children}
-
- );
- }
-
- return {
- TextInput: function(props) {
- return
+
+
+ );
+}
+
+function TextArea({ label, field, ...inputProps }) {
+ const { onChange, value, ref } = field;
+
+ return (
+
+
+
+ );
+}
+
+function FileInput({ label, field, ...inputProps }) {
+ const { onChange, ref, infoComponent } = field;
+
+ return (
+
+
+
+ );
+}
+
+function Checkbox({ label, field, ...inputProps }) {
+ const { onChange, value } = field;
+
+ return (
+
+
+
+ );
+}
+
+function Select({ label, field, options, ...inputProps }) {
+ const { onChange, value, ref } = field;
+
+ return (
+
+
+
+ );
+}
+
+function RadioGroup({ field, label, ...inputProps }) {
+ return (
+
+ {Object.entries(field.options).map(([value, radioLabel]) => (
+
+ ))}
+ {label}
+
+ );
+}
+
+module.exports = {
+ TextInput,
+ TextArea,
+ FileInput,
+ Checkbox,
+ Select,
+ RadioGroup
+};
\ No newline at end of file
diff --git a/web/source/settings/components/form/mutation-button.jsx b/web/source/settings/components/form/mutation-button.jsx
new file mode 100644
index 000000000..97bcdf08d
--- /dev/null
+++ b/web/source/settings/components/form/mutation-button.jsx
@@ -0,0 +1,49 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see
+ {(showError && targetsThisButton && result.error) &&
+
+ );
+};
\ No newline at end of file
diff --git a/web/source/settings/components/loading.jsx b/web/source/settings/components/loading.jsx
index f5648285b..a278e6466 100644
--- a/web/source/settings/components/loading.jsx
+++ b/web/source/settings/components/loading.jsx
@@ -22,6 +22,6 @@ const React = require("react");
module.exports = function Loading() {
return (
-
+
);
};
\ No newline at end of file
diff --git a/web/source/settings/components/login.jsx b/web/source/settings/components/login.jsx
deleted file mode 100644
index 4774423fc..000000000
--- a/web/source/settings/components/login.jsx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see OAUTH Login:
- {error} - -
- {errorMsg.type}
- {errorMsg.message}
+ return (
+ <>
+
+
+ {panelRouter.all}
+ {isAdmin && panelRouter.admin}
+
+
+
+
+
);
-
- if (reduxTempStatus != undefined) {
- return (
-
- {reduxTempStatus}
-
- );
- } else if (tokenChecked && loginState == "login") {
- return (
- <>
-
- {ErrorElement}
-
- {panelRouter.all}
- {isAdmin && panelRouter.admin}
- {/* default route */}
-
-
-
-
- );
- } else if (loginState == "none") {
- return (
-
-
- );
- }
-
}
function Main() {
return (
-
);
diff --git a/web/source/settings/lib/api/admin.js b/web/source/settings/lib/api/admin.js
deleted file mode 100644
index 848772db7..000000000
--- a/web/source/settings/lib/api/admin.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- GoToSocial
- Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
+
{ }}>
{/* FIXME: implement onReset */}
+ {sidebar.all}
+ {isAdmin && sidebar.admin}
+
- );
- }
-
- const LogoutElement = (
-
+
- {sidebar.all}
- {isAdmin && sidebar.admin}
- {LogoutElement}
-
-
- {status}
-
- {ErrorElement}
- {LogoutElement}
-
+
+ );
+ } else {
+ return
- {result.error &&
- {result.error.status}: {result.error.data.error}
- }
-
-
- );
};
\ No newline at end of file
diff --git a/web/source/settings/redux/reducers/instances.js b/web/source/settings/lib/form/index.js
similarity index 54%
rename from web/source/settings/redux/reducers/instances.js
rename to web/source/settings/lib/form/index.js
index c58f068ca..aef3bf0d2 100644
--- a/web/source/settings/redux/reducers/instances.js
+++ b/web/source/settings/lib/form/index.js
@@ -18,25 +18,29 @@
"use strict";
-const {createSlice} = require("@reduxjs/toolkit");
-const d = require("dotty");
+function capitalizeFirst(str) {
+ return str.slice(0, 1).toUpperCase() + str.slice(1);
+}
-module.exports = createSlice({
- name: "instances",
- initialState: {
- info: {},
- },
- reducers: {
- setNamedInstanceInfo: (state, {payload}) => {
- let [key, info] = payload;
- state.info[key] = info;
- },
- setInstanceInfo: (state, {payload}) => {
- state.current = payload;
- state.adminSettings = payload;
- },
- setAdminSettingsVal: (state, {payload: [key, val]}) => {
- d.put(state.adminSettings, key, val);
- }
+function makeHook(func) {
+ return (name, ...args) => func({
+ name,
+ Name: capitalizeFirst(name)
+ }, ...args);
+}
+
+module.exports = {
+ useTextInput: makeHook(require("./text")),
+ useFileInput: makeHook(require("./file")),
+ useBoolInput: makeHook(require("./bool")),
+ useRadioInput: makeHook(require("./radio")),
+ useComboBoxInput: makeHook(require("./combo-box")),
+ useCheckListInput: makeHook(require("./check-list")),
+ useValue: function (name, value) {
+ return {
+ name,
+ value,
+ hasChanged: () => true // always included
+ };
}
-});
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/web/source/settings/lib/form/radio.jsx b/web/source/settings/lib/form/radio.jsx
new file mode 100644
index 000000000..47ab6c726
--- /dev/null
+++ b/web/source/settings/lib/form/radio.jsx
@@ -0,0 +1,51 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see
+
+
+
+
-
);
-};
+}
function PasswordChange() {
- const dispatch = Redux.useDispatch();
+ const form = {
+ oldPassword: useTextInput("old_password"),
+ newPassword: useTextInput("old_password", {
+ validator(val) {
+ if (val != "" && val == form.oldPassword.value) {
+ return "New password same as old password";
+ }
+ return "";
+ }
+ })
+ };
- const [errorMsg, setError] = React.useState("");
- const [statusMsg, setStatus] = React.useState("");
-
- const [oldPassword, setOldPassword] = React.useState("");
- const [newPassword, setNewPassword] = React.useState("");
- const [newPasswordConfirm, setNewPasswordConfirm] = React.useState("");
-
- function changePassword() {
- if (newPassword !== newPasswordConfirm) {
- setError("New password and confirm new password did not match!");
- return;
+ const verifyNewPassword = useTextInput("verifyNewPassword", {
+ validator(val) {
+ if (val != "" && val != form.newPassword.value) {
+ return "Passwords do not match";
+ }
+ return "";
}
+ });
- setStatus("PATCHing");
- setError("");
- return Promise.try(() => {
- let data = {
- old_password: oldPassword,
- new_password: newPassword
- };
- return dispatch(api.apiCall("POST", "/api/v1/user/password_change", data, "form"));
- }).then(() => {
- setStatus("Saved!");
- setOldPassword("");
- setNewPassword("");
- setNewPasswordConfirm("");
- }).catch((e) => {
- setError(e.message);
- setStatus("");
- });
- }
+ const [submitForm, result] = useFormSubmit(form, query.usePasswordChangeMutation());
return (
- <>
+
);
}
\ No newline at end of file
diff --git a/web/source/yarn.lock b/web/source/yarn.lock
index 5cdffe70c..91b20e156 100644
--- a/web/source/yarn.lock
+++ b/web/source/yarn.lock
@@ -2463,11 +2463,6 @@ domain-browser@^1.2.0:
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-dotty@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/dotty/-/dotty-0.1.2.tgz#512d44cc4111a724931226259297f235e8484f6f"
- integrity sha512-V0EWmKeH3DEhMwAZ+8ZB2Ao4OK6p++Z0hsDtZq3N0+0ZMVqkzrcEGROvOnZpLnvBg5PTNG23JEDLAm64gPaotQ==
-
duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2, duplexer2@~0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -2653,6 +2648,13 @@ escodegen@^1.11.1:
optionalDependencies:
source-map "~0.6.1"
+eslint-plugin-license-header@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-license-header/-/eslint-plugin-license-header-0.6.0.tgz#81b0bab59da5a752d3a129f04bd0ca35bb6b07a2"
+ integrity sha512-IEywStBWaDBDMkogYoKUAdaOuomZ+YaQmdoSD2vHmXobekM+XuP6SWLlvwUUhIbdocn3MTlb5CUJ8E4VHz1c/w==
+ dependencies:
+ requireindex "^1.2.0"
+
eslint-plugin-react-hooks@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
@@ -4631,6 +4633,11 @@ remove-accents@0.4.2:
resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
integrity sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA==
+requireindex@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
+ integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==
+
requires-port@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"