FIX: uploader not removing app event (#601)
FIX: restricted to mentionabled vs allowed_chat by mistake
This commit is contained in:
parent
e4b326c711
commit
37a2db5223
|
@ -3,7 +3,6 @@ import Component, { Input } from "@ember/component";
|
||||||
import { fn } from "@ember/helper";
|
import { fn } from "@ember/helper";
|
||||||
import { on } from "@ember/modifier";
|
import { on } from "@ember/modifier";
|
||||||
import { action } from "@ember/object";
|
import { action } from "@ember/object";
|
||||||
import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
|
|
||||||
import { inject as service } from "@ember/service";
|
import { inject as service } from "@ember/service";
|
||||||
import DButton from "discourse/components/d-button";
|
import DButton from "discourse/components/d-button";
|
||||||
import { ajax } from "discourse/lib/ajax";
|
import { ajax } from "discourse/lib/ajax";
|
||||||
|
@ -52,8 +51,13 @@ export default class PersonaRagUploader extends Component.extend(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
removeListener() {
|
willDestroy() {
|
||||||
this.appEvents.off(`upload-mixin:${this.id}:all-uploads-complete`);
|
super.willDestroy(...arguments);
|
||||||
|
this.appEvents.off(
|
||||||
|
`upload-mixin:${this.id}:all-uploads-complete`,
|
||||||
|
this,
|
||||||
|
"_updatePersonaWithUploads"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
_updatePersonaWithUploads() {
|
_updatePersonaWithUploads() {
|
||||||
|
@ -108,7 +112,7 @@ export default class PersonaRagUploader extends Component.extend(
|
||||||
}
|
}
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="persona-rag-uploader" {{willDestroy this.removeListener}}>
|
<div class="persona-rag-uploader">
|
||||||
<h3>{{I18n.t "discourse_ai.ai_persona.uploads.title"}}</h3>
|
<h3>{{I18n.t "discourse_ai.ai_persona.uploads.title"}}</h3>
|
||||||
<p>{{I18n.t "discourse_ai.ai_persona.uploads.description"}}</p>
|
<p>{{I18n.t "discourse_ai.ai_persona.uploads.description"}}</p>
|
||||||
|
|
||||||
|
|
|
@ -101,8 +101,8 @@ module DiscourseAi
|
||||||
def inject_into(plugin)
|
def inject_into(plugin)
|
||||||
plugin.register_modifier(:chat_allowed_bot_user_ids) do |user_ids, guardian|
|
plugin.register_modifier(:chat_allowed_bot_user_ids) do |user_ids, guardian|
|
||||||
if guardian.user
|
if guardian.user
|
||||||
mentionables = AiPersona.mentionables(user: guardian.user)
|
allowed_chat = AiPersona.allowed_chat(user: guardian.user)
|
||||||
allowed_bot_ids = mentionables.map { |mentionable| mentionable[:user_id] }
|
allowed_bot_ids = allowed_chat.map { |info| info[:user_id] }
|
||||||
user_ids.concat(allowed_bot_ids)
|
user_ids.concat(allowed_bot_ids)
|
||||||
end
|
end
|
||||||
user_ids
|
user_ids
|
||||||
|
|
Loading…
Reference in New Issue