Revert "[refactor] one method to fetch corpus and list in CodeSection"

This reverts commit b731bf1b.
parent b731bf1b
Pipeline #7514 passed with stages
in 24 minutes and 3 seconds
...@@ -49,8 +49,4 @@ bundle.js ...@@ -49,8 +49,4 @@ bundle.js
/dist/bundle.min.js* /dist/bundle.min.js*
# IDE specific # IDE specific
.idea/
.vscode .vscode
# parcel
.parcel-cache/
...@@ -418,7 +418,21 @@ loadCorpus { nodeId, session } = do ...@@ -418,7 +418,21 @@ loadCorpus { nodeId, session } = do
case res of case res of
Left err -> pure $ Left err Left err -> pure $ Left err
Right (NodePoly { parentId: corpusId } :: NodePoly {}) -> do Right (NodePoly { parentId: corpusId } :: NodePoly {}) -> do
fetchCorpusNode session corpusId eCorpusNode <- get session $ corpusNodeRoute (fromMaybe 0 corpusId) ""
eDefaultListIds <-
(get session $ defaultListIdsRoute (fromMaybe 0 corpusId))
:: forall a. JSON.ReadForeign a => AffETableResult (NodePoly a)
case eCorpusNode of
Left err -> pure $ Left err
Right corpusNode -> do
case eDefaultListIds of
Left err -> pure $ Left err
Right defaultListIds -> do
case (A.head defaultListIds.docs :: Maybe (NodePoly HyperdataList)) of
Just (NodePoly { id: defaultListId }) ->
pure $ Right { corpusId: (fromMaybe 0 corpusId), corpusNode, defaultListId }
Nothing ->
pure $ Left $ CustomError "Missing default list"
-- (NodePoly {parentId: corpusId} :: NodePoly {}) <- get session nodePolyRoute -- (NodePoly {parentId: corpusId} :: NodePoly {}) <- get session nodePolyRoute
-- corpusNode <- get session $ corpusNodeRoute corpusId "" -- corpusNode <- get session $ corpusNodeRoute corpusId ""
...@@ -431,6 +445,8 @@ loadCorpus { nodeId, session } = do ...@@ -431,6 +445,8 @@ loadCorpus { nodeId, session } = do
-- throwError $ error "Missing default list" -- throwError $ error "Missing default list"
where where
nodePolyRoute = NodeAPI Corpus (Just nodeId) "" nodePolyRoute = NodeAPI Corpus (Just nodeId) ""
corpusNodeRoute = NodeAPI Corpus <<< Just
defaultListIdsRoute = Children NodeList 0 1 Nothing <<< Just
loadCorpusWithChild :: Record LoadProps -> AffRESTError CorpusData loadCorpusWithChild :: Record LoadProps -> AffRESTError CorpusData
loadCorpusWithChild { nodeId: childId, session } = do loadCorpusWithChild { nodeId: childId, session } = do
...@@ -440,38 +456,24 @@ loadCorpusWithChild { nodeId: childId, session } = do ...@@ -440,38 +456,24 @@ loadCorpusWithChild { nodeId: childId, session } = do
Left err -> pure $ Left err Left err -> pure $ Left err
Right listNode -> do Right listNode -> do
let (NodePoly { parentId: corpusId } :: NodePoly {}) = listNode let (NodePoly { parentId: corpusId } :: NodePoly {}) = listNode
fetchCorpusNode session corpusId eCorpusNode <- get session $ corpusNodeRoute (fromMaybe 0 corpusId) ""
where case eCorpusNode of
listNodeRoute = NodeAPI Node <<< Just
fetchCorpusNode session corpusId = do
eCorpusNode <- get session $ corpusNodeRoute defaultCorpusId ""
case eCorpusNode of
Left err -> pure $ Left err
Right corpusNode -> do
eDefaultListId <- fetchDefaultList session defaultCorpusId
case eDefaultListId of
Left err -> pure $ Left err Left err -> pure $ Left err
Right defaultListId -> Right corpusNode -> do
pure $ Right { corpusId: defaultCorpusId, corpusNode, defaultListId } eDefaultListIds <-
(get session $ defaultListIdsRoute (fromMaybe 0 corpusId))
:: forall a. JSON.ReadForeign a => AffETableResult (NodePoly a)
case eDefaultListIds of
Left err -> pure $ Left err
Right defaultListIds -> do
case (A.head defaultListIds.docs :: Maybe (NodePoly HyperdataList)) of
Just (NodePoly { id: defaultListId }) ->
pure $ Right { corpusId: fromMaybe 0 corpusId, corpusNode, defaultListId }
Nothing ->
throwError $ error "Missing default list"
where where
defaultCorpusId = fromMaybe 0 corpusId
corpusNodeRoute = NodeAPI Corpus <<< Just corpusNodeRoute = NodeAPI Corpus <<< Just
listNodeRoute = NodeAPI Node <<< Just
fetchDefaultList :: Session -> ID -> AffRESTError ID
fetchDefaultList session corpusId = do
eDefaultListIds <-
(get session $ defaultListIdsRoute corpusId)
:: forall a. JSON.ReadForeign a => AffETableResult (NodePoly a)
case eDefaultListIds of
Left err -> pure $ Left err
Right defaultListIds -> do
case (A.head defaultListIds.docs :: Maybe (NodePoly HyperdataList)) of
Just (NodePoly { id: defaultListId }) ->
pure $ Right defaultListId
Nothing ->
pure $ Left $ CustomError "Missing default list"
where
defaultListIdsRoute = Children NodeList 0 1 Nothing <<< Just defaultListIdsRoute = Children NodeList 0 1 Nothing <<< Just
type LoadWithReloadProps = type LoadWithReloadProps =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment