[CLEAN] Instances HyperData (WIP)

src/Gargantext/Database/Action/Node.hs

@@ -95,20 +95,16 @@ mkNodeWithParent NodeGraph (Just i) uId name =
     where
       hd = arbitraryGraph
 
-mkNodeWithParent NodeDashboard (Just i) uId name =
-   insertNodesWithParentR (Just i) [node NodeDashboard name hd Nothing uId]
-    where
-      hd = arbitraryDashboard
-
-
-
 mkNodeWithParent NodeFrameWrite i u n =
   mkNodeWithParent_ConfigureHyperdata NodeFrameWrite i u n
 
 mkNodeWithParent NodeFrameCalc i u n =
   mkNodeWithParent_ConfigureHyperdata NodeFrameCalc i u n
 
-mkNodeWithParent _ _ _ _       = nodeError NotImplYet
+mkNodeWithParent n (Just i) uId name =
+   insertNodesWithParentR (Just i) [node NodeDashboard name (hasDefaultData n) Nothing uId]
+
+-- mkNodeWithParent _ _ _ _       = nodeError NotImplYet
 
 
 -- | Sugar to create a node, get his NodeId and update his Hyperdata after

src/Gargantext/Database/Admin/Types/Hyperdata.hs

@@ -296,13 +296,6 @@ $(deriveJSON (unPrefix "hyperdataResource_") ''HyperdataResource)
 instance Hyperdata HyperdataResource
 
 ------------------------------------------------------------------------
-data HyperdataDashboard = HyperdataDashboard { hyperdataDashboard_preferences   :: !(Maybe Text)
-                                             , hyperdataDashboard_charts        :: ![Chart]
-                                   } deriving (Show, Generic)
-$(deriveJSON (unPrefix "hyperdataDashboard_") ''HyperdataDashboard)
-
-instance Hyperdata HyperdataDashboard
-
 ------------------------------------------------------------------------
 -- TODO add the Graph Structure here
 data HyperdataPhylo = HyperdataPhylo { hyperdataPhylo_preferences   :: !(Maybe Text)
@@ -324,6 +317,9 @@ instance Hyperdata HyperdataNotebook
 -- | TODO CLEAN
 data HyperData = HyperdataTexts { hd_preferences :: !(Maybe Text)}
                | HyperdataList' { hd_preferences :: !(Maybe Text)}
+               | HyperdataDashboard { hd_preferences   :: !(Maybe Text)
+                                    , hd_charts        :: ![Chart]
+                                    }
   deriving (Show, Generic)
 
 $(deriveJSON (unPrefix "hd_") ''HyperData)

src/Gargantext/Database/Query/Table/Node.hs

@@ -228,17 +228,19 @@ class HasDefault a where
 
 instance HasDefault NodeType where
   hasDefaultData nt = case nt of
-      NodeTexts    -> HyperdataTexts (Just "Preferences")
-      NodeList     -> HyperdataList' (Just "Preferences")
-      NodeListCooc -> HyperdataList' (Just "Preferences")
-      _         -> undefined
+      NodeTexts     -> HyperdataTexts (Just "Preferences")
+      NodeList      -> HyperdataList' (Just "Preferences")
+      NodeListCooc  -> HyperdataList' (Just "Preferences")
+      -- NodeFolder    -> defaultFolder
+      NodeDashboard -> arbitraryDashboard
+      _             -> panic "HasDefaultData undefined"
       --NodeAnnuaire -> HyperdataAnnuaire (Just "Title") (Just "Description")
 
   hasDefaultName nt = case nt of
       NodeTexts -> "Texts"
       NodeList  -> "Lists"
       NodeListCooc -> "Cooc"
-      _         -> undefined
+      _         -> panic "HasDefaultName undefined"
 
 ------------------------------------------------------------------------
 nodeDefault :: NodeType -> ParentId -> UserId -> NodeWrite
@@ -287,7 +289,7 @@ nodePhyloW maybeName maybePhylo pId = node NodePhylo name graph (Just pId)
     graph = maybe arbitraryPhylo identity maybePhylo
 
 ------------------------------------------------------------------------
-arbitraryDashboard :: HyperdataDashboard
+arbitraryDashboard :: HyperData 
 arbitraryDashboard = HyperdataDashboard (Just "Preferences") []
 ------------------------------------------------------------------------
 
@@ -446,7 +448,7 @@ mkNode nt p u = insertNodesR [nodeDefault nt p u]
 mkDashboard :: ParentId -> UserId -> Cmd err [NodeId]
 mkDashboard p u = insertNodesR [nodeDashboardW Nothing Nothing p u]
   where
-    nodeDashboardW :: Maybe Name -> Maybe HyperdataDashboard -> ParentId -> UserId -> NodeWrite
+    nodeDashboardW :: Maybe Name -> Maybe HyperData -> ParentId -> UserId -> NodeWrite
     nodeDashboardW maybeName maybeDashboard pId = node NodeDashboard name dashboard (Just pId)
       where
         name = maybe "Board" identity maybeName