fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

fix(workflows): always show navigation item

Browse Source
This commit is contained in:
Gregor Kleen 2022-04-21 10:09:31 +02:00
parent 56a1c9016a
commit 82a4eccaa4
1 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/Foundation/Navigation.hs
View File

@ -761,38 +761,51 @@ defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the
, do , do
guardVolatile clusterVolatileWorkflowsEnabled guardVolatile clusterVolatileWorkflowsEnabled
-- authCtx <- getAuthContext return NavHeader
-- (haveInstances, haveWorkflows) <- lift . memcachedBy (Just . Right $ 2 * diffMinute) (NavCacheHaveTopWorkflowsInstances authCtx) . useRunDB $ (,) { navHeaderRole = NavHeaderPrimary
-- <$> haveTopWorkflowInstances , navIcon = IconMenuWorkflows
-- <*> haveTopWorkflowWorkflows , navLink = NavLink
{ navLabel = MsgMenuTopWorkflowInstanceList
, navRoute = TopWorkflowInstanceListR
, navAccess' = NavAccessTrue
, navType = NavTypeLink { navModal = False }
, navQuick' = mempty
, navForceActive = False
}
}
mUserId <- maybeAuthId -- -- authCtx <- getAuthContext
-- if | haveInstances -> return NavHeader -- -- (haveInstances, haveWorkflows) <- lift . memcachedBy (Just . Right $ 2 * diffMinute) (NavCacheHaveTopWorkflowsInstances authCtx) . useRunDB $ (,)
if | isJust mUserId -> return NavHeader -- -- <$> haveTopWorkflowInstances
{ navHeaderRole = NavHeaderPrimary -- -- <*> haveTopWorkflowWorkflows
, navIcon = IconMenuWorkflows
, navLink = NavLink -- mUserId <- maybeAuthId
{ navLabel = MsgMenuTopWorkflowInstanceList -- -- if | haveInstances -> return NavHeader
, navRoute = TopWorkflowInstanceListR -- if | isJust mUserId -> return NavHeader
, navAccess' = NavAccessTrue -- { navHeaderRole = NavHeaderPrimary
, navType = NavTypeLink { navModal = False } -- , navIcon = IconMenuWorkflows
, navQuick' = mempty -- , navLink = NavLink
, navForceActive = False -- { navLabel = MsgMenuTopWorkflowInstanceList
} -- , navRoute = TopWorkflowInstanceListR
} -- , navAccess' = NavAccessTrue
-- | haveWorkflows -> return NavHeader -- , navType = NavTypeLink { navModal = False }
-- { navHeaderRole = NavHeaderPrimary -- , navQuick' = mempty
-- , navIcon = IconMenuWorkflows -- , navForceActive = False
-- , navLink = NavLink -- }
-- { navLabel = MsgMenuTopWorkflowWorkflowListHeader -- }
-- , navRoute = TopWorkflowWorkflowListR -- -- | haveWorkflows -> return NavHeader
-- , navAccess' = NavAccessTrue -- -- { navHeaderRole = NavHeaderPrimary
-- , navType = NavTypeLink { navModal = False } -- -- , navIcon = IconMenuWorkflows
-- , navQuick' = mempty -- -- , navLink = NavLink
-- , navForceActive = False -- -- { navLabel = MsgMenuTopWorkflowWorkflowListHeader
-- } -- -- , navRoute = TopWorkflowWorkflowListR
-- } -- -- , navAccess' = NavAccessTrue
| otherwise -> mzero -- -- , navType = NavTypeLink { navModal = False }
-- -- , navQuick' = mempty
-- -- , navForceActive = False
-- -- }
-- -- }
-- | otherwise -> mzero
, return NavHeaderContainer , return NavHeaderContainer
{ navHeaderRole = NavHeaderPrimary { navHeaderRole = NavHeaderPrimary
, navLabel = SomeMessage MsgMenuAdminHeading , navLabel = SomeMessage MsgMenuAdminHeading