diff --git a/web/default/src/features/channels/components/channel-card.tsx b/web/default/src/features/channels/components/channel-card.tsx index 1dabb1c6a1f..445261d301c 100644 --- a/web/default/src/features/channels/components/channel-card.tsx +++ b/web/default/src/features/channels/components/channel-card.tsx @@ -100,7 +100,15 @@ function ChannelCardComponent({ {!isTagRow && selectCell && ( {selectCell} )} -
{typeCell}
+
+ {typeCell} +
{showStatusBadge && statusCell} @@ -113,7 +121,12 @@ function ChannelCardComponent({
{/* Left column */}
-
+
div]:!max-w-none [&>div]:w-full' + )} + > {!isTagRow && (
#{sensitiveVisible ? row.original.id : SENSITIVE_MASK} diff --git a/web/default/src/features/channels/components/channels-columns.tsx b/web/default/src/features/channels/components/channels-columns.tsx index 807e35c61bb..29ef7e9942d 100644 --- a/web/default/src/features/channels/components/channels-columns.tsx +++ b/web/default/src/features/channels/components/channels-columns.tsx @@ -570,6 +570,10 @@ export function useChannelsColumns( header: t('ID'), meta: { mobileHidden: true }, cell: ({ row }) => { + if (isTagAggregateRow(row.original)) { + return null + } + const id = row.getValue('id') as number return }, @@ -589,13 +593,16 @@ export function useChannelsColumns( if (isTagRow) { const tag = (row.original as TagRow).tag || name const childrenCount = (row.original as TagRow).children?.length || 0 + const channelCountLabel = t('{{count}} channel', { + count: childrenCount, + }) return ( -
+
-
- Tag:{tag} +
+ + {t('Tag:')} {tag} +
@@ -835,11 +845,16 @@ export function useChannelsColumns( if (isTagRow) { const childrenCount = (row.original as TagRow).children?.length || 0 const hasEnabled = status === 1 + const statusLabel = t(hasEnabled ? 'Active' : 'Inactive') + const aggregateStatusLabel = t('{{status}} ({{count}})', { + status: statusLabel, + count: childrenCount, + }) if (hasEnabled) { return (