Skip to content

A platform for community discussion. Free, open, simple.

UX: save potentially pending draft via sendBeacon on tab close (#39056)

Renato Atilioaa734fd3bcf6
diff --git a/frontend/discourse/app/models/composer.js b/frontend/discourse/app/models/composer.js
index c3a250fc628..44ed11c71d0 100644
--- a/frontend/discourse/app/models/composer.js
+++ b/frontend/discourse/app/models/composer.js
@@ -1418,6 +1418,10 @@ export default class Composer extends RestModel {
return true;
}
+ serializeDraftData() {
+ return this.serialize(_draft_serializer);
+ }
+
saveDraft() {
if (!this.canSaveDraft) {
return Promise.reject();
@@ -1425,15 +1429,13 @@ export default class Composer extends RestModel {
this.set("draftSaving", true);
- const data = this.serialize(_draft_serializer);
-
const draftSequence = this.draftSequence;
this.set("draftSequence", this.draftSequence + 1);
return Draft.save(
this.draftKey,
draftSequence,
- data,
+ this.serializeDraftData(),
this.messageBus.clientId,
{ forceSave: this.draftForceSave }
)
diff --git a/frontend/discourse/app/models/draft.js b/frontend/discourse/app/models/draft.js
index 2b55be7f2c0..b48017aac91 100644
--- a/frontend/discourse/app/models/draft.js
+++ b/frontend/discourse/app/models/draft.js
@@ -1,5 +1,6 @@
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
+import getURL from "discourse/lib/get-url";
export default class Draft extends EmberObject {
static clear(key, sequence) {
@@ -45,4 +46,14 @@ export default class Draft extends EmberObject {
ignoreUnsent: false,
});
}
+
+ static saveBeacon(key, sequence, data, clientId, csrfToken) {
+ const formData = new FormData();
+ formData.append("draft_key", key);
+ formData.append("sequence", sequence);
+ formData.append("data", JSON.stringify(data));
+ formData.append("owner", clientId);
+ formData.append("authenticity_token", csrfToken);
+ navigator.sendBeacon(getURL("/drafts.json"), formData);
+ }
}
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.js
index f70b9b7f387..a20f5302b2d 100644
--- a/frontend/discourse/app/services/composer.js
+++ b/frontend/discourse/app/services/composer.js
@@ -19,6 +19,7 @@ import {
import { popupAjaxError } from "discourse/lib/ajax-error";
import { customPopupMenuOptions } from "discourse/lib/composer/custom-popup-menu-options";
import discourseDebounce from "discourse/lib/debounce";
+import { bind } from "discourse/lib/decorators";
import deprecated from "discourse/lib/deprecated";
import { isRailsTesting } from "discourse/lib/environment";
import prepareFormTemplateData, {
@@ -101,6 +102,7 @@ export default class ComposerService extends Service {
@service messageBus;
@service modal;
@service router;
+ @service session;
@service site;
@service siteSettings;
@service store;
@@ -130,6 +132,37 @@ export default class ComposerService extends Service {
@tracked _isStaffUserOverride;
@tracked _whispererOverride;
+ init() {
+ super.init(...arguments);
+ window.addEventListener("beforeunload", this._beaconSaveDraft);
+ }
+
+ willDestroy() {
+ super.willDestroy(...arguments);
+ window.removeEventListener("beforeunload", this._beaconSaveDraft);
+ }
+
+ @bind
+ _beaconSaveDraft() {
+ if (!this._saveDraftDebounce || !this.model || !this.model.canSaveDraft) {
+ return;
+ }
+
+ cancel(this._saveDraftDebounce);
+ this._saveDraftDebounce = null;
+
+ const draftSequence = this.model.draftSequence;
+ this.model.set("draftSequence", draftSequence + 1);
+
+ Draft.saveBeacon(
+ this.model.draftKey,
+ draftSequence,
+ this.model.serializeDraftData(),
+ this.messageBus.clientId,
+ this.session.csrfToken
+ );
+ }
+
@computed("site.mobileView", "showPreview")
get forcePreview() {
return this.site?.mobileView && this.showPreview;
diff --git a/spec/system/hashtag_autocomplete_spec.rb b/spec/system/hashtag_autocomplete_spec.rb
index 3a19366af92..ba671f6e663 100644
--- a/spec/system/hashtag_autocomplete_spec.rb
+++ b/spec/system/hashtag_autocomplete_spec.rb
@@ -49,7 +49,7 @@ describe "Using #hashtag autocompletion to search for and lookup categories and
)
end
- it "cooks the selected hashtag clientside in the composer preview with the correct url and icon" do
+ it "cooks the selected category hashtag clientside in the composer preview with the correct url and icon" do
visit_topic_and_initiate_autocomplete
hashtag_results = page.all(".hashtag-autocomplete__link", count: 2)
hashtag_results[0].click
@@ -73,12 +73,15 @@ describe "Using #hashtag autocompletion to search for and lookup categories and
},
)
end
+ end
+ it "cooks the selected tag hashtag clientside in the composer preview with the correct url and icon" do
visit_topic_and_initiate_autocomplete
hashtag_results = page.all(".hashtag-autocomplete__link", count: 2)
hashtag_results[1].click
expect(page).to have_css(".hashtag-cooked")
cooked_hashtag = page.find(".hashtag-cooked")
+
expect(cooked_hashtag["outerHTML"]).to have_tag(
"a",
with: {