[v18] feat(web): Add Instances to Bot Details (#57023)#57445
Merged
nicholasmarais1158 merged 3 commits intobranch/v18from Aug 4, 2025
Merged
[v18] feat(web): Add Instances to Bot Details (#57023)#57445nicholasmarais1158 merged 3 commits intobranch/v18from
nicholasmarais1158 merged 3 commits intobranch/v18from
Conversation
* RPC and cache * API * Update rfc0217 * Remove unnecessary copy * Fix import ordering * Fix cache bypass issue * Add context to unmarshal error * Wrap page_size parse error * Keep backend range logic consistent * feat(web): Add Join Tokens panel to Bot Details * Copy correction * Remove unneeded alert action * Handle outdated proxy error * Extend tests * Rename * Use `tokens.list` for access to tokens page (instead of `tokens.create`) * Add outline label variants * Add `semver` dep to teleport package * Add `useClusterVersion` hook * Expose heartbeat OS * Add sorting icons * Add `JoinMethodIcon` component * Add bot instances to Bot Details * Missing lock content * Fix scroll container * Scroll to top on sort * Remove unused import * Extract join method icons to component * Add mission join token icons/logos * Use OS logos (update windows) * Save some lines 😮💨 * Unused imports * Use shared semver * Fix exhaustive check * Re-export new Label variants * Correct version compatibility logic and messaging * Improve error state UX * Use `H2` * Reduce lines * Reduce lines (more) * Fix tests and lint * Fix grid alignment * Remove unnecessary margin 0 * Clarify roles container * Improve type safety of sort state * Remove unnecessary wrappers * Improve `useClusterVersion` * Add sorting icons (used later) * Rename `check()` * Correct newer version messaging # Conflicts: # web/packages/design/src/ResourceIcon/assets/windows-dark.svg # web/packages/design/src/ResourceIcon/assets/windows-light.svg # web/packages/shared/utils/semVer.ts # web/packages/teleport/src/Bots/Details/BotDetails.test.tsx # web/packages/teleport/src/Bots/Edit/EditDialog.test.tsx
nicholasmarais1158
added
machine-id
no-changelog
ravicious
reviewed
Aug 1, 2025
Member
There was a problem hiding this comment.
I ran into an unrelated problem with the icons on master. After running pnpm process-icons, I noticed that these are getting updated. I fixed them in the master PR, could you update them in the backports?
Contributor
Author
There was a problem hiding this comment.
Thank you.
It's not quite clear how I managed to do that. Maybe I never processed them originally - unlike Icons, they'll work fine without being processed, as they're only optimised and not converted to tsx.
Anyway, I've run `pnpm process-icons' now. 🤞
strideynet
changed the title
nicholasmarais1158
requested review from
avatus,
gzdunek,
r0mant and
zmb3
as code owners
gzdunek
approved these changes
Aug 1, 2025
strideynet
approved these changes
Aug 4, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
nicholasmarais1158
deleted the
nicholasmarais1158/backport-57023-branch/v18
branch
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Backport #57023 to branch/v18
Note: adds dependency on
semverwhich isn't yet backported.Also, reprocessed icons (
pnpm process-icons)Updates: #47342