UX: No admin header for edit personas tools or llms

lis2 · lis2 · commit adc26cbf2e4e · 2024-12-11T14:40:40.000+11:00
In this PR, we added functionality to hide the admin header for edit/new actions - discourse/discourse#30175 To make it work properly, we have to rename `show` to `edit` which is also a more accurate name.
diff --git a/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-edit.js b/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-edit.js
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default class AdminPluginsShowDiscourseAiLlmsShow extends DiscourseRoute {
+export default class AdminPluginsShowDiscourseAiLlmsEdit extends DiscourseRoute {
   async model(params) {
     const allLlms = this.modelFor("adminPlugins.show.discourse-ai-llms");
     const id = parseInt(params.id, 10);
diff --git a/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-personas-edit.js b/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-personas-edit.js
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default class AdminPluginsShowDiscourseAiPersonasShow extends DiscourseRoute {
+export default class AdminPluginsShowDiscourseAiPersonasEdit extends DiscourseRoute {
   async model(params) {
     const allPersonas = this.modelFor(
       "adminPlugins.show.discourse-ai-personas"
diff --git a/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-edit.js b/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-edit.js
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default class DiscourseAiToolsShowRoute extends DiscourseRoute {
+export default class DiscourseAiToolsEditRoute extends DiscourseRoute {
   async model(params) {
     const allTools = this.modelFor("adminPlugins.show.discourse-ai-tools");
     const id = parseInt(params.id, 10);
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
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
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
diff --git a/assets/javascripts/discourse/admin-discourse-ai-plugin-route-map.js b/assets/javascripts/discourse/admin-discourse-ai-plugin-route-map.js
@@ -6,17 +6,17 @@ export default {
   map() {
     this.route("discourse-ai-personas", { path: "ai-personas" }, function () {
       this.route("new");
-      this.route("show", { path: "/:id" });
+      this.route("edit", { path: "/:id" });
     });
 
     this.route("discourse-ai-llms", { path: "ai-llms" }, function () {
       this.route("new");
-      this.route("show", { path: "/:id" });
+      this.route("edit", { path: "/:id" });
     });
 
     this.route("discourse-ai-tools", { path: "ai-tools" }, function () {
       this.route("new");
-      this.route("show", { path: "/:id" });
+      this.route("edit", { path: "/:id" });
     });
     this.route("discourse-ai-usage", { path: "ai-usage" });
   },
diff --git a/assets/javascripts/discourse/components/ai-llms-list-editor.gjs b/assets/javascripts/discourse/components/ai-llms-list-editor.gjs
@@ -167,7 +167,7 @@ export default class AiLlmsListEditor extends Component {
                     </td>
                     <td class="d-admin-row__controls">
                       <LinkTo
-                        @route="adminPlugins.show.discourse-ai-llms.show"
+                        @route="adminPlugins.show.discourse-ai-llms.edit"
                         class="btn btn-default btn-small ai-llm-list__edit-button"
                         @model={{llm.id}}
                       >
diff --git a/assets/javascripts/discourse/components/ai-persona-editor.gjs b/assets/javascripts/discourse/components/ai-persona-editor.gjs
@@ -135,7 +135,7 @@ export default class PersonaEditor extends Component {
       if (isNew && this.args.model.rag_uploads.length === 0) {
         this.args.personas.addObject(this.args.model);
         this.router.transitionTo(
-          "adminPlugins.show.discourse-ai-personas.show",
+          "adminPlugins.show.discourse-ai-personas.edit",
           this.args.model
         );
       } else {
diff --git a/assets/javascripts/discourse/components/ai-persona-list-editor.gjs b/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
@@ -92,7 +92,7 @@ export default class AiPersonaListEditor extends Component {
                   </td>
                   <td class="d-admin-row__controls">
                     <LinkTo
-                      @route="adminPlugins.show.discourse-ai-personas.show"
+                      @route="adminPlugins.show.discourse-ai-personas.edit"
                       @model={{persona}}
                       class="btn btn-text btn-small"
                     >{{i18n "discourse_ai.ai_persona.edit"}} </LinkTo>
diff --git a/assets/javascripts/discourse/components/ai-tool-editor.gjs b/assets/javascripts/discourse/components/ai-tool-editor.gjs
@@ -103,7 +103,7 @@ export default class AiToolEditor extends Component {
       }
 
       this.router.transitionTo(
-        "adminPlugins.show.discourse-ai-tools.show",
+        "adminPlugins.show.discourse-ai-tools.edit",
         this.args.model
       );
     } catch (e) {
diff --git a/assets/javascripts/discourse/components/ai-tool-list-editor.gjs b/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
@@ -57,7 +57,7 @@ export default class AiToolListEditor extends Component {
                 </td>
                 <td class="d-admin-row__controls">
                   <LinkTo
-                    @route="adminPlugins.show.discourse-ai-tools.show"
+                    @route="adminPlugins.show.discourse-ai-tools.edit"
                     @model={{tool}}
                     class="btn btn-text btn-small"
                   >{{I18n.t "discourse_ai.tools.edit"}}</LinkTo>
diff --git a/spec/system/admin_ai_persona_spec.rb b/spec/system/admin_ai_persona_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.describe "Admin AI persona configuration", type: :system, js: true do
   fab!(:admin)
+  let(:admin_header) { PageObjects::Components::AdminHeader.new }
 
   before do
     SiteSetting.ai_bot_enabled = true
@@ -11,7 +12,13 @@
 
   it "allows creation of a persona" do
     visit "/admin/plugins/discourse-ai/ai-personas"
+
+    expect(admin_header).to be_visible
+
     find(".ai-persona-list-editor__new-button").click()
+
+    expect(admin_header).to be_hidden
+
     find(".ai-persona-editor__name").set("Test Persona")
     find(".ai-persona-editor__description").fill_in(with: "I am a test persona")
     find(".ai-persona-editor__system_prompt").fill_in(with: "You are a helpful bot")
diff --git a/spec/system/ai_bot/tool_spec.rb b/spec/system/ai_bot/tool_spec.rb
@@ -4,6 +4,7 @@
 
 describe "AI Tool Management", type: :system do
   fab!(:admin)
+  let(:admin_header) { PageObjects::Components::AdminHeader.new }
 
   before do
     SiteSetting.ai_embeddings_enabled = true
@@ -36,9 +37,11 @@ def ensure_can_run_test
   it "allows admin to create a new AI tool from preset" do
     visit "/admin/plugins/discourse-ai/ai-tools"
 
+    expect(admin_header).to be_visible
     expect(page).to have_content("Tools")
 
     find(".ai-tool-list-editor__new-button").click
+    expect(admin_header).to be_hidden
 
     select_kit = PageObjects::Components::SelectKit.new(".ai-tool-editor__presets")
     select_kit.expand
diff --git a/spec/system/llms/ai_llm_spec.rb b/spec/system/llms/ai_llm_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.describe "Managing LLM configurations", type: :system, js: true do
   fab!(:admin)
+  let(:admin_header) { PageObjects::Components::AdminHeader.new }
 
   before do
     SiteSetting.ai_bot_enabled = true
@@ -36,8 +37,10 @@
 
   it "manually configures an LLM" do
     visit "/admin/plugins/discourse-ai/ai-llms"
+    expect(admin_header).to be_visible
 
     find("[data-llm-id='none'] button").click()
+    expect(admin_header).to be_hidden
 
     find("input.ai-llm-editor__display-name").fill_in(with: "Self-hosted LLM")
     find("input.ai-llm-editor__name").fill_in(with: "llava-hf/llava-v1.6-mistral-7b-hf")

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ export default class AiLlmsListEditor extends Component {`
`167`	`167`	`</td>`
`168`	`168`	`<td class="d-admin-row__controls">`
`169`	`169`	`<LinkTo`
`170`		`- @route="adminPlugins.show.discourse-ai-llms.show"`
	`170`	`+ @route="adminPlugins.show.discourse-ai-llms.edit"`
`171`	`171`	`class="btn btn-default btn-small ai-llm-list__edit-button"`
`172`	`172`	`@model={{llm.id}}`
`173`	`173`	`>`