@sixb/app 0.2.5 → 0.2.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent/components/agent-threads.d.ts.map +1 -1
- package/dist/agent/components/composer-place.d.ts.map +1 -1
- package/dist/agent/components/computer-place.d.ts +24 -6
- package/dist/agent/components/computer-place.d.ts.map +1 -1
- package/dist/agent/components/conversation-panel.d.ts.map +1 -1
- package/dist/agent/components/message-view.d.ts +13 -3
- package/dist/agent/components/message-view.d.ts.map +1 -1
- package/dist/agent/components/pending-messages.d.ts.map +1 -1
- package/dist/agent/components/sandbox-recovery.d.ts +8 -2
- package/dist/agent/components/sandbox-recovery.d.ts.map +1 -1
- package/dist/agent/components/transcript.d.ts +13 -0
- package/dist/agent/components/transcript.d.ts.map +1 -1
- package/dist/agent/conversation.d.ts +4 -0
- package/dist/agent/conversation.d.ts.map +1 -1
- package/dist/agent/delegation/use-children.d.ts +5 -5
- package/dist/agent/delegation/use-children.d.ts.map +1 -1
- package/dist/agent/format.d.ts +7 -0
- package/dist/agent/format.d.ts.map +1 -1
- package/dist/agent/hooks/thread-queries.d.ts +1548 -0
- package/dist/agent/hooks/thread-queries.d.ts.map +1 -0
- package/dist/agent/hooks/use-agent-conversation.d.ts +41 -2
- package/dist/agent/hooks/use-agent-conversation.d.ts.map +1 -1
- package/dist/agent/hooks/use-thread-lists.d.ts +80 -3
- package/dist/agent/hooks/use-thread-lists.d.ts.map +1 -1
- package/dist/agent/hooks/use-thread-place.d.ts +49 -0
- package/dist/agent/hooks/use-thread-place.d.ts.map +1 -0
- package/dist/agent/i18n/en.d.ts +44 -6
- package/dist/agent/i18n/en.d.ts.map +1 -1
- package/dist/agent/i18n/fr.d.ts.map +1 -1
- package/dist/agent/i18n/index.d.ts +76 -12
- package/dist/agent/i18n/index.d.ts.map +1 -1
- package/dist/agent/live-run.d.ts.map +1 -1
- package/dist/agent/model-selection.d.ts +3 -2
- package/dist/agent/model-selection.d.ts.map +1 -1
- package/dist/agent/moves.d.ts +40 -0
- package/dist/agent/moves.d.ts.map +1 -0
- package/dist/agent/thread-reader-state.d.ts +30 -0
- package/dist/agent/thread-reader-state.d.ts.map +1 -0
- package/dist/agent/types.d.ts +4 -0
- package/dist/agent/types.d.ts.map +1 -1
- package/dist/artifacts/live/session.d.ts.map +1 -1
- package/dist/artifacts/queries.d.ts.map +1 -1
- package/dist/artifacts/renderers/live-frame.d.ts.map +1 -1
- package/dist/{chunk-69qgh20f.js → chunk-1f4h75n3.js} +1 -1
- package/dist/{chunk-4fex83k2.js → chunk-7v9622qb.js} +2254 -739
- package/dist/{chunk-4fex83k2.js.map → chunk-7v9622qb.js.map} +29 -26
- package/dist/{chunk-5sgac68y.js → chunk-dntecmwb.js} +1 -1
- package/dist/{chunk-4wm09prf.js → chunk-qmka6aea.js} +1 -1
- package/dist/createCustomApp.d.ts +8 -1
- package/dist/createCustomApp.d.ts.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +3 -3
- package/dist/pages/console/data/accounts.d.ts +94 -0
- package/dist/pages/console/data/accounts.d.ts.map +1 -0
- package/dist/pages/console/data/connectors.d.ts.map +1 -1
- package/dist/pages/console/data/datasets.d.ts.map +1 -1
- package/dist/pages/console/data/live-updates.d.ts.map +1 -1
- package/dist/pages/console/data/messages.d.ts +46 -0
- package/dist/pages/console/data/messages.d.ts.map +1 -1
- package/dist/pages/console/data/pipelines.d.ts.map +1 -1
- package/dist/pages/console/data/projections.d.ts.map +1 -1
- package/dist/pages/console/data/sync-button.d.ts.map +1 -1
- package/dist/pages/console/data/syncs.d.ts.map +1 -1
- package/dist/pages/console/ontology/actions.d.ts.map +1 -1
- package/dist/pages/console/ontology/object-type.d.ts.map +1 -1
- package/dist/pages/console/ontology/object-types.d.ts.map +1 -1
- package/dist/pages/console/ontology/rules.d.ts.map +1 -1
- package/dist/pages/console/ontology/workflow.d.ts.map +1 -1
- package/dist/pages/console/ontology/workflows.d.ts.map +1 -1
- package/dist/pages/folders.d.ts +106 -0
- package/dist/pages/folders.d.ts.map +1 -0
- package/dist/pages/settings/usage/breakdown.d.ts.map +1 -1
- package/dist/pages/settings/usage/page.d.ts +4 -1
- package/dist/pages/settings/usage/page.d.ts.map +1 -1
- package/dist/pages/settings/usage/spend-model.d.ts +43 -19
- package/dist/pages/settings/usage/spend-model.d.ts.map +1 -1
- package/dist/pages.js +23453 -22656
- package/dist/pages.js.map +23 -21
- package/dist/server.d.ts +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +40 -3
- package/dist/server.js.map +3 -3
- package/package.json +3 -3
- package/src/agent/agent-chat.tsx +2 -2
- package/src/agent/components/agent-threads.tsx +42 -2
- package/src/agent/components/composer-place.tsx +2 -7
- package/src/agent/components/computer-place.tsx +415 -70
- package/src/agent/components/conversation-panel.tsx +31 -26
- package/src/agent/components/message-view.tsx +418 -9
- package/src/agent/components/pending-messages.tsx +5 -1
- package/src/agent/components/sandbox-recovery.tsx +24 -6
- package/src/agent/components/transcript.tsx +136 -5
- package/src/agent/conversation.ts +16 -1
- package/src/agent/format.ts +52 -0
- package/src/agent/hooks/thread-queries.ts +75 -0
- package/src/agent/hooks/use-agent-conversation.ts +461 -112
- package/src/agent/hooks/use-thread-lists.ts +72 -7
- package/src/agent/hooks/use-thread-place.ts +239 -0
- package/src/agent/i18n/en.ts +69 -16
- package/src/agent/i18n/fr.ts +71 -19
- package/src/agent/live-run.ts +38 -0
- package/src/agent/model-selection.ts +3 -2
- package/src/agent/moves.ts +174 -0
- package/src/agent/thread-reader-state.ts +75 -0
- package/src/agent/types.ts +6 -0
- package/src/artifacts/live/session.ts +5 -0
- package/src/createCustomApp.ts +57 -3
- package/src/index.ts +4 -0
- package/src/pages/console/data/accounts.tsx +509 -0
- package/src/pages/console/data/connectors.tsx +67 -64
- package/src/pages/console/data/datasets.tsx +79 -68
- package/src/pages/console/data/live-updates.ts +2 -0
- package/src/pages/console/data/messages.ts +73 -0
- package/src/pages/console/data/pipelines.tsx +80 -69
- package/src/pages/console/data/projections.tsx +111 -82
- package/src/pages/console/data/sync-button.tsx +56 -16
- package/src/pages/console/data/syncs.tsx +121 -86
- package/src/pages/console/ontology/actions.tsx +51 -24
- package/src/pages/console/ontology/object-type.tsx +5 -1
- package/src/pages/console/ontology/object-types.tsx +41 -32
- package/src/pages/console/ontology/rules.tsx +48 -38
- package/src/pages/console/ontology/workflow.tsx +9 -3
- package/src/pages/console/ontology/workflows.tsx +55 -67
- package/src/pages/folders.tsx +335 -0
- package/src/pages/section-ui.tsx +1 -1
- package/src/pages/settings/usage/breakdown.tsx +5 -2
- package/src/pages/settings/usage/filter-menu.tsx +1 -1
- package/src/pages/settings/usage/page.tsx +32 -13
- package/src/pages/settings/usage/spend-chart.tsx +2 -2
- package/src/pages/settings/usage/spend-model.ts +118 -50
- package/src/server.ts +1 -0
- /package/dist/{chunk-69qgh20f.js.map → chunk-1f4h75n3.js.map} +0 -0
- /package/dist/{chunk-5sgac68y.js.map → chunk-dntecmwb.js.map} +0 -0
- /package/dist/{chunk-4wm09prf.js.map → chunk-qmka6aea.js.map} +0 -0
|
@@ -0,0 +1,335 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Browsing a list of definitions by the folders they sit in: `datasets/raw/erp/orders.ts` puts
|
|
3
|
+
* `orders` in the folder `raw/erp`. A list page shows its top level with a tile for each folder,
|
|
4
|
+
* and opening one becomes the page itself, titled by the folder with a way back up, the way a
|
|
5
|
+
* detail page is. Searching looks through every folder at once and groups what it finds by
|
|
6
|
+
* folder. A project without folders sees its lists exactly as before.
|
|
7
|
+
*
|
|
8
|
+
* The open folder lives in the URL (`?folder=raw/erp`), so the browser's back button, reloads and
|
|
9
|
+
* shared links all keep it.
|
|
10
|
+
*/
|
|
11
|
+
import { defineMessages, type MessageTree, plural, type Translation } from "@sixb/ui/lib/i18n"
|
|
12
|
+
import { cn } from "@sixb/ui/lib/utils"
|
|
13
|
+
import { type ReactNode, useMemo } from "react"
|
|
14
|
+
import { Link, useLocation, useSearchParams } from "react-router-dom"
|
|
15
|
+
|
|
16
|
+
export const en = {
|
|
17
|
+
items: (count: number) => plural("en", count, { one: "1 item", other: `${count} items` }),
|
|
18
|
+
} satisfies MessageTree
|
|
19
|
+
|
|
20
|
+
export const fr: Translation<typeof en> = {
|
|
21
|
+
items: (count: number) => plural("fr", count, { one: "1 élément", other: `${count} éléments` }),
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const useFolderMessages = defineMessages<typeof en>({ en, fr }).useMessages
|
|
25
|
+
|
|
26
|
+
const FOLDER_PARAM = "folder"
|
|
27
|
+
|
|
28
|
+
/** A definition as the API lists it: in a folder below its directory, or at its top. */
|
|
29
|
+
export interface Foldered {
|
|
30
|
+
readonly folder?: string
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** One empty list for every page to start from while its query loads, so memos hold. */
|
|
34
|
+
export const noItems: readonly never[] = []
|
|
35
|
+
|
|
36
|
+
export interface FolderTile {
|
|
37
|
+
/** The folder's own name, such as `erp`. */
|
|
38
|
+
readonly name: string
|
|
39
|
+
/** Its full path, such as `raw/erp`. */
|
|
40
|
+
readonly path: string
|
|
41
|
+
/** Everything inside it, in subfolders too. */
|
|
42
|
+
readonly count: number
|
|
43
|
+
readonly href: string
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export interface FolderGroup<TItem> {
|
|
47
|
+
/** Undefined for the items at the top. */
|
|
48
|
+
readonly folder: string | undefined
|
|
49
|
+
readonly items: readonly TItem[]
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export interface FolderBrowser<TItem> {
|
|
53
|
+
/** The open folder's subfolders, by name. */
|
|
54
|
+
readonly folders: readonly FolderTile[]
|
|
55
|
+
/** The items directly in the open folder. */
|
|
56
|
+
readonly items: readonly TItem[]
|
|
57
|
+
/** While the list is narrowed, every match grouped by folder, the top first. */
|
|
58
|
+
readonly groups: readonly FolderGroup<TItem>[] | undefined
|
|
59
|
+
/** What the page's header shows: the list's own at the top, the folder's inside one. */
|
|
60
|
+
readonly frame: {
|
|
61
|
+
readonly title: string
|
|
62
|
+
readonly description?: string
|
|
63
|
+
readonly back?: { readonly href: string; readonly label: string }
|
|
64
|
+
readonly meta?: ReactNode
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Arrange `items` by folder for the page at the current URL. Pass every item while nothing narrows
|
|
70
|
+
* the list, and only the matches with `narrowed` while a search or filter does: folders then give
|
|
71
|
+
* way to the matches from all of them, grouped by folder.
|
|
72
|
+
*/
|
|
73
|
+
export function useFolderBrowser<TItem extends Foldered>({
|
|
74
|
+
items,
|
|
75
|
+
title,
|
|
76
|
+
description,
|
|
77
|
+
meta,
|
|
78
|
+
narrowed = false,
|
|
79
|
+
}: {
|
|
80
|
+
readonly items: readonly TItem[]
|
|
81
|
+
/** The list's own title and description, shown at the top. */
|
|
82
|
+
readonly title: string
|
|
83
|
+
readonly description?: string
|
|
84
|
+
readonly meta?: ReactNode
|
|
85
|
+
readonly narrowed?: boolean
|
|
86
|
+
}): FolderBrowser<TItem> {
|
|
87
|
+
const messages = useFolderMessages()
|
|
88
|
+
const { pathname } = useLocation()
|
|
89
|
+
const [searchParams] = useSearchParams()
|
|
90
|
+
const arranged = useMemo(
|
|
91
|
+
() => arrangeByFolder(items, searchParams.get(FOLDER_PARAM) ?? undefined, narrowed),
|
|
92
|
+
[items, narrowed, searchParams]
|
|
93
|
+
)
|
|
94
|
+
|
|
95
|
+
const hrefFor = (folder: string | undefined) => {
|
|
96
|
+
const params = new URLSearchParams(searchParams)
|
|
97
|
+
if (folder) params.set(FOLDER_PARAM, folder)
|
|
98
|
+
else params.delete(FOLDER_PARAM)
|
|
99
|
+
// A folder's slashes read better left as they are, and a query allows them.
|
|
100
|
+
const query = params.toString().replaceAll("%2F", "/")
|
|
101
|
+
return query ? `${pathname}?${query}` : pathname
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
const { folder } = arranged
|
|
105
|
+
const parent = folder ? parentOf(folder) : undefined
|
|
106
|
+
return {
|
|
107
|
+
items: arranged.items,
|
|
108
|
+
groups: arranged.groups,
|
|
109
|
+
folders: arranged.folders.map((tile) => ({ ...tile, href: hrefFor(tile.path) })),
|
|
110
|
+
frame: folder
|
|
111
|
+
? {
|
|
112
|
+
title: nameOf(folder),
|
|
113
|
+
back: { href: hrefFor(parent), label: parent ? nameOf(parent) : title },
|
|
114
|
+
meta: <span className="tabular-nums">{messages.items(arranged.total)}</span>,
|
|
115
|
+
}
|
|
116
|
+
: { title, description, meta },
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/** What a list holds at one folder, before it becomes links and a page header. */
|
|
121
|
+
export interface FolderArrangement<TItem> {
|
|
122
|
+
/** The open folder, or `undefined` at the top. */
|
|
123
|
+
readonly folder: string | undefined
|
|
124
|
+
readonly folders: readonly Omit<FolderTile, "href">[]
|
|
125
|
+
readonly items: readonly TItem[]
|
|
126
|
+
readonly groups: readonly FolderGroup<TItem>[] | undefined
|
|
127
|
+
/** Everything in the open folder, in its subfolders too. */
|
|
128
|
+
readonly total: number
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
/**
|
|
132
|
+
* The open folder's subfolders, each with how much it holds, and the items directly in it; or
|
|
133
|
+
* while `narrowed`, every item grouped by its folder. A folder nothing is in any more, say after
|
|
134
|
+
* its files moved, opens the top instead.
|
|
135
|
+
*/
|
|
136
|
+
export function arrangeByFolder<TItem extends Foldered>(
|
|
137
|
+
items: readonly TItem[],
|
|
138
|
+
requested: string | undefined,
|
|
139
|
+
narrowed: boolean
|
|
140
|
+
): FolderArrangement<TItem> {
|
|
141
|
+
if (narrowed) {
|
|
142
|
+
const byFolder = new Map<string | undefined, TItem[]>()
|
|
143
|
+
for (const item of items) {
|
|
144
|
+
const group = byFolder.get(item.folder)
|
|
145
|
+
if (group) group.push(item)
|
|
146
|
+
else byFolder.set(item.folder, [item])
|
|
147
|
+
}
|
|
148
|
+
const groups = [...byFolder.entries()]
|
|
149
|
+
.sort(([left], [right]) => compareFolders(left, right))
|
|
150
|
+
.map(([folder, grouped]) => ({ folder, items: grouped }))
|
|
151
|
+
return { folder: undefined, folders: [], items, groups, total: items.length }
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
const within = requested ? items.filter((item) => isWithin(item.folder, requested)) : items
|
|
155
|
+
const folder = requested && within.length > 0 ? requested : undefined
|
|
156
|
+
const inFolder = folder ? within : items
|
|
157
|
+
|
|
158
|
+
const counts = new Map<string, number>()
|
|
159
|
+
const direct: TItem[] = []
|
|
160
|
+
for (const item of inFolder) {
|
|
161
|
+
if (item.folder === folder) {
|
|
162
|
+
direct.push(item)
|
|
163
|
+
continue
|
|
164
|
+
}
|
|
165
|
+
// Inside `folder`, so `item.folder` is longer than it and its next segment is the subfolder.
|
|
166
|
+
const rest = folder ? item.folder?.slice(folder.length + 1) : item.folder
|
|
167
|
+
const name = rest?.split("/")[0]
|
|
168
|
+
if (!name) continue
|
|
169
|
+
const child = folder ? `${folder}/${name}` : name
|
|
170
|
+
counts.set(child, (counts.get(child) ?? 0) + 1)
|
|
171
|
+
}
|
|
172
|
+
const folders = [...counts.entries()]
|
|
173
|
+
.map(([path, count]) => ({ name: nameOf(path), path, count }))
|
|
174
|
+
.sort((left, right) => compareNames(left.name, right.name))
|
|
175
|
+
|
|
176
|
+
return { folder, folders, items: direct, groups: undefined, total: inFolder.length }
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
/**
|
|
180
|
+
* A folder browser's body: the open folder's subfolders as tiles, then its items through
|
|
181
|
+
* `children`, or while narrowed each folder's matches under its name. `children` only runs for a
|
|
182
|
+
* non-empty list, so a folder holding only folders shows no empty list.
|
|
183
|
+
*/
|
|
184
|
+
export function FolderContents<TItem>({
|
|
185
|
+
browser,
|
|
186
|
+
rootLabel,
|
|
187
|
+
children,
|
|
188
|
+
}: {
|
|
189
|
+
readonly browser: FolderBrowser<TItem>
|
|
190
|
+
/** Names the matches at the top while narrowed, such as "Datasets". */
|
|
191
|
+
readonly rootLabel: string
|
|
192
|
+
readonly children: (items: readonly TItem[]) => ReactNode
|
|
193
|
+
}) {
|
|
194
|
+
if (browser.groups) {
|
|
195
|
+
// With every match in one place, as in a project without folders, a heading would only repeat
|
|
196
|
+
// the page.
|
|
197
|
+
if (browser.groups.length < 2) return <>{children(browser.items)}</>
|
|
198
|
+
return (
|
|
199
|
+
<div className="flex flex-col gap-6">
|
|
200
|
+
{browser.groups.map((group) => (
|
|
201
|
+
<section key={group.folder ?? ""} className="flex flex-col gap-2.5">
|
|
202
|
+
<FolderHeading folder={group.folder} rootLabel={rootLabel} />
|
|
203
|
+
{children(group.items)}
|
|
204
|
+
</section>
|
|
205
|
+
))}
|
|
206
|
+
</div>
|
|
207
|
+
)
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
return (
|
|
211
|
+
<div className="flex flex-col gap-4">
|
|
212
|
+
{browser.folders.length > 0 ? <FolderTiles folders={browser.folders} /> : null}
|
|
213
|
+
{browser.items.length > 0 ? children(browser.items) : null}
|
|
214
|
+
</div>
|
|
215
|
+
)
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
function FolderTiles({ folders }: { readonly folders: readonly FolderTile[] }) {
|
|
219
|
+
const messages = useFolderMessages()
|
|
220
|
+
return (
|
|
221
|
+
// As many columns as fit tiles wide enough for a usual name, so names are read, not cut: one
|
|
222
|
+
// on a phone.
|
|
223
|
+
<ul className="grid grid-cols-[repeat(auto-fill,minmax(min(100%,12.5rem),1fr))] gap-2.5">
|
|
224
|
+
{folders.map((folder) => (
|
|
225
|
+
<li key={folder.path} className="min-w-0">
|
|
226
|
+
<Link
|
|
227
|
+
to={folder.href}
|
|
228
|
+
title={folder.name}
|
|
229
|
+
className={cn(
|
|
230
|
+
"group flex h-full min-w-0 items-center gap-3 rounded-xl border border-border bg-card px-3.5 py-2.5",
|
|
231
|
+
"shadow-[0_1px_2px_0_rgb(0_0_0/0.04)] outline-none transition-[background-color,border-color,transform] duration-150",
|
|
232
|
+
"hover:border-foreground/15 hover:bg-muted/40 focus-visible:ring-2 focus-visible:ring-ring",
|
|
233
|
+
"motion-safe:active:scale-[0.985]"
|
|
234
|
+
)}
|
|
235
|
+
>
|
|
236
|
+
<FolderGlyph className="h-7 w-8 shrink-0" />
|
|
237
|
+
<span className="min-w-0 flex-1">
|
|
238
|
+
{/* A name too long for its tile wraps, at its hyphens first, rather than lose its end. */}
|
|
239
|
+
<span className="line-clamp-2 text-sm leading-5 font-medium break-words">
|
|
240
|
+
{folder.name}
|
|
241
|
+
</span>
|
|
242
|
+
<span className="block text-xs leading-4 tabular-nums text-muted-foreground">
|
|
243
|
+
{messages.items(folder.count)}
|
|
244
|
+
</span>
|
|
245
|
+
</span>
|
|
246
|
+
</Link>
|
|
247
|
+
</li>
|
|
248
|
+
))}
|
|
249
|
+
</ul>
|
|
250
|
+
)
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
/** A folder's full path over its matches, with a glyph that says what it is. */
|
|
254
|
+
function FolderHeading({
|
|
255
|
+
folder,
|
|
256
|
+
rootLabel,
|
|
257
|
+
}: {
|
|
258
|
+
readonly folder: string | undefined
|
|
259
|
+
readonly rootLabel: string
|
|
260
|
+
}) {
|
|
261
|
+
return (
|
|
262
|
+
<h3 className="flex min-w-0 items-center gap-2 px-0.5 text-[0.8125rem] leading-5 font-medium text-muted-foreground">
|
|
263
|
+
{/* The top is the list itself, not a folder. */}
|
|
264
|
+
{folder ? <FolderGlyph className="h-3.5 w-4 shrink-0" /> : null}
|
|
265
|
+
<span className="truncate">{folder ? folder.replaceAll("/", " / ") : rootLabel}</span>
|
|
266
|
+
</h3>
|
|
267
|
+
)
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
/** A folder, drawn as one: its tab behind, its front over it, in a quiet system blue. */
|
|
271
|
+
function FolderGlyph({ className }: { readonly className?: string }) {
|
|
272
|
+
return (
|
|
273
|
+
<svg aria-hidden viewBox="0 0 32 26" className={className}>
|
|
274
|
+
<path
|
|
275
|
+
d="M1.5 5A3.5 3.5 0 0 1 5 1.5h6.2a3 3 0 0 1 2.1.88L15.4 4.5H27A3.5 3.5 0 0 1 30.5 8v2h-29z"
|
|
276
|
+
className="fill-[#6aa6e6] dark:fill-[#3f6fa3]"
|
|
277
|
+
/>
|
|
278
|
+
<rect
|
|
279
|
+
x="1.5"
|
|
280
|
+
y="7"
|
|
281
|
+
width="29"
|
|
282
|
+
height="17.5"
|
|
283
|
+
rx="3.25"
|
|
284
|
+
className="fill-[#8cc0f2] dark:fill-[#5288c2]"
|
|
285
|
+
/>
|
|
286
|
+
<path d="M2.75 9.25h26.5" className="stroke-white/40 dark:stroke-white/15" strokeWidth="1" />
|
|
287
|
+
</svg>
|
|
288
|
+
)
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
/**
|
|
292
|
+
* Where a detail page's back link goes: its folder when it has one, so leaving a definition
|
|
293
|
+
* returns to where it was found, or the list itself.
|
|
294
|
+
*/
|
|
295
|
+
export function folderBack(
|
|
296
|
+
list: { readonly href: string; readonly label: string },
|
|
297
|
+
folder: string | undefined
|
|
298
|
+
): { readonly href: string; readonly label: string } {
|
|
299
|
+
if (!folder) return list
|
|
300
|
+
return { href: `${list.href}?${FOLDER_PARAM}=${encodeFolder(folder)}`, label: nameOf(folder) }
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
function encodeFolder(folder: string): string {
|
|
304
|
+
return folder.split("/").map(encodeURIComponent).join("/")
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
/** Whether `folder` is `ancestor` or inside it. Everything is within the top. */
|
|
308
|
+
function isWithin(folder: string | undefined, ancestor: string | undefined): boolean {
|
|
309
|
+
if (ancestor === undefined) return true
|
|
310
|
+
if (folder === undefined) return false
|
|
311
|
+
return folder === ancestor || folder.startsWith(`${ancestor}/`)
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
function nameOf(folder: string): string {
|
|
315
|
+
return folder.slice(folder.lastIndexOf("/") + 1)
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
function parentOf(folder: string): string | undefined {
|
|
319
|
+
const slash = folder.lastIndexOf("/")
|
|
320
|
+
return slash === -1 ? undefined : folder.slice(0, slash)
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: "base" })
|
|
324
|
+
|
|
325
|
+
function compareNames(left: string, right: string): number {
|
|
326
|
+
return collator.compare(left, right)
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
/** The top first, then folders by path. */
|
|
330
|
+
function compareFolders(left: string | undefined, right: string | undefined): number {
|
|
331
|
+
if (left === right) return 0
|
|
332
|
+
if (left === undefined) return -1
|
|
333
|
+
if (right === undefined) return 1
|
|
334
|
+
return compareNames(left, right)
|
|
335
|
+
}
|
package/src/pages/section-ui.tsx
CHANGED
|
@@ -350,7 +350,7 @@ export function PanelRow({
|
|
|
350
350
|
}
|
|
351
351
|
|
|
352
352
|
return (
|
|
353
|
-
<div className="flex items-center gap-3.5 px-4 py-3.5">
|
|
353
|
+
<div className="group flex items-center gap-3.5 px-4 py-3.5">
|
|
354
354
|
{body}
|
|
355
355
|
{trailing ? <div className="flex shrink-0 items-center gap-2">{trailing}</div> : null}
|
|
356
356
|
</div>
|
|
@@ -83,9 +83,10 @@ export function Breakdown({
|
|
|
83
83
|
...(lens === "model" ? { provider: undefined, model: undefined } : { [lens]: undefined }),
|
|
84
84
|
}
|
|
85
85
|
const active = activeRange(range, filters)
|
|
86
|
+
const earlier = priorRange(active, range)
|
|
86
87
|
const base = useQuery({
|
|
87
88
|
...getAiAccountingOverviewOptions({
|
|
88
|
-
query: { ...active, bucket: range.bucket, ...apiFilters(others) },
|
|
89
|
+
query: { ...active, bucket: range.bucket, timeZone: range.timeZone, ...apiFilters(others) },
|
|
89
90
|
}),
|
|
90
91
|
retry: false,
|
|
91
92
|
})
|
|
@@ -102,6 +103,7 @@ export function Breakdown({
|
|
|
102
103
|
from: range.from,
|
|
103
104
|
to: range.to,
|
|
104
105
|
bucket: range.bucket,
|
|
106
|
+
timeZone: range.timeZone,
|
|
105
107
|
...apiFilters({ ...others, ...row.narrow, day: undefined }),
|
|
106
108
|
},
|
|
107
109
|
}),
|
|
@@ -112,8 +114,9 @@ export function Breakdown({
|
|
|
112
114
|
queries: shown.map((row) => ({
|
|
113
115
|
...getAiAccountingOverviewOptions({
|
|
114
116
|
query: {
|
|
115
|
-
...
|
|
117
|
+
...earlier,
|
|
116
118
|
bucket: range.bucket,
|
|
119
|
+
timeZone: range.timeZone,
|
|
117
120
|
...apiFilters({ ...others, ...row.narrow }),
|
|
118
121
|
},
|
|
119
122
|
}),
|
|
@@ -54,7 +54,7 @@ export function useFilterLabels(overview: Overview | undefined, range: SpendRang
|
|
|
54
54
|
value(key: FilterKey, value: string, filters: SpendFilters): string {
|
|
55
55
|
switch (key) {
|
|
56
56
|
case "day":
|
|
57
|
-
return bucketLabel(value, range.bucket, locale)
|
|
57
|
+
return bucketLabel(value, range.bucket, locale, range.timeZone)
|
|
58
58
|
case "model":
|
|
59
59
|
return value
|
|
60
60
|
case "provider":
|
|
@@ -31,6 +31,7 @@ import {
|
|
|
31
31
|
modelPalette,
|
|
32
32
|
money,
|
|
33
33
|
percent,
|
|
34
|
+
periodKey,
|
|
34
35
|
priorRange,
|
|
35
36
|
rangeLabel,
|
|
36
37
|
readFilters,
|
|
@@ -40,6 +41,7 @@ import {
|
|
|
40
41
|
spendRanges,
|
|
41
42
|
splitMoney,
|
|
42
43
|
unpricedCalls,
|
|
44
|
+
viewerTimeZone,
|
|
43
45
|
} from "./spend-model"
|
|
44
46
|
|
|
45
47
|
type UsageTab = "spend" | "limits"
|
|
@@ -48,23 +50,30 @@ type UsageTab = "spend" | "limits"
|
|
|
48
50
|
* Settings › Usage: what models were called, what it cost and who asked, narrowed by the filters
|
|
49
51
|
* any number on the page sets, down to how one call was priced. Limits sit on their own tab.
|
|
50
52
|
*/
|
|
51
|
-
export function SettingsUsagePage(
|
|
53
|
+
export function SettingsUsagePage({
|
|
54
|
+
timeZone = viewerTimeZone(),
|
|
55
|
+
}: {
|
|
56
|
+
/** The zone the page's days follow; the reader's own unless a caller pins one. */
|
|
57
|
+
readonly timeZone?: string
|
|
58
|
+
} = {}) {
|
|
52
59
|
const messages = useAiUsageMessages()
|
|
53
60
|
const locale = useLocale()
|
|
54
61
|
const [params, setParams] = useSearchParams()
|
|
55
62
|
const tab: UsageTab = params.get("tab") === "limits" ? "limits" : "spend"
|
|
56
63
|
const rangeId = params.get("range")
|
|
57
64
|
// The range ends with the current period; choosing a range again moves it to now.
|
|
58
|
-
const range = useMemo(() => spendRange(rangeId), [rangeId])
|
|
59
|
-
const filters = useMemo(() => readFilters(params), [params])
|
|
65
|
+
const range = useMemo(() => spendRange(rangeId, timeZone), [rangeId, timeZone])
|
|
66
|
+
const filters = useMemo(() => readFilters(params, range), [params, range])
|
|
60
67
|
|
|
61
68
|
const update = (change: (next: URLSearchParams) => void) => {
|
|
62
69
|
const next = new URLSearchParams(params)
|
|
63
70
|
change(next)
|
|
64
71
|
setParams(next, { replace: true })
|
|
65
72
|
}
|
|
66
|
-
const setFilter = (key: FilterKey,
|
|
73
|
+
const setFilter = (key: FilterKey, filter: string | undefined) =>
|
|
67
74
|
update((next) => {
|
|
75
|
+
// A picked bar is spelled as its date, so the link opens the same day in another zone.
|
|
76
|
+
const value = key === "day" && filter !== undefined ? periodKey(filter, range) : filter
|
|
68
77
|
if (value === undefined || next.get(key) === value) next.delete(key)
|
|
69
78
|
else next.set(key, value)
|
|
70
79
|
// A model belongs to its provider; the two are one filter.
|
|
@@ -94,7 +103,7 @@ export function SettingsUsagePage() {
|
|
|
94
103
|
page="usage"
|
|
95
104
|
width="wide"
|
|
96
105
|
title={messages.title}
|
|
97
|
-
description={messages.subtitle(rangeLabel(range, locale))}
|
|
106
|
+
description={messages.subtitle(rangeLabel(range, locale, range.timeZone))}
|
|
98
107
|
actions={
|
|
99
108
|
<>
|
|
100
109
|
<Segmented
|
|
@@ -159,28 +168,32 @@ function Spend({ range, filters, onFilter, onModel, onClear, limitsHref }: Spend
|
|
|
159
168
|
const active = activeRange(range, filters)
|
|
160
169
|
const query = apiFilters(filters)
|
|
161
170
|
const bucket = range.bucket
|
|
171
|
+
const timeZone = range.timeZone
|
|
172
|
+
const earlier = priorRange(active, range)
|
|
162
173
|
|
|
163
174
|
const overview = useQuery({
|
|
164
|
-
...getAiAccountingOverviewOptions({ query: { ...active, bucket, ...query } }),
|
|
175
|
+
...getAiAccountingOverviewOptions({ query: { ...active, bucket, timeZone, ...query } }),
|
|
165
176
|
retry: false,
|
|
166
177
|
})
|
|
167
178
|
const chart = useQuery({
|
|
168
179
|
...getAiAccountingOverviewOptions({
|
|
169
|
-
query: { from: range.from, to: range.to, bucket, ...query },
|
|
180
|
+
query: { from: range.from, to: range.to, bucket, timeZone, ...query },
|
|
170
181
|
}),
|
|
171
182
|
retry: false,
|
|
172
183
|
})
|
|
173
184
|
const prior = useQuery({
|
|
174
|
-
...getAiAccountingOverviewOptions({ query: { ...
|
|
185
|
+
...getAiAccountingOverviewOptions({ query: { ...earlier, bucket, timeZone, ...query } }),
|
|
175
186
|
retry: false,
|
|
176
187
|
})
|
|
177
188
|
// Unfiltered, for each model's color and for what share of all spend a filter keeps.
|
|
178
189
|
const everything = useQuery({
|
|
179
|
-
...getAiAccountingOverviewOptions({
|
|
190
|
+
...getAiAccountingOverviewOptions({
|
|
191
|
+
query: { from: range.from, to: range.to, bucket, timeZone },
|
|
192
|
+
}),
|
|
180
193
|
retry: false,
|
|
181
194
|
})
|
|
182
195
|
const everythingActive = useQuery({
|
|
183
|
-
...getAiAccountingOverviewOptions({ query: { ...active, bucket } }),
|
|
196
|
+
...getAiAccountingOverviewOptions({ query: { ...active, bucket, timeZone } }),
|
|
184
197
|
enabled: narrowed,
|
|
185
198
|
retry: false,
|
|
186
199
|
})
|
|
@@ -306,8 +319,8 @@ function Spend({ range, filters, onFilter, onModel, onClear, limitsHref }: Spend
|
|
|
306
319
|
currency={currency}
|
|
307
320
|
priorLabel={
|
|
308
321
|
filters.day
|
|
309
|
-
? bucketLabel(
|
|
310
|
-
: rangeLabel(
|
|
322
|
+
? bucketLabel(earlier.from, bucket, locale, timeZone)
|
|
323
|
+
: rangeLabel(earlier, locale, timeZone)
|
|
311
324
|
}
|
|
312
325
|
limitsHref={limitsHref}
|
|
313
326
|
runsQuery={{ ...active, ...query }}
|
|
@@ -570,7 +583,13 @@ function ExportButton({ range, filters }: { range: SpendRange; filters: SpendFil
|
|
|
570
583
|
const messages = useAiUsageMessages()
|
|
571
584
|
const { data } = useQuery({
|
|
572
585
|
...getAiAccountingOverviewOptions({
|
|
573
|
-
query: {
|
|
586
|
+
query: {
|
|
587
|
+
from: range.from,
|
|
588
|
+
to: range.to,
|
|
589
|
+
bucket: range.bucket,
|
|
590
|
+
timeZone: range.timeZone,
|
|
591
|
+
...apiFilters(filters),
|
|
592
|
+
},
|
|
574
593
|
}),
|
|
575
594
|
retry: false,
|
|
576
595
|
})
|
|
@@ -264,7 +264,7 @@ export function SpendChart({
|
|
|
264
264
|
const isHover = hover === index
|
|
265
265
|
const values = series.map((entry) => entry.values[index] ?? 0)
|
|
266
266
|
const last = values.reduce((top, value, at) => (value > 0 ? at : top), -1)
|
|
267
|
-
const label = bucketLabel(period.start, range.bucket, locale)
|
|
267
|
+
const label = bucketLabel(period.start, range.bucket, locale, range.timeZone)
|
|
268
268
|
const segmentIndex = series.findIndex((entry) => entry.key === hoverSeries)
|
|
269
269
|
const hoveredSegment = segmentIndex >= 0 ? segmentIndex : undefined
|
|
270
270
|
return (
|
|
@@ -358,7 +358,7 @@ export function SpendChart({
|
|
|
358
358
|
)}
|
|
359
359
|
>
|
|
360
360
|
{index % every === 0 || picked === index || hover === index
|
|
361
|
-
? bucketLabel(start, range.bucket, locale)
|
|
361
|
+
? bucketLabel(start, range.bucket, locale, range.timeZone)
|
|
362
362
|
: ""}
|
|
363
363
|
</span>
|
|
364
364
|
))}
|