mirror of
https://github.com/moku-project/Moku.git
synced 2026-06-13 17:29:55 -05:00
Fix: Revert Logic for TrackingPanel (#58)
This commit is contained in:
@@ -2,11 +2,10 @@
|
|||||||
import { CircleNotch, X, MagnifyingGlass, ArrowSquareOut, Lock, LockOpen, ArrowsClockwise, ArrowLineDown } from "phosphor-svelte";
|
import { CircleNotch, X, MagnifyingGlass, ArrowSquareOut, Lock, LockOpen, ArrowsClockwise, ArrowLineDown } from "phosphor-svelte";
|
||||||
import { gql } from "@api/client";
|
import { gql } from "@api/client";
|
||||||
import Thumbnail from "@shared/manga/Thumbnail.svelte";
|
import Thumbnail from "@shared/manga/Thumbnail.svelte";
|
||||||
import { GET_TRACKERS, SEARCH_TRACKER } from "@api/queries/tracking";
|
import { GET_TRACKERS, GET_MANGA_TRACK_RECORDS, SEARCH_TRACKER } from "@api/queries/tracking";
|
||||||
import { BIND_TRACK, UPDATE_TRACK, UNBIND_TRACK } from "@api/mutations/tracking";
|
import { BIND_TRACK, UPDATE_TRACK, UNBIND_TRACK, FETCH_TRACK } from "@api/mutations/tracking";
|
||||||
import { GET_CHAPTERS } from "@api/queries/chapters";
|
import { GET_CHAPTERS } from "@api/queries/chapters";
|
||||||
import { addToast, store } from "@store/state.svelte";
|
import { addToast, store } from "@store/state.svelte";
|
||||||
import { trackingState } from "@features/tracking/store/trackingState.svelte";
|
|
||||||
import { syncBackFromTracker } from "@features/tracking/lib/trackingSync";
|
import { syncBackFromTracker } from "@features/tracking/lib/trackingSync";
|
||||||
import type { Tracker, TrackRecord, TrackSearch } from "@types";
|
import type { Tracker, TrackRecord, TrackSearch } from "@types";
|
||||||
import type { Chapter } from "@types/index";
|
import type { Chapter } from "@types/index";
|
||||||
@@ -20,7 +19,8 @@
|
|||||||
type TabId = "records" | number;
|
type TabId = "records" | number;
|
||||||
|
|
||||||
let trackers: Tracker[] = $state([]);
|
let trackers: Tracker[] = $state([]);
|
||||||
let loadingTrackers: boolean = $state(true);
|
let records: TrackRecord[] = $state([]);
|
||||||
|
let loading: boolean = $state(true);
|
||||||
let activeTab: TabId = $state("records");
|
let activeTab: TabId = $state("records");
|
||||||
|
|
||||||
let searchQuery: string = $state("");
|
let searchQuery: string = $state("");
|
||||||
@@ -35,20 +35,27 @@
|
|||||||
let chapterDraft: number = $state(0);
|
let chapterDraft: number = $state(0);
|
||||||
let applyingRecord: number | null = $state(null);
|
let applyingRecord: number | null = $state(null);
|
||||||
|
|
||||||
const records = $derived(trackingState.records);
|
|
||||||
const loading = $derived(trackingState.loading || loadingTrackers);
|
|
||||||
const loggedInTrackers = $derived(trackers.filter(t => t.isLoggedIn));
|
const loggedInTrackers = $derived(trackers.filter(t => t.isLoggedIn));
|
||||||
|
|
||||||
function autoFocus(node: HTMLElement) { setTimeout(() => node.focus(), 50); }
|
function autoFocus(node: HTMLElement) { setTimeout(() => node.focus(), 50); }
|
||||||
|
|
||||||
$effect(() => {
|
async function load() {
|
||||||
loadingTrackers = true;
|
loading = true;
|
||||||
gql<{ trackers: { nodes: Tracker[] } }>(GET_TRACKERS)
|
try {
|
||||||
.then(r => { trackers = r.trackers.nodes; })
|
const [tRes, rRes] = await Promise.all([
|
||||||
.catch(e => addToast({ kind: "error", title: "Failed to load trackers", body: e?.message }))
|
gql<{ trackers: { nodes: Tracker[] } }>(GET_TRACKERS),
|
||||||
.finally(() => { loadingTrackers = false; });
|
gql<{ manga: { trackRecords: { nodes: TrackRecord[] } } }>(GET_MANGA_TRACK_RECORDS, { mangaId }),
|
||||||
trackingState.loadForManga(mangaId);
|
]);
|
||||||
});
|
trackers = tRes.trackers.nodes;
|
||||||
|
records = rRes.manga.trackRecords.nodes;
|
||||||
|
} catch (e: any) {
|
||||||
|
addToast({ kind: "error", title: "Failed to load tracking", body: e?.message });
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => { load(); });
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
const tab = activeTab;
|
const tab = activeTab;
|
||||||
@@ -94,7 +101,7 @@
|
|||||||
const res = await gql<{ bindTrack: { trackRecord: TrackRecord } }>(
|
const res = await gql<{ bindTrack: { trackRecord: TrackRecord } }>(
|
||||||
BIND_TRACK, { mangaId, trackerId: activeTab, remoteId: result.remoteId }
|
BIND_TRACK, { mangaId, trackerId: activeTab, remoteId: result.remoteId }
|
||||||
);
|
);
|
||||||
trackingState.patchRecord(res.bindTrack.trackRecord);
|
records = [...records.filter(r => r.trackerId !== activeTab), res.bindTrack.trackRecord];
|
||||||
activeTab = "records";
|
activeTab = "records";
|
||||||
addToast({ kind: "success", title: "Now tracking", body: result.title });
|
addToast({ kind: "success", title: "Now tracking", body: result.title });
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
@@ -108,7 +115,7 @@
|
|||||||
updatingRecord = record.id;
|
updatingRecord = record.id;
|
||||||
try {
|
try {
|
||||||
await gql(UNBIND_TRACK, { recordId: record.id });
|
await gql(UNBIND_TRACK, { recordId: record.id });
|
||||||
trackingState.removeRecord(record.id);
|
records = records.filter(r => r.id !== record.id);
|
||||||
addToast({ kind: "info", title: "Unlinked from " + trackerFor(record.trackerId)?.name });
|
addToast({ kind: "info", title: "Unlinked from " + trackerFor(record.trackerId)?.name });
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
addToast({ kind: "error", title: "Failed to unlink", body: e?.message });
|
addToast({ kind: "error", title: "Failed to unlink", body: e?.message });
|
||||||
@@ -117,11 +124,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function patchRecord(updated: Partial<TrackRecord> & { id: number }) {
|
||||||
|
records = records.map(r => r.id === updated.id ? { ...r, ...updated } : r);
|
||||||
|
}
|
||||||
|
|
||||||
async function updateStatus(record: TrackRecord, status: number) {
|
async function updateStatus(record: TrackRecord, status: number) {
|
||||||
updatingRecord = record.id;
|
updatingRecord = record.id;
|
||||||
try {
|
try {
|
||||||
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, status });
|
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, status });
|
||||||
trackingState.patchRecord(res.updateTrack.trackRecord);
|
patchRecord(res.updateTrack.trackRecord);
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
||||||
} finally {
|
} finally {
|
||||||
@@ -133,7 +144,7 @@
|
|||||||
updatingRecord = record.id;
|
updatingRecord = record.id;
|
||||||
try {
|
try {
|
||||||
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, scoreString });
|
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, scoreString });
|
||||||
trackingState.patchRecord(res.updateTrack.trackRecord);
|
patchRecord(res.updateTrack.trackRecord);
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
||||||
} finally {
|
} finally {
|
||||||
@@ -145,7 +156,7 @@
|
|||||||
updatingRecord = record.id;
|
updatingRecord = record.id;
|
||||||
try {
|
try {
|
||||||
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, private: !record.private });
|
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, private: !record.private });
|
||||||
trackingState.patchRecord(res.updateTrack.trackRecord);
|
patchRecord(res.updateTrack.trackRecord);
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
||||||
} finally {
|
} finally {
|
||||||
@@ -156,8 +167,9 @@
|
|||||||
async function syncRecord(record: TrackRecord) {
|
async function syncRecord(record: TrackRecord) {
|
||||||
syncing = record.id;
|
syncing = record.id;
|
||||||
try {
|
try {
|
||||||
const fresh = await trackingState.syncRecordFromRemote(record.id);
|
const res = await gql<{ fetchTrack: { trackRecord: TrackRecord } }>(FETCH_TRACK, { recordId: record.id });
|
||||||
if (fresh) addToast({ kind: "success", title: "Synced from tracker" });
|
patchRecord(res.fetchTrack.trackRecord);
|
||||||
|
addToast({ kind: "success", title: "Synced from tracker" });
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
addToast({ kind: "error", title: "Sync failed", body: e?.message });
|
addToast({ kind: "error", title: "Sync failed", body: e?.message });
|
||||||
} finally {
|
} finally {
|
||||||
@@ -206,7 +218,7 @@
|
|||||||
updatingRecord = record.id;
|
updatingRecord = record.id;
|
||||||
try {
|
try {
|
||||||
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, lastChapterRead: val });
|
const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, lastChapterRead: val });
|
||||||
trackingState.patchRecord(res.updateTrack.trackRecord);
|
patchRecord(res.updateTrack.trackRecord);
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
addToast({ kind: "error", title: "Update failed", body: e?.message });
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
Reference in New Issue
Block a user