extern/gotosocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-23 00:33:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix] fix 'steal this look' form, uncheck entries after processing (#1454)

Browse Source
This commit is contained in:
f0x52 2023-02-07 18:34:54 +01:00 committed by GitHub
parent 4e4da19720
commit 52fbb3e584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/source/settings/admin/emoji/remote/parse-from-toot.js
View File

@ -115,12 +115,26 @@ function CopyEmojiForm({ localEmojiCodes, type, emojiList }) {
const form = {
selectedEmoji: useCheckListInput("selectedEmoji", {
entries: emojiList,
uniqueKey: "shortcode"
uniqueKey: "id"
}),
category: useComboBoxInput("category")
};
const [formSubmit, result] = useFormSubmit(form, query.usePatchRemoteEmojisMutation(), { changedOnly: false });
const [formSubmit, result] = useFormSubmit(
form,
query.usePatchRemoteEmojisMutation(),
{
changedOnly: false,
onFinish: ({ data }) => {
if (data != undefined) {
form.selectedEmoji.updateMultiple(
// uncheck all successfully processed emoji
data.map(([id]) => [id, { checked: false }])
);
}
}
}
);
const buttonsInactive = form.selectedEmoji.someSelected
? {}

2
web/source/settings/lib/form/check-list.jsx
View File

@ -171,7 +171,7 @@ module.exports = function useCheckListInput({ name }, { entries, uniqueKey = "ke
onChange,
selectedValues,
reset,
someSelected: state.someChecked,
someSelected: state.selectedEntries.size > 0,
updateMultiple,
toggleAll: {
ref: toggleAllRef,

11
web/source/settings/lib/form/submit.js
View File

@ -18,10 +18,11 @@
"use strict";
const Promise = require("bluebird");
const React = require("react");
const syncpipe = require("syncpipe");
module.exports = function useFormSubmit(form, mutationQuery, { changedOnly = true } = {}) {
module.exports = function useFormSubmit(form, mutationQuery, { changedOnly = true, onFinish } = {}) {
if (!Array.isArray(mutationQuery)) {
throw new ("useFormSubmit: mutationQuery was not an Array. Is a valid useMutation RTK Query provided?");
}
@ -64,7 +65,13 @@ module.exports = function useFormSubmit(form, mutationQuery, { changedOnly = tru
mutationData.action = action;
return runMutation(mutationData);
return Promise.try(() => {
return runMutation(mutationData);
}).then((res) => {
if (onFinish) {
return onFinish(res);
}
});
},
{
...result,

2
web/source/settings/lib/query/admin/custom-emoji.js
View File

@ -149,7 +149,7 @@ module.exports = (build) => ({
body: body
}).then(unwrapRes);
}).then((res) => {
data.push([emoji.shortcode, res]);
data.push([emoji.id, res]);
}).catch((e) => {
let msg = e.message ?? e;
if (e.data.error) {