Skip to content

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

UI: Move AI vs manual toggle to top of page (step 1/n) (#40161)

Natalie Taydc552a85378a
diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjs
index da80fa59a68..25ec5d8e115 100644
--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjs
+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjs
@@ -2,23 +2,34 @@ import { on } from "@ember/modifier";
import AceEditor from "discourse/components/ace-editor";
import BackButton from "discourse/components/back-button";
import Form from "discourse/components/form";
+import { eq } from "discourse/truth-helpers";
import DButton from "discourse/ui-kit/d-button";
import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";
import DTextField from "discourse/ui-kit/d-text-field";
import DTextarea from "discourse/ui-kit/d-textarea";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
+import QueryModeSwitch from "discourse/plugins/discourse-data-explorer/discourse/components/query-mode-switch";
export default <template>
<div class="admin-detail">
- <BackButton
- @route="adminPlugins.show.explorer.index"
- @label="explorer.queries"
- />
+ <div class="query-new__top-bar">
+ <BackButton
+ @route="adminPlugins.show.explorer.index"
+ @label="explorer.queries"
+ />
+
+ {{#if @controller.aiQueriesEnabled}}
+ <QueryModeSwitch
+ @value={{@controller.mode}}
+ @onChange={{@controller.setMode}}
+ />
+ {{/if}}
+ </div>
{{#if @controller.aiQueriesEnabled}}
<div class="query-new query-new--ai-first">
- {{#unless @controller.showManualForm}}
+ {{#if (eq @controller.mode "ai")}}
<div class="query-new__ai-section">
<label class="query-new__ai-label">
<span>{{i18n "explorer.ai.description_title"}}</span>
@@ -54,11 +65,6 @@ export default <template>
@disabled={{@controller.aiGenerating}}
class="btn-primary query-new__generate-btn"
/>
- <DButton
- @action={{@controller.toggleManualForm}}
- @label="explorer.ai.write_manually"
- class="btn-transparent query-new__toggle-link"
- />
{{/if}}
{{#if @controller.aiGenerating}}
@@ -119,9 +125,9 @@ export default <template>
/>
</div>
{{/if}}
- {{/unless}}
+ {{/if}}
- {{#if @controller.showManualForm}}
+ {{#if (eq @controller.mode "manual")}}
<Form
@data={{@controller.model}}
@onSubmit={{@controller.create}}
@@ -149,12 +155,6 @@ export default <template>
</form.Field>
<form.Actions>
<form.Submit @label="explorer.create" @icon="plus" />
- <DButton
- @action={{@controller.toggleAiForm}}
- @icon="discourse-sparkles"
- @label="explorer.ai.description_title"
- class="btn-transparent query-new__toggle-link"
- />
</form.Actions>
</Form>
{{/if}}
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-mode-switch.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-mode-switch.gjs
new file mode 100644
index 00000000000..b780bc0016c
--- /dev/null
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-mode-switch.gjs
@@ -0,0 +1,36 @@
+import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import DSegmentedControl from "discourse/components/d-segmented-control";
+import { i18n } from "discourse-i18n";
+
+export default class QueryModeSwitch extends Component {
+ @service siteSettings;
+
+ get items() {
+ return [
+ {
+ value: "manual",
+ icon: "pen",
+ label: i18n("explorer.mode.manual"),
+ },
+ {
+ value: "ai",
+ icon: "discourse-sparkles",
+ label: i18n("explorer.mode.ai"),
+ disabled: !this.siteSettings.data_explorer_ai_queries_enabled,
+ },
+ ];
+ }
+
+ <template>
+ <DSegmentedControl
+ @name="query-mode"
+ @value={{@value}}
+ @items={{this.items}}
+ @onSelect={{@onChange}}
+ @translatedLabel={{i18n "explorer.mode.label"}}
+ class="query-mode-switch"
+ ...attributes
+ />
+ </template>
+}
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.js
index 61d802cc0b7..0a10a666469 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.js
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.js
@@ -25,7 +25,7 @@ export default class AdminPluginsExplorerNew extends Controller {
@tracked generatedSql = "";
@tracked generatedName = "";
@tracked generatedDescription = "";
- @tracked showManualForm = false;
+ @tracked mode = "ai";
currentGenerationId = null;
_aiGenerationTimer = null;
@@ -43,13 +43,8 @@ export default class AdminPluginsExplorerNew extends Controller {
}
@action
- toggleManualForm() {
- this.showManualForm = true;
- }
-
- @action
- toggleAiForm() {
- this.showManualForm = false;
+ setMode(value) {
+ this.mode = value;
}
@action
@@ -207,7 +202,7 @@ export default class AdminPluginsExplorerNew extends Controller {
this.generatedSql = "";
this.generatedName = "";
this.generatedDescription = "";
- this.showManualForm = false;
+ this.mode = "ai";
this.loading = false;
}
}
diff --git a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
index 2ff2b79c1e8..6d24a23de99 100644
--- a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
+++ b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
@@ -363,6 +363,18 @@ table.group-reports {
margin: 10px 0;
}
+.query-new__top-bar {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 1em;
+ margin-bottom: 0.5em;
+
+ .back-button {
+ margin: 0;
+ }
+}
+
.query-new--ai-first {
max-width: 720px;
diff --git a/plugins/discourse-data-explorer/config/locales/client.en.yml b/plugins/discourse-data-explorer/config/locales/client.en.yml
index d2f1036a2b1..b0b03344778 100644
--- a/plugins/discourse-data-explorer/config/locales/client.en.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.en.yml
@@ -20,6 +20,10 @@ en:
default_query_notice: "This is a default query, the SQL cannot be edited. To edit the SQL, create a new query."
queries: "Queries"
query_created: "Query created!"
+ mode:
+ label: "Query authoring mode"
+ manual: "Write SQL"
+ ai: "Generate with AI"
or: "or"
admins_only: "The data explorer is only available to admins."
allow_groups: "Allow groups to access this query"
diff --git a/plugins/discourse-data-explorer/spec/system/ai_query_generation_spec.rb b/plugins/discourse-data-explorer/spec/system/ai_query_generation_spec.rb
index e47b94f737c..8b3d94a76fe 100644
--- a/plugins/discourse-data-explorer/spec/system/ai_query_generation_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/ai_query_generation_spec.rb
@@ -11,35 +11,36 @@ RSpec.describe "Data Explorer AI query generation" do
context "when ai queries setting is disabled" do
before { SiteSetting.data_explorer_ai_queries_enabled = false }
- it "does not show the AI section" do
+ it "shows only the manual form with no mode switch" do
visit("/admin/plugins/discourse-data-explorer/queries/new")
expect(page).to have_css(".query-new")
- expect(page).to have_no_css(".query-new--ai-first")
+ expect(page).to have_no_css(".query-mode-switch")
+ expect(page).to have_css(".query-new__manual-form")
+ expect(page).to have_no_css(".query-new__ai-section")
end
end
context "when ai queries setting is enabled" do
before { SiteSetting.data_explorer_ai_queries_enabled = true }
- it "shows the AI-first form with generate button" do
+ it "shows the AI form with generate button by default" do
visit("/admin/plugins/discourse-data-explorer/queries/new")
- expect(page).to have_css(".query-new--ai-first")
+ expect(page).to have_css(".query-mode-switch")
expect(page).to have_css(".query-new__ai-label", text: "Generate with AI")
expect(page).to have_css(".query-new__ai-textarea")
expect(page).to have_button("Generate")
- expect(page).to have_button("Write SQL manually")
end
- it "toggles between AI and manual forms" do
+ it "toggles between AI and manual forms via the mode switch" do
visit("/admin/plugins/discourse-data-explorer/queries/new")
- find(".query-new__toggle-link", text: "Write SQL manually").click
+ find(".query-mode-switch .d-segmented-control__label", text: "Write SQL").click
expect(page).to have_css(".query-new__manual-form")
expect(page).to have_no_css(".query-new__ai-section")
- find(".query-new__toggle-link", text: "Generate with AI").click
+ find(".query-mode-switch .d-segmented-control__label", text: "Generate with AI").click
expect(page).to have_css(".query-new__ai-section")
expect(page).to have_no_css(".query-new__manual-form")
end