working towards getting the table to update without closing the modal

This commit is contained in:
John O'Keefe 2024-08-19 12:51:09 -04:00
parent 8ae3b8dd22
commit c962a6ac9b

View File

@ -33,6 +33,7 @@
let submitting = writable(false)
let isSubmitting: boolean
let currentAniListAnime: AniListGetSingleAnime
let isSubmitSuccess = false
aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
malLoggedIn.subscribe((value) => isMalLoggedIn = value)
@ -62,7 +63,7 @@
startingAnilistStatusOption = statusOptions.filter(option => currentAniListAnime.data.MediaList.status === option.aniList)[0]
let items = [] as {
type TableItems = {
id: number
service: string
progress: number
@ -72,53 +73,68 @@
score: number
repeat: number
notes: string
}[];
}[]
let items = writable([] as TableItems);
let tableItems: TableItems
items.subscribe(value => tableItems = value)
if(isAniListLoggedIn) {
items.push({
id: currentAniListAnime.data.MediaList.id,
service: "AniList",
progress: currentAniListAnime.data.MediaList.progress,
status: currentAniListAnime.data.MediaList.status,
startedAt: `${currentAniListAnime.data.MediaList.startedAt.month}-${currentAniListAnime.data.MediaList.startedAt.day}-${currentAniListAnime.data.MediaList.startedAt.year}`,
completedAt: `${currentAniListAnime.data.MediaList.completedAt.month}-${currentAniListAnime.data.MediaList.completedAt.day}-${currentAniListAnime.data.MediaList.completedAt.year}`,
score: currentAniListAnime.data.MediaList.score,
repeat: currentAniListAnime.data.MediaList.repeat,
notes: currentAniListAnime.data.MediaList.notes
items.update(item => {
item.push({
id: currentAniListAnime.data.MediaList.id,
service: "AniList",
progress: currentAniListAnime.data.MediaList.progress,
status: currentAniListAnime.data.MediaList.status,
startedAt: `${currentAniListAnime.data.MediaList.startedAt.month}-${currentAniListAnime.data.MediaList.startedAt.day}-${currentAniListAnime.data.MediaList.startedAt.year}`,
completedAt: `${currentAniListAnime.data.MediaList.completedAt.month}-${currentAniListAnime.data.MediaList.completedAt.day}-${currentAniListAnime.data.MediaList.completedAt.year}`,
score: currentAniListAnime.data.MediaList.score,
repeat: currentAniListAnime.data.MediaList.repeat,
notes: currentAniListAnime.data.MediaList.notes
})
return item
})
}
if(isMalLoggedIn) {
items.push({
id: currentMalAnime.id,
service: "MyAnimeList",
progress: currentMalAnime.my_list_status.num_episodes_watched,
status: currentMalAnime.my_list_status.status,
startedAt: currentMalAnime.my_list_status.start_date,
completedAt: currentMalAnime.my_list_status.finish_date,
score: currentMalAnime.my_list_status.score,
repeat: currentMalAnime.my_list_status.num_times_rewatched,
notes: currentMalAnime.my_list_status.comments
items.update(item => {
item.push({
id: currentMalAnime.id,
service: "MyAnimeList",
progress: currentMalAnime.my_list_status.num_episodes_watched,
status: currentMalAnime.my_list_status.status,
startedAt: currentMalAnime.my_list_status.start_date,
completedAt: currentMalAnime.my_list_status.finish_date,
score: currentMalAnime.my_list_status.score,
repeat: currentMalAnime.my_list_status.num_times_rewatched,
notes: currentMalAnime.my_list_status.comments
})
return item
})
}
if(isSimklLoggedIn && Object.keys(currentSimklAnime).length > 0) {
items.push({
id: currentSimklAnime.show.ids.simkl,
service: "Simkl",
progress: currentSimklAnime.watched_episodes_count,
status: currentSimklAnime.status,
startedAt: "",
completedAt: "",
score: currentSimklAnime.user_rating,
repeat: 0,
notes: ""
items.update(item => {
item.push({
id: currentSimklAnime.show.ids.simkl,
service: "Simkl",
progress: currentSimklAnime.watched_episodes_count,
status: currentSimklAnime.status,
startedAt: "",
completedAt: "",
score: currentSimklAnime.user_rating,
repeat: 0,
notes: ""
})
return item
})
}
const sortKey = writable('service'); // default sort key
const sortDirection = writable(1); // default sort direction (ascending)
const sortItems = writable(items.slice()); // make a copy of the items array
const sortItems = writable(tableItems.slice()); // make a copy of the items array
console.log(tableItems[0])
// Define a function to sort the items
const sortTable = (key: any) => {
@ -297,16 +313,19 @@
anime.data.MediaList.completedAt.day = value.data.SaveMediaListEntry.completedAt.day
}
for (let item of items) {
for (let [index, item] of tableItems.entries()) {
if (item.service === "AniList") {
item.id = anime.data.MediaList.id
item.progress = anime.data.MediaList.progress
item.status = anime.data.MediaList.status
item.startedAt = `${anime.data.MediaList.startedAt.month}-${anime.data.MediaList.startedAt.day}-${anime.data.MediaList.startedAt.year}`
item.completedAt = `${anime.data.MediaList.completedAt.month}-${anime.data.MediaList.completedAt.day}-${anime.data.MediaList.completedAt.year}`
item.score = anime.data.MediaList.score
item.repeat = anime.data.MediaList.repeat
item.notes = anime.data.MediaList.notes
items.update(value => {
value[index].id = anime.data.MediaList.id
value[index].progress = anime.data.MediaList.progress
value[index].status = anime.data.MediaList.status
value[index].startedAt = `${anime.data.MediaList.startedAt.month}-${anime.data.MediaList.startedAt.day}-${anime.data.MediaList.startedAt.year}`
value[index].completedAt = `${anime.data.MediaList.completedAt.month}-${anime.data.MediaList.completedAt.day}-${anime.data.MediaList.completedAt.year}`
value[index].score = anime.data.MediaList.score
value[index].repeat = anime.data.MediaList.repeat
value[index].notes = anime.data.MediaList.notes
return value
})
}
}
return anime
@ -323,37 +342,77 @@
comments: values.notes
}
await MyAnimeListUpdate(currentMalAnime, body).then((value: MyListStatus) => {
currentMalAnime.my_list_status.status = value.status
currentMalAnime.my_list_status.is_rewatching = value.is_rewatching
currentMalAnime.my_list_status.score = value.score
currentMalAnime.my_list_status.num_episodes_watched = value.num_episodes_watched
currentMalAnime.my_list_status.num_times_rewatched = value.num_times_rewatched
currentMalAnime.my_list_status.comments = value.comments
await MyAnimeListUpdate(currentMalAnime, body).then((malAnimeReturn: MyListStatus) => {
currentMalAnime.my_list_status.status = malAnimeReturn.status
currentMalAnime.my_list_status.is_rewatching = malAnimeReturn.is_rewatching
currentMalAnime.my_list_status.score = malAnimeReturn.score
currentMalAnime.my_list_status.num_episodes_watched = malAnimeReturn.num_episodes_watched
currentMalAnime.my_list_status.num_times_rewatched = malAnimeReturn.num_times_rewatched
currentMalAnime.my_list_status.comments = malAnimeReturn.comments
for (let [index, item] of tableItems.entries()) {
if (item.service === "MyAnimeList") {
items.update(value => {
value[index].id = currentMalAnime.id
value[index].progress = malAnimeReturn.num_episodes_watched
value[index].status = malAnimeReturn.status
value[index].startedAt = malAnimeReturn.start_date
value[index].completedAt = malAnimeReturn.finish_date
value[index].score = malAnimeReturn.score
value[index].repeat = malAnimeReturn.num_times_rewatched
value[index].notes = malAnimeReturn.comments
return value
})
}
}
})
}
if (simklLoggedIn) {
if (currentSimklAnime.watched_episodes_count !== values.progress) {
await SimklSyncEpisodes(currentSimklAnime, values.progress).then((value) => {
simklAnime.set(value)
await SimklSyncEpisodes(currentSimklAnime, values.progress).then((simklAnimeReturn) => {
simklAnime.set(simklAnimeReturn)
for (let [index, item] of tableItems.entries()) {
if (item.service === "Simkl") {
items.update(value => {
value[index].progress = simklAnimeReturn.watched_episodes_count
return value
})
}
}
})
}
if (currentSimklAnime.user_rating !== values.score) {
await SimklSyncRating(currentSimklAnime, values.score).then((value) => {
simklAnime.set(value)
await SimklSyncRating(currentSimklAnime, values.score).then((simklAnimeReturn) => {
simklAnime.set(simklAnimeReturn)
for (let [index, item] of tableItems.entries()) {
if (item.service === "Simkl") {
items.update(value => {
value[index].score = simklAnimeReturn.user_rating
return value
})
}
}
})
}
if (currentSimklAnime.status !== values.status.simkl) {
await SimklSyncStatus(currentSimklAnime, values.status.simkl).then((value) => {
simklAnime.set(value)
await SimklSyncStatus(currentSimklAnime, values.status.simkl).then((simklAnimeReturn) => {
simklAnime.set(simklAnimeReturn)
for (let [index, item] of tableItems.entries()) {
if (item.service === "Simkl") {
items.update(value => {
value[index].status = simklAnimeReturn.status
return value
})
}
}
})
}
}
submitting.set(false)
isSubmitSuccess = true
setTimeout(() => isSubmitSuccess = false, 2000)
}
</script>
@ -499,7 +558,7 @@
<TableBodyRow>
<TableBodyCell class="overflow-x-auto">{item.id}</TableBodyCell>
<TableBodyCell class="overflow-x-auto">{item.service}</TableBodyCell>
<TableBodyCell class="overflow-x-auto" bind:value={item.progress}>{item.progress}</TableBodyCell>
<TableBodyCell class="overflow-x-auto" >{item.progress}</TableBodyCell>
<TableBodyCell class="overflow-x-auto">{item.status}</TableBodyCell>
<TableBodyCell class="overflow-x-auto">{item.startedAt}</TableBodyCell>
<TableBodyCell class="overflow-x-auto">{item.completedAt}</TableBodyCell>
@ -516,33 +575,13 @@
<div class="w-full mx-auto max-w-screen-xl p-4 md:flex md:items-center md:justify-end">
<Button disabled={isSubmitting}
id="sync-button"
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium
rounded-lg text-sm px-5 py-2.5 me-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none
dark:focus:ring-blue-800"
on:click={async () => {
let submitLoader = document.querySelector("#submit-loader")
let syncButton = document.querySelector("#sync-button")
submitLoader.classList.replace("hidden", "inline")
await submitData()
submitLoader.classList.replace("inline", "hidden")
syncButton.classList.replace("bg-blue-700", "bg-green-700")
syncButton.classList.replace("dark:bg-blue-600", "dark:bg-green-600")
syncButton.classList.replace("hover:bg-blue-600", "hover:bg-green-600")
syncButton.classList.replace("hover:dark:bg-blue-700", "hover:dark:bg-green-700")
syncButton.classList.replace("focus:ring-blue-300", "focus:ring-green-300")
syncButton.classList.replace("dark:focus:ring-blue-800", "dark:focus:ring-green-800")
syncButton.innerHTML = "Sync Successful"
setTimeout(function(){
syncButton.classList.replace("bg-green-700", "bg-blue-700")
syncButton.classList.replace("dark:bg-green-600", "dark:bg-blue-600")
syncButton.classList.replace("hover:bg-green-600", "hover:bg-blue-600")
syncButton.classList.replace("hover:dark:bg-green-700", "hover:dark:bg-blue-700")
syncButton.classList.replace("focus:ring-green-300", "focus:ring-blue-300")
syncButton.classList.replace("dark:focus:ring-green-800", "dark:focus:ring-blue-800")
syncButton.innerHTML = "Sync Changes"
}, 2000)
}}>
<svg id="submit-loader" aria-hidden="true" role="status" class="hidden w-4 h-4 me-3 text-white animate-spin" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
class="text-white bg-blue-700 {isSubmitSuccess ?
'dark:bg-green-600 hover:bg-green-800 dark:hover:bg-green-700 focus:ring-4 focus:ring-green-300 dark:focus:ring-green-800' :
'dark:bg-blue-600 hover:bg-blue-800 dark:hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-800'
} font-medium
rounded-lg text-sm px-5 py-2.5 me-2 mb-2 focus:outline-none"
on:click={submitData}>
<svg id="submit-loader" aria-hidden="true" role="status" class="{isSubmitting ? 'inline': 'hidden'} w-4 h-4 me-3 text-white animate-spin" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="#E5E7EB"/>
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentColor"/>
</svg>