Skip to content

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

UX: Change chat integration plugin to follow newer admin plugin UI guidelines (#37160)

Régis Hanol588b793995f9
diff --git a/frontend/discourse/admin/components/admin-config-area-empty-list.gjs b/frontend/discourse/admin/components/admin-config-area-empty-list.gjs
index 8549bc4c61c..65d6cd8fc66 100644
--- a/frontend/discourse/admin/components/admin-config-area-empty-list.gjs
+++ b/frontend/discourse/admin/components/admin-config-area-empty-list.gjs
@@ -14,8 +14,10 @@ export default class AdminConfigAreaEmptyList extends Component {
}
<template>
- <div class="admin-config-area-empty-list">
- {{trustHTML this.emptyLabel}}
+ <div class="admin-config-area-empty-list" ...attributes>
+ <span class="admin-config-area-empty-list__title">{{trustHTML
+ this.emptyLabel
+ }}</span>
{{#if @ctaLabel}}
<DButton
diff --git a/frontend/discourse/app/lib/ajax-error.js b/frontend/discourse/app/lib/ajax-error.js
index 9d6af2c1355..b7d549205fc 100644
--- a/frontend/discourse/app/lib/ajax-error.js
+++ b/frontend/discourse/app/lib/ajax-error.js
@@ -66,6 +66,8 @@ export function extractErrorInfo(
parsedError = parsedJSON.message;
} else if (parsedJSON.failed) {
parsedError = parsedJSON.failed;
+ } else if (parsedJSON.error_key) {
+ parsedError = i18n(parsedJSON.error_key);
}
}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/chat-integration-route-map.js b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/chat-integration-route-map.js
deleted file mode 100644
index 786a6601f96..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/chat-integration-route-map.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default {
- resource: "admin.adminPlugins",
- path: "/plugins",
- map() {
- this.route("chat-integration", function () {
- this.route("provider", { path: "/:provider" });
- });
- },
-};
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/channel-details.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/channel-details.gjs
deleted file mode 100644
index 14ac8f4da10..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/channel-details.gjs
+++ /dev/null
@@ -1,107 +0,0 @@
-import Component from "@glimmer/component";
-import { fn } from "@ember/helper";
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import DButton from "discourse/components/d-button";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { i18n } from "discourse-i18n";
-import ChannelData from "./channel-data";
-import RuleRow from "./rule-row";
-
-export default class ChannelDetails extends Component {
- @service dialog;
- @service siteSettings;
-
- @action
- deleteChannel(channel) {
- this.dialog.deleteConfirm({
- message: i18n("chat_integration.channel_delete_confirm"),
- didConfirm: () => {
- return channel
- .destroyRecord()
- .then(() => this.args.refresh())
- .catch(popupAjaxError);
- },
- });
- }
-
- <template>
- <div class="channel-details">
- <div class="channel-header">
- <div class="pull-right">
- <DButton
- @icon="pencil"
- @title="chat_integration.edit_channel"
- @label="chat_integration.edit_channel"
- @action={{fn @editChannel @channel}}
- />
-
- <DButton
- @icon="rocket"
- @title="chat_integration.test_channel"
- @label="chat_integration.test_channel"
- @action={{fn @test @channel}}
- class="btn-chat-test"
- />
-
- <DButton
- @icon="trash-can"
- @title="chat_integration.delete_channel"
- @label="chat_integration.delete_channel"
- @action={{fn this.deleteChannel @channel}}
- class="cancel delete-channel"
- />
- </div>
-
- <span class="channel-title">
- {{#if @channel.error_key}}
- <DButton
- @icon="triangle-exclamation"
- @action={{fn @showError @channel}}
- class="delete btn-danger"
- />
- {{/if}}
-
- <ChannelData @provider={{@provider}} @channel={{@channel}} />
- </span>
- </div>
- <div class="channel-body">
- <table>
- <thead>
- <tr>
- <th>{{i18n "chat_integration.rule_table.filter"}}</th>
- <th>{{i18n "chat_integration.rule_table.category"}}</th>
-
- {{#if this.siteSettings.tagging_enabled}}
- <th>{{i18n "chat_integration.rule_table.tags"}}</th>
- {{/if}}
-
- <th></th>
- </tr>
- </thead>
-
- <tbody>
- {{#each @channel.rules as |rule|}}
- <RuleRow
- @rule={{rule}}
- @edit={{fn @editRuleWithChannel rule @channel}}
- @refresh={{@refresh}}
- />
- {{/each}}
- </tbody>
- </table>
- </div>
-
- <div class="channel-footer">
- <div class="pull-right">
- <DButton
- @icon="plus"
- @title="chat_integration.create_rule"
- @label="chat_integration.create_rule"
- @action={{fn @createRule @channel}}
- />
- </div>
- </div>
- </div>
- </template>
-}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/edit-channel.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/edit-channel.gjs
deleted file mode 100644
index 0577039d414..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/edit-channel.gjs
+++ /dev/null
@@ -1,97 +0,0 @@
-import Component from "@glimmer/component";
-import { concat } from "@ember/helper";
-import { on } from "@ember/modifier";
-import { action } from "@ember/object";
-import DButton from "discourse/components/d-button";
-import DModal from "discourse/components/d-modal";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { not } from "discourse/truth-helpers";
-import { i18n } from "discourse-i18n";
-import ChannelParamRow from "../channel-param-row";
-
-export default class EditChannel extends Component {
- get validParams() {
- return this.args.model.provider.channel_parameters.every((param) => {
- const value = this.args.model.channel.get(`data.${param.key}`);
-
- if (!value?.trim()) {
- return false;
- }
-
- if (!param.regex) {
- return true;
- }
-
- return new RegExp(param.regex).test(value);
- });
- }
-
- @action
- async save() {
- try {
- await this.args.model.channel.save();
- this.args.closeModal();
- } catch (e) {
- popupAjaxError(e);
- }
- }
-
- <template>
- <DModal
- {{on "submit" this.save}}
- @title={{i18n "chat_integration.edit_channel_modal.title"}}
- @closeModal={{@closeModal}}
- @tagName="form"
- id="chat-integration-edit-channel-modal"
- >
- <:body>
- <table>
- <tbody>
- <tr class="input">
- <td class="label">
- <label for="provider">
- {{i18n "chat_integration.edit_channel_modal.provider"}}
- </label>
- </td>
- <td>
- {{i18n
- (concat
- "chat_integration.provider."
- @model.channel.provider
- ".title"
- )
- }}
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td></td>
- </tr>
-
- {{#each @model.provider.channel_parameters as |param|}}
- <ChannelParamRow @param={{param}} @channel={{@model.channel}} />
- {{/each}}
- </tbody>
- </table>
- </:body>
-
- <:footer>
- <DButton
- @action={{this.save}}
- @label="chat_integration.edit_channel_modal.save"
- @disabled={{not this.validParams}}
- type="submit"
- id="save-channel"
- class="btn-primary btn-large"
- />
-
- <DButton
- @action={{@closeModal}}
- @label="chat_integration.edit_channel_modal.cancel"
- class="btn-default btn-large"
- />
- </:footer>
- </DModal>
- </template>
-}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/edit-rule.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/edit-rule.gjs
deleted file mode 100644
index 6a5f5b2954b..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/edit-rule.gjs
+++ /dev/null
@@ -1,247 +0,0 @@
-import Component from "@glimmer/component";
-import { concat, fn, hash } from "@ember/helper";
-import { on } from "@ember/modifier";
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import DButton from "discourse/components/d-button";
-import DModal from "discourse/components/d-modal";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { bind } from "discourse/lib/decorators";
-import CategoryChooser from "discourse/select-kit/components/category-chooser";
-import ComboBox from "discourse/select-kit/components/combo-box";
-import TagChooser from "discourse/select-kit/components/tag-chooser";
-import { eq } from "discourse/truth-helpers";
-import { i18n } from "discourse-i18n";
-import getTagName from "../../lib/get-tag-name";
-import ChannelData from "../channel-data";
-
-export default class EditRule extends Component {
- @service siteSettings;
-
- @bind
- onTagsChanged(tags) {
- this.args.model.rule.tags = (tags || []).map((tag) => getTagName(tag));
- }
-
- @action
- async save(rule) {
- try {
- await rule.save();
- this.args.closeModal();
- } catch (e) {
- popupAjaxError(e);
- }
- }
-
- <template>
- <DModal
- {{on "submit" this.save}}
- @title={{i18n "chat_integration.edit_rule_modal.title"}}
- @closeModal={{@closeModal}}
- @tagName="form"
- id="chat-integration-edit-rule_modal"
- >
- <:body>
- <table>
- <tbody>
- <tr class="input">
- <td class="label">
- <label for="provider">
- {{i18n "chat_integration.edit_rule_modal.provider"}}
- </label>
- </td>
- <td>
- {{i18n
- (concat
- "chat_integration.provider."
- @model.channel.provider
- ".title"
- )
- }}
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td></td>
- </tr>
-
- <tr class="input">
- <td class="label">
- <label for="channel">
- {{i18n "chat_integration.edit_rule_modal.channel"}}
- </label>
- </td>
- <td>
- <ChannelData
- @provider={{@model.provider}}
- @channel={{@model.channel}}
- />
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td></td>
- </tr>
-
- <tr class="input">
- <td class="label">
- <label for="filter">
- {{i18n "chat_integration.edit_rule_modal.type"}}
- </label>
- </td>
- <td>
- <ComboBox
- @name="type"
- @content={{@model.rule.available_types}}
- @value={{@model.rule.type}}
- @onChange={{fn (mut @model.rule.type)}}
- />
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td>
- <label>
- {{i18n "chat_integration.edit_rule_modal.instructions.type"}}
- </label>
- </td>
- </tr>
-
- <tr class="input">
- <td class="label">
- <label for="filter">
- {{i18n "chat_integration.edit_rule_modal.filter"}}
- </label>
- </td>
- <td>
- <ComboBox
- @name="filter"
- @content={{@model.rule.available_filters}}
- @value={{@model.rule.filter}}
- @onChange={{fn (mut @model.rule.filter)}}
- />
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td>
- <label>
- {{i18n
- "chat_integration.edit_rule_modal.instructions.filter"
- }}
- </label>
- </td>
- </tr>
-
- {{#if (eq @model.rule.type "normal")}}
- <tr class="input">
- <td class="label">
- <label for="category">
- {{i18n "chat_integration.edit_rule_modal.category"}}
- </label>
- </td>
- <td>
- <CategoryChooser
- @name="category"
- @options={{hash none="chat_integration.all_categories"}}
- @value={{@model.rule.category_id}}
- @onChange={{fn (mut @model.rule.category_id)}}
- />
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td>
- <label>
- {{i18n
- "chat_integration.edit_rule_modal.instructions.category"
- }}
- </label>
- </td>
- </tr>
- {{else}}
- <tr class="input">
- <td class="label">
- <label for="group">
- {{i18n "chat_integration.edit_rule_modal.group"}}
- </label>
- </td>
- <td>
- <ComboBox
- @content={{@model.groups}}
- @valueProperty="id"
- @value={{@model.rule.group_id}}
- @onChange={{fn (mut @model.rule.group_id)}}
- @options={{hash none="chat_integration.choose_group"}}
- />
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td>
- <label>
- {{i18n
- "chat_integration.edit_rule_modal.instructions.group"
- }}
- </label>
- </td>
- </tr>
- {{/if}}
-
- {{#if this.siteSettings.tagging_enabled}}
- <tr class="input">
- <td class="label">
- <label for="tags">
- {{i18n "chat_integration.edit_rule_modal.tags"}}
- </label>
- </td>
- <td>
- <TagChooser
- @placeholderKey="chat_integration.all_tags"
- @name="tags"
- @tags={{@model.rule.tags}}
- @everyTag="true"
- @onChange={{this.onTagsChanged}}
- />
- </td>
- </tr>
-
- <tr class="chat-instructions">
- <td></td>
- <td>
- <label>
- {{i18n
- "chat_integration.edit_rule_modal.instructions.tags"
- }}
- </label>
- </td>
- </tr>
- {{/if}}
- </tbody>
- </table>
- </:body>
-
- <:footer>
- <DButton
- @action={{fn this.save @model.rule}}
- @label="chat_integration.edit_rule_modal.save"
- type="submit"
- id="save-rule"
- class="btn-primary btn-large"
- />
-
- <DButton
- @label="chat_integration.edit_rule_modal.cancel"
- @action={{@closeModal}}
- class="btn-default btn-large"
- />
- </:footer>
- </DModal>
- </template>
-}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/test-integration.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/test-integration.gjs
deleted file mode 100644
index 82b79e44092..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/test-integration.gjs
+++ /dev/null
@@ -1,93 +0,0 @@
-import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import { on } from "@ember/modifier";
-import { action } from "@ember/object";
-import ChooseTopic from "discourse/components/choose-topic";
-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
-import DButton from "discourse/components/d-button";
-import DModal from "discourse/components/d-modal";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { not } from "discourse/truth-helpers";
-import { i18n } from "discourse-i18n";
-
-export default class TestIntegration extends Component {
- @tracked loading = false;
- @tracked flash;
- @tracked topicId;
-
- @action
- async send() {
- this.loading = true;
-
- try {
- await ajax("/admin/plugins/chat-integration/test", {
- data: {
- channel_id: this.args.model.channel.id,
- topic_id: this.topicId,
- },
- type: "POST",
- });
-
- this.loading = false;
- this.flash = i18n("chat_integration.test_modal.success");
- } catch (e) {
- popupAjaxError(e);
- }
- }
-
- @action
- newTopicSelected(topic) {
- this.topicId = topic?.id;
- }
-
- <template>
- <DModal
- {{on "submit" this.send}}
- @title={{i18n "chat_integration.test_modal.title"}}
- @closeModal={{@closeModal}}
- @flash={{this.flash}}
- @flashType="success"
- @tagName="form"
- id="chat_integration_test_modal"
- >
- <:body>
- <table>
- <tbody>
- <tr class="input">
- <td class="label">
- <label for="channel">
- {{i18n "chat_integration.test_modal.topic"}}
- </label>
- </td>
- <td>
- <ChooseTopic
- @topicChangedCallback={{this.newTopicSelected}}
- @selectedTopicId={{this.topicId}}
- />
- </td>
- </tr>
- </tbody>
- </table>
- </:body>
-
- <:footer>
- <ConditionalLoadingSpinner @condition={{this.loading}}>
- <DButton
- @action={{this.send}}
- @label="chat_integration.test_modal.send"
- @disabled={{not this.topicId}}
- type="submit"
- id="send-test"
- class="btn-primary btn-large"
- />
- <DButton
- @action={{@closeModal}}
- @label="chat_integration.test_modal.close"
- class="btn-default btn-large"
- />
- </ConditionalLoadingSpinner>
- </:footer>
- </DModal>
- </template>
-}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/controllers/admin-plugins/chat-integration.js b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/controllers/admin-plugins/chat-integration.js
deleted file mode 100644
index 6d28b074217..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/controllers/admin-plugins/chat-integration.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from "@ember/controller";
-
-export default class AdminPluginsChatIntegration extends Controller {}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/lib/get-tag-name.js b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/lib/get-tag-name.js
deleted file mode 100644
index 21dc8cc736b..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/lib/get-tag-name.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default function getTagName(tag) {
- // TODO(https://github.com/discourse/discourse/pull/36678): The string check can be
- // removed using .discourse-compatibility once the PR is merged.
- return typeof tag === "string" ? tag : tag.name;
-}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration.js b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration.js
deleted file mode 100644
index 1e771ecc2b5..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class AdminPluginsChatIntegration extends DiscourseRoute {
- @service router;
-
- model() {
- return this.store.findAll("provider");
- }
-
- @action
- showSettings() {
- this.router.transitionTo("adminSiteSettingsCategory", "chat_integration");
- }
-}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration/index.js b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration/index.js
deleted file mode 100644
index bd546e11ac5..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { service } from "@ember/service";
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class AdminPluginsChatIntegrationIndex extends DiscourseRoute {
- @service router;
-
- afterModel(model) {
- if (model.totalRows > 0) {
- this.router.transitionTo(
- "adminPlugins.chat-integration.provider",
- model.content[0].name
- );
- }
- }
-}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/templates/admin-plugins/chat-integration.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/templates/admin-plugins/chat-integration.gjs
deleted file mode 100644
index 3b7b0af1a02..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/templates/admin-plugins/chat-integration.gjs
+++ /dev/null
@@ -1,41 +0,0 @@
-import { concat } from "@ember/helper";
-import DButton from "discourse/components/d-button";
-import NavItem from "discourse/components/nav-item";
-import routeAction from "discourse/helpers/route-action";
-import { i18n } from "discourse-i18n";
-
-export default <template>
- <div id="admin-plugin-chat">
- <div class="admin-controls">
- <div class="admin-controls-chat-providers">
- <ul class="nav nav-pills">
- {{#each @controller.model.content as |provider|}}
- <NavItem
- @route="adminPlugins.chat-integration.provider"
- @routeParam={{provider.name}}
- @label={{concat
- "chat_integration.provider."
- provider.name
- ".title"
- }}
- />
- {{/each}}
- </ul>
- </div>
-
- <DButton
- @icon="gear"
- @title="chat_integration.settings"
- @label="chat_integration.settings"
- @action={{routeAction "showSettings"}}
- class="chat-integration-settings-button"
- />
- </div>
-
- {{#unless @controller.model.totalRows}}
- {{i18n "chat_integration.no_providers"}}
- {{/unless}}
-
- {{outlet}}
- </div>
-</template>
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/templates/admin-plugins/chat-integration/provider.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/templates/admin-plugins/chat-integration/provider.gjs
deleted file mode 100644
index dc4939e03b2..00000000000
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/templates/admin-plugins/chat-integration/provider.gjs
+++ /dev/null
@@ -1,40 +0,0 @@
-import { fn } from "@ember/helper";
-import DButton from "discourse/components/d-button";
-import icon from "discourse/helpers/d-icon";
-import { i18n } from "discourse-i18n";
-import ChannelDetails from "../../../components/channel-details";
-
-export default <template>
- {{#if @controller.anyErrors}}
- <div class="error">
- {{icon "triangle-exclamation"}}
- <span class="error-message">
- {{i18n "chat_integration.channels_with_errors"}}
- </span>
- </div>
- {{/if}}
-
- {{#each @controller.model.channels.content as |channel|}}
- <ChannelDetails
- @channel={{channel}}
- @provider={{@controller.model.provider}}
- @refresh={{@controller.refresh}}
- @editChannel={{@controller.editChannel}}
- @test={{@controller.testChannel}}
- @createRule={{@controller.createRule}}
- @editRuleWithChannel={{@controller.editRuleWithChannel}}
- @showError={{@controller.showError}}
- />
- {{/each}}
-
- <div class="table-footer">
- <div class="pull-right">
- <DButton
- @action={{fn @controller.createChannel @controller.model.provider}}
- @label="chat_integration.create_channel"
- @icon="plus"
- id="create-channel"
- />
- </div>
- </div>
-</template>
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/channel.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/channel.js
similarity index 52%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/channel.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/channel.js
index 690b75e823b..ff3f160684c 100644
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/channel.js
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/channel.js
@@ -1,3 +1,3 @@
import buildPluginAdapter from "discourse/admin/adapters/build-plugin";
-export default buildPluginAdapter("chat-integration");
+export default buildPluginAdapter("discourse-chat-integration");
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/provider.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/provider.js
similarity index 52%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/provider.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/provider.js
index 690b75e823b..ff3f160684c 100644
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/provider.js
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/provider.js
@@ -1,3 +1,3 @@
import buildPluginAdapter from "discourse/admin/adapters/build-plugin";
-export default buildPluginAdapter("chat-integration");
+export default buildPluginAdapter("discourse-chat-integration");
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/rule.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/rule.js
similarity index 52%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/rule.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/rule.js
index 690b75e823b..ff3f160684c 100644
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/adapters/rule.js
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/adapters/rule.js
@@ -1,3 +1,3 @@
import buildPluginAdapter from "discourse/admin/adapters/build-plugin";
-export default buildPluginAdapter("chat-integration");
+export default buildPluginAdapter("discourse-chat-integration");
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/channel-data.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-data.gjs
similarity index 100%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/channel-data.gjs
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-data.gjs
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-details.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-details.gjs
new file mode 100644
index 00000000000..064fdab4d3d
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-details.gjs
@@ -0,0 +1,149 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { fn } from "@ember/helper";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import DButton from "discourse/components/d-button";
+import DropdownMenu from "discourse/components/dropdown-menu";
+import DMenu from "discourse/float-kit/components/d-menu";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { i18n } from "discourse-i18n";
+import ChannelData from "./channel-data";
+import InlineChannelForm from "./inline-channel-form";
+import RuleRow from "./rule-row";
+
+export default class ChannelDetails extends Component {
+ @service dialog;
+ @service siteSettings;
+
+ @tracked isEditing = false;
+
+ @action
+ startEditing() {
+ this.isEditing = true;
+ }
+
+ @action
+ cancelEditing() {
+ this.isEditing = false;
+ }
+
+ @action
+ onChannelSaved() {
+ this.isEditing = false;
+ this.args.refresh();
+ }
+
+ @action
+ deleteChannel(channel) {
+ this.dialog.deleteConfirm({
+ message: i18n("chat_integration.channel_delete_confirm"),
+ didConfirm: () => {
+ return channel
+ .destroyRecord()
+ .then(() => this.args.refresh())
+ .catch(popupAjaxError);
+ },
+ });
+ }
+
+ <template>
+ <div class="admin-config-area-card channel-details">
+ <div class="admin-config-area-card__header channel-header">
+ <div class="admin-config-area-card__title channel-title">
+ {{#if @channel.error_key}}
+ <DButton
+ @icon="triangle-exclamation"
+ @action={{fn @showError @channel}}
+ class="btn-danger btn-small channel-error-btn"
+ />
+ {{/if}}
+ {{#if this.isEditing}}
+ <InlineChannelForm
+ @channel={{@channel}}
+ @provider={{@provider}}
+ @onSave={{this.onChannelSaved}}
+ @onCancel={{this.cancelEditing}}
+ />
+ {{else}}
+ <ChannelData @provider={{@provider}} @channel={{@channel}} />
+ {{/if}}
+ </div>
+
+ {{#unless this.isEditing}}
+ <div class="admin-config-area-card__header-actions">
+ <DMenu
+ @identifier="channel-actions-{{@channel.id}}"
+ @icon="ellipsis-vertical"
+ @title={{i18n "chat_integration.channel_actions"}}
+ class="btn-default btn-small"
+ >
+ <:content>
+ <DropdownMenu as |dropdown|>
+ <dropdown.item>
+ <DButton
+ @icon="pencil"
+ @label="chat_integration.edit_channel"
+ @action={{this.startEditing}}
+ class="btn-transparent edit-channel"
+ />
+ </dropdown.item>
+ <dropdown.item>
+ <DButton
+ @icon="rocket"
+ @label="chat_integration.test_channel"
+ @action={{fn @test @channel}}
+ class="btn-transparent test-channel"
+ />
+ </dropdown.item>
+ <dropdown.divider />
+ <dropdown.item>
+ <DButton
+ @icon="trash-can"
+ @label="chat_integration.delete_channel"
+ @action={{fn this.deleteChannel @channel}}
+ class="btn-transparent btn-danger delete-channel"
+ />
+ </dropdown.item>
+ </DropdownMenu>
+ </:content>
+ </DMenu>
+ </div>
+ {{/unless}}
+ </div>
+
+ <div class="admin-config-area-card__content channel-body">
+ <table class="d-table channel-rules-table">
+ <thead class="d-table__header">
+ <tr>
+ <th>{{i18n "chat_integration.rule_table.filter"}}</th>
+ <th>{{i18n "chat_integration.rule_table.category"}}</th>
+ {{#if this.siteSettings.tagging_enabled}}
+ <th>{{i18n "chat_integration.rule_table.tags"}}</th>
+ {{/if}}
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{#each @channel.rules as |rule|}}
+ <RuleRow
+ @rule={{rule}}
+ @edit={{fn @editRuleWithChannel rule @channel}}
+ @refresh={{@refresh}}
+ />
+ {{/each}}
+ </tbody>
+ </table>
+ </div>
+
+ <div class="admin-config-area-card__footer channel-footer">
+ <DButton
+ @icon="plus"
+ @label="chat_integration.create_rule"
+ @action={{fn @createRule @channel}}
+ class="btn-default btn-small"
+ />
+ </div>
+ </div>
+ </template>
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/channel-param-row.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-param-row.gjs
similarity index 100%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/channel-param-row.gjs
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-param-row.gjs
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/inline-channel-form.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/inline-channel-form.gjs
new file mode 100644
index 00000000000..10d7f8e06e3
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/inline-channel-form.gjs
@@ -0,0 +1,102 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { concat } from "@ember/helper";
+import { action } from "@ember/object";
+import Form from "discourse/components/form";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { i18n } from "discourse-i18n";
+
+export default class InlineChannelForm extends Component {
+ @tracked isSaving = false;
+
+ get channelParameters() {
+ return this.args.provider?.channel_parameters || [];
+ }
+
+ get formData() {
+ const data = {};
+ this.channelParameters.forEach((param) => {
+ data[param.key] = this.args.channel?.get(`data.${param.key}`) || "";
+ });
+ return data;
+ }
+
+ get isNew() {
+ return this.args.channel?.isNew ?? true;
+ }
+
+ @action
+ async onSubmit(data) {
+ this.isSaving = true;
+
+ this.channelParameters.forEach((param) => {
+ this.args.channel.set(`data.${param.key}`, data[param.key]);
+ });
+
+ try {
+ await this.args.channel.save();
+ this.args.onSave?.();
+ } catch (e) {
+ popupAjaxError(e);
+ } finally {
+ this.isSaving = false;
+ }
+ }
+
+ <template>
+ <div class="inline-channel-form">
+ <Form @data={{this.formData}} @onSubmit={{this.onSubmit}} as |form|>
+ <div class="inline-channel-form__fields">
+ {{#each this.channelParameters as |param|}}
+ <form.Field
+ @type="input"
+ @name={{param.key}}
+ @format="full"
+ @title={{i18n
+ (concat
+ "chat_integration.provider."
+ @provider.name
+ ".param."
+ param.key
+ ".title"
+ )
+ }}
+ @description={{i18n
+ (concat
+ "chat_integration.provider."
+ @provider.name
+ ".param."
+ param.key
+ ".help"
+ )
+ }}
+ @validation="required"
+ as |field|
+ >
+ <field.Control />
+ </form.Field>
+ {{/each}}
+ </div>
+
+ <div class="inline-channel-form__actions">
+ <form.Submit
+ @label={{if
+ this.isNew
+ "chat_integration.add_channel"
+ "chat_integration.edit_channel_modal.save"
+ }}
+ @isLoading={{this.isSaving}}
+ class="btn-primary btn-small"
+ />
+ {{#if @onCancel}}
+ <form.Button
+ @label="cancel"
+ @action={{@onCancel}}
+ class="btn-default btn-small"
+ />
+ {{/if}}
+ </div>
+ </Form>
+ </div>
+ </template>
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/channel-error.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/channel-error.gjs
similarity index 100%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/modal/channel-error.gjs
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/channel-error.gjs
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/edit-rule.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/edit-rule.gjs
new file mode 100644
index 00000000000..1ed0a4d0998
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/edit-rule.gjs
@@ -0,0 +1,235 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { concat, hash } from "@ember/helper";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import DModal from "discourse/components/d-modal";
+import Form from "discourse/components/form";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import CategoryChooser from "discourse/select-kit/components/category-chooser";
+import ComboBox from "discourse/select-kit/components/combo-box";
+import TagChooser from "discourse/select-kit/components/tag-chooser";
+import { i18n } from "discourse-i18n";
+import getTagName from "../../lib/get-tag-name";
+import ChannelData from "../channel-data";
+
+export default class EditRule extends Component {
+ @service siteSettings;
+
+ @tracked type = this.args.model.rule.type || "normal";
+ @tracked filter = this.args.model.rule.filter || "watch";
+ @tracked category_id = this.args.model.rule.category_id || null;
+ @tracked group_id = this.args.model.rule.group_id || null;
+ @tracked tags = this.args.model.rule.tags || [];
+
+ get isNormalType() {
+ return this.type === "normal";
+ }
+
+ get title() {
+ return this.args.model.rule.id
+ ? i18n("chat_integration.edit_rule_modal.edit_title")
+ : i18n("chat_integration.edit_rule_modal.create_title");
+ }
+
+ @action
+ onTypeChange(type) {
+ this.type = type;
+ }
+
+ @action
+ onFilterChange(filter) {
+ this.filter = filter;
+ }
+
+ @action
+ onCategoryChange(categoryId) {
+ this.category_id = categoryId;
+ }
+
+ @action
+ onGroupChange(groupId) {
+ this.group_id = groupId;
+ }
+
+ @action
+ onTagsChange(tags) {
+ this.tags = tags;
+ }
+
+ @action
+ async save() {
+ const rule = this.args.model.rule;
+ rule.setProperties({
+ type: this.type,
+ filter: this.filter,
+ category_id: this.type === "normal" ? this.category_id : null,
+ group_id: this.type !== "normal" ? this.group_id : null,
+ tags: this.tags.map((tag) => getTagName(tag)),
+ });
+
+ try {
+ await rule.save();
+ this.args.closeModal();
+ } catch (e) {
+ popupAjaxError(e);
+ }
+ }
+
+ <template>
+ <DModal
+ @title={{this.title}}
+ @closeModal={{@closeModal}}
+ id="chat-integration-edit-rule-modal"
+ class="chat-integration-modal"
+ >
+ <:body>
+ <Form as |form|>
+ <form.Field
+ @type="custom"
+ @name="provider"
+ @title={{i18n "chat_integration.edit_rule_modal.provider"}}
+ as |field|
+ >
+ <field.Control>
+ <span class="provider-name">
+ {{i18n
+ (concat
+ "chat_integration.provider."
+ @model.channel.provider
+ ".title"
+ )
+ }}
+ </span>
+ </field.Control>
+ </form.Field>
+
+ <form.Field
+ @type="custom"
+ @name="channel"
+ @title={{i18n "chat_integration.edit_rule_modal.channel"}}
+ as |field|
+ >
+ <field.Control>
+ <ChannelData
+ @provider={{@model.provider}}
+ @channel={{@model.channel}}
+ />
+ </field.Control>
+ </form.Field>
+
+ <form.Field
+ @type="custom"
+ @name="type"
+ @title={{i18n "chat_integration.edit_rule_modal.type"}}
+ @description={{i18n
+ "chat_integration.edit_rule_modal.instructions.type"
+ }}
+ as |field|
+ >
+ <field.Control>
+ <ComboBox
+ @content={{@model.rule.available_types}}
+ @value={{this.type}}
+ @onChange={{this.onTypeChange}}
+ />
+ </field.Control>
+ </form.Field>
+
+ <form.Field
+ @type="custom"
+ @name="filter"
+ @title={{i18n "chat_integration.edit_rule_modal.filter"}}
+ @description={{i18n
+ "chat_integration.edit_rule_modal.instructions.filter"
+ }}
+ as |field|
+ >
+ <field.Control>
+ <ComboBox
+ @content={{@model.rule.available_filters}}
+ @value={{this.filter}}
+ @onChange={{this.onFilterChange}}
+ />
+ </field.Control>
+ </form.Field>
+
+ {{#if this.isNormalType}}
+ <form.Field
+ @type="custom"
+ @name="category_id"
+ @title={{i18n "chat_integration.edit_rule_modal.category"}}
+ @description={{i18n
+ "chat_integration.edit_rule_modal.instructions.category"
+ }}
+ as |field|
+ >
+ <field.Control>
+ <CategoryChooser
+ @value={{this.category_id}}
+ @onChange={{this.onCategoryChange}}
+ @options={{hash none="chat_integration.all_categories"}}
+ />
+ </field.Control>
+ </form.Field>
+ {{else}}
+ <form.Field
+ @type="custom"
+ @name="group_id"
+ @title={{i18n "chat_integration.edit_rule_modal.group"}}
+ @description={{i18n
+ "chat_integration.edit_rule_modal.instructions.group"
+ }}
+ as |field|
+ >
+ <field.Control>
+ <ComboBox
+ @content={{@model.groups}}
+ @valueProperty="id"
+ @value={{this.group_id}}
+ @onChange={{this.onGroupChange}}
+ @options={{hash none="chat_integration.choose_group"}}
+ />
+ </field.Control>
+ </form.Field>
+ {{/if}}
+
+ {{#if this.siteSettings.tagging_enabled}}
+ <form.Field
+ @type="custom"
+ @name="tags"
+ @title={{i18n "chat_integration.edit_rule_modal.tags"}}
+ @description={{i18n
+ "chat_integration.edit_rule_modal.instructions.tags"
+ }}
+ as |field|
+ >
+ <field.Control>
+ <TagChooser
+ @tags={{this.tags}}
+ @everyTag="true"
+ @onChange={{this.onTagsChange}}
+ @options={{hash placeholderKey="chat_integration.all_tags"}}
+ />
+ </field.Control>
+ </form.Field>
+ {{/if}}
+
+ <form.Actions>
+ <form.Button
+ @label="chat_integration.edit_rule_modal.save"
+ @action={{this.save}}
+ class="btn-primary"
+ id="save-rule"
+ />
+ <form.Button
+ @label="chat_integration.edit_rule_modal.cancel"
+ @action={{@closeModal}}
+ class="btn-default"
+ />
+ </form.Actions>
+ </Form>
+ </:body>
+ </DModal>
+ </template>
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/test-integration.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/test-integration.gjs
new file mode 100644
index 00000000000..b314d6156c0
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/test-integration.gjs
@@ -0,0 +1,89 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { isBlank } from "@ember/utils";
+import ChooseTopic from "discourse/components/choose-topic";
+import DModal from "discourse/components/d-modal";
+import Form from "discourse/components/form";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { not } from "discourse/truth-helpers";
+import { i18n } from "discourse-i18n";
+
+export default class TestIntegration extends Component {
+ @tracked flash;
+ @tracked flashType = "success";
+ @tracked topicId = null;
+
+ @action
+ newTopicSelected(topic) {
+ this.topicId = topic?.id;
+ }
+
+ @action
+ async send() {
+ try {
+ await ajax("/admin/plugins/discourse-chat-integration/test", {
+ data: {
+ channel_id: this.args.model.channel.id,
+ topic_id: this.topicId,
+ },
+ type: "POST",
+ });
+
+ this.flash = i18n("chat_integration.test_modal.success");
+ this.flashType = "success";
+ } catch (e) {
+ popupAjaxError(e);
+ }
+ }
+
+ get canSend() {
+ return !isBlank(this.topicId);
+ }
+
+ <template>
+ <DModal
+ @title={{i18n "chat_integration.test_modal.title"}}
+ @closeModal={{@closeModal}}
+ @flash={{this.flash}}
+ @flashType={{this.flashType}}
+ id="chat-integration-test-modal"
+ class="chat-integration-modal"
+ >
+ <:body>
+ <Form as |form|>
+ <form.Field
+ @type="custom"
+ @name="topicId"
+ @title={{i18n "chat_integration.test_modal.topic"}}
+ @format="full"
+ as |field|
+ >
+ <field.Control>
+ <ChooseTopic
+ @topicChangedCallback={{this.newTopicSelected}}
+ @selectedTopicId={{this.topicId}}
+ />
+ </field.Control>
+ </form.Field>
+
+ <form.Actions>
+ <form.Button
+ @label="chat_integration.test_modal.send"
+ @action={{this.send}}
+ @disabled={{not this.canSend}}
+ class="btn-primary"
+ id="send-test"
+ />
+ <form.Button
+ @label="chat_integration.test_modal.close"
+ @action={{@closeModal}}
+ class="btn-default"
+ />
+ </form.Actions>
+ </Form>
+ </:body>
+ </DModal>
+ </template>
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/rule-row.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/rule-row.gjs
similarity index 68%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/rule-row.gjs
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/rule-row.gjs
index b29bc5a13b6..0b7c7f80268 100644
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/components/rule-row.gjs
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/rule-row.gjs
@@ -10,6 +10,7 @@ import getTagName from "../lib/get-tag-name";
export default class RuleRow extends Component {
@service siteSettings;
+ @service dialog;
get isCategory() {
return this.args.rule.type === "normal";
@@ -33,19 +34,27 @@ export default class RuleRow extends Component {
@action
delete(rule) {
- rule
- .destroyRecord()
- .then(() => this.args.refresh())
- .catch(popupAjaxError);
+ this.dialog.deleteConfirm({
+ message: i18n("chat_integration.channel_delete_confirm"),
+ didConfirm: () => {
+ return rule
+ .destroyRecord()
+ .then(() => this.args.refresh())
+ .catch(popupAjaxError);
+ },
+ });
}
<template>
- <tr>
- <td>
+ <tr class="d-table__row">
+ <td class="d-table__cell --overview rule-filter">
{{@rule.filterName}}
</td>
- <td>
+ <td class="d-table__cell --detail rule-category">
+ <div class="d-table__mobile-label">
+ {{i18n "chat_integration.rule_table.category"}}
+ </div>
{{#if this.isCategory}}
{{#if @rule.category}}
{{categoryLink
@@ -69,29 +78,31 @@ export default class RuleRow extends Component {
{{/if}}
</td>
- <td>
- {{#if this.siteSettings.tagging_enabled}}
+ {{#if this.siteSettings.tagging_enabled}}
+ <td class="d-table__cell --detail rule-tags">
+ <div class="d-table__mobile-label">
+ {{i18n "chat_integration.rule_table.tags"}}
+ </div>
{{#if this.displayTags}}
{{this.displayTags}}
{{else}}
{{i18n "chat_integration.all_tags"}}
{{/if}}
- {{/if}}
- </td>
+ </td>
+ {{/if}}
- <td>
+ <td class="d-table__cell --controls">
<DButton
@icon="pencil"
@title="chat_integration.rule_table.edit_rule"
@action={{fn @edit @rule}}
- class="edit"
+ class="btn-default btn-small edit"
/>
-
<DButton
- @icon="far-trash-can"
+ @icon="trash-can"
@title="chat_integration.rule_table.delete_rule"
@action={{fn this.delete @rule}}
- class="delete"
+ class="btn-danger btn-small delete"
/>
</td>
</tr>
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-chat-integration-providers.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-chat-integration-providers.js
new file mode 100644
index 00000000000..2073f4461c3
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-chat-integration-providers.js
@@ -0,0 +1,3 @@
+import Controller from "@ember/controller";
+
+export default class DiscourseChatIntegrationProviders extends Controller {}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/controllers/admin-plugins/chat-integration/provider.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-chat-integration-providers/show.js
similarity index 56%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/controllers/admin-plugins/chat-integration/provider.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-chat-integration-providers/show.js
index d5e7bb19ac6..f0fb13a3daa 100644
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/controllers/admin-plugins/chat-integration/provider.js
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-chat-integration-providers/show.js
@@ -1,25 +1,27 @@
+import { tracked } from "@glimmer/tracking";
import Controller from "@ember/controller";
import { action } from "@ember/object";
import { service } from "@ember/service";
-import ChannelErrorModal from "../../../components/modal/channel-error";
-import EditChannelModal from "../../../components/modal/edit-channel";
-import EditRuleModal from "../../../components/modal/edit-rule";
-import TestModal from "../../../components/modal/test-integration";
+import ChannelErrorModal from "../../../../components/modal/channel-error";
+import EditRuleModal from "../../../../components/modal/edit-rule";
+import TestModal from "../../../../components/modal/test-integration";
-export default class AdminPluginsChatIntegrationProvider extends Controller {
+export default class DiscourseChatIntegrationProvidersShow extends Controller {
@service modal;
@service store;
+ @tracked showNewChannelForm = false;
+ @tracked newChannel = null;
+
get anyErrors() {
- let anyErrors = false;
+ return this.model.channels.content.some((channel) => channel.error_key);
+ }
- this.model.channels.content.forEach((channel) => {
- if (channel.error_key) {
- anyErrors = true;
- }
+ initNewChannel() {
+ this.newChannel = this.store.createRecord("channel", {
+ provider: this.model.provider.id,
+ data: {},
});
-
- return anyErrors;
}
async triggerModal(modal, model) {
@@ -35,21 +37,21 @@ export default class AdminPluginsChatIntegrationProvider extends Controller {
@action
createChannel() {
- return this.triggerModal(EditChannelModal, {
- channel: this.store.createRecord("channel", {
- provider: this.model.provider.id,
- data: {},
- }),
- provider: this.model.provider,
- });
+ this.initNewChannel();
+ this.showNewChannelForm = true;
}
@action
- editChannel(channel) {
- return this.triggerModal(EditChannelModal, {
- channel,
- provider: this.model.provider,
- });
+ cancelNewChannel() {
+ this.showNewChannelForm = false;
+ this.newChannel = null;
+ }
+
+ @action
+ onChannelSaved() {
+ this.showNewChannelForm = false;
+ this.initNewChannel();
+ this.refresh();
}
@action
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/lib/get-tag-name.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/lib/get-tag-name.js
new file mode 100644
index 00000000000..1db8025a8aa
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/lib/get-tag-name.js
@@ -0,0 +1,3 @@
+export default function getTagName(tag) {
+ return typeof tag === "string" ? tag : tag.name;
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/models/channel.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/models/channel.js
similarity index 100%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/models/channel.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/models/channel.js
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/models/provider.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/models/provider.js
similarity index 100%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/models/provider.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/models/provider.js
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/models/rule.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/models/rule.js
similarity index 100%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/models/rule.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/models/rule.js
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers.js
new file mode 100644
index 00000000000..e7eae6a2567
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers.js
@@ -0,0 +1,7 @@
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default class DiscourseChatIntegrationProviders extends DiscourseRoute {
+ model() {
+ return this.store.findAll("provider");
+ }
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers/index.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers/index.js
new file mode 100644
index 00000000000..0b5b0fd5ea9
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers/index.js
@@ -0,0 +1,18 @@
+import { service } from "@ember/service";
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default class DiscourseChatIntegrationProvidersIndex extends DiscourseRoute {
+ @service router;
+
+ afterModel() {
+ const providers = this.modelFor(
+ "adminPlugins.show.discourse-chat-integration-providers"
+ );
+ if (providers.totalRows > 0) {
+ this.router.transitionTo(
+ "adminPlugins.show.discourse-chat-integration-providers.show",
+ providers.content[0].name
+ );
+ }
+ }
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration/provider.js b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers/show.js
similarity index 66%
rename from plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration/provider.js
rename to plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers/show.js
index 7ac484652c3..eaf53eeee8c 100644
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins/chat-integration/provider.js
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-integration-providers/show.js
@@ -3,16 +3,21 @@ import { getOwner } from "@ember/owner";
import Group from "discourse/models/group";
import DiscourseRoute from "discourse/routes/discourse";
-export default class AdminPluginsChatIntegrationProvider extends DiscourseRoute {
+export default class DiscourseChatIntegrationProvidersShow extends DiscourseRoute {
async model(params) {
- const [channels, provider, groups] = await Promise.all([
+ const providers = this.modelFor(
+ "adminPlugins.show.discourse-chat-integration-providers"
+ );
+
+ const [channels, groups] = await Promise.all([
this.store.findAll("channel", { provider: params.provider }),
- this.modelFor("admin-plugins.chat-integration").content.find(
- (item) => item.id === params.provider
- ),
Group.findAll(),
]);
+ const provider = providers.content.find(
+ (item) => item.id === params.provider
+ );
+
const enabledFilters =
getOwner(this).lookup("model:rule").possible_filters_id;
@@ -32,6 +37,7 @@ export default class AdminPluginsChatIntegrationProvider extends DiscourseRoute
return {
channels,
provider,
+ providers,
groups,
};
}
@@ -40,6 +46,11 @@ export default class AdminPluginsChatIntegrationProvider extends DiscourseRoute
return { provider: model.provider.id };
}
+ setupController(controller, model) {
+ super.setupController(controller, model);
+ controller.initNewChannel();
+ }
+
@action
refreshProvider() {
this.refresh();
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers.gjs
new file mode 100644
index 00000000000..60163b2a551
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers.gjs
@@ -0,0 +1,174 @@
+import Component from "@glimmer/component";
+import { concat, fn } from "@ember/helper";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DButton from "discourse/components/d-button";
+import DropdownMenu from "discourse/components/dropdown-menu";
+import NavItem from "discourse/components/nav-item";
+import DMenu from "discourse/float-kit/components/d-menu";
+import { i18n } from "discourse-i18n";
+
+export default class DiscourseChatIntegrationProviders extends Component {
+ @service router;
+
+ isProviderActive = (providerName) => {
+ return this.currentProvider === providerName;
+ };
+
+ get currentProvider() {
+ return this.router.currentRoute?.params?.provider;
+ }
+
+ get enabledProviders() {
+ return this.args.controller.model.content || [];
+ }
+
+ // Sorted by popularity (number of customer sites using each provider)
+ get allProviders() {
+ return [
+ "slack",
+ "discord",
+ "teams",
+ "telegram",
+ "google",
+ "matrix",
+ "zulip",
+ "mattermost",
+ "powerautomate",
+ "gitter",
+ "rocketchat",
+ "guilded",
+ "groupme",
+ "webex",
+ ].map((name) => ({
+ name,
+ settingsFilter: `chat_integration_${name}`,
+ }));
+ }
+
+ get disabledProviders() {
+ const enabledNames = this.enabledProviders.map((p) => p.name);
+ return this.allProviders.filter((p) => !enabledNames.includes(p.name));
+ }
+
+ get popularProviders() {
+ return this.disabledProviders.slice(0, 4);
+ }
+
+ get otherProviders() {
+ return this.disabledProviders.slice(4);
+ }
+
+ @action
+ configureProvider(provider) {
+ this.router.transitionTo("adminPlugins.show.settings", {
+ queryParams: { filter: provider.settingsFilter },
+ });
+ }
+
+ <template>
+ <DBreadcrumbsItem
+ @path="/admin/plugins/discourse-chat-integration/providers"
+ @label={{i18n "chat_integration.nav.providers"}}
+ />
+
+ <div id="admin-plugin-chat-integration" class="admin-detail">
+ {{#if this.enabledProviders.length}}
+ <div class="admin-nav-submenu">
+ <ul class="nav nav-pills">
+ {{#each this.enabledProviders as |provider|}}
+ <NavItem
+ @route="adminPlugins.show.discourse-chat-integration-providers.show"
+ @routeParam={{provider.name}}
+ @currentWhen={{this.isProviderActive provider.name}}
+ @label={{concat
+ "chat_integration.provider."
+ provider.name
+ ".title"
+ }}
+ />
+ {{/each}}
+ </ul>
+ {{#if this.disabledProviders.length}}
+ <DMenu
+ @identifier="chat-integration-add-provider"
+ @icon="plus"
+ @label={{i18n "chat_integration.add_provider"}}
+ class="btn-default btn-small"
+ >
+ <:content>
+ <DropdownMenu as |dropdown|>
+ {{#each this.disabledProviders as |provider|}}
+ <dropdown.item>
+ <DButton
+ @translatedLabel={{i18n
+ (concat
+ "chat_integration.provider." provider.name ".title"
+ )
+ }}
+ @action={{fn this.configureProvider provider}}
+ class="btn-transparent"
+ />
+ </dropdown.item>
+ {{/each}}
+ </DropdownMenu>
+ </:content>
+ </DMenu>
+ {{/if}}
+ </div>
+
+ {{outlet}}
+ {{else}}
+ <AdminConfigAreaEmptyList
+ @emptyLabel="chat_integration.empty_state.title"
+ class="discourse-chat-integration-providers-empty-list"
+ >
+ <p>{{i18n "chat_integration.empty_state.body"}}</p>
+ {{#if this.disabledProviders.length}}
+ <div class="chat-integration-providers-list">
+ {{#each this.popularProviders as |provider|}}
+ <DButton
+ @translatedLabel={{i18n
+ (concat "chat_integration.provider." provider.name ".title")
+ }}
+ @action={{fn this.configureProvider provider}}
+ class="btn-default"
+ />
+ {{/each}}
+ {{#if this.otherProviders.length}}
+ <DMenu
+ @identifier="chat-integration-more-providers"
+ @icon="ellipsis"
+ @label={{i18n "chat_integration.more_providers"}}
+ class="btn-default"
+ >
+ <:content>
+ <DropdownMenu as |dropdown|>
+ {{#each this.otherProviders as |provider|}}
+ <dropdown.item>
+ <DButton
+ @translatedLabel={{i18n
+ (concat
+ "chat_integration.provider."
+ provider.name
+ ".title"
+ )
+ }}
+ @action={{fn this.configureProvider provider}}
+ class="btn-transparent"
+ />
+ </dropdown.item>
+ {{/each}}
+ </DropdownMenu>
+ </:content>
+ </DMenu>
+ {{/if}}
+ </div>
+ {{/if}}
+ </AdminConfigAreaEmptyList>
+ {{/if}}
+ </div>
+ </template>
+}
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers/show.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers/show.gjs
new file mode 100644
index 00000000000..7f712432733
--- /dev/null
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers/show.gjs
@@ -0,0 +1,71 @@
+import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageSubheader from "discourse/components/d-page-subheader";
+import icon from "discourse/helpers/d-icon";
+import { i18n } from "discourse-i18n";
+import ChannelDetails from "../../../../components/channel-details";
+import InlineChannelForm from "../../../../components/inline-channel-form";
+
+const providerTitle = (provider) =>
+ i18n(`chat_integration.provider.${provider.name}.title`);
+
+<template>
+ <DBreadcrumbsItem
+ @path="/admin/plugins/discourse-chat-integration/providers/{{@controller.model.provider.name}}"
+ @label={{providerTitle @controller.model.provider}}
+ />
+
+ {{#if @controller.anyErrors}}
+ <div class="alert alert-error chat-integration-error-banner">
+ {{icon "triangle-exclamation"}}
+ <span class="error-message">
+ {{i18n "chat_integration.channels_with_errors"}}
+ </span>
+ </div>
+ {{/if}}
+
+ <div class="admin-detail">
+ <DPageSubheader @titleLabel={{i18n "chat_integration.channels_title"}}>
+ <:actions as |actions|>
+ {{#unless @controller.showNewChannelForm}}
+ <actions.Primary
+ @label="chat_integration.add_channel"
+ @title="chat_integration.add_channel"
+ @action={{@controller.createChannel}}
+ @icon="plus"
+ id="create-channel"
+ />
+ {{/unless}}
+ </:actions>
+ </DPageSubheader>
+
+ {{#if @controller.showNewChannelForm}}
+ <InlineChannelForm
+ @channel={{@controller.newChannel}}
+ @provider={{@controller.model.provider}}
+ @onSave={{@controller.onChannelSaved}}
+ @onCancel={{@controller.cancelNewChannel}}
+ />
+ {{/if}}
+
+ {{#if @controller.model.channels.content.length}}
+ <div class="chat-integration-channel-list">
+ {{#each @controller.model.channels.content as |channel|}}
+ <ChannelDetails
+ @channel={{channel}}
+ @provider={{@controller.model.provider}}
+ @refresh={{@controller.refresh}}
+ @test={{@controller.testChannel}}
+ @createRule={{@controller.createRule}}
+ @editRuleWithChannel={{@controller.editRuleWithChannel}}
+ @showError={{@controller.showError}}
+ />
+ {{/each}}
+ </div>
+ {{else}}
+ {{#unless @controller.showNewChannelForm}}
+ <AdminConfigAreaEmptyList @emptyLabel="chat_integration.no_channels" />
+ {{/unless}}
+ {{/if}}
+ </div>
+</template>
diff --git a/plugins/discourse-chat-integration/app/controllers/chat_controller.rb b/plugins/discourse-chat-integration/app/controllers/discourse_chat_integration/chat_controller.rb
similarity index 100%
rename from plugins/discourse-chat-integration/app/controllers/chat_controller.rb
rename to plugins/discourse-chat-integration/app/controllers/discourse_chat_integration/chat_controller.rb
diff --git a/plugins/discourse-chat-integration/app/initializers/discourse_chat_integration.rb b/plugins/discourse-chat-integration/app/initializers/discourse_chat_integration.rb
index 5f7d55b512b..7d972bea58b 100644
--- a/plugins/discourse-chat-integration/app/initializers/discourse_chat_integration.rb
+++ b/plugins/discourse-chat-integration/app/initializers/discourse_chat_integration.rb
@@ -31,7 +31,7 @@ require_relative "../models/channel"
require_relative "../serializers/channel_serializer"
require_relative "../serializers/rule_serializer"
-require_relative "../controllers/chat_controller"
+require_relative "../controllers/discourse_chat_integration/chat_controller"
require_relative "../controllers/public_controller"
require_relative "../routes/discourse_chat_integration"
diff --git a/plugins/discourse-chat-integration/app/routes/discourse.rb b/plugins/discourse-chat-integration/app/routes/discourse.rb
index 7b1ab9b846e..d9893dd599b 100644
--- a/plugins/discourse-chat-integration/app/routes/discourse.rb
+++ b/plugins/discourse-chat-integration/app/routes/discourse.rb
@@ -2,7 +2,7 @@
Discourse::Application.routes.append do
mount DiscourseChatIntegration::AdminEngine,
- at: "/admin/plugins/chat-integration",
+ at: "/admin/plugins/discourse-chat-integration",
constraints: AdminConstraint.new
mount DiscourseChatIntegration::PublicEngine, at: "/chat-transcript/", as: "chat-transcript"
mount DiscourseChatIntegration::Provider::HookEngine, at: "/chat-integration/"
diff --git a/plugins/discourse-chat-integration/app/routes/discourse_chat_integration.rb b/plugins/discourse-chat-integration/app/routes/discourse_chat_integration.rb
index b473af8a2c6..9577761aec1 100644
--- a/plugins/discourse-chat-integration/app/routes/discourse_chat_integration.rb
+++ b/plugins/discourse-chat-integration/app/routes/discourse_chat_integration.rb
@@ -6,6 +6,7 @@ module DiscourseChatIntegration
AdminEngine.routes.draw do
get "" => "chat#respond"
get "/providers" => "chat#list_providers"
+ get "/providers/:provider" => "chat#respond"
post "/test" => "chat#test"
get "/channels" => "chat#list_channels"
@@ -16,8 +17,6 @@ module DiscourseChatIntegration
post "/rules" => "chat#create_rule"
put "/rules/:id" => "chat#update_rule"
delete "/rules/:id" => "chat#destroy_rule"
-
- get "/:provider" => "chat#respond"
end
PublicEngine.routes.draw { get "/:secret" => "public#post_transcript" }
diff --git a/plugins/discourse-chat-integration/assets/javascripts/discourse/admin-chat-integration-plugin-route-map.js b/plugins/discourse-chat-integration/assets/javascripts/discourse/admin-chat-integration-plugin-route-map.js
new file mode 100644
index 00000000000..b9b0ae5fdf9
--- /dev/null
+++ b/plugins/discourse-chat-integration/assets/javascripts/discourse/admin-chat-integration-plugin-route-map.js
@@ -0,0 +1,13 @@
+export default {
+ resource: "admin.adminPlugins.show",
+ path: "/plugins",
+ map() {
+ this.route(
+ "discourse-chat-integration-providers",
+ { path: "providers" },
+ function () {
+ this.route("show", { path: "/:provider" });
+ }
+ );
+ },
+};
diff --git a/plugins/discourse-chat-integration/assets/javascripts/discourse/initializers/chat-integration-admin-plugin-configuration-nav.js b/plugins/discourse-chat-integration/assets/javascripts/discourse/initializers/chat-integration-admin-plugin-configuration-nav.js
index ee4c489072b..18c58470358 100644
--- a/plugins/discourse-chat-integration/assets/javascripts/discourse/initializers/chat-integration-admin-plugin-configuration-nav.js
+++ b/plugins/discourse-chat-integration/assets/javascripts/discourse/initializers/chat-integration-admin-plugin-configuration-nav.js
@@ -13,6 +13,13 @@ export default {
withPluginApi((api) => {
api.setAdminPluginIcon(PLUGIN_ID, "plug");
+ api.addAdminPluginConfigurationNav(PLUGIN_ID, [
+ {
+ label: "chat_integration.nav.providers",
+ route: "adminPlugins.show.discourse-chat-integration-providers",
+ description: "chat_integration.nav.providers_description",
+ },
+ ]);
});
},
};
diff --git a/plugins/discourse-chat-integration/assets/stylesheets/chat-integration.scss b/plugins/discourse-chat-integration/assets/stylesheets/chat-integration.scss
index 4ba03f71a58..3c95ac5c9d9 100644
--- a/plugins/discourse-chat-integration/assets/stylesheets/chat-integration.scss
+++ b/plugins/discourse-chat-integration/assets/stylesheets/chat-integration.scss
@@ -1,121 +1,189 @@
-#admin-plugin-chat {
- table {
- margin-top: 0;
+@use "lib/viewport";
- td:last-child {
- white-space: nowrap;
+#admin-plugin-chat-integration {
+ &.admin-detail {
+ padding-top: 0;
+ }
+
+ .admin-nav-submenu {
+ display: flex;
+ align-items: center;
+ gap: 1rem;
+ margin-top: var(--space-4);
+ border-bottom: 1px solid var(--content-border-color);
+
+ .chat-integration-add-provider-trigger {
+ margin-left: auto;
}
- td:not(:last-child) {
- width: 30%;
+ .nav-pills {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.5rem;
+ margin: 0;
}
}
- div.table-footer {
- margin-top: 10px;
+ .admin-config-area__header {
+ display: flex;
+ justify-content: flex-end;
+ margin-bottom: 1rem;
}
- div.error {
- font-size: 1.1em;
- font-weight: bold;
- max-width: 100%;
- margin-top: 10px;
- margin-bottom: 10px;
- background-color: var(--danger-low);
- padding: 15px;
+ .chat-integration-channel-list {
+ margin-top: var(--space-6);
}
- div.channel-details {
- margin-top: 20px;
- border: 1px solid var(--primary-low);
+ .chat-integration-error-banner {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ margin-bottom: 1rem;
- div.channel-header {
- background: var(--primary-low);
- padding: 10px;
- overflow: auto;
+ .d-icon {
+ font-size: var(--font-up-1);
+ }
+ }
+}
- .channel-title {
- font-size: 1.3em;
+.admin-config-area-card.channel-details {
+ margin-bottom: 1rem;
+ max-width: 100%;
+ box-sizing: border-box;
+
+ .admin-config-area-card__header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0.75rem 1rem;
+ background: var(--primary-very-low);
+ border-bottom: 1px solid var(--primary-low);
+
+ .channel-title {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ font-weight: 600;
+
+ .channel-error-btn {
+ padding: 0.25rem 0.5rem;
+ }
- .field-name {
- font-weight: bold;
- }
+ .field-name {
+ font-weight: bold;
}
}
+ }
- div.channel-footer {
- overflow: auto;
+ .admin-config-area-card__content {
+ padding: 0;
+ overflow-x: auto;
+
+ .channel-rules-table {
+ margin: 0;
+ width: 100%;
+ table-layout: fixed;
+
+ thead {
+ background: var(--primary-very-low);
+ }
+
+ th,
+ td {
+ padding: 0.75rem 1rem;
+ }
+
+ td:last-child {
+ white-space: nowrap;
+ text-align: right;
+ }
}
}
- .chat-integration-settings-button {
- margin-right: 10px;
+ .admin-config-area-card__footer {
+ @include viewport.from(md) {
+ padding-top: var(--space-3);
+ }
+ display: flex;
+ justify-content: flex-end;
}
}
-.admin-controls-chat-providers {
- margin-right: auto;
-}
+.chat-integration-modal {
+ .provider-name {
+ font-weight: 600;
+ }
+
+ .form-kit__container {
+ max-width: 100%;
+ }
-#chat-integration-edit-channel-modal,
-#chat_integration_test_modal,
-#chat-integration-edit-rule_modal {
- table {
+ .select-kit {
width: 100%;
+ }
+}
- tbody {
- border-top: none;
- }
+#chat_integration_error_modal {
+ pre {
+ max-width: 100%;
+ max-height: 400px;
+ overflow: auto;
+ background: var(--primary-very-low);
+ padding: 1rem;
+ border-radius: var(--d-border-radius);
+ font-size: var(--font-down-1);
+ }
+}
- tr {
- border: none;
- }
+.discourse-chat-integration-providers-empty-list {
+ margin-top: var(--space-6);
- tr.input td {
- padding-top: 10px;
+ .admin-config-area-empty-list__title {
+ font-size: var(--font-up-1);
+ font-weight: bold;
+ }
- &.label {
- width: 100px;
+ .chat-integration-providers-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.5rem;
+ margin-top: 1rem;
+ }
+}
- label {
- margin-bottom: 0;
- font-weight: bold;
- }
- }
- }
+.inline-channel-form {
+ background: var(--primary-very-low);
+ border: 1px solid var(--primary-low);
+ border-radius: var(--d-border-radius);
+ padding: 1rem;
- tr.chat-instructions label {
- color: var(--primary-medium);
- font-size: var(--font-down-1);
- margin-top: 0.5rem;
- }
+ .form-kit__container {
+ margin-bottom: 0;
}
- #channel-field {
- width: 200px;
- margin-bottom: 0;
- box-shadow: none;
+ .form-kit__container {
+ width: 100%;
}
- .tag-chooser {
- ul.select2-choices {
- border: none;
- background: none;
- }
- margin-bottom: 0;
- margin-top: 0;
+ .form-kit {
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
}
- .field-name {
- font-weight: bold;
+ &__fields {
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
+ width: 50%;
+
+ .form-kit__field {
+ margin-bottom: 0;
+ }
}
-}
-#chat_integration_error_modal {
- pre {
- max-width: 500px;
- max-height: 800px;
- overflow: scroll;
- background: var(--primary-low);
+ &__actions {
+ display: flex;
+ gap: 0.5rem;
}
}
diff --git a/plugins/discourse-chat-integration/config/locales/client.en.yml b/plugins/discourse-chat-integration/config/locales/client.en.yml
index 9a62d365b6b..572d1213b06 100644
--- a/plugins/discourse-chat-integration/config/locales/client.en.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.en.yml
@@ -8,16 +8,27 @@ en:
chat_integration:
menu_title: "Chat Integrations"
settings: "Settings"
- no_providers: "You need to enable some providers in the plugin settings"
+ nav:
+ providers: "Providers"
+ providers_description: "Configure chat provider integrations"
+ add_provider: "Add provider"
+ more_providers: "More"
+ empty_state:
+ title: "Connect your chat platform"
+ body: "Send notifications from Discourse to your team's chat. Choose a provider to get started."
+ channels_title: "Channels"
+ no_channels: "No channels have been configured yet."
+ channel_actions: "Channel actions"
+ add_first_channel: "Add your first %{provider} channel"
channels_with_errors: "Some channels for this provider failed last time messages were sent. Click the error icon(s) to learn more."
channel_exception: "An unknown error occurred when a message was last sent to this channel."
group_mention_template: "Mentions of: @%{name}"
group_message_template: "Messages to: @%{name}"
- choose_group: "(choose a group)"
- all_categories: "(all categories)"
- all_tags: "(all tags)"
- create_rule: "Create Rule"
- create_channel: "Create Channel"
+ choose_group: "(Choose a group)"
+ all_categories: "(All categories)"
+ all_tags: "(All tags)"
+ create_rule: "Create rule"
+ add_channel: "Add channel"
delete_channel: "Delete"
test_channel: "Test"
edit_channel: "Edit"
@@ -25,14 +36,14 @@ en:
test_modal:
title: "Send a test message"
topic: "Topic"
- send: "Send Test Message"
+ send: "Send test message"
close: "Close"
error: "An unknown error occurred while sending the message. Check the site logs for more information."
success: "Message sent successfully"
type:
normal: Normal
- group_message: Group Message
- group_mention: Group Mention
+ group_message: Group message
+ group_mention: Group mention
filter:
mute: 'Mute'
follow: 'First post only'
@@ -53,8 +64,9 @@ en:
ok: "Valid"
fail: "Invalid format"
edit_rule_modal:
- title: Edit Rule
- save: Save Rule
+ edit_title: Edit rule
+ create_title: Create rule
+ save: Save rule
cancel: Cancel
provider: Provider
type: Type
@@ -79,8 +91,9 @@ en:
param:
identifier:
title: Channel
- help: "e.g. #channel, @username."
+ help: "For example #channel or @username"
errors:
+ auth_error: "The provided authentication token is invalid"
action_prohibited: "The bot does not have permission to post to that channel"
channel_not_found: "The specified channel does not exist on Slack"
@@ -111,7 +124,7 @@ en:
help: "A name to describe the channel. It is not used for the connection to Discord."
webhook_url:
title: Webhook URL
- help: The webhook URL created in your Discord server settings
+ help: The webhook URL created in your Discord server settings, should be in the format of https://discord.com/api/webhooks/<webhook-id>/<webhook-token>
#######################################
########### GUILDED STRINGS ###########
@@ -134,7 +147,7 @@ en:
param:
identifier:
title: Channel
- help: "e.g. #channel, @username."
+ help: "For example #channel or @username"
errors:
channel_not_found: "The specified channel does not exist on Mattermost"
@@ -177,7 +190,7 @@ en:
param:
identifier:
title: Channel
- help: "e.g. #channel, @username."
+ help: "For example #channel or @username"
errors:
invalid_channel: "That channel does not exist on Rocket Chat"
@@ -189,7 +202,7 @@ en:
param:
name:
title: "Name"
- help: "A Gitter room's name e.g. gitterHQ/services."
+ help: "A Gitter room's name for example gitterHQ/services"
webhook_url:
title: "Webhook URL"
help: "The URL provided when you create a new integration in a Gitter room."
diff --git a/plugins/discourse-chat-integration/config/locales/server.en.yml b/plugins/discourse-chat-integration/config/locales/server.en.yml
index 5164e3a26e7..172f534ffd1 100644
--- a/plugins/discourse-chat-integration/config/locales/server.en.yml
+++ b/plugins/discourse-chat-integration/config/locales/server.en.yml
@@ -113,7 +113,7 @@ en:
dashboard:
problem:
- channel_errors: "Some chat integration channels have errors. Visit <a href='%{base_path}/admin/plugins/chat-integration'>the chat integration section</a> to find out more."
+ channel_errors: "Some chat integration channels have errors. Visit <a href='%{base_path}/admin/plugins/discourse-chat-integration'>the chat integration section</a> to find out more."
discourse_automation:
scriptables:
diff --git a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/slack/slack_provider.rb b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/slack/slack_provider.rb
index 386509aeecf..9f4fae4a9f2 100644
--- a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/slack/slack_provider.rb
+++ b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/slack/slack_provider.rb
@@ -181,6 +181,8 @@ module DiscourseChatIntegration::Provider::SlackProvider
unless response.kind_of? Net::HTTPSuccess
raise DiscourseChatIntegration::ProviderError.new info: {
+ error_key:
+ "chat_integration.provider.slack.errors.auth_error",
request: uri,
response_code: response.code,
response_body: response.body,
@@ -190,11 +192,14 @@ module DiscourseChatIntegration::Provider::SlackProvider
json = JSON.parse(response.body)
unless json["ok"] == true
- if json.key?("error") &&
- (json["error"] == ("channel_not_found") || json["error"] == ("is_archived"))
- error_key = "chat_integration.provider.slack.errors.channel_not_found"
- else
- error_key = nil
+ if json.key?("error")
+ if json["error"] == "channel_not_found" || json["error"] == "is_archived"
+ error_key = "chat_integration.provider.slack.errors.channel_not_found"
+ elsif json["error"] == "invalid_auth"
+ error_key = "chat_integration.provider.slack.errors.auth_error"
+ else
+ error_key = nil
+ end
end
raise DiscourseChatIntegration::ProviderError.new info: {
error_key: error_key,
diff --git a/plugins/discourse-chat-integration/plugin.rb b/plugins/discourse-chat-integration/plugin.rb
index 87c7e07f324..62b869f8896 100644
--- a/plugins/discourse-chat-integration/plugin.rb
+++ b/plugins/discourse-chat-integration/plugin.rb
@@ -51,7 +51,9 @@ after_initialize do
Jobs.enqueue_in(time, :notify_chats, post_id: post.id)
end
- add_admin_route "chat_integration.menu_title", "chat-integration"
+ add_admin_route "chat_integration.menu_title",
+ "discourse-chat-integration",
+ use_new_show_route: true
DiscourseChatIntegration::Provider.mount_engines
@@ -126,7 +128,7 @@ after_initialize do
)
provider = DiscourseChatIntegration::Provider.get_by_name(provider)
- channel = provider.get_channel_by_name(channel_name) # user must have created a channel in /admin/plugins/chat-integration/<provider> page
+ channel = provider.get_channel_by_name(channel_name)
if channel.nil?
Rails.logger.warn "[discourse-automation] Channel not found. Automation ID: #{automation.id}"
diff --git a/plugins/discourse-chat-integration/spec/requests/chat_controller_spec.rb b/plugins/discourse-chat-integration/spec/requests/chat_controller_spec.rb
index 3dc02338b4f..f1096bee7c7 100644
--- a/plugins/discourse-chat-integration/spec/requests/chat_controller_spec.rb
+++ b/plugins/discourse-chat-integration/spec/requests/chat_controller_spec.rb
@@ -33,13 +33,15 @@ RSpec.describe "Chat Controller", type: :request do
end
describe "listing providers" do
- include_examples "admin constraints", "get", "/admin/plugins/chat-integration/providers.json"
+ include_examples "admin constraints",
+ "get",
+ "/admin/plugins/discourse-chat-integration/providers.json"
context "when signed in as an admin" do
before { sign_in(admin) }
it "should return the right response" do
- get "/admin/plugins/chat-integration/providers.json"
+ get "/admin/plugins/discourse-chat-integration/providers.json"
expect(response.status).to eq(200)
@@ -57,13 +59,15 @@ RSpec.describe "Chat Controller", type: :request do
end
describe "testing channels" do
- include_examples "admin constraints", "get", "/admin/plugins/chat-integration/test.json"
+ include_examples "admin constraints",
+ "get",
+ "/admin/plugins/discourse-chat-integration/test.json"
context "when signed in as an admin" do
before { sign_in(admin) }
it "should return the right response" do
- post "/admin/plugins/chat-integration/test.json",
+ post "/admin/plugins/discourse-chat-integration/test.json",
params: {
channel_id: channel.id,
topic_id: topic.id,
@@ -73,7 +77,7 @@ RSpec.describe "Chat Controller", type: :request do
end
it "should fail for invalid channel" do
- post "/admin/plugins/chat-integration/test.json",
+ post "/admin/plugins/discourse-chat-integration/test.json",
params: {
channel_id: 999,
topic_id: topic.id,
@@ -85,7 +89,9 @@ RSpec.describe "Chat Controller", type: :request do
end
describe "viewing channels" do
- include_examples "admin constraints", "get", "/admin/plugins/chat-integration/channels.json"
+ include_examples "admin constraints",
+ "get",
+ "/admin/plugins/discourse-chat-integration/channels.json"
context "when signed in as an admin" do
before { sign_in(admin) }
@@ -99,7 +105,7 @@ RSpec.describe "Chat Controller", type: :request do
tags: [tag.name],
)
- get "/admin/plugins/chat-integration/channels.json", params: { provider: "dummy" }
+ get "/admin/plugins/discourse-chat-integration/channels.json", params: { provider: "dummy" }
expect(response.status).to eq(200)
@@ -130,20 +136,25 @@ RSpec.describe "Chat Controller", type: :request do
end
it "should fail for invalid provider" do
- get "/admin/plugins/chat-integration/channels.json", params: { provider: "someprovider" }
+ get "/admin/plugins/discourse-chat-integration/channels.json",
+ params: {
+ provider: "someprovider",
+ }
expect(response.status).to eq(400)
end
end
end
describe "adding a channel" do
- include_examples "admin constraints", "post", "/admin/plugins/chat-integration/channels.json"
+ include_examples "admin constraints",
+ "post",
+ "/admin/plugins/discourse-chat-integration/channels.json"
context "as an admin" do
before { sign_in(admin) }
it "should be able to add a new channel" do
- post "/admin/plugins/chat-integration/channels.json",
+ post "/admin/plugins/discourse-chat-integration/channels.json",
params: {
channel: {
provider: "dummy",
@@ -160,7 +171,7 @@ RSpec.describe "Chat Controller", type: :request do
end
it "should fail for invalid params" do
- post "/admin/plugins/chat-integration/channels.json",
+ post "/admin/plugins/discourse-chat-integration/channels.json",
params: {
channel: {
provider: "dummy2",
@@ -180,13 +191,15 @@ RSpec.describe "Chat Controller", type: :request do
DiscourseChatIntegration::Channel.create(provider: "dummy2", data: { val: "something" })
end
- include_examples "admin constraints", "put", "/admin/plugins/chat-integration/channels/1.json"
+ include_examples "admin constraints",
+ "put",
+ "/admin/plugins/discourse-chat-integration/channels/1.json"
context "as an admin" do
before { sign_in(admin) }
it "should be able update a channel" do
- put "/admin/plugins/chat-integration/channels/#{channel.id}.json",
+ put "/admin/plugins/discourse-chat-integration/channels/#{channel.id}.json",
params: {
channel: {
data: {
@@ -202,7 +215,7 @@ RSpec.describe "Chat Controller", type: :request do
end
it "should fail for invalid params" do
- put "/admin/plugins/chat-integration/channels/#{channel.id}.json",
+ put "/admin/plugins/discourse-chat-integration/channels/#{channel.id}.json",
params: {
channel: {
data: {
@@ -221,13 +234,13 @@ RSpec.describe "Chat Controller", type: :request do
include_examples "admin constraints",
"delete",
- "/admin/plugins/chat-integration/channels/1.json"
+ "/admin/plugins/discourse-chat-integration/channels/1.json"
context "as an admin" do
before { sign_in(admin) }
it "should be able delete a channel" do
- delete "/admin/plugins/chat-integration/channels/#{channel.id}.json"
+ delete "/admin/plugins/discourse-chat-integration/channels/#{channel.id}.json"
expect(response.status).to eq(200)
expect(DiscourseChatIntegration::Channel.all.size).to eq(0)
@@ -236,13 +249,15 @@ RSpec.describe "Chat Controller", type: :request do
end
describe "adding a rule" do
- include_examples "admin constraints", "put", "/admin/plugins/chat-integration/rules.json"
+ include_examples "admin constraints",
+ "put",
+ "/admin/plugins/discourse-chat-integration/rules.json"
context "as an admin" do
before { sign_in(admin) }
it "should be able to add a new rule" do
- post "/admin/plugins/chat-integration/rules.json",
+ post "/admin/plugins/discourse-chat-integration/rules.json",
params: {
rule: {
channel_id: channel.id,
@@ -263,7 +278,7 @@ RSpec.describe "Chat Controller", type: :request do
end
it "should fail for invalid params" do
- post "/admin/plugins/chat-integration/rules.json",
+ post "/admin/plugins/discourse-chat-integration/rules.json",
params: {
rule: {
channel_id: channel.id,
@@ -288,13 +303,15 @@ RSpec.describe "Chat Controller", type: :request do
)
end
- include_examples "admin constraints", "put", "/admin/plugins/chat-integration/rules/1.json"
+ include_examples "admin constraints",
+ "put",
+ "/admin/plugins/discourse-chat-integration/rules/1.json"
context "as an admin" do
before { sign_in(admin) }
it "should be able update a rule" do
- put "/admin/plugins/chat-integration/rules/#{rule.id}.json",
+ put "/admin/plugins/discourse-chat-integration/rules/#{rule.id}.json",
params: {
rule: {
channel_id: channel.id,
@@ -311,7 +328,7 @@ RSpec.describe "Chat Controller", type: :request do
end
it "should fail for invalid params" do
- put "/admin/plugins/chat-integration/rules/#{rule.id}.json",
+ put "/admin/plugins/discourse-chat-integration/rules/#{rule.id}.json",
params: {
rule: {
channel_id: channel.id,
@@ -336,13 +353,15 @@ RSpec.describe "Chat Controller", type: :request do
)
end
- include_examples "admin constraints", "delete", "/admin/plugins/chat-integration/rules/1.json"
+ include_examples "admin constraints",
+ "delete",
+ "/admin/plugins/discourse-chat-integration/rules/1.json"
context "as an admin" do
before { sign_in(admin) }
it "should be able delete a rule" do
- delete "/admin/plugins/chat-integration/rules/#{rule.id}.json"
+ delete "/admin/plugins/discourse-chat-integration/rules/#{rule.id}.json"
expect(response.status).to eq(200)
expect(DiscourseChatIntegration::Rule.all.size).to eq(0)
diff --git a/plugins/discourse-chat-integration/spec/services/problem_check/channel_errors_spec.rb b/plugins/discourse-chat-integration/spec/services/problem_check/channel_errors_spec.rb
index 00e463a64aa..64458b6d0c8 100644
--- a/plugins/discourse-chat-integration/spec/services/problem_check/channel_errors_spec.rb
+++ b/plugins/discourse-chat-integration/spec/services/problem_check/channel_errors_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe ProblemCheck::ChannelErrors do
it do
expect(check).to have_a_problem.with_priority("low").with_message(
- "Some chat integration channels have errors. Visit <a href='/admin/plugins/chat-integration'>the chat integration section</a> to find out more.",
+ "Some chat integration channels have errors. Visit <a href='/admin/plugins/discourse-chat-integration'>the chat integration section</a> to find out more.",
)
end
end
diff --git a/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb b/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb
index af3721dc100..9f4c81a2e20 100644
--- a/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb
+++ b/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb
@@ -18,18 +18,22 @@ RSpec.describe "Create channel" do
end
it "creates and displays a new channel" do
- visit("/admin/plugins/chat-integration/discord")
+ visit("/admin/plugins/discourse-chat-integration/providers/discord")
expect(page).to have_no_css(".channel-details")
- click_button(I18n.t("js.chat_integration.create_channel"))
+ find("#create-channel").click if page.has_css?("#create-channel", wait: 0)
- find("input[name='param-name']").fill_in(with: "bloop")
- find("input[name='param-webhook_url']").fill_in(with: "https://discord.com/api/webhooks/bloop")
- click_button(I18n.t("js.chat_integration.edit_channel_modal.save"))
+ expect(page).to have_css(".inline-channel-form")
+
+ find(".form-kit__field[data-name='name'] input").fill_in(with: "bloop")
+ find(".form-kit__field[data-name='webhook_url'] input").fill_in(
+ with: "https://discord.com/api/webhooks/bloop",
+ )
+ find(".inline-channel-form .btn-primary").click
expect(page).to have_css(".channel-details")
- expect(find(".channel-info")).to have_content("bloop")
+ expect(find(".channel-details")).to have_content("bloop")
end
it "shows the error in the channel modal" do
@@ -44,9 +48,9 @@ RSpec.describe "Create channel" do
)
manager.trigger_notifications(first_post.id)
- visit("/admin/plugins/chat-integration/dummy")
+ visit("/admin/plugins/discourse-chat-integration/providers/dummy")
- expect(find(".error-message")).to have_content(
+ expect(find(".chat-integration-error-banner")).to have_content(
I18n.t("js.chat_integration.channels_with_errors"),
)
find(".channel-title").find("button").click
diff --git a/plugins/discourse-chat-integration/spec/system/provider_nav_spec.rb b/plugins/discourse-chat-integration/spec/system/provider_nav_spec.rb
index 263c3641e44..61062733e67 100644
--- a/plugins/discourse-chat-integration/spec/system/provider_nav_spec.rb
+++ b/plugins/discourse-chat-integration/spec/system/provider_nav_spec.rb
@@ -11,15 +11,15 @@ RSpec.describe "Provider navigation" do
end
it "only marks the current provider's nav pill as active" do
- visit("/admin/plugins/chat-integration/telegram")
+ visit("/admin/plugins/discourse-chat-integration/providers/telegram")
expect(page).to have_css(
- ".admin-controls-chat-providers li.active",
+ ".admin-nav-submenu li.active",
count: 1,
text: I18n.t("js.chat_integration.provider.telegram.title"),
)
expect(page).to have_css(
- ".admin-controls-chat-providers li:not(.active)",
+ ".admin-nav-submenu li:not(.active)",
count: 1,
text: I18n.t("js.chat_integration.provider.discord.title"),
)
diff --git a/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb b/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb
index dc9f14bbeb4..90f43e01b7f 100644
--- a/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb
+++ b/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb
@@ -33,9 +33,9 @@ RSpec.describe "Chat Integration Rule Tags" do
tags: ["support"],
)
- visit("/admin/plugins/chat-integration/discord")
+ visit("/admin/plugins/discourse-chat-integration/providers/discord")
- within(".channel-details table tbody tr") do
+ within(".d-table.channel-rules-table .d-table__row") do
expect(page).to have_content("support")
find(".edit").click
end
@@ -49,6 +49,7 @@ RSpec.describe "Chat Integration Rule Tags" do
expect(tag_chooser.component).to have_content("support")
expect(tag_chooser.component).to have_content("bug")
+ tag_chooser.collapse
find("#save-rule").click
expect(rule_modal).to be_closed
diff --git a/plugins/discourse-chat-integration/test/javascripts/acceptance/chat-integration-test.js b/plugins/discourse-chat-integration/test/javascripts/acceptance/chat-integration-test.js
index 0120616fb81..097769aeb58 100755
--- a/plugins/discourse-chat-integration/test/javascripts/acceptance/chat-integration-test.js
+++ b/plugins/discourse-chat-integration/test/javascripts/acceptance/chat-integration-test.js
@@ -1,4 +1,4 @@
-import { click, fillIn, triggerEvent, visit } from "@ember/test-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
@@ -14,7 +14,17 @@ acceptance("Chat Integration", function (needs) {
needs.user();
needs.pretender((server) => {
- server.get("/admin/plugins/chat-integration/providers", () => {
+ server.get("/admin/plugins/discourse-chat-integration.json", () => {
+ return jsonResponse({
+ id: "discourse-chat-integration",
+ name: "discourse-chat-integration",
+ about: "Test plugin",
+ version: "1.0.0",
+ enabled: true,
+ });
+ });
+
+ server.get("/admin/plugins/discourse-chat-integration/providers", () => {
return jsonResponse({
providers: [
{
@@ -26,7 +36,7 @@ acceptance("Chat Integration", function (needs) {
});
});
- server.get("/admin/plugins/chat-integration/channels", () => {
+ server.get("/admin/plugins/discourse-chat-integration/channels", () => {
return jsonResponse({
channels: [
{
@@ -50,31 +60,34 @@ acceptance("Chat Integration", function (needs) {
});
});
- server.post("/admin/plugins/chat-integration/channels", () => {
+ server.post("/admin/plugins/discourse-chat-integration/channels", () => {
return response({});
});
- server.put("/admin/plugins/chat-integration/channels/:id", () => {
+ server.put("/admin/plugins/discourse-chat-integration/channels/:id", () => {
return response({});
});
- server.delete("/admin/plugins/chat-integration/channels/:id", () => {
- return response({});
- });
+ server.delete(
+ "/admin/plugins/discourse-chat-integration/channels/:id",
+ () => {
+ return response({});
+ }
+ );
- server.post("/admin/plugins/chat-integration/rules", () => {
+ server.post("/admin/plugins/discourse-chat-integration/rules", () => {
return response({});
});
- server.put("/admin/plugins/chat-integration/rules/:id", () => {
+ server.put("/admin/plugins/discourse-chat-integration/rules/:id", () => {
return response({});
});
- server.delete("/admin/plugins/chat-integration/rules/:id", () => {
+ server.delete("/admin/plugins/discourse-chat-integration/rules/:id", () => {
return response({});
});
- server.post("/admin/plugins/chat-integration/test", () => {
+ server.post("/admin/plugins/discourse-chat-integration/test", () => {
return response({});
});
@@ -84,105 +97,94 @@ acceptance("Chat Integration", function (needs) {
});
test("Rules load successfully", async function (assert) {
- await visit("/admin/plugins/chat-integration");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
assert
- .dom("#admin-plugin-chat table")
+ .dom("#admin-plugin-chat-integration .d-table")
.exists("it shows the table of rules");
assert
- .dom("#admin-plugin-chat table tr td")
- .hasText("All posts and replies", "rule displayed");
+ .dom(
+ "#admin-plugin-chat-integration .d-table .d-table__cell.--overview.rule-filter"
+ )
+ .hasText(/All posts and replies/, "rule displayed");
});
test("Create channel works", async function (assert) {
- await visit("/admin/plugins/chat-integration");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
await click("#create-channel");
- assert
- .dom("#chat-integration-edit-channel-modal")
- .exists("it displays the modal");
- assert.dom("#save-channel").isDisabled();
-
- await fillIn("#chat-integration-edit-channel-modal input", "#general");
+ assert.dom(".inline-channel-form").exists("it displays the inline form");
- assert.dom("#save-channel").isEnabled();
+ await fillIn(".inline-channel-form input", "#general");
- await click("#save-channel");
+ await click(".inline-channel-form .btn-primary");
- assert
- .dom("#chat-integration-edit-channel-modal")
- .doesNotExist("modal closes on save");
+ assert.dom(".inline-channel-form").doesNotExist("form closes on save");
});
test("Edit channel works", async function (assert) {
- await visit("/admin/plugins/chat-integration");
- await click(".channel-header button");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
- assert
- .dom("#chat-integration-edit-channel-modal")
- .exists("it displays the modal");
- assert.dom("#save-channel").isEnabled();
+ // Open the channel actions dropdown menu
+ await click(".channel-header .fk-d-menu__trigger");
+ await click(".edit-channel");
- await fillIn("#chat-integration-edit-channel-modal input", " general");
- assert.dom("#save-channel").isDisabled();
+ assert.dom(".inline-channel-form").exists("it displays the inline form");
- await fillIn("#chat-integration-edit-channel-modal input", "#random");
- assert.dom("#save-channel").isEnabled();
+ await fillIn(".inline-channel-form input", "#random");
- // Press enter
- await triggerEvent("#chat-integration-edit-channel-modal", "submit");
+ await click(".inline-channel-form .btn-primary");
assert
- .dom("#chat-integration-edit-channel-modal")
- .doesNotExist("modal saves on enter");
+ .dom(".channel-title .inline-channel-form")
+ .doesNotExist("form closes on save");
});
test("Create rule works", async function (assert) {
- await visit("/admin/plugins/chat-integration");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
assert.dom(".channel-footer button").exists("create button is displayed");
await click(".channel-footer button");
assert
- .dom("#chat-integration-edit-rule_modal")
+ .dom("#chat-integration-edit-rule-modal")
.exists("modal opens on edit");
assert.dom("#save-rule").isEnabled();
await click("#save-rule");
assert
- .dom("#chat-integration-edit-rule_modal")
+ .dom("#chat-integration-edit-rule-modal")
.doesNotExist("modal closes on save");
});
test("Edit rule works", async function (assert) {
- await visit("/admin/plugins/chat-integration");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
assert.dom(".edit").exists("edit button is displayed");
await click(".edit");
assert
- .dom("#chat-integration-edit-rule_modal")
+ .dom("#chat-integration-edit-rule-modal")
.exists("modal opens on edit");
assert.dom("#save-rule").isEnabled();
await click("#save-rule");
assert
- .dom("#chat-integration-edit-rule_modal")
+ .dom("#chat-integration-edit-rule-modal")
.doesNotExist("modal closes on save");
});
test("Delete channel works", async function (assert) {
- await visit("/admin/plugins/chat-integration");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
- assert
- .dom(".channel-header .delete-channel")
- .exists("delete buttons exists");
- await click(".channel-header .delete-channel");
+ // Open the channel actions dropdown menu and click delete
+ await click(".channel-header .fk-d-menu__trigger");
+ await click(".delete-channel");
assert.dom("div.dialog-content").exists("dialog is displayed");
await click("div.dialog-content .btn-danger");
@@ -191,32 +193,34 @@ acceptance("Chat Integration", function (needs) {
});
test("Delete rule works", async function (assert) {
- await visit("/admin/plugins/chat-integration");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
assert.dom(".delete").exists();
await click(".delete");
});
test("Test channel works", async function (assert) {
- await visit("/admin/plugins/chat-integration");
+ await visit("/admin/plugins/discourse-chat-integration/providers/dummy");
- await click(".btn-chat-test");
+ // Open the channel actions dropdown menu and click test
+ await click(".channel-header .fk-d-menu__trigger");
+ await click(".test-channel");
- assert.dom("#chat_integration_test_modal").exists("it displays the modal");
+ assert.dom("#chat-integration-test-modal").exists("it displays the modal");
assert.dom("#send-test").isDisabled();
await fillIn("#choose-topic-title", "9318");
- await click("#chat_integration_test_modal .radio");
+ await click("#chat-integration-test-modal .radio");
assert.dom("#send-test").isEnabled();
await click("#send-test");
assert
- .dom("#chat_integration_test_modal")
+ .dom("#chat-integration-test-modal")
.exists("modal doesn't close on send");
assert
- .dom("#modal-alert.alert-success")
+ .dom("#chat-integration-test-modal .alert-success")
.exists("success message displayed");
});
});