mirror of
https://github.com/chillpadclub/bedolaga-cabinet.git
synced 2026-07-30 10:27:49 +00:00
feat: add per-channel disable settings and global settings to channel admin
- Add global settings section (CHANNEL_IS_REQUIRED_SUB, trial/paid toggles) at top of AdminChannelSubscriptions page - Add per-channel disable_trial_on_leave and disable_paid_on_leave toggles in each channel card with inline Toggle controls - Update RequiredChannel type and API request interfaces with new fields - Add translations for globalSettings and perChannel in en/ru/fa/zh locales
This commit is contained in:
@@ -8,6 +8,8 @@ export interface RequiredChannel {
|
|||||||
title: string | null;
|
title: string | null;
|
||||||
is_active: boolean;
|
is_active: boolean;
|
||||||
sort_order: number;
|
sort_order: number;
|
||||||
|
disable_trial_on_leave: boolean;
|
||||||
|
disable_paid_on_leave: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ChannelListResponse {
|
export interface ChannelListResponse {
|
||||||
@@ -19,6 +21,8 @@ export interface CreateChannelRequest {
|
|||||||
channel_id: string;
|
channel_id: string;
|
||||||
channel_link?: string;
|
channel_link?: string;
|
||||||
title?: string;
|
title?: string;
|
||||||
|
disable_trial_on_leave?: boolean;
|
||||||
|
disable_paid_on_leave?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UpdateChannelRequest {
|
export interface UpdateChannelRequest {
|
||||||
@@ -27,6 +31,8 @@ export interface UpdateChannelRequest {
|
|||||||
title?: string;
|
title?: string;
|
||||||
is_active?: boolean;
|
is_active?: boolean;
|
||||||
sort_order?: number;
|
sort_order?: number;
|
||||||
|
disable_trial_on_leave?: boolean;
|
||||||
|
disable_paid_on_leave?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const adminChannelsApi = {
|
export const adminChannelsApi = {
|
||||||
|
|||||||
@@ -1322,6 +1322,21 @@
|
|||||||
"submit": "Add",
|
"submit": "Add",
|
||||||
"save": "Save",
|
"save": "Save",
|
||||||
"cancel": "Cancel"
|
"cancel": "Cancel"
|
||||||
|
},
|
||||||
|
"globalSettings": {
|
||||||
|
"title": "Channel Settings",
|
||||||
|
"channelRequired": "Require subscription",
|
||||||
|
"channelRequiredDesc": "Users must subscribe to channels to use the bot",
|
||||||
|
"disableTrialOnUnsub": "Disable trial on unsubscribe",
|
||||||
|
"disableTrialOnUnsubDesc": "Revoke trial access when user unsubscribes from any channel",
|
||||||
|
"requiredForAll": "Required for all users",
|
||||||
|
"requiredForAllDesc": "Apply channel subscription check to all users, including paid"
|
||||||
|
},
|
||||||
|
"perChannel": {
|
||||||
|
"disableTrial": "Disable trial on leave",
|
||||||
|
"disableTrialDesc": "Revoke trial when user leaves this channel",
|
||||||
|
"disablePaid": "Disable paid on leave",
|
||||||
|
"disablePaidDesc": "Revoke paid access when user leaves this channel"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
|||||||
@@ -1025,6 +1025,21 @@
|
|||||||
"submit": "افزودن",
|
"submit": "افزودن",
|
||||||
"save": "ذخیره",
|
"save": "ذخیره",
|
||||||
"cancel": "لغو"
|
"cancel": "لغو"
|
||||||
|
},
|
||||||
|
"globalSettings": {
|
||||||
|
"title": "تنظیمات کانال",
|
||||||
|
"channelRequired": "الزام عضویت",
|
||||||
|
"channelRequiredDesc": "کاربران باید در کانالها عضو شوند تا از ربات استفاده کنند",
|
||||||
|
"disableTrialOnUnsub": "غیرفعالسازی آزمایشی هنگام لغو عضویت",
|
||||||
|
"disableTrialOnUnsubDesc": "لغو دسترسی آزمایشی هنگام لغو عضویت از هر کانال",
|
||||||
|
"requiredForAll": "اجباری برای همه",
|
||||||
|
"requiredForAllDesc": "بررسی عضویت برای همه کاربران، از جمله پولی"
|
||||||
|
},
|
||||||
|
"perChannel": {
|
||||||
|
"disableTrial": "غیرفعالسازی آزمایشی هنگام خروج",
|
||||||
|
"disableTrialDesc": "لغو دسترسی آزمایشی هنگام خروج از این کانال",
|
||||||
|
"disablePaid": "غیرفعالسازی پولی هنگام خروج",
|
||||||
|
"disablePaidDesc": "لغو دسترسی پولی هنگام خروج از این کانال"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"payments": {
|
"payments": {
|
||||||
|
|||||||
@@ -1348,6 +1348,21 @@
|
|||||||
"submit": "Добавить",
|
"submit": "Добавить",
|
||||||
"save": "Сохранить",
|
"save": "Сохранить",
|
||||||
"cancel": "Отмена"
|
"cancel": "Отмена"
|
||||||
|
},
|
||||||
|
"globalSettings": {
|
||||||
|
"title": "Настройки каналов",
|
||||||
|
"channelRequired": "Требовать подписку",
|
||||||
|
"channelRequiredDesc": "Пользователи должны подписаться на каналы для использования бота",
|
||||||
|
"disableTrialOnUnsub": "Отключать триал при отписке",
|
||||||
|
"disableTrialOnUnsubDesc": "Отзывать пробный доступ при отписке от любого канала",
|
||||||
|
"requiredForAll": "Обязательно для всех",
|
||||||
|
"requiredForAllDesc": "Проверять подписку для всех пользователей, включая платных"
|
||||||
|
},
|
||||||
|
"perChannel": {
|
||||||
|
"disableTrial": "Отключать триал при выходе",
|
||||||
|
"disableTrialDesc": "Отзывать пробный доступ при выходе из этого канала",
|
||||||
|
"disablePaid": "Отключать платный при выходе",
|
||||||
|
"disablePaidDesc": "Отзывать платный доступ при выходе из этого канала"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
|||||||
@@ -1077,6 +1077,21 @@
|
|||||||
"submit": "添加",
|
"submit": "添加",
|
||||||
"save": "保存",
|
"save": "保存",
|
||||||
"cancel": "取消"
|
"cancel": "取消"
|
||||||
|
},
|
||||||
|
"globalSettings": {
|
||||||
|
"title": "频道设置",
|
||||||
|
"channelRequired": "要求订阅",
|
||||||
|
"channelRequiredDesc": "用户必须订阅频道才能使用机器人",
|
||||||
|
"disableTrialOnUnsub": "取消订阅时禁用试用",
|
||||||
|
"disableTrialOnUnsubDesc": "用户取消订阅任何频道时撤销试用权限",
|
||||||
|
"requiredForAll": "对所有用户强制",
|
||||||
|
"requiredForAllDesc": "对所有用户(包括付费用户)检查频道订阅"
|
||||||
|
},
|
||||||
|
"perChannel": {
|
||||||
|
"disableTrial": "退出时禁用试用",
|
||||||
|
"disableTrialDesc": "用户退出此频道时撤销试用权限",
|
||||||
|
"disablePaid": "退出时禁用付费",
|
||||||
|
"disablePaidDesc": "用户退出此频道时撤销付费权限"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
|||||||
@@ -8,7 +8,9 @@ import {
|
|||||||
type CreateChannelRequest,
|
type CreateChannelRequest,
|
||||||
type UpdateChannelRequest,
|
type UpdateChannelRequest,
|
||||||
} from '../api/adminChannels';
|
} from '../api/adminChannels';
|
||||||
|
import { adminSettingsApi, type SettingDefinition } from '../api/adminSettings';
|
||||||
import { AdminBackButton } from '../components/admin';
|
import { AdminBackButton } from '../components/admin';
|
||||||
|
import { Toggle } from '../components/admin/Toggle';
|
||||||
|
|
||||||
// Icons
|
// Icons
|
||||||
const ChannelIcon = () => (
|
const ChannelIcon = () => (
|
||||||
@@ -79,17 +81,146 @@ const LinkIcon = () => (
|
|||||||
</svg>
|
</svg>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const SettingsIcon = () => (
|
||||||
|
<svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}>
|
||||||
|
<path
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.325.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.241-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.991l1.004.827c.424.35.534.955.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.47 6.47 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.281c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.019-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.991a6.932 6.932 0 010-.255c.007-.38-.138-.751-.43-.992l-1.004-.827a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.086.22-.128.332-.183.582-.495.644-.869l.214-1.28z"
|
||||||
|
/>
|
||||||
|
<path strokeLinecap="round" strokeLinejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
// Setting toggle row for global settings
|
||||||
|
const CHANNEL_SETTING_KEYS = [
|
||||||
|
'CHANNEL_IS_REQUIRED_SUB',
|
||||||
|
'CHANNEL_DISABLE_TRIAL_ON_UNSUBSCRIBE',
|
||||||
|
'CHANNEL_REQUIRED_FOR_ALL',
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
type ChannelSettingKey = (typeof CHANNEL_SETTING_KEYS)[number];
|
||||||
|
|
||||||
|
const SETTING_I18N_MAP: Record<ChannelSettingKey, { label: string; desc: string }> = {
|
||||||
|
CHANNEL_IS_REQUIRED_SUB: {
|
||||||
|
label: 'admin.channelSubscriptions.globalSettings.channelRequired',
|
||||||
|
desc: 'admin.channelSubscriptions.globalSettings.channelRequiredDesc',
|
||||||
|
},
|
||||||
|
CHANNEL_DISABLE_TRIAL_ON_UNSUBSCRIBE: {
|
||||||
|
label: 'admin.channelSubscriptions.globalSettings.disableTrialOnUnsub',
|
||||||
|
desc: 'admin.channelSubscriptions.globalSettings.disableTrialOnUnsubDesc',
|
||||||
|
},
|
||||||
|
CHANNEL_REQUIRED_FOR_ALL: {
|
||||||
|
label: 'admin.channelSubscriptions.globalSettings.requiredForAll',
|
||||||
|
desc: 'admin.channelSubscriptions.globalSettings.requiredForAllDesc',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
function GlobalSettingsSection() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
const haptic = useHaptic();
|
||||||
|
const notify = useNotify();
|
||||||
|
|
||||||
|
const { data: settings, isLoading } = useQuery({
|
||||||
|
queryKey: ['admin-settings', 'CHANNEL'],
|
||||||
|
queryFn: () => adminSettingsApi.getSettings('CHANNEL'),
|
||||||
|
});
|
||||||
|
|
||||||
|
const updateSettingMutation = useMutation({
|
||||||
|
mutationFn: ({ key, value }: { key: string; value: unknown }) =>
|
||||||
|
adminSettingsApi.updateSetting(key, value),
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['admin-settings', 'CHANNEL'] });
|
||||||
|
haptic.impact('light');
|
||||||
|
},
|
||||||
|
onError: () => {
|
||||||
|
haptic.notification('error');
|
||||||
|
notify.error(t('common.error'));
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const getSettingByKey = (key: string): SettingDefinition | undefined =>
|
||||||
|
settings?.find((s) => s.key === key);
|
||||||
|
|
||||||
|
const isSettingEnabled = (key: string): boolean => {
|
||||||
|
const setting = getSettingByKey(key);
|
||||||
|
if (!setting) return false;
|
||||||
|
return setting.current === true || setting.current === 'true';
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleToggleSetting = (key: string) => {
|
||||||
|
const current = isSettingEnabled(key);
|
||||||
|
updateSettingMutation.mutate({ key, value: !current });
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-dark-700 bg-dark-800/50 p-6">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div className="animate-spin">
|
||||||
|
<RefreshIcon />
|
||||||
|
</div>
|
||||||
|
<span className="text-sm text-dark-400">{t('common.loading')}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-dark-700 bg-dark-800/50 p-4">
|
||||||
|
<div className="mb-4 flex items-center gap-2.5">
|
||||||
|
<div className="text-dark-300">
|
||||||
|
<SettingsIcon />
|
||||||
|
</div>
|
||||||
|
<h2 className="text-sm font-semibold text-dark-100">
|
||||||
|
{t('admin.channelSubscriptions.globalSettings.title')}
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-1">
|
||||||
|
{CHANNEL_SETTING_KEYS.map((key) => {
|
||||||
|
const setting = getSettingByKey(key);
|
||||||
|
const i18n = SETTING_I18N_MAP[key];
|
||||||
|
const enabled = isSettingEnabled(key);
|
||||||
|
const isUpdating = updateSettingMutation.isPending;
|
||||||
|
const isReadOnly = setting?.read_only ?? false;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={key}
|
||||||
|
className="flex items-center justify-between gap-4 rounded-lg px-3 py-2.5 transition-colors hover:bg-dark-700/30"
|
||||||
|
>
|
||||||
|
<div className="min-w-0 flex-1">
|
||||||
|
<p className="text-sm font-medium text-dark-200">{t(i18n.label)}</p>
|
||||||
|
<p className="mt-0.5 text-xs text-dark-400">{t(i18n.desc)}</p>
|
||||||
|
</div>
|
||||||
|
<Toggle
|
||||||
|
checked={enabled}
|
||||||
|
onChange={() => handleToggleSetting(key)}
|
||||||
|
disabled={isUpdating || isReadOnly || !setting}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Channel card component
|
// Channel card component
|
||||||
function ChannelCard({
|
function ChannelCard({
|
||||||
channel,
|
channel,
|
||||||
onToggle,
|
onToggle,
|
||||||
onDelete,
|
onDelete,
|
||||||
onEdit,
|
onEdit,
|
||||||
|
onUpdate,
|
||||||
}: {
|
}: {
|
||||||
channel: RequiredChannel;
|
channel: RequiredChannel;
|
||||||
onToggle: (id: number) => void;
|
onToggle: (id: number) => void;
|
||||||
onDelete: (id: number) => void;
|
onDelete: (id: number) => void;
|
||||||
onEdit: (channel: RequiredChannel) => void;
|
onEdit: (channel: RequiredChannel) => void;
|
||||||
|
onUpdate: (id: number, data: UpdateChannelRequest) => void;
|
||||||
}) {
|
}) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
@@ -148,6 +279,46 @@ function ChannelCard({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Per-channel disable toggles */}
|
||||||
|
<div className="mt-3 space-y-2 border-t border-dark-700/50 pt-3">
|
||||||
|
<div className="flex items-center justify-between gap-3">
|
||||||
|
<div className="min-w-0 flex-1">
|
||||||
|
<p className="text-xs font-medium text-dark-300">
|
||||||
|
{t('admin.channelSubscriptions.perChannel.disableTrial')}
|
||||||
|
</p>
|
||||||
|
<p className="text-xs text-dark-500">
|
||||||
|
{t('admin.channelSubscriptions.perChannel.disableTrialDesc')}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Toggle
|
||||||
|
checked={channel.disable_trial_on_leave}
|
||||||
|
onChange={() =>
|
||||||
|
onUpdate(channel.id, {
|
||||||
|
disable_trial_on_leave: !channel.disable_trial_on_leave,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center justify-between gap-3">
|
||||||
|
<div className="min-w-0 flex-1">
|
||||||
|
<p className="text-xs font-medium text-dark-300">
|
||||||
|
{t('admin.channelSubscriptions.perChannel.disablePaid')}
|
||||||
|
</p>
|
||||||
|
<p className="text-xs text-dark-500">
|
||||||
|
{t('admin.channelSubscriptions.perChannel.disablePaidDesc')}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Toggle
|
||||||
|
checked={channel.disable_paid_on_leave}
|
||||||
|
onChange={() =>
|
||||||
|
onUpdate(channel.id, {
|
||||||
|
disable_paid_on_leave: !channel.disable_paid_on_leave,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Action buttons */}
|
{/* Action buttons */}
|
||||||
<div className="mt-3 flex flex-wrap gap-2 border-t border-dark-700/50 pt-3">
|
<div className="mt-3 flex flex-wrap gap-2 border-t border-dark-700/50 pt-3">
|
||||||
<button
|
<button
|
||||||
@@ -545,6 +716,9 @@ export default function AdminChannelSubscriptions() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Global channel settings */}
|
||||||
|
<GlobalSettingsSection />
|
||||||
|
|
||||||
{/* Add form */}
|
{/* Add form */}
|
||||||
{showAddForm && (
|
{showAddForm && (
|
||||||
<AddChannelForm
|
<AddChannelForm
|
||||||
@@ -588,6 +762,7 @@ export default function AdminChannelSubscriptions() {
|
|||||||
onToggle={handleToggle}
|
onToggle={handleToggle}
|
||||||
onDelete={handleDelete}
|
onDelete={handleDelete}
|
||||||
onEdit={handleEdit}
|
onEdit={handleEdit}
|
||||||
|
onUpdate={handleUpdate}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user