osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update core references to controller:composer

Browse Source
This commit is contained in:
David Taylor 2023-03-17 16:16:35 +00:00
parent e7764b5865
commit 0537e5086f
No known key found for this signature in database
GPG Key ID: 46904C18B1D3F434
19 changed files with 67 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/popup-input-tip.js
View File

@ -28,7 +28,7 @@ export default Component.extend({
dismiss() {
this.set("shownAt", null);
const composer = getOwner(this).lookup("controller:composer");
const composer = getOwner(this).lookup("service:composer");
composer.clearLastValidatedAt();
this.element.previousElementSibling?.focus();
},

2
app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
View File

@ -68,7 +68,7 @@ export default class SidebarUserCommunitySection extends SidebarCommonCommunityS
}
next(() => {
getOwner(this).lookup("controller:composer").open(composerArgs);
getOwner(this).lookup("service:composer").open(composerArgs);
});
}
}

2
app/assets/javascripts/discourse/app/components/user-stream.js
View File

@ -100,7 +100,7 @@ export default Component.extend(LoadMore, {
},
resumeDraft(item) {
const composer = getOwner(this).lookup("controller:composer");
const composer = getOwner(this).lookup("service:composer");
if (composer.get("model.viewOpen")) {
composer.close();
}

3
app/assets/javascripts/discourse/app/controllers/full-page-search.js
View File

@ -22,6 +22,7 @@ import { Promise } from "rsvp";
import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
import showModal from "discourse/lib/show-modal";
import userSearch from "discourse/lib/user-search";
import { inject as service } from "@ember/service";
const SortOrders = [
{ name: I18n.t("search.relevance"), id: 0 },
@ -39,7 +40,7 @@ const PAGE_LIMIT = 10;
export default Controller.extend({
application: controller(),
composer: controller(),
composer: service(),
bulkSelectEnabled: null,
loading: false,

2
app/assets/javascripts/discourse/app/controllers/topic.js
View File

@ -47,7 +47,7 @@ export function registerCustomPostMessageCallback(type, callback) {
}
export default Controller.extend(bufferedProperty("model"), {
composer: controller(),
composer: service(),
application: controller(),
dialog: service(),
documentTitle: service(),

6
app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
View File

@ -445,14 +445,14 @@ export default {
return;
}
this.container.lookup("controller:composer").open({
this.container.lookup("service:composer").open({
action: Composer.CREATE_TOPIC,
draftKey: Composer.NEW_TOPIC_KEY,
});
},
focusComposer(event) {
const composer = this.container.lookup("controller:composer");
const composer = this.container.lookup("service:composer");
if (event) {
event.preventDefault();
event.stopPropagation();
@ -461,7 +461,7 @@ export default {
},
fullscreenComposer() {
const composer = this.container.lookup("controller:composer");
const composer = this.container.lookup("service:composer");
if (composer.get("model")) {
composer.toggleFullscreen();
}

2
app/assets/javascripts/discourse/app/lib/plugin-api.js
View File

@ -58,7 +58,7 @@ import { addPluginReviewableParam } from "discourse/components/reviewable-item";
import {
addComposerSaveErrorCallback,
addPopupMenuOptionsCallback,
} from "discourse/controllers/composer";
} from "discourse/services/composer";
import { addPostClassesCallback } from "discourse/widgets/post";
import {
addGroupPostSmallActionCode,

2
app/assets/javascripts/discourse/app/lib/url.js
View File

@ -410,7 +410,7 @@ const DiscourseURL = EmberObject.extend({
},
get isComposerOpen() {
return this.controllerFor("composer")?.visible;
return this.container.lookup("service:composer")?.visible;
},
get router() {

39
app/assets/javascripts/discourse/app/mixins/open-composer.js
View File

@ -1,6 +1,7 @@
// This mixin allows a route to open the composer
import Composer from "discourse/models/composer";
import Mixin from "@ember/object/mixin";
import { getOwner } from "discourse-common/lib/get-owner";
export default Mixin.create({
openComposer(controller) {
@ -13,13 +14,15 @@ export default Mixin.create({
categoryId = null;
}
this.controllerFor("composer").open({
prioritizedCategoryId: categoryId,
topicCategoryId: categoryId,
action: Composer.CREATE_TOPIC,
draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
draftSequence: controller.get("model.draft_sequence") || 0,
});
getOwner(this)
.lookup("service:composer")
.open({
prioritizedCategoryId: categoryId,
topicCategoryId: categoryId,
action: Composer.CREATE_TOPIC,
draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
draftSequence: controller.get("model.draft_sequence") || 0,
});
},
openComposerWithTopicParams(
@ -29,15 +32,17 @@ export default Mixin.create({
topicCategoryId,
topicTags
) {
this.controllerFor("composer").open({
action: Composer.CREATE_TOPIC,
topicTitle,
topicBody,
topicCategoryId,
topicTags,
draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
draftSequence: controller.get("model.draft_sequence"),
});
getOwner(this)
.lookup("service:composer")
.open({
action: Composer.CREATE_TOPIC,
topicTitle,
topicBody,
topicCategoryId,
topicTags,
draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
draftSequence: controller.get("model.draft_sequence"),
});
},
openComposerWithMessageParams({
@ -46,7 +51,7 @@ export default Mixin.create({
topicBody = "",
hasGroups = false,
} = {}) {
this.controllerFor("composer").open({
getOwner(this).lookup("service:composer").open({
action: Composer.PRIVATE_MESSAGE,
recipients,
topicTitle,

3
app/assets/javascripts/discourse/app/routes/application.js
View File

@ -39,6 +39,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
shortSiteDescription: setting("short_site_description"),
documentTitle: service(),
dialog: service(),
composer: service(),
actions: {
toggleAnonymous() {
@ -84,7 +85,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
: null;
// used only once, one less dependency
return this.controllerFor("composer").open({
return this.composer.open({
action: Composer.PRIVATE_MESSAGE,
recipients,
archetypeId: "private_message",

4
app/assets/javascripts/discourse/app/routes/build-category-route.js
View File

@ -16,11 +16,13 @@ import PermissionType from "discourse/models/permission-type";
import TopicList from "discourse/models/topic-list";
import { action } from "@ember/object";
import PreloadStore from "discourse/lib/preload-store";
import { inject as service } from "@ember/service";
// A helper function to create a category route with parameters
export default (filterArg, params) => {
return DiscourseRoute.extend({
queryParams,
composer: service(),
model(modelParams) {
const category = Category.findBySlugPathWithID(
@ -209,7 +211,7 @@ export default (filterArg, params) => {
deactivate() {
this._super(...arguments);
this.controllerFor("composer").set("prioritizedCategoryId", null);
this.composer.set("prioritizedCategoryId", null);
this.searchService.set("searchContext", null);
},

3
app/assets/javascripts/discourse/app/routes/discourse.js
View File

@ -3,6 +3,7 @@ import Draft from "discourse/models/draft";
import Route from "@ember/routing/route";
import { once } from "@ember/runloop";
import { seenUser } from "discourse/lib/user-presence";
import { getOwner } from "discourse-common/lib/get-owner";
const DiscourseRoute = Route.extend({
showFooter: false,
@ -53,7 +54,7 @@ const DiscourseRoute = Route.extend({
},
openTopicDraft() {
const composer = this.controllerFor("composer");
const composer = getOwner(this).lookup("service:composer");
if (
composer.get("model.action") === Composer.CREATE_TOPIC &&

9
app/assets/javascripts/discourse/app/routes/tag-show.js
View File

@ -18,11 +18,13 @@ import { setTopicList } from "discourse/lib/topic-list-tracker";
import showModal from "discourse/lib/show-modal";
import { action } from "@ember/object";
import PreloadStore from "discourse/lib/preload-store";
import { inject as service } from "@ember/service";
const NONE = "none";
const ALL = "all";
export default DiscourseRoute.extend(FilterModeMixin, {
composer: service(),
navMode: "latest",
queryParams,
@ -214,8 +216,7 @@ export default DiscourseRoute.extend(FilterModeMixin, {
this.openTopicDraft();
} else {
const controller = this.controllerFor("tag.show");
const composerController = this.controllerFor("composer");
composerController
this.composer
.open({
categoryId: controller.category?.id,
action: Composer.CREATE_TOPIC,
@ -223,8 +224,8 @@ export default DiscourseRoute.extend(FilterModeMixin, {
})
.then(() => {
// Pre-fill the tags input field
if (composerController.canEditTags && controller.tag?.id) {
const composerModel = this.controllerFor("composer").model;
if (this.composer.canEditTags && controller.tag?.id) {
const composerModel = this.composer.model;
composerModel.set("tags", this._controllerTags(controller));
}
});

6
app/assets/javascripts/discourse/app/routes/topic-from-params.js
View File

@ -5,9 +5,12 @@ import { isEmpty } from "@ember/utils";
import { isTesting } from "discourse-common/config/environment";
import { schedule } from "@ember/runloop";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";
// This route is used for retrieving a topic based on params
export default DiscourseRoute.extend({
composer: service(),
// Avoid default model hook
model(params) {
params = params || {};
@ -56,7 +59,6 @@ export default DiscourseRoute.extend({
}
const topicController = this.controllerFor("topic");
const composerController = this.controllerFor("composer");
const topic = this.modelFor("topic");
const postStream = topic.postStream;
@ -105,7 +107,7 @@ export default DiscourseRoute.extend({
}
if (!isEmpty(topic.draft)) {
composerController.open({
this.composer.open({
draft: Draft.getLocal(topic.draft_key, topic.draft),
draftKey: topic.draft_key,
draftSequence: topic.draft_sequence,

5
app/assets/javascripts/discourse/app/routes/topic.js
View File

@ -14,6 +14,7 @@ import PostFlag from "discourse/lib/flag-targets/post-flag";
const SCROLL_DELAY = 500;
const TopicRoute = DiscourseRoute.extend({
composer: service(),
screenTrack: service(),
scheduledReplace: null,
@ -333,7 +334,7 @@ const TopicRoute = DiscourseRoute.extend({
postStream.cancelFilter();
topicController.set("multiSelect", false);
this.controllerFor("composer").set("topic", null);
this.composer.set("topic", null);
this.screenTrack.stop();
this.appEvents.trigger("header:hide-topic");
@ -357,7 +358,7 @@ const TopicRoute = DiscourseRoute.extend({
controller.set("multiSelect", false);
controller.get("quoteState").clear();
this.controllerFor("composer").set("topic", model);
this.composer.set("topic", model);
this.topicTrackingState.trackIncoming("all");
// We reset screen tracking every time a topic is entered

7
app/assets/javascripts/discourse/app/routes/user-private-messages.js
View File

@ -2,8 +2,11 @@ import Composer from "discourse/models/composer";
import DiscourseRoute from "discourse/routes/discourse";
import Draft from "discourse/models/draft";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";
export default DiscourseRoute.extend({
composer: service(),
renderTemplate() {
this.render("user/messages");
},
@ -20,11 +23,9 @@ export default DiscourseRoute.extend({
controller.set("model", model);
if (this.currentUser) {
const composerController = this.controllerFor("composer");
Draft.get("new_private_message").then((data) => {
if (data.draft) {
composerController.open({
this.composer.open({
draft: data.draft,
draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
ignoreIfChanged: true,

2
app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
View File

@ -12,7 +12,7 @@ import I18n from "I18n";
import selectKit from "discourse/tests/helpers/select-kit-helper";
import sinon from "sinon";
import { test } from "qunit";
import { toggleCheckDraftPopup } from "discourse/controllers/composer";
import { toggleCheckDraftPopup } from "discourse/services/composer";
import userFixtures from "discourse/tests/fixtures/user-fixtures";
import { cloneJSON } from "discourse-common/lib/object";

14
app/assets/javascripts/discourse/tests/acceptance/composer-test.js
View File

@ -7,7 +7,7 @@ import {
triggerKeyEvent,
visit,
} from "@ember/test-helpers";
import { toggleCheckDraftPopup } from "discourse/controllers/composer";
import { toggleCheckDraftPopup } from "discourse/services/composer";
import { cloneJSON } from "discourse-common/lib/object";
import TopicFixtures from "discourse/tests/fixtures/topic";
import LinkLookup from "discourse/lib/link-lookup";
@ -996,7 +996,7 @@ acceptance("Composer", function (needs) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .create");
this.container.lookup("controller:composer").set(
this.container.lookup("service:composer").set(
"linkLookup",
new LinkLookup({
"github.com": {
@ -1165,7 +1165,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
test("Focusing a composer which is not open with create topic", async function (assert) {
await visit("/t/internationalization-localization/280");
const composer = this.container.lookup("controller:composer");
const composer = this.container.lookup("service:composer");
await composer.focusComposer({ fallbackToNewTopic: true });
await settled();
@ -1180,7 +1180,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
test("Focusing a composer which is not open with create topic and append text", async function (assert) {
await visit("/t/internationalization-localization/280");
const composer = this.container.lookup("controller:composer");
const composer = this.container.lookup("service:composer");
await composer.focusComposer({
fallbackToNewTopic: true,
insertText: "this is appended",
@ -1202,7 +1202,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
await visit("/");
await click("#create-topic");
const composer = this.container.lookup("controller:composer");
const composer = this.container.lookup("service:composer");
await composer.focusComposer();
await settled();
@ -1217,7 +1217,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
await visit("/");
await click("#create-topic");
const composer = this.container.lookup("controller:composer");
const composer = this.container.lookup("service:composer");
await composer.focusComposer({ insertText: "this is some appended text" });
await settled();
@ -1239,7 +1239,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
await fillIn(".d-editor-input", "This is a dirty reply");
await click(".toggle-minimize");
const composer = this.container.lookup("controller:composer");
const composer = this.container.lookup("service:composer");
await composer.focusComposer({ insertText: "this is some appended text" });
await settled();

6
app/assets/javascripts/discourse/tests/acceptance/tags-test.js
View File

@ -542,7 +542,7 @@ acceptance("Tag info", function (needs) {
test("composer will not set tags if user cannot create them", async function (assert) {
await visit("/tag/planters");
await click("#create-topic");
let composer = this.owner.lookup("controller:composer");
let composer = this.owner.lookup("service:composer");
assert.strictEqual(composer.get("model").tags, undefined);
});
});
@ -611,7 +611,7 @@ acceptance("Tag show - create topic", function (needs) {
});
test("composer will not set tags with all/none tags when creating topic", async function (assert) {
const composer = this.owner.lookup("controller:composer");
const composer = this.owner.lookup("service:composer");
await visit("/tag/none");
await click("#create-topic");
@ -623,7 +623,7 @@ acceptance("Tag show - create topic", function (needs) {
});
test("composer will set tags from selected tag", async function (assert) {
const composer = this.owner.lookup("controller:composer");
const composer = this.owner.lookup("service:composer");
await visit("/tag/planters");
await click("#create-topic");