From 82a4eccaa4fc5d6df3ff0bc71a025973f12c7dfd Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 21 Apr 2022 10:09:31 +0200 Subject: [PATCH] fix(workflows): always show navigation item --- src/Foundation/Navigation.hs | 75 +++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/src/Foundation/Navigation.hs b/src/Foundation/Navigation.hs index a1133b8e3..697960e32 100644 --- a/src/Foundation/Navigation.hs +++ b/src/Foundation/Navigation.hs @@ -761,38 +761,51 @@ defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the , do guardVolatile clusterVolatileWorkflowsEnabled - -- authCtx <- getAuthContext - -- (haveInstances, haveWorkflows) <- lift . memcachedBy (Just . Right $ 2 * diffMinute) (NavCacheHaveTopWorkflowsInstances authCtx) . useRunDB $ (,) - -- <$> haveTopWorkflowInstances - -- <*> haveTopWorkflowWorkflows + return NavHeader + { navHeaderRole = NavHeaderPrimary + , navIcon = IconMenuWorkflows + , navLink = NavLink + { navLabel = MsgMenuTopWorkflowInstanceList + , navRoute = TopWorkflowInstanceListR + , navAccess' = NavAccessTrue + , navType = NavTypeLink { navModal = False } + , navQuick' = mempty + , navForceActive = False + } + } - mUserId <- maybeAuthId - -- if | haveInstances -> return NavHeader - if | isJust mUserId -> return NavHeader - { navHeaderRole = NavHeaderPrimary - , navIcon = IconMenuWorkflows - , navLink = NavLink - { navLabel = MsgMenuTopWorkflowInstanceList - , navRoute = TopWorkflowInstanceListR - , navAccess' = NavAccessTrue - , navType = NavTypeLink { navModal = False } - , navQuick' = mempty - , navForceActive = False - } - } - -- | haveWorkflows -> return NavHeader - -- { navHeaderRole = NavHeaderPrimary - -- , navIcon = IconMenuWorkflows - -- , navLink = NavLink - -- { navLabel = MsgMenuTopWorkflowWorkflowListHeader - -- , navRoute = TopWorkflowWorkflowListR - -- , navAccess' = NavAccessTrue - -- , navType = NavTypeLink { navModal = False } - -- , navQuick' = mempty - -- , navForceActive = False - -- } - -- } - | otherwise -> mzero + -- -- authCtx <- getAuthContext + -- -- (haveInstances, haveWorkflows) <- lift . memcachedBy (Just . Right $ 2 * diffMinute) (NavCacheHaveTopWorkflowsInstances authCtx) . useRunDB $ (,) + -- -- <$> haveTopWorkflowInstances + -- -- <*> haveTopWorkflowWorkflows + + -- mUserId <- maybeAuthId + -- -- if | haveInstances -> return NavHeader + -- if | isJust mUserId -> return NavHeader + -- { navHeaderRole = NavHeaderPrimary + -- , navIcon = IconMenuWorkflows + -- , navLink = NavLink + -- { navLabel = MsgMenuTopWorkflowInstanceList + -- , navRoute = TopWorkflowInstanceListR + -- , navAccess' = NavAccessTrue + -- , navType = NavTypeLink { navModal = False } + -- , navQuick' = mempty + -- , navForceActive = False + -- } + -- } + -- -- | haveWorkflows -> return NavHeader + -- -- { navHeaderRole = NavHeaderPrimary + -- -- , navIcon = IconMenuWorkflows + -- -- , navLink = NavLink + -- -- { navLabel = MsgMenuTopWorkflowWorkflowListHeader + -- -- , navRoute = TopWorkflowWorkflowListR + -- -- , navAccess' = NavAccessTrue + -- -- , navType = NavTypeLink { navModal = False } + -- -- , navQuick' = mempty + -- -- , navForceActive = False + -- -- } + -- -- } + -- | otherwise -> mzero , return NavHeaderContainer { navHeaderRole = NavHeaderPrimary , navLabel = SomeMessage MsgMenuAdminHeading