From d9c052f8e7671bbf72b32cf33a4431db7970958a Mon Sep 17 00:00:00 2001 From: Jan Cernik <66427541+jancernik@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:49:47 -0300 Subject: [PATCH] FIX: 500 error when reviewable has a missing message (#397) --- app/models/reviewable_ai_chat_message.rb | 3 ++- .../reviewable_ai_chat_message_serializer.rb | 2 +- .../components/reviewable-ai-chat-message.hbs | 26 ++++++++++--------- .../components/reviewable-ai-chat-message.js | 3 +++ .../reviewable_ai_chat_message_spec.rb | 16 ++++++++++++ 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/app/models/reviewable_ai_chat_message.rb b/app/models/reviewable_ai_chat_message.rb index 52075f78..382d9bd5 100644 --- a/app/models/reviewable_ai_chat_message.rb +++ b/app/models/reviewable_ai_chat_message.rb @@ -34,7 +34,8 @@ class ReviewableAiChatMessage < Reviewable def build_actions(actions, guardian, args) return unless pending? - return if chat_message.blank? + + return build_action(actions, :ignore, icon: "external-link-alt") if chat_message.blank? agree = actions.add_bundle("#{id}-agree", icon: "thumbs-up", label: "reviewables.actions.agree.title") diff --git a/app/serializers/reviewable_ai_chat_message_serializer.rb b/app/serializers/reviewable_ai_chat_message_serializer.rb index 6cfd1bda..241f3aad 100644 --- a/app/serializers/reviewable_ai_chat_message_serializer.rb +++ b/app/serializers/reviewable_ai_chat_message_serializer.rb @@ -10,7 +10,7 @@ class ReviewableAiChatMessageSerializer < ReviewableSerializer has_one :chat_channel, serializer: AiChatChannelSerializer, root: false, embed: :objects def chat_channel - object.chat_message.chat_channel + object.chat_message&.chat_channel end def target_id diff --git a/assets/javascripts/discourse/components/reviewable-ai-chat-message.hbs b/assets/javascripts/discourse/components/reviewable-ai-chat-message.hbs index 0f0f6003..c3108924 100644 --- a/assets/javascripts/discourse/components/reviewable-ai-chat-message.hbs +++ b/assets/javascripts/discourse/components/reviewable-ai-chat-message.hbs @@ -1,15 +1,17 @@ -