From c392cb58952598d0a8a806bf64846952b664f67d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 3 Dec 2020 17:51:07 +0100 Subject: [PATCH] refactor(workflows): better modularize workflow-workflow-list --- src/Handler/Workflow/Workflow/List.hs | 85 ++++++++------------------- src/Utils/Workflow.hs | 9 ++- 2 files changed, 31 insertions(+), 63 deletions(-) diff --git a/src/Handler/Workflow/Workflow/List.hs b/src/Handler/Workflow/Workflow/List.hs index 4da5ddd3b..1354ee1bc 100644 --- a/src/Handler/Workflow/Workflow/List.hs +++ b/src/Handler/Workflow/Workflow/List.hs @@ -14,6 +14,9 @@ import Import import Utils.Workflow import Handler.Utils.Workflow.CanonicalRoute +import qualified Database.Esqueleto as E +import qualified Database.Esqueleto.Utils as E + getGlobalWorkflowWorkflowListR :: Handler Html getGlobalWorkflowWorkflowListR = workflowWorkflowListR WSGlobal @@ -22,25 +25,9 @@ getSchoolWorkflowWorkflowListR :: SchoolId -> Handler Html getSchoolWorkflowWorkflowListR = workflowWorkflowListR . WSSchool workflowWorkflowListR :: RouteWorkflowScope -> Handler Html -workflowWorkflowListR rScope = do -- not implemented; TODO: FIXME - wfRoutes <- runDB $ do - scope <- maybeT notFound $ fromRouteWorkflowScope rScope - wfs <- selectKeysList [ WorkflowWorkflowScope ==. view _DBWorkflowScope scope ] [] - flip mapMaybeM wfs $ \wfId -> do - cID <- encrypt wfId - let route = _WorkflowScopeRoute # (rScope, WorkflowWorkflowR cID WWWorkflowR) - guardM $ hasReadAccessTo route - return (cID, route) - - defaultLayout - [whamlet| - $newline never -