DEV: Clean up after #677

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-new.js

@@ -1,16 +1,15 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class DiscourseAiToolsNewRoute extends DiscourseRoute {
   async model() {
-    const record = this.store.createRecord("ai-tool");
-    return record;
-  },
+    return this.store.createRecord("ai-tool");
+  }
 
-  setupController(controller, model) {
-    this._super(controller, model);
+  setupController(controller) {
+    super.setupController(...arguments);
     const toolsModel = this.modelFor("adminPlugins.show.discourse-ai-tools");
 
     controller.set("allTools", toolsModel);
     controller.set("presets", toolsModel.resultSetMeta.presets);
-  },
-});
+  }
+}

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-show.js

@@ -1,17 +1,18 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class DiscourseAiToolsShowRoute extends DiscourseRoute {
   async model(params) {
     const allTools = this.modelFor("adminPlugins.show.discourse-ai-tools");
     const id = parseInt(params.id, 10);
-    return allTools.findBy("id", id);
-  },
 
-  setupController(controller, model) {
-    this._super(controller, model);
+    return allTools.find((tool) => tool.id === id);
+  }
+
+  setupController(controller) {
+    super.setupController(...arguments);
     const toolsModel = this.modelFor("adminPlugins.show.discourse-ai-tools");
 
     controller.set("allTools", toolsModel);
     controller.set("presets", toolsModel.resultSetMeta.presets);
-  },
-});
+  }
+}

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools.js

@@ -1,6 +1,9 @@
+import { service } from "@ember/service";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default class DiscourseAiToolsRoute extends DiscourseRoute {
+  @service store;
+
   model() {
     return this.store.findAll("ai-tool");
   }

app/controllers/discourse_ai/admin/ai_tools_controller.rb

@@ -81,7 +81,7 @@ def ai_tool_params
           :description,
           :script,
           :summary,
-          parameters: %i[name type description],
+          parameters: [:name, :type, :description, :required, :enum, enum_values: []],
         )
       end
     end

app/models/ai_tool.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 class AiTool < ActiveRecord::Base
-  validates :name, presence: true, length: { maximum: 255 }
+  validates :name, presence: true, length: { maximum: 100 }
   validates :description, presence: true, length: { maximum: 1000 }
+  validates :summary, presence: true, length: { maximum: 255 }
   validates :script, presence: true, length: { maximum: 100_000 }
   validates :created_by_id, presence: true
   belongs_to :created_by, class_name: "User"
@@ -174,10 +175,12 @@ def self.presets
 #
 #  id            :bigint           not null, primary key
 #  name          :string           not null
-#  description   :text             not null
+#  description   :string           not null
+#  summary       :string           not null
 #  parameters    :jsonb            not null
 #  script        :text             not null
 #  created_by_id :integer          not null
+#  enabled       :boolean          default(TRUE), not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #

assets/javascripts/discourse/admin/adapters/ai-tool.js

@@ -1,6 +1,6 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default class Adapter extends RestAdapter {
+export default class AiToolAdapter extends RestAdapter {
   jsonMode = true;
 
   basePath() {

assets/javascripts/discourse/admin/models/ai-tool.js

@@ -1,3 +1,4 @@
+import { TrackedArray, TrackedObject } from "@ember-compat/tracked-built-ins";
 import RestModel from "discourse/models/rest";
 
 const CREATE_ATTRIBUTES = [
@@ -20,8 +21,21 @@ export default class AiTool extends RestModel {
   }
 
   workingCopy() {
-    let attrs = this.getProperties(CREATE_ATTRIBUTES);
-    attrs.parameters = attrs.parameters || [];
-    return AiTool.create(attrs);
+    const attrs = this.getProperties(CREATE_ATTRIBUTES);
+
+    attrs.parameters = new TrackedArray(
+      attrs.parameters?.map((p) => {
+        const parameter = new TrackedObject(p);
+
+        if (parameter.enum_values) {
+          parameter.enumValues = new TrackedArray(parameter.enum_values);
+          delete parameter.enum_values;
+        }
+
+        return parameter;
+      })
+    );
+
+    return this.store.createRecord("ai-tool", attrs);
   }
 }

assets/javascripts/discourse/components/ai-tool-editor.gjs

@@ -1,43 +1,36 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
-import { Input } from "@ember/component";
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import didUpdate from "@ember/render-modifiers/modifiers/did-update";
-import { inject as service } from "@ember/service";
+import { service } from "@ember/service";
 import BackButton from "discourse/components/back-button";
 import DButton from "discourse/components/d-button";
-import Textarea from "discourse/components/d-textarea";
 import DTooltip from "discourse/components/d-tooltip";
+import withEventValue from "discourse/helpers/with-event-value";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import I18n from "discourse-i18n";
 import AceEditor from "admin/components/ace-editor";
 import ComboBox from "select-kit/components/combo-box";
 import AiToolParameterEditor from "./ai-tool-parameter-editor";
 import AiToolTestModal from "./modal/ai-tool-test-modal";
 
+const ACE_EDITOR_MODE = "javascript";
+const ACE_EDITOR_THEME = "chrome";
+
 export default class AiToolEditor extends Component {
   @service router;
-  @service store;
   @service dialog;
   @service modal;
   @service toasts;
 
   @tracked isSaving = false;
   @tracked editingModel = null;
   @tracked showDelete = false;
-
   @tracked selectedPreset = null;
 
-  aceEditorMode = "javascript";
-  aceEditorTheme = "chrome";
-
-  @action
-  updateModel() {
-    this.editingModel = this.args.model.workingCopy();
-    this.showDelete = !this.args.model.isNew;
-  }
-
   get presets() {
     return this.args.presets.map((preset) => {
       return {
@@ -51,6 +44,12 @@ export default class AiToolEditor extends Component {
     return !this.selectedPreset && this.args.model.isNew;
   }
 
+  @action
+  updateModel() {
+    this.editingModel = this.args.model.workingCopy();
+    this.showDelete = !this.args.model.isNew;
+  }
+
   @action
   configurePreset() {
     this.selectedPreset = this.args.presets.findBy("preset_id", this.presetId);
@@ -64,16 +63,23 @@ export default class AiToolEditor extends Component {
     this.isSaving = true;
 
     try {
-      await this.args.model.save(
-        this.editingModel.getProperties(
-          "name",
-          "description",
-          "parameters",
-          "script",
-          "summary"
-        )
+      const data = this.editingModel.getProperties(
+        "name",
+        "description",
+        "parameters",
+        "script",
+        "summary"
       );
 
+      for (const p of data.parameters) {
+        if (p.enumValues) {
+          p.enum_values = p.enumValues;
+          delete p.enumValues;
+        }
+      }
+
+      await this.args.model.save(data);
+
       this.toasts.success({
         data: { message: I18n.t("discourse_ai.tools.saved") },
         duration: 2000,
@@ -97,22 +103,15 @@ export default class AiToolEditor extends Component {
   delete() {
     return this.dialog.confirm({
       message: I18n.t("discourse_ai.tools.confirm_delete"),
-      didConfirm: () => {
-        return this.args.model.destroyRecord().then(() => {
-          this.args.tools.removeObject(this.args.model);
-          this.router.transitionTo(
-            "adminPlugins.show.discourse-ai-tools.index"
-          );
-        });
+      didConfirm: async () => {
+        await this.args.model.destroyRecord();
+
+        this.args.tools.removeObject(this.args.model);
+        this.router.transitionTo("adminPlugins.show.discourse-ai-tools.index");
       },
     });
   }
 
-  @action
-  updateScript(script) {
-    this.editingModel.script = script;
-  }
-
   @action
   openTestModal() {
     this.modal.show(AiToolTestModal, {
@@ -129,9 +128,9 @@ export default class AiToolEditor extends Component {
     />
 
     <form
-      class="form-horizontal ai-tool-editor"
-      {{didUpdate this.updateModel @model.id}}
       {{didInsert this.updateModel @model.id}}
+      {{didUpdate this.updateModel @model.id}}
+      class="form-horizontal ai-tool-editor"
     >
       {{#if this.showPresets}}
         <div class="control-group">
@@ -145,76 +144,88 @@ export default class AiToolEditor extends Component {
 
         <div class="control-group ai-llm-editor__action_panel">
           <DButton
-            class="ai-tool-editor__next"
             @action={{this.configurePreset}}
-          >
-            {{I18n.t "discourse_ai.tools.next.title"}}
-          </DButton>
+            @label="discourse_ai.tools.next.title"
+            class="ai-tool-editor__next"
+          />
         </div>
       {{else}}
         <div class="control-group">
           <label>{{I18n.t "discourse_ai.tools.name"}}</label>
-          <Input
-            @type="text"
-            @value={{this.editingModel.name}}
+          <input
+            {{on "input" (withEventValue (fn (mut this.editingModel.name)))}}
+            value={{this.editingModel.name}}
+            type="text"
             class="ai-tool-editor__name"
           />
           <DTooltip
             @icon="question-circle"
             @content={{I18n.t "discourse_ai.tools.name_help"}}
           />
         </div>
+
         <div class="control-group">
           <label>{{I18n.t "discourse_ai.tools.description"}}</label>
-          <Textarea
-            @value={{this.editingModel.description}}
-            class="ai-tool-editor__description input-xxlarge"
+          <textarea
+            {{on
+              "input"
+              (withEventValue (fn (mut this.editingModel.description)))
+            }}
             placeholder={{I18n.t "discourse_ai.tools.description_help"}}
-          />
+            class="ai-tool-editor__description input-xxlarge"
+          >{{this.editingModel.description}}</textarea>
         </div>
+
         <div class="control-group">
           <label>{{I18n.t "discourse_ai.tools.summary"}}</label>
-          <Input
-            @type="text"
-            @value={{this.editingModel.summary}}
+          <input
+            {{on "input" (withEventValue (fn (mut this.editingModel.summary)))}}
+            value={{this.editingModel.summary}}
+            type="text"
             class="ai-tool-editor__summary input-xxlarge"
           />
           <DTooltip
             @icon="question-circle"
             @content={{I18n.t "discourse_ai.tools.summary_help"}}
           />
         </div>
+
         <div class="control-group">
           <label>{{I18n.t "discourse_ai.tools.parameters"}}</label>
           <AiToolParameterEditor @parameters={{this.editingModel.parameters}} />
         </div>
+
         <div class="control-group">
           <label>{{I18n.t "discourse_ai.tools.script"}}</label>
           <AceEditor
             @content={{this.editingModel.script}}
-            @mode={{this.aceEditorMode}}
-            @theme={{this.aceEditorTheme}}
-            @onChange={{this.updateScript}}
+            @onChange={{withEventValue (fn (mut this.editingModel.script))}}
+            @mode={{ACE_EDITOR_MODE}}
+            @theme={{ACE_EDITOR_THEME}}
             @editorId="ai-tool-script-editor"
           />
         </div>
+
         <div class="control-group ai-tool-editor__action_panel">
           <DButton
             @action={{this.openTestModal}}
-            class="btn-default ai-tool-editor__test-button"
-          >{{I18n.t "discourse_ai.tools.test"}}</DButton>
+            @label="discourse_ai.tools.test"
+            class="ai-tool-editor__test-button"
+          />
+
           <DButton
-            class="btn-primary ai-tool-editor__save"
             @action={{this.save}}
+            @label="discourse_ai.tools.save"
             @disabled={{this.isSaving}}
-          >{{I18n.t "discourse_ai.tools.save"}}</DButton>
+            class="btn-primary ai-tool-editor__save"
+          />
+
           {{#if this.showDelete}}
             <DButton
               @action={{this.delete}}
+              @label="discourse_ai.tools.delete"
               class="btn-danger ai-tool-editor__delete"
-            >
-              {{I18n.t "discourse_ai.tools.delete"}}
-            </DButton>
+            />
           {{/if}}
         </div>
       {{/if}}