mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-31 03:22:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] Settings refactor fix4 (#1383)

Browse source 
* fix error handling behavior in emoji overview and FormWithData components

* css: long domain cutoff

* unused require

* eslint vscode task
This commit is contained in:
f0x52 2023-01-25 09:47:55 +01:00 • committed by GitHub
commit 27d4e364e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
web/source/settings/lib/form/form-with-data.jsx
View file

@ -19,13 +19,14 @@
"use strict";
const React = require("react");
const { Error } = require("../../components/error");
const Loading = require("../../components/loading");
// Wrap Form component inside component that fires the RTK Query call,
// so Form will only be rendered when data is available to generate form-fields for
module.exports = function FormWithData({ dataQuery, DataForm, queryArg, ...formProps }) {
const { data, isLoading } = dataQuery(queryArg);
const { data, isLoading, isError, error } = dataQuery(queryArg);
if (isLoading) {
return (
@ -33,6 +34,10 @@ module.exports = function FormWithData({ dataQuery, DataForm, queryArg, ...formP
<Loading />
</div>
);
} else if (isError) {
return (
<Error error={error} />
);
} else {
return <DataForm data={data} {...formProps} />;
}