move sync to a modal

msupply-foundation · Dec 31, 2024 · e6d6582 · e6d6582
1 parent 2d49b35
commit e6d6582
Show file tree

Hide file tree

Showing 14 changed files with 340 additions and 233 deletions.
diff --git a/client/packages/common/src/ui/components/navigation/AppNavLink/AppNavLink.tsx b/client/packages/common/src/ui/components/navigation/AppNavLink/AppNavLink.tsx
@@ -72,7 +72,7 @@ export interface AppNavLinkProps {
   text?: string;
   to: string;
   visible?: boolean;
-  onClick?: () => void;
+  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
 }
 
 export const AppNavLink: FC<AppNavLinkProps> = props => {
@@ -92,11 +92,11 @@ export const AppNavLink: FC<AppNavLinkProps> = props => {
   const match = useMatch({ path: `${to}/*` });
   const isSelectedParentItem = inactive && !!match;
   const showMenuSectionIcon = inactive && drawer.isOpen;
-  const handleClick = () => {
+  const handleClick = (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
     // reset the clicked nav path when navigating
     // otherwise the child menu remains open
     drawer.setClickedNavPath(undefined);
-    if (onClick) onClick();
+    if (onClick) onClick(e);
     drawer.onClick();
   };
 

diff --git a/client/packages/common/src/ui/components/navigation/Breadcrumbs/Breadcrumbs.tsx b/client/packages/common/src/ui/components/navigation/Breadcrumbs/Breadcrumbs.tsx
@@ -15,12 +15,7 @@ export const Breadcrumb = styled(Link)({
 });
 
 export const Breadcrumbs = ({
-  topLevelPaths = [
-    AppRoute.Settings,
-    AppRoute.Sync,
-    AppRoute.Reports,
-    AppRoute.Help,
-  ],
+  topLevelPaths = [AppRoute.Settings, AppRoute.Reports, AppRoute.Help],
 }: {
   topLevelPaths?: string[];
 }) => {

diff --git a/client/packages/common/src/utils/environment/EnvUtils.ts b/client/packages/common/src/utils/environment/EnvUtils.ts
@@ -64,8 +64,6 @@ const mapRoute = (route: string): RouteMapping => {
       return { title: 'stock', docs: '/inventory/stock-view/' };
     case inRoute(AppRoute.Stocktakes):
       return { title: 'stocktakes', docs: '/inventory/stock-takes/' };
-    case inRoute(AppRoute.Sync):
-      return { title: 'sync', docs: '/sync/synchronisation/' };
     case inRoute(AppRoute.Settings):
       return { title: 'settings', docs: '/settings/' };
     case inRoute(AppRoute.Patients):

diff --git a/client/packages/config/src/routes.ts b/client/packages/config/src/routes.ts
@@ -50,8 +50,6 @@ export enum AppRoute {
 
   Messages = 'messages',
 
-  Sync = 'sync',
-
   Settings = 'settings',
 
   Help = 'help',

diff --git a/client/packages/host/src/CommandK.tsx b/client/packages/host/src/CommandK.tsx
@@ -24,6 +24,7 @@ import {
 import { AppRoute } from '@openmsupply-client/config';
 import { Action } from 'kbar/lib/types';
 import { useEasterEggModal } from './components/EasterEggModal';
+import { useSyncModal } from './components/Sync';
 
 const CustomKBarSearch = styled(KBarSearch)(({ theme }) => ({
   width: 500,
@@ -90,6 +91,7 @@ const Actions = () => {
   const t = useTranslation();
   const { store, logout, user, userHasPermission } = useAuthContext();
   const showEasterEgg = useEasterEggModal();
+  const showSync = useSyncModal();
   const confirmLogout = useConfirmationModal({
     onConfirm: () => {
       logout();
@@ -275,6 +277,13 @@ const Actions = () => {
       shortcut: ['h'],
       perform: () => navigate(RouteBuilder.create(AppRoute.Help).build()),
     },
+    {
+      id: 'action:sync',
+      name: `${t('sync')} (Alt+Control+S)`,
+      keywords: 'sync',
+      shortcut: ['Alt+Control+KeyS'],
+      perform: showSync,
+    },
   ];
 
   if (userHasPermission(UserPermission.ServerAdmin)) {