Merge branch 'dev' of https://github.com/Dispatcharr/Dispatcharr into pr/nick4810/761

frontend/src/components/tables/ChannelsTable.jsx

@@ -386,6 +386,15 @@ const ChannelsTable = ({ onReady }) => {
     params.append('page', pagination.pageIndex + 1);
     params.append('page_size', pagination.pageSize);
     params.append('include_streams', 'true');
+    if (selectedProfileId !== '0') {
+      params.append('channel_profile_id', selectedProfileId);
+    }
+    if (showDisabled === true) {
+      params.append('show_disabled', true);
+    }
+    if (showOnlyStreamlessChannels === true) {
+      params.append('only_streamless', true);
+    }
 
     // Apply sorting
     if (sorting.length > 0) {
@@ -428,7 +437,15 @@ const ChannelsTable = ({ onReady }) => {
       hasSignaledReady.current = true;
       onReady();
     }
-  }, [pagination, sorting, debouncedFilters, onReady]);
+  }, [
+    pagination,
+    sorting,
+    debouncedFilters,
+    onReady,
+    showDisabled,
+    selectedProfileId,
+    showOnlyStreamlessChannels,
+  ]);
 
   const stopPropagation = useCallback((e) => {
     e.stopPropagation();
@@ -1355,6 +1372,10 @@ const ChannelsTable = ({ onReady }) => {
             deleteChannels={deleteChannels}
             selectedTableIds={table.selectedTableIds}
             table={table}
+            showDisabled={showDisabled}
+            setShowDisabled={setShowDisabled}
+            showOnlyStreamlessChannels={showOnlyStreamlessChannels}
+            setShowOnlyStreamlessChannels={setShowOnlyStreamlessChannels}
           />
 
           {/* Table or ghost empty state inside Paper */}

frontend/src/components/tables/ChannelsTable/ChannelTableHeader.jsx

@@ -12,20 +12,22 @@ import {
   Text,
   TextInput,
   Tooltip,
-  UnstyledButton,
   useMantineTheme,
 } from '@mantine/core';
 import {
   ArrowDown01,
   Binary,
-  Check,
   CircleCheck,
-  Ellipsis,
   EllipsisVertical,
   SquareMinus,
   SquarePen,
   SquarePlus,
   Settings,
+  Eye,
+  EyeOff,
+  Filter,
+  Square,
+  SquareCheck,
 } from 'lucide-react';
 import API from '../../../api';
 import { notifications } from '@mantine/notifications';
@@ -102,6 +104,10 @@ const ChannelTableHeader = ({
   editChannel,
   deleteChannels,
   selectedTableIds,
+  showDisabled,
+  setShowDisabled,
+  showOnlyStreamlessChannels,
+  setShowOnlyStreamlessChannels,
 }) => {
   const theme = useMantineTheme();
 
@@ -208,6 +214,14 @@ const ChannelTableHeader = ({
     );
   };
 
+  const toggleShowDisabled = () => {
+    setShowDisabled(!showDisabled);
+  };
+
+  const toggleShowOnlyStreamlessChannels = () => {
+    setShowOnlyStreamlessChannels(!showOnlyStreamlessChannels);
+  };
+
   return (
     <Group justify="space-between">
       <Group gap={5} style={{ paddingLeft: 10 }}>
@@ -236,6 +250,41 @@ const ChannelTableHeader = ({
         }}
       >
         <Flex gap={6}>
+          <Menu shadow="md" width={200}>
+            <Menu.Target>
+              <Button size="xs" variant="default" onClick={() => {}}>
+                <Filter size={18} />
+              </Button>
+            </Menu.Target>
+
+            <Menu.Dropdown>
+              <Menu.Item
+                onClick={toggleShowDisabled}
+                leftSection={
+                  showDisabled ? <Eye size={18} /> : <EyeOff size={18} />
+                }
+                disabled={selectedProfileId === '0'}
+              >
+                <Text size="xs">
+                  {showDisabled ? 'Hide Disabled' : 'Show Disabled'}
+                </Text>
+              </Menu.Item>
+
+              <Menu.Item
+                onClick={toggleShowOnlyStreamlessChannels}
+                leftSection={
+                  showOnlyStreamlessChannels ? (
+                    <SquareCheck size={18} />
+                  ) : (
+                    <Square size={18} />
+                  )
+                }
+              >
+                <Text size="xs">Only Empty Channels</Text>
+              </Menu.Item>
+            </Menu.Dropdown>
+          </Menu>
+
           <Button
             leftSection={<SquarePen size={18} />}
             variant="default"

frontend/src/pages/Settings.jsx

@@ -191,6 +191,8 @@ const SettingsPage = () => {
     useState(false);
   const [netNetworkAccessConfirmCIDRs, setNetNetworkAccessConfirmCIDRs] =
     useState([]);
+    
+  const [clientIpAddress, setClientIpAddress] = useState(null);
 
   const [proxySettingsSaved, setProxySettingsSaved] = useState(false);
   const [generalSettingsSaved, setGeneralSettingsSaved] = useState(false);
@@ -508,6 +510,9 @@ const SettingsPage = () => {
       return;
     }
 
+    // Store the client IP
+    setClientIpAddress(check.client_ip);
+
     // For now, only warn if we're blocking the UI
     const blockedAccess = check.UI;
     if (blockedAccess.length == 0) {
@@ -1365,7 +1370,7 @@ Please ensure you have time to let this complete before proceeding.`}
         message={
           <>
             <Text>
-              Your client is not included in the allowed networks for the web
+              Your client {clientIpAddress && `(${clientIpAddress}) `}is not included in the allowed networks for the web
               UI. Are you sure you want to proceed?
             </Text>
 

frontend/src/pages/Stats.jsx

@@ -481,8 +481,8 @@ const VODCard = ({ vodContent, stopVODClient }) => {
                   size={16}
                   style={{
                     transform: isClientExpanded
-                      ? 'rotate(180deg)'
-                      : 'rotate(0deg)',
+                      ? 'rotate(0deg)'
+                      : 'rotate(180deg)',
                     transition: 'transform 0.2s',
                   }}
                 />