A platform for community discussion. Free, open, simple.
FIX: Event image crashed the advanced post-event builder (#40798)
Gabriel Grubba0bf14de7104c
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjsindex 5775f787b46..b5a561a320d 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs@@ -115,7 +115,7 @@ export default class PostEventBuilder extends Component {: this.event.status || "public",rawInvitees: this.event.rawInvitees ?? [],recurrence: this.event.recurrence ?? null,- imageUpload: this.event.imageUpload ?? null,+ imageUpload: this.event.imageUpload?.url ?? null,timezone: this.event.timezone ?? null,// clone so the form draft owns its own remindersreminders: (this.event.reminders ?? []).map((r) => ({ ...r })),@@ -204,8 +204,8 @@ export default class PostEventBuilder extends Component {@actionhandleImageChange(value, { set }) {- set("imageUpload", value);- this.event.imageUpload = value;+ set("imageUpload", value?.url ?? null);+ this.event.imageUpload = value ?? null;}@action@@ -740,6 +740,7 @@ export default class PostEventBuilder extends Component {}}@closeModal={{@closeModal}}@flash={{this.flash}}+ @inline={{@inline}}class="post-event-builder-modal{{if this.isAdvancedScreen 'is-advanced' 'is-compact'}}">diff --git a/plugins/discourse-calendar/test/javascripts/integration/components/post-event-builder-test.gjs b/plugins/discourse-calendar/test/javascripts/integration/components/post-event-builder-test.gjsnew file mode 100644index 00000000000..de0acd5abba--- /dev/null+++ b/plugins/discourse-calendar/test/javascripts/integration/components/post-event-builder-test.gjs@@ -0,0 +1,70 @@+import { getOwner } from "@ember/owner";+import { render } from "@ember/test-helpers";+import { module, test } from "qunit";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import PostEventBuilder from "../../discourse/components/modal/post-event-builder";+import DiscoursePostEventEvent from "../../discourse/models/discourse-post-event-event";++module("Integration | Component | Modal | PostEventBuilder", function (hooks) {+ setupRenderingTest(hooks);++ hooks.beforeEach(function () {+ const store = getOwner(this).lookup("service:store");+ this.user = store.createRecord("user", {+ username: "tom",+ id: 1,+ admin: true,+ });++ getOwner(this).unregister("service:current-user");+ getOwner(this).register("service:current-user", this.user, {+ instantiate: false,+ });+ });++ test("advanced screen renders an existing image upload as its URL", async function (assert) {+ const event = DiscoursePostEventEvent.create({+ name: "My event",+ starts_at: "2022-07-01T10:00:00Z",+ ends_at: "2022-07-01T11:00:00Z",+ timezone: "UTC",+ status: "public",+ reminders: [],+ raw_invitees: [],+ custom_fields: {},+ image_upload: {+ url: "/uploads/default/original/1X/test-event-image.png",+ short_url: "upload://test-event-image",+ },+ });++ const model = {+ event,+ initialScreen: "advanced",+ onUpdate: () => {},+ toolbarEvent: {},+ };+ const closeModal = () => {};++ await render(+ <template>+ <PostEventBuilder+ @inline={{true}}+ @model={{model}}+ @closeModal={{closeModal}}+ />+ </template>+ );++ assert+ .dom(`[data-name="imageUpload"] .file-uploader`)+ .hasClass("has-image", "the image control shows the uploaded image");+ assert+ .dom(`[data-name="imageUpload"] .file-uploader__preview`)+ .hasAttribute(+ "style",+ /url\(\/uploads\/default\/original\/1X\/test-event-image\.png\)/,+ "renders the upload url, not the raw object"+ );+ });+});