Skip to content

P
purescript-gargantext
Commit b7f2c801 authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

[MERGE] dev

parents 09b43855 3293f38a
Pipeline #1630 failed with stage
    Show whitespace changes
    Inline Side-by-side
    Showing with 437 additions and 183 deletions
    src/Gargantext/Components/Charts/Options/Data.purs
    View file @ b7f2c801
    module Gargantext.Components.Charts.Options.Data where
    import Gargantext.Components.Charts.Options.Font (TextStyle, Icon, ItemStyle)
    import Gargantext.Components.Charts.Options.Legend (SelectedMode)
    import Gargantext.Types (class Optional)
    import Record.Unsafe (unsafeSet)
    import Unsafe.Coerce (unsafeCoerce)
    import Gargantext.Types (class Optional)
    import Gargantext.Components.Charts.Options.Font (TextStyle, Icon, ItemStyle)
    type DataLegend =
    { name :: String
    ......@@ -27,6 +28,10 @@ type OptionalData =
    , itemStyle :: ItemStyle
    -- ^ the style setting about single data point(bubble).
    , label :: { show :: Boolean }
    , emphasis :: { itemStyle :: ItemStyle }
    , selectedMode :: SelectedMode
    , select :: { itemStyle :: ItemStyle }
    -- ^ need "selectedMode" to be defined
    )
    type DataSerie v = RequiredData v OptionalData
    ......
    src/Gargantext/Components/Charts/Options/ECharts.js
    View file @ b7f2c801
    ......@@ -3,3 +3,31 @@
    var ReactEcharts = require("echarts-for-react");
    exports.eChartsClass = ReactEcharts.default;
    /**
    * @XXX "echarts-for-react" unsuitable to proper PureScript implementation
    * regarding event listeners
    * @name listenerFn1
    * @param {function} fn
    * @returns
    */
    exports.listenerFn1 = function(fn) {
    return function() {
    var args = Array.prototype.slice.call(arguments);
    fn(args[0])()
    }
    };
    /**
    * @link https://echarts.apache.org/en/api.html#echartsInstance.dispatchAction
    * @name dispatchAction
    * @param {object} eChartsInstance instanceof ECharts
    * @param {object} opts
    * @returns
    */
    exports.dispatchAction = function(eChartsInstance) {
    return function(opts) {
    return function() {
    eChartsInstance.dispatchAction(opts);
    }
    }
    }
    src/Gargantext/Components/Charts/Options/ECharts.purs
    View file @ b7f2c801
    module Gargantext.Components.Charts.Options.ECharts where
    import Prelude
    import CSS.Common (normal)
    import CSS.FontStyle (FontStyle(..))
    import Data.Maybe (Maybe(..))
    import Data.Nullable (toMaybe)
    import Effect (Effect)
    import Gargantext.Components.Charts.Options.Color (transparent, violet, black)
    import Gargantext.Components.Charts.Options.Data (DataLegend, dataSerie)
    import Gargantext.Components.Charts.Options.Font (IconOptions(..), Shape(..), TextStyle, chartFontStyle, chartFontWeight, icon, mkTooltip, Tooltip, mkToolBox)
    import Gargantext.Components.Charts.Options.Legend (legendType, LegendMode(..), PlainOrScroll(..), selectedMode, Orientation(..), orient)
    import Gargantext.Components.Charts.Options.Position (Align(..), LeftRelativePosition(..), TopRelativePosition(..), numberPosition, percentPosition, relativePosition)
    import Gargantext.Components.Charts.Options.Series (Series, seriesPieD1)
    import Gargantext.Components.Charts.Options.Type (DataZoom, Echarts, Legend, Option, Title, XAxis, YAxis, xAxis, yAxis)
    import Gargantext.Components.Charts.Options.Type (DataZoom, EChartsInstance, Echarts, Legend, MouseEvent, Option, Title, XAxis, YAxis, EChartRef, xAxis, yAxis)
    import Gargantext.Utils.Reactix as R2
    import Prelude
    import React (ReactClass, unsafeCreateElementDynamic)
    import Reactix as R
    import Gargantext.Utils.Reactix as R2
    import Record.Extra as RX
    import Unsafe.Coerce (unsafeCoerce)
    foreign import eChartsClass :: ReactClass Echarts
    foreign import listenerFn1 :: forall evt. (evt -> Effect Unit) -> Effect Unit
    -- | @XXX some eCharts "actions" not working ("select", ...)
    -- | https://echarts.apache.org/en/api.html#echartsInstance.dispatchAction
    foreign import dispatchAction :: forall payload. EChartsInstance -> payload -> Effect Unit
    chart :: Options -> R.Element
    chart = echarts <<< chartWith <<< opts
    chart = echarts <<< chartWith
    chartWith :: Option -> Echarts
    chartWith option =
    { option
    chartWith :: Options -> Echarts
    chartWith options =
    { option : opts options
    --, className : Nothing
    --, style : Nothing
    --, theme : Nothing
    ......@@ -35,9 +42,25 @@ chartWith option =
    --, optsLoading: Nothing
    --, onReady : Nothing
    --, resizable : Nothing
    --, onEvents : Nothing
    , onEvents : getEvents options
    , ref : refListener options
    }
    where
    getEvents (Options { onClick }) =
    { click: listenerFn1 \e -> case onClick of
    -- sanitize parsing (see MouseEvent comment)
    Just fn -> RX.pick (e :: MouseEvent) # fn
    Nothing -> pure unit
    }
    refListener (Options { onInit }) = case onInit of
    Nothing -> pure unit
    Just fn -> listenerFn1 (_ # fn # execOnInit)
    execOnInit fn = toMaybe >>> case _ of
    Nothing -> pure unit
    Just (ref :: Record EChartRef) -> pure unit -- fn =<< ref.getEchartsInstance
    echarts :: Echarts -> R.Element
    echarts c = R2.buff $ unsafeCreateElementDynamic (unsafeCoerce eChartsClass) c []
    ......@@ -155,6 +178,20 @@ data Options = Options
    , series :: Array Series
    , addZoom :: Boolean
    , tooltip :: Tooltip
    , onClick :: Maybe (MouseEvent -> Effect Unit)
    -- (?) `onInit` custom listener
    --
    -- * in addition of the already existing `onReady` native listener
    -- which is executed on chart mount, but does not provide any arg
    -- * the React library also contained another native listener as
    -- `ref`, which adds the React Ref of the mounted chart
    -- * this additional `onInit` is executed after the "Apache Echarts"
    -- has been "initialised" (see more details [1]),
    -- it intends to return the `eChartsInstance` used for every
    -- library actions
    --
    -- [1] https://echarts.apache.org/en/api.html#echarts.init
    , onInit :: Maybe (EChartsInstance -> Effect Unit)
    }
    tooltipTriggerAxis :: Tooltip
    ......
    src/Gargantext/Components/Charts/Options/Series.purs
    View file @ b7f2c801
    module Gargantext.Components.Charts.Options.Series where
    import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson, (.:), (~>), (:=))
    import Data.Argonaut.Core (jsonEmptyObject)
    import Data.Array (foldl)
    import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..), maybe)
    import Data.Newtype (class Newtype)
    import Data.Symbol (SProxy(..))
    import Gargantext.Components.Charts.Options.Data (DataD1, DataD2)
    import Gargantext.Components.Charts.Options.Data (DataD1, DataD2)
    import Gargantext.Components.Charts.Options.Font (ItemStyle, Tooltip)
    import Gargantext.Components.Charts.Options.Font (ItemStyle, Tooltip)
    import Gargantext.Components.Charts.Options.Legend (SelectedMode)
    import Gargantext.Prelude
    import Gargantext.Types (class Optional)
    import Prelude (class Eq, class Show, bind, map, pure, show, ($), (+), (<<<), (<>), eq)
    import Record as Record
    import Record.Unsafe (unsafeSet)
    import Simple.JSON as JSON
    import Unsafe.Coerce (unsafeCoerce)
    import Gargantext.Prelude
    import Gargantext.Types (class Optional)
    import Gargantext.Components.Charts.Options.Font (ItemStyle, Tooltip)
    import Gargantext.Components.Charts.Options.Data (DataD1, DataD2)
    newtype SeriesType = SeriesType String
    ......@@ -65,7 +70,10 @@ type OptionalSeries =
    -- ^ Graphic style of, *emphasis* is the style when it is highlighted, like being hovered by mouse, or highlighted via legend connect.
    -- https://ecomfe.github.io/echarts-doc/public/en/option.html#series-scatter.itemStyle
    , tooltip :: Tooltip
    , emphasis :: { itemStyle :: ItemStyle }
    , selectedMode :: SelectedMode
    , select :: { itemStyle :: ItemStyle }
    -- ^ need "selectedMode" to be defined
    -- many more...
    )
    ......@@ -217,5 +225,3 @@ labelP = SProxy :: SProxy "label"
    -- | TODO
    -- https://ecomfe.github.io/echarts-examples/public/data/asset/data/life-expectancy-table.json
    -- https://ecomfe.github.io/echarts-examples/public/editor.html?c=scatter3D-dataset&gl=1
    src/Gargantext/Components/Charts/Options/Type.purs
    View file @ b7f2c801
    ......@@ -2,6 +2,8 @@ module Gargantext.Components.Charts.Options.Type where
    import Prelude
    import Data.Nullable (Nullable)
    import Effect (Effect)
    import Gargantext.Components.Charts.Options.Color (Color)
    import Gargantext.Components.Charts.Options.Data (DataLegend)
    import Gargantext.Components.Charts.Options.Font (TextStyle, Tooltip, ToolBox)
    ......@@ -12,6 +14,9 @@ import Gargantext.Types (class Optional)
    import React as R
    import Unsafe.Coerce (unsafeCoerce)
    -- | https://echarts.apache.org/en/api.html#echartsInstance
    foreign import data EChartsInstance :: Type
    newtype ChartAlign = ChartAlign String
    -- TODO: Maybe is not working here => use Optional
    ......@@ -29,7 +34,8 @@ type Echarts =
    --, optsLoading :: Maybe OptsLoading -- PropTypes.object,
    --, onReady :: Maybe String -- PropTypes.func,
    --, resizable :: Maybe Boolean -- PropTypes.bool,
    --, onEvents :: Maybe String -- PropTypes.object
    , onEvents :: OnEvents -- PropTypes.object
    , ref :: Effect Unit
    }
    type Option =
    ......@@ -160,3 +166,53 @@ type AxisLabel =
    }
    type Rich = {}
    ---
    -- | @XXX "echarts-for-react" third party library does not have an event
    -- | dictionary
    -- | these values had been picked from what we gather in the dist file
    -- | "echarts/dist/echarts.common.js" and
    -- | https://echarts.apache.org/en/api.html#events
    type OnEvents =
    { click :: Effect Unit
    -- ...
    }
    -- | @XXX "echarts-for-react" third party library bases on "apache-echarts"
    -- | does not have strongly typed signature, nor determined arity
    -- | (actual runtime event contains more key than what their docs describe)
    -- |
    -- | https://echarts.apache.org/en/api.html#events.Mouse%20events
    type MouseEvent =
    { borderColor :: Nullable String
    , color :: String
    , componentIndex :: Int
    , componentSubType :: String
    , componentTyp :: String
    -- , data :: -- Object
    , dataIndex :: Int
    , dataType :: Nullable String
    -- , dimensionNames :: -- Array
    -- , encore :: -- Object
    -- , event :: -- instanceof Event
    -- , marker :: -- String
    , name :: String
    , seriesId :: Nullable String
    , seriesIndex :: Int
    , seriesName :: String
    , seriesType :: String
    , type :: String
    , value :: String -- or Array ??
    }
    ----
    -- | @XXX partial definition given by the third library author
    -- | POJO containing a mix of ReactElement field and custom method attached
    -- |
    -- | https://github.com/hustcc/echarts-for-react#component-api--echarts-api
    type EChartRef =
    ( getEchartsInstance :: Effect EChartsInstance
    -- ...
    )
    src/Gargantext/Components/DocsTable.purs
    View file @ b7f2c801
    -- TODO: this module should be replaced by FacetsTable
    module Gargantext.Components.DocsTable where
    import DOM.Simple.Console (log2)
    import DOM.Simple.Event as DE
    import Data.Argonaut (class EncodeJson, jsonEmptyObject, (:=), (~>))
    import Data.Array as A
    import Data.Generic.Rep (class Generic)
    import Data.Lens ((^.))
    import Data.Lens.At (at)
    import Data.Lens.Record (prop)
    import Data.Maybe (Maybe(..), fromMaybe, isJust, maybe)
    import Data.Map as Map
    import Data.Maybe (Maybe(..), fromMaybe, isJust, maybe)
    import Data.Newtype (class Newtype)
    import Data.Ord.Down (Down(..))
    import Data.Set (Set)
    ......@@ -15,37 +18,34 @@ import Data.Set as Set
    import Data.String as Str
    import Data.Symbol (SProxy(..))
    import Data.Tuple (Tuple(..))
    import DOM.Simple.Console (log2)
    import DOM.Simple.Event as DE
    import Effect (Effect)
    import Effect.Aff (Aff, launchAff_)
    import Effect.Class (liftEffect)
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Simple.JSON as JSON
    import Toestand as T
    import Gargantext.Prelude
    import Gargantext.Components.Category (rating)
    import Gargantext.Components.Category.Types (Star(..))
    import Gargantext.Components.DocsTable.Types
    ( DocumentsView(..), Hyperdata(..), LocalUserScore, Query, Response(..), sampleData )
    import Gargantext.Components.Table.Types as TT
    import Gargantext.Components.DocsTable.Types (DocumentsView(..), Hyperdata(..), LocalUserScore, Query, Response(..), Year, sampleData)
    import Gargantext.Components.Nodes.Lists.Types as NT
    import Gargantext.Components.Nodes.Texts.Types as TextsT
    import Gargantext.Components.Table as TT
    import Gargantext.Components.Table.Types as TT
    import Gargantext.Ends (Frontends, url)
    import Gargantext.Hooks.Loader (useLoader, useLoaderWithCacheAPI, HashedResponse(..))
    import Gargantext.Routes as Routes
    import Gargantext.Prelude
    import Gargantext.Prelude (class Ord, Unit, bind, const, discard, identity, mempty, otherwise, pure, show, unit, ($), (/=), (<$>), (<<<), (<>), (==))
    import Gargantext.Routes (SessionRoute(NodeAPI))
    import Gargantext.Routes as Routes
    import Gargantext.Sessions (Session, sessionId, get, delete)
    import Gargantext.Types (ListId, NodeID, NodeType(..), OrderBy(..), SidePanelState(..), TableResult, TabSubType, TabType, showTabType')
    import Gargantext.Utils (sortWith)
    import Gargantext.Utils.CacheAPI as GUC
    import Gargantext.Utils.QueryString (joinQueryStrings, mQueryParamS, queryParam, queryParamS)
    import Gargantext.Utils.QueryString (joinQueryStrings, mQueryParam, mQueryParamS, queryParam, queryParamS)
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Prelude
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Simple.JSON as JSON
    import Toestand as T
    here :: R2.Here
    here = R2.here "Gargantext.Components.DocsTable"
    ......@@ -73,6 +73,7 @@ type CommonProps =
    -- ^ tabType is not ideal here since it is too much entangled with tabs and
    -- ngramtable. Let's see how this evolves. )
    , totalRecords :: Int
    , yearFilter :: T.Box (Maybe Year)
    )
    type LayoutProps =
    ......@@ -128,6 +129,7 @@ docViewCpt = here.component "docView" cpt where
    , sidePanelState
    , tabType
    , totalRecords
    , yearFilter
    }
    , params
    , query
    ......@@ -153,6 +155,7 @@ docViewCpt = here.component "docView" cpt where
    , sidePanelState
    , tabType
    , totalRecords
    , yearFilter
    } [] ] ] ]
    type SearchBarProps =
    ......@@ -215,6 +218,7 @@ type PageParams = {
    , tabType :: TabType
    , query :: Query
    , params :: TT.Params
    , yearFilter :: Maybe Year
    }
    getPageHash :: Session -> PageParams -> Aff String
    ......@@ -249,6 +253,12 @@ filterDocs query docs = A.filter filterFunc docs
    filterFunc (Response { hyperdata: Hyperdata { title } }) =
    isJust $ Str.indexOf (Str.Pattern $ Str.toLower query) $ Str.toLower title
    filterDocsByYear :: Year -> Array Response -> Array Response
    filterDocsByYear year docs = A.filter filterFunc docs
    where
    filterFunc :: Response -> Boolean
    filterFunc (Response { hyperdata: Hyperdata { pub_year } }) = eq year $ show pub_year
    pageLayout :: R2.Component PageLayoutProps
    pageLayout = R.createElement pageLayoutCpt
    ......@@ -263,19 +273,30 @@ pageLayoutCpt = here.component "pageLayout" cpt where
    , query
    , session
    , sidePanel
    , tabType } _ = do
    , tabType
    , yearFilter
    } _ = do
    cacheState' <- T.useLive T.unequal cacheState
    yearFilter' <- T.useLive T.unequal yearFilter
    let path = { listId, mCorpusId, nodeId, params, query, tabType }
    let path = { listId, mCorpusId, nodeId, params, query, tabType, yearFilter: yearFilter' }
    handleResponse :: HashedResponse (TableResult Response) -> Tuple Int (Array DocumentsView)
    handleResponse (HashedResponse { hash, value: res }) = ret
    where
    docs = res2corpus <$> filterDocs query res.docs
    filters = filterDocs query
    >>> \res' -> case yearFilter' of
    Nothing -> res'
    Just year -> filterDocsByYear year res'
    docs = res2corpus <$> filters res.docs
    ret = if mock then
    --Tuple 0 (take limit $ drop offset sampleData)
    Tuple 0 sampleData
    else
    Tuple res.count docs
    case cacheState' of
    NT.CacheOn -> do
    let paint (Tuple count docs) = page { documents: docs
    ......@@ -527,9 +548,10 @@ tableRouteWithPage :: forall row.
    , params :: TT.Params
    , query :: Query
    , tabType :: TabType
    , yearFilter :: Maybe Year
    | row } -> SessionRoute
    tableRouteWithPage { listId, nodeId, params: { limit, offset, orderBy, searchType }, query, tabType } =
    NodeAPI Node (Just nodeId) $ "table" <> joinQueryStrings [tt, lst, lmt, odb, ofs, st, q]
    tableRouteWithPage { listId, nodeId, params: { limit, offset, orderBy, searchType }, query, tabType, yearFilter } =
    NodeAPI Node (Just nodeId) $ "table" <> joinQueryStrings [tt, lst, lmt, odb, ofs, st, q, y]
    where
    lmt = queryParam "limit" limit
    lst = queryParam "list" listId
    ......@@ -538,6 +560,7 @@ tableRouteWithPage { listId, nodeId, params: { limit, offset, orderBy, searchTyp
    st = queryParam "searchType" searchType
    tt = queryParamS "tabType" (showTabType' tabType)
    q = queryParamS "query" query
    y = mQueryParam "year" yearFilter
    deleteAllDocuments :: Session -> Int -> Aff (Array Int)
    deleteAllDocuments session = delete session <<< documentsRoute
    ......
    src/Gargantext/Components/DocsTable/Types.purs
    View file @ b7f2c801
    ......@@ -97,6 +97,7 @@ instance JSON.ReadForeign Hyperdata where
    type LocalCategories = Map Int Category
    type LocalUserScore = Map Int Star
    type Query = String
    type Year = String
    ---------------------------------------------------------
    sampleData' :: DocumentsView
    ......
    src/Gargantext/Components/Nodes/Annuaire/Tabs.purs
    View file @ b7f2c801
    ......@@ -2,31 +2,32 @@
    module Gargantext.Components.Nodes.Annuaire.Tabs where
    import Prelude hiding (div)
    import Effect.Aff (Aff)
    import Data.Generic.Rep (class Generic)
    import Data.Show.Generic (genericShow)
    import Data.Maybe (Maybe(..))
    import Data.Tuple (fst)
    import Data.Tuple.Nested ((/\))
    import Reactix as R
    import Record as Record
    import Record.Extra as RX
    import Toestand as T
    import Effect.Aff (Aff)
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.DocsTable as DT
    import Gargantext.Components.DocsTable.Types (Year)
    import Gargantext.Components.NgramsTable as NT
    import Gargantext.Components.NgramsTable.Core as NTC
    import Gargantext.Components.Nodes.Texts.Types as TextsT
    import Gargantext.Components.Tab as Tab
    import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types (ContactData)
    import Gargantext.Components.Nodes.Lists.Types as LTypes
    import Gargantext.Components.Nodes.Texts.Types as TTypes
    import Gargantext.Components.Nodes.Texts.Types as TextsT
    import Gargantext.Components.Tab as Tab
    import Gargantext.Ends (Frontends)
    import Gargantext.Sessions (Session)
    import Gargantext.Types (CTabNgramType(..), PTabNgramType(..), SidePanelState, TabType(..), TabSubType(..))
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    import Record as Record
    import Record.Extra as RX
    import Toestand as T
    here :: R2.Here
    here = R2.here "Gargantext.Components.Nodes.Annuaire.User.Contacts.Tabs"
    ......@@ -71,9 +72,10 @@ tabsCpt :: R.Component TabsProps
    tabsCpt = here.component "tabs" cpt where
    cpt props _ = do
    activeTab <- T.useBox 0
    yearFilter <- T.useBox (Nothing :: Maybe Year)
    pure $ Tab.tabs { activeTab, tabs: tabs' props }
    tabs' props@{ sidePanel, sidePanelState } =
    pure $ Tab.tabs { activeTab, tabs: tabs' yearFilter props }
    tabs' yearFilter props@{ sidePanel, sidePanelState } =
    [ "Documents" /\ docs
    , "Patents" /\ ngramsView (viewProps Patents)
    , "Books" /\ ngramsView (viewProps Books)
    ......@@ -92,6 +94,7 @@ tabsCpt = here.component "tabs" cpt where
    , showSearch: true
    , tabType: TabPairing TabDocs
    , totalRecords
    , yearFilter
    }
    type DTCommon =
    ......
    src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Tabs.purs
    View file @ b7f2c801
    ......@@ -2,27 +2,28 @@
    module Gargantext.Components.Nodes.Annuaire.User.Contacts.Tabs where
    import Prelude hiding (div)
    import Data.Generic.Rep (class Generic)
    import Data.Show.Generic (genericShow)
    import Data.Maybe (Maybe(..))
    import Data.Tuple (fst)
    import Data.Tuple.Nested ((/\))
    import Reactix as R
    import Toestand as T
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.DocsTable as DT
    import Gargantext.Components.DocsTable.Types (Year)
    import Gargantext.Components.NgramsTable as NT
    import Gargantext.Components.NgramsTable.Core as NTC
    import Gargantext.Components.Tab as Tab
    import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types (ContactData')
    import Gargantext.Components.Nodes.Lists.Types as LTypes
    import Gargantext.Components.Nodes.Texts.Types as TTypes
    import Gargantext.Components.Tab as Tab
    import Gargantext.Ends (Frontends)
    import Gargantext.Sessions (Session)
    import Gargantext.Types (CTabNgramType(..), PTabNgramType(..), SidePanelState, TabType(..), TabSubType(..))
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    import Toestand as T
    here :: R2.Here
    here = R2.here "Gargantext.Components.Nodes.Annuaire.User.Contacts.Tabs"
    ......@@ -78,10 +79,11 @@ tabsCpt = here.component "tabs" cpt
    , sidePanelState
    , reloadForest } _ = do
    activeTab <- T.useBox 0
    yearFilter <- T.useBox (Nothing :: Maybe Year)
    pure $ Tab.tabs { activeTab, tabs: tabs' }
    pure $ Tab.tabs { activeTab, tabs: tabs' yearFilter }
    where
    tabs' =
    tabs' yearFilter =
    [ "Documents" /\ docs
    , "Patents" /\ ngramsView patentsView []
    , "Books" /\ ngramsView booksView []
    ......@@ -127,6 +129,7 @@ tabsCpt = here.component "tabs" cpt
    , sidePanelState
    , tabType: TabPairing TabDocs
    , totalRecords
    , yearFilter
    }
    ......
    src/Gargantext/Components/Nodes/Corpus/Chart/Common.purs
    View file @ b7f2c801
    ......@@ -34,11 +34,11 @@ metricsLoadView p = R.createElement metricsLoadViewCpt p []
    metricsLoadViewCpt :: forall a. Eq a => R.Component (MetricsLoadViewProps a)
    metricsLoadViewCpt = here.component "metricsLoadView" cpt
    where
    cpt { getMetrics, loaded, path, reload, session } _ = do
    cpt { getMetrics, loaded, path, reload, session, onClick, onInit } _ = do
    reload' <- T.useLive T.unequal reload
    useLoader (reload' /\ path) (getMetrics session) $ \l ->
    loaded { path, reload, session } l
    loaded { path, reload, session, onClick, onInit } l
    type MetricsWithCacheLoadViewProps res ret = (
    getMetricsHash :: Session -> ReloadPath -> Aff Hash
    ......@@ -58,11 +58,11 @@ metricsWithCacheLoadViewCpt :: forall res ret.
    R.Component (MetricsWithCacheLoadViewProps res ret)
    metricsWithCacheLoadViewCpt = here.component "metricsWithCacheLoadView" cpt
    where
    cpt { getMetricsHash, handleResponse, loaded, mkRequest, path, reload, session } _ = do
    cpt { getMetricsHash, handleResponse, loaded, mkRequest, path, reload, session, onClick, onInit } _ = do
    reload' <- T.useLive T.unequal reload
    useLoaderWithCacheAPI { cacheEndpoint: (getMetricsHash session)
    , handleResponse
    , mkRequest
    , path: (reload' /\ path)
    , renderer: loaded { path, reload, session } }
    , renderer: loaded { path, reload, session, onClick, onInit } }
    src/Gargantext/Components/Nodes/Corpus/Chart/Histo.purs
    View file @ b7f2c801
    module Gargantext.Components.Nodes.Corpus.Chart.Histo where
    import Data.Generic.Rep (class Generic)
    import Data.Eq.Generic (genericEq)
    import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..))
    import Data.Newtype (class Newtype)
    import Data.Tuple.Nested ((/\))
    import Effect.Aff (Aff)
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Simple.JSON as JSON
    import Toestand as T
    import Gargantext.Prelude (class Eq, bind, map, pure, ($), (==))
    import Gargantext.Components.Charts.Options.Color (grey)
    import Gargantext.Components.Charts.Options.Color (grey, blue, green)
    import Gargantext.Components.Charts.Options.Data (dataSerie)
    import Gargantext.Components.Charts.Options.ECharts (Options(..), chart, xAxis', yAxis')
    import Gargantext.Components.Charts.Options.Font (itemStyle, mkTooltip, templateFormatter)
    import Gargantext.Components.Charts.Options.Legend (LegendMode(..), selectedMode)
    import Gargantext.Components.Charts.Options.Series (seriesBarD1)
    import Gargantext.Components.Nodes.Corpus.Chart.Common (metricsWithCacheLoadView)
    import Gargantext.Components.Nodes.Corpus.Chart.Types (MetricsProps, Path, Props, ReloadPath)
    import Gargantext.Hooks.Loader (HashedResponse(..))
    import Gargantext.Prelude (class Eq, bind, map, pure, ($), (==))
    import Gargantext.Routes (SessionRoute(..))
    import Gargantext.Sessions (Session, get)
    import Gargantext.Types (ChartType(..))
    import Gargantext.Utils.CacheAPI as GUC
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Simple.JSON as JSON
    import Toestand as T
    here :: R2.Here
    here = R2.here "Gargantext.Components.Nodes.Corpus.Chart.Histo"
    ......@@ -48,16 +48,32 @@ derive newtype instance JSON.WriteForeign HistoMetrics
    type Loaded = HistoMetrics
    chartOptions :: HistoMetrics -> Options
    chartOptions (HistoMetrics { dates: dates', count: count'}) = Options
    chartOptions :: Record MetricsProps -> HistoMetrics -> Options
    chartOptions { onClick, onInit } (HistoMetrics { dates: dates', count: count'}) = Options
    { mainTitle : "Histogram"
    , subTitle : "Distribution of publications over time"
    , xAxis : xAxis' dates'
    , yAxis : yAxis' { position: "left", show: true, min:0}
    , addZoom : true
    , tooltip : mkTooltip { formatter: templateFormatter "{b0}" }
    , series : [seriesBarD1 {name: "Number of publication / year"} $
    map (\n -> dataSerie {value: n, itemStyle : itemStyle {color:grey}}) count'] }
    , series
    , onClick
    , onInit
    }
    where
    mapSeriesBar n = dataSerie
    { value: n
    , itemStyle: itemStyle { color: grey }
    , emphasis: { itemStyle: itemStyle { color: blue } }
    -- @XXX "select" action not working
    -- , selectedMode: selectedMode Single
    , select: { itemStyle: itemStyle { color: green }}
    }
    series =
    [ seriesBarD1 {name: "Number of publication / year"} $
    map mapSeriesBar count'
    ]
    getMetricsHash :: Session -> ReloadPath -> Aff String
    getMetricsHash session (_ /\ { corpusId, limit, listId, tabType }) = do
    ......@@ -82,7 +98,7 @@ histo props = R.createElement histoCpt props []
    histoCpt :: R.Component Props
    histoCpt = here.component "histo" cpt
    where
    cpt { path, session } _ = do
    cpt { path, session, onClick, onInit } _ = do
    reload <- T.useBox T2.newReload
    pure $ metricsWithCacheLoadView {
    ......@@ -93,13 +109,15 @@ histoCpt = here.component "histo" cpt
    , path
    , reload
    , session
    , onClick
    , onInit
    }
    loaded :: Record MetricsProps -> HistoMetrics -> R.Element
    loaded { path, reload, session } l =
    loaded p@{ path, reload, session } l =
    H.div {} [
    {- U.reloadButton reload
    , U.chartUpdateButton { chartType: Histo, path, reload, session }
    , -} chart $ chartOptions l
    , -} chart $ chartOptions p l
    ]
    -- TODO: parametrize ngramsType above
    src/Gargantext/Components/Nodes/Corpus/Chart/Metrics.purs
    View file @ b7f2c801
    ......@@ -57,8 +57,8 @@ derive newtype instance JSON.ReadForeign Metrics
    type Loaded = Array Metric
    scatterOptions :: Array Metric -> Options
    scatterOptions metrics' = Options
    scatterOptions :: Record MetricsProps -> Array Metric -> Options
    scatterOptions { onClick, onInit } metrics' = Options
    { mainTitle : "Ngrams Selection Metrics"
    , subTitle : "Local metrics (Inc/Exc, Spe/Gen), Global metrics (TFICF maillage)"
    , xAxis : xAxis { min: -1 }
    ......@@ -66,6 +66,8 @@ scatterOptions metrics' = Options
    , series : map2series $ metric2map metrics'
    , addZoom : false
    , tooltip : mkTooltip { formatter: templateFormatter "{b0}" }
    , onClick
    , onInit
    }
    where
    metric2map :: Array Metric -> Map TermList (Array Metric)
    ......@@ -110,7 +112,7 @@ metrics props = R.createElement metricsCpt props []
    metricsCpt :: R.Component Props
    metricsCpt = here.component "etrics" cpt
    where
    cpt {path, session} _ = do
    cpt {path, session, onClick, onInit } _ = do
    reload <- T.useBox T2.newReload
    pure $ metricsWithCacheLoadView {
    ......@@ -121,13 +123,15 @@ metricsCpt = here.component "etrics" cpt
    , path
    , reload
    , session
    , onClick
    , onInit
    }
    loaded :: Record MetricsProps -> Loaded -> R.Element
    loaded { path, reload, session } loaded' =
    loaded p@{ path, reload, session } loaded' =
    H.div {} [
    {- U.reloadButton reload
    , U.chartUpdateButton { chartType: Scatter, path, reload, session }
    , -} chart $ scatterOptions loaded'
    , -} chart $ scatterOptions p loaded'
    ]
    src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
    View file @ b7f2c801
    ......@@ -55,8 +55,8 @@ derive newtype instance JSON.WriteForeign HistoMetrics
    type Loaded = HistoMetrics
    chartOptionsBar :: HistoMetrics -> Options
    chartOptionsBar (HistoMetrics { dates: dates', count: count'}) = Options
    chartOptionsBar :: Record MetricsProps -> HistoMetrics -> Options
    chartOptionsBar { onClick, onInit } (HistoMetrics { dates: dates', count: count'}) = Options
    { mainTitle : "Bar"
    , subTitle : "Count of MapTerm"
    , xAxis : xAxis' $ map (\t -> joinWith " " $ map (take 3) $ A.take 3 $ filter (\s -> length s > 3) $ split (Pattern " ") t) dates'
    ......@@ -64,10 +64,12 @@ chartOptionsBar (HistoMetrics { dates: dates', count: count'}) = Options
    , series : [seriesBarD1 {name: "Number of publication / year"} $ map (\n -> dataSerie {name: "", itemStyle: itemStyle {color:blue}, value: n }) count']
    , addZoom : false
    , tooltip : mkTooltip { formatter: templateFormatter "{b0}" }
    , onClick
    , onInit
    }
    chartOptionsPie :: HistoMetrics -> Options
    chartOptionsPie (HistoMetrics { dates: dates', count: count'}) = Options
    chartOptionsPie :: Record MetricsProps -> HistoMetrics -> Options
    chartOptionsPie { onClick, onInit } (HistoMetrics { dates: dates', count: count'}) = Options
    { mainTitle : "Pie"
    , subTitle : "Distribution by MapTerm"
    , xAxis : xAxis' []
    ......@@ -76,6 +78,8 @@ chartOptionsPie (HistoMetrics { dates: dates', count: count'}) = Options
    -- , series : [seriesBarD1 {name: "Number of publication / year"} $ map (\n -> dataSerie {name: "", value: n }) count']
    , addZoom : false
    , tooltip : mkTooltip { formatter: templateFormatter "{b0}" }
    , onClick
    , onInit
    }
    getMetricsHash :: Session -> ReloadPath -> Aff String
    ......@@ -101,7 +105,7 @@ pie props = R.createElement pieCpt props []
    pieCpt :: R.Component Props
    pieCpt = here.component "pie" cpt
    where
    cpt { path, session } _ = do
    cpt { path, session, onClick, onInit } _ = do
    reload <- T.useBox T2.newReload
    pure $ metricsWithCacheLoadView {
    ......@@ -112,14 +116,16 @@ pieCpt = here.component "pie" cpt
    , path
    , reload
    , session
    , onClick
    , onInit
    }
    loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
    loadedPie { path, reload, session } loaded =
    loadedPie p@{ path, reload, session } loaded =
    H.div {} [
    {- U.reloadButton reload
    , U.chartUpdateButton { chartType: ChartPie, path, reload, session }
    , -} chart $ chartOptionsPie loaded
    , -} chart $ chartOptionsPie p loaded
    ]
    ......@@ -129,7 +135,7 @@ bar props = R.createElement barCpt props []
    barCpt :: R.Component Props
    barCpt = here.component "bar" cpt
    where
    cpt {path, session} _ = do
    cpt {path, session, onClick, onInit} _ = do
    reload <- T.useBox T2.newReload
    pure $ metricsWithCacheLoadView {
    ......@@ -140,12 +146,14 @@ barCpt = here.component "bar" cpt
    , path
    , reload
    , session
    , onClick
    , onInit
    }
    loadedBar :: Record MetricsProps -> Loaded -> R.Element
    loadedBar { path, reload, session } loaded =
    loadedBar p@{ path, reload, session } loaded =
    H.div {} [
    {- U.reloadButton reload
    , U.chartUpdateButton { chartType: ChartBar, path, reload, session }
    , -} chart $ chartOptionsBar loaded
    , -} chart $ chartOptionsBar p loaded
    ]
    src/Gargantext/Components/Nodes/Corpus/Chart/Predefined.purs
    View file @ b7f2c801
    module Gargantext.Components.Nodes.Corpus.Chart.Predefined where
    import Gargantext.Prelude
    import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson)
    import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..), fromMaybe)
    import Data.Nullable (Nullable)
    import Data.Ord.Generic (genericCompare)
    import Data.Show.Generic (genericShow)
    import Effect (Effect)
    import Gargantext.Components.Charts.Options.Type (EChartsInstance, MouseEvent)
    import Gargantext.Components.Nodes.Corpus.Chart.Histo (histo)
    import Gargantext.Components.Nodes.Corpus.Chart.Metrics (metrics)
    import Gargantext.Components.Nodes.Corpus.Chart.Pie (pie)
    import Gargantext.Components.Nodes.Corpus.Chart.Tree (tree)
    import Gargantext.Prelude
    import Gargantext.Sessions (Session)
    import Gargantext.Types (NodeID, Mode(..), TabSubType(..), TabType(..), modeTabType)
    import Reactix as R
    ......@@ -58,45 +61,43 @@ type Params =
    -- optinal params
    , limit :: Maybe Int
    , listId :: Maybe Int
    , onClick :: Maybe (MouseEvent -> Effect Unit)
    , onInit :: Maybe (EChartsInstance -> Effect Unit)
    )
    render :: PredefinedChart -> Record Params -> R.Element
    render CDocsHistogram { corpusId, listId, session } = histo { path, session }
    render CDocsHistogram { corpusId, listId, session, onClick, onInit } = histo { path, session, onClick, onInit }
    where
    path = { corpusId
    , listId: fromMaybe 0 listId
    , limit: Nothing
    , tabType: TabCorpus TabDocs
    }
    render CAuthorsPie { corpusId, listId, session } = pie { path, session }
    render CAuthorsPie { corpusId, listId, session, onClick, onInit } = pie { path, session, onClick, onInit }
    where
    path = { corpusId
    , listId: fromMaybe 0 listId
    , limit: Nothing
    , tabType: TabCorpus (TabNgramType $ modeTabType Authors)
    }
    render CInstitutesTree { corpusId, limit, listId, session } = tree { path, session }
    render CInstitutesTree { corpusId, limit, listId, session, onClick, onInit } = tree { path, session, onClick, onInit }
    where
    path = { corpusId
    , limit
    , listId: fromMaybe 0 listId
    , tabType: TabCorpus (TabNgramType $ modeTabType Institutes)
    }
    render CTermsMetrics { corpusId, limit, listId, session } = metrics { path, session }
    render CTermsMetrics { corpusId, limit, listId, session, onClick, onInit } = metrics { path, session, onClick, onInit }
    where
    path = { corpusId
    , limit
    , listId: fromMaybe 0 listId
    , tabType: TabCorpus (TabNgramType $ modeTabType Terms)
    }
    render CSourcesBar { corpusId, limit, listId, session } = metrics { path, session }
    render CSourcesBar { corpusId, limit, listId, session, onClick, onInit } = metrics { path, session, onClick, onInit }
    where
    path = { corpusId
    , limit
    , listId: fromMaybe 0 listId
    , tabType: TabCorpus (TabNgramType $ modeTabType Sources)
    }
    src/Gargantext/Components/Nodes/Corpus/Chart/Tree.purs
    View file @ b7f2c801
    ......@@ -38,8 +38,8 @@ derive newtype instance JSON.WriteForeign Metrics
    type Loaded = Array TreeNode
    scatterOptions :: Array TreeNode -> Options
    scatterOptions nodes = Options
    scatterOptions :: Record MetricsProps -> Array TreeNode -> Options
    scatterOptions { onClick, onInit } nodes = Options
    { mainTitle : "Tree"
    , subTitle : "Tree Sub Title"
    , xAxis : xAxis' []
    ......@@ -47,6 +47,8 @@ scatterOptions nodes = Options
    , series : [ mkTree TreeMap nodes]
    , addZoom : false
    , tooltip : mkTooltip { formatter: templateFormatter "{b0}" }
    , onClick
    , onInit
    -- TODO improve the formatter:
    -- https://ecomfe.github.io/echarts-examples/public/editor.html?c=treemap-obama
    ......@@ -75,7 +77,7 @@ tree props = R.createElement treeCpt props []
    treeCpt :: R.Component Props
    treeCpt = here.component "tree" cpt
    where
    cpt {path, session} _ = do
    cpt {path, session, onClick, onInit} _ = do
    reload <- T.useBox T2.newReload
    pure $ metricsWithCacheLoadView {
    ......@@ -86,12 +88,14 @@ treeCpt = here.component "tree" cpt
    , path
    , reload
    , session
    , onClick
    , onInit
    }
    loaded :: Record MetricsProps -> Loaded -> R.Element
    loaded { path, reload, session } loaded' =
    loaded p@{ path, reload, session } loaded' =
    H.div {} [
    {- U.reloadButton reload
    , U.chartUpdateButton { chartType: ChartTree, path, reload, session }
    , -} chart (scatterOptions loaded')
    , -} chart (scatterOptions p loaded')
    ]
    src/Gargantext/Components/Nodes/Corpus/Chart/Types.purs
    View file @ b7f2c801
    ......@@ -2,7 +2,9 @@ module Gargantext.Components.Nodes.Corpus.Chart.Types where
    import Data.Maybe (Maybe)
    import Data.Tuple (Tuple)
    import Effect (Effect)
    import Gargantext.Components.Charts.Options.Type (EChartsInstance, MouseEvent)
    import Gargantext.Prelude (Unit)
    import Gargantext.Sessions (Session)
    import Gargantext.Types (TabType)
    import Gargantext.Utils.Toestand as T2
    ......@@ -17,6 +19,8 @@ type Path = (
    type Props = (
    path :: Record Path
    , session :: Session
    , onClick :: Maybe (MouseEvent -> Effect Unit)
    , onInit :: Maybe (EChartsInstance -> Effect Unit)
    )
    type MetricsProps = (
    ......
    src/Gargantext/Components/Nodes/Corpus/Dashboard.purs
    View file @ b7f2c801
    ......@@ -228,6 +228,8 @@ renderChartCpt = here.component "renderChart" cpt
    , limit: Just 1000
    , listId: Just defaultListId
    , session
    , onClick: Nothing
    , onInit: Nothing
    }
    -- aSchool school = H.div {className: "col-md-4 content"} [ chart $ focus school ]
    ......
    src/Gargantext/Components/Nodes/Corpus/Types.purs
    View file @ b7f2c801
    module Gargantext.Components.Nodes.Corpus.Types where
    import Data.Generic.Rep (class Generic)
    import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, (.:), (:=), (~>), jsonEmptyObject)
    import Data.Eq.Generic (genericEq)
    import Data.Generic.Rep (class Generic)
    import Data.List as List
    import Data.Maybe (Maybe(..))
    import Data.Newtype (class Newtype)
    import Gargantext.Components.Node (NodePoly)
    import Gargantext.Components.Nodes.Types (FTField, Field(..), FieldType(..), FTField, FTFieldList(..), isJSON)
    import Gargantext.Prelude
    import Reactix as R
    import Record as Record
    import Simple.JSON as JSON
    import Gargantext.Prelude
    import Gargantext.Components.Node (NodePoly)
    import Gargantext.Components.Nodes.Types (FTFieldList(..), Field(..), FieldType(..), isJSON)
    import Toestand as T
    newtype Hyperdata =
    Hyperdata { fields :: FTFieldList }
    ......
    src/Gargantext/Components/Nodes/Lists/Tabs.purs
    View file @ b7f2c801
    module Gargantext.Components.Nodes.Lists.Tabs where
    import Gargantext.Prelude (bind, pure, unit, ($), (<>))
    import Gargantext.Components.Nodes.Lists.Types
    import Data.Array as A
    import Data.Maybe (Maybe(..), fromMaybe)
    import Data.Tuple (fst)
    import Data.Tuple.Nested ((/\))
    import Effect.Class (liftEffect)
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Record as Record
    import Record.Extra as RX
    import Toestand as T
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.NgramsTable as NT
    import Gargantext.Components.NgramsTable.Core as NTC
    import Gargantext.Components.Nodes.Corpus.Types (CorpusData)
    import Gargantext.Components.Nodes.Corpus.Chart.Metrics (metrics)
    import Gargantext.Components.Nodes.Corpus.Chart.Pie (pie, bar)
    import Gargantext.Components.Nodes.Corpus.Chart.Tree (tree)
    import Gargantext.Components.Nodes.Corpus.Chart.Utils (mNgramsTypeFromTabType)
    import Gargantext.Components.Nodes.Lists.Types
    import Gargantext.Components.Nodes.Corpus.Types (CorpusData)
    import Gargantext.Components.Search as S
    import Gargantext.Components.Tab as Tab
    import Gargantext.Prelude (bind, pure, unit, ($), (<>))
    import Gargantext.Sessions (Session)
    import Gargantext.Types
    ( ChartType(..), CTabNgramType(..), Mode(..), TabSubType(..), TabType(..), modeTabType )
    import Gargantext.Types (ChartType(..), CTabNgramType(..), Mode(..), TabSubType(..), TabType(..), modeTabType)
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Record as Record
    import Record.Extra as RX
    import Toestand as T
    here :: R2.Here
    here = R2.here "Gargantext.Components.Nodes.Lists.Tabs"
    ......@@ -163,7 +161,7 @@ ngramsViewCpt = here.component "ngramsView" cpt where
    ]
    charts params _ = [ chart params mode ]
    chart path Authors = pie { path, session }
    chart path Institutes = tree { path, session }
    chart path Sources = bar { path, session }
    chart path Terms = metrics { path, session }
    chart path Authors = pie { path, session, onClick: Nothing, onInit: Nothing }
    chart path Institutes = tree { path, session, onClick: Nothing, onInit: Nothing }
    chart path Sources = bar { path, session, onClick: Nothing, onInit: Nothing }
    chart path Terms = metrics { path, session, onClick: Nothing, onInit: Nothing }
    src/Gargantext/Components/Nodes/Texts.purs
    View file @ b7f2c801
    module Gargantext.Components.Nodes.Texts where
    import DOM.Simple.Console (log2)
    import Data.Generic.Rep (class Generic)
    import Data.Show.Generic (genericShow)
    import Data.Maybe (Maybe(..))
    import Data.Show.Generic (genericShow)
    import Data.Symbol (SProxy(..))
    import Data.Tuple.Nested ((/\))
    import Effect.Aff (launchAff_)
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Toestand as T
    import Gargantext.Prelude
    import Gargantext.Components.Charts.Options.ECharts (dispatchAction)
    import Gargantext.Components.Charts.Options.Type (EChartsInstance)
    import Gargantext.Components.DocsTable as DT
    import Gargantext.Components.DocsTable.Types (Year)
    import Gargantext.Components.NgramsTable.Loader (clearCache)
    import Gargantext.Components.Node (NodePoly(..))
    import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
    import Gargantext.Components.Nodes.Corpus.Chart.Histo (histo)
    import Gargantext.Components.Nodes.Corpus.Document as D
    import Gargantext.Components.Nodes.Corpus.Types (CorpusData, Hyperdata(..), getCorpusInfo, CorpusInfo(..))
    import Gargantext.Components.Nodes.Corpus.Types (CorpusData, CorpusInfo(..), Hyperdata(..), getCorpusInfo)
    import Gargantext.Components.Nodes.Lists.Types as LT
    import Gargantext.Components.Nodes.Texts.Types as TT
    import Gargantext.Components.Tab as Tab
    import Gargantext.Components.Table as Table
    import Gargantext.Ends (Frontends)
    import Gargantext.Hooks.Loader (useLoader)
    import Gargantext.Sessions (WithSession, WithSessionContext, Session, sessionId, getCacheState)
    import Gargantext.Prelude
    import Gargantext.Sessions (WithSession, Session, getCacheState)
    import Gargantext.Types (CTabNgramType(..), ListId, NodeID, SidePanelState(..), TabSubType(..), TabType(..))
    import Gargantext.Utils.Reactix as R2
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Record (set)
    import Toestand as T
    here :: R2.Here
    here = R2.here "Gargantext.Components.Nodes.Texts"
    ......@@ -81,6 +85,10 @@ textsLayoutWithKeyCpt = here.component "textsLayoutWithKey" cpt
    cacheState <- T.useBox $ getCacheState LT.CacheOff session nodeId
    cacheState' <- T.useLive T.unequal cacheState
    yearFilter <- T.useBox (Nothing :: Maybe Year)
    eChartsInstance <- T.useBox (Nothing :: Maybe EChartsInstance)
    R.useEffectOnce' $ do
    T.listen (\{ new } -> afterCacheStateChange new) cacheState
    ......@@ -89,6 +97,7 @@ textsLayoutWithKeyCpt = here.component "textsLayoutWithKey" cpt
    let NodePoly { date, hyperdata: Hyperdata h, name } = corpusNode
    CorpusInfo { authors, desc, query } = getCorpusInfo h.fields
    title = "Corpus " <> name
    R.fragment
    [ Table.tableHeaderLayout { cacheState
    , date
    ......@@ -103,7 +112,10 @@ textsLayoutWithKeyCpt = here.component "textsLayoutWithKey" cpt
    , frontends
    , session
    , sidePanel
    , sidePanelState }
    , sidePanelState
    , yearFilter
    , eChartsInstance
    }
    ]
    where
    afterCacheStateChange cacheState = do
    ......@@ -133,6 +145,8 @@ type TabsProps =
    , session :: Session
    , sidePanel :: T.Box (Maybe (Record TT.SidePanel))
    , sidePanelState :: T.Box SidePanelState
    , yearFilter :: T.Box (Maybe Year)
    , eChartsInstance :: T.Box (Maybe EChartsInstance)
    )
    tabs :: Record TabsProps -> R.Element
    ......@@ -141,8 +155,23 @@ tabs props = R.createElement tabsCpt props []
    tabsCpt :: R.Component TabsProps
    tabsCpt = here.component "tabs" cpt
    where
    cpt { cacheState, corpusId, corpusData, frontends, session, sidePanel, sidePanelState } _ = do
    let path = initialPath
    cpt { cacheState, corpusId, corpusData, frontends, session, sidePanel, sidePanelState, yearFilter, eChartsInstance } _ = do
    let
    path = initialPath
    onInit = Just \i -> T.write_ (Just i) eChartsInstance
    onClick = Just \opts@{ name } -> do
    T.write_ (Just name) yearFilter
    T.read eChartsInstance >>= case _ of
    Nothing -> pure unit
    Just i -> do
    -- @XXX due to lack of support for "echart.select" action,
    -- have to manually rely on a set/unset selection
    -- targeting the "echart.emphasis" action
    dispatchAction i { type: "downplay" }
    dispatchAction i $ set (SProxy :: SProxy "type") "highlight" opts
    activeTab <- T.useBox 0
    ......@@ -150,7 +179,7 @@ tabsCpt = here.component "tabs" cpt
    activeTab
    , tabs: [
    "Documents" /\ R.fragment [
    histo { path, session }
    histo { path, session, onClick, onInit }
    , docView' path TabDocs
    ]
    , "Trash" /\ docView' path TabTrash
    ......@@ -173,7 +202,9 @@ tabsCpt = here.component "tabs" cpt
    , session
    , tabType
    , sidePanel
    , sidePanelState } []
    , sidePanelState
    , yearFilter
    } []
    type DocViewProps a = (
    cacheState :: T.Box LT.CacheState
    ......@@ -186,6 +217,7 @@ type DocViewProps a = (
    , tabType :: TabSubType a
    , sidePanel :: T.Box (Maybe (Record TT.SidePanel))
    , sidePanelState :: T.Box SidePanelState
    , yearFilter :: T.Box (Maybe Year)
    )
    docView :: forall a. R2.Component (DocViewProps a)
    ......@@ -205,7 +237,9 @@ docViewLayoutRec { cacheState
    , session
    , tabType: TabDocs
    , sidePanel
    , sidePanelState } =
    , sidePanelState
    , yearFilter
    } =
    { cacheState
    , chart : H.div {} []
    , frontends
    ......@@ -219,6 +253,7 @@ docViewLayoutRec { cacheState
    , sidePanelState
    , tabType: TabCorpus TabDocs
    , totalRecords: 4737
    , yearFilter
    }
    docViewLayoutRec { cacheState
    , corpusId
    ......@@ -227,7 +262,9 @@ docViewLayoutRec { cacheState
    , session
    , tabType: TabMoreLikeFav
    , sidePanel
    , sidePanelState } =
    , sidePanelState
    , yearFilter
    } =
    { cacheState
    , chart : H.div {} []
    , frontends
    ......@@ -241,6 +278,7 @@ docViewLayoutRec { cacheState
    , sidePanelState
    , tabType: TabCorpus TabMoreLikeFav
    , totalRecords: 4737
    , yearFilter
    }
    docViewLayoutRec { cacheState
    , corpusId
    ......@@ -249,7 +287,9 @@ docViewLayoutRec { cacheState
    , session
    , tabType: TabMoreLikeTrash
    , sidePanel
    , sidePanelState } =
    , sidePanelState
    , yearFilter
    } =
    { cacheState
    , chart : H.div {} []
    , frontends
    ......@@ -263,6 +303,7 @@ docViewLayoutRec { cacheState
    , sidePanelState
    , tabType: TabCorpus TabMoreLikeTrash
    , totalRecords: 4737
    , yearFilter
    }
    docViewLayoutRec { cacheState
    , corpusId
    ......@@ -271,7 +312,9 @@ docViewLayoutRec { cacheState
    , session
    , tabType: TabTrash
    , sidePanel
    , sidePanelState } =
    , sidePanelState
    , yearFilter
    } =
    { cacheState
    , chart : H.div {} []
    , frontends
    ......@@ -285,6 +328,7 @@ docViewLayoutRec { cacheState
    , sidePanelState
    , tabType: TabCorpus TabTrash
    , totalRecords: 4737
    , yearFilter
    }
    -- DUMMY
    docViewLayoutRec { cacheState
    ......@@ -294,7 +338,9 @@ docViewLayoutRec { cacheState
    , session
    , tabType
    , sidePanel
    , sidePanelState } =
    , sidePanelState
    , yearFilter
    } =
    { cacheState
    , chart : H.div {} []
    , frontends
    ......@@ -308,6 +354,7 @@ docViewLayoutRec { cacheState
    , sidePanelState
    , tabType: TabCorpus TabTrash
    , totalRecords: 4737
    , yearFilter
    }
    ......
    yarn.lock
    View file @ b7f2c801
    ......@@ -1975,11 +1975,16 @@ bootstrap-dark@^1.0.3:
    dependencies:
    bootstrap ">=4.3"
    bootstrap@>=4.3, bootstrap@^5.0.2:
    bootstrap@>=4.3:
    version "5.0.2"
    resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.2.tgz#aff23d5e0e03c31255ad437530ee6556e78e728e"
    integrity sha512-1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q==
    bootstrap@^4.6.0:
    version "4.6.0"
    resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
    integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
    boxen@1.3.0:
    version "1.3.0"
    resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
    ......
    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