Skip to content
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
24 changes: 17 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ GEM
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.9)
public_suffix (>= 2.0.2, < 8.0)
ast (2.4.3)
base64 (0.3.0)
bigdecimal (4.0.1)
Expand All @@ -22,34 +24,42 @@ GEM
drb (2.2.3)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
json (2.18.0)
json (2.19.1)
json-schema (6.2.0)
addressable (~> 2.8)
bigdecimal (>= 3.1, < 5)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
minitest (6.0.1)
mcp (0.8.0)
json-schema (>= 4.1)
minitest (6.0.2)
drb (~> 2.0)
prism (~> 1.5)
parallel (1.27.0)
parser (3.3.10.1)
parser (3.3.10.2)
ast (~> 2.4.1)
racc
prettier_print (1.2.1)
prism (1.8.0)
prism (1.9.0)
public_suffix (7.0.5)
racc (1.8.1)
rack (3.2.5)
rainbow (3.1.1)
regexp_parser (2.11.3)
rubocop (1.84.0)
rubocop (1.85.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
mcp (~> 0.6)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.49.0)
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-capybara (2.22.1)
Expand Down Expand Up @@ -102,4 +112,4 @@ DEPENDENCIES
syntax_tree

BUNDLED WITH
4.0.4
4.0.8
4 changes: 2 additions & 2 deletions javascripts/discourse/api-initializers/icons.gjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { on } from "@ember/modifier";
import { LinkTo } from "@ember/routing";
import { eq, or } from "truth-helpers";
import DMenu from "discourse/float-kit/components/d-menu";
import avatar from "discourse/helpers/bound-avatar-template";
import icon from "discourse/helpers/d-icon";
import routeAction from "discourse/helpers/route-action";
import { apiInitializer } from "discourse/lib/api";
import { eq, or } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";
import DMenu from "float-kit/components/d-menu";

export default apiInitializer((api) => {
const currentUser = api.getCurrentUser();
Expand Down
2 changes: 1 addition & 1 deletion javascripts/discourse/components/blocks/profile.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { concat } from "@ember/helper";
import { LinkTo } from "@ember/routing";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import { or } from "truth-helpers";
import avatar from "discourse/helpers/avatar";
import concatClass from "discourse/helpers/concat-class";
import { ajax } from "discourse/lib/ajax";
import { or } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";

export default class Profile extends Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { concat } from "@ember/helper";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { htmlSafe } from "@ember/template";
import { eq } from "truth-helpers";
import avatar from "discourse/helpers/avatar";
import concatClass from "discourse/helpers/concat-class";
import number from "discourse/helpers/number";
import { ajax } from "discourse/lib/ajax";
import { eq } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";

const PERIODS = [
Expand Down
2 changes: 1 addition & 1 deletion javascripts/discourse/components/blocks/top-topics.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { concat } from "@ember/helper";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { htmlSafe } from "@ember/template";
import { eq } from "truth-helpers";
import UserLink from "discourse/components/user-link";
import avatar from "discourse/helpers/avatar";
import categoryLink from "discourse/helpers/category-link";
Expand All @@ -14,6 +13,7 @@ import number from "discourse/helpers/number";
import replaceEmoji from "discourse/helpers/replace-emoji";
import { ajax } from "discourse/lib/ajax";
import Category from "discourse/models/category";
import { eq } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";

const PERIODS = [
Expand Down
12 changes: 7 additions & 5 deletions javascripts/discourse/components/like-toggle.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,29 @@ import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { debounce } from "@ember/runloop";
import { service } from "@ember/service";
import { not } from "truth-helpers";
import concatClass from "discourse/helpers/concat-class";
import icon from "discourse/helpers/d-icon";
import number from "discourse/helpers/number";
import { ajax } from "discourse/lib/ajax";
import { resettableTracked } from "discourse/lib/tracked-tools";
import { not } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";

export default class LikeToggle extends Component {
@service dialog;

@tracked likeCount = this.args.topic.like_count;
@tracked liked = this.args.topic.op_liked || false;
@tracked liked = !!this.args.topic.op_liked;
@tracked loading = false;
@resettableTracked likeCount = this.args.topic.like_count;

clickCounter = 0;

get canLike() {
return this.args.topic.op_can_like || false;
return !!this.args.topic.op_can_like;
}

get firstPostId() {
return this.args.topic.first_post_id || false;
return !!this.args.topic.first_post_id;
}

@action
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
import { fn } from "@ember/helper";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
Expand All @@ -14,8 +13,6 @@ import { i18n } from "discourse-i18n";
export default class CentralCategories extends Component {
@service router;

@tracked categories = this.args.outletArgs.categories;

@action
navigate(url, event) {
const anchor = event.target.closest("a, button");
Expand All @@ -29,7 +26,7 @@ export default class CentralCategories extends Component {

<template>
<div class="c-categories">
{{#each this.categories as |category|}}
{{#each @categories as |category|}}
{{! template-lint-disable no-invalid-interactive }}
<div
{{on "click" (fn this.navigate category.url)}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
import Component from "@ember/component";
import { classNames } from "@ember-decorators/component";
import NavItem from "discourse/components/nav-item";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import { eq, or } from "truth-helpers";
import UserAvatarFlair from "discourse/components/user-avatar-flair";
import UserLink from "discourse/components/user-link";
import avatar from "discourse/helpers/avatar";
Expand All @@ -14,6 +13,7 @@ import icon from "discourse/helpers/d-icon";
import formatDate from "discourse/helpers/format-date";
import number from "discourse/helpers/number";
import replaceEmoji from "discourse/helpers/replace-emoji";
import { eq, or } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";
import LikeToggle from "../../components/like-toggle";
import endsWithEllipsis from "../../helpers/ends-with-ellipsis";
Expand All @@ -28,7 +28,7 @@ export default class PostPrimary extends Component {
}

get topic() {
return this.args.outletArgs.topic;
return this.args.topic;
}

@action
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import { eq } from "truth-helpers";
import categoryBadge from "discourse/helpers/category-badge";
import { eq } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";

export default class DiscoveryBreadcrumbs extends Component {
@service router;
@service discovery;

@tracked routeType;

get filterType() {
if (this.router.currentRoute.localName === "categories") {
return "categories";
Expand Down Expand Up @@ -58,10 +56,7 @@ export default class DiscoveryBreadcrumbs extends Component {
{{/if}}

{{#if this.shouldRenderFilters}}
<TopicFilter
@filterType={{this.filterType}}
@routeType={{this.routeType}}
/>
<TopicFilter @filterType={{this.filterType}} />
{{/if}}
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable ember/no-classic-components */
import Component from "@ember/component";
import { tagName } from "@ember-decorators/component";
import SmallScreenSidebar0 from "../../components/small-screen-sidebar";
Expand Down
1 change: 1 addition & 0 deletions javascripts/discourse/connectors/topic-title/back.gjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
import Component from "@ember/component";
import { classNames } from "@ember-decorators/component";
import icon from "discourse/helpers/d-icon";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable ember/no-classic-components */
import Component from "@ember/component";
import { tagName } from "@ember-decorators/component";
import icon from "discourse/helpers/d-icon";
Expand Down
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.37.2",
"@glint/ember-tsc": "1.0.9",
"@discourse/lint-configs": "2.43.0",
"@glint/ember-tsc": "1.1.1",
"concurrently": "^9.2.1",
"discourse": "npm:@discourse/types@2026.1.0-2709d36",
"discourse": "npm:@discourse/types@2026.3.0-887c5be4",
"ember-template-lint": "7.9.3",
"eslint": "9.39.2",
"prettier": "3.8.0",
"stylelint": "17.0.0"
"lint-to-the-future": "^2.6.4",
"lint-to-the-future-eslint": "^3.3.0",
"prettier": "3.8.1",
"stylelint": "17.4.0"
},
"scripts": {
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
Expand All @@ -21,7 +23,8 @@
"lint:hbs:fix": "ember-template-lint javascripts/**/*.gjs --fix --no-error-on-unmatched-pattern",
"lint:prettier": "pnpm prettier {javascripts,desktop,mobile,common,scss}/**/*.scss {javascripts,test}/**/*.{js,gjs} --check --no-error-on-unmatched-pattern",
"lint:prettier:fix": "pnpm prettier {javascripts,desktop,mobile,common,scss}/**/*.scss {javascripts,test}/**/*.{js,gjs} -w --no-error-on-unmatched-pattern",
"lint:types": "ember-tsc -b"
"lint:types": "ember-tsc -b",
"lttf:ignore": "lint-to-the-future ignore"
},
"engines": {
"node": ">= 22",
Expand Down
Loading