From 6664f2d4f508f29f5bc2085e638ce5aadea7042d Mon Sep 17 00:00:00 2001
From: Corban-Lee Jones <corbz.jones@gmail.com>
Date: Mon, 30 Sep 2024 14:03:42 +0100
Subject: [PATCH] abstract load values for select fields

---
 apps/home/static/home/js/tabs/subs.js | 45 +++++++++++----------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/apps/home/static/home/js/tabs/subs.js b/apps/home/static/home/js/tabs/subs.js
index 33e5ed9..713b81a 100644
--- a/apps/home/static/home/js/tabs/subs.js
+++ b/apps/home/static/home/js/tabs/subs.js
@@ -168,12 +168,25 @@ $(subModalId).on("submit", async function(event) {
 // region Load Modal Options
 
 $(document).on("selectedServerChange", async function() {
-    await loadMessageStyleOptions();
+    await loadSubModalOptions(
+        $(subModalId).find('[data-field="message_style"]'),
+        `/api/message-styles/?server=${selectedServer.id}`
+    );
+    await loadSubModalOptions(
+        $(subModalId).find('[data-field="filters"]'),
+        `/api/filters/?server=${selectedServer.id}`
+    );
+    
 });
 
-async function loadMessageStyleOptions() {
-    let $input = $(subModalId).find('[data-field="message_style"]');
+$(document).ready(async function() {
+    await loadSubModalOptions(
+        $(subModalId).find('[data-field="unique_rules"]'),
+        "/api/unique-content-rules/"
+    );
+})
 
+async function loadSubModalOptions($input, url) {
     // Disable and clear input
     $input.val("").change();
     $input.prop("disabled", true);
@@ -186,34 +199,14 @@ async function loadMessageStyleOptions() {
     });
 
     // Load new values
-    const data = await ajaxRequest(`/api/message-styles/?server=${selectedServer.id}`, "GET");
-    data.results.forEach(style => {
+    const data = await ajaxRequest(url, "GET");
+    data.results.forEach(item => {
         $input.append($(
             "<option>",
-            {text: style.name, value: style.id}
+            {text: item.name, value: item.id}
         ));
     });
 
     // Re-enable input
     $input.prop("disabled", false);
 }
-
-$(document).ready(async function() {
-    await loadUniqueRules();
-})
-
-async function loadUniqueRules() {
-    let $input = $(subModalId).find('[data-field="unique_rules"]');
-    $input.prop("disabled", true);
-
-    // Load new values
-    const data = await ajaxRequest("/api/unique-content-rules/", "GET");
-    data.results.forEach(style => {
-        $input.append($(
-            "<option>",
-            {text: style.name, value: style.id}
-        ));
-    });
-
-    $input.prop("disabled", false);
-}