From bdc2f27a2ae04f2074aeb6df73aa251d280f2e8b Mon Sep 17 00:00:00 2001 From: Keegan George Date: Mon, 23 Jan 2023 10:30:48 -0800 Subject: [PATCH] DEV: Ember upgrade (#155) --- .../admin/components/channel-data.hbs | 19 ++ .../admin/components/channel-data.js | 5 - .../admin/components/channel-details.hbs | 78 +++++++ .../admin/components/channel-details.js | 40 ++-- .../admin/components/channel-param-row.hbs | 42 ++++ .../admin/components/channel-param-row.js | 51 +++++ .../javascripts/admin/components/rule-row.hbs | 47 ++++ .../javascripts/admin/components/rule-row.js | 48 ++-- ...admin-plugins-chat-integration-provider.js | 147 ++++++------ .../admin-plugins-chat-integration.js | 2 +- ...n-plugins-chat-integration-edit-channel.js | 153 +++---------- ...dmin-plugins-chat-integration-edit-rule.js | 73 +++--- .../admin-plugins-chat-integration-test.js | 70 +++--- assets/javascripts/admin/models/channel.js | 8 +- assets/javascripts/admin/models/provider.js | 2 +- assets/javascripts/admin/models/rule.js | 77 +++---- .../admin-plugins-chat-integration-index.js | 6 +- ...admin-plugins-chat-integration-provider.js | 16 +- .../routes/admin-plugins-chat-integration.js | 8 +- ...plugins-chat-integration-channel-error.hbs | 4 +- ...-plugins-chat-integration-edit-channel.hbs | 90 +++----- ...min-plugins-chat-integration-edit-rule.hbs | 209 +++++++++++------- .../admin-plugins-chat-integration-test.hbs | 54 ++--- .../plugins-chat-integration-provider.hbs | 33 +++ .../templates/plugins-chat-integration.hbs | 30 +++ .../discourse/routes/transcript.js | 6 +- .../plugins-chat-integration-provider.hbs | 34 --- .../admin/plugins-chat-integration.hbs | 28 --- .../templates/components/channel-data.hbs | 17 -- .../templates/components/channel-details.hbs | 77 ------- .../templates/components/rule-row.hbs | 45 ---- .../stylesheets/chat-integration-admin.scss | 6 + .../acceptance/chat-integration-test.js | 4 +- 33 files changed, 772 insertions(+), 757 deletions(-) create mode 100644 assets/javascripts/admin/components/channel-data.hbs delete mode 100644 assets/javascripts/admin/components/channel-data.js create mode 100644 assets/javascripts/admin/components/channel-details.hbs create mode 100644 assets/javascripts/admin/components/channel-param-row.hbs create mode 100644 assets/javascripts/admin/components/channel-param-row.js create mode 100644 assets/javascripts/admin/components/rule-row.hbs create mode 100644 assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs create mode 100644 assets/javascripts/admin/templates/plugins-chat-integration.hbs delete mode 100644 assets/javascripts/discourse/templates/admin/plugins-chat-integration-provider.hbs delete mode 100644 assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs delete mode 100644 assets/javascripts/discourse/templates/components/channel-data.hbs delete mode 100644 assets/javascripts/discourse/templates/components/channel-details.hbs delete mode 100644 assets/javascripts/discourse/templates/components/rule-row.hbs diff --git a/assets/javascripts/admin/components/channel-data.hbs b/assets/javascripts/admin/components/channel-data.hbs new file mode 100644 index 0000000..0111306 --- /dev/null +++ b/assets/javascripts/admin/components/channel-data.hbs @@ -0,0 +1,19 @@ +{{#each @provider.channel_parameters as |param|}} + {{#unless param.hidden}} +
+ + {{i18n + (concat + "chat_integration.provider." + @channel.provider + ".param." + param.key + ".title" + ) + }}: + + {{get @channel.data param.key}} +
+
+ {{/unless}} +{{/each}} \ No newline at end of file diff --git a/assets/javascripts/admin/components/channel-data.js b/assets/javascripts/admin/components/channel-data.js deleted file mode 100644 index 165e52d..0000000 --- a/assets/javascripts/admin/components/channel-data.js +++ /dev/null @@ -1,5 +0,0 @@ -import Component from "@ember/component"; - -export default Component.extend({ - classNames: ["channel-info"], -}); diff --git a/assets/javascripts/admin/components/channel-details.hbs b/assets/javascripts/admin/components/channel-details.hbs new file mode 100644 index 0000000..62216c9 --- /dev/null +++ b/assets/javascripts/admin/components/channel-details.hbs @@ -0,0 +1,78 @@ +
+
+
+ + + + + +
+ + + {{#if @channel.error_key}} + + {{/if}} + + + +
+
+ + + + + + + {{#if this.siteSettings.tagging_enabled}} + + {{/if}} + + + + + + + {{#each @channel.rules as |rule|}} + + {{/each}} + +
{{i18n "chat_integration.rule_table.filter"}}{{i18n "chat_integration.rule_table.category"}}{{i18n "chat_integration.rule_table.tags"}}
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/assets/javascripts/admin/components/channel-details.js b/assets/javascripts/admin/components/channel-details.js index 53b21ba..98973c2 100644 --- a/assets/javascripts/admin/components/channel-details.js +++ b/assets/javascripts/admin/components/channel-details.js @@ -1,27 +1,23 @@ -import Component from "@ember/component"; +import Component from "@glimmer/component"; import { popupAjaxError } from "discourse/lib/ajax-error"; import I18n from "I18n"; import { inject as service } from "@ember/service"; +import { action } from "@ember/object"; -export default Component.extend({ - dialog: service(), - classNames: ["channel-details"], +export default class ChannelDetails extends Component { + @service dialog; + @service siteSettings; - actions: { - deleteChannel(channel) { - this.dialog.deleteConfirm({ - message: I18n.t("chat_integration.channel_delete_confirm"), - didConfirm: () => { - return channel - .destroyRecord() - .then(() => this.refresh()) - .catch(popupAjaxError); - }, - }); - }, - - editRule(rule) { - this.editRuleWithChannel(rule, this.get("channel")); - }, - }, -}); + @action + deleteChannel(channel) { + this.dialog.deleteConfirm({ + message: I18n.t("chat_integration.channel_delete_confirm"), + didConfirm: () => { + return channel + .destroyRecord() + .then(() => this.args.refresh()) + .catch(popupAjaxError); + }, + }); + } +} diff --git a/assets/javascripts/admin/components/channel-param-row.hbs b/assets/javascripts/admin/components/channel-param-row.hbs new file mode 100644 index 0000000..1578c11 --- /dev/null +++ b/assets/javascripts/admin/components/channel-param-row.hbs @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/javascripts/admin/components/channel-param-row.js b/assets/javascripts/admin/components/channel-param-row.js new file mode 100644 index 0000000..dab2beb --- /dev/null +++ b/assets/javascripts/admin/components/channel-param-row.js @@ -0,0 +1,51 @@ +import Component from "@glimmer/component"; +import EmberObject, { action } from "@ember/object"; +import { tracked } from "@glimmer/tracking"; +import I18n from "I18n"; + +export default class ChannelParamRow extends Component { + @tracked inputValue = this.args.model.channel.data[this.args.param.key] || ""; + + get validate() { + const parameter = this.args.param; + const regString = parameter.regex; + const regex = new RegExp(regString); + + if (this.inputValue === "") { + // Fail silently if field blank + this.args.isValidParams(false); + return EmberObject.create({ + failed: true, + }); + } else if (!regString) { + // Pass silently if no regex available for provider + this.args.isValidParams(true); + return EmberObject.create({ + ok: true, + }); + } else if (regex.test(this.inputValue)) { + // Test against regex + this.args.isValidParams(true); + return EmberObject.create({ + ok: true, + reason: I18n.t( + "chat_integration.edit_channel_modal.channel_validation.ok" + ), + }); + } else { + // Failed regex + this.args.isValidParams(false); + return EmberObject.create({ + failed: true, + reason: I18n.t( + "chat_integration.edit_channel_modal.channel_validation.fail" + ), + }); + } + } + + @action + updateValue(event) { + this.args.model.channel.data[this.args.param.key] = event.target.value; + } +} diff --git a/assets/javascripts/admin/components/rule-row.hbs b/assets/javascripts/admin/components/rule-row.hbs new file mode 100644 index 0000000..038e4ff --- /dev/null +++ b/assets/javascripts/admin/components/rule-row.hbs @@ -0,0 +1,47 @@ + + + {{@rule.filterName}} + + + + {{#if this.isCategory}} + {{#if @rule.category}} + {{category-link @rule.category allowUncategorized="true" link="false"}} + {{else}} + {{i18n "chat_integration.all_categories"}} + {{/if}} + {{else if this.isMention}} + {{i18n "chat_integration.group_mention_template" name=@rule.group_name}} + {{else if this.isMessage}} + {{i18n "chat_integration.group_message_template" name=@rule.group_name}} + {{/if}} + + + + {{#if this.siteSettings.tagging_enabled}} + {{#if @rule.tags}} + {{@rule.tags}} + {{else}} + {{i18n "chat_integration.all_tags"}} + {{/if}} + {{/if}} + + + + + + + + \ No newline at end of file diff --git a/assets/javascripts/admin/components/rule-row.js b/assets/javascripts/admin/components/rule-row.js index 45eac53..517ceb9 100644 --- a/assets/javascripts/admin/components/rule-row.js +++ b/assets/javascripts/admin/components/rule-row.js @@ -1,31 +1,27 @@ -import Component from "@ember/component"; +import { action } from "@ember/object"; +import Component from "@glimmer/component"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import computed from "discourse-common/utils/decorators"; +import { inject as service } from "@ember/service"; +export default class RuleRow extends Component { + @service siteSettings; -export default Component.extend({ - tagName: "tr", + get isCategory() { + return this.args.rule.type === "normal"; + } - @computed("rule.type") - isCategory(type) { - return type === "normal"; - }, + get isMessage() { + return this.args.rule.type === "group_message"; + } - @computed("rule.type") - isMessage(type) { - return type === "group_message"; - }, + get isMention() { + return this.args.rule.type === "group_mention"; + } - @computed("rule.type") - isMention(type) { - return type === "group_mention"; - }, - - actions: { - delete(rule) { - rule - .destroyRecord() - .then(() => this.refresh()) - .catch(popupAjaxError); - }, - }, -}); + @action + delete(rule) { + rule + .destroyRecord() + .then(() => this.args.refresh()) + .catch(popupAjaxError); + } +} diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js b/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js index 76650d5..af5b09a 100644 --- a/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js +++ b/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js @@ -1,12 +1,20 @@ import Controller from "@ember/controller"; import showModal from "discourse/lib/show-modal"; -import computed from "discourse-common/utils/decorators"; +import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; -export default Controller.extend({ - modalShowing: false, +const MODALS = { + editChannel: "admin-plugins-chat-integration-edit-channel", + testChannel: "admin-plugins-chat-integration-test", + editRule: "admin-plugins-chat-integration-edit-rule", + channelError: "admin-plugins-chat-integration-channel-error", +}; - @computed("model.channels") - anyErrors(channels) { +export default class AdminPluginsChatIntegrationEditRule extends Controller { + @tracked modalShowing = false; + + get anyErrors() { + const channels = this.model.channels; let anyErrors = false; channels.forEach((channel) => { @@ -16,90 +24,83 @@ export default Controller.extend({ }); return anyErrors; - }, + } - actions: { - createChannel() { - this.set("modalShowing", true); + triggerModal(model, modal) { + this.modalShowing = true; - const model = { + showModal(modal, { + model, + admin: true, + }); + } + + @action + createChannel() { + return this.triggerModal( + { channel: this.store.createRecord("channel", { - provider: this.get("model.provider.id"), + provider: this.model.provider.id, data: {}, }), - provider: this.get("model.provider"), - }; + provider: this.model.provider, + }, + MODALS.editChannel + ); + } - showModal("admin-plugins-chat-integration-edit-channel", { - model, - admin: true, - }); - }, - - editChannel(channel) { - this.set("modalShowing", true); - - const model = { + @action + editChannel(channel) { + return this.triggerModal( + { channel, - provider: this.get("model.provider"), - }; + provider: this.model.provider, + }, + MODALS.editChannel + ); + } - showModal("admin-plugins-chat-integration-edit-channel", { - model, - admin: true, - }); - }, + @action + testChannel(channel) { + return this.triggerModal({ channel }, MODALS.testChannel); + } - testChannel(channel) { - this.set("modalShowing", true); - showModal("admin-plugins-chat-integration-test", { - model: { channel }, - admin: true, - }); - }, - - createRule(channel) { - this.set("modalShowing", true); - - const model = { + @action + createRule(channel) { + return this.triggerModal( + { rule: this.store.createRecord("rule", { channel_id: channel.id, channel, }), channel, - provider: this.get("model.provider"), - groups: this.get("model.groups"), - }; + provider: this.model.provider, + groups: this.model.groups, + }, + MODALS.editRule + ); + } - showModal("admin-plugins-chat-integration-edit-rule", { - model, - admin: true, - }); - }, - - editRuleWithChannel(rule, channel) { - this.set("modalShowing", true); - - const model = { + @action + editRuleWithChannel(rule, channel) { + return this.triggerModal( + { rule, channel, - provider: this.get("model.provider"), - groups: this.get("model.groups"), - }; + provider: this.model.provider, + groups: this.model.groups, + }, + MODALS.editRule + ); + } - showModal("admin-plugins-chat-integration-edit-rule", { - model, - admin: true, - }); - }, + @action + showError(channel) { + return this.triggerModal({ channel }, MODALS.channelError); + } - showError(channel) { - this.set("modalShowing", true); - - showModal("admin-plugins-chat-integration-channel-error", { - model: channel, - admin: true, - }); - }, - }, -}); + @action + refresh() { + this.send("refreshProvider"); + } +} diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat-integration.js b/assets/javascripts/admin/controllers/admin-plugins-chat-integration.js index fa4ba1e..6d28b07 100644 --- a/assets/javascripts/admin/controllers/admin-plugins-chat-integration.js +++ b/assets/javascripts/admin/controllers/admin-plugins-chat-integration.js @@ -1,3 +1,3 @@ import Controller from "@ember/controller"; -export default Controller.extend({}); +export default class AdminPluginsChatIntegration extends Controller {} diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js index c1b3355..2ca5302 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js @@ -1,131 +1,42 @@ import Controller from "@ember/controller"; -import I18n from "I18n"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import EmberObject, { - defineProperty, - computed as emberComputed, -} from "@ember/object"; -import computed, { observes, on } from "discourse-common/utils/decorators"; -import { schedule } from "@ember/runloop"; +import { action } from "@ember/object"; +import { tracked } from "@glimmer/tracking"; -export default Controller.extend(ModalFunctionality, { - @on("init") - setupKeydown() { - schedule("afterRender", () => { - $("#chat-integration-edit-channel-modal").keydown((e) => { - if (e.keyCode === 13) { - this.send("save"); - } - }); - }); - }, +export default class AdminPluginsChatIntegrationEditChannel extends Controller.extend( + ModalFunctionality +) { + @tracked validParams = false; - // The validation property must be defined at runtime since the possible parameters vary by provider - @observes("model") - setupValidations() { - if (this.get("model.provider")) { - const theKeys = this.get("model.provider.channel_parameters").map( - (param) => param["key"] - ); - defineProperty( - this, - "paramValidation", - emberComputed( - `model.channel.data.{${theKeys.join(",")}}`, - this._paramValidation - ) - ); - this.notifyPropertyChange("paramValidation"); + @action + isValidParams(validity) { + return (this.validParams = validity); + } + + @action + handleKeyUp(e) { + if (e.code === "Enter" && this.validParams) { + this.save(); } - }, + } - validate(parameter) { - const regString = parameter.regex; - const regex = new RegExp(regString); - let val = this.get(`model.channel.data.${parameter.key}`); + @action + cancel() { + this.send("closeModal"); + } - if (val === undefined) { - val = ""; + @action + save() { + if (!this.validParams) { + return; } - if (val === "") { - // Fail silently if field blank - return EmberObject.create({ - failed: true, - }); - } else if (!regString) { - // Pass silently if no regex available for provider - return EmberObject.create({ - ok: true, - }); - } else if (regex.test(val)) { - // Test against regex - return EmberObject.create({ - ok: true, - reason: I18n.t( - "chat_integration.edit_channel_modal.channel_validation.ok" - ), - }); - } else { - // Failed regex - return EmberObject.create({ - failed: true, - reason: I18n.t( - "chat_integration.edit_channel_modal.channel_validation.fail" - ), - }); - } - }, - - _paramValidation() { - const response = {}; - const parameters = this.get("model.provider.channel_parameters"); - - parameters.forEach((parameter) => { - response[parameter.key] = this.validate(parameter); - }); - - return response; - }, - - @computed("paramValidation") - saveDisabled(paramValidation) { - if (!paramValidation) { - return true; - } - - let invalid = false; - - Object.keys(paramValidation).forEach((key) => { - if (!paramValidation[key]) { - invalid = true; - } - - if (!paramValidation[key]["ok"]) { - invalid = true; - } - }); - - return invalid; - }, - - actions: { - cancel() { - this.send("closeModal"); - }, - - save() { - if (this.get("saveDisabled")) { - return; - } - - this.get("model.channel") - .save() - .then(() => { - this.send("closeModal"); - }) - .catch(popupAjaxError); - }, - }, -}); + this.model.channel + .save() + .then(() => { + this.send("closeModal"); + }) + .catch(popupAjaxError); + } +} diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js index 944ef87..140a46d 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js @@ -1,38 +1,51 @@ import Controller from "@ember/controller"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import computed, { on } from "discourse-common/utils/decorators"; -import { schedule } from "@ember/runloop"; +import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; -export default Controller.extend(ModalFunctionality, { - saveDisabled: false, +export default class AdminPluginsChatIntegrationEditRule extends Controller.extend( + ModalFunctionality +) { + @service siteSettings; + @tracked saveDisabled = false; - @on("init") - setupKeydown() { - schedule("afterRender", () => { - $("#chat-integration-edit-channel-modal").keydown((e) => { - if (e.keyCode === 13) { - this.send("save"); - } - }); - }); - }, + get showCategory() { + return this.model.rule.type === "normal"; + } - @computed("model.rule.type") - showCategory(type) { - return type === "normal"; - }, + get currentRuleType() { + return this.model.rule.type; + } - actions: { - save(rule) { - if (this.get("saveDisabled")) { - return; - } + @action + save(rule) { + if (this.saveDisabled) { + return; + } - rule - .save() - .then(() => this.send("closeModal")) - .catch(popupAjaxError); - }, - }, -}); + rule + .save() + .then(() => this.send("closeModal")) + .catch(popupAjaxError); + } + + @action + handleKeyUp(e) { + if (e.code === "Enter") { + this.save(); + } + } + + @action + onChangeRuleType(type) { + this.model.rule.type = type; + this.currentRuleType = type; + if (type !== "normal") { + this.showCategory = false; + } else { + this.showCategory = true; + } + } +} diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js index ca4532e..d29bc21 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js @@ -1,47 +1,43 @@ import Controller from "@ember/controller"; +import { not } from "@ember/object/computed"; import I18n from "I18n"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import computed, { on } from "discourse-common/utils/decorators"; -import { schedule } from "@ember/runloop"; +import { action } from "@ember/object"; +import { tracked } from "@glimmer/tracking"; -export default Controller.extend(ModalFunctionality, { - @on("init") - setupKeydown() { - schedule("afterRender", () => { - $("#chat_integration_test_modal").keydown((e) => { - if (e.keyCode === 13) { - this.send("send"); - } - }); - }); - }, +export default class AdminPluginsChatIntegrationTest extends Controller.extend( + ModalFunctionality +) { + @tracked loading = false; + @not("model.topic_id") sendDisabled; - @computed("model.topic_id") - sendDisabled(topicId) { - return !topicId; - }, + @action + handleKeyUp(e) { + if (e.code === "Enter" && !this.sendDisabled) { + this.send(); + } + } - actions: { - send() { - if (this.get("sendDisabled")) { - return; - } - this.set("loading", true); + @action + send() { + if (this.sendDisabled) { + return; + } + this.loading = true; - ajax("/admin/plugins/chat-integration/test", { - data: { - channel_id: this.get("model.channel.id"), - topic_id: this.get("model.topic_id"), - }, - type: "POST", + ajax("/admin/plugins/chat-integration/test", { + data: { + channel_id: this.model.channel.id, + topic_id: this.model.topic_id, + }, + type: "POST", + }) + .then(() => { + this.loading = false; + this.flash(I18n.t("chat_integration.test_modal.success"), "success"); }) - .then(() => { - this.set("loading", false); - this.flash(I18n.t("chat_integration.test_modal.success"), "success"); - }) - .catch(popupAjaxError); - }, - }, -}); + .catch(popupAjaxError); + } +} diff --git a/assets/javascripts/admin/models/channel.js b/assets/javascripts/admin/models/channel.js index db91717..a1bc53a 100644 --- a/assets/javascripts/admin/models/channel.js +++ b/assets/javascripts/admin/models/channel.js @@ -1,11 +1,11 @@ import RestModel from "discourse/models/rest"; -export default RestModel.extend({ +export default class Channel extends RestModel { updateProperties() { return this.getProperties(["data"]); - }, + } createProperties() { return this.getProperties(["provider", "data"]); - }, -}); + } +} diff --git a/assets/javascripts/admin/models/provider.js b/assets/javascripts/admin/models/provider.js index 0c432d3..d0dacec 100644 --- a/assets/javascripts/admin/models/provider.js +++ b/assets/javascripts/admin/models/provider.js @@ -1,3 +1,3 @@ import RestModel from "discourse/models/rest"; -export default RestModel.extend({}); +export default class Provider extends RestModel {} diff --git a/assets/javascripts/admin/models/rule.js b/assets/javascripts/admin/models/rule.js index a1e0aca..67a3649 100644 --- a/assets/javascripts/admin/models/rule.js +++ b/assets/javascripts/admin/models/rule.js @@ -1,12 +1,31 @@ import I18n from "I18n"; import RestModel from "discourse/models/rest"; import Category from "discourse/models/category"; -import computed, { observes } from "discourse-common/utils/decorators"; +import { tracked } from "@glimmer/tracking"; -export default RestModel.extend({ - @computed("channel.provider") - available_filters(provider) { +export default class Rule extends RestModel { + @tracked type = "normal"; + @tracked category_id = null; + @tracked tags = null; + @tracked channel_id = null; + @tracked filter = "watch"; + @tracked error_key = null; + + available_types = [ + { id: "normal", name: I18n.t("chat_integration.type.normal") }, + { + id: "group_message", + name: I18n.t("chat_integration.type.group_message"), + }, + { + id: "group_mention", + name: I18n.t("chat_integration.type.group_mention"), + }, + ]; + + get available_filters() { const available = []; + const provider = this.channel.provider; if (provider === "slack") { available.push({ @@ -35,51 +54,21 @@ export default RestModel.extend({ ); return available; - }, + } - available_types: [ - { id: "normal", name: I18n.t("chat_integration.type.normal") }, - { - id: "group_message", - name: I18n.t("chat_integration.type.group_message"), - }, - { - id: "group_mention", - name: I18n.t("chat_integration.type.group_mention"), - }, - ], + get category() { + const categoryId = this.category_id; - category_id: null, - tags: null, - channel_id: null, - filter: "watch", - type: "normal", - error_key: null, - - @observes("type") - removeUnneededInfo() { - const type = this.get("type"); - - if (type === "normal") { - this.set("group_id", null); - } else { - this.set("category_id", null); - } - }, - - @computed("category_id") - category(categoryId) { if (categoryId) { return Category.findById(categoryId); } else { return false; } - }, + } - @computed("filter") - filterName(filter) { - return I18n.t(`chat_integration.filter.${filter}`); - }, + get filterName() { + return I18n.t(`chat_integration.filter.${this.filter}`); + } updateProperties() { return this.getProperties([ @@ -89,7 +78,7 @@ export default RestModel.extend({ "tags", "filter", ]); - }, + } createProperties() { return this.getProperties([ @@ -100,5 +89,5 @@ export default RestModel.extend({ "tags", "filter", ]); - }, -}); + } +} diff --git a/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js b/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js index f530ff8..768c686 100644 --- a/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js +++ b/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js @@ -1,6 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; -export default DiscourseRoute.extend({ +export default class AdminPluginsChatIntegrationIndex extends DiscourseRoute { afterModel(model) { if (model.totalRows > 0) { this.transitionTo( @@ -8,5 +8,5 @@ export default DiscourseRoute.extend({ model.get("firstObject").name ); } - }, -}); + } +} diff --git a/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js b/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js index 20e09d1..a032761 100644 --- a/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js +++ b/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js @@ -3,7 +3,7 @@ import Group from "discourse/models/group"; import { action } from "@ember/object"; import RSVP from "rsvp"; -export default DiscourseRoute.extend({ +export default class AdminPluginsChatIntegrationProvider extends DiscourseRoute { model(params) { return RSVP.hash({ channels: this.store.findAll("channel", { provider: params.provider }), @@ -26,24 +26,24 @@ export default DiscourseRoute.extend({ return value; }); - }, + } serialize(model) { return { provider: model["provider"].get("id") }; - }, + } @action closeModal() { - if (this.get("controller.modalShowing")) { + if (this.controller.modalShowing) { this.refresh(); - this.set("controller.modalShowing", false); + this.controller.modalShowing = false; } return true; // Continue bubbling up, so the modal actually closes - }, + } @action refreshProvider() { this.refresh(); - }, -}); + } +} diff --git a/assets/javascripts/admin/routes/admin-plugins-chat-integration.js b/assets/javascripts/admin/routes/admin-plugins-chat-integration.js index dcc3bdd..b7e9313 100644 --- a/assets/javascripts/admin/routes/admin-plugins-chat-integration.js +++ b/assets/javascripts/admin/routes/admin-plugins-chat-integration.js @@ -1,15 +1,15 @@ import DiscourseRoute from "discourse/routes/discourse"; import { action } from "@ember/object"; -export default DiscourseRoute.extend({ +export default class AdminPluginsChatIntegration extends DiscourseRoute { model() { return this.store.findAll("provider"); - }, + } @action showSettings() { this.transitionTo("adminSiteSettingsCategory", "plugins", { queryParams: { filter: "chat_integration" }, }); - }, -}); + } +} diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs index 936d01e..26c55cb 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs @@ -1,4 +1,4 @@ -{{#d-modal-body id="chat_integration_error_modal"}} +

{{i18n model.error_key}}

{{model.error_info}}
-{{/d-modal-body}} \ No newline at end of file + \ No newline at end of file diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs index 300a16c..56d31f8 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs @@ -1,15 +1,18 @@ -{{#d-modal-body - id="chat-integration-edit-channel-modal" - title="chat_integration.edit_channel_modal.title" -}} +
- + - {{#each model.provider.channel_parameters as |param|}} - - - - - - - - - + {{#each this.model.provider.channel_parameters as |param|}} + {{/each}}
+ + {{i18n (concat @@ -24,63 +27,34 @@
- {{text-field - name=(concat "param-" param.key) - value=(mut (get model.channel.data param.key)) - }} - -   - {{#if (get model.channel.data param.key)}} - {{input-tip validation=(get paramValidation param.key)}} - {{/if}} -
-{{/d-modal-body}} +
- {{d-button - id="save-channel" - class="btn-primary btn-large" - action=(action "save") - title="chat_integration.edit_channel_modal.save" - label="chat_integration.edit_channel_modal.save" - disabled=saveDisabled - }} + - {{d-button - class="btn-large" - action=(action "cancel") - title="chat_integration.edit_channel_modal.cancel" - label="chat_integration.edit_channel_modal.cancel" - }} +
\ No newline at end of file diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs index 66981aa..52f3f3b 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs @@ -1,19 +1,24 @@ -{{#d-modal-body - id="chat-integration-edit-rule_modal" - title="chat_integration.edit_rule_modal.title" -}} +
- + @@ -25,11 +30,16 @@ - + @@ -39,131 +49,158 @@ - + - + - + - + - {{#if showCategory}} + {{#if (eq this.model.rule.type "normal")}} - + - + }} + + {{else}} - + - + {{/if}} - {{#if siteSettings.tagging_enabled}} + {{#if this.siteSettings.tagging_enabled}} - + - + {{/if}}
+ + {{i18n (concat - "chat_integration.provider." model.channel.provider ".title" + "chat_integration.provider." + this.model.channel.provider + ".title" ) }}
+ + - {{channel-data provider=model.provider channel=model.channel}} +
+ + - {{combo-box - name="type" - content=model.rule.available_types - value=model.rule.type - }} +
+ +
+ + - {{combo-box - name="filter" - content=model.rule.available_filters - value=model.rule.filter - }} +
+ +
+ + - {{category-chooser - name="category" - none="chat_integration.all_categories" - value=model.rule.category_id - }} +
+
+ + - {{combo-box - content=model.groups - valueAttribute="id" - value=model.rule.group_id - none="chat_integration.choose_group" - }} +
+ +
+ + - {{tag-chooser - placeholderKey="chat_integration.all_tags" - name="tags" - tags=model.rule.tags - everyTag=true - }} +
+ +
-{{/d-modal-body}} +
- {{d-button - id="save-rule" - class="btn-primary btn-large" - action=(action "save") - actionParam=model.rule - title="chat_integration.edit_rule_modal.save" - label="chat_integration.edit_rule_modal.save" - disabled=saveDisabled - }} + - {{d-button - class="btn-large" - action=(route-action "closeModal") - title="chat_integration.edit_rule_modal.cancel" - label="chat_integration.edit_rule_modal.cancel" - }} +
\ No newline at end of file diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs index ad80159..450d8a6 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs @@ -1,41 +1,43 @@ -{{#d-modal-body - id="chat_integration_test_modal" - title="chat_integration.test_modal.title" -}} +
- +
+ + - {{choose-topic selectedTopicId=model.topic_id}} +
-{{/d-modal-body}} +
- {{#conditional-loading-spinner condition=loading}} - {{d-button - id="send-test" - class="btn-primary btn-large" - action=(action "send") - title="chat_integration.test_modal.send" - label="chat_integration.test_modal.send" - disabled=sendDisabled - }} - - {{d-button - class="btn-large" - action=(route-action "closeModal") - title="chat_integration.test_modal.close" - label="chat_integration.test_modal.close" - }} - {{/conditional-loading-spinner}} + + + +
\ No newline at end of file diff --git a/assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs b/assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs new file mode 100644 index 0000000..37c2c3e --- /dev/null +++ b/assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs @@ -0,0 +1,33 @@ +{{#if this.anyErrors}} +
+ {{d-icon "exclamation-triangle"}} + + {{i18n "chat_integration.channels_with_errors"}} + +
+{{/if}} + +{{#each this.model.channels.content as |channel|}} + +{{/each}} + +
+
+ +
+
\ No newline at end of file diff --git a/assets/javascripts/admin/templates/plugins-chat-integration.hbs b/assets/javascripts/admin/templates/plugins-chat-integration.hbs new file mode 100644 index 0000000..d7f1ad6 --- /dev/null +++ b/assets/javascripts/admin/templates/plugins-chat-integration.hbs @@ -0,0 +1,30 @@ +
+
+
+
    + {{#each this.model as |provider|}} + + {{/each}} +
+
+ + +
+ + {{#unless this.model.totalRows}} + {{i18n "chat_integration.no_providers"}} + {{/unless}} + + {{outlet}} +
\ No newline at end of file diff --git a/assets/javascripts/discourse/routes/transcript.js b/assets/javascripts/discourse/routes/transcript.js index e76c6d5..57b39de 100644 --- a/assets/javascripts/discourse/routes/transcript.js +++ b/assets/javascripts/discourse/routes/transcript.js @@ -3,7 +3,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error"; import DiscourseRoute from "discourse/routes/discourse"; import { next } from "@ember/runloop"; -export default DiscourseRoute.extend({ +export default class Trascript extends DiscourseRoute { model(params) { if (this.currentUser) { const secret = params.secret; @@ -28,5 +28,5 @@ export default DiscourseRoute.extend({ this.session.set("shouldRedirectToUrl", window.location.href); this.replaceWith("login"); } - }, -}); + } +} diff --git a/assets/javascripts/discourse/templates/admin/plugins-chat-integration-provider.hbs b/assets/javascripts/discourse/templates/admin/plugins-chat-integration-provider.hbs deleted file mode 100644 index 13aa961..0000000 --- a/assets/javascripts/discourse/templates/admin/plugins-chat-integration-provider.hbs +++ /dev/null @@ -1,34 +0,0 @@ -{{#if anyErrors}} -
- {{d-icon "exclamation-triangle"}} - {{i18n - "chat_integration.channels_with_errors" - }} -
-{{/if}} - -{{#each model.channels as |channel|}} - {{channel-details - channel=channel - provider=model.provider - refresh=(route-action "refreshProvider") - editChannel=(action "editChannel") - test=(action "testChannel") - createRule=(action "createRule") - editRuleWithChannel=(action "editRuleWithChannel") - showError=(action "showError") - }} -{{/each}} - -
-
- {{d-button - id="create-channel" - action=(action "createChannel") - actionParam=model.provider - icon="plus" - title="chat_integration.create_channel" - label="chat_integration.create_channel" - }} -
-
\ No newline at end of file diff --git a/assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs b/assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs deleted file mode 100644 index 1689a22..0000000 --- a/assets/javascripts/discourse/templates/admin/plugins-chat-integration.hbs +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
-
    - {{#each model as |provider|}} - {{nav-item - route="adminPlugins.chat-integration.provider" - routeParam=provider.name - label=(concat "chat_integration.provider." provider.name ".title") - }} - {{/each}} -
-
- - {{d-button - action=(route-action "showSettings") - icon="cog" - title="chat_integration.settings" - label="chat_integration.settings" - }} -
- - {{#unless model.totalRows}} - {{i18n "chat_integration.no_providers"}} - {{/unless}} - - {{outlet}} -
\ No newline at end of file diff --git a/assets/javascripts/discourse/templates/components/channel-data.hbs b/assets/javascripts/discourse/templates/components/channel-data.hbs deleted file mode 100644 index e36267a..0000000 --- a/assets/javascripts/discourse/templates/components/channel-data.hbs +++ /dev/null @@ -1,17 +0,0 @@ -{{#each provider.channel_parameters as |param|}} - {{#unless param.hidden}} - - {{i18n - (concat - "chat_integration.provider." - channel.provider - ".param." - param.key - ".title" - ) - }}: - - {{get channel.data param.key}} -
- {{/unless}} -{{/each}} \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/components/channel-details.hbs b/assets/javascripts/discourse/templates/components/channel-details.hbs deleted file mode 100644 index 34a82f3..0000000 --- a/assets/javascripts/discourse/templates/components/channel-details.hbs +++ /dev/null @@ -1,77 +0,0 @@ -
-
- {{d-button - action=editChannel - actionParam=channel - icon="pencil-alt" - title="chat_integration.edit_channel" - label="chat_integration.edit_channel" - }} - - {{d-button - action=test - actionParam=channel - icon="rocket" - title="chat_integration.test_channel" - label="chat_integration.test_channel" - class="btn-chat-test" - }} - - {{d-button - class="cancel delete-channel" - action=(action "deleteChannel") - actionParam=channel - icon="trash-alt" - title="chat_integration.delete_channel" - label="chat_integration.delete_channel" - }} -
- - - {{#if channel.error_key}} - {{d-button - action=showError - actionParam=channel - class="delete btn-danger" - icon="exclamation-triangle" - }} - {{/if}} - - {{channel-data provider=provider channel=channel}} - -
- -
- - - - - - - {{#if siteSettings.tagging_enabled}} - - {{/if}} - - - - - - - {{#each channel.rules as |rule|}} - {{rule-row rule=rule edit=(action "editRule") refresh=refresh}} - {{/each}} - -
{{i18n "chat_integration.rule_table.filter"}}{{i18n "chat_integration.rule_table.category"}}{{i18n "chat_integration.rule_table.tags"}}
-
- -
-
- {{d-button - action=createRule - actionParam=channel - icon="plus" - title="chat_integration.create_rule" - label="chat_integration.create_rule" - }} -
-
\ No newline at end of file diff --git a/assets/javascripts/discourse/templates/components/rule-row.hbs b/assets/javascripts/discourse/templates/components/rule-row.hbs deleted file mode 100644 index 7cfbbd2..0000000 --- a/assets/javascripts/discourse/templates/components/rule-row.hbs +++ /dev/null @@ -1,45 +0,0 @@ - - {{rule.filterName}} - - - - {{#if isCategory}} - {{#if rule.category}} - {{category-link rule.category allowUncategorized="true" link="false"}} - {{else}} - {{i18n "chat_integration.all_categories"}} - {{/if}} - {{else if isMention}} - {{i18n "chat_integration.group_mention_template" name=rule.group_name}} - {{else if isMessage}} - {{i18n "chat_integration.group_message_template" name=rule.group_name}} - {{/if}} - - -{{#if siteSettings.tagging_enabled}} - - {{#if rule.tags}} - {{rule.tags}} - {{else}} - {{i18n "chat_integration.all_tags"}} - {{/if}} - -{{/if}} - - - {{d-button - action=edit - actionParam=rule - icon="pencil-alt" - class="edit" - title="chat_integration.rule_table.edit_rule" - }} - - {{d-button - action=(action "delete") - actionParam=rule - icon="far-trash-alt" - class="delete" - title="chat_integration.rule_table.delete_rule" - }} - \ No newline at end of file diff --git a/assets/stylesheets/chat-integration-admin.scss b/assets/stylesheets/chat-integration-admin.scss index fc4d2a1..0fcc5bc 100644 --- a/assets/stylesheets/chat-integration-admin.scss +++ b/assets/stylesheets/chat-integration-admin.scss @@ -66,6 +66,10 @@ table { width: 100%; + tbody { + border-top: none; + } + tr { border: none; } @@ -85,6 +89,8 @@ tr.chat-instructions label { color: var(--primary-medium); + font-size: var(--font-down-1); + margin-top: 0.5rem; } } diff --git a/test/javascripts/acceptance/chat-integration-test.js b/test/javascripts/acceptance/chat-integration-test.js index 59f8665..178bf70 100755 --- a/test/javascripts/acceptance/chat-integration-test.js +++ b/test/javascripts/acceptance/chat-integration-test.js @@ -143,9 +143,9 @@ acceptance("Chat Integration", function (needs) { // Press enter await triggerKeyEvent( - "#chat-integration-edit-channel-modal input", + "#chat-integration-edit-channel-modal", "keydown", - 13 + "Enter" ); assert.notOk(