Skip to content

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

[list selector] various refactorings

parent 992d6718
Pipeline #1769 canceled with stage
    Show whitespace changes
    Inline Side-by-side
    Showing with 344 additions and 321 deletions
    src/Gargantext/Components/DocsTable.purs
    View file @ e8891f6a
    ......@@ -3,7 +3,6 @@ module Gargantext.Components.DocsTable where
    import Gargantext.Prelude
    import DOM.Simple.Console (log2)
    import DOM.Simple.Event as DE
    import Data.Array as A
    import Data.Either (Either)
    ......@@ -496,9 +495,9 @@ docChooserCpt = here.component "docChooser" cpt
    ]
    where
    onClick selected _ = do
    -- log2 "[docChooser] onClick, listId" listId
    -- log2 "[docChooser] onClick, corpusId" corpusId
    -- log2 "[docChooser] onClick, nodeId" nodeId
    -- here.log2 "[docChooser] onClick, listId" listId
    -- here.log2 "[docChooser] onClick, corpusId" corpusId
    -- here.log2 "[docChooser] onClick, nodeId" nodeId
    -- R2.callTrigger triggerAnnotatedDocIdChange { corpusId, listId, nodeId }
    -- T2.reload tableReload
    if selected then do
    ......@@ -510,7 +509,7 @@ docChooserCpt = here.component "docChooser" cpt
    , mCurrentDocId: Just nodeId
    , nodeId: nodeId }) sidePanel
    T.write_ Opened sidePanelState
    log2 "[docChooser] sidePanel opened" sidePanelState
    here.log2 "[docChooser] sidePanel opened" sidePanelState
    newtype SearchQuery = SearchQuery {
    ......
    src/Gargantext/Components/FacetsTable.purs
    View file @ e8891f6a
    ......@@ -5,7 +5,6 @@ module Gargantext.Components.FacetsTable where
    import Gargantext.Prelude
    import DOM.Simple.Console (log2)
    import Data.Either (Either(..))
    import Data.Eq.Generic (genericEq)
    import Data.Generic.Rep (class Generic)
    ......@@ -223,7 +222,7 @@ loadPage { session, nodeId, listId, query, params: {limit, offset, orderBy } } =
    case eSearchResult of
    Left err -> pure $ Left err
    Right (SearchResult {result}) -> do
    liftEffect $ log2 "[loadPage] result" result
    liftEffect $ here.log2 "[loadPage] result" result
    -- $ SearchQuery {query: concat query, expected: SearchDoc}
    pure $ Right $ case result of
    SearchResultDoc {docs} -> Docs {docs: doc2view <$> Seq.fromFoldable docs}
    ......
    src/Gargantext/Components/FolderView.purs
    View file @ e8891f6a
    ......@@ -10,7 +10,6 @@ import Effect.Aff (Aff)
    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.Add (AddNodeValue(..), addNode)
    import Gargantext.Components.Forest.Tree.Node.Action.Contact as Contact
    import Gargantext.Components.Forest.Tree.Node.Action.Delete (deleteNode, unpublishNode)
    ......@@ -19,6 +18,7 @@ import Gargantext.Components.Forest.Tree.Node.Action.Merge (mergeNodeReq)
    import Gargantext.Components.Forest.Tree.Node.Action.Move (moveNodeReq)
    import Gargantext.Components.Forest.Tree.Node.Action.Rename (RenameValue(..), rename)
    import Gargantext.Components.Forest.Tree.Node.Action.Share as Share
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Update (updateRequest)
    import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadArbitraryFile, uploadFile)
    import Gargantext.Components.Forest.Tree.Node.Box (nodePopupView)
    ......@@ -277,8 +277,10 @@ performAction = performAction' where
    performAction' (SharePublic { params }) p = sharePublic params p
    performAction' (AddContact params) p = addContact params p
    performAction' (AddNode name nodeType) p = addNode' name nodeType p
    performAction' (UploadFile nodeType fileType mName contents) p = uploadFile' nodeType fileType mName contents p
    performAction' (UploadArbitraryFile mName blob) p = uploadArbitraryFile' mName blob p
    performAction' (UploadFile nodeType fileType mName contents selection) p =
    uploadFile' nodeType fileType mName contents p selection
    performAction' (UploadArbitraryFile mName blob selection) p =
    uploadArbitraryFile' mName blob p selection
    performAction' DownloadNode _ = liftEffect $ here.log "[performAction] DownloadNode"
    performAction' (MoveNode {params}) p = moveNode params p
    performAction' (MergeNode {params}) p = mergeNode params p
    ......@@ -325,14 +327,14 @@ performAction = performAction' where
    addContact params { nodeId: id, session } =
    void $ Contact.contactReq session id params
    uploadFile' nodeType fileType mName contents { boxes: { errors, tasks }, nodeId: id, session } = do
    eTask <- uploadFile { contents, fileType, id, nodeType, mName, session }
    uploadFile' nodeType fileType mName contents { boxes: { errors, tasks }, nodeId: id, session } selection = do
    eTask <- uploadFile { contents, fileType, id, nodeType, mName, selection, session }
    handleRESTError errors eTask $ \task -> liftEffect $ do
    GAT.insert id task tasks
    here.log2 "[performAction] UploadFile, uploaded, task:" task
    uploadArbitraryFile' mName blob { boxes: { errors, tasks }, nodeId: id, session } = do
    eTask <- uploadArbitraryFile session id { blob, mName }
    uploadArbitraryFile' mName blob { boxes: { errors, tasks }, nodeId: id, session } selection = do
    eTask <- uploadArbitraryFile session id { blob, mName } selection
    handleRESTError errors eTask $ \task -> liftEffect $ do
    GAT.insert id task tasks
    here.log2 "[performAction] UploadArbitraryFile, uploaded, task:" task
    ......
    src/Gargantext/Components/Forest/Tree.purs
    View file @ e8891f6a
    ......@@ -12,7 +12,6 @@ import Effect.Class (liftEffect)
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree.Node (nodeSpan)
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Add (AddNodeValue(..), addNode)
    import Gargantext.Components.Forest.Tree.Node.Action.Contact as Contact
    import Gargantext.Components.Forest.Tree.Node.Action.Delete (deleteNode, unpublishNode)
    ......@@ -21,6 +20,7 @@ import Gargantext.Components.Forest.Tree.Node.Action.Merge (mergeNodeReq)
    import Gargantext.Components.Forest.Tree.Node.Action.Move (moveNodeReq)
    import Gargantext.Components.Forest.Tree.Node.Action.Rename (RenameValue(..), rename)
    import Gargantext.Components.Forest.Tree.Node.Action.Share as Share
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Update (updateRequest)
    import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadFile, uploadArbitraryFile)
    import Gargantext.Components.Forest.Tree.Node.Tools.FTree (FTree, LNode(..), NTree(..), fTreeID)
    ......@@ -271,14 +271,14 @@ addNode' name nodeType p@{ boxes: { errors, forestOpen }, session, tree: (NTree
    liftEffect $ T.modify_ (openNodesInsert (mkNodeId session id)) forestOpen
    refreshTree p
    uploadFile' nodeType fileType mName contents p@{ boxes: { errors, tasks }, session, tree: (NTree (LNode { id }) _) } = do
    eTask <- uploadFile { contents, fileType, id, mName, nodeType, session }
    uploadFile' nodeType fileType mName contents p@{ boxes: { errors, tasks }, session, tree: (NTree (LNode { id }) _) } selection = do
    eTask <- uploadFile { contents, fileType, id, mName, nodeType, selection, session }
    handleRESTError errors eTask $ \task -> liftEffect $ do
    GAT.insert id task tasks
    here.log2 "[uploadFile'] UploadFile, uploaded, task:" task
    uploadArbitraryFile' mName blob p@{ boxes: { errors, tasks }, session, tree: (NTree (LNode { id }) _) } = do
    eTask <- uploadArbitraryFile session id { blob, mName }
    uploadArbitraryFile' mName blob p@{ boxes: { errors, tasks }, session, tree: (NTree (LNode { id }) _) } selection = do
    eTask <- uploadArbitraryFile session id { blob, mName } selection
    handleRESTError errors eTask $ \task -> liftEffect $ do
    GAT.insert id task tasks
    here.log2 "[uploadArbitraryFile'] UploadArbitraryFile, uploaded, task:" task
    ......@@ -313,8 +313,10 @@ performAction (ShareTeam username) p = shareTeam userna
    performAction (SharePublic { params }) p = sharePublic params p
    performAction (AddContact params) p = addContact params p
    performAction (AddNode name nodeType) p = addNode' name nodeType p
    performAction (UploadFile nodeType fileType mName contents) p = uploadFile' nodeType fileType mName contents p
    performAction (UploadArbitraryFile mName blob) p = uploadArbitraryFile' mName blob p
    performAction (UploadFile nodeType fileType mName contents selection) p =
    uploadFile' nodeType fileType mName contents p selection
    performAction (UploadArbitraryFile mName blob selection) p =
    uploadArbitraryFile' mName blob p selection
    performAction DownloadNode _ = liftEffect $ here.log "[performAction] DownloadNode"
    performAction (MoveNode {params}) p = moveNode params p
    performAction (MergeNode {params}) p = mergeNode params p
    ......
    src/Gargantext/Components/Forest/Tree/Node.purs
    View file @ e8891f6a
    ......@@ -10,7 +10,7 @@ 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.Types (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)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action.purs
    View file @ e8891f6a
    ......@@ -2,12 +2,9 @@ module Gargantext.Components.Forest.Tree.Node.Action where
    import Gargantext.Prelude
    import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..))
    import Effect.Aff (Aff)
    import Gargantext.Components.Forest.Tree.Node.Action.Contact.Types (AddContactParams)
    import Gargantext.Components.Forest.Tree.Node.Action.Update.Types (UpdateNodeParams)
    import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType, UploadFileBlob)
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), glyphiconNodeAction)
    import Gargantext.Components.Forest.Tree.Node.Tools.FTree (ID)
    import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut, SubTreeParams(..))
    ......@@ -22,27 +19,6 @@ type Props =
    )
    data Action = AddNode String GT.NodeType
    | DeleteNode GT.NodeType
    | RenameNode String
    | UpdateNode UpdateNodeParams
    | DoSearch GT.AsyncTaskWithType
    | UploadFile GT.NodeType FileType (Maybe String) String
    | UploadArbitraryFile (Maybe String) UploadFileBlob
    | DownloadNode
    | RefreshTree
    | ClosePopover
    | ShareTeam String
    | AddContact AddContactParams
    | SharePublic {params :: Maybe SubTreeOut}
    | MoveNode {params :: Maybe SubTreeOut}
    | MergeNode {params :: Maybe SubTreeOut}
    | LinkNode {nodeType :: Maybe GT.NodeType, params :: Maybe SubTreeOut}
    | NoAction
    subTreeOut :: Action -> Maybe SubTreeOut
    subTreeOut (MoveNode {params}) = params
    subTreeOut (MergeNode {params}) = params
    ......@@ -57,47 +33,6 @@ setTreeOut (LinkNode {nodeType, params:_}) p = LinkNode {nodeType, params: p}
    setTreeOut (SharePublic {params:_}) p = SharePublic {params: p}
    setTreeOut a _ = a
    derive instance Generic Action _
    instance Eq Action where
    eq (AddNode s1 nt1) (AddNode s2 nt2) = (eq s1 s2) && (eq nt1 nt2)
    eq (DeleteNode nt1) (DeleteNode nt2) = eq nt1 nt2
    eq (RenameNode s1) (RenameNode s2) = eq s1 s2
    eq (UpdateNode un1) (UpdateNode un2) = eq un1 un2
    eq (DoSearch at1) (DoSearch at2) = eq at1 at2
    eq (UploadFile nt1 ft1 s1 _) (UploadFile nt2 ft2 s2 _) = (eq nt1 nt2) && (eq ft1 ft2) && (eq s1 s2)
    eq (UploadArbitraryFile s1 _) (UploadArbitraryFile s2 _) = eq s1 s2
    eq DownloadNode DownloadNode = true
    eq RefreshTree RefreshTree = true
    eq ClosePopover ClosePopover = true
    eq (ShareTeam s1) (ShareTeam s2) = eq s1 s2
    eq (AddContact ac1) (AddContact ac2) = eq ac1 ac2
    eq (SharePublic p1) (SharePublic p2) = eq p1 p2
    eq (MoveNode p1) (MoveNode p2) = eq p1 p2
    eq (MergeNode p1) (MergeNode p2) = eq p1 p2
    eq (LinkNode l1) (LinkNode l2) = eq l1 l2
    eq NoAction NoAction = true
    eq _ _ = false
    instance Show Action where
    show (AddNode _ _ ) = "AddNode"
    show (DeleteNode _ ) = "DeleteNode"
    show (RenameNode _ ) = "RenameNode"
    show (UpdateNode _ ) = "UpdateNode"
    show (ShareTeam _ ) = "ShareTeam"
    show (AddContact _ ) = "AddContact"
    show (SharePublic _ ) = "SharePublic"
    show (DoSearch _ ) = "SearchQuery"
    show (UploadFile _ _ _ _) = "UploadFile"
    show (UploadArbitraryFile _ _) = "UploadArbitraryFile"
    show RefreshTree = "RefreshTree"
    show ClosePopover = "ClosePopover"
    show DownloadNode = "Download"
    show (MoveNode _ ) = "MoveNode"
    show (MergeNode _ ) = "MergeNode"
    show (LinkNode _ ) = "LinkNode"
    show NoAction = "NoAction"
    -----------------------------------------------------------------------
    icon :: Action -> String
    icon (AddNode _ _) = glyphiconNodeAction (Add [])
    ......@@ -108,8 +43,8 @@ icon (ShareTeam _) = glyphiconNodeAction Share
    icon (AddContact _) = glyphiconNodeAction Share
    icon (SharePublic _ ) = glyphiconNodeAction (Publish { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
    icon (DoSearch _) = glyphiconNodeAction SearchBox
    icon (UploadFile _ _ _ _) = glyphiconNodeAction Upload
    icon (UploadArbitraryFile _ _ ) = glyphiconNodeAction Upload
    icon (UploadFile _ _ _ _ _) = glyphiconNodeAction Upload
    icon (UploadArbitraryFile _ _ _ ) = glyphiconNodeAction Upload
    icon RefreshTree = glyphiconNodeAction Refresh
    icon ClosePopover = glyphiconNodeAction CloseNodePopover
    icon DownloadNode = glyphiconNodeAction Download
    ......@@ -130,8 +65,8 @@ text (ShareTeam _ ) = "Share with team !"
    text (AddContact _ ) = "Add contact !"
    text (SharePublic _ ) = "Publish !"
    text (DoSearch _ ) = "Launch search !"
    text (UploadFile _ _ _ _) = "Upload File !"
    text (UploadArbitraryFile _ _) = "Upload arbitrary file !"
    text (UploadFile _ _ _ _ _) = "Upload File !"
    text (UploadArbitraryFile _ _ _) = "Upload arbitrary file !"
    text RefreshTree = "Refresh Tree !"
    text ClosePopover = "Close Popover !"
    text DownloadNode = "Download !"
    ......@@ -140,3 +75,4 @@ text (MergeNode _ ) = "Merge !"
    text (LinkNode _ ) = "Link !"
    text NoAction = "No Action"
    -----------------------------------------------------------------------
    src/Gargantext/Components/Forest/Tree/Node/Action/Add.purs
    View file @ e8891f6a
    ......@@ -11,7 +11,7 @@ import Data.String (Pattern(..), indexOf)
    import Data.Tuple.Nested ((/\))
    import Effect (Effect)
    import Effect.Aff (Aff, launchAff_)
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Settings (SettingsBox(..), settingsBox)
    import Gargantext.Components.Forest.Tree.Node.Tools (formChoiceSafe, panel, submitButton)
    import Gargantext.Components.InputWithEnter (inputWithEnter)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Contact.purs
    View file @ e8891f6a
    ......@@ -10,7 +10,7 @@ import Reactix as R
    import Reactix.DOM.HTML as H
    import Toestand as T
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Contact.Types (AddContactParams(..))
    import Gargantext.Config.REST (RESTError)
    import Gargantext.Routes as GR
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Delete.purs
    View file @ e8891f6a
    ......@@ -9,7 +9,7 @@ import Effect.Aff (Aff)
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
    import Gargantext.Config.REST (RESTError)
    import Gargantext.Routes (SessionRoute(..))
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Download.purs
    View file @ e8891f6a
    ......@@ -4,7 +4,7 @@ import Data.Maybe (Maybe(..))
    import Reactix as R
    import Reactix.DOM.HTML as H
    import Gargantext.Components.Forest.Tree.Node.Action (Action(DownloadNode))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(DownloadNode))
    import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT, panel, submitButtonHref)
    import Gargantext.Ends (url)
    import Gargantext.Prelude (pure, ($))
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Link.purs
    View file @ e8891f6a
    ......@@ -7,7 +7,7 @@ import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..))
    import Data.Show.Generic (genericShow)
    import Effect.Aff (Aff)
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
    import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
    import Gargantext.Config.REST (RESTError)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Merge.purs
    View file @ e8891f6a
    ......@@ -10,7 +10,7 @@ import Reactix as R
    import Reactix.DOM.HTML as H
    import Toestand as T
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel, checkbox, checkboxesListGroup)
    import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
    import Gargantext.Config.REST (RESTError)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Move.purs
    View file @ e8891f6a
    ......@@ -9,7 +9,7 @@ import Reactix as R
    import Reactix.DOM.HTML as H
    import Toestand as T
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
    import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
    import Gargantext.Config.REST (RESTError)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Rename.purs
    View file @ e8891f6a
    ......@@ -10,7 +10,7 @@ import Simple.JSON as JSON
    import Gargantext.Prelude
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Config.REST (RESTError)
    import Gargantext.Routes as GR
    import Gargantext.Sessions (Session, put)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Search.purs
    View file @ e8891f6a
    ......@@ -6,7 +6,7 @@ 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.Types (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)
    ......@@ -38,7 +38,8 @@ actionSearchCpt = here.component "actionSearch" cpt
    where
    cpt { boxes: { errors }, dispatch, id, nodePopup, session } _ = do
    search <- T.useBox $ defaultSearch { node_id = id }
    pure $ R.fragment [ H.p { className: "action-search" }
    pure $ R.fragment
    [ H.p { className: "action-search" }
    [ H.text $ "Search and create a private "
    <> "corpus with the search query as corpus name." ]
    , searchBar { errors
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Search/SearchField.purs
    View file @ e8891f6a
    ......@@ -60,7 +60,8 @@ searchFieldCpt = here.component "searchField" cpt
    -- then
    -- H.div {}[]
    -- else
    , H.div {} [ dataFieldNav { datafields: dataFields, search } []
    , H.div {}
    [ dataFieldNav { datafields: dataFields, search } []
    , if isExternal search'.datafield
    then databaseInput { databases: props.databases, search } []
    ......@@ -84,12 +85,10 @@ searchFieldCpt = here.component "searchField" cpt
    , H.div {} [ searchIframes { iframeRef, search } [] ]
    ]
    ]
    let button = submitButton { errors, onSearch, search, session } []
    pure $
    H.div { className: "search-field" }
    [
    R.fragment params
    ......@@ -109,7 +108,8 @@ componentIMTCpt = here.component "componentIMT" cpt
    cpt { search } _ = do
    search' <- T.useLive T.unequal search
    let liCpt org = H.li {}
    let liCpt org =
    H.li {}
    [ H.input { type: "checkbox"
    , checked: isIn org search'.datafield
    , on: { change: \_ -> ( T.modify_ (_ { datafield = updateFilter org search'.datafield }) search)
    ......@@ -132,8 +132,8 @@ componentCNRSCpt :: R.Component ComponentProps
    componentCNRSCpt = here.component "componentCNRS" cpt
    where
    cpt { search } _ = do
    pure $ R.fragment [
    H.div {} []
    pure $ R.fragment
    [ H.div {} []
    --, filterInput fi
    ]
    ......@@ -247,7 +247,8 @@ langNavCpt = here.component "langNav" cpt
    cpt { langs, search } _ = do
    search' <- T.useLive T.unequal search
    pure $ R.fragment [ H.div {className: "text-primary center"} [H.text "with lang"]
    pure $ R.fragment
    [ H.div {className: "text-primary center"} [H.text "with lang"]
    , H.div {className: "nav nav-tabs"} ((liItem search') <$> langs)
    ]
    where
    ......@@ -255,7 +256,8 @@ langNavCpt = here.component "langNav" cpt
    liItem { lang } lang' =
    H.div { className : "nav-item nav-link" <> if (Just lang') == lang then " active" else ""
    , on: { click: \_ -> T.modify_ (_ { lang = Just lang' }) search }
    } [ H.text (show lang') ]
    }
    [ H.text (show lang') ]
    ------------------------------------------------------------------------
    ......@@ -271,7 +273,8 @@ dataFieldNavCpt = here.component "dataFieldNav" cpt
    cpt { datafields, search } _ = do
    search'@{ datafield } <- T.useLive T.unequal search
    pure $ R.fragment [ H.div { className: "text-primary center"} [H.text "with DataField"]
    pure $ R.fragment
    [ H.div { className: "text-primary center"} [H.text "with DataField"]
    , H.div {className: "nav nav-tabs"} ((liItem search') <$> dataFields)
    , H.div {className: "center"} [ H.text
    $ maybe "TODO: add Doc Instance" doc datafield
    ......@@ -325,8 +328,8 @@ databaseInputCpt = here.component "databaseInput" cpt
    }) search
    pure $
    H.div { className: "form-group" } [
    H.div {className: "text-primary center"} [ H.text "in database" ]
    H.div { className: "form-group" }
    [ H.div {className: "text-primary center"} [ H.text "in database" ]
    , R2.select { className: "form-control"
    , defaultValue: defaultValue search'.datafield
    , on: { change }
    ......@@ -392,8 +395,8 @@ searchInputCpt = here.component "searchInput" cpt
    { term } <- T.useLive T.unequal search
    valueRef <- R.useRef term
    pure $ H.div { className: "" } [
    inputWithEnter { onBlur: onBlur valueRef search
    pure $ H.div { className: "" }
    [ inputWithEnter { onBlur: onBlur valueRef search
    , onEnter: onEnter valueRef search
    , onValueChanged: onValueChanged valueRef
    , autoFocus: false
    ......@@ -442,7 +445,8 @@ submitButtonComponent = here.component "submitButton" cpt
    , "type" : "button"
    , on : { click: doSearch onSearch errors session search' }
    , style : { width: "100%" }
    } [ H.text "Launch Search" ]
    }
    [ H.text "Launch Search" ]
    doSearch os errors s q = \_ -> do
    log2 "[submitButton] searching" q
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Share.purs
    View file @ e8891f6a
    ......@@ -13,8 +13,8 @@ import Toestand as T
    import Gargantext.Prelude
    import Gargantext.Components.Forest.Tree.Node.Action (Action)
    import Gargantext.Components.Forest.Tree.Node.Action as Action
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action)
    import Gargantext.Components.Forest.Tree.Node.Action.Types as Action
    import Gargantext.Components.Forest.Tree.Node.Tools as Tools
    import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
    import Gargantext.Config.REST (RESTError)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Types.purs 0 → 100644
    View file @ e8891f6a
    module Gargantext.Components.Forest.Tree.Node.Action.Types where
    import Gargantext.Prelude
    import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe)
    import Gargantext.Components.Forest.Tree.Node.Action.Contact.Types (AddContactParams)
    import Gargantext.Components.Forest.Tree.Node.Action.Update.Types (UpdateNodeParams)
    import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType, UploadFileBlob)
    import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut)
    import Gargantext.Components.ListSelection.Types (Selection)
    import Gargantext.Types as GT
    data Action = AddNode String GT.NodeType
    | DeleteNode GT.NodeType
    | RenameNode String
    | UpdateNode UpdateNodeParams
    | DoSearch GT.AsyncTaskWithType
    | UploadFile GT.NodeType FileType (Maybe String) String Selection
    | UploadArbitraryFile (Maybe String) UploadFileBlob Selection
    | DownloadNode
    | RefreshTree
    | ClosePopover
    | ShareTeam String
    | AddContact AddContactParams
    | SharePublic {params :: Maybe SubTreeOut}
    | MoveNode {params :: Maybe SubTreeOut}
    | MergeNode {params :: Maybe SubTreeOut}
    | LinkNode {nodeType :: Maybe GT.NodeType, params :: Maybe SubTreeOut}
    | NoAction
    derive instance Generic Action _
    instance Eq Action where
    eq (AddNode s1 nt1) (AddNode s2 nt2) = (eq s1 s2) && (eq nt1 nt2)
    eq (DeleteNode nt1) (DeleteNode nt2) = eq nt1 nt2
    eq (RenameNode s1) (RenameNode s2) = eq s1 s2
    eq (UpdateNode un1) (UpdateNode un2) = eq un1 un2
    eq (DoSearch at1) (DoSearch at2) = eq at1 at2
    eq (UploadFile nt1 ft1 s1 _ _) (UploadFile nt2 ft2 s2 _ _) =
    (eq nt1 nt2) && (eq ft1 ft2) && (eq s1 s2)
    eq (UploadArbitraryFile s1 _ _) (UploadArbitraryFile s2 _ _) = eq s1 s2
    eq DownloadNode DownloadNode = true
    eq RefreshTree RefreshTree = true
    eq ClosePopover ClosePopover = true
    eq (ShareTeam s1) (ShareTeam s2) = eq s1 s2
    eq (AddContact ac1) (AddContact ac2) = eq ac1 ac2
    eq (SharePublic p1) (SharePublic p2) = eq p1 p2
    eq (MoveNode p1) (MoveNode p2) = eq p1 p2
    eq (MergeNode p1) (MergeNode p2) = eq p1 p2
    eq (LinkNode l1) (LinkNode l2) = eq l1 l2
    eq NoAction NoAction = true
    eq _ _ = false
    instance Show Action where
    show (AddNode _ _ ) = "AddNode"
    show (DeleteNode _ ) = "DeleteNode"
    show (RenameNode _ ) = "RenameNode"
    show (UpdateNode _ ) = "UpdateNode"
    show (ShareTeam _ ) = "ShareTeam"
    show (AddContact _ ) = "AddContact"
    show (SharePublic _ ) = "SharePublic"
    show (DoSearch _ ) = "SearchQuery"
    show (UploadFile _ _ _ _ _) = "UploadFile"
    show (UploadArbitraryFile _ _ _) = "UploadArbitraryFile"
    show RefreshTree = "RefreshTree"
    show ClosePopover = "ClosePopover"
    show DownloadNode = "Download"
    show (MoveNode _ ) = "MoveNode"
    show (MergeNode _ ) = "MergeNode"
    show (LinkNode _ ) = "LinkNode"
    show NoAction = "NoAction"
    src/Gargantext/Components/Forest/Tree/Node/Action/Update.purs
    View file @ e8891f6a
    ......@@ -9,7 +9,7 @@ import Toestand as T
    import Gargantext.Prelude
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Update.Types
    import Gargantext.Components.Forest.Tree.Node.Tools (formChoiceSafe, submitButton, panel)
    import Gargantext.Config.REST (RESTError)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Upload.purs
    View file @ e8891f6a
    ......@@ -14,11 +14,14 @@ import Data.Tuple.Nested ((/\))
    import Effect (Effect)
    import Effect.Aff (Aff, launchAff)
    import Effect.Class (liftEffect)
    import Gargantext.Components.Forest.Tree.Node.Action (Action(..), Props)
    import Gargantext.Components.Forest.Tree.Node.Action (Props)
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
    import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType(..), UploadFileBlob(..), readUFBAsText)
    import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT, formChoiceSafe, panel)
    import Gargantext.Components.Lang (Lang(..))
    import Gargantext.Components.ListSelection as ListSelection
    import Gargantext.Components.ListSelection.Types (Selection(..))
    import Gargantext.Components.ListSelection.Types as ListSelection
    import Gargantext.Config.REST (RESTError)
    import Gargantext.Routes as GR
    import Gargantext.Sessions (Session(..), postWwwUrlencoded)
    ......@@ -137,9 +140,9 @@ uploadFileViewCpt = here.component "uploadFileView" cpt
    let footer = H.div {} [ uploadButton { dispatch
    , fileType
    , lang
    , id
    , mFile
    , nodeType
    , selection
    }
    ]
    pure $ panel bodies footer
    ......@@ -161,10 +164,10 @@ uploadFileViewCpt = here.component "uploadFileView" cpt
    type UploadButtonProps =
    ( dispatch :: Action -> Aff Unit
    , fileType :: T.Box FileType
    , id :: GT.ID
    , lang :: T.Box Lang
    , mFile :: T.Box (Maybe UploadFile)
    , nodeType :: GT.NodeType
    , selection :: T.Box ListSelection.Selection
    )
    uploadButton :: Record UploadButtonProps -> R.Element
    ......@@ -174,13 +177,14 @@ uploadButtonCpt = here.component "uploadButton" cpt
    where
    cpt { dispatch
    , fileType
    , id
    , lang
    , mFile
    , nodeType
    , selection
    } _ = do
    fileType' <- T.useLive T.unequal fileType
    mFile' <- T.useLive T.unequal mFile
    selection' <- T.useLive T.unequal selection
    let disabled = case mFile' of
    Nothing -> "1"
    ......@@ -190,19 +194,19 @@ uploadButtonCpt = here.component "uploadButton" cpt
    , "type" : "button"
    , disabled
    , style : { width: "100%" }
    , on: {click: onClick fileType' mFile'}
    , on: { click: onClick fileType' mFile' selection' }
    } [ H.text "Upload" ]
    where
    onClick fileType' mFile' e = do
    onClick fileType' mFile' selection' e = do
    let { blob, name } = unsafePartial $ fromJust mFile'
    here.log2 "[uploadButton] fileType" fileType'
    void $ launchAff do
    case fileType' of
    Arbitrary ->
    dispatch $ UploadArbitraryFile (Just name) blob
    dispatch $ UploadArbitraryFile (Just name) blob selection'
    _ -> do
    contents <- readUFBAsText blob
    dispatch $ UploadFile nodeType fileType' (Just name) contents
    dispatch $ UploadFile nodeType fileType' (Just name) contents selection'
    liftEffect $ do
    T.write_ Nothing mFile
    T.write_ CSV fileType
    ......@@ -289,7 +293,7 @@ fileTypeViewCpt = here.component "fileTypeView" cpt
    T.write_ Nothing droppedFile
    launchAff $ do
    contents <- readUFBAsText blob
    dispatch $ UploadFile nodeType ft Nothing contents
    dispatch $ UploadFile nodeType ft Nothing contents (SelectedLists [])
    }
    } [H.text "Upload"]
    Nothing ->
    ......@@ -315,6 +319,7 @@ uploadFile :: { contents :: String
    , id :: ID
    , nodeType :: GT.NodeType
    , mName :: Maybe String
    , selection :: ListSelection.Selection
    , session :: Session }
    -> Aff (Either RESTError GT.AsyncTaskWithType)
    {-
    ......@@ -357,8 +362,9 @@ uploadFile { contents, fileType, id, nodeType, mName, session } = do
    uploadArbitraryFile :: Session
    -> ID
    -> {blob :: UploadFileBlob, mName :: Maybe String}
    -> ListSelection.Selection
    -> Aff (Either RESTError GT.AsyncTaskWithType)
    uploadArbitraryFile session id {mName, blob: UploadFileBlob blob} = do
    uploadArbitraryFile session id {mName, blob: UploadFileBlob blob} selection = do
    contents <- readAsDataURL blob
    uploadArbitraryDataURL session id mName contents
    ......@@ -475,6 +481,6 @@ uploadTermButtonCpt = here.component "uploadTermButton" cpt
    let {name, blob} = unsafePartial $ fromJust mFile'
    void $ launchAff do
    contents <- readUFBAsText blob
    _ <- dispatch $ UploadFile nodeType uploadType' (Just name) contents
    _ <- dispatch $ UploadFile nodeType uploadType' (Just name) contents (SelectedLists [])
    liftEffect $ do
    T.write_ Nothing mFile
    src/Gargantext/Components/Forest/Tree/Node/Box.purs
    View file @ e8891f6a
    ......@@ -6,7 +6,6 @@ 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
    import Gargantext.Components.Forest.Tree.Node.Action.Delete (actionDelete)
    ......@@ -18,6 +17,7 @@ import Gargantext.Components.Forest.Tree.Node.Action.Move (moveNode)
    import Gargantext.Components.Forest.Tree.Node.Action.Rename (renameAction)
    import Gargantext.Components.Forest.Tree.Node.Action.Search (actionSearch)
    import Gargantext.Components.Forest.Tree.Node.Action.Share as Share
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action)
    import Gargantext.Components.Forest.Tree.Node.Action.Update (update)
    import Gargantext.Components.Forest.Tree.Node.Action.Upload (actionUpload)
    import Gargantext.Components.Forest.Tree.Node.Box.Types (NodePopupProps, NodePopupS)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Box/Types.purs
    View file @ e8891f6a
    ......@@ -5,7 +5,7 @@ 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.Action.Types (Action)
    import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction)
    import Gargantext.Prelude (Unit)
    import Gargantext.Sessions (Session)
    ......
    src/Gargantext/Components/Forest/Tree/Node/Tools.purs
    View file @ e8891f6a
    ......@@ -9,7 +9,8 @@ import Data.String.CodeUnits as DSCU
    import Effect (Effect)
    import Effect.Aff (Aff, launchAff, launchAff_)
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree.Node.Action (Action, icon, text)
    import Gargantext.Components.Forest.Tree.Node.Action (icon, text)
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action)
    import Gargantext.Components.InputWithEnter (inputWithEnter)
    import Gargantext.Ends (Frontends, url)
    import Gargantext.Prelude (class Ord, class Read, class Show, Unit, bind, const, discard, map, not, pure, read, show, when, mempty, ($), (<), (<<<), (<>), (<$>), (<*>))
    ......
    src/Gargantext/Components/Forest/Tree/Node/Tools/SubTree.purs
    View file @ e8891f6a
    ......@@ -7,7 +7,8 @@ import Data.Either (Either)
    import Data.Maybe (Maybe(..))
    import Effect.Aff (Aff)
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.Forest.Tree.Node.Action (Props, Action, subTreeOut, setTreeOut)
    import Gargantext.Components.Forest.Tree.Node.Action (Props, subTreeOut, setTreeOut)
    import Gargantext.Components.Forest.Tree.Node.Action.Types (Action)
    import Gargantext.Components.Forest.Tree.Node.Tools (nodeText)
    import Gargantext.Components.Forest.Tree.Node.Tools.FTree (FTree, LNode(..), NTree(..))
    import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeParams(..), SubTreeOut(..))
    ......
    src/Gargantext/Components/Forest/Tree/Node/Tools/Sync.purs
    View file @ e8891f6a
    module Gargantext.Components.Forest.Tree.Node.Tools.Sync where
    import Gargantext.Prelude
    ( Unit, bind, const, discard, pure, unit, ($), (<>), (==) )
    ( Unit, bind, discard, pure, unit, ($), (<>), (==) )
    import Effect.Aff (Aff, launchAff_)
    import Data.Tuple.Nested ((/\))
    import Data.Maybe (Maybe(..))
    import Data.Tuple (fst)
    import Effect.Class (liftEffect)
    import Reactix.DOM.HTML as H
    import Reactix as R
    ......@@ -69,7 +67,7 @@ graphUpdateButtonCpt = here.component "graphUpdateButton" cpt
    onClick true enabled = do
    launchAff_ $ do
    liftEffect $ T.write_ false enabled
    g <- GraphAPI.updateGraphVersions { graphId: id, session }
    _g <- GraphAPI.updateGraphVersions { graphId: id, session }
    liftEffect $ T.write_ true enabled
    refresh unit
    pure unit
    ......@@ -105,7 +103,6 @@ type NodeListUpdateButtonProps =
    nodeListUpdateButton :: Record NodeListUpdateButtonProps -> R.Element
    nodeListUpdateButton p = R.createElement nodeListUpdateButtonCpt p []
    nodeListUpdateButtonCpt :: R.Component NodeListUpdateButtonProps
    nodeListUpdateButtonCpt = here.component "nodeListUpdateButton" cpt
    where
    ......
    src/Gargantext/Components/GraphExplorer/API.purs
    View file @ e8891f6a
    ......@@ -2,7 +2,7 @@ module Gargantext.Components.GraphExplorer.API where
    import Gargantext.Prelude
    import Data.Either (Either(..))
    import Data.Either (Either)
    import Data.Maybe (Maybe)
    import Effect.Aff (Aff)
    import Gargantext.Components.GraphExplorer.Types as GET
    ......
    src/Gargantext/Components/GraphExplorer/Button.purs
    View file @ e8891f6a
    ......@@ -21,7 +21,6 @@ import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadArbitraryData
    import Gargantext.Components.GraphExplorer.API (cloneGraph)
    import Gargantext.Components.GraphExplorer.Types as GET
    import Gargantext.Components.GraphExplorer.Utils as GEU
    import Gargantext.Config.REST (RESTError)
    import Gargantext.Hooks.Sigmax as Sigmax
    import Gargantext.Hooks.Sigmax.Sigma as Sigma
    import Gargantext.Sessions (Session)
    ......
    src/Gargantext/Components/ListSelection.purs
    View file @ e8891f6a
    ......@@ -2,45 +2,24 @@ module Gargantext.Components.ListSelection where
    import Gargantext.Prelude
    import Control.Bind ((=<<))
    import Data.Array as A
    import Data.Either (Either)
    import Data.Eq.Generic (genericEq)
    import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..))
    import Data.Newtype (class Newtype)
    import Gargantext.Components.Forest.Tree.Node.Tools (formChoiceSafe)
    import Gargantext.Components.ListSelection.Types (NodeSimple(..), Selection(..), selectedListIds)
    import Gargantext.Config.REST (RESTError(..), AffRESTError)
    import Gargantext.Hooks.Loader (useLoader)
    import Gargantext.Routes (SessionRoute(..))
    import Gargantext.Sessions (Session(..), get)
    import Gargantext.Types (ID, ListId, NodeType(..), fldr)
    import Gargantext.Types (ID, NodeType(..), fldr)
    import Gargantext.Utils.Reactix as R2
    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.ListSelection"
    data Selection = MyListsFirst | OtherListsFirst | SelectedLists (Array ListId)
    derive instance Generic Selection _
    instance Show Selection where
    show MyListsFirst = "My lists first"
    show OtherListsFirst = "Other lists first"
    show (SelectedLists _) = "Selected lists"
    instance Eq Selection where eq = genericEq
    instance Read Selection where
    read "My lists first" = Just MyListsFirst
    read "Other lists first" = Just OtherListsFirst
    read "Selected lists" = Just $ SelectedLists []
    read _ = Nothing
    selectedListIds :: Selection -> Array ListId
    selectedListIds (SelectedLists ids) = ids
    selectedListIds _ = []
    type Props =
    ( selection :: T.Box Selection
    , session :: Session
    ......@@ -91,25 +70,6 @@ listIdsRoute = Children NodeList 0 1 Nothing <<< Just
    treeFirstLevelRoute :: ID -> SessionRoute
    treeFirstLevelRoute id = TreeFirstLevel (Just id) ""
    -- A simplified data structure (we don't want the full-blown (NodePoly
    -- a), we care only about Corpus and NodeList node types, with id,
    -- name and that's all).
    newtype NodeSimple =
    NodeSimple { id :: ID
    , name :: String
    , nodeType :: NodeType }
    derive instance Generic NodeSimple _
    derive instance Newtype NodeSimple _
    derive instance Eq NodeSimple
    instance JSON.ReadForeign NodeSimple where
    readImpl f = do
    { node } :: { node :: { id :: ID
    , name :: String
    , type :: NodeType } } <- JSON.read' f
    pure $ NodeSimple { id: node.id
    , name: node.name
    , nodeType: node.type }
    loadTreeChildren :: { root :: ID, session :: Session } -> AffRESTError (Array NodeSimple)
    loadTreeChildren { root, session } = do
    eResult :: (Either RESTError { children :: Array NodeSimple }) <- get session $ treeFirstLevelRoute root
    ......
    src/Gargantext/Components/ListSelection/Types.purs 0 → 100644
    View file @ e8891f6a
    module Gargantext.Components.ListSelection.Types where
    import Gargantext.Prelude
    import Data.Eq.Generic (genericEq)
    import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..))
    import Data.Newtype (class Newtype)
    import Gargantext.Types (ID, ListId, NodeType)
    import Simple.JSON as JSON
    data Selection = MyListsFirst | OtherListsFirst | SelectedLists (Array ListId)
    derive instance Generic Selection _
    instance Show Selection where
    show MyListsFirst = "My lists first"
    show OtherListsFirst = "Other lists first"
    show (SelectedLists _) = "Selected lists"
    instance Eq Selection where eq = genericEq
    instance Read Selection where
    read "My lists first" = Just MyListsFirst
    read "Other lists first" = Just OtherListsFirst
    read "Selected lists" = Just $ SelectedLists []
    read _ = Nothing
    selectedListIds :: Selection -> Array ListId
    selectedListIds (SelectedLists ids) = ids
    selectedListIds _ = []
    ----------------------
    -- A simplified data structure (we don't want the full-blown (NodePoly
    -- a), we care only about Corpus and NodeList node types, with id,
    -- name and that's all).
    newtype NodeSimple =
    NodeSimple { id :: ID
    , name :: String
    , nodeType :: NodeType }
    derive instance Generic NodeSimple _
    derive instance Newtype NodeSimple _
    derive instance Eq NodeSimple
    instance JSON.ReadForeign NodeSimple where
    readImpl f = do
    { node } :: { node :: { id :: ID
    , name :: String
    , type :: NodeType } } <- JSON.read' f
    pure $ NodeSimple { id: node.id
    , name: node.name
    , nodeType: node.type }
    src/Gargantext/Components/NgramsTable.purs
    View file @ e8891f6a
    ......@@ -35,7 +35,7 @@ import Gargantext.Components.Nodes.Lists.Types as NT
    import Gargantext.Components.Table as TT
    import Gargantext.Components.Table.Types as TT
    import Gargantext.Config.REST (RESTError)
    import Gargantext.Hooks.Loader (useLoader, useLoaderBox)
    import Gargantext.Hooks.Loader (useLoaderBox)
    import Gargantext.Routes (SessionRoute(..)) as R
    import Gargantext.Sessions (Session, get)
    import Gargantext.Types (CTabNgramType, OrderBy(..), SearchQuery, TabType, TermList(..), TermSize, termLists, termSizes)
    ......@@ -379,14 +379,14 @@ loadedNgramsTableBodyCpt = here.component "loadedNgramsTableBody" cpt where
    , performAction: performAction <<< CoreAction }
    -- autoUpdate :: Array R.Element
    autoUpdate path' = if withAutoUpdate then
    [ R2.buff
    $ autoUpdateElt
    { duration: 5000
    , effect: performAction $ CoreAction $ Synchronize { afterSync: afterSync' }
    }
    ]
    else []
    -- autoUpdate path' = if withAutoUpdate then
    -- [ R2.buff
    -- $ autoUpdateElt
    -- { duration: 5000
    -- , effect: performAction $ CoreAction $ Synchronize { afterSync: afterSync' }
    -- }
    -- ]
    -- else []
    ngramsParentRoot :: Maybe NgramsTerm
    ngramsParentRoot =
    ......@@ -595,7 +595,7 @@ mainNgramsTableCacheOnCpt = here.component "mainNgramsTableCacheOn" cpt where
    handleResponse v = v
    mainNgramsTableCacheOff :: R2.Component MainNgramsTableProps
    mainNgramsTableCacheOff = R.createElement mainNgramsTableCacheOnCpt
    mainNgramsTableCacheOff = R.createElement mainNgramsTableCacheOffCpt
    mainNgramsTableCacheOffCpt :: R.Component MainNgramsTableProps
    mainNgramsTableCacheOffCpt = here.component "mainNgramsTableCacheOff" cpt where
    cpt { afterSync
    ......
    src/Gargantext/Components/NgramsTable/Components.purs
    View file @ e8891f6a
    ......@@ -11,11 +11,10 @@ import Data.Set (Set)
    import Data.Set as Set
    import Effect (Effect)
    import FFI.Simple (delay)
    import Gargantext.Components.Forest.Tree.Node.Action.Search.SearchField (searchQuery)
    import Gargantext.Components.NgramsTable.Core (Action(..), Dispatch, NgramsElement, NgramsTable, NgramsTablePatch, NgramsTerm, _NgramsElement, _NgramsRepoElement, _PatchMap, _children, _list, _ngrams, _occurrences, ngramsTermText, replace, setTermListA)
    import Gargantext.Components.Table as Tbl
    import Gargantext.Prelude (Unit, bind, const, discard, map, not, otherwise, pure, show, unit, ($), (+), (/=), (<<<), (<>), (==), (>), (||))
    import Gargantext.Types as T
    import Gargantext.Types as GT
    import Gargantext.Utils.Reactix as R2
    import React.DOM (a, span, text)
    import React.DOM.Props as DOM
    ......@@ -241,8 +240,8 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
    , on: { click: onClick } } []
    ]
    , selected
    , checkbox T.MapTerm
    , checkbox T.StopTerm
    , checkbox GT.MapTerm
    , checkbox GT.StopTerm
    , H.div {} ( if ngramsParent == Nothing
    then [renderNgramsTree { ngramsTable, ngrams, ngramsStyle, ngramsClick, ngramsEdit }]
    else [H.a { on: { click: const $ dispatch $ ToggleChild true ngrams } }
    ......@@ -283,7 +282,7 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
    }
    checkbox termList' =
    let chkd = termList == termList'
    termList'' = if chkd then T.CandidateTerm else termList'
    termList'' = if chkd then GT.CandidateTerm else termList'
    in
    H.input { checked: chkd
    , className: "checkbox"
    ......@@ -300,18 +299,18 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
    cycleTermListItem n = setTermListA n (replace termList (nextTermList termList))
    termStyle :: T.TermList -> Number -> DOM.Props
    termStyle T.MapTerm opacity = DOM.style { color: "green", opacity }
    termStyle T.StopTerm opacity = DOM.style { color: "red", opacity
    termStyle :: GT.TermList -> Number -> DOM.Props
    termStyle GT.MapTerm opacity = DOM.style { color: "green", opacity }
    termStyle GT.StopTerm opacity = DOM.style { color: "red", opacity
    , textDecoration: "line-through" }
    termStyle T.CandidateTerm opacity = DOM.style { color: "#767676", opacity }
    termStyle GT.CandidateTerm opacity = DOM.style { color: "#767676", opacity }
    tablePatchHasNgrams :: NgramsTablePatch -> NgramsTerm -> Boolean
    tablePatchHasNgrams ngramsTablePatch ngrams =
    isJust $ ngramsTablePatch.ngramsPatches ^. _PatchMap <<< at ngrams
    nextTermList :: T.TermList -> T.TermList
    nextTermList T.MapTerm = T.StopTerm
    nextTermList T.StopTerm = T.CandidateTerm
    nextTermList T.CandidateTerm = T.MapTerm
    nextTermList :: GT.TermList -> GT.TermList
    nextTermList GT.MapTerm = GT.StopTerm
    nextTermList GT.StopTerm = GT.CandidateTerm
    nextTermList GT.CandidateTerm = GT.MapTerm
    src/Gargantext/Components/NgramsTable/Core.purs
    View file @ e8891f6a
    ......@@ -121,7 +121,7 @@ import Data.TraversableWithIndex (traverseWithIndex)
    import Data.Tuple (Tuple(..))
    import Data.Tuple.Nested ((/\))
    import Effect (Effect)
    import Effect.Aff (Aff, error, launchAff_)
    import Effect.Aff (Aff, launchAff_)
    import Effect.Class (liftEffect)
    import Effect.Exception.Unsafe (unsafeThrow)
    import FFI.Simple.Functions (delay)
    ......
    src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Tabs.purs
    View file @ e8891f6a
    ......@@ -7,7 +7,6 @@ import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..))
    import Data.Show.Generic (genericShow)
    import Data.Tuple.Nested ((/\))
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.DocsTable as DT
    import Gargantext.Components.DocsTable.Types (Year)
    ......@@ -19,9 +18,8 @@ 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(..), FrontendError, PTabNgramType(..), SidePanelState, TabSubType(..), TabType(..))
    import Gargantext.Types (CTabNgramType(..), PTabNgramType(..), TabSubType(..), TabType(..))
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    import Toestand as T
    ......
    src/Gargantext/Components/Nodes/Corpus/Dashboard.purs
    View file @ e8891f6a
    ......@@ -15,7 +15,7 @@ import Gargantext.Components.Nodes.Types (FTFieldList(..), FTFieldsWithIndex(..)
    import Gargantext.Hooks.Loader (useLoader)
    import Gargantext.Prelude (Unit, bind, discard, pure, read, show, unit, ($), (<$>), (<>), (==))
    import Gargantext.Sessions (Session, sessionId)
    import Gargantext.Types (FrontendError, NodeID)
    import Gargantext.Types (NodeID)
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    ......
    src/Gargantext/Components/Nodes/Corpus/Document.purs
    View file @ e8891f6a
    module Gargantext.Components.Nodes.Corpus.Document where
    --import Data.Argonaut (encodeJson) -- DEBUG
    --import Data.Argonaut.Core (stringifyWithIndent) -- DEBUG
    import Data.Either (Either(..))
    import Data.Maybe (Maybe(..), fromMaybe)
    import Data.Tuple (fst)
    import Data.Tuple.Nested ((/\))
    import Effect.Aff (Aff)
    import Reactix as R
    import Reactix.DOM.HTML as H
    ......@@ -34,10 +30,10 @@ here :: R2.Here
    here = R2.here "Gargantext.Components.Nodes.Corpus.Document"
    publicationDate :: Document -> String
    publicationDate (Document doc@{publication_year: Nothing}) = ""
    publicationDate (Document doc@{publication_year: Just py, publication_month: Nothing}) = U.zeroPad 2 py
    publicationDate (Document doc@{publication_year: Just py, publication_month: Just pm, publication_day: Nothing}) = (U.zeroPad 2 py) <> "-" <> (U.zeroPad 2 pm)
    publicationDate (Document doc@{publication_year: Just py, publication_month: Just pm, publication_day: Just pd}) = (U.zeroPad 2 py) <> "-" <> (U.zeroPad 2 pm) <> "-" <> (U.zeroPad 2 pd)
    publicationDate (Document {publication_year: Nothing}) = ""
    publicationDate (Document {publication_year: Just py, publication_month: Nothing}) = U.zeroPad 2 py
    publicationDate (Document {publication_year: Just py, publication_month: Just pm, publication_day: Nothing}) = (U.zeroPad 2 py) <> "-" <> (U.zeroPad 2 pm)
    publicationDate (Document {publication_year: Just py, publication_month: Just pm, publication_day: Just pd}) = (U.zeroPad 2 py) <> "-" <> (U.zeroPad 2 pm) <> "-" <> (U.zeroPad 2 pd)
    docViewWrapper :: R2.Component Props
    docViewWrapper = R.createElement docViewWrapperCpt
    ......@@ -60,10 +56,10 @@ docViewCpt :: R.Component DocViewProps
    docViewCpt = here.component "docView" cpt
    where
    cpt { path
    , loaded: loaded@{ ngramsTable: Versioned { data: initTable }, document }
    , loaded: { ngramsTable: Versioned { data: initTable }, document }
    , state
    } _children = do
    state'@{ ngramsLocalPatch, ngramsVersion: version } <- T.useLive T.unequal state
    state'@{ ngramsLocalPatch } <- T.useLive T.unequal state
    let
    afterSync = \_ -> pure unit
    ......
    src/Gargantext/Components/Nodes/Lists/Tabs.purs
    View file @ e8891f6a
    ......@@ -6,7 +6,6 @@ import Data.Array as A
    import Data.Maybe (Maybe(..), fromMaybe)
    import Data.Tuple.Nested ((/\))
    import Effect.Class (liftEffect)
    import Gargantext.AsyncTasks as GAT
    import Gargantext.Components.App.Data (Boxes)
    import Gargantext.Components.NgramsTable as NT
    import Gargantext.Components.NgramsTable.Core as NTC
    ......@@ -18,7 +17,7 @@ import Gargantext.Components.Nodes.Corpus.Types (CorpusData)
    import Gargantext.Components.Tab as Tab
    import Gargantext.Prelude (bind, pure, unit, ($), (<>))
    import Gargantext.Sessions (Session)
    import Gargantext.Types (CTabNgramType(..), FrontendError, Mode(..), TabSubType(..), TabType(..), modeTabType)
    import Gargantext.Types (CTabNgramType(..), Mode(..), TabSubType(..), TabType(..), modeTabType)
    import Gargantext.Utils.Reactix as R2
    import Gargantext.Utils.Toestand as T2
    import Reactix as R
    ......
    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