Skip to content

P
purescript-gargantext
Commit c10a6d14 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski
Browse files
Options

[boxes] refactoring of boxes

parent 4da3ef16
Pipeline #1716 canceled with stage
    Expand all Show whitespace changes
    Inline Side-by-side
    Showing with 772 additions and 1046 deletions
    src/Gargantext/Components/App/Data.purs
    View file @ c10a6d14
    ......@@ -15,7 +15,7 @@ import Gargantext.Routes (AppRoute(Home))
    import Gargantext.Sessions (Session, Sessions)
    import Gargantext.Sessions as Sessions
    import Gargantext.Sessions.Types (OpenNodes(..))
    import Gargantext.Types (FrontendError(..), Handed(RightHanded), SidePanelState(..))
    import Gargantext.Types (FrontendError, Handed(RightHanded), SidePanelState(..))
    import Gargantext.Utils.Toestand as T2
    type App =
    ......
    src/Gargantext/Components/DocsTable.purs
    View file @ c10a6d14
    -- TODO: this module should be replaced by FacetsTable
    module Gargantext.Components.DocsTable where
    import Gargantext.Prelude
    import DOM.Simple.Console (log2)
    import DOM.Simple.Event as DE
    import Data.Array as A
    ......@@ -21,6 +23,7 @@ import Data.Tuple (Tuple(..))
    import Effect (Effect)
    import Effect.Aff (Aff)
    import Effect.Class (liftEffect)
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Category (rating)
    import Gargantext.Components.Category.Types (Star(..))
    import Gargantext.Components.DocsTable.Types (DocumentsView(..), Hyperdata(..), LocalUserScore, Query, Response(..), Year, sampleData)
    ......@@ -31,7 +34,6 @@ import Gargantext.Components.Table.Types as TT
    import Gargantext.Config.REST (RESTError)
    import Gargantext.Ends (Frontends, url)
    import Gargantext.Hooks.Loader (useLoader, useLoaderWithCacheAPI, HashedResponse(..))
    import Gargantext.Prelude
    import Gargantext.Routes (SessionRoute(NodeAPI))
    import Gargantext.Routes as Routes
    import Gargantext.Sessions (Session, sessionId, get, delete)
    ......@@ -60,15 +62,14 @@ type Path a =
    )
    type CommonProps =
    ( cacheState :: T.Box NT.CacheState
    , errors :: T.Box (Array FrontendError)
    ( boxes :: Boxes
    , cacheState :: T.Box NT.CacheState
    , frontends :: Frontends
    , listId :: Int
    , mCorpusId :: Maybe Int
    , nodeId :: Int
    , session :: Session
    , sidePanel :: T.Box (Maybe (Record TextsT.SidePanel))
    , sidePanelState :: T.Box SidePanelState
    , tabType :: TabType
    -- ^ tabType is not ideal here since it is too much entangled with tabs and
    -- ngramtable. Let's see how this evolves. )
    ......@@ -77,16 +78,14 @@ type CommonProps =
    )
    type LayoutProps =
    (
    chart :: R.Element
    ( chart :: R.Element
    , showSearch :: Boolean
    | CommonProps
    -- , path :: Record (Path a)
    )
    type PageLayoutProps =
    (
    key :: String -- NOTE Necessary to clear the component when cache state changes
    ( key :: String -- NOTE Necessary to clear the component when cache state changes
    , params :: TT.Params
    , query :: Query
    | CommonProps
    ......@@ -115,9 +114,9 @@ docView :: R2.Component Props
    docView = R.createElement docViewCpt
    docViewCpt :: R.Component Props
    docViewCpt = here.component "docView" cpt where
    cpt { layout: { cacheState
    cpt { layout: { boxes
    , cacheState
    , chart
    , errors
    , frontends
    , listId
    , mCorpusId
    ......@@ -125,7 +124,6 @@ docViewCpt = here.component "docView" cpt where
    , session
    , showSearch
    , sidePanel
    , sidePanelState
    , tabType
    , totalRecords
    , yearFilter
    ......@@ -141,8 +139,8 @@ docViewCpt = here.component "docView" cpt where
    [ chart
    , if showSearch then searchBar { query } [] else H.div {} []
    , H.div {className: "col-md-12"}
    [ pageLayout { cacheState
    , errors
    [ pageLayout { boxes
    , cacheState
    , frontends
    , key: "docView-" <> (show cacheState')
    , listId
    ......@@ -152,7 +150,6 @@ docViewCpt = here.component "docView" cpt where
    , query: query'
    , session
    , sidePanel
    , sidePanelState
    , tabType
    , totalRecords
    , yearFilter
    ......@@ -262,9 +259,8 @@ pageLayout :: R2.Component PageLayoutProps
    pageLayout = R.createElement pageLayoutCpt
    pageLayoutCpt :: R.Component PageLayoutProps
    pageLayoutCpt = here.component "pageLayout" cpt where
    cpt props@{ cacheState
    , errors
    , frontends
    cpt props@{ boxes
    , cacheState
    , listId
    , mCorpusId
    , nodeId
    ......@@ -298,16 +294,16 @@ pageLayoutCpt = here.component "pageLayout" cpt where
    case cacheState' of
    NT.CacheOn -> do
    let paint (Tuple count docs) = page { documents: docs
    , errors
    let paint (Tuple count docs) = page { boxes
    , documents: docs
    , layout: props { totalRecords = count }
    , params } []
    mkRequest :: PageParams -> GUC.Request
    mkRequest p = GUC.makeGetRequest session $ tableRoute p
    useLoaderWithCacheAPI {
    cacheEndpoint: getPageHash session
    , errors
    useLoaderWithCacheAPI
    { boxes
    , cacheEndpoint: getPageHash session
    , handleResponse
    , mkRequest
    , path
    ......@@ -335,9 +331,9 @@ pageLayoutCpt = here.component "pageLayout" cpt where
    , loader
    , render }
    type PageProps = (
    documents :: Array DocumentsView
    , errors :: T.Box (Array FrontendError)
    type PageProps =
    ( boxes :: Boxes
    , documents :: Array DocumentsView
    , layout :: Record PageLayoutProps
    , params :: TT.Params
    )
    ......@@ -383,8 +379,8 @@ pagePaintCpt = here.component "pagePaintCpt" cpt
    filteredRows params' = TT.filterRows { params: params' } $ (orderWith params') $ A.toUnfoldable documents
    type PagePaintRawProps = (
    documents :: Array DocumentsView
    type PagePaintRawProps =
    ( documents :: Array DocumentsView
    , layout :: Record PageLayoutProps
    , localCategories :: T.Box LocalUserScore
    , params :: T.Box TT.Params
    ......@@ -392,21 +388,19 @@ type PagePaintRawProps = (
    pagePaintRaw :: R2.Component PagePaintRawProps
    pagePaintRaw = R.createElement pagePaintRawCpt
    pagePaintRawCpt :: R.Component PagePaintRawProps
    pagePaintRawCpt = here.component "pagePaintRawCpt" cpt where
    cpt { documents
    , layout: { frontends
    , layout: { boxes
    , frontends
    , listId
    , mCorpusId
    , nodeId
    , session
    , sidePanel
    , sidePanelState
    , totalRecords }
    , localCategories
    , params } _ = do
    reload <- T.useBox T2.newReload
    mCurrentDocId <- T.useFocused
    (maybe Nothing _.mCurrentDocId)
    (\val -> maybe Nothing (\sp -> Just $ sp { mCurrentDocId = val })) sidePanel
    ......@@ -416,17 +410,15 @@ pagePaintRawCpt = here.component "pagePaintRawCpt" cpt where
    pure $ TT.table
    { colNames
    , container: TT.defaultContainer { title: "Documents" }
    , container: TT.defaultContainer
    , params
    , rows: rows reload localCategories' mCurrentDocId'
    , rows: rows localCategories' mCurrentDocId'
    , syncResetButton : [ H.div {} [] ]
    , totalRecords
    , wrapColElts
    }
    where
    sid = sessionId session
    gi Star_1 = "fa fa-star"
    gi _ = "fa fa-star-empty"
    trashClassName Star_0 _ = "trash"
    trashClassName _ true = "active"
    trashClassName _ false = ""
    ......@@ -435,18 +427,17 @@ pagePaintRawCpt = here.component "pagePaintRawCpt" cpt where
    | otherwise = Routes.Document sid listId
    colNames = TT.ColumnName <$> [ "Show", "Tag", "Date", "Title", "Source", "Score" ]
    wrapColElts = const identity
    rows reload localCategories' mCurrentDocId' = row <$> A.toUnfoldable documents
    rows localCategories' mCurrentDocId' = row <$> A.toUnfoldable documents
    where
    row dv@(DocumentsView r@{ _id, category }) =
    { row:
    TT.makeRow [ -- H.div {} [ H.a { className, style, on: {click: click Favorite} } [] ]
    H.div { className: "" }
    [ docChooser { listId
    [ docChooser { boxes
    , listId
    , mCorpusId
    , nodeId: r._id
    , sidePanel
    , sidePanelState
    , tableReload: reload } []
    , sidePanel } []
    ]
    --, H.div { className: "column-tag flex" } [ caroussel { category: cat, nodeId, row: dv, session, setLocalCategories } [] ]
    , H.div { className: "column-tag flex" }
    ......@@ -471,32 +462,28 @@ pagePaintRawCpt = here.component "pagePaintRawCpt" cpt where
    -- checked = Star_1 == cat
    selected = mCurrentDocId' == Just r._id
    tClassName = trashClassName cat selected
    className = gi cat
    type DocChooser = (
    listId :: ListId
    boxes :: Boxes
    , listId :: ListId
    , mCorpusId :: Maybe NodeID
    , nodeId :: NodeID
    , sidePanel :: T.Box (Maybe (Record TextsT.SidePanel))
    , sidePanelState :: T.Box SidePanelState
    , tableReload :: T2.ReloadS
    )
    docChooser :: R2.Component DocChooser
    docChooser = R.createElement docChooserCpt
    docChooserCpt :: R.Component DocChooser
    docChooserCpt = here.component "docChooser" cpt
    where
    cpt { mCorpusId: Nothing } _ = do
    pure $ H.div {} []
    cpt { listId
    cpt { boxes: { sidePanelState }
    , listId
    , mCorpusId: Just corpusId
    , nodeId
    , sidePanel
    , sidePanelState
    , tableReload } _ = do
    , sidePanel } _ = do
    mCurrentDocId <- T.useFocused
    (maybe Nothing _.mCurrentDocId)
    (\val -> maybe Nothing (\sp -> Just $ sp { mCurrentDocId = val })) sidePanel
    ......
    src/Gargantext/Components/FolderView.purs
    View file @ c10a6d14
    This diff is collapsed.
    src/Gargantext/Components/Forest.purs
    View file @ c10a6d14
    module Gargantext.Components.Forest
    ( forest
    , forestLayout
    , Common
    , Props
    ) where
    ......@@ -9,62 +8,33 @@ import Gargantext.Prelude
    import Data.Array as A
    import Data.Maybe (Maybe(..))
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree (treeLoader)
    import Gargantext.Ends (Frontends, Backend)
    import Gargantext.Routes (AppRoute)
    import Gargantext.Sessions (Session(..), Sessions, OpenNodes, unSessions)
    import Gargantext.Types (FrontendError, Handed, switchHanded)
    import Gargantext.Ends (Frontends)
    import Gargantext.Sessions (Session(..), unSessions)
    import Gargantext.Types (switchHanded)
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Record.Extra as RX
    import Toestand as T
    here :: R2.Here
    here = R2.here "Gargantext.Components.Forest"
    -- Shared by components here with Tree
    type Common =
    ( frontends :: Frontends
    , handed :: T.Box Handed
    , reloadMainPage :: T2.ReloadS
    , reloadRoot :: T2.ReloadS
    , route :: T.Box AppRoute
    )
    type Props =
    ( backend :: T.Box (Maybe Backend)
    , errors :: T.Box (Array FrontendError)
    , forestOpen :: T.Box OpenNodes
    , reloadForest :: T2.ReloadS
    , sessions :: T.Box Sessions
    , showLogin :: T.Box Boolean
    , tasks :: T.Box GAT.Storage
    | Common
    )
    type TreeExtra = (
    forestOpen :: T.Box OpenNodes
    ( boxes :: Boxes
    , frontends :: Frontends
    )
    forest :: R2.Component Props
    forest = R.createElement forestCpt
    forestCpt :: R.Component Props
    forestCpt = here.component "forest" cpt where
    cpt props@{ backend
    , errors
    , forestOpen
    , frontends
    , handed
    cpt { boxes: boxes@{ handed
    , reloadForest
    , reloadMainPage
    , reloadRoot
    , route
    , sessions
    , showLogin
    , tasks } _ = do
    , sessions }
    , frontends } _ = do
    -- TODO Fix this. I think tasks shouldn't be a Box but only a Reductor
    -- tasks' <- GAT.useTasks reloadRoot reloadForest
    -- R.useEffect' $ do
    ......@@ -78,33 +48,24 @@ forestCpt = here.component "forest" cpt where
    -- TODO If `reloadForest` is set, `reload` state should be updated
    -- TODO fix tasks ref
    pure $ H.div { className: "forest-layout-content" }
    (A.cons (plus { backend, handed, showLogin }) (trees handed' sessions'))
    (A.cons (plus { boxes }) (trees handed' sessions'))
    where
    common = RX.pick props :: Record Common
    trees handed' sessions' = (tree handed') <$> unSessions sessions'
    tree handed' s@(Session {treeId}) =
    treeLoader { errors
    , forestOpen
    tree handed' s@(Session { treeId }) =
    treeLoader { boxes
    , frontends
    , handed: handed'
    , reload: reloadForest
    , reloadMainPage
    , reloadRoot
    , root: treeId
    , route
    , session: s
    , tasks } []
    , session: s } []
    type Plus =
    ( backend :: T.Box (Maybe Backend)
    , handed :: T.Box Handed
    , showLogin :: T.Box Boolean )
    type Plus = ( boxes :: Boxes )
    plus :: R2.Leaf Plus
    plus p = R.createElement plusCpt p []
    plusCpt :: R.Component Plus
    plusCpt = here.component "plus" cpt where
    cpt { backend, handed, showLogin } _ = do
    cpt { boxes: { backend, handed, showLogin } } _ = do
    handed' <- T.useLive T.unequal handed
    pure $ H.div {}
    ......
    src/Gargantext/Components/Forest/Tree.purs
    View file @ c10a6d14
    This diff is collapsed.
    src/Gargantext/Components/Forest/Tree/Node.purs
    View file @ c10a6d14
    ......@@ -5,17 +5,15 @@ import Gargantext.Prelude
    import Data.Maybe (Maybe(..))
    import Data.Nullable (null)
    import Data.Symbol (SProxy(..))
    import Data.Tuple (fst, snd)
    import Data.Tuple.Nested ((/\))
    import Effect (Effect)
    import Effect.Aff (Aff, launchAff)
    import Effect.Class (liftEffect)
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Upload (DroppedFile(..), fileTypeView)
    import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType(..), UploadFileBlob(..))
    import Gargantext.Components.Forest.Tree.Node.Box (nodePopupView)
    import Gargantext.Components.Forest.Tree.Node.Box.Types (CommonProps)
    import Gargantext.Components.Forest.Tree.Node.Settings (SettingsBox(..), settingsBox)
    import Gargantext.Components.Forest.Tree.Node.Tools (nodeLink)
    import Gargantext.Components.Forest.Tree.Node.Tools.ProgressBar (asyncProgressBar, BarType(..))
    ......@@ -27,7 +25,7 @@ import Gargantext.Ends (Frontends)
    import Gargantext.Hooks.Loader (useLoader)
    import Gargantext.Routes as Routes
    import Gargantext.Sessions (Session, sessionId)
    import Gargantext.Types (FrontendError, ID, Name, reverseHanded)
    import Gargantext.Types (ID, Name, reverseHanded)
    import Gargantext.Types as GT
    import Gargantext.Utils.Popover as Popover
    import Gargantext.Utils.Reactix as R2
    ......@@ -44,7 +42,8 @@ here = R2.here "Gargantext.Components.Forest.Tree.Node"
    -- Main Node
    type NodeMainSpanProps =
    ( errors :: T.Box (Array FrontendError)
    ( boxes :: Boxes
    , dispatch :: Action -> Aff Unit
    , folderOpen :: T.Box Boolean
    , frontends :: Frontends
    , id :: ID
    ......@@ -52,12 +51,8 @@ type NodeMainSpanProps =
    , name :: Name
    , nodeType :: GT.NodeType
    , reload :: T2.ReloadS
    , reloadMainPage :: T2.ReloadS
    , reloadRoot :: T2.ReloadS
    , route :: T.Box Routes.AppRoute
    , session :: Session
    , setPopoverRef :: R.Ref (Maybe (Boolean -> Effect Unit))
    , tasks :: T.Box GAT.Storage
    | CommonProps
    )
    type IsLeaf = Boolean
    ......@@ -67,8 +62,9 @@ nodeSpan = R.createElement nodeSpanCpt
    nodeSpanCpt :: R.Component NodeMainSpanProps
    nodeSpanCpt = here.component "nodeSpan" cpt
    where
    cpt props@{ handed } children = do
    let className = case handed of
    cpt props@{ boxes: { handed } } children = do
    handed' <- T.useLive T.unequal handed
    let className = case handed' of
    GT.LeftHanded -> "lefthanded"
    GT.RightHanded -> "righthanded"
    ......@@ -79,23 +75,23 @@ nodeMainSpan = R.createElement nodeMainSpanCpt
    nodeMainSpanCpt :: R.Component NodeMainSpanProps
    nodeMainSpanCpt = here.component "nodeMainSpan" cpt
    where
    cpt props@{ dispatch
    , errors
    cpt props@{ boxes: boxes@{ errors
    , handed
    , reloadMainPage
    , reloadRoot
    , route
    , tasks }
    , dispatch
    , folderOpen
    , frontends
    , handed
    , id
    , isLeaf
    , name
    , nodeType
    , reload
    , reloadMainPage
    , reloadRoot
    , route
    , session
    , setPopoverRef
    , tasks
    } _ = do
    handed' <- T.useLive T.unequal handed
    route' <- T.useLive T.unequal route
    -- only 1 popup at a time is allowed to be opened
    droppedFile <- T.useBox (Nothing :: Maybe DroppedFile)
    ......@@ -114,12 +110,12 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
    -- tasks' <- T.read tasks
    pure $ H.span (dropProps droppedFile droppedFile' isDragOver isDragOver')
    $ reverseHanded handed
    $ reverseHanded handed'
    [ folderIcon { folderOpen, nodeType } []
    , chevronIcon { folderOpen, handed, isLeaf, nodeType } []
    , nodeLink { frontends
    , handed
    , nodeLink { boxes
    , folderOpen
    , frontends
    , id
    , isSelected
    , name: name' props
    ......@@ -187,9 +183,14 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
    name' {name: n, nodeType: nt} = if nt == GT.NodeUser then show session else n
    mNodePopupView props'@{ id: i, nodeType: nt, handed: h } opc =
    nodePopupView { dispatch, errors, handed: h, id: i, name: name' props'
    , nodeType: nt, onPopoverClose: opc, session }
    mNodePopupView props'@{ boxes: b, id: i, nodeType: nt } opc =
    nodePopupView { boxes: b
    , dispatch
    , id: i
    , name: name' props'
    , nodeType: nt
    , onPopoverClose: opc
    , session }
    popOverIcon =
    H.a { className: "settings fa fa-cog"
    ......@@ -234,7 +235,6 @@ type FolderIconProps = (
    folderIcon :: R2.Component FolderIconProps
    folderIcon = R.createElement folderIconCpt
    folderIconCpt :: R.Component FolderIconProps
    folderIconCpt = here.component "folderIcon" cpt
    where
    ......@@ -245,27 +245,27 @@ folderIconCpt = here.component "folderIcon" cpt
    type ChevronIconProps = (
    folderOpen :: T.Box Boolean
    , handed :: GT.Handed
    , handed :: T.Box GT.Handed
    , isLeaf :: Boolean
    , nodeType :: GT.NodeType
    )
    chevronIcon :: R2.Component ChevronIconProps
    chevronIcon = R.createElement chevronIconCpt
    chevronIconCpt :: R.Component ChevronIconProps
    chevronIconCpt = here.component "chevronIcon" cpt
    where
    cpt { folderOpen, handed, isLeaf: true, nodeType } _ = do
    pure $ H.div {} []
    cpt { folderOpen, handed, isLeaf: false, nodeType } _ = do
    handed' <- T.useLive T.unequal handed
    open <- T.useLive T.unequal folderOpen
    pure $ H.a { className: "chevron-icon"
    , on: { click: \_ -> T.modify_ not folderOpen }
    }
    [ H.i { className: if open
    then "fa fa-chevron-down"
    else if handed == GT.RightHanded
    else if handed' == GT.RightHanded
    then "fa fa-chevron-right"
    else "fa fa-chevron-left"
    } [] ]
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Link.purs
    View file @ c10a6d14
    ......@@ -48,7 +48,7 @@ linkNode = R.createElement linkNodeCpt
    linkNodeCpt :: R.Component SubTreeParamsIn
    linkNodeCpt = here.component "linkNode" cpt
    where
    cpt { dispatch, handed, id, nodeType, session, subTreeParams } _ = do
    cpt { boxes, dispatch, id, nodeType, session, subTreeParams } _ = do
    action <- T.useBox (LinkNode { nodeType: Nothing, params: Nothing})
    action' <- T.useLive T.unequal action
    ......@@ -60,8 +60,8 @@ linkNodeCpt = here.component "linkNode" cpt
    pure $ panel [
    subTreeView { action
    , boxes
    , dispatch
    , handed
    , id
    , nodeType
    , session
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Merge.purs
    View file @ c10a6d14
    ......@@ -31,7 +31,7 @@ mergeNode = R.createElement mergeNodeCpt
    mergeNodeCpt :: R.Component SubTreeParamsIn
    mergeNodeCpt = here.component "mergeNode" cpt
    where
    cpt {dispatch, subTreeParams, id, nodeType, session, handed} _ = do
    cpt { boxes, dispatch, id, nodeType, session, subTreeParams } _ = do
    action <- T.useBox (MergeNode { params: Nothing })
    action' <- T.useLive T.unequal action
    ......@@ -46,8 +46,8 @@ mergeNodeCpt = here.component "mergeNode" cpt
    pure $ panel
    [ subTreeView { action
    , boxes
    , dispatch
    , handed
    , id
    , nodeType
    , session
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Move.purs
    View file @ c10a6d14
    ......@@ -30,7 +30,7 @@ moveNode = R.createElement moveNodeCpt
    moveNodeCpt :: R.Component SubTreeParamsIn
    moveNodeCpt = here.component "moveNode" cpt
    where
    cpt { dispatch, handed, id, nodeType, session, subTreeParams } _ = do
    cpt { boxes, dispatch, id, nodeType, session, subTreeParams } _ = do
    action :: T.Box Action <- T.useBox (MoveNode {params: Nothing})
    action' <- T.useLive T.unequal action
    ......@@ -43,8 +43,8 @@ moveNodeCpt = here.component "moveNode" cpt
    pure $
    panel [ subTreeView { action
    , boxes
    , dispatch
    , handed
    , id
    , nodeType
    , session
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Search.purs
    View file @ c10a6d14
    ......@@ -5,13 +5,14 @@ import Gargantext.Prelude
    import Data.Maybe (Maybe)
    import Effect (Effect)
    import Effect.Aff (Aff, launchAff)
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup)
    import Gargantext.Components.Forest.Tree.Node.Action.Search.SearchBar (searchBar)
    import Gargantext.Components.Forest.Tree.Node.Action.Search.SearchField (defaultSearch)
    import Gargantext.Components.Lang (allLangs)
    import Gargantext.Sessions (Session)
    import Gargantext.Types (FrontendError, ID)
    import Gargantext.Types (ID)
    import Gargantext.Types as GT
    import Gargantext.Utils.Reactix as R2
    import Reactix as R
    ......@@ -23,8 +24,8 @@ here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Search"
    type Props =
    ( dispatch :: Action -> Aff Unit
    , errors :: T.Box (Array FrontendError)
    ( boxes :: Boxes
    , dispatch :: Action -> Aff Unit
    , id :: Maybe ID
    , nodePopup :: Maybe NodePopup
    , session :: Session )
    ......@@ -35,7 +36,7 @@ actionSearch = R.createElement actionSearchCpt
    actionSearchCpt :: R.Component Props
    actionSearchCpt = here.component "actionSearch" cpt
    where
    cpt { dispatch, errors, id, nodePopup, session } _ = do
    cpt { boxes: { errors }, dispatch, id, nodePopup, session } _ = do
    search <- T.useBox $ defaultSearch { node_id = id }
    pure $ R.fragment [ H.p { className: "action-search" }
    [ H.text $ "Search and create a private "
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Share.purs
    View file @ c10a6d14
    ......@@ -71,7 +71,7 @@ publishNode = R.createElement publishNodeCpt
    publishNodeCpt :: R.Component SubTreeParamsIn
    publishNodeCpt = here.component "publishNode" cpt
    where
    cpt { dispatch, handed, id, nodeType, session, subTreeParams } _ = do
    cpt { boxes, dispatch, id, nodeType, session, subTreeParams } _ = do
    action <- T.useBox (Action.SharePublic { params: Nothing })
    action' <- T.useLive T.unequal action
    ......@@ -83,8 +83,8 @@ publishNodeCpt = here.component "publishNode" cpt
    pure $ Tools.panel
    [ subTreeView { action
    , boxes
    , dispatch
    , handed
    , id
    , nodeType
    , session
    ......
    src/Gargantext/Components/Forest/Tree/Node/Box.purs
    View file @ c10a6d14
    ......@@ -5,6 +5,7 @@ import Gargantext.Prelude
    import Data.Array as A
    import Data.Maybe (Maybe(..))
    import Effect.Aff (Aff)
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree.Node.Action (Action)
    import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), addNodeView)
    import Gargantext.Components.Forest.Tree.Node.Action.Contact as Contact
    ......@@ -102,9 +103,16 @@ nodePopupCpt = here.component "nodePopupView" cpt where
    else []
    mPanelAction :: Record NodePopupS -> Record NodePopupProps -> R.Element
    mPanelAction { action: Just action }
    { dispatch, errors, id, name, nodeType, session, handed } =
    panelAction { action, dispatch, errors, id, name, nodeType, session
    , handed, nodePopup: Just NodePopup }
    { boxes, dispatch, id, name, nodeType, session } =
    panelAction { action
    , boxes
    , dispatch
    , id
    , name
    , nodePopup: Just NodePopup
    , nodeType
    , session
    }
    mPanelAction { action: Nothing } _ =
    H.div { className: "card-footer" }
    [ H.div {className:"center fa-hand-pointer-o"}
    ......@@ -160,15 +168,14 @@ type NodeProps =
    type PanelActionProps =
    ( id :: ID
    , action :: NodeAction
    ( action :: NodeAction
    , boxes :: Boxes
    , id :: ID
    , dispatch :: Action -> Aff Unit
    , errors :: T.Box (Array FrontendError)
    , name :: Name
    , nodePopup :: Maybe NodePopup
    , nodeType :: GT.NodeType
    , session :: Session
    , handed :: GT.Handed
    )
    panelAction :: R2.Leaf PanelActionProps
    ......@@ -186,16 +193,16 @@ panelActionCpt = here.component "panelAction" cpt
    cpt {action: Config , dispatch, id, nodeType, session} _ =
    pure $ fragmentPT $ "Config " <> show nodeType
    -- Functions using SubTree
    cpt {action: Merge {subTreeParams}, dispatch, id, nodeType, session, handed} _ =
    pure $ mergeNode {dispatch, id, nodeType, session, subTreeParams, handed} []
    cpt {action: Move {subTreeParams}, dispatch, id, nodeType, session, handed} _ =
    pure $ moveNode { dispatch, id, nodeType, session, subTreeParams, handed } []
    cpt {action: Link {subTreeParams}, dispatch, id, nodeType, session, handed} _ =
    pure $ linkNode {dispatch, id, nodeType, session, subTreeParams, handed} []
    cpt { action: Merge {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
    pure $ mergeNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
    cpt {action: Move {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
    pure $ moveNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
    cpt {action: Link {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
    pure $ linkNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
    cpt {action : Share, dispatch, id, name } _ = pure $ Share.shareNode { dispatch, id } []
    cpt {action : AddingContact, dispatch, id, name } _ = pure $ Contact.actionAddContact { dispatch, id } []
    cpt {action : Publish {subTreeParams}, dispatch, id, nodeType, session, handed} _ =
    pure $ Share.publishNode { dispatch, handed, id, nodeType, session, subTreeParams } []
    cpt props@{action: SearchBox, errors, id, session, dispatch, nodePopup} _ =
    pure $ actionSearch { dispatch, errors, id: (Just id), nodePopup, session } []
    cpt {action : Publish {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
    pure $ Share.publishNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
    cpt props@{action: SearchBox, boxes, id, session, dispatch, nodePopup} _ =
    pure $ actionSearch { boxes, dispatch, id: (Just id), nodePopup, session } []
    cpt _ _ = pure $ H.div {} []
    src/Gargantext/Components/Forest/Tree/Node/Box/Types.purs
    View file @ c10a6d14
    ......@@ -4,22 +4,21 @@ import DOM.Simple as DOM
    import Data.Maybe (Maybe)
    import Effect (Effect)
    import Effect.Aff (Aff)
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree.Node.Action (Action)
    import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction)
    import Gargantext.Prelude (Unit)
    import Gargantext.Sessions (Session)
    import Gargantext.Types (FrontendError, ID, Name)
    import Gargantext.Types (ID, Name)
    import Gargantext.Types as GT
    import Toestand as T