corbz/PYRSS-Website
corbz/PYRSS-Website
1
0
Fork 0
Code Issues 21 Pull Requests Actions Releases 1 Wiki Activity

fix active toggle switch
All checks were successful
Build and Push Docker Image / build (push) Successful in 15s
Details

Browse Source
This commit is contained in:
Corban-Lee Jones 2024-09-04 22:27:13 +01:00
parent 5d893fed37
commit a06b9d0f9d
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/static/js/home/subscriptions.js
View File

@ -117,6 +117,31 @@ async function initSubscriptionTable() {
bindTableCheckboxes("#subTable", subTable, "#subscriptionsTabPane .table-del-btn"); bindTableCheckboxes("#subTable", subTable, "#subscriptionsTabPane .table-del-btn");
} }
async function updateSubFromObject(sub, handleErrorMsg=true) {
let data = {
"name": sub.name,
"url": sub.url,
"guild_id": sub.guild_id,
"extra_notes": sub.extra_notes,
"embed_colour": sub.embed_colour,
"article_fetch_image": sub.article_fetch_image,
"published_threshold": sub.published_threshold,
"active": sub.active
};
let formData = new FormData();
for (key in data) {
formData.append(key, data[key]);
}
sub.article_title_mutators.forEach(mutator => formData.append("article_title_mutators", mutator.id));
sub.article_desc_mutators.forEach(mutator => formData.append("article_desc_mutators", mutator.id));
sub.filters.forEach(filter => formData.append("filters", filter));
return await saveSubscription(sub.id, formData, handleErrorMsg=handleErrorMsg);
}
$("#subscriptionsTabPane").on("change", ".sub-toggle-active", async function () { $("#subscriptionsTabPane").on("change", ".sub-toggle-active", async function () {
/* /*
@ -135,30 +160,16 @@ $("#subscriptionsTabPane").on("change", ".sub-toggle-active", async function ()
subTable.data(sub).draw(); subTable.data(sub).draw();
// Update the database // Update the database
const subPrimaryKey = await saveSubscription( const subId = await updateSubFromObject(sub, handleErrorMsg=false);
sub.id,
sub.name, if (!subId) {
sub.url,
sub.guild_id,
sub.extra_notes,
sub.filters,
{
title: sub.article_title_mutators.map(mutator => mutator.id),
desc: sub.article_desc_mutators.map(mutator => mutator.id)
},
sub.embed_colour,
sub.article_fetch_image,
sub.published_threshold,
active,
handleErrorMsg=false
);
if (!subPrimaryKey)
throw Error("This subscription no longer exists."); throw Error("This subscription no longer exists.");
}
showToast( showToast(
active ? "success" : "danger", active ? "success" : "danger",
"Subscription " + (active ? "Activated" : "Deactivated"), "Subscription " + (active ? "Activated" : "Deactivated"),
"Subscription ID: " + subPrimaryKey "Subscription ID: " + subId
); );
} }
catch (error) { catch (error) {
@ -171,7 +182,10 @@ $("#subscriptionsTabPane").on("change", ".sub-toggle-active", async function ()
} }
finally { finally {
// Re-enable toggles after 500ms // Re-enable toggles after 500ms
setTimeout(() => { $(".sub-toggle-active").prop("disabled", false); }, 500) setTimeout(() => {
$(".sub-toggle-active").prop("disabled", false); },
500
);
} }
}); });
@ -246,7 +260,6 @@ function getValueFromField(elem) {
default: default:
return $elem.val(); return $elem.val();
} }
} }
$("#subForm").on("submit", async function(event) { $("#subForm").on("submit", async function(event) {
@ -284,6 +297,7 @@ $("#subForm").on("submit", async function(event) {
// This field is constructed differently, so needs to be specifically added // This field is constructed differently, so needs to be specifically added
formData.append("embed_colour", getColourInputVal("subEmbedColour", false)); formData.append("embed_colour", getColourInputVal("subEmbedColour", false));
subId = await saveSubscription(subId, formData); subId = await saveSubscription(subId, formData);
if (subId) { if (subId) {