A platform for community discussion. Free, open, simple.
FEATURE: sorting for upcoming changes list (#45339)
Kris3f8a0beb0ea0
diff --git a/app/assets/stylesheets/common/components/d-filter-controls.scss b/app/assets/stylesheets/common/components/d-filter-controls.scssindex f84bfc83c17..e0fa6587eaf 100644--- a/app/assets/stylesheets/common/components/d-filter-controls.scss+++ b/app/assets/stylesheets/common/components/d-filter-controls.scss@@ -28,6 +28,10 @@display: grid;grid-template-columns: repeat(auto-fit, minmax(5em, 1fr));gap: var(--space-2);++ @include viewport.until(sm) {+ grid-template-columns: 1fr;+ }}&__additional-filters {@@ -45,6 +49,15 @@}}+ &__sort-trigger {+ flex: none;+ }++ &__sort-option {+ width: 100%;+ justify-content: space-between;+ }+&__no-results {display: flex;flex-direction: column;diff --git a/app/assets/stylesheets/common/float-kit/d-menu-modal.scss b/app/assets/stylesheets/common/float-kit/d-menu-modal.scssindex 50d67e0bf2c..4ab7fc4db5c 100644--- a/app/assets/stylesheets/common/float-kit/d-menu-modal.scss+++ b/app/assets/stylesheets/common/float-kit/d-menu-modal.scss@@ -58,5 +58,9 @@li > a {padding: 0.75em 1rem;}++ &__subheader {+ padding-inline: 1rem;+ }}}diff --git a/app/services/upcoming_changes/list.rb b/app/services/upcoming_changes/list.rbindex d4ece269476..18c6344efc5 100644--- a/app/services/upcoming_changes/list.rb+++ b/app/services/upcoming_changes/list.rb@@ -8,6 +8,7 @@ class UpcomingChanges::Listpolicy :current_user_is_adminmodel :upcoming_changes, optional: truestep :load_upcoming_change_groups+ step :load_status_changed_atstep :sort_changesstep :update_last_visited@@ -94,6 +95,24 @@ class UpcomingChanges::Listendend+ def load_status_changed_at(upcoming_changes:)+ status_changed_at =+ UpcomingChangeEvent+ .status_changed+ .where(upcoming_change_name: upcoming_changes.map { |change| change[:setting] })+ .reorder(nil)+ .group(:upcoming_change_name)+ .maximum(:created_at)++ # upcoming_change is the process-global metadata hash, so copy rather than+ # write per-site data into it+ upcoming_changes.each do |change|+ change[:upcoming_change] = change[:upcoming_change].merge(+ status_changed_at: status_changed_at[change[:setting].to_s],+ )+ end+ end+def sort_changes(upcoming_changes:)context[:upcoming_changes] = upcoming_changes.sort_by { |change| change[:setting] }enddiff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex c4d27344bef..e1841444223 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -3524,6 +3524,8 @@ en:filter_controls:reset: "Reset"toggle: "Toggle dropdown filters"+ sort_label: "Sort by"+ sort_trigger_label: "Sort by: %{sort}"d_icon_grid_picker:select_icon: "Select icon"@@ -7010,6 +7012,10 @@ en:impact_role_staff: "Staff"impact_role_all_members: "All members"impact_role_developers: "Developers"+ sort:+ recently_updated: "Recently updated"+ status: "Status"+ name: "Name"config:about:diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjsindex 471439cea29..4a1e4fc0096 100644--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs@@ -10,6 +10,56 @@ import { AUTO_GROUPS } from "discourse/lib/constants";import DFilterControls from "discourse/ui-kit/d-filter-controls";import { i18n } from "discourse-i18n";+// most mature first, as those are closest to being enabled automatically+const STATUS_ORDER = ["stable", "beta", "alpha", "experimental"];++const DEFAULT_SORT = "recently_updated";++function compareNames(a, b) {+ return a.humanized_name.localeCompare(b.humanized_name);+}++function compareStatuses(a, b) {+ return (+ STATUS_ORDER.indexOf(a.upcoming_change.status) -+ STATUS_ORDER.indexOf(b.upcoming_change.status)+ );+}++// changes not yet seen by the tracking job have no timestamp, but are the newest+function compareRecentlyUpdated(a, b) {+ const aTime = a.upcoming_change.status_changed_at+ ? Date.parse(a.upcoming_change.status_changed_at)+ : Infinity;+ const bTime = b.upcoming_change.status_changed_at+ ? Date.parse(b.upcoming_change.status_changed_at)+ : Infinity;++ return aTime === bTime ? 0 : bTime > aTime ? 1 : -1;+}++function compareBy(...comparators) {+ return (a, b) => {+ for (const compare of comparators) {+ const result = compare(a, b);+ if (result !== 0) {+ return result;+ }+ }+ return 0;+ };+}++const SORTS = {+ recently_updated: compareBy(+ compareRecentlyUpdated,+ compareStatuses,+ compareNames+ ),+ status: compareBy(compareStatuses, compareRecentlyUpdated, compareNames),+ name: compareNames,+};+export default class AdminConfigAreasUpcomingChanges extends Component {@service site;@@ -21,6 +71,14 @@ export default class AdminConfigAreasUpcomingChanges extends Component {});}+ get sortOptions() {+ return Object.entries(SORTS).map(([value, compareFn]) => ({+ value,+ label: i18n(`admin.upcoming_changes.sort.${value}`),+ compareFn,+ }));+ }+get staffGroupName() {return this.site.groupsById[AUTO_GROUPS.staff.id].name;}@@ -161,6 +219,7 @@ export default class AdminConfigAreasUpcomingChanges extends Component {<template><DFilterControls@array={{this.upcomingChanges}}+ @defaultSort={{DEFAULT_SORT}}@dropdownFilterQueryParams={{hashstatus="status"type="type"@@ -182,6 +241,8 @@ export default class AdminConfigAreasUpcomingChanges extends Component {"plugin_identifier""setting"}}+ @sortOptions={{this.sortOptions}}+ @sortQueryParam="sort"@textFilterQueryParam="changeNamesFilter"><:content as |upcomingChanges|>diff --git a/frontend/discourse/app/ui-kit/d-filter-controls.gjs b/frontend/discourse/app/ui-kit/d-filter-controls.gjsindex 9ed88e1eecc..deb8bcc9f3c 100644--- a/frontend/discourse/app/ui-kit/d-filter-controls.gjs+++ b/frontend/discourse/app/ui-kit/d-filter-controls.gjs@@ -7,6 +7,7 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { schedule } from "@ember/runloop";import { service } from "@ember/service";+import DMenu from "discourse/float-kit/components/d-menu";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY, isTesting } from "discourse/lib/environment";import { resettableTracked } from "discourse/lib/tracked-tools";@@ -15,9 +16,11 @@ import DiscourseURL, {searchParamsFromPath,} from "discourse/lib/url";import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import DFilterInput from "discourse/ui-kit/d-filter-input";import DNativeSelect from "discourse/ui-kit/d-native-select";import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import { i18n } from "discourse-i18n";const ResetButton = <template><DButton@@ -31,6 +34,39 @@ const ResetButton = <template>/></template>;+const SortMenu = <template>+ <DMenu+ @ariaLabel={{i18n "filter_controls.sort_trigger_label" sort=@label}}+ @icon="arrow-down-wide-short"+ @identifier="d-filter-controls-sort"+ @label={{if @showLabel @label}}+ @modalForMobile={{true}}+ @placement="bottom-end"+ @title={{i18n "filter_controls.sort_trigger_label" sort=@label}}+ @triggerClass="btn-default d-filter-controls__sort-trigger"+ >+ <:content as |menu|>+ <DDropdownMenu as |dropdown|>+ <dropdown.subheader>+ {{i18n "filter_controls.sort_label"}}+ </dropdown.subheader>+ {{#each @options as |option|}}+ <dropdown.item>+ <DButton+ aria-current={{if (eq option.value @value) "true"}}+ class="btn-transparent d-filter-controls__sort-option"+ data-sort={{option.value}}+ @action={{fn @onChange menu.close option.value}}+ @suffixIcon={{if (eq option.value @value) "check"}}+ @translatedLabel={{option.label}}+ />+ </dropdown.item>+ {{/each}}+ </DDropdownMenu>+ </:content>+ </DMenu>+</template>;+/*** filter controls component that support both client-side and server-side filtering*@@ -45,6 +81,11 @@ const ResetButton = <template>* for nested properties (e.g. "user.name")* @param {Array|Object} [dropdownOptions] - Dropdown options. Format: [{value, label, filterFn?}]. Or, if you* want multiple dropdowns, format is: { dropdown1: [...], dropdown2: [...] }+ * @param {Array} [sortOptions] - Sort menu options. Format: [{value, label, compareFn?}]. The menu shows with+ * two or more options. Reset leaves the sort in place, as it isn't a filter+ * @param {String} [defaultSort] - Default sort value, defaults to the first option+ * @param {String} [sortQueryParam] - Query param that holds a non-default sort+ * @param {Function} [onSortChange] - Callback for sort changes. Omit compareFn to sort on the server* @param {String} [inputPlaceholder] - Placeholder text for search input* @param {String|Object} [defaultDropdownValue="all"] - Default dropdown value(s). For single dropdown: "all",* for multiple: { dropdown1: "all", dropdown2: "all" }@@ -73,11 +114,13 @@ const ResetButton = <template>*/export default class DFilterControls extends Component {+ @service capabilities;@service router;@tracked dropdownFilter = "all";@trackedshowFilterDropdowns = this.args.filterDropdownsExpanded ?? isTesting();+ @resettableTracked sort = this.initialSortValue;@resettableTracked textFilter = this.initialTextFilterValue;dropdownFilters = trackedObject();@@ -124,6 +167,19 @@ export default class DFilterControls extends Component {return this.args.initialTextFilter?.replace(/,\s*/g, ", ") || "";}+ get initialSortValue() {+ const fromUrl =+ this.args.sortQueryParam && this.showFilters+ ? this.#validatedUrlValue(+ this.currentSearchParams,+ this.args.sortQueryParam,+ this.sortOptions+ )+ : null;++ return fromUrl ?? this.defaultSort;+ }+get currentSearchParams() {// router.currentURL, unlike window.location, is also correct under the// test environment's mock location@@ -159,6 +215,22 @@ export default class DFilterControls extends Component {return this.args.dropdownOptions || [];}+ get sortOptions() {+ return this.args.sortOptions ?? [];+ }++ get defaultSort() {+ return this.args.defaultSort ?? this.sortOptions[0]?.value;+ }++ get showSort() {+ return this.sortOptions.length > 1;+ }++ get sortLabel() {+ return this.sortOptions.find((option) => option.value === this.sort)?.label;+ }+get showDropdownFilterToggle() {return (this.args.showDropdownFilterToggle ??@@ -232,7 +304,7 @@ export default class DFilterControls extends Component {const hasExternalCallbacks =this.args.onTextFilterChange || this.args.onDropdownFilterChange;if (hasExternalCallbacks) {- return filtered;+ return this.#sorted(filtered);}if (this.textFilter.length > 0) {@@ -270,7 +342,7 @@ export default class DFilterControls extends Component {}}- return filtered;+ return this.#sorted(filtered);}get singleDropdownLabel() {@@ -418,6 +490,20 @@ export default class DFilterControls extends Component {}}+ @action+ onSortChange(close, value) {+ this.sort = value;++ if (this.args.sortQueryParam) {+ this.updateQueryParams({+ [this.args.sortQueryParam]: value === this.defaultSort ? null : value,+ });+ }++ this.args.onSortChange?.(value);+ close();+ }+@actionasync resetFilters() {this.textFilter = "";@@ -461,6 +547,14 @@ export default class DFilterControls extends Component {this.args.onFilterDropdownsToggle?.(this.showFilterDropdowns);}+ #sorted(items) {+ const compareFn = this.sortOptions.find(+ (option) => option.value === this.sort+ )?.compareFn;++ return compareFn ? items.sort(compareFn) : items;+ }+#validatedUrlValue(params, paramName, options) {const value = params.get(paramName);return value !== null && options.some((option) => option.value === value)@@ -487,7 +581,9 @@ export default class DFilterControls extends Component {@dropdownValue}}>- {{#if (or this.showTextFilter this.showDropdownFilterToggle)}}+ {{#if+ (or this.showTextFilter this.showSort this.showDropdownFilterToggle)+ }}<div class="d-filter-controls__inputs">{{#if this.showTextFilter}}<DFilterInput@@ -501,6 +597,16 @@ export default class DFilterControls extends Component {{{yield to="inlineFilters"}}+ {{#if this.showSort}}+ <SortMenu+ @label={{this.sortLabel}}+ @onChange={{this.onSortChange}}+ @options={{this.sortOptions}}+ @showLabel={{this.capabilities.viewport.sm}}+ @value={{this.sort}}+ />+ {{/if}}+{{#if this.showDropdownFilterToggle}}<DButtonaria-expanded={{if this.showFilterDropdowns "true" "false"}}diff --git a/frontend/discourse/tests/acceptance/admin-upcoming-changes-test.js b/frontend/discourse/tests/acceptance/admin-upcoming-changes-test.jsindex b91c24eedeb..282bdf91893 100644--- a/frontend/discourse/tests/acceptance/admin-upcoming-changes-test.js+++ b/frontend/discourse/tests/acceptance/admin-upcoming-changes-test.js@@ -2,7 +2,14 @@ import { click, currentURL, fillIn, visit } from "@ember/test-helpers";import { test } from "qunit";import { acceptance } from "discourse/tests/helpers/qunit-helpers";-function buildChange(setting, status, impactType, impactRole, enabledFor) {+function buildChange(+ setting,+ status,+ impactType,+ impactRole,+ enabledFor,+ statusChangedAt = null+) {return {setting,humanized_name: setting,@@ -18,6 +25,7 @@ function buildChange(setting, status, impactType, impactRole, enabledFor) {impact_type: impactType,impact_role: impactRole,enabled_for: enabledFor,+ status_changed_at: statusChangedAt,},};}@@ -99,3 +107,153 @@ acceptance("Admin - Upcoming Changes - URL filters", function (needs) {assert.dom(".upcoming-change-row").exists({ count: 3 });});});++acceptance("Admin - Upcoming Changes - Sorting", function (needs) {+ needs.user();++ needs.pretender((server, helper) => {+ server.get("/admin/config/upcoming-changes", () =>+ helper.response({+ upcoming_changes: [+ buildChange(+ "beta_old",+ "beta",+ "feature",+ "all_members",+ "no_one",+ "2026-01-01T00:00:00Z"+ ),+ buildChange(+ "alpha_recent",+ "alpha",+ "feature",+ "all_members",+ "no_one",+ "2026-06-01T00:00:00Z"+ ),+ buildChange(+ "experimental_untracked",+ "experimental",+ "feature",+ "all_members",+ "no_one"+ ),+ buildChange(+ "stable_middle",+ "stable",+ "feature",+ "all_members",+ "everyone",+ "2026-03-01T00:00:00Z"+ ),+ ],+ })+ );+ });++ async function chooseSort(value) {+ await click(".d-filter-controls__sort-trigger");+ await click(`.d-filter-controls__sort-option[data-sort='${value}']`);+ }++ function rowOrder() {+ return [...document.querySelectorAll(".upcoming-change-row")].map(+ (row) => row.dataset.upcomingChange+ );+ }++ test("sorts by most recent status change by default", async function (assert) {+ await visit("/admin/config/upcoming-changes");++ assert.dom(".d-filter-controls__sort-trigger").hasText("Recently updated");+ assert.deepEqual(rowOrder(), [+ "experimental_untracked",+ "alpha_recent",+ "stable_middle",+ "beta_old",+ ]);+ });++ test("sorts by status and name, keeping the choice in the URL", async function (assert) {+ await visit("/admin/config/upcoming-changes");++ await chooseSort("status");+ assert+ .dom(".d-filter-controls__sort-trigger")+ .hasAttribute("aria-label", "Sort by: Status");+ assert.strictEqual(+ currentURL(),+ "/admin/config/upcoming-changes?sort=status"+ );+ assert.deepEqual(rowOrder(), [+ "stable_middle",+ "beta_old",+ "alpha_recent",+ "experimental_untracked",+ ]);++ await chooseSort("name");+ assert.deepEqual(rowOrder(), [+ "alpha_recent",+ "beta_old",+ "experimental_untracked",+ "stable_middle",+ ]);++ await chooseSort("recently_updated");+ assert.strictEqual(currentURL(), "/admin/config/upcoming-changes");+ });++ test("keeps the sort when filters are reset", async function (assert) {+ await visit("/admin/config/upcoming-changes?sort=status&status=beta");++ assert.deepEqual(rowOrder(), ["beta_old"]);+ await click(".d-filter-controls__reset");++ assert.strictEqual(+ currentURL(),+ "/admin/config/upcoming-changes?sort=status"+ );+ assert.dom(".d-filter-controls__sort-trigger").hasText("Status");+ assert.strictEqual(rowOrder()[0], "stable_middle");+ });++ test("keeps filters from the URL when the sort changes", async function (assert) {+ await visit("/admin/config/upcoming-changes?status=beta");++ await chooseSort("name");++ assert.strictEqual(+ currentURL(),+ "/admin/config/upcoming-changes?status=beta&sort=name"+ );+ assert.dom(".d-filter-controls__dropdown--status").hasValue("beta");+ assert.deepEqual(rowOrder(), ["beta_old"]);+ });++ test("keeps selected filters when the sort changes", async function (assert) {+ await visit("/admin/config/upcoming-changes");+ await fillIn(".d-filter-controls__dropdown--status", "beta");++ await chooseSort("name");++ assert.strictEqual(+ currentURL(),+ "/admin/config/upcoming-changes?status=beta&sort=name"+ );+ assert.dom(".d-filter-controls__dropdown--status").hasValue("beta");+ assert.deepEqual(rowOrder(), ["beta_old"]);+ });++ test("keeps the sort when a filter changes", async function (assert) {+ await visit("/admin/config/upcoming-changes?sort=name");++ await fillIn(".d-filter-controls__dropdown--status", "beta");++ assert.strictEqual(+ currentURL(),+ "/admin/config/upcoming-changes?sort=name&status=beta"+ );+ assert.dom(".d-filter-controls__sort-trigger").hasText("Name");+ });+});diff --git a/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjsindex 1d24bcdbc30..146f55fc126 100644--- a/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjs@@ -1249,4 +1249,170 @@ module("Integration | ui-kit | DFilterControls", function (hooks) {"each toggle reports the resulting expanded state");});++ module("sorting", function (nestedHooks) {+ const SORT_OPTIONS = [+ {+ label: "Newest",+ value: "newest",+ compareFn: (a, b) => b.id - a.id,+ },+ {+ label: "Name",+ value: "name",+ compareFn: (a, b) => a.name.localeCompare(b.name),+ },+ { label: "Server", value: "server" },+ ];++ nestedHooks.beforeEach(function () {+ this.data = SAMPLE_DATA;+ this.sortOptions = SORT_OPTIONS;+ });++ function itemOrder() {+ return [...document.querySelectorAll(".item")].map((item) =>+ Number(item.dataset.id)+ );+ }++ async function chooseSort(value) {+ await click(".d-filter-controls__sort-trigger");+ await click(`.d-filter-controls__sort-option[data-sort='${value}']`);+ }++ const Example = <template>+ <DFilterControls+ @array={{@data}}+ @dropdownOptions={{SAMPLE_DROPDOWN_OPTIONS}}+ @onSortChange={{@onSortChange}}+ @sortOptions={{@sortOptions}}+ @sortQueryParam={{@sortQueryParam}}+ >+ <:content as |filteredData|>+ {{#each filteredData as |item|}}+ <div class="item" data-id={{item.id}}>{{item.name}}</div>+ {{/each}}+ </:content>+ </DFilterControls>+ </template>;++ test("sorts filtered items by the first option by default", async function (assert) {+ await render(+ <template>+ <Example @data={{this.data}} @sortOptions={{this.sortOptions}} />+ </template>+ );++ assert.dom(".d-filter-controls__sort-trigger").hasText("Newest");+ assert.deepEqual(itemOrder(), [3, 2, 1]);++ await select(".d-filter-controls__dropdown", "feature");+ assert.deepEqual(itemOrder(), [3, 1]);+ });++ test("changes the sort from the menu", async function (assert) {+ const changes = [];+ this.onSortChange = (value) => changes.push(value);++ await render(+ <template>+ <Example+ @data={{this.data}}+ @onSortChange={{this.onSortChange}}+ @sortOptions={{this.sortOptions}}+ />+ </template>+ );++ await chooseSort("name");++ assert.deepEqual(changes, ["name"]);+ assert.dom(".d-filter-controls__sort-trigger").hasText("Name");+ assert+ .dom(".d-filter-controls__sort-trigger")+ .hasAttribute("aria-label", "Sort by: Name");+ assert.deepEqual(itemOrder(), [1, 2, 3]);++ await click(".d-filter-controls__sort-trigger");+ assert+ .dom(".d-filter-controls__sort-option[data-sort='name']")+ .hasAttribute("aria-current", "true");+ assert+ .dom(".d-filter-controls__sort-option[data-sort='newest']")+ .doesNotHaveAttribute("aria-current");+ });++ test("keeps the given order for an option without compareFn", async function (assert) {+ await render(+ <template>+ <Example @data={{this.data}} @sortOptions={{this.sortOptions}} />+ </template>+ );++ await chooseSort("server");++ assert.deepEqual(itemOrder(), [1, 2, 3]);+ });++ test("doesn't show a menu for a single option", async function (assert) {+ this.sortOptions = SORT_OPTIONS.slice(0, 1);++ await render(+ <template>+ <Example @data={{this.data}} @sortOptions={{this.sortOptions}} />+ </template>+ );++ assert.dom(".d-filter-controls__sort-trigger").doesNotExist();+ });++ test("keeps the sort when filters are reset", async function (assert) {+ await render(+ <template>+ <Example @data={{this.data}} @sortOptions={{this.sortOptions}} />+ </template>+ );++ await chooseSort("name");+ await select(".d-filter-controls__dropdown", "feature");+ await click(".d-filter-controls__reset");++ assert.dom(".d-filter-controls__sort-trigger").hasText("Name");+ assert.deepEqual(itemOrder(), [1, 2, 3]);+ });++ test("follows the URL and ignores values that aren't options", async function (assert) {+ this.owner.unregister("service:router");+ this.owner.register("service:router", RouterStub);+ const router = this.owner.lookup("service:router");+ router.currentURL = "/admin/example?sort=name";++ await render(+ <template>+ <Example+ @data={{this.data}}+ @sortOptions={{this.sortOptions}}+ @sortQueryParam="sort"+ />+ </template>+ );++ assert.dom(".d-filter-controls__sort-trigger").hasText("Name");+ assert.deepEqual(itemOrder(), [1, 2, 3]);++ router.changeURL("/admin/example?sort=bogus");+ await settled();+ assert.dom(".d-filter-controls__sort-trigger").hasText("Newest");+ assert.deepEqual(itemOrder(), [3, 2, 1]);++ router.changeURL("/admin/example?sort=name");+ await settled();+ assert.dom(".d-filter-controls__sort-trigger").hasText("Name");++ router.changeURL("/admin/example?sort=constructor");+ await settled();+ assert.dom(".d-filter-controls__sort-trigger").hasText("Newest");+ });+ });});diff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rbindex d8353117a3b..d82c9802ea8 100644--- a/lib/svg_sprite.rb+++ b/lib/svg_sprite.rb@@ -19,6 +19,7 @@ module SvgSpriteangles-rightangles-uparrow-down+ arrow-down-wide-shortarrow-leftarrow-rightarrow-rotate-leftdiff --git a/spec/requests/admin/config/upcoming_changes_controller_spec.rb b/spec/requests/admin/config/upcoming_changes_controller_spec.rbindex 8dc894a9099..f7835921cf2 100644--- a/spec/requests/admin/config/upcoming_changes_controller_spec.rb+++ b/spec/requests/admin/config/upcoming_changes_controller_spec.rb@@ -55,6 +55,7 @@ RSpec.describe Admin::Config::UpcomingChangesController do"impact_type" => "other","status" => "experimental","enabled_for" => "no_one",+ "status_changed_at" => nil,},)enddiff --git a/spec/services/upcoming_changes/list_spec.rb b/spec/services/upcoming_changes/list_spec.rbindex 30a3cad9b03..a45f0e79b64 100644--- a/spec/services/upcoming_changes/list_spec.rb+++ b/spec/services/upcoming_changes/list_spec.rb@@ -116,6 +116,50 @@ RSpec.describe UpcomingChanges::List doexpect(mock_setting[:groups]).to eq("trust_level_0,trust_level_1")end+ describe "status_changed_at" do+ before do+ freeze_time++ UpcomingChangeEvent.create!(+ event_type: :status_changed,+ upcoming_change_name: "enable_upload_debug_mode",+ created_at: 2.weeks.ago,+ )+ UpcomingChangeEvent.create!(+ event_type: :status_changed,+ upcoming_change_name: "enable_upload_debug_mode",+ created_at: 1.day.ago,+ )+ UpcomingChangeEvent.create!(+ event_type: :manual_opt_in,+ upcoming_change_name: "enable_upload_debug_mode",+ created_at: 1.hour.ago,+ )+ end++ it "includes the most recent status change time" do+ mock_setting =+ result.upcoming_changes.find { |change| change[:setting] == :enable_upload_debug_mode }++ expect(mock_setting[:upcoming_change][:status_changed_at]).to eq_time(1.day.ago)+ end++ it "is nil for changes without a status change event" do+ mock_setting =+ result.upcoming_changes.find { |change| change[:setting] == :allow_user_locale }++ expect(mock_setting[:upcoming_change][:status_changed_at]).to be_nil+ end++ it "does not write the time into the shared upcoming change metadata" do+ result++ expect(SiteSetting.upcoming_change_metadata[:enable_upload_debug_mode]).not_to have_key(+ :status_changed_at,+ )+ end+ end+describe "overriding defaults setting" docontext "when an upcoming_change_default_override points to the change" dobefore do