+ <:body>
+
+ {{this.instructionsText}}
+
+
+
+ <:footer>
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.js
new file mode 100644
index 00000000000..f8f5b11b4e6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.js
@@ -0,0 +1,112 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
+import discourseLater from "discourse-common/lib/later";
+import {
+ EXISTING_TOPIC_SELECTION,
+ NEW_TOPIC_SELECTION,
+} from "discourse/plugins/chat/discourse/components/chat-to-topic-selector";
+import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";
+import { isEmpty } from "@ember/utils";
+
+export default class ChatModalArchiveChannel extends Component {
+ @service chatApi;
+ @service siteSettings;
+
+ @tracked selection = NEW_TOPIC_SELECTION;
+ @tracked saving = false;
+ @tracked topicTitle = null;
+ @tracked categoryId = null;
+ @tracked tags = null;
+ @tracked selectedTopicId = null;
+ @tracked flash;
+ @tracked flashType;
+
+ get channel() {
+ return this.args.model.channel;
+ }
+
+ get newTopic() {
+ return this.selection === NEW_TOPIC_SELECTION;
+ }
+
+ get existingTopic() {
+ return this.selection === EXISTING_TOPIC_SELECTION;
+ }
+
+ get buttonDisabled() {
+ if (this.saving) {
+ return true;
+ }
+
+ if (
+ this.newTopic &&
+ (!this.topicTitle ||
+ this.topicTitle.length < this.siteSettings.min_topic_title_length ||
+ this.topicTitle.length > this.siteSettings.max_topic_title_length)
+ ) {
+ return true;
+ }
+
+ if (this.existingTopic && isEmpty(this.selectedTopicId)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ get instructionLabels() {
+ const labels = {};
+ labels[NEW_TOPIC_SELECTION] = I18n.t(
+ "chat.selection.new_topic.instructions_channel_archive"
+ );
+ labels[EXISTING_TOPIC_SELECTION] = I18n.t(
+ "chat.selection.existing_topic.instructions_channel_archive"
+ );
+ return labels;
+ }
+
+ get instructionsText() {
+ return htmlSafe(
+ I18n.t("chat.channel_archive.instructions", {
+ channelTitle: this.channel.escapedTitle,
+ })
+ );
+ }
+
+ @action
+ archiveChannel() {
+ this.saving = true;
+
+ return this.chatApi
+ .createChannelArchive(this.channel.id, this.#data())
+ .then(() => {
+ this.flash = I18n.t("chat.channel_archive.process_started");
+ this.flashType = "success";
+ this.channel.status = CHANNEL_STATUSES.archived;
+
+ discourseLater(() => {
+ this.args.closeModal();
+ }, 3000);
+ })
+ .catch(popupAjaxError)
+ .finally(() => (this.saving = false));
+ }
+
+ #data() {
+ const data = { type: this.selection };
+ if (this.newTopic) {
+ data.title = this.topicTitle;
+ data.category_id = this.categoryId;
+ data.tags = this.tags;
+ }
+ if (this.existingTopic) {
+ data.topic_id = this.selectedTopicId;
+ }
+ return data;
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.hbs
new file mode 100644
index 00000000000..0e16015ae21
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.hbs
@@ -0,0 +1,22 @@
+
+ <:body>
+ {{i18n "chat.summarization.description"}}
+
+
+ {{this.summary}}
+
+
+ <:footer>
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.js
new file mode 100644
index 00000000000..199118729d4
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.js
@@ -0,0 +1,47 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { action } from "@ember/object";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
+
+export default class ChatModalChannelSummary extends Component {
+ @service chatApi;
+
+ @tracked sinceHours = null;
+ @tracked loading = false;
+ @tracked summary = null;
+
+ availableSummaries = {};
+
+ sinceOptions = [1, 3, 6, 12, 24, 72, 168].map((hours) => {
+ return {
+ name: I18n.t("chat.summarization.since", { count: hours }),
+ value: hours,
+ };
+ });
+
+ get channelId() {
+ return this.args.model.channelId;
+ }
+
+ @action
+ summarize(since) {
+ this.loading = true;
+
+ if (this.availableSummaries[since]) {
+ this.summary = this.availableSummaries[since];
+ this.loading = false;
+ return;
+ }
+
+ return this.chatApi
+ .summarize(this.channelId, { since })
+ .then((data) => {
+ this.availableSummaries[this.sinceHours] = data.summary;
+ this.summary = this.availableSummaries[this.sinceHours];
+ })
+ .catch(popupAjaxError)
+ .finally(() => (this.loading = false));
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
new file mode 100644
index 00000000000..06e8213a245
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
@@ -0,0 +1,136 @@
+
+ <:body>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{#if this.categoryPermissionsHint}}
+
+ {{this.categoryPermissionsHint}}
+
+ {{/if}}
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/create-channel.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.js
similarity index 62%
rename from plugins/chat/assets/javascripts/discourse/controllers/create-channel.js
rename to plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.js
index d4e464a0105..7d5a35c0f46 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/create-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.js
@@ -2,14 +2,13 @@ import { escapeExpression } from "discourse/lib/utilities";
import { ajax } from "discourse/lib/ajax";
import { cancel } from "@ember/runloop";
import discourseDebounce from "discourse-common/lib/debounce";
-import Controller from "@ember/controller";
+import Component from "@glimmer/component";
import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action, computed } from "@ember/object";
-import { gt, notEmpty } from "@ember/object/computed";
+import { action } from "@ember/object";
import { inject as service } from "@ember/service";
import { isBlank, isPresent } from "@ember/utils";
import { htmlSafe } from "@ember/template";
+import { tracked } from "@glimmer/tracking";
const DEFAULT_HINT = htmlSafe(
I18n.t("chat.create_channel.choose_category.default_hint", {
@@ -18,9 +17,7 @@ const DEFAULT_HINT = htmlSafe(
})
);
-export default class CreateChannelController extends Controller.extend(
- ModalFunctionality
-) {
+export default class ChatModalCreateChannel extends Component {
@service chat;
@service dialog;
@service chatChannelsManager;
@@ -28,21 +25,30 @@ export default class CreateChannelController extends Controller.extend(
@service router;
@service currentUser;
@service siteSettings;
+ @service site;
- category = null;
- categoryId = null;
- name = "";
- slug = "";
- autoGeneratedSlug = "";
- description = "";
- categoryPermissionsHint = null;
- autoJoinUsers = false;
- autoJoinWarning = "";
- loadingPermissionHint = false;
- threadingEnabled = false;
+ @tracked flash;
+ @tracked name;
+ @tracked category;
+ @tracked categoryId;
+ @tracked autoGeneratedSlug = "";
+ @tracked categoryPermissionsHint;
+ @tracked autoJoinWarning = "";
+ @tracked loadingPermissionHint = false;
- @notEmpty("category") categorySelected;
- @gt("siteSettings.max_chat_auto_joined_users", 0) autoJoinAvailable;
+ #generateSlugHandler = null;
+
+ willDestroy() {
+ cancel(this.#generateSlugHandler);
+ }
+
+ get autoJoinAvailable() {
+ return this.siteSettings.max_chat_auto_joined_users > 0;
+ }
+
+ get categorySelected() {
+ return isPresent(this.category);
+ }
get threadingAvailable() {
return (
@@ -51,69 +57,88 @@ export default class CreateChannelController extends Controller.extend(
);
}
- @computed("categorySelected", "name")
get createDisabled() {
return !this.categorySelected || isBlank(this.name);
}
- @computed("categorySelected", "name")
get categoryName() {
return this.categorySelected && isPresent(this.name)
? escapeExpression(this.name)
: null;
}
+ @action
onShow() {
- this.set("categoryPermissionsHint", DEFAULT_HINT);
+ this.categoryPermissionsHint = DEFAULT_HINT;
}
- onClose() {
- cancel(this.generateSlugHandler);
- this.setProperties({
- categoryId: null,
- category: null,
- name: "",
- description: "",
- slug: "",
- autoGeneratedSlug: "",
- categoryPermissionsHint: DEFAULT_HINT,
- autoJoinWarning: "",
- });
+ @action
+ onCategoryChange(categoryId) {
+ const category = categoryId
+ ? this.site.categories.findBy("id", categoryId)
+ : null;
+ this.#updatePermissionsHint(category);
+
+ const name = this.name || category?.name || "";
+ this.categoryId = categoryId;
+ this.category = category;
+ this.name = name;
+ this.#debouncedGenerateSlug(name);
}
- _createChannel() {
- const data = {
- chatable_id: this.categoryId,
- name: this.name,
- slug: this.slug || this.autoGeneratedSlug,
- description: this.description,
- auto_join_users: this.autoJoinUsers,
- threading_enabled: this.threadingEnabled,
- };
+ @action
+ onNameChange(name) {
+ this.#debouncedGenerateSlug(name);
+ }
+ @action
+ onSave(event) {
+ event.preventDefault();
+
+ if (this.createDisabled) {
+ return;
+ }
+
+ const formData = new FormData(event.currentTarget);
+ const data = Object.fromEntries(formData.entries());
+ data.auto_join_users = data.auto_join_users === "on";
+ data.slug ??= this.autoGeneratedSlug;
+ data.threading_enabled = data.threading_enabled === "on";
+
+ if (data.auto_join_users) {
+ this.dialog.yesNoConfirm({
+ message: this.autoJoinWarning,
+ didConfirm: () => this.#createChannel(data),
+ });
+ } else {
+ this.#createChannel(data);
+ }
+ }
+
+ #createChannel(data) {
return this.chatApi
.createChannel(data)
.then((channel) => {
- this.send("closeModal");
+ this.args.closeModal();
this.chatChannelsManager.follow(channel);
this.router.transitionTo("chat.channel", ...channel.routeModels);
})
.catch((e) => {
- this.flash(e.jqXHR.responseJSON.errors[0], "error");
+ this.flash = e.jqXHR.responseJSON.errors[0];
});
}
- _buildCategorySlug(category) {
+ #buildCategorySlug(category) {
const parent = category.parentCategory;
if (parent) {
- return `${this._buildCategorySlug(parent)}/${category.slug}`;
+ return `${this.#buildCategorySlug(parent)}/${category.slug}`;
} else {
return category.slug;
}
}
- _updateAutoJoinConfirmWarning(category, catPermissions) {
+ #updateAutoJoinConfirmWarning(category, catPermissions) {
const allowedGroups = catPermissions.allowed_groups;
let warning;
@@ -158,19 +183,19 @@ export default class CreateChannelController extends Controller.extend(
);
}
- this.set("autoJoinWarning", warning);
+ this.autoJoinWarning = warning;
}
- _updatePermissionsHint(category) {
+ #updatePermissionsHint(category) {
if (category) {
- const fullSlug = this._buildCategorySlug(category);
+ const fullSlug = this.#buildCategorySlug(category);
- this.set("loadingPermissionHint", true);
+ this.loadingPermissionHint = true;
return this.chatApi
.categoryPermissions(category.id)
.then((catPermissions) => {
- this._updateAutoJoinConfirmWarning(category, catPermissions);
+ this.#updateAutoJoinConfirmWarning(category, catPermissions);
const allowedGroups = catPermissions.allowed_groups;
const settingLink = `/c/${escapeExpression(fullSlug)}/edit/security`;
let hint;
@@ -207,77 +232,40 @@ export default class CreateChannelController extends Controller.extend(
break;
}
- this.set("categoryPermissionsHint", htmlSafe(hint));
+ this.categoryPermissionsHint = htmlSafe(hint);
})
.finally(() => {
- this.set("loadingPermissionHint", false);
+ this.loadingPermissionHint = false;
});
} else {
- this.set("categoryPermissionsHint", DEFAULT_HINT);
- this.set("autoJoinWarning", "");
+ this.categoryPermissionsHint = DEFAULT_HINT;
+ this.autoJoinWarning = "";
}
}
// intentionally not showing AJAX error for this, we will autogenerate
// the slug server-side if they leave it blank
- _generateSlug(name) {
- ajax("/slugs.json", { type: "POST", data: { name } }).then((response) => {
- this.set("autoGeneratedSlug", response.slug);
- });
+ #generateSlug(name) {
+ return ajax("/slugs.json", { type: "POST", data: { name } }).then(
+ (response) => {
+ this.autoGeneratedSlug = response.slug;
+ }
+ );
}
- _debouncedGenerateSlug(name) {
- cancel(this.generateSlugHandler);
- this._clearAutoGeneratedSlug();
+ #debouncedGenerateSlug(name) {
+ cancel(this.#generateSlugHandler);
+ this.autoGeneratedSlug = "";
+
if (!name) {
return;
}
- this.generateSlugHandler = discourseDebounce(
+
+ this.#generateSlugHandler = discourseDebounce(
this,
- this._generateSlug,
+ this.#generateSlug,
name,
300
);
}
-
- _clearAutoGeneratedSlug() {
- this.set("autoGeneratedSlug", "");
- }
-
- @action
- onCategoryChange(categoryId) {
- let category = categoryId
- ? this.site.categories.findBy("id", categoryId)
- : null;
- this._updatePermissionsHint(category);
-
- const name = this.name || category?.name || "";
- this.setProperties({
- categoryId,
- category,
- name,
- });
- this._debouncedGenerateSlug(name);
- }
-
- @action
- onNameChange(name) {
- this._debouncedGenerateSlug(name);
- }
-
- @action
- create() {
- if (this.createDisabled) {
- return;
- }
-
- if (this.autoJoinUsers) {
- this.dialog.yesNoConfirm({
- message: this.autoJoinWarning,
- didConfirm: () => this._createChannel(),
- });
- } else {
- this._createChannel();
- }
- }
}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs
new file mode 100644
index 00000000000..3e7c026a977
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs
@@ -0,0 +1,32 @@
+
+ <:body>
+
+ {{this.instructionsText}}
+
+
+
+
+ <:footer>
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.js
new file mode 100644
index 00000000000..affb248edc6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.js
@@ -0,0 +1,68 @@
+import Component from "@glimmer/component";
+import { isEmpty } from "@ember/utils";
+import I18n from "I18n";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import discourseLater from "discourse-common/lib/later";
+import { htmlSafe } from "@ember/template";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatModalDeleteChannel extends Component {
+ @service chatApi;
+ @service router;
+
+ @tracked channelNameConfirmation;
+ @tracked deleting = false;
+ @tracked confirmed = false;
+ @tracked flash;
+ @tracked flashType;
+
+ get channel() {
+ return this.args.model.channel;
+ }
+
+ get buttonDisabled() {
+ if (this.deleting || this.confirmed) {
+ return true;
+ }
+
+ if (
+ isEmpty(this.channelNameConfirmation) ||
+ this.channelNameConfirmation.toLowerCase() !==
+ this.channel.title.toLowerCase()
+ ) {
+ return true;
+ }
+
+ return false;
+ }
+
+ get instructionsText() {
+ return htmlSafe(
+ I18n.t("chat.channel_delete.instructions", {
+ name: this.channel.escapedTitle,
+ })
+ );
+ }
+
+ @action
+ deleteChannel() {
+ this.deleting = true;
+
+ return this.chatApi
+ .destroyChannel(this.channel.id, this.channelNameConfirmation)
+ .then(() => {
+ this.confirmed = true;
+ this.flash = I18n.t("chat.channel_delete.process_started");
+ this.flashType = "success";
+
+ discourseLater(() => {
+ this.args.closeModal();
+ this.router.transitionTo("chat");
+ }, 3000);
+ })
+ .catch(popupAjaxError)
+ .finally(() => (this.deleting = false));
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs
new file mode 100644
index 00000000000..3a21233edbd
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs
@@ -0,0 +1,37 @@
+
+ <:body>
+ {{i18n
+ "chat.channel_edit_description_modal.description"
+ }}
+
+
+
+
+ <:footer>
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.js
new file mode 100644
index 00000000000..2336c6cc040
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.js
@@ -0,0 +1,49 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+const DESCRIPTION_MAX_LENGTH = 280;
+
+export default class ChatModalEditChannelDescription extends Component {
+ @service chatApi;
+
+ @tracked editedDescription = this.channel.description || "";
+ @tracked flash;
+
+ get channel() {
+ return this.args.model;
+ }
+
+ get isSaveDisabled() {
+ return (
+ this.channel.description === this.editedDescription ||
+ this.editedDescription?.length > DESCRIPTION_MAX_LENGTH
+ );
+ }
+
+ get descriptionMaxLength() {
+ return DESCRIPTION_MAX_LENGTH;
+ }
+
+ @action
+ onSaveChatChannelDescription() {
+ return this.chatApi
+ .updateChannel(this.channel.id, { description: this.editedDescription })
+ .then((result) => {
+ this.channel.description = result.channel.description;
+ this.args.closeModal();
+ })
+ .catch((event) => {
+ if (event.jqXHR?.responseJSON?.errors) {
+ this.flash = event.jqXHR.responseJSON.errors.join("\n");
+ }
+ });
+ }
+
+ @action
+ onChangeChatChannelDescription(description) {
+ this.flash = null;
+ this.editedDescription = description;
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
new file mode 100644
index 00000000000..b4d8ee1df1c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
@@ -0,0 +1,54 @@
+
+ <:body>
+
+
+
+
+
+
+
+
+
+
+ <:footer>
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js
new file mode 100644
index 00000000000..433d6ac0ea6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js
@@ -0,0 +1,84 @@
+import Component from "@glimmer/component";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { ajax } from "discourse/lib/ajax";
+import { cancel } from "@ember/runloop";
+import { action } from "@ember/object";
+import { extractError } from "discourse/lib/ajax-error";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+export default class ChatModalEditChannelName extends Component {
+ @service chatApi;
+ @service siteSettings;
+
+ @tracked editedName = this.channel.title;
+ @tracked editedSlug = this.channel.slug;
+ @tracked autoGeneratedSlug = "";
+ @tracked flash;
+
+ #generateSlugHandler = null;
+
+ get channel() {
+ return this.args.model;
+ }
+
+ get isSaveDisabled() {
+ return (
+ (this.channel.title === this.editedName &&
+ this.channel.slug === this.editedSlug) ||
+ this.editedName?.length > this.siteSettings.max_topic_title_length
+ );
+ }
+
+ @action
+ onSave() {
+ return this.chatApi
+ .updateChannel(this.channel.id, {
+ name: this.editedName,
+ slug: this.editedSlug || this.autoGeneratedSlug || this.channel.slug,
+ })
+ .then((result) => {
+ this.channel.title = result.channel.title;
+ this.args.closeModal();
+ })
+ .catch((error) => (this.flash = extractError(error)));
+ }
+
+ @action
+ onChangeChatChannelName(title) {
+ this.flash = null;
+ this.#debouncedGenerateSlug(title);
+ }
+
+ @action
+ onChangeChatChannelSlug() {
+ this.flash = null;
+ this.#debouncedGenerateSlug(this.editedName);
+ }
+
+ #debouncedGenerateSlug(name) {
+ cancel(this.#generateSlugHandler);
+ this.autoGeneratedSlug = "";
+
+ if (!name) {
+ return;
+ }
+
+ this.#generateSlugHandler = discourseDebounce(
+ this,
+ this.#generateSlug,
+ name,
+ 300
+ );
+ }
+
+ // intentionally not showing AJAX error for this, we will autogenerate
+ // the slug server-side if they leave it blank
+ #generateSlug(name) {
+ return ajax("/slugs.json", { type: "POST", data: { name } }).then(
+ (response) => {
+ this.autoGeneratedSlug = response.slug;
+ }
+ );
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs
new file mode 100644
index 00000000000..2d09a13ba89
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs
@@ -0,0 +1,29 @@
+
+ <:body>
+ {{#if this.selectedMessageCount}}
+ {{this.instructionsText}}
+ {{/if}}
+
+
+
+ <:footer>
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.js
similarity index 64%
rename from plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.js
rename to plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.js
index 86a2dd8c4c1..ca4ff3afbd4 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.js
@@ -1,35 +1,49 @@
-import Component from "@ember/component";
-import I18n from "I18n";
-import { reads } from "@ember/object/computed";
+import Component from "@glimmer/component";
import { isBlank } from "@ember/utils";
-import { action, computed } from "@ember/object";
+import { action } from "@ember/object";
import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
-export default class MoveToChannelModalInner extends Component {
+export default class ChatModalMoveMessageToChannel extends Component {
@service chat;
@service chatApi;
@service router;
@service chatChannelsManager;
- tagName = "";
- sourceChannel = null;
- destinationChannelId = null;
- selectedMessageIds = null;
+ @tracked destinationChannelId;
- @reads("selectedMessageIds.length") selectedMessageCount;
+ get sourceChannel() {
+ return this.args.model.sourceChannel;
+ }
+
+ get selectedMessageIds() {
+ return this.args.model.selectedMessageIds;
+ }
+
+ get selectedMessageCount() {
+ return this.selectedMessageIds?.length;
+ }
- @computed("destinationChannelId")
get disableMoveButton() {
return isBlank(this.destinationChannelId);
}
- @computed("chatChannelsManager.publicMessageChannels.[]")
get availableChannels() {
- return this.chatChannelsManager.publicMessageChannels.rejectBy(
- "id",
- this.sourceChannel.id
+ return (
+ this.args.model.availableChannels ||
+ this.chatChannelsManager.publicMessageChannels
+ ).rejectBy("id", this.sourceChannel.id);
+ }
+
+ get instructionsText() {
+ return htmlSafe(
+ I18n.t("chat.move_to_channel.instructions", {
+ channelTitle: this.sourceChannel.escapedTitle,
+ count: this.selectedMessageCount,
+ })
);
}
@@ -50,14 +64,4 @@ export default class MoveToChannelModalInner extends Component {
})
.catch(popupAjaxError);
}
-
- @computed()
- get instructionsText() {
- return htmlSafe(
- I18n.t("chat.move_to_channel.instructions", {
- channelTitle: this.sourceChannel.escapedTitle,
- count: this.selectedMessageCount,
- })
- );
- }
}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.hbs
new file mode 100644
index 00000000000..05b535f5e6c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.hbs
@@ -0,0 +1,8 @@
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs
new file mode 100644
index 00000000000..348bf2ccd77
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs
@@ -0,0 +1,26 @@
+
+ <:body>
+
+
+
+ <:footer>
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/settings-modal-inner.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.js
similarity index 69%
rename from plugins/chat/assets/javascripts/discourse/components/chat/thread/settings-modal-inner.js
rename to plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.js
index 18af082ba10..6871c195444 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread/settings-modal-inner.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.js
@@ -4,25 +4,30 @@ import { tracked } from "@glimmer/tracking";
import { inject as service } from "@ember/service";
import { action } from "@ember/object";
-export default class ChatThreadSettingsModalInner extends Component {
+export default class ChatModalThreadSettings extends Component {
@service chatApi;
- @tracked editedTitle = this.args.thread.title || "";
+ @tracked editedTitle = this.thread.title || "";
@tracked saving = false;
get buttonDisabled() {
return this.saving;
}
+ get thread() {
+ return this.args.model;
+ }
+
@action
saveThread() {
this.saving = true;
+
this.chatApi
- .editThread(this.args.thread.channel.id, this.args.thread.id, {
+ .editThread(this.thread.channel.id, this.thread.id, {
title: this.editedTitle,
})
.then(() => {
- this.args.thread.title = this.editedTitle;
+ this.thread.title = this.editedTitle;
this.args.closeModal();
})
.catch(popupAjaxError)
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs
new file mode 100644
index 00000000000..85e35103ef5
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs
@@ -0,0 +1,20 @@
+
+ <:body>
+ {{this.instructions}}
+
+ <:footer>
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.js
similarity index 65%
rename from plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.js
rename to plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.js
index 5ed0b2dbdf5..d801aa67fe5 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.js
@@ -1,40 +1,37 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
import { htmlSafe } from "@ember/template";
import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";
import I18n from "I18n";
-import { action, computed } from "@ember/object";
import { inject as service } from "@ember/service";
import { popupAjaxError } from "discourse/lib/ajax-error";
-export default class ChatChannelToggleView extends Component {
- @service chat;
+export default class ChatModalToggleChannelStatus extends Component {
@service chatApi;
@service router;
- tagName = "";
- channel = null;
- onStatusChange = null;
- @computed("channel.isClosed")
+ get channel() {
+ return this.args.model;
+ }
+
get buttonLabel() {
- if (this.channel.isClosed) {
+ if (this.channel?.isClosed) {
return "chat.channel_settings.open_channel";
} else {
return "chat.channel_settings.close_channel";
}
}
- @computed("channel.isClosed")
get instructions() {
- if (this.channel.isClosed) {
+ if (this.channel?.isClosed) {
return htmlSafe(I18n.t("chat.channel_open.instructions"));
} else {
return htmlSafe(I18n.t("chat.channel_close.instructions"));
}
}
- @computed("channel.isClosed")
get modalTitle() {
- if (this.channel.isClosed) {
+ if (this.channel?.isClosed) {
return "chat.channel_open.title";
} else {
return "chat.channel_close.title";
@@ -42,15 +39,16 @@ export default class ChatChannelToggleView extends Component {
}
@action
- changeChannelStatus() {
+ onStatusChange() {
const status = this.channel.isClosed
? CHANNEL_STATUSES.open
: CHANNEL_STATUSES.closed;
return this.chatApi
.updateChannelStatus(this.channel.id, status)
- .finally(() => {
- this.onStatusChange?.(this.channel);
+ .then(() => {
+ this.args.closeModal();
+ this.router.transitionTo("chat.channel", ...this.channel.routeModels);
})
.catch(popupAjaxError);
}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.js b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.js
index 2c4a2e93428..9614e7b6d13 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.js
@@ -1,6 +1,5 @@
import Component from "@glimmer/component";
import { action } from "@ember/object";
-import showModal from "discourse/lib/show-modal";
import { clipboardCopyAsync } from "discourse/lib/utilities";
import { getOwner } from "discourse-common/lib/get-owner";
import { isTesting } from "discourse-common/config/environment";
@@ -8,10 +7,12 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
import { inject as service } from "@ember/service";
import { bind } from "discourse-common/utils/decorators";
import { tracked } from "@glimmer/tracking";
+import ChatModalMoveMessageToChannel from "discourse/plugins/chat/discourse/components/chat/modal/move-message-to-channel";
export default class ChatSelectionManager extends Component {
@service("composer") topicComposer;
@service router;
+ @service modal;
@service site;
@service("chat-api") api;
@@ -42,9 +43,11 @@ export default class ChatSelectionManager extends Component {
@action
openMoveMessageModal() {
- showModal("chat-message-move-to-channel-modal").setProperties({
- sourceChannel: this.args.pane.channel,
- selectedMessageIds: this.args.pane.selectedMessageIds,
+ this.modal.show(ChatModalMoveMessageToChannel, {
+ model: {
+ sourceChannel: this.args.pane.channel,
+ selectedMessageIds: this.args.pane.selectedMessageIds,
+ },
});
}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.js
index b2e5f877b3f..bbc0b8c84f8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.js
@@ -124,6 +124,7 @@ export default class ChatThreadList extends Component {
}
#unsubscribe() {
+ // TODO (joffrey) In drawer we won't have channel anymore at this point
this.messageBus.unsubscribe(
`/chat/${this.args.channel.id}`,
this.onMessageBus
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.js
index 3ddce5f9eb0..4b863f04094 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.js
@@ -1,11 +1,11 @@
import Component from "@glimmer/component";
import { NotificationLevels } from "discourse/lib/notification-levels";
import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
import { inject as service } from "@ember/service";
import { action } from "@ember/object";
import UserChatThreadMembership from "discourse/plugins/chat/discourse/models/user-chat-thread-membership";
import { tracked } from "@glimmer/tracking";
+import ChatModalThreadSettings from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings";
export default class ChatThreadHeader extends Component {
@service currentUser;
@@ -14,6 +14,7 @@ export default class ChatThreadHeader extends Component {
@service chatStateManager;
@service chatHistory;
@service site;
+ @service modal;
@tracked persistedNotificationLevel = true;
@@ -60,8 +61,7 @@ export default class ChatThreadHeader extends Component {
@action
openThreadSettings() {
- const controller = showModal("chat-thread-settings-modal");
- controller.set("thread", this.args.thread);
+ this.modal.show(ChatModalThreadSettings, { model: this.args.thread });
}
@action
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/settings-modal-inner.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/settings-modal-inner.hbs
deleted file mode 100644
index 15b4ae124bb..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread/settings-modal-inner.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/modal/chat-new-message.hbs b/plugins/chat/assets/javascripts/discourse/components/modal/chat-new-message.hbs
deleted file mode 100644
index d090f4c9fbf..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/modal/chat-new-message.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/modal/chat-new-message.js b/plugins/chat/assets/javascripts/discourse/components/modal/chat-new-message.js
deleted file mode 100644
index 3a4a62b1fbb..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/modal/chat-new-message.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from "@ember/component";
-import { inject as service } from "@ember/service";
-
-export default class ChatNewMessageModal extends Component {
- @service chat;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.hbs
new file mode 100644
index 00000000000..d2409d2f27c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js
new file mode 100644
index 00000000000..57bcb49834a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js
@@ -0,0 +1,20 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalArchiveChannel from "discourse/plugins/chat/discourse/components/chat/modal/archive-channel";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalArchiveChannel extends Component {
+ @service modal;
+
+ channel = fabricators.channel();
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalArchiveChannel, {
+ model: {
+ channel: this.channel,
+ },
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.hbs
new file mode 100644
index 00000000000..099820a0a0f
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.js
new file mode 100644
index 00000000000..79008022af7
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.js
@@ -0,0 +1,16 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import Component from "@glimmer/component";
+import ChatModalChannelSummary from "discourse/plugins/chat/discourse/components/chat/modal/channel-summary";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalChannelSummary extends Component {
+ @service modal;
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalChannelSummary, {
+ model: { channelId: fabricators.channel().id },
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.hbs
new file mode 100644
index 00000000000..e2747d289e6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.js
new file mode 100644
index 00000000000..3d37663d555
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.js
@@ -0,0 +1,13 @@
+import Component from "@glimmer/component";
+import ChatModalCreateChannel from "discourse/plugins/chat/discourse/components/chat/modal/create-channel";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalCreateChannel extends Component {
+ @service modal;
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalCreateChannel);
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.hbs
new file mode 100644
index 00000000000..f9787048ce6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js
new file mode 100644
index 00000000000..02bba90987b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js
@@ -0,0 +1,18 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalDeleteChannel from "discourse/plugins/chat/discourse/components/chat/modal/delete-channel";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalDeleteChannel extends Component {
+ @service modal;
+
+ channel = fabricators.channel();
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalDeleteChannel, {
+ model: { channel: this.channel },
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.hbs
new file mode 100644
index 00000000000..b7d5dcc2804
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js
new file mode 100644
index 00000000000..018108bc2c7
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js
@@ -0,0 +1,18 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalEditChannelDescription from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-description";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalEditChannelDescription extends Component {
+ @service modal;
+
+ channel = fabricators.channel();
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalEditChannelDescription, {
+ model: this.channel,
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.hbs
new file mode 100644
index 00000000000..5a40bff03cd
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js
new file mode 100644
index 00000000000..7e9770840ba
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js
@@ -0,0 +1,18 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalEditChannelName from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-name";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalEditChannelName extends Component {
+ @service modal;
+
+ channel = fabricators.channel();
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalEditChannelName, {
+ model: this.channel,
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.hbs
new file mode 100644
index 00000000000..e508bd7810a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js
new file mode 100644
index 00000000000..513dda5dcfe
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js
@@ -0,0 +1,26 @@
+import Component from "@glimmer/component";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalMoveMessageToChannel from "discourse/plugins/chat/discourse/components/chat/modal/move-message-to-channel";
+
+export default class ChatStyleguideChatModalMoveMessageToChannel extends Component {
+ @service modal;
+
+ channel = fabricators.channel();
+ selectedMessageIds = [fabricators.message({ channel: this.channel })].mapBy(
+ "id"
+ );
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalMoveMessageToChannel, {
+ model: {
+ sourceChannel: this.channel,
+ selectedMessageIds: [
+ fabricators.message({ channel: this.channel }),
+ ].mapBy("id"),
+ },
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.hbs
new file mode 100644
index 00000000000..e39c631ef7c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.js
new file mode 100644
index 00000000000..1ace191332a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.js
@@ -0,0 +1,13 @@
+import Component from "@glimmer/component";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalNewMessage extends Component {
+ @service modal;
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalNewMessage);
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.hbs
new file mode 100644
index 00000000000..496b4784b58
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js
new file mode 100644
index 00000000000..106faef111d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js
@@ -0,0 +1,16 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import Component from "@glimmer/component";
+import ChatModalThreadSettings from "discourse/plugins/chat/discourse/components/modal/chat/thread-settings";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalThreadSettings extends Component {
+ @service modal;
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalThreadSettings, {
+ model: fabricators.thread(),
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.hbs
new file mode 100644
index 00000000000..c11dd520807
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js
new file mode 100644
index 00000000000..afd29aab914
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js
@@ -0,0 +1,16 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import Component from "@glimmer/component";
+import ChatModalToggleChannelStatus from "discourse/plugins/chat/discourse/components/chat/modal/toggle-channel-status";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalToggleChannelStatus extends Component {
+ @service modal;
+
+ @action
+ openModal() {
+ return this.modal.show(ChatModalToggleChannelStatus, {
+ model: fabricators.channel(),
+ });
+ }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/organisms/chat.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/organisms/chat.hbs
index d37a61138f9..e883457235a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/organisms/chat.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/organisms/chat.hbs
@@ -3,4 +3,17 @@
-
\ No newline at end of file
+
+
+
Modals
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-archive-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-archive-modal.js
deleted file mode 100644
index d46a9f241d0..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-archive-modal.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default class ChatChannelArchiveModalController extends Controller.extend(
- ModalFunctionality
-) {
- chatChannel = null;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-delete-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-delete-modal.js
deleted file mode 100644
index ad230c1021b..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-delete-modal.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default class ChatChannelDeleteModalController extends Controller.extend(
- ModalFunctionality
-) {
- chatChannel = null;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-description.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-description.js
deleted file mode 100644
index 664a1993bad..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-description.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import Controller from "@ember/controller";
-import { action, computed } from "@ember/object";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { tracked } from "@glimmer/tracking";
-import { inject as service } from "@ember/service";
-
-const DESCRIPTION_MAX_LENGTH = 280;
-
-export default class ChatChannelEditDescriptionController extends Controller.extend(
- ModalFunctionality
-) {
- @service chatApi;
- @tracked editedDescription = this.model.description || "";
-
- @computed("model.description", "editedDescription")
- get isSaveDisabled() {
- return (
- this.model.description === this.editedDescription ||
- this.editedDescription?.length > DESCRIPTION_MAX_LENGTH
- );
- }
-
- get descriptionMaxLength() {
- return DESCRIPTION_MAX_LENGTH;
- }
-
- onClose() {
- this.clearFlash();
- }
-
- @action
- onSaveChatChannelDescription() {
- return this.chatApi
- .updateChannel(this.model.id, {
- description: this.editedDescription,
- })
- .then((result) => {
- this.model.set("description", result.channel.description);
- this.send("closeModal");
- })
- .catch((event) => {
- if (event.jqXHR?.responseJSON?.errors) {
- this.flash(event.jqXHR.responseJSON.errors.join("\n"), "error");
- }
- });
- }
-
- @action
- onChangeChatChannelDescription(description) {
- this.clearFlash();
- this.editedDescription = description;
- }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-name-slug.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-name-slug.js
deleted file mode 100644
index 82bc6c59b2e..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-name-slug.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import Controller from "@ember/controller";
-import discourseDebounce from "discourse-common/lib/debounce";
-import { ajax } from "discourse/lib/ajax";
-import { cancel } from "@ember/runloop";
-import { action, computed } from "@ember/object";
-import { flashAjaxError } from "discourse/lib/ajax-error";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { inject as service } from "@ember/service";
-export default class ChatChannelEditTitleController extends Controller.extend(
- ModalFunctionality
-) {
- @service chatApi;
- editedName = "";
- editedSlug = "";
- autoGeneratedSlug = "";
-
- @computed("model.title", "editedName", "editedSlug")
- get isSaveDisabled() {
- return (
- (this.model.title === this.editedName &&
- this.model.slug === this.editedSlug) ||
- this.editedName?.length > this.siteSettings.max_topic_title_length
- );
- }
-
- onShow() {
- this.setProperties({
- editedName: this.model.title,
- editedSlug: this.model.slug,
- });
- }
-
- onClose() {
- this.setProperties({
- editedName: "",
- editedSlug: "",
- });
- this.clearFlash();
- }
-
- @action
- onSaveChatChannelName() {
- return this.chatApi
- .updateChannel(this.model.id, {
- name: this.editedName,
- slug: this.editedSlug || this.autoGeneratedSlug || this.model.slug,
- })
- .then((result) => {
- this.model.title = result.channel.title;
- this.send("closeModal");
- })
- .catch(flashAjaxError(this));
- }
-
- @action
- onChangeChatChannelName(title) {
- this.clearFlash();
- this._debouncedGenerateSlug(title);
- }
-
- @action
- onChangeChatChannelSlug() {
- this.clearFlash();
- this._debouncedGenerateSlug(this.editedName);
- }
-
- _clearAutoGeneratedSlug() {
- this.set("autoGeneratedSlug", "");
- }
-
- _debouncedGenerateSlug(name) {
- cancel(this.generateSlugHandler);
- this._clearAutoGeneratedSlug();
- if (!name) {
- return;
- }
- this.generateSlugHandler = discourseDebounce(
- this,
- this._generateSlug,
- name,
- 300
- );
- }
-
- // intentionally not showing AJAX error for this, we will autogenerate
- // the slug server-side if they leave it blank
- _generateSlug(name) {
- ajax("/slugs.json", { type: "POST", data: { name } }).then((response) => {
- this.set("autoGeneratedSlug", response.slug);
- });
- }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js
index b21daefbe2c..8748478788f 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js
+++ b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js
@@ -1,19 +1,25 @@
import Controller from "@ember/controller";
import { action } from "@ember/object";
import ModalFunctionality from "discourse/mixins/modal-functionality";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import ChatModalEditChannelDescription from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-description";
+import ChatModalEditChannelName from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-name";
export default class ChatChannelInfoAboutController extends Controller.extend(
ModalFunctionality
) {
+ @service modal;
+
@action
onEditChatChannelName() {
- showModal("chat-channel-edit-name-slug", { model: this.model });
+ return this.modal.show(ChatModalEditChannelName, {
+ model: this.model,
+ });
}
@action
onEditChatChannelDescription() {
- showModal("chat-channel-edit-description", {
+ return this.modal.show(ChatModalEditChannelDescription, {
model: this.model,
});
}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-selector-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-selector-modal.js
deleted file mode 100644
index ac07dd24838..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-selector-modal.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-
-export default class ChatChannelSelectorModalController extends Controller.extend(
- ModalFunctionality
-) {
- @action
- closeSelf() {
- this.send("closeModal");
- }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-toggle.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-toggle.js
deleted file mode 100644
index a9cba248a8e..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-toggle.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-
-export default class ChatChannelToggleController extends Controller.extend(
- ModalFunctionality
-) {
- @service chat;
- @service router;
-
- chatChannel = null;
-
- @action
- channelStatusChanged(channel) {
- this.send("closeModal");
- this.router.transitionTo("chat.channel", ...channel.routeModels);
- }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-message-move-to-channel-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-message-move-to-channel-modal.js
deleted file mode 100644
index 86ebd1e8ab4..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-message-move-to-channel-modal.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default class ChatMessageMoveToChannelModalController extends Controller.extend(
- ModalFunctionality
-) {
- chatChannel = null;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-thread-settings-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-thread-settings-modal.js
deleted file mode 100644
index 7a59f9b99e5..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-thread-settings-modal.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default class ChatThreadSettingsModalController extends Controller.extend(
- ModalFunctionality
-) {
- thread = null;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js
index f8f87fc89fd..ba6a1b4434b 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js
@@ -1,6 +1,6 @@
import { withPluginApi } from "discourse/lib/plugin-api";
import { PLATFORM_KEY_MODIFIER } from "discourse/lib/keyboard-shortcuts";
-import ChatNewMessageModal from "discourse/plugins/chat/discourse/components/modal/chat-new-message";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
export default {
name: "chat-keyboard-shortcuts",
@@ -22,10 +22,10 @@ export default {
const chatChannelsManager = container.lookup(
"service:chat-channels-manager"
);
- const openChannelSelector = (e) => {
+ const openQuickChannelSelector = (e) => {
e.preventDefault();
e.stopPropagation();
- modal.show(ChatNewMessageModal);
+ modal.show(ChatModalNewMessage);
};
const handleMoveUpShortcut = (e) => {
@@ -126,7 +126,7 @@ export default {
withPluginApi("0.12.1", (api) => {
api.addKeyboardShortcut(
`${PLATFORM_KEY_MODIFIER}+k`,
- openChannelSelector,
+ openQuickChannelSelector,
{
global: true,
help: {
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
index 7b8ab459fb7..7b9886706ca 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
@@ -9,7 +9,7 @@ import { emojiUnescape } from "discourse/lib/text";
import { decorateUsername } from "discourse/helpers/decorate-username-selector";
import { until } from "discourse/lib/formatter";
import { inject as service } from "@ember/service";
-import ChatNewMessageModal from "discourse/plugins/chat/discourse/components/modal/chat-new-message";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
export default {
name: "chat-sidebar",
@@ -379,7 +379,7 @@ export default {
id: "startDm",
title: I18n.t("chat.direct_messages.new"),
action: () => {
- this.modal.show(ChatNewMessageModal);
+ this.modal.show(ChatModalNewMessage);
},
},
];
diff --git a/plugins/chat/assets/javascripts/discourse/lib/fabricators.js b/plugins/chat/assets/javascripts/discourse/lib/fabricators.js
index 3b90bd00037..a4dba3ff61b 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/fabricators.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/fabricators.js
@@ -68,6 +68,7 @@ function channelFabricator(args = {}) {
description: args.description,
chatable: args.chatable || categoryFabricator(),
status: CHANNEL_STATUSES.open,
+ slug: args.chatable?.slug || "general",
},
args
)
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-api.js b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
index 960376a4b39..54d86607e81 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-api.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
@@ -476,7 +476,8 @@ export default class ChatApi extends Service {
*
* @param {number} channelId - The ID of the channel.
* @param {Array
} userIds - The IDs of the users to invite.
- * @param {Array} [messageId] - The ID of a message to highlight when opening the notification.
+ * @param {object} options
+ * @param {number} options.chat_message_id - A message ID to display in the invite.
*/
invite(channelId, userIds, options = {}) {
return ajax(`/chat/${channelId}/invite`, {
@@ -485,6 +486,17 @@ export default class ChatApi extends Service {
});
}
+ /**
+ * Summarize a channel.
+ *
+ * @param {number} channelId - The ID of the channel to summarize.
+ * @param {object} options
+ * @param {number} options.since - Number of hours ago the summary should start (1, 3, 6, 12, 24, 72, 168).
+ */
+ summarize(channelId, options = {}) {
+ return this.#getRequest(`/channels/${channelId}/summarize`, options);
+ }
+
get #basePath() {
return "/chat/api";
}
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/channel-summary.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/channel-summary.hbs
deleted file mode 100644
index c5bf414e9f7..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/channel-summary.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-archive-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-archive-modal.hbs
deleted file mode 100644
index bb925b1952b..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-archive-modal.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-delete-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-delete-modal.hbs
deleted file mode 100644
index 90820b131a3..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-delete-modal.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-description.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-description.hbs
deleted file mode 100644
index 059e2d147bf..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-description.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- {{i18n "chat.channel_edit_description_modal.description"}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name-slug.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name-slug.hbs
deleted file mode 100644
index 0d73d0003b8..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name-slug.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name.hbs
deleted file mode 100644
index fffffe406c7..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- {{i18n "chat.channel_edit_name_modal.description"}}
-
-
-
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-selector-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-selector-modal.hbs
deleted file mode 100644
index 498861076c6..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-selector-modal.hbs
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-toggle.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-toggle.hbs
deleted file mode 100644
index 121e2c8f424..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-toggle.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-message-move-to-channel-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-message-move-to-channel-modal.hbs
deleted file mode 100644
index 0dcc0c1114d..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-message-move-to-channel-modal.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-thread-settings-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-thread-settings-modal.hbs
deleted file mode 100644
index d94e9d24ae3..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-thread-settings-modal.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/create-channel.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/create-channel.hbs
deleted file mode 100644
index 278f03c1c6a..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/create-channel.hbs
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{#if this.categoryPermissionsHint}}
-
- {{this.categoryPermissionsHint}}
-
- {{/if}}
-
-
-
-
-
- | {{@name}} |
+ {{#if @name}}
+ {{@name}} |
+ {{/if}}
{{yield}}
|