Stop separatings tags by language (#438)

Author: dcollie2

app/controllers/api/v1/tags_controller.rb

@@ -1,109 +1,29 @@
-import { Controller } from "@hotwired/stimulus"
-import { get } from "@rails/request.js"
-import Tags from "bootstrap5-tags"
+import { Controller } from "@hotwired/stimulus";
+import { get } from "@rails/request.js";
+import Tags from "bootstrap5-tags";
 
 export default class extends Controller {
-  static targets = ["language", "tagList"]
+  static targets = ["tagList"];
 
   connect() {
-    this.initializeTags()
-    this.changeLanguage();
+    this.initializeTags();
   }
 
   notify() {
-    this.dispatch("notify", { detail: { content: Array.from(this.tagListTarget.selectedOptions).map(option => option.value) } })
-  }
-
-  /**
-   * Handle language change event and update tags accordingly
-   * @param {Event} event - Change event
-   */
-  async changeLanguage(_event) {
-    try {
-      const { resourceId, languageId } = this.getIds()
-
-      const tags = await this.fetchTags(languageId)
-      const selectedTags = await this.fetchAssignedTags(languageId, resourceId)
-
-      this.presentTags(tags, selectedTags)
-    } catch (error) {
-      console.error("Error changing language:", error)
-    }
-  }
-
-  /**
-   * Extract resource and language IDs from the form
-   * @returns {Object} Object containing resourceId and languageId
-   */
-  getIds() {
-    return {
-      resourceId: this.languageTarget.dataset.resourceId,
-      languageId: this.languageTarget.value
-    }
-  }
-
-  /**
-   * Fetch available tags for a given language
-   * @param {string} languageId - ID of the selected language
-   * @returns {Object} Dictionary of tag names
-   */
-  async fetchTags(languageId) {
-    try {
-      const response = await get(`/api/v1/tags?language_id=${languageId}`, {
-        responseKind: "json"
-      })
-
-      if (!response.ok) return []
-
-      const json = await response.json
-      return Object.fromEntries(json.map(({name}) => [name, name]))
-    } catch (error) {
-      console.error("Error fetching tags:", error)
-      return []
-    }
-  }
-
-  /**
-   * Fetch tags already assigned to the resource
-   * @param {string} languageId - ID of the selected language
-   * @param {string} resourceId - ID of the current resource
-   * @returns {string} Comma-separated list of tag names
-   */
-  async fetchAssignedTags(languageId, resourceId) {
-    if (resourceId === undefined) return ""
-
-    try {
-      const response = await get(`/topics/${resourceId}/tags?language_id=${languageId}`, {
-        responseKind: "json"
-      })
-
-      if (!response.ok) return ""
-
-      const json = await response.json
-      return json.map(x => x.name).join()
-    } catch (error) {
-      console.error("Error fetching assigned tags:", error)
-      return ""
-    }
-  }
-
-  /**
-   * Update the tags input with new tags and selections
-   * @param {Object} tags - Available tags
-   * @param {string} selectedTags - Previously selected tags
-   */
-  presentTags(tags, selectedTags) {
-    this.initializeTags({
-      items: tags,
-      selected: selectedTags
-    }, true)
+    this.dispatch("notify", {
+      detail: {
+        content: Array.from(this.tagListTarget.selectedOptions).map(
+          (option) => option.value
+        ),
+      },
+    });
   }
 
   /**
    * Initialize the tags input with given options
    * @param {Object} options - Configuration options for bootstrap5-tags
    */
   initializeTags(options = {}, reset = false) {
-    Tags.init(`select#${this.tagListTarget.id}`, options, reset)
+    Tags.init(`select#${this.tagListTarget.id}`, options, reset);
   }
 }

app/controllers/topics/tags_controller.rb

@@ -1,8 +1,8 @@
 class SynchronizeCognatesOnTopicsJob < ApplicationJob
   def perform(tag)
     Topic.where(id: tag.taggings.select(:taggable_id)).each do |topic|
-      tags = topic.current_tags_list << tag.cognates_tags.for_context(topic.language_code).uniq.pluck(:name)
-      topic.set_tag_list_on(topic.language_code, tags)
+      tags = topic.tag_list << tag.cognates_tags.uniq.pluck(:name)
+      topic.tag_list.add(tags)
       topic.save
     end
   end

app/javascript/controllers/select_tags_controller.js

@@ -13,61 +13,6 @@ class LanguageContextError < StandardError; end
     end
   end
 
-  # Returns the language-specific tag context based on code
-  #
-  # @return [Symbol] the language context for tagging
-  # @raise [LanguageContextError] if language or code is not present
-  def language_tag_context
-    return nil if new_record?
-
-    raise LanguageContextError, "Language must be present" if language.nil?
-    raise LanguageContextError, "Language code must be present" if language.code.blank?
-
-    language_code
-  end
-
-  # Retrieves all available tags for the current language context
-  #
-  # @return [ActiveRecord::Relation] collection of ActsAsTaggableOn::Tag
-  def available_tags
-    return [] if language_tag_context.nil?
-
-    ActsAsTaggableOn::Tag.for_context(language_tag_context)&.order(name: :asc)
-  end
-
-  # Retrieves associated tags for the current language context
-  #
-  # @return [Array<Tag>] list of tags
-  def current_tags
-    return [] if language_tag_context.nil?
-
-    tags_on(language_tag_context)
-  end
-
-  # Retrieves associated tags for the current language context
-  #
-  # @return [Array<String>] list of tag names
-  def current_tags_list
-    return [] if language_tag_context.nil?
-
-    tag_list_on(language_tag_context)
-  end
-
-  # Retrieves associated tags for a specific language
-  # @param language_id [Integer] the ID of the language
-  # @return [ActiveRecord::Relation] collection of ActsAsTaggableOn::Tag
-  def current_tags_for_language(language_id)
-    return [] if language_id.nil?
-
-    language = Language.find(language_id)
-
-    tags_on(language.code.to_sym)
-  end
-
-  def language_code
-    language.code.to_sym
-  end
-
   # Updates the list of tags for a specific record
   # @param attrs [Array<String>] the list of tags
   # @return [Boolean] true if tags are processed successfully, false otherwise
@@ -86,22 +31,25 @@ def save_with_tags(attrs)
 
   private
 
-  def process_tags(tag_list)
-    return unless tag_list.present?
+  def process_tags(tag_names)
+    return unless tag_names.present?
+
+    Rails.logger.info "Processing tags: #{tag_names} for record: #{id}"
+    removed_tags = tag_list - tag_names
+    @full_list_of_tags = tag_names + removed_tags
+    removed_tags_with_cognates = tags_with_cognates(removed_tags)
+    tag_names_without_redundant_cognates = tag_names - removed_tags_with_cognates
+    tag_names_with_cognates_to_add = tag_names_without_redundant_cognates + tags_with_cognates(tag_names_without_redundant_cognates)
+    final_tag_names = tag_names_with_cognates_to_add.uniq.compact_blank
 
-    Rails.logger.info "Processing tags: #{tag_list} for record: #{id}"
-    removed_tags = current_tags_list - tag_list
-    @full_list_of_tags = tag_list + removed_tags
-    tag_list_without_redundant_cognates = tag_list - tags_with_cognates(removed_tags)
-    tag_list_with_cognates_to_add = tag_list_without_redundant_cognates + tags_with_cognates(tag_list_without_redundant_cognates)
-    final_tag_list = tag_list_with_cognates_to_add.uniq.compact_blank.join(",")
-    set_tag_list_on(language_code, final_tag_list)
+    self.tag_list = final_tag_names
     save!
+    taggings.where(tag_id: Tag.where(name: removed_tags_with_cognates)).destroy_all
   end
 
   def cognates_names_for(tags_to_keep_add_or_remove)
     Tag.where(name: tags_to_keep_add_or_remove).each_with_object({}) do |tag, hash|
-      hash[tag.name] = tag.cognates_tags.for_context(language_code).uniq.pluck(:name).push(tag.name)
+      hash[tag.name] = tag.cognates_tags.uniq.pluck(:name).push(tag.name)
     end
   end
 

app/jobs/synchronize_cognates_on_topics_job.rb

@@ -10,7 +10,7 @@ def initialize(language, **args)
 
   def text_content
     scope
-      .flat_map { |topic| topic.current_tags_list }
+      .flat_map { |topic| topic.tag_list }
       .uniq
       .sort
       .join("\n")

app/models/concerns/taggable.rb

@@ -11,7 +11,7 @@ def initialize(language, **args)
   def text_content
     scope
       .flat_map do |topic|
-        [ topic.title ] + topic.current_tags_list
+        [ topic.title ] + topic.tag_list
       end
       .join("\n")
   end

app/services/text_generator/tags.rb

@@ -17,16 +17,15 @@
             <%= f.collection_select :provider_id, Provider.all, :id, :name, { prompt: "Select Provider" }, class: "form-select" %>
           </div>
         <% end %>
-        <div data-controller="select-tags">
+        <div>
           <div class="form-group">
             <%= f.label :language %>
             <%= f.collection_select :language_id,
                                     Language.all,
                                     :id,
                                     :name,
                                     { prompt: "Select language", selected: topic.language&.id || Language.first.id },
-                                    class: "form-select",
-                                    data: { "resource-type": "topics", "resource-id": f.object.id, "select-tags-target": "language", "action": "change->select-tags#changeLanguage" }
+                                    class: "form-select"
             %>
           </div>
           <div class="form-group">
@@ -37,23 +36,23 @@
             <%= f.label :publishing_month %>
             <%= f.select :published_at_month, options_for_select((1..12).to_a, topic.published_at_month || Date.today.month), { prompt: "Select month of publishing" }, class: "form-select" %>
           </div>
-          <div class="form-group">
+          <div class="form-group" data-controller="select-tags">
             <div class="d-flex">
               <%= f.label :tag_list, class: "flex-fill" %>
               <small class="flex-fill text-end fw-light text-muted text-uppercase">Press enter to add a new tag</small>
             </div>
             <p>Please note: For any tag you add or remove, its cognates are also added or removed.</p>
             <%= f.select :tag_list,
                          options_from_collection_for_select(
-                           topic.available_tags,
+                           ActsAsTaggableOn::Tag.all&.order(name: :asc),
                            :name,
                            :name,
-                           topic.current_tags_list
+                           topic.tag_list
                          ),
                          { prompt: "Select tags", include_blank: true },
                          multiple: true,
                          class: "form-select",
-                         data: { "allow-new": "true", "allow-clear": "true", "select-tags-target": "tagList" }
+                         data: { "allow-new": "true", "allow-clear": "true", "select-tags-target": "tagList", "resource-type": "topics", "resource-id": f.object.id }
             %>
           </div>
         </div>

app/services/text_generator/title_and_tags.rb

@@ -31,7 +31,7 @@
       </div>
       <div class="card-footer">
         <strong>Tags:</strong>
-        <% topic.current_tags.each do |tag| %>
+        <% topic.tags.each do |tag| %>
           <%= link_to tag.name, tag_path(tag), class: "badge bg-success text-decoration-none me-1", target: "_blank" %>
         <% end %>
       </div>

app/views/topics/_form.html.erb

@@ -0,0 +1,8 @@
+class ChangeContextForTags < ActiveRecord::Migration[8.0]
+  def up
+    execute "UPDATE taggings SET context = 'tags'"
+  end
+
+  def down
+  end
+end