UX: Group membership PMs thread

Gemfile.lock

@@ -406,7 +406,7 @@ GEM
  rspec-core (>= 2.14)
  rtlcss (0.2.1)
  mini_racer (>= 0.6.3)
- rubocop (1.63.4)
+ rubocop (1.63.5)
  json (~> 2.3)
  language_server-protocol (>= 3.17.0)
  parallel (~> 1.10)

app/assets/javascripts/admin/index.js

@@ -6,23 +6,6 @@ const path = require("path");
 module.exports = {
  name: require("./package").name,
 
- options: {
- babel: {
- plugins: [
- [
- require.resolve("decorator-transforms"),
- {
- runEarly: true,
- },
- ],
- ],
- },
-
- "ember-cli-babel": {
- disableDecoratorTransforms: true,
- },
- },
-
  // return an empty tree here as we do not want the addon modules to be
  // included into vendor.js; instead, we will produce a separate bundle
  // (admin.js) to be included via a script tag as needed

app/assets/javascripts/custom-proxy/package.json

@@ -19,7 +19,7 @@
  "devDependencies": {
  "clean-base-url": "^1.0.0",
  "express": "^4.19.2",
- "glob": "^10.3.12",
+ "glob": "^10.3.14",
  "html-entities": "^2.5.2",
  "html-rewriter-wasm": "^0.4.1",
  "node-fetch": "^3.3.2"

app/assets/javascripts/dialog-holder/index.js

@@ -3,23 +3,6 @@
 module.exports = {
  name: require("./package").name,
 
- options: {
- babel: {
- plugins: [
- [
- require.resolve("decorator-transforms"),
- {
- runEarly: true,
- },
- ],
- ],
- },
-
- "ember-cli-babel": {
- disableDecoratorTransforms: true,
- },
- },
-
  isDevelopingAddon() {
  return true;
  },

app/assets/javascripts/discourse-common/index.js

@@ -8,21 +8,6 @@ module.exports = {
  handlebars: "handlebars/dist/cjs/handlebars.js",
  },
  },
-
- babel: {
- plugins: [
- [
- require.resolve("decorator-transforms"),
- {
- runEarly: true,
- },
- ],
- ],
- },
-
- "ember-cli-babel": {
- disableDecoratorTransforms: true,
- },
  },
 
  isDevelopingAddon() {

app/assets/javascripts/discourse-plugins/index.js

@@ -97,20 +97,11 @@ module.exports = {
 
  options: {
  babel: {
- plugins: [
- require.resolve("deprecation-silencer"),
- [
- require.resolve("decorator-transforms"),
- {
- runEarly: true,
- },
- ],
- ],
+ plugins: [require.resolve("deprecation-silencer")],
  },
 
  "ember-cli-babel": {
  throwUnlessParallelizable: true,
- disableDecoratorTransforms: true,
  },
 
  "ember-this-fallback": {

app/assets/javascripts/discourse/app/app.js

@@ -1,5 +1,4 @@
 /* eslint-disable simple-import-sort/imports */
-import "decorator-transforms/globals";
 import "./loader-shims";
 import "./global-compat";
 /* eslint-enable simple-import-sort/imports */

app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs

@@ -1,5 +1,6 @@
 import Component from "@glimmer/component";
 import { DEBUG } from "@glimmer/env";
+import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { cancel, schedule } from "@ember/runloop";
@@ -28,10 +29,11 @@ export default class GlimmerSiteHeader extends Component {
  @service site;
  @service header;
 
+ docking;
  pxClosed;
  headerElement;
- docking;
- _dockedHeader = false;
+
+ @tracked _dockedHeader = false;
  _animate = false;
  _headerWrap;
  _swipeMenuOrigin;

app/assets/javascripts/discourse/app/routes/about.js

@@ -1,19 +1,34 @@
+import { service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
+import Category from "discourse/models/category";
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "discourse-i18n";
 
 export default DiscourseRoute.extend({
- model() {
- return ajax("/about.json").then((result) => {
- const yearAgo = moment().locale("en").utc().subtract(1, "year");
- result.about.admins = result.about.admins.filter(
- (r) => moment(r.last_seen_at) > yearAgo
- );
- result.about.moderators = result.about.moderators.filter(
- (r) => moment(r.last_seen_at) > yearAgo
- );
- return result.about;
+ site: service(),
+
+ async model() {
+ const result = await ajax("/about.json");
+ const users = Object.fromEntries(
+ result.users.map((user) => [user.id, user])
+ );
+ result.categories?.forEach((category) => {
+ this.site.updateCategory(category);
+ });
+
+ const yearAgo = moment().utc().subtract(1, "year");
+ result.about.admins = result.about.admin_ids
+ .map((id) => users[id])
+ .filter((r) => moment(r.last_seen_at) > yearAgo);
+ result.about.moderators = result.about.moderator_ids
+ .map((id) => users[id])
+ .filter((r) => moment(r.last_seen_at) > yearAgo);
+ result.about.category_moderators?.forEach((obj) => {
+ obj.category = Category.findById(obj.category_id);
+ obj.moderators = obj.moderator_ids.map((id) => users[id]);
  });
+
+ return result.about;
  },
 
  titleToken() {

app/assets/javascripts/discourse/ember-cli-build.js

@@ -60,20 +60,10 @@ module.exports = function (defaults) {
 
  "ember-cli-babel": {
  throwUnlessParallelizable: true,
- disableDecoratorTransforms: true,
  },
 
  babel: {
- sourceMaps: false,
- plugins: [
- require.resolve("deprecation-silencer"),
- [
- require.resolve("decorator-transforms"),
- {
- runEarly: true,
- },
- ],
- ],
+ plugins: [require.resolve("deprecation-silencer")],
  },
 
  vendorFiles: {

app/assets/javascripts/discourse/tests/fixtures/about.js

@@ -1,5 +1,34 @@
 export default {
  "about.json": {
+ users: [
+ {
+ id: 1,
+ username: "sam",
+ name: "Sam Saffron",
+ avatar_template:
+ "/user_avatar/meta.discourse.org/sam/{size}/102149_2.png",
+ title: "co-founder",
+ last_seen_at: "2030-01-15T13:30:43.272Z",
+ },
+ {
+ id: 32,
+ username: "codinghorror",
+ name: "Jeff Atwood",
+ avatar_template:
+ "/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png",
+ title: "co-founder",
+ last_seen_at: "2030-01-15T13:21:56.592Z",
+ },
+ {
+ id: 19,
+ username: "eviltrout",
+ name: "Robin Ward",
+ avatar_template:
+ "/user_avatar/meta.discourse.org/eviltrout/{size}/5275_2.png",
+ title: "co-founder",
+ last_seen_at: "2030-01-14T18:03:08.232Z",
+ },
+ ],
  about: {
  can_see_about_stats: true,
  stats: {
@@ -37,64 +66,8 @@ export default {
  locale: "en",
  version: "2.2.0.beta8",
  https: true,
- admins: [
- {
- id: 1,
- username: "sam",
- name: "Sam Saffron",
- avatar_template:
- "/user_avatar/meta.discourse.org/sam/{size}/102149_2.png",
- title: "co-founder",
- last_seen_at: "2030-01-15T13:30:43.272Z",
- },
- {
- id: 32,
- username: "codinghorror",
- name: "Jeff Atwood",
- avatar_template:
- "/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png",
- title: "co-founder",
- last_seen_at: "2030-01-15T13:21:56.592Z",
- },
- {
- id: 19,
- username: "eviltrout",
- name: "Robin Ward",
- avatar_template:
- "/user_avatar/meta.discourse.org/eviltrout/{size}/5275_2.png",
- title: "co-founder",
- last_seen_at: "2030-01-14T18:03:08.232Z",
- },
- ],
- moderators: [
- {
- id: 1,
- username: "sam",
- name: "Sam Saffron",
- avatar_template:
- "/user_avatar/meta.discourse.org/sam/{size}/102149_2.png",
- title: "co-founder",
- last_seen_at: "2030-01-15T13:30:43.272Z",
- },
- {
- id: 32,
- username: "codinghorror",
- name: "Jeff Atwood",
- avatar_template:
- "/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png",
- title: "co-founder",
- last_seen_at: "2030-01-15T13:21:56.592Z",
- },
- {
- id: 19,
- username: "eviltrout",
- name: "Robin Ward",
- avatar_template:
- "/user_avatar/meta.discourse.org/eviltrout/{size}/5275_2.png",
- title: "co-founder",
- last_seen_at: "2030-01-14T18:03:08.232Z",
- },
- ],
+ admin_ids: [1, 32, 19],
+ moderator_ids: [1, 32, 19],
  },
  },
 };

app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js

@@ -265,4 +265,76 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {
 
  assert.dom(".fk-d-menu__content.test-content").doesNotExist();
  });
+
+ test("get a menu by identifier", async function (assert) {
+ await render(hbs`<DMenu @inline={{true}} @identifier="test">test</DMenu>`);
+ await open();
+
+ const activeMenu = getOwner(this)
+ .lookup("service:menu")
+ .getByIdentifier("test");
+
+ await activeMenu.close();
+
+ assert.dom(".fk-d-menu__content.test-content").doesNotExist();
+ });
+
+ test("opening a menu with the same identifier", async function (assert) {
+ await render(
+ hbs`<DMenu @inline={{true}} @identifier="foo" @class="first">1</DMenu><DMenu @inline={{true}} @identifier="foo" @class="second">2</DMenu>`
+ );
+
+ await click(".first.fk-d-menu__trigger");
+
+ assert.dom(".foo-content.first").exists();
+ assert.dom(".foo-content.second").doesNotExist();
+
+ await click(".second.fk-d-menu__trigger");
+
+ assert.dom(".foo-content.first").doesNotExist();
+ assert.dom(".foo-content.second").exists();
+ });
+
+ test("@groupIdentifier", async function (assert) {
+ await render(
+ hbs`<DMenu @inline={{true}} @groupIdentifier="foo" @class="first">1</DMenu><DMenu @inline={{true}} @groupIdentifier="foo" @class="second">2</DMenu>`
+ );
+
+ await click(".first.fk-d-menu__trigger");
+
+ assert.dom(".fk-d-menu__content.first").exists();
+ assert.dom(".fk-d-menu__content.second").doesNotExist();
+
+ await click(".second.fk-d-menu__trigger");
+
+ assert.dom(".fk-d-menu__content.first").doesNotExist();
+ assert.dom(".fk-d-menu__content.second").exists();
+ });
+
+ test("@class", async function (assert) {
+ await render(hbs`<DMenu @inline={{true}} @class="first">1</DMenu>`);
+
+ await open();
+
+ assert.dom(".fk-d-menu__trigger.first").exists();
+ assert.dom(".fk-d-menu__content.first").exists();
+ });
+
+ test("@triggerClass", async function (assert) {
+ await render(hbs`<DMenu @inline={{true}} @triggerClass="first">1</DMenu>`);
+
+ await open();
+
+ assert.dom(".fk-d-menu__trigger.first").exists();
+ assert.dom(".fk-d-menu__content.first").doesNotExist();
+ });
+
+ test("@contentClass", async function (assert) {
+ await render(hbs`<DMenu @inline={{true}} @contentClass="first">1</DMenu>`);
+
+ await open();
+
+ assert.dom(".fk-d-menu__trigger.first").doesNotExist();
+ assert.dom(".fk-d-menu__content.first").exists();
+ });
 });

app/assets/javascripts/discourse/tests/setup-tests.js

@@ -1,5 +1,4 @@
 /* eslint-disable simple-import-sort/imports */
-import Application from "../app";
 import "./loader-shims";
 /* eslint-enable simple-import-sort/imports */
 
@@ -47,6 +46,7 @@ import deprecated from "discourse-common/lib/deprecated";
 import { setDefaultOwner } from "discourse-common/lib/get-owner";
 import { setupS3CDN, setupURL } from "discourse-common/lib/get-url";
 import { buildResolver } from "discourse-common/resolver";
+import Application from "../app";
 import { loadSprites } from "../lib/svg-sprite-loader";
 import * as FakerModule from "@faker-js/faker";
 import { setLoadedFaker } from "discourse/lib/load-faker";