From ea5c38686ea68282bf9da9fc6da0f89efa966644 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 13 Mar 2024 20:52:33 +1100 Subject: [PATCH] FIX: expire assets when CSS changes FIX: missing translation on share page (#528) * FIX: expire assets when CSS changes FIX: missing translation on share page Also add trivial image styling * oops not needed --- .../ai_bot/shared_ai_conversations_helper.rb | 15 ++++++++++++++ .../shared_ai_conversations/show.html.erb | 7 +++---- config/locales/server.en.yml | 2 +- public/ai-share/share.css | 20 ++++++++++++++----- .../ai_bot/shared_ai_conversations_spec.rb | 1 + 5 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 app/helpers/discourse_ai/ai_bot/shared_ai_conversations_helper.rb diff --git a/app/helpers/discourse_ai/ai_bot/shared_ai_conversations_helper.rb b/app/helpers/discourse_ai/ai_bot/shared_ai_conversations_helper.rb new file mode 100644 index 00000000..3e16311c --- /dev/null +++ b/app/helpers/discourse_ai/ai_bot/shared_ai_conversations_helper.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true +module DiscourseAi + module AiBot + module SharedAiConversationsHelper + # bump up version when assets change + # long term we may want to change this cause it is hard to remember + # to bump versions, but for now this does the job + VERSION = "1" + + def share_asset_url(short_path) + ::UrlHelper.local_cdn_url("/plugins/discourse-ai/ai-share/#{short_path}?#{VERSION}") + end + end + end +end diff --git a/app/views/discourse_ai/ai_bot/shared_ai_conversations/show.html.erb b/app/views/discourse_ai/ai_bot/shared_ai_conversations/show.html.erb index b77378f5..8880a67e 100644 --- a/app/views/discourse_ai/ai_bot/shared_ai_conversations/show.html.erb +++ b/app/views/discourse_ai/ai_bot/shared_ai_conversations/show.html.erb @@ -10,8 +10,8 @@ - "> - "> + "> + "> - +
@@ -42,7 +42,6 @@ <%= @shared_conversation.llm_name %>
-

<%= @shared_conversation.title %>

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index b3fd1f5b..6611a904 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -158,13 +158,13 @@ en: share_ai: read_more: "Read full transcript" onebox_title: "AI Conversation with %{llm_name}" + formatted_excerpt: "AI Conversation with %{llm_name}:\n %{excerpt}" errors: not_allowed: "You are not allowed to share this topic" other_people_in_pm: "Personal messages with other humans cannot be shared publicly" other_content_in_pm: "Personal messages containing posts from other people cannot be shared publicly" failed_to_share: "Failed to share the conversation" conversation_deleted: "Conversation share deleted successfully" - formatted_excerpt: "AI Conversation with %{llm_name}:\n %{excerpt}" ai_bot: personas: cannot_delete_system_persona: "System personas cannot be deleted, please disable it instead" diff --git a/public/ai-share/share.css b/public/ai-share/share.css index 8d579160..5d905e4f 100644 --- a/public/ai-share/share.css +++ b/public/ai-share/share.css @@ -26,10 +26,10 @@ --font-up-4: 1.7511em; --font-up-3: 1.5157em; --font-up-2: 1.3195em; - --font-up-1: 1.1487em; + --font-up-1: 1.1487em; --font-0: 1em; - --font-down-1: 0.8706em; - --font-down-2: 0.7579em; + --font-down-1: 0.8706em; + --font-down-2: 0.7579em; --font-down-3: 0.6599em; --font-down-4: 0.5745em; --font-down-5: 0.5em; @@ -216,7 +216,7 @@ article { } article:last-of-type:hover { border-bottom-color: transparent; - } + } } pre, code { @@ -290,7 +290,7 @@ h1 h2 h3 h4 h5 h6 { .post__content p:last-child { margin-bottom: 0.4em; } - + .post__date { color: var(--primary-500); margin-left: auto; @@ -377,3 +377,13 @@ li, p { word-break: break-word; } +.lightbox-wrapper .meta svg, .lightbox-wrapper .meta .informations { + display: none; +} +.lightbox-wrapper .meta .filename { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + +} diff --git a/spec/requests/ai_bot/shared_ai_conversations_spec.rb b/spec/requests/ai_bot/shared_ai_conversations_spec.rb index 714601a4..a46c317b 100644 --- a/spec/requests/ai_bot/shared_ai_conversations_spec.rb +++ b/spec/requests/ai_bot/shared_ai_conversations_spec.rb @@ -153,6 +153,7 @@ RSpec.describe DiscourseAi::AiBot::SharedAiConversationsController do expect(response).to have_http_status(:success) expect(response.headers["Cache-Control"]).to eq("max-age=60, public") expect(response.headers["X-Robots-Tag"]).to eq("noindex") + expect(response.body).not_to include("Translation missing") end it "is also able to render in json format" do