From 343078678a1747d2a6d0d031395017bc169798f3 Mon Sep 17 00:00:00 2001
From: wrenny-ko <wrenny.ko@gmail.com>
Date: Thu, 29 Aug 2024 18:35:20 -0400
Subject: [PATCH] scroll to tag block, review suggestions, cleanup

---
 assets/js/upload.js | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/assets/js/upload.js b/assets/js/upload.js
index fe068899..0f931037 100644
--- a/assets/js/upload.js
+++ b/assets/js/upload.js
@@ -2,6 +2,7 @@
  * Fetch and display preview images for various image upload forms.
  */
 
+import { assertNotNull } from './utils/assert';
 import { fetchJson, handleError } from './utils/requests';
 import { $, $$, clearEl, hideEl, makeEl, showEl } from './utils/dom';
 import { addTag } from './tagsinput';
@@ -173,9 +174,8 @@ function setupImageUpload() {
 
   function createTagError(message) {
     const buttonAfter = $('#tagsinput-save');
-    const errorElement = makeEl('span', { className: 'help-block tag-error' });
+    const errorElement = makeEl('span', { className: 'help-block tag-error', innerText: message });
 
-    errorElement.innerText = message;
     buttonAfter.insertAdjacentElement('beforebegin', errorElement);
   }
 
@@ -229,14 +229,6 @@ function setupImageUpload() {
     return errors.length === 0; // true: valid if no errors
   }
 
-  function enableUploadButton() {
-    const submitButton = $('.input--separate-top');
-    if (submitButton !== null) {
-      submitButton.disabled = false;
-      submitButton.innerText = 'Upload';
-    }
-  }
-
   function disableUploadButton() {
     const submitButton = $('.button.input--separate-top');
     if (submitButton !== null) {
@@ -248,17 +240,6 @@ function setupImageUpload() {
     requestAnimationFrame(() => submitButton.setAttribute('disabled', 'disabled'));
   }
 
-  function scrollToTags() {
-    const taginputEle = $('#taginput-fancy-tag_input');
-
-    if (!taginputEle) {
-      // default to scroll to top
-      window.scrollTo({ top: 0, left: 0 });
-    }
-
-    taginputEle.scrollIntoView();
-  }
-
   function submitHandler(event) {
     // Remove any existing tag error elements
     clearTagErrors();
@@ -273,10 +254,7 @@ function setupImageUpload() {
       // Let the form submission complete
     } else {
       // Scroll to view validation errors
-      scrollToTags();
-
-      // allow users to re-submit the form
-      enableUploadButton();
+      assertNotNull($('.fancy-tag-upload')).scrollIntoView();
 
       // Prevent the form from being submitted
       event.preventDefault();