[CLEAN] Chart Issue (Sources/Authors) // (Bar/Pie)

src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs

@@ -116,8 +116,7 @@ pieCpt = R.hooksComponent "G.C.N.C.C.P.pie" cpt
 
 loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
 loadedPie { path, reload, session } loaded =
-  H.div {} [
-    U.reloadButton reload
+  H.div {} [ U.reloadButton reload
            , U.chartUpdateButton { chartType: ChartPie, path, reload, session }
            , chart $ chartOptionsPie loaded
            ]
@@ -132,8 +131,8 @@ barCpt = R.hooksComponent "LoadedMetricsBar" cpt
     cpt {path, session} _ = do
       reload <- R.useState' 0
       --pure $ metricsLoadView {getMetrics, loaded: loadedBar, path, reload, session}
-      pure $ metricsWithCacheLoadView {
-          getMetricsHash
+      pure $ metricsWithCacheLoadView
+           { getMetricsHash
            , handleResponse
            , loaded: loadedPie
            , mkRequest: mkRequest session

src/Gargantext/Components/Nodes/Corpus/Chart/Predefined.purs

@@ -19,8 +19,10 @@ import Gargantext.Types (NodeID, Mode(..), TabSubType(..), TabType(..), modeTabT
 data PredefinedChart =
     CDocsHistogram
   | CAuthorsPie
+  | CSourcesBar
   | CInstitutesTree
   | CTermsMetrics
+
 derive instance genericPredefinedChart :: Generic PredefinedChart _
 
 instance showPredefinedChart :: Show PredefinedChart where
@@ -42,30 +44,30 @@ instance encodePredefinedChart :: EncodeJson PredefinedChart where
 instance readPredefinedChart :: Read PredefinedChart where
   read "CDocsHistogram"  = Just CDocsHistogram
   read "CAuthorsPie"     = Just CAuthorsPie
+  read "CSourcesBar"     = Just CSourcesBar
   read "CInstitutesTree" = Just CInstitutesTree
   read "CTermsMetrics"   = Just CTermsMetrics
   read _                 = Nothing
 
 
 allPredefinedCharts :: Array PredefinedChart
-allPredefinedCharts = [
-    CDocsHistogram
+allPredefinedCharts =
+  [ CDocsHistogram
   , CAuthorsPie
   , CTermsMetrics
   , CInstitutesTree
+  , CSourcesBar
   ]
 
 
 type Params =
-  (
-    corpusId :: NodeID
+  ( corpusId :: NodeID
   , session  :: Session
   -- optinal params
   , limit    :: Maybe Int
   , listId   :: Maybe Int
   )
 
-
 render :: PredefinedChart -> Record Params -> R.Element
 render CDocsHistogram { corpusId, listId, session } = histo { path, session }
   where
@@ -93,5 +95,16 @@ render CTermsMetrics { corpusId, limit, listId, session } = metrics { path, sess
     path = { corpusId
            , limit
            , listId: fromMaybe 0 listId
-           , tabType: TabCorpus (TabNgramType $ modeTabType Authors)
+           , tabType: TabCorpus (TabNgramType $ modeTabType Terms)
            }
+render CSourcesBar { corpusId, limit, listId, session } = metrics { path, session }
+  where
+    path = { corpusId
+           , limit
+           , listId: fromMaybe 0 listId
+           , tabType: TabCorpus (TabNgramType $ modeTabType Sources)
+           }
+
+
+
+

src/Gargantext/Components/Nodes/Lists/Tabs.purs

@@ -18,10 +18,10 @@ import Gargantext.Sessions (Session)
 import Gargantext.Types (ChartType(..), CTabNgramType(..), Mode(..), TabSubType(..), TabType(..), chartTypeFromString, modeTabType)
 import Gargantext.Utils.Reactix as R2
 
-type Props =
-  ( session :: Session
+type Props = ( session    :: Session
              , corpusId   :: Int
-  , corpusData :: CorpusData )
+             , corpusData :: CorpusData 
+             )
 
 tabs :: Record Props -> R.Element
 tabs props = R.createElement tabsCpt props []
@@ -55,27 +55,40 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
 
       pure $ R.fragment
         ( charts tabNgramType chartType
-        <> [
-          NT.mainNgramsTable
-            {session, defaultListId, nodeId: corpusId, tabType, tabNgramType, withAutoUpdate: false}
+        <> [ NT.mainNgramsTable { session
+                                , defaultListId
+                                , nodeId: corpusId
+                                , tabType
+                                , tabNgramType
+                                , withAutoUpdate: false
+                                }
            ]
         )
       where
         tabNgramType = modeTabType mode
         tabType      = TabCorpus (TabNgramType tabNgramType)
         listId       = defaultListId
-        path = {corpusId, listId, tabType, limit: (Just 1000)}
+        path         = { corpusId
+                       , listId
+                       , tabType
+                       , limit: Just 1000
+                       }
 
         charts CTabTerms (chartType /\ setChartType) = [
           H.div { className: "row chart-type-selector" } [
             H.div { className: "col-md-3" } [
-
               R2.select { className: "form-control"
-                        ,  on: { change: \e -> setChartType $ const $ fromMaybe Histo $ chartTypeFromString $ R2.unsafeEventValue e }
+                        ,  on: { change: \e -> setChartType
+                                             $ const
+                                             $ fromMaybe Histo
+                                             $ chartTypeFromString
+                                             $ R2.unsafeEventValue e
+                               }
                         , defaultValue: show chartType } [
                 H.option { value: show Histo     } [ H.text $ show Histo     ]
               , H.option { value: show Scatter   } [ H.text $ show Scatter   ]
               , H.option { value: show ChartBar  } [ H.text $ show ChartBar  ]
+              , H.option { value: show ChartPie  } [ H.text $ show ChartPie  ]
               , H.option { value: show ChartTree } [ H.text $ show ChartTree ]
               ]
             ]

src/Gargantext/Ends.purs

@@ -119,7 +119,7 @@ sessionPath (R.Tab t i)             = sessionPath (R.NodeAPI Node i (showTabType
 sessionPath (R.Children n o l s i)  = sessionPath (R.NodeAPI Node i ("children?type=" <> show n <> offsetUrl o <> limitUrl l <> orderUrl s))
 sessionPath (R.NodeAPI Phylo pId p) = "phyloscape?nodeId=" <> (show $ fromMaybe 0 pId) <> p
 sessionPath (R.RecomputeNgrams nt nId lId)      = "node/" <> (show nId) <> "/ngrams/recompute?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
-sessionPath (R.RecomputeListChart ChartBar nt nId lId)   = "node/" <> (show nId) <> "/pie?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
+sessionPath (R.RecomputeListChart ChartBar nt nId lId)   = "node/" <> (show nId) <> "/chart?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
 sessionPath (R.RecomputeListChart ChartPie nt nId lId)   = "node/" <> (show nId) <> "/pie?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
 sessionPath (R.RecomputeListChart ChartTree nt nId lId)  = "node/" <> (show nId) <> "/tree?" <> (defaultList lId) <> "&ngramsType=" <> (show nt) <> "&listType=" <> show MapTerm
 sessionPath (R.RecomputeListChart Histo nt nId lId)      = "node/" <> (show nId) <> "/chart?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)

src/Gargantext/Types.purs

@@ -15,8 +15,6 @@ import Prelude
 import Prim.Row (class Union)
 import URI.Query (Query)
 
-
-
 data Handed = LeftHanded | RightHanded
 
 derive instance genericHanded :: Generic Handed _