Skip to content
This repository was archived by the owner on Jul 22, 2025. It is now read-only.

Commit f35db80

Browse files
DEV: Change to use DPageSubheader (#1033)
Previously was AdminPageSubheader until discourse/discourse#30146
1 parent fae2d5f commit f35db80

File tree

8 files changed

+38
-34
lines changed

8 files changed

+38
-34
lines changed

assets/javascripts/discourse/components/ai-llms-list-editor.gjs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { action } from "@ember/object";
44
import { LinkTo } from "@ember/routing";
55
import { service } from "@ember/service";
66
import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
7+
import DPageSubheader from "discourse/components/d-page-subheader";
78
import i18n from "discourse-common/helpers/i18n";
89
import I18n from "discourse-i18n";
9-
import AdminPageSubheader from "admin/components/admin-page-subheader";
1010
import AdminSectionLandingItem from "admin/components/admin-section-landing-item";
1111
import AdminSectionLandingWrapper from "admin/components/admin-section-landing-wrapper";
1212
import AiLlmEditor from "./ai-llm-editor";
@@ -121,9 +121,11 @@ export default class AiLlmsListEditor extends Component {
121121
{{else}}
122122
{{#if this.hasLlmElements}}
123123
<section class="ai-llms-list-editor__configured">
124-
<AdminPageSubheader
125-
@titleLabel="discourse_ai.llms.configured.title"
126-
@descriptionLabel="discourse_ai.llms.preconfigured.description"
124+
<DPageSubheader
125+
@titleLabel={{i18n "discourse_ai.llms.configured.title"}}
126+
@descriptionLabel={{i18n
127+
"discourse_ai.llms.preconfigured.description"
128+
}}
127129
@learnMoreUrl="https://meta.discourse.org/t/discourse-ai-large-language-model-llm-settings-page/319903"
128130
/>
129131
<table class="d-admin-table">
@@ -183,11 +185,11 @@ export default class AiLlmsListEditor extends Component {
183185
</section>
184186
{{/if}}
185187
<section class="ai-llms-list-editor__templates">
186-
<AdminPageSubheader
187-
@titleLabel={{this.preconfiguredTitle}}
188+
<DPageSubheader
189+
@titleLabel={{i18n this.preconfiguredTitle}}
188190
@descriptionLabel={{unless
189191
this.hasLlmElements
190-
"discourse_ai.llms.preconfigured.description"
192+
(i18n "discourse_ai.llms.preconfigured.description")
191193
}}
192194
@learnMoreUrl={{unless
193195
this.hasLlmElements

assets/javascripts/discourse/components/ai-persona-list-editor.gjs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import { action } from "@ember/object";
55
import { LinkTo } from "@ember/routing";
66
import { service } from "@ember/service";
77
import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
8+
import DPageSubheader from "discourse/components/d-page-subheader";
89
import DToggleSwitch from "discourse/components/d-toggle-switch";
910
import concatClass from "discourse/helpers/concat-class";
1011
import { popupAjaxError } from "discourse/lib/ajax-error";
1112
import i18n from "discourse-common/helpers/i18n";
1213
import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list";
13-
import AdminPageSubheader from "admin/components/admin-page-subheader";
1414
import AiPersonaEditor from "./ai-persona-editor";
1515

1616
export default class AiPersonaListEditor extends Component {
@@ -39,9 +39,11 @@ export default class AiPersonaListEditor extends Component {
3939
{{#if @currentPersona}}
4040
<AiPersonaEditor @model={{@currentPersona}} @personas={{@personas}} />
4141
{{else}}
42-
<AdminPageSubheader
43-
@titleLabel="discourse_ai.ai_persona.short_title"
44-
@descriptionLabel="discourse_ai.ai_persona.persona_description"
42+
<DPageSubheader
43+
@titleLabel={{i18n "discourse_ai.ai_persona.short_title"}}
44+
@descriptionLabel={{i18n
45+
"discourse_ai.ai_persona.persona_description"
46+
}}
4547
@learnMoreUrl="https://meta.discourse.org/t/ai-bot-personas/306099"
4648
>
4749
<:actions as |actions|>
@@ -52,7 +54,7 @@ export default class AiPersonaListEditor extends Component {
5254
class="ai-persona-list-editor__new-button"
5355
/>
5456
</:actions>
55-
</AdminPageSubheader>
57+
</DPageSubheader>
5658

5759
{{#if @personas}}
5860
<table class="content-list ai-persona-list-editor d-admin-table">

assets/javascripts/discourse/components/ai-spam.gjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { action } from "@ember/object";
66
import { LinkTo } from "@ember/routing";
77
import { service } from "@ember/service";
88
import DButton from "discourse/components/d-button";
9+
import DPageSubheader from "discourse/components/d-page-subheader";
910
import DStatTiles from "discourse/components/d-stat-tiles";
1011
import DToggleSwitch from "discourse/components/d-toggle-switch";
1112
import DTooltip from "discourse/components/d-tooltip";
@@ -15,7 +16,6 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
1516
import i18n from "discourse-common/helpers/i18n";
1617
import getURL from "discourse-common/lib/get-url";
1718
import AdminConfigAreaCard from "admin/components/admin-config-area-card";
18-
import AdminPageSubheader from "admin/components/admin-page-subheader";
1919
import ComboBox from "select-kit/components/combo-box";
2020
import SpamTestModal from "./modal/spam-test-modal";
2121

@@ -165,9 +165,9 @@ export default class AiSpam extends Component {
165165
<template>
166166
<div class="ai-spam">
167167
<section class="ai-spam__settings">
168-
<AdminPageSubheader
169-
@titleLabel="discourse_ai.spam.title"
170-
@descriptionLabel="discourse_ai.spam.spam_description"
168+
<DPageSubheader
169+
@titleLabel={{i18n "discourse_ai.spam.title"}}
170+
@descriptionLabel={{i18n "discourse_ai.spam.spam_description"}}
171171
/>
172172

173173
<div class="control-group ai-spam__enabled">

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import Component from "@glimmer/component";
22
import { LinkTo } from "@ember/routing";
33
import { service } from "@ember/service";
44
import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
5+
import DPageSubheader from "discourse/components/d-page-subheader";
56
import i18n from "discourse-common/helpers/i18n";
67
import I18n from "discourse-i18n";
78
import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list";
8-
import AdminPageSubheader from "admin/components/admin-page-subheader";
99

1010
export default class AiToolListEditor extends Component {
1111
@service adminPluginNavManager;
@@ -16,10 +16,10 @@ export default class AiToolListEditor extends Component {
1616
@label={{i18n "discourse_ai.tools.short_title"}}
1717
/>
1818
<section class="ai-tool-list-editor__current admin-detail pull-left">
19-
<AdminPageSubheader
20-
@titleLabel="discourse_ai.tools.short_title"
19+
<DPageSubheader
20+
@titleLabel={{i18n "discourse_ai.tools.short_title"}}
2121
@learnMoreUrl="https://meta.discourse.org/t/ai-bot-custom-tools/314103"
22-
@descriptionLabel="discourse_ai.tools.subheader_description"
22+
@descriptionLabel={{i18n "discourse_ai.tools.subheader_description"}}
2323
>
2424
<:actions as |actions|>
2525
<actions.Primary
@@ -29,7 +29,7 @@ export default class AiToolListEditor extends Component {
2929
class="ai-tool-list-editor__new-button"
3030
/>
3131
</:actions>
32-
</AdminPageSubheader>
32+
</DPageSubheader>
3333

3434
{{#if @tools}}
3535
<table class="d-admin-table ai-tool-list-editor">

assets/javascripts/discourse/components/ai-usage.gjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { service } from "@ember/service";
77
import { eq, gt, lt } from "truth-helpers";
88
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
99
import DButton from "discourse/components/d-button";
10+
import DPageSubheader from "discourse/components/d-page-subheader";
1011
import DStatTiles from "discourse/components/d-stat-tiles";
1112
import DateTimeInputRange from "discourse/components/date-time-input-range";
1213
import avatar from "discourse/helpers/avatar";
@@ -17,7 +18,6 @@ import i18n from "discourse-common/helpers/i18n";
1718
import { bind } from "discourse-common/utils/decorators";
1819
import AdminConfigAreaCard from "admin/components/admin-config-area-card";
1920
import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list";
20-
import AdminPageSubheader from "admin/components/admin-page-subheader";
2121
import Chart from "admin/components/chart";
2222
import ComboBox from "select-kit/components/combo-box";
2323

@@ -309,10 +309,10 @@ export default class AiUsage extends Component {
309309

310310
<template>
311311
<div class="ai-usage admin-detail">
312-
<AdminPageSubheader
313-
@titleLabel="discourse_ai.usage.short_title"
312+
<DPageSubheader
313+
@titleLabel={{i18n "discourse_ai.usage.short_title"}}
314314
@learnMoreUrl="https://meta.discourse.org/t/estimating-costs-of-using-llms-for-discourse-ai/307243"
315-
@descriptionLabel="discourse_ai.usage.subheader_description"
315+
@descriptionLabel={{i18n "discourse_ai.usage.subheader_description"}}
316316
/>
317317
<div class="ai-usage__filters">
318318
<div class="ai-usage__filters-dates">

spec/system/admin_ai_persona_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe "Admin AI persona configuration", type: :system, js: true do
44
fab!(:admin)
5-
let(:admin_header) { PageObjects::Components::AdminHeader.new }
5+
let(:page_header) { PageObjects::Components::DPageHeader.new }
66

77
before do
88
SiteSetting.ai_bot_enabled = true
@@ -13,11 +13,11 @@
1313
it "allows creation of a persona" do
1414
visit "/admin/plugins/discourse-ai/ai-personas"
1515

16-
expect(admin_header).to be_visible
16+
expect(page_header).to be_visible
1717

1818
find(".ai-persona-list-editor__new-button").click()
1919

20-
expect(admin_header).to be_hidden
20+
expect(page_header).to be_hidden
2121

2222
find(".ai-persona-editor__name").set("Test Persona")
2323
find(".ai-persona-editor__description").fill_in(with: "I am a test persona")

spec/system/ai_bot/tool_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
describe "AI Tool Management", type: :system do
66
fab!(:admin)
7-
let(:admin_header) { PageObjects::Components::AdminHeader.new }
7+
let(:page_header) { PageObjects::Components::DPageHeader.new }
88

99
before do
1010
SiteSetting.ai_embeddings_enabled = true
@@ -37,11 +37,11 @@ def ensure_can_run_test
3737
it "allows admin to create a new AI tool from preset" do
3838
visit "/admin/plugins/discourse-ai/ai-tools"
3939

40-
expect(admin_header).to be_visible
40+
expect(page_header).to be_visible
4141
expect(page).to have_content("Tools")
4242

4343
find(".ai-tool-list-editor__new-button").click
44-
expect(admin_header).to be_hidden
44+
expect(page_header).to be_hidden
4545

4646
select_kit = PageObjects::Components::SelectKit.new(".ai-tool-editor__presets")
4747
select_kit.expand

spec/system/llms/ai_llm_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe "Managing LLM configurations", type: :system, js: true do
44
fab!(:admin)
5-
let(:admin_header) { PageObjects::Components::AdminHeader.new }
5+
let(:page_header) { PageObjects::Components::DPageHeader.new }
66

77
before do
88
SiteSetting.ai_bot_enabled = true
@@ -37,10 +37,10 @@
3737

3838
it "manually configures an LLM" do
3939
visit "/admin/plugins/discourse-ai/ai-llms"
40-
expect(admin_header).to be_visible
40+
expect(page_header).to be_visible
4141

4242
find("[data-llm-id='none'] button").click()
43-
expect(admin_header).to be_hidden
43+
expect(page_header).to be_hidden
4444

4545
find("input.ai-llm-editor__display-name").fill_in(with: "Self-hosted LLM")
4646
find("input.ai-llm-editor__name").fill_in(with: "llava-hf/llava-v1.6-mistral-7b-hf")

0 commit comments

Comments
 (0)