Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-18807-calendar-section-formatting.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- The Calendar section now has the Inbox's layout and spacing: each meeting is a row with status and platform chips, the title on its own line, a time line that leads with the next occurrence of a series (with "repeats weekly" after it, the first date in a tooltip, and the time zone shown once), a meta line, and grouped actions that wrap on narrow screens; a row awaiting approval is tinted and says in plain words why it waits; forwarded "FW:" and "Fwd:" prefixes are hidden in the title (display only); headings, the Add meeting disclosure and the empty states share one rhythm with the Inbox (#18807).
30 changes: 28 additions & 2 deletions dashboard/test/meetings-calendar-role-race.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ const MEETINGS = ['meetingsIsOwner', 'meetingsRoleKnown', 'meetingsOnRoleReady',
const CALENDAR = ['calendarRoleKnown', 'calendarOnRoleReady', 'calendarCanView', 'calendarIsOwner', 'fetchCalendar', 'calendarRefreshMeetings',
'fetchMeetingDrafts', 'renderCalendar', 'renderMeetingDrafts', 'meetingDraftsSplit', 'calendarFormHtml', 'calendarViewerTimeZone',
'calendarRowHtml', 'calendarFormatTime', 'calendarPlatformLabel', 'calendarMeetingLink', 'calendarActionButtons', 'renderCalendarIndicator',
'calendarIndicatorState', 'calendarBadgeCount', 'calendarMeetingList', 'calendarCanDelete'];
'calendarIndicatorState', 'calendarBadgeCount', 'calendarMeetingList', 'calendarCanDelete',
'calendarDisplayTitle', 'calendarLooksForwarded', 'calendarRepeatText', 'calendarFormatRange', 'calendarWhen', 'calendarApprovalWhy'];

function makeSandbox(opts) {
const els = {};
Expand Down Expand Up @@ -74,7 +75,7 @@ function makeSandbox(opts) {
vm.createContext(sb);
const consts = ['MEETINGS_ERROR_INLINE_CHARS', 'MEETINGS_PLATFORM_LABELS', 'MEETINGS_PILL_STATUS', 'MEETINGS_LIVE_STATES',
'CALENDAR_ACTIVE_STATES', 'CALENDAR_DEFAULT_NAME', 'CALENDAR_PLATFORM_LABELS', 'CALENDAR_PLATFORM_ICONS', 'CALENDAR_SOURCE_LABELS',
'CALENDAR_STATUS_LABELS', 'CALENDAR_PILL_STATUS', 'MEETINGS_FINAL_STATES', 'CALENDAR_FINISHED_STATUSES'].map(extractConst);
'CALENDAR_STATUS_LABELS', 'CALENDAR_PILL_STATUS', 'CALENDAR_FWD_PREFIX', 'MEETINGS_FINAL_STATES', 'CALENDAR_FINISHED_STATUSES'].map(extractConst);
// const declarations stay script-scoped in a vm context; re-declare the
// mutable module state with var so the extracted functions share it.
vm.runInContext(consts.join('\n') + '\n' + GH_AUTH.concat(MEETINGS, CALENDAR).map(extractFunction).join('\n'), sb);
Expand Down Expand Up @@ -147,3 +148,28 @@ test('a failed meeting row shows a pill, a friendly line and the raw error under
assert.match(html, /<summary class="muted-xs">details<\/summary><div class="meetings-row-raw">quorum meeting\.join/);
assert.match(html, /Zoom · /);
});

test('calendar row: forwarded prefix stripped for display, series leads with next occurrence, approval reason in words', () => {
const sb = makeSandbox({});
sb.window._hiveRole = 'owner';
assert.equal(sb.calendarDisplayTitle('FW: Fwd: Hive Commons Community Meeting'), 'Hive Commons Community Meeting');
assert.equal(sb.calendarDisplayTitle('Forward planning'), 'Forward planning');
assert.equal(sb.calendarDisplayTitle('FW:'), 'FW:');
assert.equal(sb.calendarRepeatText('FREQ=WEEKLY;BYDAY=TH'), 'repeats weekly');
assert.equal(sb.calendarRepeatText('FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR'), 'repeats every weekday');
assert.equal(sb.calendarRepeatText('FREQ=DAILY;INTERVAL=2'), 'repeats every 2 days');
const ev = {
id: 'e1', summary: 'FW: Hive Commons Community Meeting', status: 'awaiting_approval', source: 'email', platform: 'teams',
start: '2026-09-10T14:00:00Z', end: '2026-09-10T15:00:00Z', rrule: 'FREQ=WEEKLY', next_occurrences: ['2026-11-19T15:00:00Z']
};
const html = sb.calendarRowHtml(ev);
assert.match(html, /Hive Commons Community Meeting<\/div>/);
assert.doesNotMatch(html, />FW:/);
assert.match(html, /calendar-row-when" title="Series started /);
assert.match(html, /Next: .*· repeats weekly/);
assert.doesNotMatch(html, /· repeats ·/);
assert.match(html, /looks forwarded/);
assert.match(html, /DMARC aligned/);
assert.match(html, /calendar-row-actions/);
assert.equal(sb.calendarApprovalWhy({ status: 'scheduled', source: 'email' }), '');
});
24 changes: 18 additions & 6 deletions src/pkg/dashboard/static-src/css/calendar.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
/* Calendar: scheduled meetings hive joins (#18394) */
.calendar-panel { display: flex; flex-direction: column; gap: var(--sp-5); }
.calendar-subsection { display: flex; flex-direction: column; gap: var(--sp-2); }
.calendar-subsection { display: flex; flex-direction: column; gap: var(--sp-3); }
.calendar-hint { max-width: 80ch; line-height: 1.5; }
.calendar-panel .email-in { margin-bottom: var(--sp-0); }
#meeting-drafts-panel { margin-top: var(--sp-5); }
.calendar-add-summary { display: flex; align-items: center; min-height: var(--tap-target); cursor: pointer; font-size: var(--fs-sm); font-weight: var(--fw-semibold); color: var(--text); }
.calendar-add-grid { display: grid; grid-template-columns: minmax(0, 2fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) auto; gap: var(--sp-2); align-items: end; }
.calendar-add-grid label { display: flex; flex-direction: column; gap: var(--sp-1); font-size: var(--fs-xs); }
.calendar-list { display: flex; flex-direction: column; gap: var(--sp-2); }
.calendar-row { display: flex; flex-wrap: wrap; align-items: center; gap: var(--sp-2); padding: var(--sp-2); border: 1px solid var(--border); border-radius: var(--r); background: var(--surface); }
.calendar-row[data-status="awaiting_approval"] { border-color: var(--accent); }
.calendar-list { display: flex; flex-direction: column; gap: var(--sp-3); }
/* Row: chips (status, platform), title, time line, meta line, an optional
reason, then one actions group that wraps on narrow widths. */
.calendar-row { display: flex; flex-direction: column; align-items: stretch; gap: var(--sp-2); padding: var(--sp-4) var(--sp-5); border: 1px solid var(--border); border-radius: var(--r); background: var(--surface); }
.calendar-row[data-status="awaiting_approval"] { border-color: var(--accent); border-left-width: 3px; background: color-mix(in srgb, var(--accent) 8%, var(--surface)); }
.calendar-row[data-status="live"] { border-color: var(--green); }
.calendar-row-main { flex: 1 1 16em; min-width: 0; }
.calendar-row-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.calendar-chips { display: flex; flex-wrap: wrap; align-items: center; gap: var(--sp-2); }
.calendar-row-main { display: flex; flex-direction: column; gap: var(--sp-1); min-width: 0; }
.calendar-row-title { font-size: var(--fs-base); font-weight: var(--fw-semibold); overflow-wrap: anywhere; }
.calendar-row-when { font-size: var(--fs-sm); color: var(--text); }
.calendar-row-when[title] { cursor: help; }
.calendar-row-meta, .calendar-row-body { overflow-wrap: anywhere; line-height: 1.5; }
.calendar-why { padding: var(--sp-3) var(--sp-4); border: 1px solid var(--border); border-left: 3px solid var(--accent); border-radius: var(--r); background: var(--bg); font-size: var(--fs-sm); line-height: 1.5; max-width: 80ch; }
.calendar-row-actions { display: flex; flex-wrap: wrap; align-items: center; gap: var(--sp-2); margin-top: var(--sp-1); }
.oc-meeting-indicator { cursor: pointer; }
@media (max-width: 720px) {
.calendar-add-grid { grid-template-columns: 1fr; }
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/dashboard/static-src/css/email-in.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
.email-in { display: flex; flex-wrap: wrap; align-items: center; gap: var(--sp-2) var(--sp-3); margin-bottom: var(--sp-5); padding: var(--sp-4) var(--sp-5); border: 1px solid var(--border); border-radius: var(--r); background: var(--bg); }
.email-in-label { font-size: var(--fs-xs); font-weight: 700; color: var(--muted); }
.email-in-address { font-family: var(--font-mono); font-size: var(--fs-base); font-weight: 600; overflow-wrap: anywhere; color: var(--accent); }
.email-in-hint { flex-basis: 100%; }
.email-in-hint { flex-basis: 100%; max-width: 80ch; line-height: 1.5; }
.email-in.is-off .email-in-hint { flex-basis: auto; }
2 changes: 1 addition & 1 deletion src/pkg/dashboard/static-src/html/calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<h2 class="section-label section-header-toggle mb-4" data-action="toggleSection" data-arg0="calendar-section"><button type="button" class="dashboard-grip" data-dashboard-grip data-stop="1" aria-label="Move Calendar section" aria-pressed="false">⠿</button><span class="section-chevron">▼</span> 📅 Calendar</h2>
<div class="section-body">
<div id="calendar-panel" class="calendar-panel"><p class="muted-xs">Loading calendar…</p></div>
<div id="meeting-drafts-panel" class="calendar-panel mt-4"></div>
<div id="meeting-drafts-panel" class="calendar-panel"></div>
</div>
</div>
Loading
Loading