Don't request category default filters on pages that don't have categories

.prettierrc.mjs

@@ -0,0 +1,12 @@
+/**
+ * @type {import('prettier').Config}
+ */
+const config = {
+  braceStyle: "stroustrup",
+  plugins: ["prettier-plugin-brace-style"],
+  printWidth: 120,
+  singleQuote: true,
+  tabWidth: 2,
+};
+
+export default config;

app/assets/javascripts/filters.js

@@ -1,158 +1,169 @@
-$(() => {
-  $('.js-filter-select').toArray().forEach(async (el) => {
-    const $select = $(el);
-    const $form = $select.closest('form');
-    const $formFilters = $form.find('.form--filter');
-    const $saveButton = $form.find('.filter-save');
-    const $isDefaultCheckbox = $form.find('.filter-is-default');
-    const categoryId = $isDefaultCheckbox.val()?.toString();
-    let defaultFilter = await QPixel.defaultFilter(categoryId);
-    const $deleteButton = $form.find('.filter-delete');
-
-    // Enables/Disables Save & Delete buttons programatically
-    async function computeEnables() {
-      const filters = await QPixel.filters();
-      const filterName = $select.val()?.toString();
-
-      // Nothing set
-      if (!filterName) {
-        $saveButton.prop('disabled', true);
-        $deleteButton.prop('disabled', true);
-        return;
-      }
+document.addEventListener('DOMContentLoaded', () => {
+  $('.js-filter-select')
+    .toArray()
+    .forEach(async (el) => {
+      const $select = $(el);
+      const $form = $select.closest('form');
+      const $formFilters = $form.find('.form--filter');
+      const $saveButton = $form.find('.filter-save');
+      const $isDefaultCheckbox = $form.find('.filter-is-default');
+      const categoryId = $isDefaultCheckbox.val()?.toString();
+      let defaultFilter = categoryId ? await QPixel.defaultFilter(categoryId) : null;
+      const $deleteButton = $form.find('.filter-delete');
+
+      // Enables/Disables Save & Delete buttons programatically
+      async function computeEnables() {
+        const filters = await QPixel.filters();
+        const filterName = $select.val()?.toString();
+
+        // Nothing set
+        if (!filterName) {
+          $saveButton.prop('disabled', true);
+          $deleteButton.prop('disabled', true);
+          return;
+        }
 
-      const filter = filters[filterName]
+        const filter = filters[filterName];
 
-      // New filter
-      if (!filter) {
-        $saveButton.prop('disabled', false);
-        $deleteButton.prop('disabled', true);
-        return;
-      }
+        // New filter
+        if (!filter) {
+          $saveButton.prop('disabled', false);
+          $deleteButton.prop('disabled', true);
+          return;
+        }
 
-      // Not a new filter
-      $deleteButton.prop('disabled', filter.system);
+        // Not a new filter
+        $deleteButton.prop('disabled', filter.system);
 
-      const hasChanges = [...$formFilters].some((el) => {
-        const filterValue = filter[el.dataset.name];
-        let elValue = /** @type {string | undefined[]} */ ($(el).val());
-        if (filterValue?.constructor == Array) {
-          elValue = elValue ?? [];
-          return filterValue.length != elValue.length || filterValue.some((v, i) => v[1] != elValue[i]);
-        }
-        else {
-          return filterValue ? filterValue != elValue : elValue;
-        }
-      });
-      const defaultStatusChanged = $isDefaultCheckbox.prop('checked') != (defaultFilter === $select.val());
-      $saveButton.prop('disabled', !defaultStatusChanged && (filter.system || !hasChanges));
-    }
-
-    async function initializeSelect() {
-      defaultFilter = await QPixel.defaultFilter(categoryId);
-      $isDefaultCheckbox.prop('checked', defaultFilter === $select.val());
-      const filters = await QPixel.filters();
-
-      function template(option) {
-        if (option.id == '') { return 'Default'; }
-
-        const filter = filters[option.id];
-        const name = `<span>${option.text}</span>`;
-        const systemIndicator = filter?.system
-          ? ' <span has-font-size-caption">(System)</span>'
-          : '';
-        const newIndicator = !filter
-          ? ' <span has-font-size-caption">(New)</span>'
-          : '';
-        return $(name + systemIndicator + newIndicator);
+        const hasChanges = [...$formFilters].some((el) => {
+          const filterValue = filter[el.dataset.name];
+          let elValue = /** @type {string | undefined[]} */ ($(el).val());
+          if (filterValue?.constructor == Array) {
+            elValue = elValue ?? [];
+            return filterValue.length != elValue.length || filterValue.some((v, i) => v[1] != elValue[i]);
+          }
+          else {
+            return filterValue ? filterValue != elValue : elValue;
+          }
+        });
+        const defaultStatusChanged = $isDefaultCheckbox.prop('checked') != (defaultFilter === $select.val());
+        $saveButton.prop('disabled', !defaultStatusChanged && (filter.system || !hasChanges));
       }
 
-      // Clear out any old options
-      $select.children().filter((_, /** @type{HTMLOptionElement} */ option) => {
-        return option.value && !filters[option.value];
-      }).detach();
+      async function initializeSelect() {
+        defaultFilter = categoryId ? await QPixel.defaultFilter(categoryId) : null;
+        $isDefaultCheckbox.prop('checked', defaultFilter === $select.val());
+        const filters = await QPixel.filters();
 
-      $select.select2({
-        data: Object.keys(filters).map((filterName) => {
-          return {
-            id: filterName,
-            text: filterName
+        function template(option) {
+          if (option.id == '') {
+            return 'Default';
           }
-        }),
-        tags: true,
-        templateResult: template,
-        templateSelection: template
-      });
 
-      $select.on('select2:select', /** @type {(event: Select2.Event) => void} */ (async (evt) => {
-        const filterName = evt.params.data.id;
-        const preset = filters[filterName];
+          const filter = filters[option.id];
+          const name = `<span>${option.text}</span>`;
+          const systemIndicator = filter?.system ? ' <span has-font-size-caption">(System)</span>' : '';
+          const newIndicator = !filter ? ' <span has-font-size-caption">(New)</span>' : '';
+          return $(name + systemIndicator + newIndicator);
+        }
 
-        $isDefaultCheckbox.prop('checked', defaultFilter === $select.val());
+        // Clear out any old options
+        $select
+          .children()
+          .filter((_, /** @type{HTMLOptionElement} */ option) => {
+            return option.value && !filters[option.value];
+          })
+          .detach();
+
+        $select.select2({
+          data: Object.keys(filters).map((filterName) => {
+            return {
+              id: filterName,
+              text: filterName,
+            };
+          }),
+          tags: true,
+          templateResult: template,
+          templateSelection: template,
+        });
+
+        $select.on(
+          'select2:select',
+          /** @type {(event: Select2.Event) => void} */ (
+            async (evt) => {
+              const filterName = evt.params.data.id;
+              const preset = filters[filterName];
+
+              $isDefaultCheckbox.prop('checked', defaultFilter === $select.val());
+              computeEnables();
+
+              // Name is not one of the presets, i.e user is creating a new preset
+              if (!preset) {
+                return;
+              }
+
+              for (const [name, value] of Object.entries(preset)) {
+                const $el = $form.find(`.form--filter[data-name=${name}]`);
+                if (value?.constructor == Array) {
+                  $el.val(null);
+                  for (const val of value) {
+                    $el.append(new Option(val[0], val[1].toString(), false, true));
+                  }
+                  $el.trigger('change');
+                }
+                else {
+                  $el.val(/** @type {string} */ (value)).trigger('change');
+                }
+              }
+            }
+          ),
+        );
         computeEnables();
+      }
 
-        // Name is not one of the presets, i.e user is creating a new preset
-        if (!preset) {
-          return;
-        }
+      initializeSelect();
 
-        for (const [name, value] of Object.entries(preset)) {
-          const $el = $form.find(`.form--filter[data-name=${name}]`);
-          if (value?.constructor == Array) {
-            $el.val(null);
-            for (const val of value) {
-              $el.append(new Option(val[0], val[1].toString(), false, true));
-            }
-            $el.trigger('change');
-          }
-          else {
-            $el.val(/** @type {string} */ (value)).trigger('change');
-          }
+      // Enable saving when the filter is changed
+      $formFilters.on('change', computeEnables);
+      $isDefaultCheckbox.on('change', computeEnables);
+
+      async function saveFilter() {
+        if (!$form[0].reportValidity()) {
+          return;
         }
-      }));
-      computeEnables();
-    }
 
-    initializeSelect();
+        const filter = /** @type {QPixelFilter} */ ({});
 
-    // Enable saving when the filter is changed
-    $formFilters.on('change', computeEnables);
-    $isDefaultCheckbox.on('change', computeEnables);
+        for (const el of $formFilters) {
+          filter[el.dataset.name] = $(el).val();
+        }
 
-    async function saveFilter() {
-      if (!$form[0].reportValidity()) { return; }
+        await QPixel.setFilter($select.val()?.toString(), filter, categoryId, $isDefaultCheckbox.prop('checked'));
 
-      const filter = /** @type {QPixelFilter} */({});
+        defaultFilter = categoryId ? await QPixel.defaultFilter(categoryId) : null;
 
-      for (const el of $formFilters) {
-        filter[el.dataset.name] = $(el).val();
+        // Reinitialize to get new options
+        await initializeSelect();
       }
 
-      await QPixel.setFilter($select.val()?.toString(), filter, categoryId, $isDefaultCheckbox.prop('checked'));
-      defaultFilter = await QPixel.defaultFilter(categoryId);
+      $saveButton.on('click', saveFilter);
 
-      // Reinitialize to get new options
-      await initializeSelect();
-    }
-
-    $saveButton.on('click', saveFilter);
+      function clear() {
+        $select.val(null).trigger('change');
+        $form.find('.form--filter').val(null).trigger('change');
+        $isDefaultCheckbox.prop('checked', false);
+        computeEnables();
+      }
 
-    function clear() {
-      $select.val(null).trigger('change');
-      $form.find('.form--filter').val(null).trigger('change');
-      $isDefaultCheckbox.prop('checked', false);
-      computeEnables();
-    }
+      $deleteButton?.on('click', async (_evt) => {
+        if (confirm(`Are you sure you want to delete ${$select.val()}?`)) {
+          await QPixel.deleteFilter($select.val()?.toString());
+          // Reinitialize to get new options
+          await initializeSelect();
+          clear();
+        }
+      });
 
-    $deleteButton?.on('click', async (_evt) => {
-      if (confirm(`Are you sure you want to delete ${$select.val()}?`)) {
-        await QPixel.deleteFilter($select.val()?.toString());
-        // Reinitialize to get new options
-        await initializeSelect();
-        clear();
-      }
+      $form.find('.filter-clear').on('click', clear);
     });
-
-    $form.find('.filter-clear').on('click', clear);
-  });
 });

app/controllers/users_controller.rb

@@ -177,13 +177,12 @@ def delete_filter
   end
 
   def default_filter
-    if user_signed_in? && params[:category]
+    if user_signed_in? && params[:category].present?
       default_filter = helpers.default_filter(current_user.id, params[:category].to_i)
-      render json: { status: 'success', success: true, name: default_filter&.name },
-             status: 200
+      render json: { status: 'success', success: true, name: default_filter&.name }
     else
       render json: { status: 'failed', success: false },
-             status: 400
+             status: :bad_request
     end
   end
 

app/helpers/users_helper.rb

@@ -47,10 +47,9 @@ def preference_choice(pref_config)
     end
   end
 
-  ##
-  # Get the default filter for the specified user and category.
-  # @param user_id [Integer]
-  # @param category_id [Category]
+  # Get the default filter for a given user and category +id+.
+  # @param user_id [Integer] +id+ of the user to get default filter for
+  # @param category_id [Integer] +id+ of the category to get default filter for
   # @return [Filter, nil]
   def default_filter(user_id, category_id)
     CategoryFilterDefault.find_by(user_id: user_id, category_id: category_id)&.filter