Refactoring auto-complete functionality for alias editor and auto tagger

shish · Nov 17, 2023 · 46fce1e · 46fce1e
1 parent 6664c2e
commit 46fce1e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/core/imageboard/autocomplete_column.php b/core/imageboard/autocomplete_column.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+namespace Shimmie2;
+
+use MicroCRUD\TextColumn;
+use function MicroHTML\INPUT;
+
+class AutoCompleteColumn extends TextColumn 
+{
+	public function read_input(array $inputs)
+    {
+        return INPUT([
+            "type" => "text",
+            "name" => "r_{$this->name}",
+			"class" => "autocomplete_tags",
+            "placeholder" => $this->title,
+            "value" => @$inputs["r_{$this->name}"]
+        ]);
+    }
+
+	public function create_input(array $inputs)
+    {
+        return INPUT([
+            "type" => "text",
+            "name" => "c_{$this->name}",
+			"class" => "autocomplete_tags",
+            "placeholder" => $this->title,
+            "value" => @$inputs["c_{$this->name}"]
+        ]);
+    }
+}
+?>
diff --git a/ext/alias_editor/main.php b/ext/alias_editor/main.php
@@ -37,8 +37,8 @@ public function __construct(\FFSPHP\PDO $db)
         $this->size = 100;
         $this->limit = 1000000;
         $this->set_columns([
-            new TextColumn("oldtag", "Old Tag"),
-            new TextColumn("newtag", "New Tag"),
+            new AutoCompleteColumn("oldtag", "Old Tag"),
+            new AutoCompleteColumn("newtag", "New Tag"),
             new ActionColumn("oldtag"),
         ]);
         $this->order_by = ["oldtag"];

diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
@@ -31,9 +31,6 @@ public function display_aliases(HTMLElement $table, HTMLElement $paginator): voi
         $page->set_heading("Alias List");
         $page->add_block(new NavBlock());
 		$block = new Block("Aliases", $html);
-		$block->body = str_replace(array("name='c_oldtag'", "name='c_newtag'"), 
-						array("name='c_oldtag' class='autocomplete_tags'", "name='c_newtag' class='autocomplete_tags'"), 
-						$block->body);
         $page->add_block($block);
 
         if ($user->can(Permissions::MANAGE_ALIAS_LIST)) {

diff --git a/ext/auto_tagger/main.php b/ext/auto_tagger/main.php
@@ -39,8 +39,8 @@ public function __construct(\FFSPHP\PDO $db)
         $this->size = 100;
         $this->limit = 1000000;
         $this->set_columns([
-            new TextColumn("tag", "Tag"),
-            new TextColumn("additional_tags", "Additional Tags"),
+            new AutoCompleteColumn("tag", "Tag"),
+            new AutoCompleteColumn("additional_tags", "Additional Tags"),
             new ActionColumn("tag"),
         ]);
         $this->order_by = ["tag"];

diff --git a/ext/auto_tagger/theme.php b/ext/auto_tagger/theme.php
@@ -33,9 +33,6 @@ public function display_auto_tagtable($table, $paginator): void
         $page->set_heading("Auto-Tag List");
         $page->add_block(new NavBlock());
 		$block = new Block("Auto-Tag", $html);
-		$block->body = str_replace(array("name='c_tag'", "name='c_additional_tags'"), 
-				array("name='c_tag' class='autocomplete_tags'", "name='c_additional_tags' class='autocomplete_tags'"), 
-				$block->body);
         $page->add_block($block);
         if ($can_manage) {
             $page->add_block(new Block("Bulk Upload", $bulk_html, "main", 51));