Skip to content

haskell-gargantext
haskell-gargantext
Commit 3eb58680 authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

Merge remote-tracking branch 'origin/452-dev-teams-security' into dev-merge

parents b9db02f4 27a5fcf4
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
src/Gargantext/API/GraphQL/TreeFirstLevel.hs
View file @ 3eb58680
...@@ -78,13 +78,17 @@ childrenToTreeNodes (TreeN {_tn_node}, rId) = toTreeNode (Just rId) _tn_node ...@@ -78,13 +78,17 @@ childrenToTreeNodes (TreeN {_tn_node}, rId) = toTreeNode (Just rId) _tn_node
resolveParent :: (HasConnectionPool env, HasConfig env, HasMail env) => Maybe NodeId -> GqlM e env (Maybe TreeNode) resolveParent :: (HasConnectionPool env, HasConfig env, HasMail env) => Maybe NodeId -> GqlM e env (Maybe TreeNode)
resolveParent (Just pId) = do resolveParent (Just pId) = do
node <- lift $ getNode pId node <- lift $ getNode pId
pure $ Just $ nodeToTreeNode node pure $ nodeToTreeNode node
resolveParent Nothing = pure Nothing resolveParent Nothing = pure Nothing
nodeToTreeNode :: NN.Node json -> TreeNode nodeToTreeNode :: NN.Node json -> Maybe TreeNode
nodeToTreeNode N.Node {..} = TreeNode { id = NN.unNodeId _node_id nodeToTreeNode N.Node {..} = if (fromNodeTypeId _node_typename /= NN.NodeFolderShared) && (fromNodeTypeId _node_typename /= NN.NodeTeam)
, name = _node_name then
, node_type = fromNodeTypeId _node_typename Just TreeNode { id = NN.unNodeId _node_id
, parent_id = NN.unNodeId <$> _node_parent_id , name = _node_name
} , node_type = fromNodeTypeId _node_typename
, parent_id = NN.unNodeId <$> _node_parent_id
}
else
Nothing
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