diff options
| author |  f0x52 <f0x@cthu.lu> | 2023-02-06 09:19:56 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-06 09:19:56 +0100 |
| commit | 47daddc10c291ec67320dd2485bffc498ea44bdf (patch) | |
| tree | 530677541399c27cd292dfc0050a71273c35f098 /web/source/settings/admin/federation/import-export | |
| parent | [chore]: Bump codeberg.org/gruf/go-runners from 1.4.0 to 1.5.1 (#1428) (diff) | |
| download | gotosocial-47daddc10c291ec67320dd2485bffc498ea44bdf.tar.xz | |
[chore/frogend] Restructure form data default values / update from Query data (#1422)
* eslint: set console use to error to catch debug littering in CI
* remove debug logging
* some form field restructuring, fixes submitted updates not being reflected
* more form field restructuring
* remove debug logger
* simplify field updates
* fix react state set during render when submitting import file
* className instead of class
* show Select hints again
Diffstat (limited to 'web/source/settings/admin/federation/import-export')
3 files changed, 4 insertions, 10 deletions
diff --git a/web/source/settings/admin/federation/import-export/form.jsx b/web/source/settings/admin/federation/import-export/form.jsx index afd2d775d..7b6ad9206 100644 --- a/web/source/settings/admin/federation/import-export/form.jsx +++ b/web/source/settings/admin/federation/import-export/form.jsx @@ -36,13 +36,11 @@ const ExportFormatTable = require("./export-format-table"); module.exports = function ImportExportForm({ form, submitParse, parseResult }) { const [submitExport, exportResult] = useFormSubmit(form, query.useExportDomainListMutation()); - const [updateFromFile, setUpdateFromFile] = React.useState(false); - function fileChanged(e) { const reader = new FileReader(); reader.onload = function (read) { - form.domains.setter(read.target.result); - setUpdateFromFile(true); + form.domains.value = read.target.result; + submitParse(); }; reader.readAsText(e.target.files[0]); } @@ -54,10 +52,6 @@ module.exports = function ImportExportForm({ form, submitParse, parseResult }) { /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [exportResult]); - if (updateFromFile) { - setUpdateFromFile(false); - submitParse(); - } return ( <> <h1>Import / Export suspended domains</h1> diff --git a/web/source/settings/admin/federation/import-export/index.jsx b/web/source/settings/admin/federation/import-export/index.jsx index 3039b98f3..ca55296f8 100644 --- a/web/source/settings/admin/federation/import-export/index.jsx +++ b/web/source/settings/admin/federation/import-export/index.jsx @@ -40,7 +40,7 @@ module.exports = function ImportExport() { exportType: useTextInput("exportType", { defaultValue: "plain", dontReset: true }) }; - const [submitParse, parseResult] = useFormSubmit(form, query.useProcessDomainListMutation()); + const [submitParse, parseResult] = useFormSubmit(form, query.useProcessDomainListMutation(), { changedOnly: false }); const [_location, setLocation] = useLocation(); diff --git a/web/source/settings/admin/federation/import-export/process.jsx b/web/source/settings/admin/federation/import-export/process.jsx index 0b2d10099..6b9d98f01 100644 --- a/web/source/settings/admin/federation/import-export/process.jsx +++ b/web/source/settings/admin/federation/import-export/process.jsx @@ -234,7 +234,7 @@ const UpdateableEntry = React.memo( return ( <> <span className="text-cutoff">{entry.domain}</span> - <i class="fa fa-long-arrow-right" aria-hidden="true"></i> + <i className="fa fa-long-arrow-right" aria-hidden="true"></i> <span>{entry.suggest}</span> <a role="button" onClick={() => updateEntry(entry.key, { domain: entry.suggest, suggest: null }) |