From 0ad35549ace190277f9f0f48bf9da7026547efd0 Mon Sep 17 00:00:00 2001
From: brendanlaschke <brendan.laschke@googlemail.com>
Date: Wed, 2 Aug 2023 07:11:07 +0200
Subject: [PATCH] Fix hotkeys for tasks page (#1034)

- fix hotkeys for tasks
---
 front/src/AppNavbar.tsx                              |  1 +
 .../modules/command-menu/components/CommandMenu.tsx  | 12 +++++++++---
 front/src/modules/types/PageHotkeyScope.ts           |  1 +
 front/src/sync-hooks/AuthAutoRouter.tsx              |  5 +++++
 front/src/sync-hooks/GotoHotkeysHooks.tsx            |  1 +
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/front/src/AppNavbar.tsx b/front/src/AppNavbar.tsx
index 544db676b132..0b6f09bc4ae7 100644
--- a/front/src/AppNavbar.tsx
+++ b/front/src/AppNavbar.tsx
@@ -49,6 +49,7 @@ export function AppNavbar() {
           <NavItem
             label="Tasks"
             to="/tasks"
+            active={currentPath === '/tasks'}
             icon={<IconCheckbox size={theme.icon.size.md} />}
           />
           <NavTitle label="Workspace" />
diff --git a/front/src/modules/command-menu/components/CommandMenu.tsx b/front/src/modules/command-menu/components/CommandMenu.tsx
index 765f7dc149d5..842c6322a56c 100644
--- a/front/src/modules/command-menu/components/CommandMenu.tsx
+++ b/front/src/modules/command-menu/components/CommandMenu.tsx
@@ -98,6 +98,11 @@ export function CommandMenu() {
       label: 'Go to Settings',
       shortcuts: ['G', 'S'],
     },
+    {
+      to: '/tasks',
+      label: 'Go to Tasks',
+      shortcuts: ['G', 'T'],
+    },
   ];
 
   const matchingCommand = commands.find(
@@ -162,7 +167,6 @@ export function CommandMenu() {
         {matchingCommand && (
           <StyledGroup heading="Navigate">
             <CommandMenuItem
-              key={matchingCommand.shortcuts?.join('')}
               to={matchingCommand.to}
               label={matchingCommand.label}
               shortcuts={matchingCommand.shortcuts}
@@ -222,8 +226,10 @@ export function CommandMenu() {
         {!matchingCommand && (
           <StyledGroup heading="Navigate">
             {commands
-              .filter((cmd) =>
-                cmd.shortcuts?.join('').includes(search?.toUpperCase()),
+              .filter(
+                (cmd) =>
+                  cmd.shortcuts?.join('').includes(search?.toUpperCase()) ||
+                  cmd.label?.toUpperCase().includes(search?.toUpperCase()),
               )
               .map((cmd) => (
                 <CommandMenuItem
diff --git a/front/src/modules/types/PageHotkeyScope.ts b/front/src/modules/types/PageHotkeyScope.ts
index 04205d0fea90..5882480f67c1 100644
--- a/front/src/modules/types/PageHotkeyScope.ts
+++ b/front/src/modules/types/PageHotkeyScope.ts
@@ -11,4 +11,5 @@ export enum PageHotkeyScope {
   OpportunitiesPage = 'opportunities-page',
   ProfilePage = 'profile-page',
   WorkspaceMemberPage = 'workspace-member-page',
+  TaskPage = 'task-page',
 }
diff --git a/front/src/sync-hooks/AuthAutoRouter.tsx b/front/src/sync-hooks/AuthAutoRouter.tsx
index fe9eec3f5075..44758b2a9290 100644
--- a/front/src/sync-hooks/AuthAutoRouter.tsx
+++ b/front/src/sync-hooks/AuthAutoRouter.tsx
@@ -91,6 +91,11 @@ export function AuthAutoRouter() {
         setHotkeyScope(PageHotkeyScope.OpportunitiesPage, { goto: true });
         break;
       }
+      case isMatchingLocation(AppPath.TasksPage): {
+        setHotkeyScope(PageHotkeyScope.TaskPage, { goto: true });
+        break;
+      }
+
       case isMatchingLocation(AppPath.SignIn): {
         setHotkeyScope(PageHotkeyScope.SignInUp);
         break;
diff --git a/front/src/sync-hooks/GotoHotkeysHooks.tsx b/front/src/sync-hooks/GotoHotkeysHooks.tsx
index c9b480f34dbe..da782c719256 100644
--- a/front/src/sync-hooks/GotoHotkeysHooks.tsx
+++ b/front/src/sync-hooks/GotoHotkeysHooks.tsx
@@ -5,6 +5,7 @@ export function GotoHotkeysHooks() {
   useGoToHotkeys('c', '/companies');
   useGoToHotkeys('o', '/opportunities');
   useGoToHotkeys('s', '/settings/profile');
+  useGoToHotkeys('t', '/tasks');
 
   return <></>;
 }