From 637f188ebec71fe4b0b80bbab4592d4c269d7d93 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:46:06 +0200 Subject: [feature] Allow import/export/creation of domain allows via admin panel (#2264) * it's happening! * aaa * fix silly whoopsie * it's working pa! it's working ma! * model report parameters * shuffle some more stuff around * getting there * oo hoo * finish tidying up for now * aaa * fix use form submit errors * peepee poo poo * aaaaa * ffff * they see me typin', they hatin' * boop * aaa * oooo * typing typing tappa tappa * almost done typing * weee * alright * push it push it real good doo doo doo doo doo doo * thingy no worky * almost done * mutation modifers not quite right * hmm * it works * view blocks + allows nicely * it works! * typia install * the old linterino * linter plz --- web/source/settings/admin/emoji/remote/index.js | 4 ++-- web/source/settings/admin/emoji/remote/parse-from-toot.js | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'web/source/settings/admin/emoji/remote') diff --git a/web/source/settings/admin/emoji/remote/index.js b/web/source/settings/admin/emoji/remote/index.js index e877efb89..1a8c719dd 100644 --- a/web/source/settings/admin/emoji/remote/index.js +++ b/web/source/settings/admin/emoji/remote/index.js @@ -21,9 +21,9 @@ const React = require("react"); const ParseFromToot = require("./parse-from-toot"); -const query = require("../../../lib/query"); const Loading = require("../../../components/loading"); const { Error } = require("../../../components/error"); +const { useListEmojiQuery } = require("../../../lib/query/admin/custom-emoji"); module.exports = function RemoteEmoji() { // local emoji are queried for shortcode collision detection @@ -31,7 +31,7 @@ module.exports = function RemoteEmoji() { data: emoji = [], isLoading, error - } = query.useListEmojiQuery({ filter: "domain:local" }); + } = useListEmojiQuery({ filter: "domain:local" }); const emojiCodes = React.useMemo(() => { return new Set(emoji.map((e) => e.shortcode)); diff --git a/web/source/settings/admin/emoji/remote/parse-from-toot.js b/web/source/settings/admin/emoji/remote/parse-from-toot.js index e6438a4d2..503a341c8 100644 --- a/web/source/settings/admin/emoji/remote/parse-from-toot.js +++ b/web/source/settings/admin/emoji/remote/parse-from-toot.js @@ -19,25 +19,27 @@ const React = require("react"); -const query = require("../../../lib/query"); - const { useTextInput, useComboBoxInput, useCheckListInput } = require("../../../lib/form"); -const useFormSubmit = require("../../../lib/form/submit"); +const useFormSubmit = require("../../../lib/form/submit").default; -const CheckList = require("../../../components/check-list"); +const CheckList = require("../../../components/check-list").default; const { CategorySelect } = require('../category-select'); const { TextInput } = require("../../../components/form/inputs"); const MutationButton = require("../../../components/form/mutation-button"); const { Error } = require("../../../components/error"); +const { + useSearchItemForEmojiMutation, + usePatchRemoteEmojisMutation +} = require("../../../lib/query/admin/custom-emoji"); module.exports = function ParseFromToot({ emojiCodes }) { - const [searchStatus, result] = query.useSearchStatusForEmojiMutation(); + const [searchStatus, result] = useSearchItemForEmojiMutation(); const [onURLChange, _resetURL, { url }] = useTextInput("url"); @@ -121,7 +123,7 @@ function CopyEmojiForm({ localEmojiCodes, type, emojiList }) { const [formSubmit, result] = useFormSubmit( form, - query.usePatchRemoteEmojisMutation(), + usePatchRemoteEmojisMutation(), { changedOnly: false, onFinish: ({ data }) => { -- cgit v1.3