feat: rebuild account management like JDownloader
Replace the grouped account cards with a viewport-filling 24px table, compact provider dialog, and separate usage rules view. Preserve account order and selections across bulk toggles, filtering, deletion, keyboard interaction, and narrow-window scrolling. Add focused regression coverage and publish the 2.0.9 changelog.
This commit is contained in:
Sucukdeluxe
@@ -10,6 +10,13 @@ Desktop downloader for Windows with package-based queue management, multi-provid
|
||||
|
||||
## Changelog
|
||||
|
||||
### 2.0.9
|
||||
|
||||
- Rebuild the Accounts view as a viewport-filling, JDownloader-style table with flat 24-pixel rows and bottom-aligned actions.
|
||||
- Separate account usage rules from the overview so rotation and routing controls no longer reduce the visible account list.
|
||||
- Redesign the account dialog with one-line provider rows, an immediate default selection, compact credential fields, and split cancel/save actions.
|
||||
- Add a global account enable/disable control while preserving unrelated provider state.
|
||||
|
||||
### 2.0.8
|
||||
|
||||
- Add a compact account-management table with traffic, status, expiry, username, and credential columns.
|
||||
@@ -85,7 +92,6 @@ Desktop downloader for Windows with package-based queue management, multi-provid
|
||||
- AllDebrid browser-login flow and in-app Rapidgator host status display.
|
||||
- Debrid-Link multi-key management with optional detailed line-by-line key display.
|
||||
- Debrid-Link API-key statistics popup with per-key Rapidgator traffic quota, link quota, reset, activate/deactivate, and click-to-copy masked keys.
|
||||
- Reset button for stored account column widths in the Accounts table.
|
||||
|
||||
### Download engine
|
||||
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "real-debrid-downloader",
|
||||
"version": "2.0.8",
|
||||
"version": "2.0.9",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "real-debrid-downloader",
|
||||
"version": "2.0.8",
|
||||
"version": "2.0.9",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"adm-zip": "0.6.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "real-debrid-downloader",
|
||||
"version": "2.0.8",
|
||||
"version": "2.0.9",
|
||||
"description": "Desktop downloader",
|
||||
"main": "build/main/main/main.js",
|
||||
"author": "Sucukdeluxe",
|
||||
|
||||
+160
-290
@@ -1,4 +1,4 @@
|
||||
import { CSSProperties, DragEvent, KeyboardEvent as ReactKeyboardEvent, ReactElement, memo, useCallback, useDeferredValue, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
|
||||
import { DragEvent, KeyboardEvent as ReactKeyboardEvent, ReactElement, memo, useCallback, useDeferredValue, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
|
||||
import { parseDebridLinkApiKeys } from "../shared/debrid-link-keys";
|
||||
import { getMegaDebridAccountId, parseMegaDebridAccounts, serializeMegaDebridAccounts, maskMegaDebridLogin } from "../shared/mega-debrid-accounts";
|
||||
import type {
|
||||
@@ -38,7 +38,7 @@ import {
|
||||
} from "../shared/provider-daily-limits";
|
||||
import { reorderPackageOrderByDrop, sortPackageOrderByName, sortPackagesForDisplay } from "./package-order";
|
||||
import { pruneSelection } from "./selection";
|
||||
import { matchesAccountModeFilter } from "./account-ui";
|
||||
import { buildBulkAccountEnabledState, buildConfiguredProviderOrder, getAccountDialogSelectableOptions, isAccountRowSelectionKey, matchesAccountModeFilter, pruneAccountRowSelection, resolveVisibleAccountKind } from "./account-ui";
|
||||
import type { AccountModeFilter } from "./account-ui";
|
||||
import { DOWNLOAD_SPEED_MAX_SAMPLES, updateDownloadSpeedHistory } from "./download-speed-state";
|
||||
import type { DownloadSpeedHistoryState } from "./download-speed-state";
|
||||
@@ -103,8 +103,6 @@ type AccountKind =
|
||||
| "linksnappy-login";
|
||||
|
||||
type AccountQuickAction = "realdebrid-login" | "bestdebrid-cookies" | "alldebrid-login" | "alldebrid-status";
|
||||
type AccountColumnKey = "service" | "mode" | "status" | "secret";
|
||||
|
||||
interface AccountOption {
|
||||
kind: AccountKind;
|
||||
service: AccountService;
|
||||
@@ -124,6 +122,7 @@ interface MegaDialogAccount {
|
||||
export interface AccountDialogState {
|
||||
mode: "create" | "edit";
|
||||
kind: AccountKind | null;
|
||||
service: AccountService | null;
|
||||
token: string;
|
||||
login: string;
|
||||
password: string;
|
||||
@@ -370,41 +369,6 @@ const ACCOUNT_OPTIONS: AccountOption[] = [
|
||||
|
||||
const ACCOUNT_SERVICES: AccountService[] = ["realdebrid", "megadebrid-api", "megadebrid-web", "bestdebrid", "alldebrid", "ddownload", "onefichier", "debridlink", "linksnappy"];
|
||||
const ACCOUNT_LIMIT_BYTES_PER_GIB = 1024 * 1024 * 1024;
|
||||
const ACCOUNT_COLUMN_STORAGE_KEY = "rd-account-column-widths-v2";
|
||||
const ACCOUNT_COLUMN_DEFAULT_WIDTHS: Record<AccountColumnKey, number> = {
|
||||
service: 240,
|
||||
mode: 96,
|
||||
status: 320,
|
||||
secret: 210
|
||||
};
|
||||
const ACCOUNT_COLUMN_MIN_WIDTHS: Record<AccountColumnKey, number> = {
|
||||
service: 180,
|
||||
mode: 80,
|
||||
status: 180,
|
||||
secret: 140
|
||||
};
|
||||
|
||||
function loadAccountColumnWidths(): Record<AccountColumnKey, number> {
|
||||
if (typeof window === "undefined") {
|
||||
return { ...ACCOUNT_COLUMN_DEFAULT_WIDTHS };
|
||||
}
|
||||
try {
|
||||
const raw = window.localStorage.getItem(ACCOUNT_COLUMN_STORAGE_KEY);
|
||||
if (!raw) {
|
||||
return { ...ACCOUNT_COLUMN_DEFAULT_WIDTHS };
|
||||
}
|
||||
const parsed = JSON.parse(raw) as Partial<Record<AccountColumnKey, unknown>>;
|
||||
return {
|
||||
service: Math.max(ACCOUNT_COLUMN_MIN_WIDTHS.service, Number(parsed.service) || ACCOUNT_COLUMN_DEFAULT_WIDTHS.service),
|
||||
mode: Math.max(ACCOUNT_COLUMN_MIN_WIDTHS.mode, Number(parsed.mode) || ACCOUNT_COLUMN_DEFAULT_WIDTHS.mode),
|
||||
status: Math.max(ACCOUNT_COLUMN_MIN_WIDTHS.status, Number(parsed.status) || ACCOUNT_COLUMN_DEFAULT_WIDTHS.status),
|
||||
secret: Math.max(ACCOUNT_COLUMN_MIN_WIDTHS.secret, Number(parsed.secret) || ACCOUNT_COLUMN_DEFAULT_WIDTHS.secret)
|
||||
};
|
||||
} catch {
|
||||
return { ...ACCOUNT_COLUMN_DEFAULT_WIDTHS };
|
||||
}
|
||||
}
|
||||
|
||||
function findAccountOption(kind: AccountKind): AccountOption {
|
||||
const option = ACCOUNT_OPTIONS.find((entry) => entry.kind === kind);
|
||||
if (!option) {
|
||||
@@ -526,19 +490,14 @@ function getConfiguredProvidersFromSettings(settings: AppSettings): DebridProvid
|
||||
|
||||
function getActiveProvidersFromSettings(settings: AppSettings): DebridProvider[] {
|
||||
const disabled = new Set(settings.disabledProviders || []);
|
||||
return getConfiguredProvidersFromSettings(settings).filter((p) => !disabled.has(p));
|
||||
return getConfiguredProvidersFromSettings(settings).filter((provider) => !disabled.has(provider));
|
||||
}
|
||||
|
||||
const DIRECT_HOSTERS: ReadonlySet<DebridProvider> = new Set(["onefichier", "ddownload"]);
|
||||
|
||||
function normalizeProviderOrderForSettings(settings: AppSettings): DebridProvider[] {
|
||||
const active = new Set(getActiveProvidersFromSettings(settings).filter((p) => !DIRECT_HOSTERS.has(p)));
|
||||
const ordered = (settings.providerOrder || []).filter((p) => active.has(p));
|
||||
const inOrder = new Set(ordered);
|
||||
for (const p of active) {
|
||||
if (!inOrder.has(p)) ordered.push(p);
|
||||
}
|
||||
return ordered;
|
||||
const configured = getConfiguredProvidersFromSettings(settings).filter((provider) => !DIRECT_HOSTERS.has(provider));
|
||||
return buildConfiguredProviderOrder(settings.providerOrder || [], configured);
|
||||
}
|
||||
|
||||
function normalizeProviderSelectionForSettings(
|
||||
@@ -649,6 +608,7 @@ function createAccountDialogState(mode: "create" | "edit", kind: AccountKind | n
|
||||
return {
|
||||
mode,
|
||||
kind: null,
|
||||
service: null,
|
||||
token: "",
|
||||
login: "",
|
||||
password: "",
|
||||
@@ -657,13 +617,14 @@ function createAccountDialogState(mode: "create" | "edit", kind: AccountKind | n
|
||||
...baseMega
|
||||
};
|
||||
}
|
||||
const provider = getAccountServiceProvider(findAccountOption(kind).service);
|
||||
const service = findAccountOption(kind).service;
|
||||
const provider = getAccountServiceProvider(service);
|
||||
const dailyLimitGb = formatAccountDailyLimitInput(getProviderDailyLimitBytes(settings, provider));
|
||||
switch (kind) {
|
||||
case "realdebrid-api":
|
||||
return { mode, kind, token: settings.token, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: settings.token, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "realdebrid-web":
|
||||
return { mode, kind, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "megadebrid-api":
|
||||
case "megadebrid-web": {
|
||||
let megaToken = (settings.megaCredentials || "").trim();
|
||||
@@ -674,24 +635,25 @@ function createAccountDialogState(mode: "create" | "edit", kind: AccountKind | n
|
||||
const megaAccounts = parsed.map((a) => ({ login: a.login, password: a.password }));
|
||||
const loadedIds = new Set(parsed.map((a) => a.id));
|
||||
const megaDisabledIds = (settings.megaDebridDisabledAccountIds || []).filter((id) => loadedIds.has(id));
|
||||
return { mode, kind, token: megaToken, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, megaAccounts, megaNewLogin: "", megaNewPassword: "", megaDisabledIds };
|
||||
return { mode, kind, service, token: megaToken, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, megaAccounts, megaNewLogin: "", megaNewPassword: "", megaDisabledIds };
|
||||
}
|
||||
case "bestdebrid-api":
|
||||
return { mode, kind, token: settings.bestToken, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: settings.bestToken, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "bestdebrid-web":
|
||||
return { mode, kind, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "alldebrid-api":
|
||||
return { mode, kind, token: settings.allDebridToken, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: settings.allDebridToken, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "alldebrid-web":
|
||||
return { mode, kind, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "ddownload-login":
|
||||
return { mode, kind, token: "", login: settings.ddownloadLogin, password: settings.ddownloadPassword, dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: "", login: settings.ddownloadLogin, password: settings.ddownloadPassword, dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "onefichier-api":
|
||||
return { mode, kind, token: settings.oneFichierApiKey, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: settings.oneFichierApiKey, login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
case "debridlink-api":
|
||||
return {
|
||||
mode,
|
||||
kind,
|
||||
service,
|
||||
token: settings.debridLinkApiKeys || "",
|
||||
login: "",
|
||||
password: "",
|
||||
@@ -700,9 +662,9 @@ function createAccountDialogState(mode: "create" | "edit", kind: AccountKind | n
|
||||
...baseMega
|
||||
};
|
||||
case "linksnappy-login":
|
||||
return { mode, kind, token: "", login: settings.linkSnappyLogin || "", password: settings.linkSnappyPassword || "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: "", login: settings.linkSnappyLogin || "", password: settings.linkSnappyPassword || "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
default:
|
||||
return { mode, kind, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
return { mode, kind, service, token: "", login: "", password: "", dailyLimitGb, keyDailyLimitGbById: {}, ...baseMega };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1757,7 +1719,6 @@ export function App(): ReactElement {
|
||||
const [settingsDraft, setSettingsDraft] = useState<AppSettings>(emptySnapshot().settings);
|
||||
const [speedLimitInput, setSpeedLimitInput] = useState(() => formatMbpsInputFromKbps(emptySnapshot().settings.speedLimitKbps));
|
||||
const [scheduleSpeedInputs, setScheduleSpeedInputs] = useState<Record<string, string>>({});
|
||||
const [accountColumnWidths, setAccountColumnWidths] = useState<Record<AccountColumnKey, number>>(loadAccountColumnWidths);
|
||||
const [settingsDirty, setSettingsDirty] = useState(false);
|
||||
const [schedulePickerOpen, setSchedulePickerOpen] = useState(false);
|
||||
const [scheduleTimeInput, setScheduleTimeInput] = useState("");
|
||||
@@ -1810,6 +1771,8 @@ export function App(): ReactElement {
|
||||
const dragDepthRef = useRef(0);
|
||||
const [openMenu, setOpenMenu] = useState<string | null>(null);
|
||||
const [settingsSubTab, setSettingsSubTab] = useState<SettingsSubTab>("allgemein");
|
||||
const [accountManagementTab, setAccountManagementTab] = useState<"overview" | "rules">("overview");
|
||||
const [selectedAccountRowKey, setSelectedAccountRowKey] = useState<string | null>(null);
|
||||
const [openSubmenu, setOpenSubmenu] = useState<string | null>(null);
|
||||
const [startConflictPrompt, setStartConflictPrompt] = useState<StartConflictPromptState | null>(null);
|
||||
const startConflictResolverRef = useRef<((result: { policy: Extract<DuplicatePolicy, "skip" | "overwrite">; applyToAll: boolean } | null) => void) | null>(null);
|
||||
@@ -1856,37 +1819,6 @@ export function App(): ReactElement {
|
||||
const [allDebridHostLoading, setAllDebridHostLoading] = useState(false);
|
||||
const allDebridHostRequestRef = useRef(0);
|
||||
const debridLinkHostLimitsRequestRef = useRef(0);
|
||||
const accountColumnResizeRef = useRef<{ key: AccountColumnKey; startX: number; startWidth: number } | null>(null);
|
||||
const onAccountColumnResizeMove = useCallback((event: MouseEvent): void => {
|
||||
const active = accountColumnResizeRef.current;
|
||||
if (!active) {
|
||||
return;
|
||||
}
|
||||
const nextWidth = Math.max(
|
||||
ACCOUNT_COLUMN_MIN_WIDTHS[active.key],
|
||||
Math.round(active.startWidth + (event.clientX - active.startX))
|
||||
);
|
||||
setAccountColumnWidths((prev) => (
|
||||
prev[active.key] === nextWidth ? prev : { ...prev, [active.key]: nextWidth }
|
||||
));
|
||||
}, []);
|
||||
|
||||
const stopAccountColumnResize = useCallback((): void => {
|
||||
accountColumnResizeRef.current = null;
|
||||
window.removeEventListener("mousemove", onAccountColumnResizeMove);
|
||||
window.removeEventListener("mouseup", stopAccountColumnResize);
|
||||
}, [onAccountColumnResizeMove]);
|
||||
|
||||
const startAccountColumnResize = useCallback((key: AccountColumnKey, clientX: number): void => {
|
||||
accountColumnResizeRef.current = {
|
||||
key,
|
||||
startX: clientX,
|
||||
startWidth: accountColumnWidths[key]
|
||||
};
|
||||
window.addEventListener("mousemove", onAccountColumnResizeMove);
|
||||
window.addEventListener("mouseup", stopAccountColumnResize);
|
||||
}, [accountColumnWidths, onAccountColumnResizeMove, stopAccountColumnResize]);
|
||||
|
||||
useEffect(() => {
|
||||
if (tab !== "history") return;
|
||||
const loadHistory = async (): Promise<void> => {
|
||||
@@ -1904,22 +1836,6 @@ export function App(): ReactElement {
|
||||
|
||||
useEffect(() => { historyEntriesRef.current = historyEntries; }, [historyEntries]);
|
||||
|
||||
useEffect(() => {
|
||||
try {
|
||||
window.localStorage.setItem(ACCOUNT_COLUMN_STORAGE_KEY, JSON.stringify(accountColumnWidths));
|
||||
} catch {
|
||||
}
|
||||
}, [accountColumnWidths]);
|
||||
|
||||
const resetAccountColumnWidths = useCallback((): void => {
|
||||
setAccountColumnWidths({ ...ACCOUNT_COLUMN_DEFAULT_WIDTHS });
|
||||
try {
|
||||
window.localStorage.removeItem(ACCOUNT_COLUMN_STORAGE_KEY);
|
||||
} catch {
|
||||
}
|
||||
showToast("Accounts-Spalten zurückgesetzt", 1800);
|
||||
}, []);
|
||||
|
||||
const columnOrderKey = useMemo(
|
||||
() => (snapshot.settings.columnOrder || []).join("|"),
|
||||
[snapshot.settings.columnOrder]
|
||||
@@ -2217,12 +2133,11 @@ export function App(): ReactElement {
|
||||
const request = confirmQueueRef.current.shift();
|
||||
request?.resolve(false);
|
||||
}
|
||||
stopAccountColumnResize();
|
||||
if (unsubscribe) { unsubscribe(); }
|
||||
if (unsubClipboard) { unsubClipboard(); }
|
||||
if (unsubUpdateInstallProgress) { unsubUpdateInstallProgress(); }
|
||||
};
|
||||
}, [clearImportQueueFocusListener, stopAccountColumnResize]);
|
||||
}, [clearImportQueueFocusListener]);
|
||||
|
||||
const downloadsTabActive = tab === "downloads";
|
||||
const deferredDownloadSearch = useDeferredValue(downloadSearch);
|
||||
@@ -2671,58 +2586,29 @@ export function App(): ReactElement {
|
||||
const [accountStatusSort, setAccountStatusSort] = useState<"none" | "desc" | "asc">("none");
|
||||
const cycleAccountStatusSort = (): void => setAccountStatusSort((s) => (s === "none" ? "desc" : s === "desc" ? "asc" : "none"));
|
||||
|
||||
const groupedAccountRows = useMemo(() => {
|
||||
const groups: { service: string; serviceLabel: string; rows: typeof accountRows }[] = [];
|
||||
const byService = new Map<string, { service: string; serviceLabel: string; rows: typeof accountRows }>();
|
||||
for (const row of accountRows) {
|
||||
const key = row.entry.service;
|
||||
let group = byService.get(key);
|
||||
if (!group) {
|
||||
group = { service: key, serviceLabel: row.hosterLabel, rows: [] };
|
||||
byService.set(key, group);
|
||||
groups.push(group);
|
||||
}
|
||||
group.rows.push(row);
|
||||
}
|
||||
if (accountStatusSort !== "none") {
|
||||
const statuses = snapshot.settings?.debridAccountStatuses || {};
|
||||
const now = Date.now();
|
||||
const remainingMs = (row: (typeof accountRows)[number]): number => {
|
||||
const st = row.accountId ? statuses[row.accountId] : null;
|
||||
return st && st.premiumUntilMs && st.premiumUntilMs > now ? st.premiumUntilMs - now : -1;
|
||||
};
|
||||
for (const group of groups) {
|
||||
group.rows = [...group.rows].sort((a, b) => {
|
||||
const ra = remainingMs(a);
|
||||
const rb = remainingMs(b);
|
||||
if (ra > 0 && rb > 0) return accountStatusSort === "desc" ? rb - ra : ra - rb;
|
||||
if (ra > 0) return -1;
|
||||
if (rb > 0) return 1;
|
||||
return 0;
|
||||
});
|
||||
}
|
||||
}
|
||||
return groups;
|
||||
const sortedAccountRows = useMemo(() => {
|
||||
if (accountStatusSort === "none") return accountRows;
|
||||
const statuses = snapshot.settings?.debridAccountStatuses || {};
|
||||
const now = Date.now();
|
||||
const remainingMs = (row: (typeof accountRows)[number]): number => {
|
||||
const status = row.accountId ? statuses[row.accountId] : null;
|
||||
return status && status.premiumUntilMs && status.premiumUntilMs > now ? status.premiumUntilMs - now : -1;
|
||||
};
|
||||
return [...accountRows].sort((a, b) => {
|
||||
const remainingA = remainingMs(a);
|
||||
const remainingB = remainingMs(b);
|
||||
if (remainingA > 0 && remainingB > 0) return accountStatusSort === "desc" ? remainingB - remainingA : remainingA - remainingB;
|
||||
if (remainingA > 0) return -1;
|
||||
if (remainingB > 0) return 1;
|
||||
return 0;
|
||||
});
|
||||
}, [accountRows, accountStatusSort, snapshot.settings]);
|
||||
|
||||
const [collapsedAccountGroups, setCollapsedAccountGroups] = useState<Set<string>>(() => {
|
||||
try {
|
||||
const raw = localStorage.getItem("rd-account-collapsed-groups-v1");
|
||||
if (raw) return new Set(JSON.parse(raw) as string[]);
|
||||
} catch { /* ignore */ }
|
||||
return new Set<string>();
|
||||
});
|
||||
useEffect(() => {
|
||||
setSelectedAccountRowKey((current) => pruneAccountRowSelection(current, accountRows.map((row) => row.rowKey)));
|
||||
}, [accountRows]);
|
||||
|
||||
const toggleAccountGroup = (service: string): void => {
|
||||
setCollapsedAccountGroups((prev) => {
|
||||
const next = new Set(prev);
|
||||
if (next.has(service)) next.delete(service); else next.add(service);
|
||||
try { localStorage.setItem("rd-account-collapsed-groups-v1", JSON.stringify([...next])); } catch { /* ignore */ }
|
||||
return next;
|
||||
});
|
||||
};
|
||||
|
||||
const renderAccountRow = (row: AccountTableRow, isMember: boolean): ReactElement => {
|
||||
const renderAccountRow = (row: AccountTableRow): ReactElement => {
|
||||
const st = row.accountId ? (snapshot.settings?.debridAccountStatuses?.[row.accountId] ?? null) : null;
|
||||
const checking = row.accountId ? megaCheckingIds.has(row.accountId) : false;
|
||||
let statusCls = "none";
|
||||
@@ -2747,7 +2633,17 @@ export function App(): ReactElement {
|
||||
return (
|
||||
<div
|
||||
key={row.rowKey}
|
||||
className={`acct2-row${row.disabled ? " acct2-disabled" : ""}${isProblem ? " acct2-problem" : ""}${isMember ? " acct2-member" : ""}`}
|
||||
className={`acct2-row${row.disabled ? " acct2-disabled" : ""}${isProblem ? " acct2-problem" : ""}${selectedAccountRowKey === row.rowKey ? " selected" : ""}`}
|
||||
role="row"
|
||||
tabIndex={0}
|
||||
aria-selected={selectedAccountRowKey === row.rowKey}
|
||||
onClick={() => setSelectedAccountRowKey(row.rowKey)}
|
||||
onKeyDown={(event) => {
|
||||
if (isAccountRowSelectionKey(event.key, event.target === event.currentTarget)) {
|
||||
event.preventDefault();
|
||||
setSelectedAccountRowKey(row.rowKey);
|
||||
}
|
||||
}}
|
||||
onDoubleClick={() => openEditAccountDialog(row.entry.kind)}
|
||||
onContextMenu={(event) => {
|
||||
event.preventDefault();
|
||||
@@ -2768,7 +2664,8 @@ export function App(): ReactElement {
|
||||
}}
|
||||
/>
|
||||
</span>
|
||||
<span className="acct2-hoster">
|
||||
<span className="acct2-hoster" title={`${row.hosterLabel} · ${row.modeLabel}`}>
|
||||
<span className={`acct2-service-icon service-${row.entry.service}`}>{row.hosterLabel.slice(0, 1).toUpperCase()}</span>
|
||||
<strong>{row.hosterLabel}</strong>
|
||||
<span className="acct2-mode">{row.modeLabel}</span>
|
||||
</span>
|
||||
@@ -2807,14 +2704,13 @@ export function App(): ReactElement {
|
||||
if (!accountDialog) {
|
||||
return [];
|
||||
}
|
||||
if (accountDialog.mode === "edit") {
|
||||
if (!accountDialogOption) {
|
||||
return [];
|
||||
}
|
||||
return ACCOUNT_OPTIONS.filter((option) => option.service === accountDialogOption.service);
|
||||
}
|
||||
return availableAccountOptions;
|
||||
}, [accountDialog, accountDialogOption, availableAccountOptions]);
|
||||
return getAccountDialogSelectableOptions(
|
||||
ACCOUNT_OPTIONS,
|
||||
availableAccountOptions,
|
||||
accountDialog.mode,
|
||||
accountDialog.service
|
||||
);
|
||||
}, [accountDialog, availableAccountOptions]);
|
||||
const accountDialogSearchQuery = accountDialogSearch.trim().toLowerCase();
|
||||
const filteredAccountDialogOptions = useMemo(() => (
|
||||
accountDialogSelectableOptions.filter((option) => {
|
||||
@@ -2834,13 +2730,6 @@ export function App(): ReactElement {
|
||||
return haystack.includes(accountDialogSearchQuery);
|
||||
})
|
||||
), [accountDialogModeFilter, accountDialogSearchQuery, accountDialogSelectableOptions]);
|
||||
const accountTableStyle = useMemo(() => ({
|
||||
"--account-col-service": `${accountColumnWidths.service}px`,
|
||||
"--account-col-mode": `${accountColumnWidths.mode}px`,
|
||||
"--account-col-status": `${accountColumnWidths.status}px`,
|
||||
"--account-col-secret": `${accountColumnWidths.secret}px`
|
||||
} as CSSProperties), [accountColumnWidths]);
|
||||
|
||||
const handleUpdateResult = async (result: UpdateCheckResult, source: "manual" | "startup"): Promise<void> => {
|
||||
if (!mountedRef.current) {
|
||||
return;
|
||||
@@ -3055,7 +2944,7 @@ export function App(): ReactElement {
|
||||
const openCreateAccountDialog = (): void => {
|
||||
setAccountDialogSearch("");
|
||||
setAccountDialogModeFilter("all");
|
||||
setAccountDialog(createAccountDialogState("create", null, settingsDraft));
|
||||
setAccountDialog(createAccountDialogState("create", availableAccountOptions[0]?.kind ?? null, settingsDraft));
|
||||
};
|
||||
|
||||
const openEditAccountDialog = (kind: AccountKind): void => {
|
||||
@@ -3064,7 +2953,7 @@ export function App(): ReactElement {
|
||||
setAccountDialog(createAccountDialogState("edit", kind, settingsDraft));
|
||||
};
|
||||
|
||||
const updateAccountDialogKind = (kind: AccountKind): void => {
|
||||
const updateAccountDialogKind = useCallback((kind: AccountKind): void => {
|
||||
setAccountDialog((prev) => {
|
||||
const next = createAccountDialogState(prev?.mode ?? "create", kind, settingsDraft);
|
||||
if (!prev) {
|
||||
@@ -3085,7 +2974,25 @@ export function App(): ReactElement {
|
||||
next.dailyLimitGb = prev.dailyLimitGb;
|
||||
return next;
|
||||
});
|
||||
};
|
||||
}, [settingsDraft]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!accountDialog) {
|
||||
return;
|
||||
}
|
||||
const visibleKind = resolveVisibleAccountKind(
|
||||
accountDialog.kind,
|
||||
filteredAccountDialogOptions.map((option) => option.kind)
|
||||
);
|
||||
if (visibleKind === accountDialog.kind) {
|
||||
return;
|
||||
}
|
||||
if (visibleKind) {
|
||||
updateAccountDialogKind(visibleKind);
|
||||
return;
|
||||
}
|
||||
setAccountDialog((current) => current ? { ...current, kind: null } : current);
|
||||
}, [accountDialog?.kind, filteredAccountDialogOptions, updateAccountDialogKind]);
|
||||
|
||||
const closeAccountDialog = useCallback((): void => {
|
||||
setAccountDialog(null);
|
||||
@@ -3277,6 +3184,27 @@ export function App(): ReactElement {
|
||||
}
|
||||
};
|
||||
|
||||
const setAllAccountsEnabled = async (enabled: boolean): Promise<void> => {
|
||||
await performQuickAction(async () => {
|
||||
const configuredProviderIds = [...new Set(configuredAccounts.map((entry) => entry.service as DebridProvider))];
|
||||
const nextEnabledState = buildBulkAccountEnabledState(
|
||||
settingsDraft.disabledProviders || [],
|
||||
configuredProviderIds,
|
||||
accountRows.filter((row) => row.toggleKind === "mega" && row.accountId).map((row) => row.accountId as string),
|
||||
accountRows.filter((row) => row.toggleKind === "dl" && row.accountId).map((row) => row.accountId as string),
|
||||
enabled
|
||||
);
|
||||
const nextDraft: AppSettings = {
|
||||
...settingsDraft,
|
||||
...nextEnabledState
|
||||
};
|
||||
await persistSpecificSettings(nextDraft);
|
||||
showToast(enabled ? "Accounts aktiviert" : "Accounts deaktiviert", 2200);
|
||||
}, (error) => {
|
||||
showToast(`Accounts konnten nicht umgeschaltet werden: ${String(error)}`, 3200);
|
||||
});
|
||||
};
|
||||
|
||||
const removeAccountTableRow = (row: AccountTableRow): void => {
|
||||
setAccountContextMenu(null);
|
||||
if (row.toggleKind === "mega" && row.megaLogin) {
|
||||
@@ -5580,7 +5508,7 @@ export function App(): ReactElement {
|
||||
<button key={st.key} className={`settings-sidebar-tab${settingsSubTab === st.key ? " active" : ""}`} onClick={() => setSettingsSubTab(st.key)}>{st.label}</button>
|
||||
))}
|
||||
</nav>
|
||||
<div className="settings-content" key={settingsSubTab}>
|
||||
<div className={`settings-content${settingsSubTab === "accounts" ? " settings-content-accounts" : ""}`} key={settingsSubTab}>
|
||||
{settingsSubTab === "allgemein" && (
|
||||
<div className="settings-section card">
|
||||
<h3>Allgemein</h3>
|
||||
@@ -5674,95 +5602,50 @@ export function App(): ReactElement {
|
||||
</div>
|
||||
)}
|
||||
{settingsSubTab === "accounts" && (
|
||||
<div className="account-settings-layout">
|
||||
<div className="settings-section card account-board">
|
||||
<div className="account-board-header">
|
||||
<div>
|
||||
<h3>Accountverwaltung</h3>
|
||||
<div className="hint">Kompakte Übersicht mit Hoster, Traffic, Status, Benutzername, Ablauf und Zugang. Rechtsklick oder Doppelklick öffnet die Aktionen.</div>
|
||||
</div>
|
||||
<div className="account-board-header-actions">
|
||||
<button className="btn" disabled={actionBusy || accountCheckBusy} onClick={() => { void checkAllAccounts(); }} title="Prüft Login-Gültigkeit und Premium-Restlaufzeit aller Mega-Debrid-/Debrid-Link-Accounts">
|
||||
{accountCheckBusy ? "Prüfe Accounts…" : "Alle prüfen"}
|
||||
</button>
|
||||
<button className="btn account-add-button" disabled={actionBusy || availableAccountOptions.length === 0} onClick={openCreateAccountDialog}>
|
||||
Account hinzufügen
|
||||
</button>
|
||||
</div>
|
||||
<div className={`account-settings-layout ${accountManagementTab}`}>
|
||||
<div className="account-management-heading">
|
||||
<div>
|
||||
<h3>Accountverwaltung</h3>
|
||||
<div className="hint">Hier kannst Du Deine Accounts hinzufügen, prüfen und verwalten.</div>
|
||||
</div>
|
||||
|
||||
<div className="account-board-summary">
|
||||
<span className="account-inline-stat">{accountRows.length} {accountRows.length === 1 ? "Account" : "Accounts"}</span>
|
||||
<span className="account-inline-stat">{availableAccountOptions.length} weitere Typen verfügbar</span>
|
||||
</div>
|
||||
|
||||
{configuredAccountServices.has("megadebrid-api") && configuredAccountServices.has("megadebrid-web") && (
|
||||
<div className="account-mode-note">
|
||||
<strong>Mega-Debrid API + Web sind derselbe Account</strong>, nur zwei Zugriffsarten: API (schnell) wird zuerst versucht, Web dient als Fallback. Gleicher Login, kein zweites Konto — beide Zeilen teilen sich dasselbe Tageslimit und denselben Premium-Status.
|
||||
</div>
|
||||
)}
|
||||
|
||||
{accountRows.length === 0 && (
|
||||
<div className="account-empty-state">
|
||||
<strong>Noch keine Accounts hinterlegt</strong>
|
||||
<span>Füge über "Account hinzufügen" den ersten Dienst hinzu. Danach erscheinen hier Status, Zugang und Aktionen als Liste.</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{accountRows.length > 0 && (
|
||||
<div className="acct2-table">
|
||||
<div className="acct2-head">
|
||||
<span className="acct2-c-check" />
|
||||
<span>Hoster</span>
|
||||
<span>Download-Traffic</span>
|
||||
<span className="acct2-sortable" title="Nach Premium-Restlaufzeit sortieren (längste/kürzeste)" onClick={cycleAccountStatusSort}>Status{accountStatusSort === "desc" ? " ▼" : accountStatusSort === "asc" ? " ▲" : ""}</span>
|
||||
<span>Benutzername</span>
|
||||
<span>Verfallsdatum</span>
|
||||
<span>Zugang</span>
|
||||
<span className="acct2-c-actions">Aktion</span>
|
||||
</div>
|
||||
{groupedAccountRows.flatMap((group) => {
|
||||
if (group.rows.length < 2) {
|
||||
return group.rows.map((row) => renderAccountRow(row, false));
|
||||
}
|
||||
const collapsed = collapsedAccountGroups.has(group.service);
|
||||
let okCount = 0;
|
||||
let problemCount = 0;
|
||||
let offCount = 0;
|
||||
for (const r of group.rows) {
|
||||
if (r.disabled) { offCount += 1; continue; }
|
||||
const s = r.accountId ? (snapshot.settings?.debridAccountStatuses?.[r.accountId] ?? null) : null;
|
||||
if (r.checkable && s && !s.valid) { problemCount += 1; } else { okCount += 1; }
|
||||
}
|
||||
const elements: ReactElement[] = [
|
||||
<div key={`grp-${group.service}`} className="acct2-row acct2-group-head" title={collapsed ? "Ausklappen" : "Einklappen"} onClick={() => toggleAccountGroup(group.service)}>
|
||||
<span className="acct2-c-check"><span className={`acct2-chevron${collapsed ? "" : " open"}`}>{"▶"}</span></span>
|
||||
<span className="acct2-hoster">
|
||||
<strong>{group.serviceLabel}</strong>
|
||||
<span className="acct2-mode">{group.rows.length} Accounts</span>
|
||||
</span>
|
||||
<span className="acct2-traffic" />
|
||||
<span className="acct2-status acct2-grp-sum">
|
||||
{okCount > 0 && <span className="account-validity-badge ok">{okCount} OK</span>}
|
||||
{problemCount > 0 && <span className="account-validity-badge invalid">{problemCount} Problem</span>}
|
||||
{offCount > 0 && <span className="account-validity-badge disabled">{offCount} aus</span>}
|
||||
</span>
|
||||
<span />
|
||||
<span />
|
||||
<span />
|
||||
<span />
|
||||
</div>
|
||||
];
|
||||
if (!collapsed) {
|
||||
for (const row of group.rows) elements.push(renderAccountRow(row, true));
|
||||
}
|
||||
return elements;
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
<label className="account-use-toggle"><input type="checkbox" checked={accountRows.some((row) => !row.disabled)} disabled={actionBusy || accountRows.length === 0} onChange={(event) => { void setAllAccountsEnabled(event.target.checked); }} /> Accounts zum Herunterladen verwenden</label>
|
||||
</div>
|
||||
|
||||
<div className="settings-section card">
|
||||
<div className="account-management-tabs" role="tablist" aria-label="Accountverwaltung">
|
||||
<button className={accountManagementTab === "overview" ? "active" : ""} onClick={() => setAccountManagementTab("overview")} role="tab" aria-selected={accountManagementTab === "overview"}>Übersicht</button>
|
||||
<button className={accountManagementTab === "rules" ? "active" : ""} onClick={() => setAccountManagementTab("rules")} role="tab" aria-selected={accountManagementTab === "rules"}>Verwendungsregeln</button>
|
||||
</div>
|
||||
|
||||
<div className="account-overview-panel" hidden={accountManagementTab !== "overview"}>
|
||||
<div className="acct2-table" role="table" aria-label="Accounts">
|
||||
<div className="acct2-head" role="row">
|
||||
<span className="acct2-c-check" role="columnheader" aria-label="Aktiviert" />
|
||||
<span role="columnheader">Hoster</span>
|
||||
<span role="columnheader">Download-Traffic übrig</span>
|
||||
<span role="columnheader"><button type="button" className="acct2-sortable" title="Nach Premium-Restlaufzeit sortieren" onClick={cycleAccountStatusSort}>Status{accountStatusSort === "desc" ? " ▼" : accountStatusSort === "asc" ? " ▲" : ""}</button></span>
|
||||
<span role="columnheader">Benutzername</span>
|
||||
<span role="columnheader">Verfallsdatum</span>
|
||||
<span role="columnheader">Passwort / Zugang</span>
|
||||
<span className="acct2-c-actions" role="columnheader" aria-label="Aktionen" />
|
||||
</div>
|
||||
<div className="acct2-body" role="rowgroup">
|
||||
{accountRows.length === 0 ? (
|
||||
<div className="acct2-empty">Noch keine Accounts vorhanden.</div>
|
||||
) : sortedAccountRows.map((row) => renderAccountRow(row))}
|
||||
</div>
|
||||
</div>
|
||||
<div className="account-table-actions">
|
||||
<button className="btn btn-sm" disabled={actionBusy || availableAccountOptions.length === 0} onClick={openCreateAccountDialog}>＋ Hinzufügen</button>
|
||||
<button className="btn btn-sm" disabled={actionBusy || !selectedAccountRowKey} onClick={() => {
|
||||
const selectedRow = accountRows.find((row) => row.rowKey === selectedAccountRowKey);
|
||||
if (selectedRow) removeAccountTableRow(selectedRow);
|
||||
}}>－ Entfernen</button>
|
||||
<button className="btn btn-sm" disabled={actionBusy || accountCheckBusy} onClick={() => { void checkAllAccounts(); }}>{accountCheckBusy ? "Prüfe…" : "↻ Aktualisieren"}</button>
|
||||
<span>{accountRows.length} {accountRows.length === 1 ? "Account" : "Accounts"}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="settings-section card account-rule-section" hidden={accountManagementTab !== "rules"}>
|
||||
<div className="account-board-header">
|
||||
<div>
|
||||
<h3>Rotations-Verlauf</h3>
|
||||
@@ -5787,7 +5670,7 @@ export function App(): ReactElement {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="settings-section card">
|
||||
<div className="settings-section card account-rule-section" hidden={accountManagementTab !== "rules"}>
|
||||
<h3>Hoster-Reihenfolge</h3>
|
||||
<div className="hint">
|
||||
Lege fest, in welcher Reihenfolge die Debrid-Accounts für Links genutzt werden.
|
||||
@@ -5844,7 +5727,7 @@ export function App(): ReactElement {
|
||||
</div>
|
||||
|
||||
{configuredProviders.length >= 1 && (
|
||||
<div className="settings-section card">
|
||||
<div className="settings-section card account-rule-section" hidden={accountManagementTab !== "rules"}>
|
||||
<h3>Hoster-Zuordnung</h3>
|
||||
<div className="hint">Lege fest, welcher Debrid-Provider sich um welchen Filehoster kümmert. Nicht zugeordnete Hoster nutzen die Standard-Reihenfolge oben.</div>
|
||||
{(() => {
|
||||
@@ -6427,17 +6310,14 @@ export function App(): ReactElement {
|
||||
|
||||
{accountDialog && (
|
||||
<div className="modal-backdrop" onClick={closeAccountDialog}>
|
||||
<div className="modal-card account-modal" onClick={(event) => event.stopPropagation()}>
|
||||
<div className="modal-card account-modal" role="dialog" aria-modal="true" aria-labelledby="account-dialog-title" onClick={(event) => event.stopPropagation()}>
|
||||
<div className="account-modal-header">
|
||||
<div>
|
||||
<h3>{accountDialog.mode === "edit" ? "Account bearbeiten" : "Account hinzufügen"}</h3>
|
||||
<p>Wie in JDownloader: oben Account-Typ auswaehlen, unten Zugangsdaten direkt eintragen.</p>
|
||||
</div>
|
||||
<h3 id="account-dialog-title">{accountDialog.mode === "edit" ? "Account bearbeiten" : "Neuen Account hinzufügen"}</h3>
|
||||
</div>
|
||||
|
||||
<div className="account-modal-body">
|
||||
<div className="account-dialog-step">
|
||||
<div className="account-dialog-step-label">1. Account-Typ auswaehlen</div>
|
||||
<div className="account-dialog-step account-modal-provider-list">
|
||||
<div className="account-dialog-step-label">1. Wähle einen Hoster aus</div>
|
||||
<div className="account-picker-toolbar">
|
||||
<select
|
||||
className="account-picker-filter"
|
||||
@@ -6451,6 +6331,7 @@ export function App(): ReactElement {
|
||||
</select>
|
||||
<input
|
||||
className="account-picker-search"
|
||||
autoFocus
|
||||
placeholder="Dienst oder Typ suchen"
|
||||
value={accountDialogSearch}
|
||||
onChange={(event) => setAccountDialogSearch(event.target.value)}
|
||||
@@ -6477,22 +6358,16 @@ export function App(): ReactElement {
|
||||
className={`account-picker-row${accountDialog.kind === option.kind ? " active" : ""}`}
|
||||
onClick={() => updateAccountDialogKind(option.kind)}
|
||||
>
|
||||
<div>
|
||||
<strong>{option.title}</strong>
|
||||
<span>{option.serviceLabel}</span>
|
||||
</div>
|
||||
<div>
|
||||
<strong>{getAccountPickerFunctionLabel(option)}</strong>
|
||||
<span>{option.pickerDescription}</span>
|
||||
</div>
|
||||
<span className="account-picker-domain"><span className={`account-picker-icon service-${option.service}`}>{option.serviceLabel.slice(0, 1).toUpperCase()}</span><strong>{option.title}</strong></span>
|
||||
<span className="account-picker-function">{getAccountPickerFunctionLabel(option)}</span>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="account-dialog-step">
|
||||
<div className="account-dialog-step account-modal-credentials">
|
||||
<div className="account-dialog-step-label">
|
||||
{accountDialogOption ? `2. ${accountDialogOption.serviceLabel} - Zugangsdaten eingeben` : "2. Zugangsdaten eingeben"}
|
||||
{accountDialogOption ? `2. Gib Deine ${accountDialogOption.serviceLabel}-Zugangsdaten ein` : "2. Zugangsdaten eingeben"}
|
||||
</div>
|
||||
|
||||
{!accountDialogOption && (
|
||||
@@ -6504,11 +6379,6 @@ export function App(): ReactElement {
|
||||
|
||||
{accountDialogOption && (
|
||||
<>
|
||||
<div className="account-form-summary">
|
||||
<strong>{accountDialogOption.title}</strong>
|
||||
<span>{accountDialogOption.pickerDescription}</span>
|
||||
</div>
|
||||
|
||||
<div className="account-modal-fields">
|
||||
{(accountDialogOption.service === "megadebrid-api" || accountDialogOption.service === "megadebrid-web") && (
|
||||
<div>
|
||||
@@ -6730,7 +6600,7 @@ export function App(): ReactElement {
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="modal-actions">
|
||||
<div className="modal-actions account-modal-actions">
|
||||
<button className="btn" onClick={closeAccountDialog}>Abbrechen</button>
|
||||
{accountDialog.kind === "realdebrid-web" && (
|
||||
<button className="btn" disabled={actionBusy} onClick={() => { void onSaveAccountDialog("realdebrid-login"); }}>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import type { DebridProvider } from "../shared/types";
|
||||
|
||||
export type AccountModeFilter = "all" | "api" | "web";
|
||||
|
||||
export interface AccountModeOption {
|
||||
@@ -13,3 +15,63 @@ export function matchesAccountModeFilter(option: AccountModeOption, filter: Acco
|
||||
}
|
||||
return option.modeLabel.startsWith("Web");
|
||||
}
|
||||
|
||||
export function buildConfiguredProviderOrder(
|
||||
currentOrder: readonly DebridProvider[],
|
||||
configuredProviders: readonly DebridProvider[]
|
||||
): DebridProvider[] {
|
||||
const configured = new Set(configuredProviders);
|
||||
const result = currentOrder.filter((provider, index) => configured.has(provider) && currentOrder.indexOf(provider) === index);
|
||||
const included = new Set(result);
|
||||
for (const provider of configuredProviders) {
|
||||
if (!included.has(provider)) {
|
||||
result.push(provider);
|
||||
included.add(provider);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export function pruneAccountRowSelection(selectedRowKey: string | null, existingRowKeys: readonly string[]): string | null {
|
||||
return selectedRowKey && existingRowKeys.includes(selectedRowKey) ? selectedRowKey : null;
|
||||
}
|
||||
|
||||
export function resolveVisibleAccountKind<T extends string>(currentKind: T | null, visibleKinds: readonly T[]): T | null {
|
||||
return currentKind && visibleKinds.includes(currentKind) ? currentKind : visibleKinds[0] ?? null;
|
||||
}
|
||||
|
||||
export function getAccountDialogSelectableOptions<T extends { service: string }>(
|
||||
allOptions: readonly T[],
|
||||
availableOptions: readonly T[],
|
||||
mode: "create" | "edit",
|
||||
editService: string | null
|
||||
): T[] {
|
||||
return mode === "edit"
|
||||
? allOptions.filter((option) => option.service === editService)
|
||||
: [...availableOptions];
|
||||
}
|
||||
|
||||
export function isAccountRowSelectionKey(key: string, originatedOnRow: boolean): boolean {
|
||||
return originatedOnRow && (key === "Enter" || key === " ");
|
||||
}
|
||||
|
||||
export function buildBulkAccountEnabledState(
|
||||
currentDisabledProviders: DebridProvider[],
|
||||
configuredProviders: DebridProvider[],
|
||||
megaAccountIds: string[],
|
||||
debridLinkKeyIds: string[],
|
||||
enabled: boolean
|
||||
): {
|
||||
disabledProviders: DebridProvider[];
|
||||
megaDebridDisabledAccountIds: string[];
|
||||
debridLinkDisabledKeyIds: string[];
|
||||
} {
|
||||
const configured = new Set(configuredProviders);
|
||||
return {
|
||||
disabledProviders: enabled
|
||||
? currentDisabledProviders.filter((provider) => !configured.has(provider))
|
||||
: [...new Set([...currentDisabledProviders, ...configuredProviders])],
|
||||
megaDebridDisabledAccountIds: enabled ? [] : [...new Set(megaAccountIds)],
|
||||
debridLinkDisabledKeyIds: enabled ? [] : [...new Set(debridLinkKeyIds)]
|
||||
};
|
||||
}
|
||||
|
||||
+234
-90
@@ -1232,6 +1232,11 @@ body,
|
||||
padding: 4px 0 4px 14px;
|
||||
}
|
||||
|
||||
.settings-content-accounts {
|
||||
overflow: hidden;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.settings-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -1240,8 +1245,94 @@ body,
|
||||
|
||||
.account-settings-layout {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr;
|
||||
gap: 14px;
|
||||
grid-template-rows: auto auto minmax(0, 1fr);
|
||||
height: 100%;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
background: color-mix(in srgb, var(--surface) 96%, transparent);
|
||||
}
|
||||
|
||||
.account-settings-layout.rules {
|
||||
grid-template-rows: auto auto;
|
||||
align-content: start;
|
||||
gap: 8px;
|
||||
overflow-y: auto;
|
||||
padding-bottom: 8px;
|
||||
}
|
||||
|
||||
.account-management-heading {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
min-height: 42px;
|
||||
padding: 6px 10px;
|
||||
border-bottom: 1px solid color-mix(in srgb, var(--border) 65%, transparent);
|
||||
}
|
||||
|
||||
.account-management-heading h3 {
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.account-management-heading .hint {
|
||||
margin-top: 1px;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.account-use-toggle {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
color: var(--text);
|
||||
font-size: 11.5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.account-management-tabs {
|
||||
display: flex;
|
||||
align-items: end;
|
||||
height: 28px;
|
||||
padding: 0 8px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
background: color-mix(in srgb, var(--card) 45%, transparent);
|
||||
}
|
||||
|
||||
.account-management-tabs button {
|
||||
height: 27px;
|
||||
padding: 0 12px;
|
||||
border: 1px solid transparent;
|
||||
border-bottom: 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
background: transparent;
|
||||
color: var(--muted);
|
||||
font: inherit;
|
||||
font-size: 11px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.account-management-tabs button.active {
|
||||
border-color: var(--border);
|
||||
background: var(--surface);
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
.account-overview-panel {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.account-overview-panel[hidden],
|
||||
.account-rule-section[hidden] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.account-rule-section {
|
||||
margin: 0 8px;
|
||||
}
|
||||
|
||||
.account-board {
|
||||
@@ -1894,47 +1985,52 @@ body,
|
||||
}
|
||||
|
||||
.account-modal {
|
||||
width: min(960px, calc(100vw - 36px));
|
||||
width: min(720px, calc(100vw - 36px));
|
||||
max-height: calc(100vh - 36px);
|
||||
overflow: hidden;
|
||||
gap: 14px;
|
||||
gap: 8px;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.account-modal-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
min-height: 24px;
|
||||
}
|
||||
|
||||
.account-modal-header > div:first-child {
|
||||
flex: 1;
|
||||
min-width: min(320px, 100%);
|
||||
}
|
||||
|
||||
.account-modal-header p {
|
||||
margin: 4px 0 0;
|
||||
color: var(--muted);
|
||||
.account-modal-header h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.account-dialog-step {
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
gap: 6px;
|
||||
align-content: start;
|
||||
}
|
||||
|
||||
.account-dialog-step-label {
|
||||
font-size: 14px;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.account-modal-body {
|
||||
display: grid;
|
||||
gap: 16px;
|
||||
grid-template-rows: minmax(220px, 1fr) auto;
|
||||
gap: 8px;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.account-modal-provider-list {
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.account-modal-credentials {
|
||||
max-height: min(320px, 42vh);
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
padding-right: 4px;
|
||||
padding-right: 3px;
|
||||
}
|
||||
|
||||
.account-picker-search {
|
||||
@@ -1943,8 +2039,8 @@ body,
|
||||
|
||||
.account-picker-toolbar {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(145px, 0.32fr) minmax(0, 1fr);
|
||||
gap: 8px;
|
||||
grid-template-columns: 130px minmax(0, 1fr);
|
||||
gap: 5px;
|
||||
}
|
||||
|
||||
.account-picker-filter {
|
||||
@@ -1967,9 +2063,9 @@ body,
|
||||
|
||||
.account-modal label {
|
||||
display: block;
|
||||
margin-bottom: 6px;
|
||||
margin-bottom: 3px;
|
||||
color: color-mix(in srgb, var(--text) 92%, var(--muted));
|
||||
font-size: 13px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.01em;
|
||||
}
|
||||
@@ -1979,9 +2075,9 @@ body,
|
||||
.account-modal select,
|
||||
.account-modal textarea {
|
||||
width: 100%;
|
||||
min-height: 42px;
|
||||
padding: 10px 12px;
|
||||
border-radius: 12px;
|
||||
min-height: 30px;
|
||||
padding: 5px 8px;
|
||||
border-radius: 5px;
|
||||
border: 1px solid color-mix(in srgb, var(--border) 90%, transparent);
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--field) 97%, transparent), color-mix(in srgb, var(--surface) 94%, transparent));
|
||||
color: var(--text);
|
||||
@@ -2029,9 +2125,10 @@ body,
|
||||
.account-picker-table {
|
||||
display: grid;
|
||||
border: 1px solid color-mix(in srgb, var(--border) 84%, transparent);
|
||||
border-radius: 14px;
|
||||
border-radius: 4px;
|
||||
overflow: auto;
|
||||
max-height: min(330px, 40vh);
|
||||
min-height: 190px;
|
||||
max-height: min(330px, 42vh);
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--card) 96%, transparent), color-mix(in srgb, var(--surface) 94%, transparent));
|
||||
}
|
||||
|
||||
@@ -2044,7 +2141,8 @@ body,
|
||||
}
|
||||
|
||||
.account-picker-head {
|
||||
padding: 10px 14px;
|
||||
min-height: 24px;
|
||||
padding: 4px 8px;
|
||||
color: var(--muted);
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
@@ -2059,7 +2157,8 @@ body,
|
||||
.account-picker-row {
|
||||
display: grid;
|
||||
width: 100%;
|
||||
padding: 12px 14px;
|
||||
min-height: 24px;
|
||||
padding: 2px 8px;
|
||||
text-align: left;
|
||||
border: none;
|
||||
border-top: 1px solid color-mix(in srgb, var(--border) 80%, transparent);
|
||||
@@ -2070,7 +2169,7 @@ body,
|
||||
}
|
||||
|
||||
.account-dialog-step + .account-dialog-step {
|
||||
padding-top: 4px;
|
||||
padding-top: 7px;
|
||||
border-top: 1px solid color-mix(in srgb, var(--border) 75%, transparent);
|
||||
}
|
||||
|
||||
@@ -2083,53 +2182,60 @@ body,
|
||||
box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 35%, transparent);
|
||||
}
|
||||
|
||||
.account-picker-row > div {
|
||||
.account-picker-domain {
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.account-picker-row strong {
|
||||
font-size: 13px;
|
||||
overflow: hidden;
|
||||
font-size: 11.5px;
|
||||
font-weight: 500;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.account-picker-row span {
|
||||
.account-picker-function {
|
||||
overflow: hidden;
|
||||
color: var(--muted);
|
||||
font-size: 12px;
|
||||
line-height: 1.45;
|
||||
font-size: 11px;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.account-form-summary {
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
padding: 12px 14px;
|
||||
border-radius: 12px;
|
||||
border: 1px solid color-mix(in srgb, var(--border) 82%, transparent);
|
||||
background: color-mix(in srgb, var(--field) 84%, transparent);
|
||||
}
|
||||
|
||||
.account-form-summary span {
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
.account-picker-icon,
|
||||
.acct2-service-icon {
|
||||
display: inline-grid;
|
||||
place-items: center;
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
flex: 0 0 15px;
|
||||
border-radius: 3px;
|
||||
background: color-mix(in srgb, var(--accent) 24%, var(--field));
|
||||
color: color-mix(in srgb, var(--accent) 78%, var(--text));
|
||||
font-size: 9px;
|
||||
font-weight: 800;
|
||||
}
|
||||
|
||||
.account-modal-fields {
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.account-modal-note {
|
||||
padding: 12px 14px;
|
||||
border-radius: 12px;
|
||||
padding: 6px 8px;
|
||||
border-radius: 5px;
|
||||
border: 1px solid color-mix(in srgb, var(--accent) 26%, transparent);
|
||||
background: color-mix(in srgb, var(--accent) 8%, transparent);
|
||||
color: var(--text);
|
||||
font-size: 13px;
|
||||
line-height: 1.5;
|
||||
font-size: 11px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.account-daily-limit-note {
|
||||
margin-top: 10px;
|
||||
margin-top: 6px;
|
||||
}
|
||||
|
||||
.account-mode-note {
|
||||
@@ -2148,16 +2254,16 @@ body,
|
||||
|
||||
.account-dl-key-limit-list {
|
||||
display: grid;
|
||||
gap: 8px;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.account-dl-key-limit-row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(160px, 220px) minmax(0, 1fr);
|
||||
gap: 10px;
|
||||
gap: 6px;
|
||||
align-items: center;
|
||||
padding: 10px 12px;
|
||||
border-radius: 12px;
|
||||
padding: 5px 7px;
|
||||
border-radius: 5px;
|
||||
border: 1px solid color-mix(in srgb, var(--border) 82%, transparent);
|
||||
background: color-mix(in srgb, var(--field) 84%, transparent);
|
||||
}
|
||||
@@ -2169,12 +2275,12 @@ body,
|
||||
}
|
||||
|
||||
.account-dl-key-meta strong {
|
||||
font-size: 13px;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.account-dl-key-meta span {
|
||||
color: var(--muted);
|
||||
font-size: 12px;
|
||||
font-size: 10px;
|
||||
font-family: "JetBrains Mono", "Consolas", monospace;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
@@ -3113,6 +3219,10 @@ td {
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.modal-card.account-modal {
|
||||
width: min(660px, calc(100vw - 36px));
|
||||
}
|
||||
|
||||
.modal-card h3 {
|
||||
margin: 0;
|
||||
}
|
||||
@@ -3162,6 +3272,18 @@ td {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.account-modal-actions {
|
||||
justify-content: space-between;
|
||||
position: sticky;
|
||||
bottom: 0;
|
||||
padding-top: 6px;
|
||||
background: color-mix(in srgb, var(--card) 96%, transparent);
|
||||
}
|
||||
|
||||
.account-modal-actions > :first-child {
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.online-backup-modal {
|
||||
width: min(760px, calc(100vw - 24px));
|
||||
}
|
||||
@@ -3360,20 +3482,20 @@ td {
|
||||
.account-validity-badge.disabled { color: var(--muted, #a59c8e); background: transparent; border-color: var(--border); opacity: 0.8; }
|
||||
|
||||
.acct2-table {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
overflow: hidden;
|
||||
margin-top: 4px;
|
||||
display: block;
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
border-bottom: 1px solid var(--border);
|
||||
overflow: auto;
|
||||
}
|
||||
.acct2-head,
|
||||
.acct2-row {
|
||||
display: grid;
|
||||
grid-template-columns: 32px minmax(0, 1.35fr) minmax(0, 1.25fr) minmax(0, 1.3fr) minmax(0, 1.45fr) minmax(0, 1fr) minmax(0, 0.9fr) 56px;
|
||||
grid-template-columns: 24px minmax(150px, 1.25fr) minmax(165px, 1.3fr) minmax(190px, 1.5fr) minmax(165px, 1.3fr) minmax(100px, 0.72fr) minmax(140px, 0.9fr) 30px;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 7px 12px;
|
||||
gap: 6px;
|
||||
min-width: 1120px;
|
||||
padding: 0 6px;
|
||||
}
|
||||
.acct2-head > span,
|
||||
.acct2-row > span {
|
||||
@@ -3384,49 +3506,71 @@ td {
|
||||
.acct2-head > .acct2-c-actions,
|
||||
.acct2-row > .acct2-c-actions { overflow: visible; }
|
||||
.acct2-head {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 2;
|
||||
min-height: 25px;
|
||||
background: color-mix(in srgb, var(--card) 60%, transparent);
|
||||
border-bottom: 1px solid var(--border);
|
||||
font-size: 11px;
|
||||
font-size: 9.5px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.04em;
|
||||
text-transform: uppercase;
|
||||
color: var(--muted);
|
||||
}
|
||||
.acct2-row {
|
||||
min-height: 24px;
|
||||
border-bottom: 1px solid color-mix(in srgb, var(--border) 55%, transparent);
|
||||
font-size: 13px;
|
||||
font-size: 11px;
|
||||
cursor: default;
|
||||
}
|
||||
.acct2-row:last-child { border-bottom: 0; }
|
||||
.acct2-row:hover { background: color-mix(in srgb, var(--button-bg-hover) 55%, transparent); }
|
||||
.acct2-row.selected { background: color-mix(in srgb, var(--accent) 15%, transparent); box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 28%, transparent); }
|
||||
.acct2-row.acct2-problem { background: color-mix(in srgb, var(--danger) 15%, transparent); }
|
||||
.acct2-row.acct2-problem.selected { background: color-mix(in srgb, var(--danger) 20%, var(--accent) 8%); }
|
||||
.acct2-row.acct2-disabled { opacity: 0.55; }
|
||||
.acct2-group-head { cursor: pointer; background: color-mix(in srgb, var(--card) 50%, transparent); }
|
||||
.acct2-group-head:hover { background: color-mix(in srgb, var(--card) 68%, transparent); }
|
||||
.acct2-group-head .acct2-hoster strong { font-size: 13px; }
|
||||
.acct2-chevron { display: inline-block; color: var(--muted); font-size: 9px; transition: transform 0.12s ease; }
|
||||
.acct2-chevron.open { transform: rotate(90deg); }
|
||||
.acct2-grp-sum { display: flex; gap: 6px; flex-wrap: wrap; }
|
||||
.acct2-row.acct2-member .acct2-hoster {
|
||||
padding-left: 12px;
|
||||
border-left: 2px solid color-mix(in srgb, var(--accent) 45%, transparent);
|
||||
}
|
||||
.acct2-body { min-width: 1120px; }
|
||||
.acct2-empty { display: grid; place-items: center; min-height: 160px; color: var(--muted); font-size: 11px; }
|
||||
.acct2-c-check { display: flex; justify-content: center; }
|
||||
.acct2-c-check input { cursor: pointer; }
|
||||
.acct2-c-actions { display: flex; gap: 6px; justify-content: flex-end; }
|
||||
.acct2-menu-button { min-width: 38px; padding-inline: 8px; font-size: 18px; line-height: 1; }
|
||||
.acct2-hoster { display: flex; flex-direction: column; gap: 1px; min-width: 0; }
|
||||
.acct2-hoster strong { font-size: 13px; }
|
||||
.acct2-mode { font-size: 11px; color: var(--muted); }
|
||||
.acct2-menu-button { width: 22px; min-width: 22px; height: 19px; padding: 0; font-size: 14px; line-height: 1; }
|
||||
.acct2-hoster { display: grid; grid-template-columns: 15px auto minmax(0, 1fr); align-items: center; gap: 5px; min-width: 0; }
|
||||
.acct2-hoster strong { overflow: hidden; font-size: 11px; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.acct2-mode { overflow: hidden; color: var(--muted); font-size: 9.5px; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.acct2-traffic,
|
||||
.acct2-expiry { font-variant-numeric: tabular-nums; color: var(--muted); }
|
||||
.acct2-head > span:nth-child(3),
|
||||
.acct2-traffic { text-align: center; }
|
||||
.acct2-sortable { cursor: pointer; user-select: none; }
|
||||
.acct2-sortable { width: 100%; padding: 0; border: 0; color: inherit; background: transparent; font: inherit; letter-spacing: inherit; text-align: left; text-transform: inherit; cursor: pointer; user-select: none; }
|
||||
.acct2-sortable:hover { color: var(--text); }
|
||||
.acct2-user { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.acct2-credential { color: var(--muted); white-space: nowrap; }
|
||||
.acct2-status .account-validity-badge { margin-top: 0; }
|
||||
.acct2-status .account-validity-badge { height: 16px; margin-top: 0; padding: 0 5px; font-size: 9px; line-height: 14px; }
|
||||
.acct2-nostatus { color: var(--muted); opacity: 0.6; font-variant-numeric: tabular-nums; }
|
||||
|
||||
.account-table-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 5px;
|
||||
min-height: 30px;
|
||||
padding: 3px 6px;
|
||||
background: color-mix(in srgb, var(--card) 45%, transparent);
|
||||
}
|
||||
|
||||
.account-table-actions > span {
|
||||
margin-left: auto;
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.account-table-actions .btn-sm {
|
||||
min-height: 22px;
|
||||
padding: 1px 7px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.account-context-menu { min-width: 230px; }
|
||||
.account-context-heading { display: grid; gap: 3px; padding: 8px 12px; }
|
||||
.account-context-heading strong { color: var(--text); font-size: 13px; }
|
||||
|
||||
@@ -6,6 +6,7 @@ function megaDialog(kind: "megadebrid-api" | "megadebrid-web"): AccountDialogSta
|
||||
return {
|
||||
mode: "edit",
|
||||
kind,
|
||||
service: kind,
|
||||
token: "",
|
||||
login: "",
|
||||
password: "",
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { matchesAccountModeFilter } from "../src/renderer/account-ui";
|
||||
import {
|
||||
buildBulkAccountEnabledState,
|
||||
buildConfiguredProviderOrder,
|
||||
getAccountDialogSelectableOptions,
|
||||
isAccountRowSelectionKey,
|
||||
matchesAccountModeFilter,
|
||||
pruneAccountRowSelection,
|
||||
resolveVisibleAccountKind
|
||||
} from "../src/renderer/account-ui";
|
||||
|
||||
describe("account mode filter", () => {
|
||||
it("shows only API options for the API filter", () => {
|
||||
@@ -12,3 +20,72 @@ describe("account mode filter", () => {
|
||||
expect(matchesAccountModeFilter({ modeLabel: "API" }, "web")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("bulk account activation", () => {
|
||||
it("disables each configured provider and account exactly once", () => {
|
||||
expect(buildBulkAccountEnabledState(
|
||||
["alldebrid"],
|
||||
["megadebrid-api", "alldebrid"],
|
||||
["mega-1", "mega-1", "mega-2"],
|
||||
["debrid-link-1", "debrid-link-1"],
|
||||
false
|
||||
)).toEqual({
|
||||
disabledProviders: ["alldebrid", "megadebrid-api"],
|
||||
megaDebridDisabledAccountIds: ["mega-1", "mega-2"],
|
||||
debridLinkDisabledKeyIds: ["debrid-link-1"]
|
||||
});
|
||||
});
|
||||
|
||||
it("enables configured providers without changing unrelated provider state", () => {
|
||||
expect(buildBulkAccountEnabledState(
|
||||
["realdebrid", "alldebrid", "megadebrid-api"],
|
||||
["alldebrid", "megadebrid-api"],
|
||||
["mega-1"],
|
||||
["debrid-link-1"],
|
||||
true
|
||||
)).toEqual({
|
||||
disabledProviders: ["realdebrid"],
|
||||
megaDebridDisabledAccountIds: [],
|
||||
debridLinkDisabledKeyIds: []
|
||||
});
|
||||
});
|
||||
|
||||
it("preserves the custom provider order while accounts are disabled", () => {
|
||||
expect(buildConfiguredProviderOrder(
|
||||
["debridlink", "realdebrid", "alldebrid"],
|
||||
["realdebrid", "alldebrid", "debridlink", "bestdebrid"]
|
||||
)).toEqual(["debridlink", "realdebrid", "alldebrid", "bestdebrid"]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("account selection", () => {
|
||||
it("clears a selected row after that account disappears", () => {
|
||||
expect(pruneAccountRowSelection("account-a", ["account-b"])).toBeNull();
|
||||
expect(pruneAccountRowSelection("account-a", ["account-a", "account-b"])).toBe("account-a");
|
||||
});
|
||||
|
||||
it("moves a hidden provider selection to the first visible option", () => {
|
||||
expect(resolveVisibleAccountKind("realdebrid-api", ["realdebrid-web", "bestdebrid-web"]))
|
||||
.toBe("realdebrid-web");
|
||||
expect(resolveVisibleAccountKind("realdebrid-api", [])).toBeNull();
|
||||
expect(resolveVisibleAccountKind("realdebrid-api", ["realdebrid-api", "bestdebrid-api"]))
|
||||
.toBe("realdebrid-api");
|
||||
});
|
||||
|
||||
it("keeps edit options available after a filter temporarily has no matches", () => {
|
||||
const options = [
|
||||
{ kind: "realdebrid-api", service: "realdebrid" },
|
||||
{ kind: "realdebrid-web", service: "realdebrid" },
|
||||
{ kind: "bestdebrid-api", service: "bestdebrid" }
|
||||
];
|
||||
expect(getAccountDialogSelectableOptions(options, [], "edit", "realdebrid").map((option) => option.kind))
|
||||
.toEqual(["realdebrid-api", "realdebrid-web"]);
|
||||
});
|
||||
|
||||
it("does not consume keyboard activation from controls inside a row", () => {
|
||||
expect(isAccountRowSelectionKey("Enter", true)).toBe(true);
|
||||
expect(isAccountRowSelectionKey(" ", true)).toBe(true);
|
||||
expect(isAccountRowSelectionKey("Enter", false)).toBe(false);
|
||||
expect(isAccountRowSelectionKey(" ", false)).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user