A platform for community discussion. Free, open, simple.
DEV: Temporarily hide/skip OG image generation (#41264)
Penar Musaraj1e5ea1351501
diff --git a/config/site_settings.yml b/config/site_settings.ymlindex 3383437c36c..8ed50e011b2 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -195,6 +195,7 @@ branding:generate_topic_og_image:default: falseclient: true+ hidden: trueopengraph_image:default: ""client: truediff --git a/frontend/discourse/admin/components/admin-logo-form.gjs b/frontend/discourse/admin/components/admin-logo-form.gjsindex 4025af71afe..bfcb3e41b49 100644--- a/frontend/discourse/admin/components/admin-logo-form.gjs+++ b/frontend/discourse/admin/components/admin-logo-form.gjs@@ -5,13 +5,11 @@ import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";import AdminConfigAreaCardSection from "discourse/admin/components/admin-config-area-card-section";-import OgImagePreview from "discourse/admin/components/og-image-preview";import SimpleList from "discourse/admin/components/simple-list";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";import { bind } from "discourse/lib/decorators";import getURL from "discourse/lib/get-url";-import { eq } from "discourse/truth-helpers";import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";@@ -75,7 +73,6 @@ export default class AdminLogoForm extends Component {manifest_screenshots: data.manifest_screenshots,apple_touch_icon: data.apple_touch_icon,digest_logo: data.digest_logo,- generate_topic_og_image: data.og_image_source === "generated",opengraph_image: data.opengraph_image,x_summary_large_image: data.x_summary_large_image,},@@ -120,9 +117,6 @@ export default class AdminLogoForm extends Component {manifest_screenshots: this.siteSettings.manifest_screenshots,apple_touch_icon: this.siteSettings.apple_touch_icon,digest_logo: this.siteSettings.digest_logo,- og_image_source: this.siteSettings.generate_topic_og_image- ? "generated"- : "uploaded",opengraph_image: this.siteSettings.opengraph_image,x_summary_large_image: this.siteSettings.x_summary_large_image,};@@ -375,43 +369,20 @@ export default class AdminLogoForm extends Component {><:content><form.Field- @name="og_image_source"- @title={{i18n "admin.config.logo.form.og_image_source.title"}}+ @name="opengraph_image"+ @title={{i18n "admin.config.logo.form.opengraph_image.title"}}@description={{i18n- "admin.config.logo.form.og_image_source.description"+ "admin.config.logo.form.opengraph_image.description"}}- @format="full"- @type="radio-group"+ @onSet={{fn this.handleUpload "opengraph_image"}}+ @type="image"as |field|>- <field.Control as |radioGroup|>- <radioGroup.Radio @value="uploaded">- {{i18n "admin.config.logo.form.og_image_source.uploaded"}}- </radioGroup.Radio>- <radioGroup.Radio @value="generated">- {{i18n "admin.config.logo.form.og_image_source.generated"}}- </radioGroup.Radio>- </field.Control>+ <field.Control+ @type="branding"+ @placeholderUrl={{this.placeholders.opengraph_image}}+ /></form.Field>- {{#if (eq transientData.og_image_source "uploaded")}}- <form.Field- @name="opengraph_image"- @title={{i18n "admin.config.logo.form.opengraph_image.title"}}- @description={{i18n- "admin.config.logo.form.opengraph_image.description"- }}- @onSet={{fn this.handleUpload "opengraph_image"}}- @type="image"- as |field|- >- <field.Control- @type="branding"- @placeholderUrl={{this.placeholders.opengraph_image}}- />- </form.Field>- {{else if (eq transientData.og_image_source "generated")}}- <OgImagePreview />- {{/if}}</:content></AdminConfigAreaCardSection><form.Submit />diff --git a/spec/jobs/regular/generate_topic_og_image_spec.rb b/spec/jobs/regular/generate_topic_og_image_spec.rbindex 81bdb76e2c3..c1cba849a1e 100644--- a/spec/jobs/regular/generate_topic_og_image_spec.rb+++ b/spec/jobs/regular/generate_topic_og_image_spec.rb@@ -18,7 +18,7 @@ RSpec.describe Jobs::GenerateTopicOgImage doexpect(topic.reload.og_image_upload_id).to be_nilend- it "clears stale generated OG images when topic has a user-uploaded image" do+ xit "clears stale generated OG images when topic has a user-uploaded image" doold_upload = Fabricate(:upload)topic.update_column(:image_upload_id, Fabricate(:upload).id)topic.update_column(:og_image_upload_id, old_upload.id)@@ -31,7 +31,7 @@ RSpec.describe Jobs::GenerateTopicOgImage doexpect(UploadReference.exists?(upload_id: old_upload.id, target: topic)).to eq(false)end- it "replaces an existing generated OG image and cleans up the old reference" do+ xit "replaces an existing generated OG image and cleans up the old reference" doold_upload = Fabricate(:upload)topic.update_column(:og_image_upload_id, old_upload.id)UploadReference.ensure_exist!(upload_ids: [old_upload.id], target: topic)@@ -61,7 +61,7 @@ RSpec.describe Jobs::GenerateTopicOgImage doexpect(topic.reload.og_image_upload_id).to be_nilend- it "generates an OG image for a topic without an image" do+ xit "generates an OG image for a topic without an image" doupload = Fabricate(:upload)TopicOgImageGenerator.any_instance.expects(:generate).returns(upload)described_class.new.execute(topic_id: topic.id)