From bdc0d7c264716193cd17e6e9624e2999cf805a3a Mon Sep 17 00:00:00 2001
From: jgwl <jgwl@umd.edu>
Date: Tue, 21 Jun 2022 00:45:45 -0400
Subject: [PATCH 1/4]  Automatically check newly added tag

---
 taguette/static/js/taguette.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/taguette/static/js/taguette.js b/taguette/static/js/taguette.js
index 37195b25..bc1f29cd 100644
--- a/taguette/static/js/taguette.js
+++ b/taguette/static/js/taguette.js
@@ -766,6 +766,7 @@ function addTag(tag) {
   }
   tags[tag.id] = tag;
   updateTagsList();
+  document.getElementById('highlight-add-tags-' + tag.id).checked = true; 
 }
 
 function removeTag(tag_id) {
-- 
GitLab


From 8ec8008dba9512d166b524f80a4d9f8967b53ae8 Mon Sep 17 00:00:00 2001
From: jgwl <jgwl@umd.edu>
Date: Wed, 22 Jun 2022 09:47:47 -0400
Subject: [PATCH 2/4] only check tag if it was personally added

---
 taguette/static/js/taguette.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/taguette/static/js/taguette.js b/taguette/static/js/taguette.js
index bc1f29cd..e54b00aa 100644
--- a/taguette/static/js/taguette.js
+++ b/taguette/static/js/taguette.js
@@ -524,6 +524,7 @@ project_description_input.addEventListener('blur', projectMetadataChanged);
 
 var current_document = null;
 var current_tag = null;
+var added_tag = null;
 var documents_list = document.getElementById('documents-list');
 
 function linkDocument(elem, doc_id) {
@@ -766,7 +767,9 @@ function addTag(tag) {
   }
   tags[tag.id] = tag;
   updateTagsList();
-  document.getElementById('highlight-add-tags-' + tag.id).checked = true; 
+  if(tag.id == added_tag){
+    document.getElementById('highlight-add-tags-' + tag.id).checked = true; 
+  }
 }
 
 function removeTag(tag_id) {
@@ -973,8 +976,9 @@ document.getElementById('tag-add-form').addEventListener('submit', function(e) {
     );
   }
   showSpinner();
-  req.then(function() {
+  req.then(function(reply) {
     console.log("Tag posted");
+    added_tag = reply.id;
     $(tag_add_modal).modal('hide');
     document.getElementById('tag-add-form').reset();
   })
-- 
GitLab


From a8a41c0f6a3c2bc12548d7b3c98da22196167716 Mon Sep 17 00:00:00 2001
From: Remi Rampin <remi@rampin.org>
Date: Fri, 16 Dec 2022 16:17:12 -0500
Subject: [PATCH 3/4] Minor tweaks

---
 taguette/static/js/taguette.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/taguette/static/js/taguette.js b/taguette/static/js/taguette.js
index e54b00aa..b9295b60 100644
--- a/taguette/static/js/taguette.js
+++ b/taguette/static/js/taguette.js
@@ -524,7 +524,7 @@ project_description_input.addEventListener('blur', projectMetadataChanged);
 
 var current_document = null;
 var current_tag = null;
-var added_tag = null;
+var last_added_tag = null;
 var documents_list = document.getElementById('documents-list');
 
 function linkDocument(elem, doc_id) {
@@ -767,8 +767,10 @@ function addTag(tag) {
   }
   tags[tag.id] = tag;
   updateTagsList();
-  if(tag.id == added_tag){
-    document.getElementById('highlight-add-tags-' + tag.id).checked = true; 
+
+  // This is the last tag we created, check it
+  if(tag.id == last_added_tag){
+    document.getElementById('highlight-add-tags-' + tag.id).checked = true;
   }
 }
 
@@ -978,7 +980,14 @@ document.getElementById('tag-add-form').addEventListener('submit', function(e) {
   showSpinner();
   req.then(function(reply) {
     console.log("Tag posted");
-    added_tag = reply.id;
+
+    // Check this tag in the list, or remember to check it once it appears
+    var tag_checkbox = document.getElementById('highlight-add-tags-' + reply.id);
+    if(tag_checkbox) {
+      tag_checkbox.checked = true;
+    }
+    last_added_tag = reply.id;
+
     $(tag_add_modal).modal('hide');
     document.getElementById('tag-add-form').reset();
   })
-- 
GitLab


From 56866a570fa643fb73d79ab856095e7ac6cbc54c Mon Sep 17 00:00:00 2001
From: Remi Rampin <remi@rampin.org>
Date: Fri, 16 Dec 2022 16:34:39 -0500
Subject: [PATCH 4/4] Update browser test

---
 tests.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests.py b/tests.py
index 416d304b..4802e7ae 100644
--- a/tests.py
+++ b/tests.py
@@ -2669,15 +2669,12 @@ class TestSeleniumMultiuser(SeleniumTest):
         # Finish editing highlight 1 in document 1
         self.assertEqual(
             self.get_highlight_add_tags(),
-            # TODO: 3 should be selected, issue #135
-            {1: True, 2: False, 3: False},
+            # 3 was created while this modal was opened, it should be selected
+            {1: True, 2: False, 3: True},
         )
         await self.s_click(
             self.driver.find_element_by_id('highlight-add-tags-1')
         )
-        await self.s_click(
-            self.driver.find_element_by_id('highlight-add-tags-3')
-        )
         self.assertEqual(
             self.get_highlight_add_tags(),
             {1: False, 2: False, 3: True},
-- 
GitLab