Skip to content

A platform for community discussion. Free, open, simple.

UX: Use RelativeTimePicker for category auto-close hours dropdown (#38480)

Martin Brennan5ef58ba74b5d
diff --git a/app/services/categories/types/base.rb b/app/services/categories/types/base.rb
index 576f483d504..2a6e3008b07 100644
--- a/app/services/categories/types/base.rb
+++ b/app/services/categories/types/base.rb
@@ -40,6 +40,10 @@ module Categories
"type" => "string",
"minLength" => 1,
},
+ "subtype" => {
+ "type" => "string",
+ "minLength" => 1,
+ },
"label" => {
"type" => "string",
"minLength" => 1,
@@ -306,6 +310,7 @@ module Categories
default: config[:default],
type: config[:type].to_s,
label: config[:label],
+ subtype: config[:subtype]&.to_s,
description: config[:description],
required: config[:required],
show_on_create: config[:show_on_create].nil? ? true : config[:show_on_create],
@@ -318,6 +323,7 @@ module Categories
key: field_name.to_s,
default: config[:default],
type: config[:type].to_s,
+ subtype: config[:subtype]&.to_s,
label: config[:label],
description: config[:description],
required: config[:required],
diff --git a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
index e5ce3b13ebc..9c471981691 100644
--- a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
+++ b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
@@ -1,4 +1,5 @@
import Component from "@glimmer/component";
+import RelativeTimePicker from "discourse/components/relative-time-picker";
import { bind } from "discourse/lib/decorators";
import { eq } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";
@@ -27,10 +28,18 @@ const SchemaFormField = <template>
@validation={{if @entry.required "required"}}
@titleFormat="full"
@descriptionFormat="full"
- @format="small"
+ @format="full"
as |field|
>
- <field.Input @type="number" />
+ {{#if (eq @entry.subtype "duration")}}
+ <RelativeTimePicker
+ @durationHours={{field.value}}
+ @durationOutputUnit="hours"
+ @onChange={{field.set}}
+ />
+ {{else}}
+ <field.Input @type="number" />
+ {{/if}}
</@formObject.Field>
{{else}}
<@formObject.Field
@@ -57,10 +66,12 @@ export default class EditCategoryTypeSchemaFields extends Component {
}
get className() {
- let classes = ["edit-category-type-schema-fields"];
- classes.push(`--category-type-${this.args.categoryType}`);
+ let classes = [
+ "edit-category-type-schema-fields",
+ `--category-type-${this.args.categoryType}`,
+ ];
if (this.args.active) {
- classes.push(" active");
+ classes.push("active");
}
return classes.join(" ");
}
diff --git a/frontend/discourse/app/components/relative-time-picker.gjs b/frontend/discourse/app/components/relative-time-picker.gjs
index 42a18529d60..4232a575d7b 100644
--- a/frontend/discourse/app/components/relative-time-picker.gjs
+++ b/frontend/discourse/app/components/relative-time-picker.gjs
@@ -2,6 +2,7 @@ import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
import didUpdate from "@ember/render-modifiers/modifiers/did-update";
import { isBlank } from "@ember/utils";
import ComboBox from "discourse/select-kit/components/combo-box";
@@ -24,13 +25,13 @@ function roundDuration(duration) {
function inputValueFromMinutes(minutes) {
if (!minutes) {
return null;
- } else if (minutes > YEAR) {
+ } else if (minutes >= YEAR) {
return roundDuration(minutes / YEAR);
- } else if (minutes > MONTH) {
+ } else if (minutes >= MONTH) {
return roundDuration(minutes / MONTH);
- } else if (minutes > DAY) {
+ } else if (minutes >= DAY) {
return roundDuration(minutes / DAY);
- } else if (minutes > HOUR) {
+ } else if (minutes >= HOUR) {
return roundDuration(minutes / HOUR);
} else {
return minutes;
@@ -38,13 +39,13 @@ function inputValueFromMinutes(minutes) {
}
function intervalFromMinutes(minutes) {
- if (minutes > YEAR) {
+ if (minutes >= YEAR) {
return "years";
- } else if (minutes > MONTH) {
+ } else if (minutes >= MONTH) {
return "months";
- } else if (minutes > DAY) {
+ } else if (minutes >= DAY) {
return "days";
- } else if (minutes > HOUR) {
+ } else if (minutes >= HOUR) {
return "hours";
} else {
return "mins";
@@ -56,11 +57,6 @@ export default class RelativeTimePicker extends Component {
@tracked duration;
@tracked interval;
- constructor() {
- super(...arguments);
- this.initValues();
- }
-
get intervals() {
const count = this.duration ? parseFloat(this.duration) : 0;
@@ -160,30 +156,39 @@ export default class RelativeTimePicker extends Component {
}
this.duration = newDuration;
- this.interval = intervalFromMinutes(this.duration);
- this.inputValue = inputValueFromMinutes(this.duration);
+ this.interval = intervalFromMinutes(newDuration);
+ this.inputValue = inputValueFromMinutes(newDuration);
}
- this.args.onChange?.(this.duration);
+ this.args.onChange?.(this.outputDuration);
+ }
+
+ get outputDuration() {
+ if (this.args.durationOutputUnit === "hours") {
+ return this.duration / HOUR;
+ }
+ return this.duration;
}
@action
onChangeInterval(interval) {
this.interval = interval;
- const newDuration = this.minutesFromInputValueAndInterval(
+ let newDuration = this.minutesFromInputValueAndInterval(
this.inputValue,
this.interval
);
if (newDuration !== this.duration) {
this.duration = newDuration;
- this.args.onChange?.(this.duration);
+ this.inputValue = inputValueFromMinutes(newDuration);
+ this.args.onChange?.(this.outputDuration);
}
}
<template>
<div class="relative-time-picker" ...attributes>
<input
+ {{didInsert this.initValues}}
{{didUpdate this.initValues @durationMinutes @durationHours}}
{{on "change" this.onChangeDuration}}
type="number"
diff --git a/frontend/discourse/tests/integration/components/relative-time-picker-test.gjs b/frontend/discourse/tests/integration/components/relative-time-picker-test.gjs
index 4f53b503a20..cffd7f52ce5 100644
--- a/frontend/discourse/tests/integration/components/relative-time-picker-test.gjs
+++ b/frontend/discourse/tests/integration/components/relative-time-picker-test.gjs
@@ -284,4 +284,52 @@ module("Integration | Component | relative-time-picker", function (hooks) {
assert.strictEqual(selectKit().header().value(), "years");
assert.dom(".relative-time-duration").hasValue("2");
});
+
+ test("durationOutputUnit hours passes duration in hours to onChange", async function (assert) {
+ let updatedValue;
+ const update = (value) => (updatedValue = value);
+ await render(
+ <template>
+ <RelativeTimePicker @onChange={{update}} @durationOutputUnit="hours" />
+ </template>
+ );
+
+ await typeIn(".relative-time-duration", "2");
+ assert.strictEqual(
+ selectKit().header().value(),
+ "days",
+ "dropdown has 'days' preselected"
+ );
+ assert.strictEqual(
+ updatedValue,
+ 48,
+ "onChange called with 2 days in hours (2 * 24)"
+ );
+
+ await selectKit().expand();
+ await selectKit().selectRowByValue("hours");
+ assert.strictEqual(
+ updatedValue,
+ 2,
+ "onChange called with 2 when interval is hours (2 hours)"
+ );
+
+ await fillIn(".relative-time-duration", "1");
+ assert.strictEqual(updatedValue, 1, "onChange called with 1 hour");
+ });
+
+ test("durationOutputUnit default passes duration in minutes to onChange", async function (assert) {
+ let updatedValue;
+ const update = (value) => (updatedValue = value);
+ await render(
+ <template><RelativeTimePicker @onChange={{update}} /></template>
+ );
+
+ await typeIn(".relative-time-duration", "2");
+ assert.strictEqual(
+ updatedValue,
+ 2 * 60 * 24,
+ "onChange called with 2 days in minutes when durationOutputUnit is not set"
+ );
+ });
});
diff --git a/plugins/discourse-solved/app/services/discourse_solved/categories/types/support.rb b/plugins/discourse-solved/app/services/discourse_solved/categories/types/support.rb
index 457c66d50d2..5a9027c9b5c 100644
--- a/plugins/discourse-solved/app/services/discourse_solved/categories/types/support.rb
+++ b/plugins/discourse-solved/app/services/discourse_solved/categories/types/support.rb
@@ -73,11 +73,14 @@ module DiscourseSolved
:solved_topics_auto_close_hours => {
default: 48,
type: :integer,
+ subtype: :duration,
label:
- I18n.t("discourse_solved.category_type.solved_topics_auto_close_hours.label"),
+ I18n.t(
+ "discourse_solved.category_type.solved_topics_auto_close_duration.label",
+ ),
description:
I18n.t(
- "discourse_solved.category_type.solved_topics_auto_close_hours.description",
+ "discourse_solved.category_type.solved_topics_auto_close_duration.description",
),
},
},
diff --git a/plugins/discourse-solved/config/locales/server.en.yml b/plugins/discourse-solved/config/locales/server.en.yml
index 136bb4e42d9..363f7fd97c5 100644
--- a/plugins/discourse-solved/config/locales/server.en.yml
+++ b/plugins/discourse-solved/config/locales/server.en.yml
@@ -14,6 +14,9 @@ en:
solved_topics_auto_close_hours:
label: "Auto close solved topics (hours)"
description: "Automatically close topic after this many hours once marked as solved. Set to 0 to disable."
+ solved_topics_auto_close_duration:
+ label: "Auto close solved topics"
+ description: "Automatically close topic after this duration once marked as solved. Set to 0 to disable."
site_settings:
solved_enabled: "Enable solved plugin, allow users to select solutions for topics"