Skip to content

Fix empty join token ui state #45413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avatus merged 1 commit into from
Aug 13, 2024
Merged

Fix empty join token ui state #45413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion web/packages/teleport/src/services/joinToken/joinToken.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class JoinTokenService {
fetchJoinTokens(signal: AbortSignal = null): Promise<{ items: JoinToken[] }> {
return api.get(cfg.getJoinTokensUrl(), signal).then(resp => {
return {
items: resp.items.map(makeJoinToken),
items: resp.items?.map(makeJoinToken) || [],
Copy link
Copy Markdown
Member

@ravicious ravicious Aug 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the API endpoint not include items when there are no items to return?

Copy link
Copy Markdown
Contributor

@marcoandredinis marcoandredinis Aug 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It includes it, but it's null:
image

Copy link
Copy Markdown
Contributor Author

@avatus avatus Aug 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it has to do with not using zero-length slices.

};
});
}
Expand Down