- Notifications
You must be signed in to change notification settings - Fork1k
feat: display the number of idle tasks in the navbar#19471
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
7 commits Select commitHold shift + click to select a range
a880e67 feat: add badge in the navbar
BrunoQuaresmaf437556 Add stories
BrunoQuaresma1fa4f23 show tasks nav item in chromatic
BrunoQuaresmabddab45 Apply PR review
BrunoQuaresma7358bf8 Merge branch 'main' of https://github.com/coder/coder into bq/19323
BrunoQuaresmaa0995bf Fix merge issues
BrunoQuaresmacbef909 Fix storybook
BrunoQuaresmaFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
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 |
|---|---|---|
| @@ -1,13 +1,21 @@ | ||
| import { API } from "api/api"; | ||
| import type * as TypesGen from "api/typesGenerated"; | ||
| import { Badge } from "components/Badge/Badge"; | ||
| import { Button } from "components/Button/Button"; | ||
| import { ExternalImage } from "components/ExternalImage/ExternalImage"; | ||
| import { CoderIcon } from "components/Icons/CoderIcon"; | ||
| import { | ||
| Tooltip, | ||
| TooltipContent, | ||
| TooltipProvider, | ||
| TooltipTrigger, | ||
| } from "components/Tooltip/Tooltip"; | ||
| import type { ProxyContextValue } from "contexts/ProxyContext"; | ||
| import { useWebpushNotifications } from "contexts/useWebpushNotifications"; | ||
| import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata"; | ||
| import { NotificationsInbox } from "modules/notifications/NotificationsInbox/NotificationsInbox"; | ||
| import type { FC } from "react"; | ||
| import { useQuery } from "react-query"; | ||
| import { NavLink, useLocation } from "react-router"; | ||
| import { cn } from "utils/cn"; | ||
| import { DeploymentDropdown } from "./DeploymentDropdown"; | ||
| @@ -17,7 +25,7 @@ import { UserDropdown } from "./UserDropdown/UserDropdown"; | ||
| interface NavbarViewProps { | ||
| logo_url?: string; | ||
| user: TypesGen.User; | ||
johnstcn marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| buildInfo?: TypesGen.BuildInfoResponse; | ||
| supportLinks?: readonly TypesGen.LinkConfig[]; | ||
| onSignOut: () => void; | ||
| @@ -60,7 +68,7 @@ export const NavbarView: FC<NavbarViewProps> = ({ | ||
| )} | ||
| </NavLink> | ||
| <NavItems className="ml-4"user={user}/> | ||
| <div className="flex items-center gap-3 ml-auto"> | ||
| {proxyContextValue && ( | ||
| @@ -109,16 +117,14 @@ export const NavbarView: FC<NavbarViewProps> = ({ | ||
| } | ||
| /> | ||
| <div className="hidden md:block"> | ||
| <UserDropdown | ||
| user={user} | ||
| buildInfo={buildInfo} | ||
| supportLinks={supportLinks} | ||
| onSignOut={onSignOut} | ||
| /> | ||
| </div> | ||
| <div className="md:hidden"> | ||
| <MobileMenu | ||
| @@ -140,11 +146,11 @@ export const NavbarView: FC<NavbarViewProps> = ({ | ||
| interface NavItemsProps { | ||
| className?: string; | ||
| user: TypesGen.User; | ||
| } | ||
| const NavItems: FC<NavItemsProps> = ({ className, user }) => { | ||
| const location = useLocation(); | ||
| return ( | ||
| <nav className={cn("flex items-center gap-4 h-full", className)}> | ||
| @@ -153,30 +159,84 @@ const NavItems: FC<NavItemsProps> = ({ className }) => { | ||
| if (location.pathname.startsWith("/@")) { | ||
| isActive = true; | ||
| } | ||
| return cn(linkStyles.default,{ [linkStyles.active]: isActive }); | ||
| }} | ||
| to="/workspaces" | ||
| > | ||
| Workspaces | ||
| </NavLink> | ||
| <NavLink | ||
| className={({ isActive }) => { | ||
| return cn(linkStyles.default,{ [linkStyles.active]: isActive }); | ||
| }} | ||
| to="/templates" | ||
| > | ||
| Templates | ||
| </NavLink> | ||
| <TasksNavItem user={user} /> | ||
| </nav> | ||
| ); | ||
| }; | ||
| type TasksNavItemProps = { | ||
| user: TypesGen.User; | ||
| }; | ||
| const TasksNavItem: FC<TasksNavItemProps> = ({ user }) => { | ||
| const { metadata } = useEmbeddedMetadata(); | ||
| const canSeeTasks = Boolean( | ||
| metadata["tasks-tab-visible"].value || | ||
| process.env.NODE_ENV === "development" || | ||
| process.env.STORYBOOK, | ||
| ); | ||
BrunoQuaresma marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| const filter = { | ||
| username: user.username, | ||
| }; | ||
| const { data: idleCount } = useQuery({ | ||
| queryKey: ["tasks", filter], | ||
| queryFn: () => API.experimental.getTasks(filter), | ||
| refetchInterval: 1_000 * 60, | ||
| enabled: canSeeTasks, | ||
| refetchOnWindowFocus: true, | ||
| initialData: [], | ||
| select: (data) => | ||
| data.filter((task) => task.workspace.latest_app_status?.state === "idle") | ||
| .length, | ||
| }); | ||
BrunoQuaresma marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| if (!canSeeTasks) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <NavLink | ||
| to="/tasks" | ||
| className={({ isActive }) => { | ||
| return cn(linkStyles.default, { [linkStyles.active]: isActive }); | ||
| }} | ||
| > | ||
| Tasks | ||
| {idleCount > 0 && ( | ||
| <TooltipProvider> | ||
| <Tooltip> | ||
| <TooltipTrigger asChild> | ||
| <Badge | ||
| variant="info" | ||
| size="xs" | ||
| className="ml-2" | ||
| aria-label={idleTasksLabel(idleCount)} | ||
| > | ||
| {idleCount} | ||
| </Badge> | ||
| </TooltipTrigger> | ||
| <TooltipContent>{idleTasksLabel(idleCount)}</TooltipContent> | ||
| </Tooltip> | ||
| </TooltipProvider> | ||
| )} | ||
| </NavLink> | ||
| ); | ||
| }; | ||
| function idleTasksLabel(count: number) { | ||
| return `You have ${count} ${count === 1 ? "task" : "tasks"} waiting for input`; | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.