Skip to content
This repository was archived by the owner on Jul 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ DEPENDENCIES
syntax_tree

BUNDLED WITH
2.6.5
2.6.6
1 change: 1 addition & 0 deletions assets/javascripts/discourse/components/ai-artifact.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import getURL from "discourse/lib/get-url";

export default class AiArtifactComponent extends Component {
@service siteSettings;

@tracked expanded = false;
@tracked showingArtifact = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export default class AiComposerHelperMenu extends Component {
@service siteSettings;
@service currentUser;
@service site;

@tracked newSelectedText;
@tracked diff;
@tracked customPromptValue = "";
Expand Down
1 change: 1 addition & 0 deletions assets/javascripts/discourse/components/ai-usage.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import ComboBox from "select-kit/components/combo-box";

export default class AiUsage extends Component {
@service store;

@tracked startDate = moment().subtract(30, "days").toDate();
@tracked endDate = new Date();
@tracked data = this.args.model;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import AiIndicatorWave from "../ai-indicator-wave";

export default class ModalDiffModal extends Component {
@service currentUser;

@tracked loading = false;
@tracked diff;
@tracked suggestion = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { i18n } from "discourse-i18n";

export default class ShareModal extends Component {
@service toasts;

@tracked shareKey = "";

constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default class ShareModal extends Component {
@service modal;
@service siteSettings;
@service currentUser;

@tracked contextValue = 1;
@tracked htmlContext = "";
@tracked maxContext = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { i18n } from "discourse-i18n";

export default class RagUploadProgress extends Component {
@service messageBus;

@tracked updatedProgress = null;

willDestroy() {
Expand Down
1 change: 1 addition & 0 deletions assets/javascripts/discourse/components/rag-uploader.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import RagUploadProgress from "./rag-upload-progress";

export default class RagUploader extends Component {
@service appEvents;

@tracked term = null;
@tracked filteredUploads = null;
@tracked ragIndexingStatuses = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { MIN_CHARACTER_COUNT } from "../../lib/ai-helper-suggestions";

export default class AiCategorySuggester extends Component {
@service siteSettings;

@tracked loading = false;
@tracked suggestions = null;
@tracked untriggers = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { MIN_CHARACTER_COUNT } from "../../lib/ai-helper-suggestions";
export default class AiTagSuggester extends Component {
@service siteSettings;
@service toasts;

@tracked loading = false;
@tracked suggestions = null;
@tracked untriggers = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@ export default class AiTopicGist extends Component {
return !this.topicThumbnails?.enabledForRoute;
}

<template>
<AiGistToggle />
</template>
<template><AiGistToggle /></template>
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default class BotSelector extends Component {

@service currentUser;
@service siteSettings;

@tracked llm;
@tracked allowLLMSelector = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default class AiEditSuggestionButton extends Component {
}

@service currentUser;

@tracked loading = false;
@tracked suggestion = "";
@tracked _activeAIRequest = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ export default class AiTopicGistPlacement extends Component {
return settings.discourse_ai_enabled && settings.ai_summarization_enabled;
}

<template>
<AiTopicGist @topic={{@outletArgs.topic}} />
</template>
<template><AiTopicGist @topic={{@outletArgs.topic}} /></template>
}
1 change: 1 addition & 0 deletions assets/javascripts/discourse/controllers/preferences-ai.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { isTesting } from "discourse/lib/environment";

export default class PreferencesAiController extends Controller {
@service siteSettings;

@tracked saved = false;

get booleanSettings() {
Expand Down
15 changes: 9 additions & 6 deletions assets/javascripts/initializers/ai-artifacts.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ function initializeAiArtifacts(api) {
"data-ai-artifact-version"
);

helper.renderGlimmer(artifactElement, <template>
<AiArtifact
@artifactId={{artifactId}}
@artifactVersion={{artifactVersion}}
/>
</template>);
helper.renderGlimmer(
artifactElement,
<template>
<AiArtifact
@artifactId={{artifactId}}
@artifactVersion={{artifactVersion}}
/>
</template>
);
}
);
},
Expand Down
12 changes: 10 additions & 2 deletions assets/stylesheets/common/streaming.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,16 @@

@mixin progress-dot {
content: "\25CF";
font-family: "Söhne Circle", system-ui, -apple-system, "Segoe UI", Roboto,
Ubuntu, Cantarell, "Noto Sans", sans-serif;
font-family:
"Söhne Circle",
system-ui,
-apple-system,
"Segoe UI",
Roboto,
Ubuntu,
Cantarell,
"Noto Sans",
sans-serif;
line-height: normal;
margin-left: 0.25rem;
vertical-align: baseline;
Expand Down
4 changes: 2 additions & 2 deletions assets/stylesheets/modules/ai-helper/common/ai-helper.scss
Original file line number Diff line number Diff line change
Expand Up @@ -737,8 +737,8 @@
.fk-d-toasts:has(.ai-proofread-error-toast) {
transform: translateX(
calc(
(100vw - var(--d-max-width) - var(--d-sidebar-width) / 0.5) / 2 + 17em +
1rem
(100vw - var(--d-max-width) - var(--d-sidebar-width) / 0.5) / 2 +
17em + 1rem
)
);
}
Expand Down
4 changes: 3 additions & 1 deletion assets/stylesheets/modules/sentiment/common/dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@
&__chart-wrapper {
height: fit-content;
position: relative;
transition: transform 0.25s ease, box-shadow 0.25s ease;
transition:
transform 0.25s ease,
box-shadow 0.25s ease;
border-radius: var(--d-border-radius);

.doughnut-chart-title {
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.7.0",
"ember-template-lint": "6.1.0",
"eslint": "9.20.1",
"prettier": "2.8.8",
"stylelint": "16.14.1"
"@discourse/lint-configs": "2.11.1",
"ember-template-lint": "7.0.1",
"eslint": "9.22.0",
"prettier": "3.5.3",
"stylelint": "16.16.0"
},
"engines": {
"node": ">= 22",
Expand Down
Loading
Loading