Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-01-23 10:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Finish merge

Browse source
This commit is contained in:
SergeantPanda 2025-10-05 18:44:26 -05:00
parent e6a9672a14
commit cedd0d6f4d
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/components/forms/ChannelBatch.jsx
View file

@ -29,14 +29,11 @@ import { FixedSizeList as List } from 'react-window';
import { useForm } from '@mantine/form';
import { notifications } from '@mantine/notifications';
import { USER_LEVELS, USER_LEVEL_LABELS } from '../../constants';
<<<<<<< HEAD
import { useChannelLogoSelection } from '../../hooks/useSmartLogos';
import LazyLogo from '../LazyLogo';
import logo from '../../images/logo.png';
=======
import ConfirmationDialog from '../ConfirmationDialog';
import useWarningsStore from '../../store/warnings';
>>>>>>> Main-Project/dev
const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
const theme = useMantineTheme();
@ -68,10 +65,8 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
const [groupFilter, setGroupFilter] = useState('');
const groupOptions = Object.values(channelGroups);
<<<<<<< HEAD
const [logoPopoverOpened, setLogoPopoverOpened] = useState(false);
const [logoFilter, setLogoFilter] = useState('');
=======
// Confirmation dialog states
const [confirmSetNamesOpen, setConfirmSetNamesOpen] = useState(false);
const [confirmSetLogosOpen, setConfirmSetLogosOpen] = useState(false);
@ -79,7 +74,6 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
const [confirmClearEpgsOpen, setConfirmClearEpgsOpen] = useState(false);
const isWarningSuppressed = useWarningsStore((s) => s.isWarningSuppressed);
const suppressWarning = useWarningsStore((s) => s.suppressWarning);
>>>>>>> Main-Project/dev
const form = useForm({
mode: 'uncontrolled',
@ -785,7 +779,6 @@ const ChannelBatchForm = ({ channelIds, isOpen, onClose }) => {
)}
</Group>
<Select
id="stream_profile_id"
label="Stream Profile"