perf(desktop): paginate usage activity #4539
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| export { | ||
| shortUsageActivitySessionId, | ||
| UsageActivityPagination, | ||
| type UsageActivityPage, | ||
| } from './ui/usage-activity-pagination.js'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { Pagination, paginateData } from '@astryxdesign/core'; | ||
| import { HStack } from '@maka/ui'; | ||
| import { useState, type ReactNode } from 'react'; | ||
| import { parseDesktopSessionKey } from '../../../../shared/runtime-host-identity.js'; | ||
|
|
||
| export interface UsageActivityPage<Item> { | ||
| items: Item[]; | ||
| rowIndexStart: number; | ||
| rowCount: number; | ||
| reset(): void; | ||
| } | ||
|
|
||
| export function UsageActivityPagination<Item>(props: { | ||
| items: Item[]; | ||
| pageSize: number; | ||
| children(page: UsageActivityPage<Item>): ReactNode; | ||
| }) { | ||
| const [page, setPage] = useState(1); | ||
| const pageCount = Math.max(1, Math.ceil(props.items.length / props.pageSize)); | ||
| const currentPage = Math.min(page, pageCount); | ||
|
|
||
| return ( | ||
| <> | ||
| {props.children({ | ||
| items: paginateData(props.items, currentPage, props.pageSize), | ||
| rowIndexStart: (currentPage - 1) * props.pageSize + 1, | ||
| rowCount: props.items.length, | ||
| reset: () => setPage(1), | ||
| })} | ||
| {pageCount > 1 ? ( | ||
| <HStack hAlign="center"> | ||
| <Pagination | ||
| page={currentPage} | ||
| onChange={setPage} | ||
| totalItems={props.items.length} | ||
| pageSize={props.pageSize} | ||
| size="sm" | ||
| /> | ||
| </HStack> | ||
| ) : null} | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| export function shortUsageActivitySessionId(sessionKey: string) { | ||
|
Contributor
There was a problem hiding this comment. P3: this helper is about session ids, not pagination, and its only caller is still |
||
| try { | ||
| return shortenSessionId(parseDesktopSessionKey(sessionKey).sessionId); | ||
| } catch { | ||
| return shortenSessionId(sessionKey); | ||
| } | ||
| } | ||
|
|
||
| function shortenSessionId(sessionId: string) { | ||
| return sessionId.length > 8 ? sessionId.slice(0, 8) : sessionId; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P3:
@astryxdesign/core@0.5.2already ships the seam this reimplements.useTablePaginationis the Table plugin for exactly this shape (consumer owns the page state, the plugin rendersPaginationaround the table, withposition,align,sizeandlabel). The PR usespaginateDatafrom the same module but routes around the plugin with a render-prop component, a new feature directory and a barrel.The smaller equivalent: hold
pageinUsageRequestsPanel(above theshowDetailsearly return), callpaginateDatadirectly, and pass the plugin throughUsageStatsTable. That deletesfeatures/usage-activity/entirely, theUsageActivityPagetype, and therenderer-architecture.jsonplusastryx-surface-file-inventorychurn, and turns the reset into a plainsetPage(1). I have not rendered the plugin's chrome to confirm it matches the currentHStack+Paginationlayout; if it does not, the fallback is still to move the state intoUsageRequestsPaneland drop the wrapper while keeping the hand-placedPagination.