Merge branch 'main' into main

Author: satonotdead

.github/workflows/d-compat-branch.yml

@@ -0,0 +1,10 @@
+name: Create new d-compat branch
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  ci:
+    uses: discourse/.github/.github/workflows/create-d-compat-branch.yml@v1

Gemfile.lock

@@ -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)
@@ -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)
@@ -102,4 +112,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-  4.0.4
+  4.0.8

javascripts/discourse/components/categories-groups.gjs

@@ -1,3 +1,4 @@
+/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
 import Component from "@ember/component";
 import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
@@ -17,16 +18,9 @@ import categoryLink, {
 import icon from "discourse/helpers/d-icon";
 import lazyHash from "discourse/helpers/lazy-hash";
 import { slugify } from "discourse/lib/utilities";
-import { i18n } from "discourse-i18n";
+import I18nInstance, { i18n } from "discourse-i18n";
 import CategoryGroupExtraLink from "./category-group-extra-link";
 
-function parseSettings(settings) {
-  return settings.split("|").map((i) => {
-    const [categoryGroup, categories] = i.split(":").map((str) => str.trim());
-    return { categoryGroup, categories };
-  });
-}
-
 const ExtraLink = class {
   constructor(args) {
     this.isExtraLink = true;
@@ -43,6 +37,14 @@ export default class CategoriesGroups extends Component {
   @service router;
   @service siteSettings;
 
+  localizedGroupName(group) {
+    const locale = I18nInstance.currentLocale();
+    const translation = (group.translations || []).find(
+      (t) => t.locale === locale
+    );
+    return translation?.name || group.name;
+  }
+
   get shouldShow() {
     const currentRoute = this.router.currentRouteName;
     const categoryPageStyle = this.siteSettings.desktop_category_page_style;
@@ -63,41 +65,48 @@ export default class CategoriesGroups extends Component {
   }
 
   get categoryGroupList() {
-    const parsedSettings = parseSettings(settings.category_groups);
-    const extraLinks = JSON.parse(settings.extra_links || "[]");
+    const parsedSettings = settings.category_groups;
+    const extraLinks = settings.extra_links || [];
 
-    // Initialize an array to keep track of found categories and used links
+    // Keep track of which categories landed in a group so the rest fall through
+    // to the "ungrouped" section.
     const foundCategories = [];
-    const usedLinks = [];
 
-    // Helper function to find extra link by ID
-    const findExtraLinkById = (id) => extraLinks.find((link) => link.id === id);
+    // Returns each category preceded by any extra links positioned before it
+    // (via the link's `show_before` category), so links render inline next to a
+    // category.
+    const withLinks = (categories) => {
+      const items = [];
+      categories.forEach((category) => {
+        extraLinks
+          .filter((link) => (link.show_before || []).includes(category.id))
+          .forEach((link) => items.push(new ExtraLink(link)));
+        items.push(category);
+      });
+      return items;
+    };
 
     // Iterate through parsed settings in the defined order
     const categoryGroupList = parsedSettings.reduce((groups, obj) => {
-      const categoryArray = obj.categories.split(",").map((str) => str.trim());
-      const categoryGroup = [];
+      const groupCategories = (obj.categories || [])
+        .map((id) =>
+          this.categories.find((cat) => cat.id === Number(id) && !cat.hasMuted)
+        )
+        .filter(Boolean);
 
-      // Iterate through each category/link in the order specified in settings
-      categoryArray.forEach((categoryOrLinkId) => {
-        const category = this.categories.find(
-          (cat) => cat.slug === categoryOrLinkId && !cat.hasMuted
-        );
+      groupCategories.forEach((c) => foundCategories.push(c.slug));
 
-        if (category) {
-          categoryGroup.push(category);
-          foundCategories.push(category.slug);
-        } else {
-          const extraLink = findExtraLinkById(categoryOrLinkId);
-          if (extraLink) {
-            categoryGroup.push(new ExtraLink(extraLink));
-            usedLinks.push(extraLink.id);
-          }
-        }
-      });
+      const items = withLinks(groupCategories);
 
-      if (categoryGroup.length > 0) {
-        groups.push({ name: obj.categoryGroup, items: categoryGroup });
+      if (items.length > 0) {
+        // `slug` is derived from the default name so it stays stable across
+        // locales (used for CSS classes and localStorage collapse state),
+        // while `name` is the localized label shown to the user.
+        groups.push({
+          name: this.localizedGroupName(obj),
+          slug: slugify(obj.name),
+          items,
+        });
       }
       return groups;
     }, []);
@@ -115,25 +124,29 @@ export default class CategoriesGroups extends Component {
     if (settings.show_ungrouped && ungroupedCategories.length > 0) {
       categoryGroupList.push({
         name: i18n(themePrefix("ungrouped_categories_title")),
-        items: ungroupedCategories,
+        slug: "ungrouped",
+        items: withLinks(ungroupedCategories),
       });
     }
 
     if (mutedCategories.length > 0) {
-      categoryGroupList.push({ name: "muted", items: mutedCategories });
+      categoryGroupList.push({
+        name: i18n(themePrefix("muted_categories_title")),
+        slug: "muted",
+        items: mutedCategories,
+      });
     }
 
     return categoryGroupList;
   }
 
   @action
-  toggleCategories(name, event) {
+  toggleCategories(slug, event) {
     event.preventDefault();
 
-    const id = slugify(name);
     const storedCategories =
       JSON.parse(localStorage.getItem("categoryGroups")) || [];
-    const categoryClass = `.custom-category-group-${id}`;
+    const categoryClass = `.custom-category-group-${slug}`;
 
     if (storedCategories.includes(categoryClass)) {
       storedCategories.removeObject(categoryClass);
@@ -161,11 +174,6 @@ export default class CategoriesGroups extends Component {
     });
   }
 
-  @action
-  slugifyIdentifier(str) {
-    return slugify(str);
-  }
-
   <template>
     {{#if this.shouldShow}}
       <section class="category-boxes with-logos with-subcategories">
@@ -174,14 +182,11 @@ export default class CategoriesGroups extends Component {
           {{didInsert this.initializeLocalStorage}}
         >
           {{#each this.categoryGroupList as |t|}}
-            <div
-              class="custom-category-group-{{this.slugifyIdentifier t.name}}
-                is-expanded"
-            >
+            <div class="custom-category-group-{{t.slug}} is-expanded">
               <a
-                {{on "click" (fn this.toggleCategories t.name)}}
+                {{on "click" (fn this.toggleCategories t.slug)}}
                 href
-                id={{this.slugifyIdentifier t.name}}
+                id={{t.slug}}
                 class="custom-category-group-toggle"
               >
                 <h2>{{t.name}}</h2>

javascripts/discourse/connectors/above-discovery-categories/custom-categories-boxes.gjs

@@ -1,6 +1,7 @@
+/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
 import Component from "@ember/component";
 import { classNames } from "@ember-decorators/component";
-import { and, not, or } from "truth-helpers";
+import { and, or } from "discourse/truth-helpers";
 import CategoriesGroups from "../../components/categories-groups";
 
 @classNames("above-discovery-categories-outlet", "custom-categories-boxes")

locales/ar.yml

@@ -8,10 +8,9 @@ ar:
   theme_metadata:
     description: "صفحة الفئة المخصَّصة مع إعدادات المجموعة"
     settings:
-      category_groups: "التنسيق على النحو التالي: اسم المجموعة: category-slug، extra-link-id، category-slug-2"
-      extra_links: "روابط إضافية يمكن دمجها في قائمة الفئات. أضِف معرِّف الرابط في إعداد category_groups لعرضه"
       show_on_mobile: "عرض مجموعات مربعات الفئات القابلة للطي على الجوَّال"
       show_ungrouped: "عرض مجموعة من الفئات التي لم يتم تعيينها إلى مجموعة أخرى"
       hide_muted_subcategories: "عند التفعيل، لن تظهر فئة رئيسية غير مكتومة أسفل القسم المكتوم إذا كانت تحتوي على فئة فرعية مكتومة"
       fancy_styling: "تشغيل التصميم الإضافي"
   ungrouped_categories_title: "أخرى"
+  muted_categories_title: "المكتومة"

locales/be.yml

@@ -5,3 +5,4 @@
 # https://translate.discourse.org/
 
 be:
+  muted_categories_title: "Без апавяшчэнняў"

locales/bg.yml

@@ -5,3 +5,4 @@
 # https://translate.discourse.org/
 
 bg:
+  muted_categories_title: "Заглуши"

locales/bs_BA.yml

@@ -5,3 +5,4 @@
 # https://translate.discourse.org/
 
 bs_BA:
+  muted_categories_title: "Utišani"

locales/ca.yml

@@ -5,3 +5,4 @@
 # https://translate.discourse.org/
 
 ca:
+  muted_categories_title: "Silenciat"

locales/cs.yml

@@ -5,3 +5,4 @@
 # https://translate.discourse.org/
 
 cs:
+  muted_categories_title: "Ztišení"