collavre 0.24.0 → 0.24.1

data/app/javascript/controllers/comments/topics_controller.js

@@ -7,7 +7,7 @@ const ICON_ARCHIVE = `<svg width="12" height="12" viewBox="0 0 24 24" fill="none
 const ICON_RESTORE = `<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 7v6h6"/><path d="M21 17a9 9 0 0 0-9-9 9 9 0 0 0-6.69 3L3 13"/></svg>`
 
 export default class extends Controller {
-    static targets = ["list"]
+    static targets = ["list", "creationContainer"]
 
     connect() {
         this.topics = []
@@ -189,15 +189,37 @@ export default class extends Controller {
             }
         }
 
-        // Add create button container (write permission is sufficient for topic creation)
-        if (canCreateTopic) {
-            html += `<span class="topic-creation-container" data-comments--topics-target="creationContainer"
-                          data-action="dragover->comments--topics#handleAddButtonDragOver dragleave->comments--topics#handleDragLeave drop->comments--topics#handleAddButtonDrop">
-                  <button class="add-topic-btn" data-action="click->comments--topics#showInput">+</button>
-                 </span>`
+        this.listTarget.innerHTML = html
+
+        // The create button lives outside the scrolling strip so it stays reachable
+        // without horizontal scrolling, no matter how many topics there are.
+        this.renderCreationContainer(canCreateTopic)
+    }
+
+    // Write permission is sufficient for topic creation.
+    renderCreationContainer(canCreateTopic) {
+        if (!this.hasCreationContainerTarget) return
+        const container = this.creationContainerTarget
+
+        container.hidden = !canCreateTopic
+        if (!canCreateTopic) {
+            container.innerHTML = ''
+            return
         }
 
-        this.listTarget.innerHTML = html
+        // renderTopics re-runs on every topic broadcast; don't wipe a name being typed.
+        // `creating` marks an already-submitted name, whose input must give way to the button.
+        // A draft only survives re-renders of the creative it was typed for: chat-nav
+        // switches creatives without blurring, and posting it there is the wrong creative.
+        const draftIsCurrent = String(this._draftCreativeId) === String(this.creativeId)
+        if (!this.creating && draftIsCurrent && container.querySelector('.topic-input')) return
+
+        this.renderAddButton()
+    }
+
+    renderAddButton() {
+        this.creationContainerTarget.innerHTML =
+            `<button class="add-topic-btn" data-action="click->comments--topics#showInput">+</button>`
     }
 
     handleDragOver(event) {
@@ -404,7 +426,7 @@ export default class extends Controller {
                 }
                 this.loadTopics()
             } else {
-                alertDialog("Failed to delete topic")
+                alertDialog(this._i18n("delete_error"))
             }
         } catch (e) {
             console.error("Error deleting topic", e)
@@ -431,7 +453,7 @@ export default class extends Controller {
                 }
                 this.loadTopics()
             } else {
-                alertDialog("Failed to archive topic")
+                alertDialog(this._i18n("archive_error"))
             }
         } catch (e) {
             console.error("Error archiving topic", e)
@@ -454,7 +476,7 @@ export default class extends Controller {
             if (response.ok) {
                 this.loadTopics()
             } else {
-                alertDialog("Failed to restore topic")
+                alertDialog(this._i18n("restore_error"))
             }
         } catch (e) {
             console.error("Error restoring topic", e)
@@ -517,9 +539,10 @@ export default class extends Controller {
 
     showInput(event) {
         event.preventDefault()
-        const container = this.element.querySelector('[data-comments--topics-target="creationContainer"]')
-        if (!container) return
+        if (!this.hasCreationContainerTarget) return
+        const container = this.creationContainerTarget
 
+        this._draftCreativeId = this.creativeId
         const placeholder = this.listTarget.dataset.newTopicPlaceholder || "New Topic"
         container.innerHTML = `<input type="text" class="topic-input" placeholder="${placeholder}" 
                                   data-action="keydown->comments--topics#handleInputKey blur->comments--topics#resetInput"
@@ -532,9 +555,8 @@ export default class extends Controller {
     resetInput() {
         // Small delay to allow enter key to process first if that was the cause
         setTimeout(() => {
-            const container = this.element.querySelector('[data-comments--topics-target="creationContainer"]')
-            if (container && !this.creating) {
-                container.innerHTML = `<button class="add-topic-btn" data-action="click->comments--topics#showInput">+</button>`
+            if (this.hasCreationContainerTarget && !this.creating) {
+                this.renderAddButton()
             }
         }, 200)
     }
@@ -661,7 +683,7 @@ export default class extends Controller {
                 this.renderTopics(this.topics, this.canManageTopics, this.canCreateTopic)
                 this.restoreSelection()
             } else {
-                alertDialog("Failed to update topic")
+                alertDialog(this._i18n("update_error"))
                 this.loadTopics() // Reload to restore state
             }
         } catch (e) {
@@ -752,7 +774,7 @@ export default class extends Controller {
                 // Dispatch change event manually since we skipped the click handler
                 this.dispatch("change", { detail: { topicId: topic.id, mainTopicId: this.mainTopicId } })
             } else {
-                alertDialog("Failed to create topic")
+                alertDialog(this._i18n("create_error"))
             }
         } catch (e) {
             console.error("Error creating topic", e)
@@ -1000,6 +1022,21 @@ export default class extends Controller {
         }
     }
 
+    // Localized strings are handed down from the ERB partial as data
+    // attributes; the English literals are last-resort fallbacks for when the
+    // controller is mounted without them.
+    _i18n(key) {
+        const translations = {
+            set_agent_error: this.element.dataset.topicSetAgentError || 'Unable to assign the agent to this topic.',
+            create_error: this.element.dataset.topicCreateError || 'Unable to create the topic.',
+            update_error: this.element.dataset.topicUpdateError || 'Unable to update the topic.',
+            delete_error: this.element.dataset.topicDeleteError || 'Unable to delete the topic.',
+            archive_error: this.element.dataset.topicArchiveError || 'Unable to archive the topic.',
+            restore_error: this.element.dataset.topicRestoreError || 'Unable to restore the topic.'
+        }
+        return translations[key] || key
+    }
+
     async setTopicPrimaryAgent(topicId, agent) {
         if (!this.creativeId) return
 
@@ -1013,13 +1050,23 @@ export default class extends Controller {
                 body: JSON.stringify({ agent_id: agent.id })
             })
 
+            const data = await response.json().catch(() => ({}))
+
             if (!response.ok) {
-                const data = await response.json()
-                console.error('Failed to set primary agent:', data.error)
+                alertDialog(data.error || this._i18n("set_agent_error"))
+                return
             }
-            // Topic update comes via WebSocket broadcast
+
+            // Render the avatar from the response rather than waiting for the
+            // WebSocket broadcast. A dropped broadcast (e.g. the topics channel
+            // subscription was refused) would otherwise leave the avatar
+            // invisible until the next page load. The broadcast still runs and
+            // propagates the change to other connected users; re-applying it
+            // here is a no-op merge.
+            if (data.topic) this.updateTopicInList(data.topic)
         } catch (e) {
             console.error('Error setting primary agent', e)
+            alertDialog(this._i18n("set_agent_error"))
         }
     }
 

data/app/views/collavre/comments/_comments_popup.html.erb

@@ -59,6 +59,12 @@
      data-review-type-review-label="<%= t('collavre.comments.review_type_review') %>"
      data-review-type-question-label="<%= t('collavre.comments.review_type_question') %>"
      data-remove-from-history-label="<%= t('collavre.comments.remove_from_history') %>"
+     data-topic-set-agent-error="<%= t('collavre.comments.topic_set_agent_error') %>"
+     data-topic-create-error="<%= t('collavre.comments.topic_create_error') %>"
+     data-topic-update-error="<%= t('collavre.comments.topic_update_error') %>"
+     data-topic-delete-error="<%= t('collavre.comments.topic_delete_error') %>"
+     data-topic-archive-error="<%= t('collavre.comments.topic_archive_error') %>"
+     data-topic-restore-error="<%= t('collavre.comments.topic_restore_error') %>"
      data-inbox-reply-button="<%= t('collavre.comments.inbox_reply_button') %>"
      data-table-download-csv-text="<%= t('collavre.comments.table_download.csv') %>"
      data-table-download-excel-text="<%= t('collavre.comments.table_download.excel') %>"
@@ -129,6 +135,8 @@
     <div id="comment-topics" data-comments--topics-target="list" class="comment-topics-list"
          data-confirm-delete-text="<%= t('collavre.topics.delete_confirm') %>"
          data-new-topic-placeholder="<%= t('collavre.topics.new_placeholder') %>"></div>
+    <span class="topic-creation-container" data-comments--topics-target="creationContainer" hidden
+          data-action="dragover->comments--topics#handleAddButtonDragOver dragleave->comments--topics#handleDragLeave drop->comments--topics#handleAddButtonDrop"></span>
     <button type="button" class="topic-list-btn"
             data-action="click->comments--topics#openTopicListPopup"
             title="<%= t('collavre.comments.topic_list') %>"

data/config/locales/comments.en.yml

@@ -107,6 +107,12 @@ en:
       navigate_forward: Next chat
       recent_chats: Recent chats
       remove_from_history: Remove from history
+      topic_set_agent_error: Unable to assign the agent to this topic.
+      topic_create_error: Unable to create the topic.
+      topic_update_error: Unable to update the topic.
+      topic_delete_error: Unable to delete the topic.
+      topic_archive_error: Unable to archive the topic.
+      topic_restore_error: Unable to restore the topic.
       inbox_reply_button: Reply
       replace_button: Replace
       move_no_selection: Select at least one message to move.

data/config/locales/comments.ko.yml

@@ -104,6 +104,12 @@ ko:
       navigate_forward: 다음 채팅
       recent_chats: 최근 채팅
       remove_from_history: 히스토리에서 제거
+      topic_set_agent_error: 이 토픽에 에이전트를 지정할 수 없습니다.
+      topic_create_error: 토픽을 생성할 수 없습니다.
+      topic_update_error: 토픽을 수정할 수 없습니다.
+      topic_delete_error: 토픽을 삭제할 수 없습니다.
+      topic_archive_error: 토픽을 보관할 수 없습니다.
+      topic_restore_error: 토픽을 복원할 수 없습니다.
       inbox_reply_button: 답글
       replace_button: 바꾸기
       move_no_selection: 이동할 메시지를 선택해주세요.

data/lib/collavre/version.rb

@@ -1,3 +1,3 @@
 module Collavre
-  VERSION = "0.24.0"
+  VERSION = "0.24.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Collavre
@@ -306,12 +306,17 @@ files:
 - app/javascript/controllers/comment_version_controller.js
 - app/javascript/controllers/comments/__tests__/form_controller_double_submit.test.js
 - app/javascript/controllers/comments/__tests__/form_controller_review.test.js
+- app/javascript/controllers/comments/__tests__/list_controller_prev_message.test.js
 - app/javascript/controllers/comments/__tests__/list_controller_selection.test.js
 - app/javascript/controllers/comments/__tests__/popup_controller.test.js
 - app/javascript/controllers/comments/__tests__/presence_controller.test.js
+- app/javascript/controllers/comments/__tests__/prev_message_navigator.test.js
 - app/javascript/controllers/comments/__tests__/review_quotes_store.test.js
+- app/javascript/controllers/comments/__tests__/topics_controller_action_errors.test.js
+- app/javascript/controllers/comments/__tests__/topics_controller_creation_container.test.js
 - app/javascript/controllers/comments/__tests__/topics_controller_delete.test.js
 - app/javascript/controllers/comments/__tests__/topics_controller_override.test.js
+- app/javascript/controllers/comments/__tests__/topics_controller_primary_agent.test.js
 - app/javascript/controllers/comments/__tests__/topics_controller_topic_list.test.js
 - app/javascript/controllers/comments/contexts_controller.js
 - app/javascript/controllers/comments/drop_trigger_controller.js
@@ -320,6 +325,7 @@ files:
 - app/javascript/controllers/comments/mention_menu_controller.js
 - app/javascript/controllers/comments/popup_controller.js
 - app/javascript/controllers/comments/presence_controller.js
+- app/javascript/controllers/comments/prev_message_navigator.js
 - app/javascript/controllers/comments/review_quotes_store.js
 - app/javascript/controllers/comments/topics_controller.js
 - app/javascript/controllers/common_popup_controller.js