From 7a1e6394831fb07e303c5ed0900dfe1ea4820de5 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:12:47 +0200
Subject: [chore] Refactor settings panel routing (and other fixes) (#2864)
---
web/source/settings/admin/emoji/remote/index.tsx | 54 -----
.../admin/emoji/remote/parse-from-toot.tsx | 235 ---------------------
2 files changed, 289 deletions(-)
delete mode 100644 web/source/settings/admin/emoji/remote/index.tsx
delete mode 100644 web/source/settings/admin/emoji/remote/parse-from-toot.tsx
(limited to 'web/source/settings/admin/emoji/remote')
diff --git a/web/source/settings/admin/emoji/remote/index.tsx b/web/source/settings/admin/emoji/remote/index.tsx
deleted file mode 100644
index d9c786be2..000000000
--- a/web/source/settings/admin/emoji/remote/index.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- GoToSocial
- Copyright (C) GoToSocial Authors admin@gotosocial.org
- SPDX-License-Identifier: AGPL-3.0-or-later
-
- 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 .
-*/
-
-import React, { useMemo } from "react";
-
-import ParseFromToot from "./parse-from-toot";
-
-import Loading from "../../../components/loading";
-import { Error } from "../../../components/error";
-import { useListEmojiQuery } from "../../../lib/query/admin/custom-emoji";
-
-export default function RemoteEmoji() {
- // local emoji are queried for shortcode collision detection
- const {
- data: emoji = [],
- isLoading,
- error
- } = useListEmojiQuery({ filter: "domain:local" });
-
- const emojiCodes = useMemo(() => {
- return new Set(emoji.map((e) => e.shortcode));
- }, [emoji]);
-
- return (
- <>
-
Custom Emoji (remote)
- {error &&
-
- }
- {isLoading
- ?
- : <>
-
- >
- }
- >
- );
-}
diff --git a/web/source/settings/admin/emoji/remote/parse-from-toot.tsx b/web/source/settings/admin/emoji/remote/parse-from-toot.tsx
deleted file mode 100644
index df1c221ba..000000000
--- a/web/source/settings/admin/emoji/remote/parse-from-toot.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- GoToSocial
- Copyright (C) GoToSocial Authors admin@gotosocial.org
- SPDX-License-Identifier: AGPL-3.0-or-later
-
- 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 .
-*/
-
-import React, { useCallback, useEffect } from "react";
-
-import { useTextInput, useComboBoxInput, useCheckListInput } from "../../../lib/form";
-
-import useFormSubmit from "../../../lib/form/submit";
-
-import CheckList from "../../../components/check-list";
-import { CategorySelect } from '../category-select';
-
-import { TextInput } from "../../../components/form/inputs";
-import MutationButton from "../../../components/form/mutation-button";
-import { Error } from "../../../components/error";
-import { useSearchItemForEmojiMutation, usePatchRemoteEmojisMutation } from "../../../lib/query/admin/custom-emoji";
-
-export default function ParseFromToot({ emojiCodes }) {
- const [searchStatus, result] = useSearchItemForEmojiMutation();
- const urlField = useTextInput("url");
-
- function submitSearch(e) {
- e.preventDefault();
- if (urlField.value !== undefined && urlField.value.trim().length != 0) {
- searchStatus(urlField.value);
- }
- }
-
- return (
-
- );
-}
-
-function SearchResult({ result, localEmojiCodes }) {
- const { error, data, isSuccess, isError } = result;
-
- if (!(isSuccess || isError)) {
- return null;
- }
-
- if (error == "NONE_FOUND") {
- return "No results found";
- } else if (error == "LOCAL_INSTANCE") {
- return This is a local user/toot, all referenced emoji are already on your instance;
- } else if (error != undefined) {
- return ;
- }
-
- if (data.list.length == 0) {
- return This {data.type == "statuses" ? "toot" : "account"} doesn't use any custom emoji;
- }
-
- return (
-
- );
-}
-
-function CopyEmojiForm({ localEmojiCodes, type, emojiList }) {
- const form = {
- selectedEmoji: useCheckListInput("selectedEmoji", {
- entries: emojiList,
- uniqueKey: "id"
- }),
- category: useComboBoxInput("category")
- };
-
- const [formSubmit, result] = useFormSubmit(
- form,
- usePatchRemoteEmojisMutation(),
- {
- changedOnly: false,
- onFinish: ({ data }) => {
- if (data) {
- // uncheck all successfully processed emoji
- const processed = data.map((emoji) => {
- return [emoji.id, { checked: false }];
- });
- form.selectedEmoji.updateMultiple(processed);
- }
- }
- }
- );
-
- const buttonsInactive = form.selectedEmoji.someSelected
- ? {
- disabled: false,
- title: ""
- }
- : {
- disabled: true,
- title: "No emoji selected, cannot perform any actions"
- };
-
- const checkListExtraProps = useCallback(() => ({ localEmojiCodes }), [localEmojiCodes]);
-
- return (
-
-
This {type == "statuses" ? "toot" : "account"} uses the following custom emoji, select the ones you want to copy/disable:
-
-
- );
-}
-
-function ErrorList({ errors }) {
- return (
-
- One or multiple emoji failed to process:
- {errors.map(([shortcode, err]) => (
-
- {shortcode}: {err}
-
- ))}
-
- );
-}
-
-function EmojiEntry({ entry: emoji, onChange, extraProps: { localEmojiCodes } }) {
- const shortcodeField = useTextInput("shortcode", {
- defaultValue: emoji.shortcode,
- validator: function validateShortcode(code) {
- return (emoji.checked && localEmojiCodes.has(code))
- ? "Shortcode already in use"
- : "";
- }
- });
-
- useEffect(() => {
- if (emoji.valid != shortcodeField.valid) {
- onChange({ valid: shortcodeField.valid });
- }
- }, [onChange, emoji.valid, shortcodeField.valid]);
-
- useEffect(() => {
- shortcodeField.validate();
- // only need this update if it's the emoji.checked that updated, not shortcodeField
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [emoji.checked]);
-
- return (
- <>
-
-
- {
- shortcodeField.onChange(e);
- onChange({ shortcode: e.target.value, checked: true });
- }}
- />
- >
- );
-}
\ No newline at end of file
--
cgit v1.3