A platform for community discussion. Free, open, simple.
UX: Use DSegmentedControl for new report page period selector (#39570)
Martin Brennand9d5170fdf01
diff --git a/app/assets/stylesheets/admin/admin_report_chart.scss b/app/assets/stylesheets/admin/admin_report_chart.scssindex 0f7598f302f..df8da620b95 100644--- a/app/assets/stylesheets/admin/admin_report_chart.scss+++ b/app/assets/stylesheets/admin/admin_report_chart.scss@@ -73,34 +73,9 @@ body.uc-reporting-improvements .admin-contents:not(.dashboard) .chart {}.chart-groupings {- display: flex;- gap: var(--space-2);- background-color: var(--primary-very-low);- border-radius: var(--d-border-radius-large);- padding: var(--space-1) var(--space-2);-@include viewport.from(sm) {margin-right: auto;}-- .chart-grouping {- border-radius: var(--d-border-radius-large);- background: transparent;-- @include viewport.until(sm) {- flex-grow: 1;- }-- &:hover {- background: transparent;- color: var(--primary);- }-- &.active {- background: var(--secondary);- box-shadow: var(--shadow-card);- }- }}}diff --git a/app/assets/stylesheets/common/components/d-segmented-control.scss b/app/assets/stylesheets/common/components/d-segmented-control.scssindex 1eba72f7462..4f7ef50a72c 100644--- a/app/assets/stylesheets/common/components/d-segmented-control.scss+++ b/app/assets/stylesheets/common/components/d-segmented-control.scss@@ -81,5 +81,11 @@background: transparent;color: var(--primary);}++ &.is-disabled {+ cursor: not-allowed;+ opacity: 0.45;+ pointer-events: none;+ }}}diff --git a/frontend/discourse/admin/components/admin-report-new.gjs b/frontend/discourse/admin/components/admin-report-new.gjsindex a1ec8b379ad..9541c20d6e9 100644--- a/frontend/discourse/admin/components/admin-report-new.gjs+++ b/frontend/discourse/admin/components/admin-report-new.gjs@@ -4,6 +4,7 @@ import AdminReport from "discourse/admin/components/admin-report";import ConditionalLoadingSection from "discourse/components/conditional-loading-section";import DButton from "discourse/components/d-button";import DPageSubheader from "discourse/components/d-page-subheader";+import DSegmentedControl from "discourse/components/d-segmented-control";import DateTimeInputRange from "discourse/components/date-time-input-range";import DTooltip from "discourse/float-kit/components/d-tooltip";import concatClass from "discourse/helpers/concat-class";@@ -92,23 +93,14 @@ import { i18n } from "discourse-i18n";<div class="chart__filters">{{#if @report.isChartMode}}- <div+ <DSegmentedControlclass="chart-groupings"- role="tablist"- aria-label={{i18n- "admin.dashboard.reports.chart_group_period"- }}- >- {{#each @report.chartGroupings as |chartGrouping|}}- <DButton- @label={{chartGrouping.label}}- @action={{fn @report.changeGrouping chartGrouping.id}}- @disabled={{chartGrouping.disabled}}- class={{chartGrouping.class}}- role="tab"- />- {{/each}}- </div>+ @name="chart-grouping-{{@report.model.type}}"+ @label="admin.dashboard.reports.chart_group_period"+ @items={{@report.chartGroupingSegmentItems}}+ @value={{@report.options.chartGrouping}}+ @onSelect={{@report.changeGrouping}}+ />{{/if}}{{#if @report.showDatesOptions}}diff --git a/frontend/discourse/admin/components/admin-report.gjs b/frontend/discourse/admin/components/admin-report.gjsindex 7e197d0cfe6..52a4982d940 100644--- a/frontend/discourse/admin/components/admin-report.gjs+++ b/frontend/discourse/admin/components/admin-report.gjs@@ -323,6 +323,15 @@ export default class AdminReport extends Component {});}+ get chartGroupingSegmentItems() {+ return this.chartGroupings.map((g) => ({+ value: g.id,+ label: i18n(g.label),+ disabled: g.disabled,+ class: `chart-grouping ${g.id}`,+ }));+ }+@actiononChangeDateRange(range) {this.userHasCustomDates = true;diff --git a/frontend/discourse/app/components/d-segmented-control.gjs b/frontend/discourse/app/components/d-segmented-control.gjsindex e740d8e958f..624f95b241d 100644--- a/frontend/discourse/app/components/d-segmented-control.gjs+++ b/frontend/discourse/app/components/d-segmented-control.gjs@@ -3,6 +3,7 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { modifier as modifierFn } from "ember-modifier";+import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";import { i18n } from "discourse-i18n";@@ -58,12 +59,19 @@ export default class DSegmentedControl extends Component {<span class="d-segmented-control__slider"></span>{{#each @items as |item|}}- <label class="d-segmented-control__label">+ <label+ class={{concatClass+ "d-segmented-control__label"+ item.class+ (if item.disabled "is-disabled")+ }}+ ><inputtype="radio"name={{@name}}value={{item.value}}checked={{eq @value item.value}}+ disabled={{item.disabled}}class="d-segmented-control__input"{{on "change" (fn this.handleChange item.value)}}/>