miteruzo/btrc-hub
1
0
フォーク 0
コード イシュー 62 プルリクエスト リリース Wiki アクティビティ

#434

ソースを参照
このコミットが含まれているのは:
みてるぞ
2026-10-28 21:58:24 +09:00
親 d0d1738192
コミット 97e769248f
6個のファイルの変更、90行の追加、23行の削除
Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む
backend/app/services/counts_defaults.rb
+1 -1
ファイルの表示
@@ -25,7 +25,7 @@ class CountsDefaults
elsif resource == 'tags' && token.start_with?('aliases.')
[]
elsif resource == 'posts' && token == 'tags.name'
["tags.#{ name }", "tags.#{ aliases }"]
"tags.#{ name }"
else token
end
end.join(' ')
frontend/src/components/common/SortableList.tsx
+16 -8
ファイルの表示
@@ -25,9 +25,7 @@ const sameGroups = (left: Groups, right: Groups): boolean =>
const Group = ({ id, children }: { id: string; children: ReactNode }) => {
const drop = useDroppable ({ id: `group:${id}` })
return <div ref={drop.setNodeRef} className={cn (
'min-w-0 rounded',
drop.isOver && 'ring-1 ring-blue-500 dark:ring-blue-400')}>{children}</div>
return <div ref={drop.setNodeRef} className="min-w-0 rounded">{children}</div>
}
@@ -36,12 +34,13 @@ const SortableList = (
groups: Groups; name: (id: string) => Name
handleName?: (id: string) => Name
renderItem: (id: string, group: string) => ReactNode
renderGroup: (id: string, content: ReactNode) => ReactNode
renderGroup: (id: string, content: ReactNode, over: boolean) => ReactNode
onChange: (groups: Groups) => void; fixed?: string[] },
) => {
const drag = useRef<{ id: string; groups: Groups } | null> (null)
const scope = useId ()
const [active, setActive] = useState<string | null> (null)
const [overGroup, setOverGroup] = useState<string | null> (null)
const motion = useClientMotion ()
const accessibleName = handleName ?? name
const sensors = useSensors (
@@ -86,12 +85,15 @@ const SortableList = (
const reset = () => {
drag.current = null
setActive (null)
setOverGroup (null)
}
return <DndContext sensors={sensors} collisionDetection={args => {
const hits = pointerWithin (args)
const available = hits.find (hit => hit.id === 'group:available')
return owner (String (args.active.id), groups) !== 'available'
&& available != null ? [available] : closestCenter (args)
const group = hits.find (hit => String (hit.id).startsWith ('group:'))
const groupName = group?.id.toString ().slice (6)
const item = groupName != null && hits.some (hit =>
owner (String (hit.id), groups) === groupName)
return group != null && !item ? [group] : closestCenter (args)
}}
accessibility={{ announcements: {
onDragStart: event => accessibleName (String (event.active.id)).text,
@@ -106,6 +108,12 @@ const SortableList = (
const id = String (event.active.id)
drag.current = { id, groups }
setActive (id)
setOverGroup (owner (id, groups) ?? null)
}} onDragOver={event => {
const id = event.over?.id.toString ()
const group = id == null ? null
: (id.startsWith ('group:') ? id.slice (6) : owner (id, groups) ?? null)
setOverGroup (previous => previous === group ? previous : group)
}} onDragCancel={reset} onDragEnd={event => {
const session = drag.current
reset ()
@@ -125,7 +133,7 @@ const SortableList = (
{renderItem (id, group)}
</SortableItem>)}
</div>
</SortableContext>)}
</SortableContext>, overGroup === group)}
</Group>)}
{typeof document !== 'undefined' && createPortal (
<DragOverlay adjustScale={false}
frontend/src/components/counts/CountsAxes.tsx
+3 -2
ファイルの表示
@@ -49,9 +49,10 @@ const CountsAxes = ({ params, update }: {
commit (next)
}
return <SortableList groups={groups} name={name} onChange={commit}
renderGroup={(id, content) => <fieldset className="mb-2 min-w-0">
renderGroup={(id, content, over) => <fieldset className="mb-2 min-w-0">
<legend>{label (id === 'available' ? 'axisItems' : id)}</legend>
<div className="rounded border dark:border-slate-700">{content}</div>
<div className={cn ('rounded border dark:border-slate-700',
over && 'ring-1 ring-blue-500 dark:ring-blue-400')}>{content}</div>
</fieldset>} renderItem={(id, group) => {
const axis = axes.find (axis => axis.field === id)
return <div className={cn ('flex items-center gap-2 text-sm',
frontend/src/components/counts/CountsSelectableTable.tsx
+4 -9
ファイルの表示
@@ -83,14 +83,13 @@ const scrollToCell = (table: HTMLTableElement, point: Point, previous: Point) =>
const CountsSelectableTable = (
{ family, columns, identity, children, className, name, copyTable, stretched = false }: {
{ family, columns, identity, children, className, name, copyTable }: {
family: string
columns: string[]
identity: string
children: ReactNode
className?: string
name?: { text: string; language: string }
stretched?: boolean
copyTable?: () => CountsClipboardTable },
) => {
const id = useId ()
@@ -383,15 +382,13 @@ const CountsSelectableTable = (
}
}
const totalWidth = columns.reduce ((sum, key) => sum + layout.width (family, key), 0)
const flexible = stretched ? columns.filter (key => !layout.custom (family, key)).length : 0
return (
<CountsTableScope.Provider value={family}>
<table ref={root} role="grid" tabIndex={0} aria-multiselectable="true"
aria-label={name?.text ?? message ('selection.table').text}
aria-describedby={`${id}-hint`}
style={{ tableLayout: 'fixed', minWidth: totalWidth,
width: flexible > 0 ? '100%' : totalWidth }}
style={{ tableLayout: 'fixed', minWidth: totalWidth, width: totalWidth }}
className={cn ('counts-grid select-none border-separate border-spacing-0 outline-none',
'focus-visible:outline focus-visible:outline-2 focus-visible:outline-blue-500',
'dark:focus-visible:outline-blue-400',
@@ -618,10 +615,8 @@ const CountsSelectableTable = (
<span id={`${id}-hint`} className="sr-only">{label ('selection.hint')}</span>
<span role="status">{textCell != null && label ('selection.textMode')}</span>
</caption>
<colgroup>{columns.map (key => (
<col key={key} style={{ width: flexible > 0 && !layout.custom (family, key)
? `calc(${layout.width (family, key)}px + (100% - ${totalWidth}px) / ${flexible})`
: layout.width (family, key) }}/>))}</colgroup>
<colgroup>{columns.map (key => <col key={key}
style={{ width: layout.width (family, key) }}/>)}</colgroup>
{children}
</table>
{textCell != null && caret != null && caret.cell === textCell && createPortal (
frontend/src/components/counts/CountsSummaryResults.tsx
+4 -3
ファイルの表示
@@ -36,10 +36,11 @@ const CountsSummaryTable = (
const columnHeaders: CountsPivotHeader[] = data.columnHeaders
?? (data.columnValues ?? [[]]).map (values => ({ values, kind: 'data' }))
const sorts = readCountSort (params.get ('sort'))
const timezone = params.get ('timezone') ?? 'UTC'
const change = (key: string, additive: boolean) => update (
'sort', writeCountSort (changeCountSort (sorts, key, additive)))
const display = (value: string | number | null, axis: CountsAxis, index: number) =>
countsSummaryValue (value, axis, index, data, locale)
countsSummaryValue (value, axis, index, data, locale, timezone)
const aggregateLabel = (header: CountsPivotHeader) => message (
header.labelKey ?? (header.kind === 'grand_total' ? (rows.length + cols.length === 1
? 'singleTotal' : 'grandTotal') : 'subtotal')).text
@@ -227,7 +228,6 @@ const CountsSummaryTable = (
}
return <div className="min-h-0 flex-1 overflow-auto" data-counts-results aria-busy={pending}>
<CountsSelectableTable family={`pivot_${resource}`} columns={keys}
stretched={keys.filter (key => key !== 'row_number').length > 1}
copyTable={() => ({ columns: keys.map ((_, index) => ({ label: headingRows[0][index] })),
headerRows: headingRows, rows: matrix })}
identity={`${countsRequestParams (params)}:${JSON.stringify (keys)}`}
@@ -295,7 +295,8 @@ const CountsSummaryResults = (props: Parameters<typeof CountsSummaryTable>[0]) =
const dragIds = Object.fromEntries (groups.map ((group, index) => [group, ids[index]]))
return <SortableColumns ids={ids} name={id => ({
text: countsSummaryValue (JSON.parse (groups[ids.indexOf (id)])[0], columns[0],
props.data.rows?.length ?? 0, props.data, locale), language: message ('count').language })}
props.data.rows?.length ?? 0, props.data, locale,
props.params.get ('timezone') ?? 'UTC'), language: message ('count').language })}
onChange={order => props.update ('column_order', encodeCountState ('column_order',
order.map (id => ({ value: JSON.parse (groups[ids.indexOf (id)])[0] }))))}>
{order => {
frontend/src/lib/countsDisplay.ts
+62
ファイルの表示
@@ -392,12 +392,66 @@ export const countsDetailClipboardTable = (
}
const zonedCalendarDate = (
year: number, month: number, day: number, hour: number, timezone: string,
): Date => {
const target = Date.UTC (year, month - 1, day, hour)
const formatter = new Intl.DateTimeFormat ('en-US-u-ca-gregory-nu-latn', {
timeZone: timezone, year: 'numeric', month: '2-digit', day: '2-digit',
hour: '2-digit', minute: '2-digit', second: '2-digit', hourCycle: 'h23' })
const align = (date: Date) => {
const parts = formatter.formatToParts (date)
const part = (type: string) => Number (
parts.find (entry => entry.type === type)?.value ?? 0)
const actual = Date.UTC (part ('year'), part ('month') - 1, part ('day'),
part ('hour'), part ('minute'), part ('second'))
return new Date (date.getTime () + target - actual)
}
return align (align (new Date (target)))
}
const countsDateValue = (
value: string, grain: string, locale: LocaleCode, timezone: string,
): string | null => {
const patterns = {
year: /^(\d{4})$/, quarter: /^(\d{4})-Q([1-4])$/,
month: /^(\d{4})-(\d{2})$/, week: /^(\d{4})-W(\d{2})$/,
day: /^(\d{4})-(\d{2})-(\d{2})$/,
hour: /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):00$/ }
const pattern = patterns[grain as keyof typeof patterns]
const match = pattern == null ? null : value.match (pattern)
if (match == null) return null
const year = Number (match[1])
const weekStart = grain === 'week' ? new Date (Date.UTC (year, 0, 4)
- ((new Date (Date.UTC (year, 0, 4)).getUTCDay () + 6) % 7) * 86_400_000
+ (Number (match[2]) - 1) * 7 * 86_400_000) : null
const calendarYear = weekStart?.getUTCFullYear () ?? year
const month = weekStart == null
? (grain === 'quarter' ? (Number (match[2]) - 1) * 3 + 1
: (grain === 'month' || grain === 'day' || grain === 'hour'
? Number (match[2]) : 1))
: weekStart.getUTCMonth () + 1
const day = weekStart?.getUTCDate ()
?? (grain === 'day' || grain === 'hour' ? Number (match[3]) : 1)
const hour = grain === 'hour' ? Number (match[4]) : 12
const date = zonedCalendarDate (calendarYear, month, day, hour, timezone)
const unknown = ({ year: 'month', quarter: 'day', month: 'day', week: 'hour',
day: 'hour', hour: 'minute' } as const)[grain as keyof typeof patterns]
const formatted = localisedDateString (date, locale, unknown, timezone)
return grain === 'quarter' ? `${formatted} Q${match[2]}`
: (grain === 'week' ? `${formatted} W${match[2]}` : formatted)
}
export const countsSummaryValue = (
value: string | number | null,
axis: CountsAxis,
index: number,
data: CountsResult,
locale: LocaleCode,
timezone = 'UTC',
): string => {
const message = (key: string, values?: Record<string, string | number>) =>
translateUIMessage (key, 'counts', locale, values).text
@@ -414,5 +468,13 @@ export const countsSummaryValue = (
if (axis.field === 'event_type') return message (`events.${value}`)
if (axis.field === 'category' || axis.field === 'tag_category')
return message (`common:categories.${value}`)
const dateAxis = axis.field.endsWith ('_at')
|| axis.field.startsWith ('original_created_')
const grain = axis.grain ?? (dateAxis ? 'month' : null)
if (grain != null)
{
const date = countsDateValue (String (value), grain, locale, timezone)
if (date != null) return date
}
return String (value)
}