diff --git a/Gemfile.lock b/Gemfile.lock index a1aec6e8a..90ea5777d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,30 +14,31 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - ast (2.4.2) - base64 (0.2.0) - benchmark (0.4.0) - bigdecimal (3.1.9) + ast (2.4.3) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.2) concurrent-ruby (1.3.5) - connection_pool (2.5.0) - drb (2.2.1) + connection_pool (2.5.3) + drb (2.2.3) i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.10.2) - language_server-protocol (3.17.0.4) + json (2.12.2) + language_server-protocol (3.17.0.5) lint_roller (1.1.0) - logger (1.6.6) + logger (1.7.0) minitest (5.25.5) - parallel (1.26.3) - parser (3.3.7.1) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) racc prettier_print (1.2.1) + prism (1.4.0) racc (1.8.1) - rack (3.1.14) + rack (3.1.16) rainbow (3.1.1) regexp_parser (2.10.0) - rubocop (1.74.0) + rubocop (1.77.0) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -45,11 +46,12 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.38.0, < 2.0) + rubocop-ast (>= 1.45.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.38.1) - parser (>= 3.3.1.0) + rubocop-ast (1.45.1) + parser (>= 3.3.7.2) + prism (~> 1.4) rubocop-capybara (2.22.1) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -65,13 +67,13 @@ GEM rubocop-factory_bot (2.27.1) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) - rubocop-rails (2.30.3) + rubocop-rails (2.32.0) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.72.1, < 2.0) - rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rspec (3.5.0) + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) + rubocop-rspec (3.6.0) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec_rails (2.31.0) diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/edit.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/edit.gjs new file mode 100644 index 000000000..803c27259 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/edit.gjs @@ -0,0 +1,11 @@ +import RouteTemplate from "ember-route-template"; +import AiEmbeddingsListEditor from "../../../../../discourse/components/ai-embeddings-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/edit.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/edit.hbs deleted file mode 100644 index 8ec8776fa..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/edit.hbs +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/index.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/index.gjs new file mode 100644 index 000000000..3c98b782d --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/index.gjs @@ -0,0 +1,8 @@ +import RouteTemplate from "ember-route-template"; +import AiEmbeddingsListEditor from "../../../../../discourse/components/ai-embeddings-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/index.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/index.hbs deleted file mode 100644 index 8226d03c4..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/index.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/new.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/new.gjs new file mode 100644 index 000000000..803c27259 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/new.gjs @@ -0,0 +1,11 @@ +import RouteTemplate from "ember-route-template"; +import AiEmbeddingsListEditor from "../../../../../discourse/components/ai-embeddings-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/new.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/new.hbs deleted file mode 100644 index 8ec8776fa..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/new.hbs +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/index.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/index.gjs new file mode 100644 index 000000000..b71919e17 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/index.gjs @@ -0,0 +1,6 @@ +import RouteTemplate from "ember-route-template"; +import AiFeatures from "../../../../../discourse/components/ai-features"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/index.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/index.hbs deleted file mode 100644 index d0193ebed..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/index.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/edit.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/edit.gjs new file mode 100644 index 000000000..05f97a9ca --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/edit.gjs @@ -0,0 +1,11 @@ +import RouteTemplate from "ember-route-template"; +import AiLlmsListEditor from "../../../../../discourse/components/ai-llms-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/edit.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/edit.hbs deleted file mode 100644 index 77f3b0f31..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/edit.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/index.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/index.gjs new file mode 100644 index 000000000..3eb7805ea --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/index.gjs @@ -0,0 +1,6 @@ +import RouteTemplate from "ember-route-template"; +import AiLlmsListEditor from "../../../../../discourse/components/ai-llms-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/index.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/index.hbs deleted file mode 100644 index e1ab7f35c..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/index.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/new.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/new.gjs new file mode 100644 index 000000000..30a4d7861 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/new.gjs @@ -0,0 +1,12 @@ +import RouteTemplate from "ember-route-template"; +import AiLlmsListEditor from "../../../../../discourse/components/ai-llms-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/new.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/new.hbs deleted file mode 100644 index cfc02f05f..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/new.hbs +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/edit.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/edit.gjs new file mode 100644 index 000000000..5f0b877e0 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/edit.gjs @@ -0,0 +1,11 @@ +import RouteTemplate from "ember-route-template"; +import AiPersonaListEditor from "../../../../../discourse/components/ai-persona-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/edit.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/edit.hbs deleted file mode 100644 index a3173af47..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/edit.hbs +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/index.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/index.gjs new file mode 100644 index 000000000..c70dbb0c5 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/index.gjs @@ -0,0 +1,6 @@ +import RouteTemplate from "ember-route-template"; +import AiPersonaListEditor from "../../../../../discourse/components/ai-persona-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/index.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/index.hbs deleted file mode 100644 index 74bb45817..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/index.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/new.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/new.gjs new file mode 100644 index 000000000..5f0b877e0 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/new.gjs @@ -0,0 +1,11 @@ +import RouteTemplate from "ember-route-template"; +import AiPersonaListEditor from "../../../../../discourse/components/ai-persona-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/new.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/new.hbs deleted file mode 100644 index a3173af47..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/new.hbs +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-spam.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-spam.gjs new file mode 100644 index 000000000..52a959793 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-spam.gjs @@ -0,0 +1,6 @@ +import RouteTemplate from "ember-route-template"; +import AiSpam from "../../../../discourse/components/ai-spam"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-spam.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-spam.hbs deleted file mode 100644 index f9946ef94..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-spam.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/edit.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/edit.gjs new file mode 100644 index 000000000..e6f29cda7 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/edit.gjs @@ -0,0 +1,16 @@ +import RouteTemplate from "ember-route-template"; +import AiToolEditor from "../../../../../discourse/components/ai-tool-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/edit.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/edit.hbs deleted file mode 100644 index 444f69663..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/edit.hbs +++ /dev/null @@ -1,9 +0,0 @@ -
- -
\ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/index.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/index.gjs new file mode 100644 index 000000000..1b21d706a --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/index.gjs @@ -0,0 +1,6 @@ +import RouteTemplate from "ember-route-template"; +import AiToolListEditor from "../../../../../discourse/components/ai-tool-list-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/index.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/index.hbs deleted file mode 100644 index 1b0dbe812..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/index.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.gjs new file mode 100644 index 000000000..36a01778b --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.gjs @@ -0,0 +1,17 @@ +import RouteTemplate from "ember-route-template"; +import AiToolEditor from "../../../../../discourse/components/ai-tool-editor"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs deleted file mode 100644 index cc036e766..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs +++ /dev/null @@ -1,10 +0,0 @@ -
- -
\ No newline at end of file diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-usage.gjs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-usage.gjs new file mode 100644 index 000000000..668f1c318 --- /dev/null +++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-usage.gjs @@ -0,0 +1,6 @@ +import RouteTemplate from "ember-route-template"; +import AiUsage from "../../../../discourse/components/ai-usage"; + +export default RouteTemplate( + +); diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-usage.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-usage.hbs deleted file mode 100644 index e1592fc9f..000000000 --- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-usage.hbs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/javascripts/discourse/components/admin-report-emotion.gjs b/assets/javascripts/discourse/components/admin-report-emotion.gjs new file mode 100644 index 000000000..d131707eb --- /dev/null +++ b/assets/javascripts/discourse/components/admin-report-emotion.gjs @@ -0,0 +1,89 @@ +import Component from "@ember/component"; +import { attributeBindings, classNames } from "@ember-decorators/component"; +import icon from "discourse/helpers/d-icon"; +import number from "discourse/helpers/number"; +import getURL from "discourse/lib/get-url"; + +@classNames("admin-report-counters") +@attributeBindings("model.description:title") +export default class AdminReportEmotion extends Component { + get todayLink() { + let date = moment().format("YYYY-MM-DD"); + return this._filterURL(date); + } + + get yesterdayLink() { + let date = moment().subtract(1, "day").format("YYYY-MM-DD"); + return this._filterURL(date); + } + + get lastSevenDaysLink() { + let date = moment().subtract(1, "week").format("YYYY-MM-DD"); + return this._filterURL(date); + } + + get lastThirtyDaysLink() { + let date = moment().subtract(1, "month").format("YYYY-MM-DD"); + return this._filterURL(date); + } + + _baseFilter() { + return "/filter?q=activity-after%3A"; + } + + _model() { + return "%20order%3A" + this.model.type; + } + + _filterURL(date) { + return getURL(`${this._baseFilter()}${date}${this._model()}`); + } + + +} diff --git a/assets/javascripts/discourse/components/admin-report-emotion.hbs b/assets/javascripts/discourse/components/admin-report-emotion.hbs deleted file mode 100644 index 08298b7ce..000000000 --- a/assets/javascripts/discourse/components/admin-report-emotion.hbs +++ /dev/null @@ -1,45 +0,0 @@ -
- {{#if this.model.icon}} - {{d-icon this.model.icon}} - {{/if}} - {{this.model.title}} -
- - - -
- - {{number this.model.yesterdayCount}} - - {{d-icon this.model.yesterdayTrendIcon}} -
- -
- - {{number this.model.lastSevenDaysCount}} - - {{d-icon this.model.sevenDaysTrendIcon}} -
- -
- - - {{number this.model.lastThirtyDaysCount}} - - {{#if this.model.canDisplayTrendIcon}} - {{d-icon this.model.thirtyDaysTrendIcon}} - {{/if}} -
\ No newline at end of file diff --git a/assets/javascripts/discourse/components/admin-report-emotion.js b/assets/javascripts/discourse/components/admin-report-emotion.js deleted file mode 100644 index 7d7cccc1c..000000000 --- a/assets/javascripts/discourse/components/admin-report-emotion.js +++ /dev/null @@ -1,39 +0,0 @@ -import Component from "@ember/component"; -import { attributeBindings, classNames } from "@ember-decorators/component"; -import getURL from "discourse/lib/get-url"; - -@classNames("admin-report-counters") -@attributeBindings("model.description:title") -export default class AdminReportEmotion extends Component { - get todayLink() { - let date = moment().format("YYYY-MM-DD"); - return this._filterURL(date); - } - - get yesterdayLink() { - let date = moment().subtract(1, "day").format("YYYY-MM-DD"); - return this._filterURL(date); - } - - get lastSevenDaysLink() { - let date = moment().subtract(1, "week").format("YYYY-MM-DD"); - return this._filterURL(date); - } - - get lastThirtyDaysLink() { - let date = moment().subtract(1, "month").format("YYYY-MM-DD"); - return this._filterURL(date); - } - - _baseFilter() { - return "/filter?q=activity-after%3A"; - } - - _model() { - return "%20order%3A" + this.model.type; - } - - _filterURL(date) { - return getURL(`${this._baseFilter()}${date}${this._model()}`); - } -} diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs index 2623f685a..2bd2776c8 100644 --- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs +++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs @@ -12,7 +12,7 @@ import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav" import PostList from "discourse/components/post-list"; import bodyClass from "discourse/helpers/body-class"; import categoryBadge from "discourse/helpers/category-badge"; -import dIcon from "discourse/helpers/d-icon"; +import icon from "discourse/helpers/d-icon"; import replaceEmoji from "discourse/helpers/replace-emoji"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; @@ -440,7 +440,7 @@ export default class AdminReportSentimentAnalysis extends Component { class="admin-report-sentiment-analysis-details__post-score" data-sentiment-score={{sentiment.id}} > - {{dIcon sentiment.icon}} + {{icon sentiment.icon}} {{sentiment.text}} {{/let}} diff --git a/assets/javascripts/discourse/components/ai-bot-conversations.gjs b/assets/javascripts/discourse/components/ai-bot-conversations.gjs index 1d859a4c1..5b255468c 100644 --- a/assets/javascripts/discourse/components/ai-bot-conversations.gjs +++ b/assets/javascripts/discourse/components/ai-bot-conversations.gjs @@ -1,6 +1,6 @@ import { tracked } from "@glimmer/tracking"; import Component from "@ember/component"; -import { fn, hash } from "@ember/helper"; +import { fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; import { getOwner } from "@ember/owner"; @@ -12,6 +12,7 @@ import $ from "jquery"; import DButton from "discourse/components/d-button"; import PluginOutlet from "discourse/components/plugin-outlet"; import bodyClass from "discourse/helpers/body-class"; +import lazyHash from "discourse/helpers/lazy-hash"; import { popupAjaxError } from "discourse/lib/ajax-error"; import userAutocomplete from "discourse/lib/autocomplete/user"; import { setupHashtagAutocomplete } from "discourse/lib/hashtag-autocomplete"; @@ -300,7 +301,7 @@ export default class AiBotConversations extends Component { {{#each this.errors as |e|}}
- {{dIcon "triangle-exclamation"}} + {{icon "triangle-exclamation"}}

{{e.message}}

<:trigger> - {{dIcon "circle-info"}} + {{icon "circle-info"}} <:content> {{i18n "summary.model_used" model=this.summarizedBy}} diff --git a/assets/javascripts/discourse/components/model-accuracies.gjs b/assets/javascripts/discourse/components/model-accuracies.gjs new file mode 100644 index 000000000..5ba188d09 --- /dev/null +++ b/assets/javascripts/discourse/components/model-accuracies.gjs @@ -0,0 +1,20 @@ +import { i18n } from "discourse-i18n"; + +const ModelAccuracies = ; + +export default ModelAccuracies; diff --git a/assets/javascripts/discourse/components/model-accuracies.hbs b/assets/javascripts/discourse/components/model-accuracies.hbs deleted file mode 100644 index e2dc68a08..000000000 --- a/assets/javascripts/discourse/components/model-accuracies.hbs +++ /dev/null @@ -1,14 +0,0 @@ -{{#if @accuracies}} - - - {{#each-in @accuracies as |model acc|}} - - - - - - - {{/each-in}} - -
{{i18n "discourse_ai.reviewables.model_used"}}{{model}}{{i18n "discourse_ai.reviewables.accuracy"}}{{acc}}%
-{{/if}} \ No newline at end of file diff --git a/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs b/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs new file mode 100644 index 000000000..1c0b97ea5 --- /dev/null +++ b/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs @@ -0,0 +1,60 @@ +import Component from "@glimmer/component"; +import { array } from "@ember/helper"; +import { LinkTo } from "@ember/routing"; +import { or } from "truth-helpers"; +import ReviewableCreatedBy from "discourse/components/reviewable-created-by"; +import ReviewablePostHeader from "discourse/components/reviewable-post-header"; +import htmlSafe from "discourse/helpers/html-safe"; +import ChatChannelTitle from "discourse/plugins/chat/discourse/components/chat-channel-title"; +import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel"; +import ModelAccuracies from "./model-accuracies"; + +export default class ReviewableAiChatMessage extends Component { + get chatChannel() { + if (!this.args.reviewable.chat_channel) { + return; + } + return ChatChannel.create(this.args.reviewable.chat_channel); + } + + +} diff --git a/assets/javascripts/discourse/components/reviewable-ai-chat-message.hbs b/assets/javascripts/discourse/components/reviewable-ai-chat-message.hbs deleted file mode 100644 index c31089242..000000000 --- a/assets/javascripts/discourse/components/reviewable-ai-chat-message.hbs +++ /dev/null @@ -1,33 +0,0 @@ -{{#if this.chatChannel}} -
- - - -
-{{/if}} - -
- -
- - -
- {{html-safe (or @reviewable.payload.message_cooked @reviewable.cooked)}} -
- - {{yield}} - - -
-
\ No newline at end of file diff --git a/assets/javascripts/discourse/components/reviewable-ai-chat-message.js b/assets/javascripts/discourse/components/reviewable-ai-chat-message.js deleted file mode 100644 index b87ec5d47..000000000 --- a/assets/javascripts/discourse/components/reviewable-ai-chat-message.js +++ /dev/null @@ -1,11 +0,0 @@ -import Component from "@glimmer/component"; -import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel"; - -export default class ReviewableAiChatMessage extends Component { - get chatChannel() { - if (!this.args.reviewable.chat_channel) { - return; - } - return ChatChannel.create(this.args.reviewable.chat_channel); - } -} diff --git a/assets/javascripts/discourse/components/reviewable-ai-post.gjs b/assets/javascripts/discourse/components/reviewable-ai-post.gjs new file mode 100644 index 000000000..20f285c6c --- /dev/null +++ b/assets/javascripts/discourse/components/reviewable-ai-post.gjs @@ -0,0 +1,38 @@ +import ReviewableCreatedBy from "discourse/components/reviewable-created-by"; +import ReviewablePostEdits from "discourse/components/reviewable-post-edits"; +import ReviewablePostHeader from "discourse/components/reviewable-post-header"; +import ReviewableTopicLink from "discourse/components/reviewable-topic-link"; +import htmlSafe from "discourse/helpers/html-safe"; +import { i18n } from "discourse-i18n"; +import ModelAccuracies from "./model-accuracies"; + +const ReviewableAiPost = ; + +export default ReviewableAiPost; diff --git a/assets/javascripts/discourse/components/reviewable-ai-post.hbs b/assets/javascripts/discourse/components/reviewable-ai-post.hbs deleted file mode 100644 index b6bf22486..000000000 --- a/assets/javascripts/discourse/components/reviewable-ai-post.hbs +++ /dev/null @@ -1,26 +0,0 @@ -
- - -
- -
- -
- -
- {{#if @reviewable.blank_post}} -

{{i18n "review.deleted_post"}}

- {{else}} - {{html-safe @reviewable.cooked}} - {{/if}} -
- - {{yield}} - - -
-
\ No newline at end of file diff --git a/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs b/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs index ea00263cf..c059f610d 100644 --- a/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs +++ b/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs @@ -3,8 +3,8 @@ import { LinkTo } from "@ember/routing"; import { i18n } from "discourse-i18n"; export default class AISentimentDashboard extends Component { - static shouldRender(_outletArgs, helper) { - return helper.siteSettings.ai_sentiment_enabled; + static shouldRender(args, context) { + return context.siteSettings.ai_sentiment_enabled; }