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
    Hide 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
    ......@@ -122,21 +57,22 @@ icon NoAction = "hand-o-right"
    -- icon _ = "hand-o-right"
    text :: Action -> String
    text (AddNode _ _ ) = "Add !"
    text (DeleteNode _ ) = "Delete !"
    text (RenameNode _ ) = "Rename !"
    text (UpdateNode _ ) = "Update !"
    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 RefreshTree = "Refresh Tree !"
    text ClosePopover = "Close Popover !"
    text DownloadNode = "Download !"
    text (MoveNode _ ) = "Move !"
    text (MergeNode _ ) = "Merge !"
    text (LinkNode _ ) = "Link !"
    text NoAction = "No Action"
    text (AddNode _ _ ) = "Add !"
    text (DeleteNode _ ) = "Delete !"
    text (RenameNode _ ) = "Rename !"
    text (UpdateNode _ ) = "Update !"
    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 RefreshTree = "Refresh Tree !"
    text ClosePopover = "Close Popover !"
    text DownloadNode = "Download !"
    text (MoveNode _ ) = "Move !"
    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,16 +38,17 @@ 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" }
    [ H.text $ "Search and create a private "
    <> "corpus with the search query as corpus name." ]
    , searchBar { errors
    , langs: allLangs
    , onSearch: searchOn dispatch nodePopup
    , search
    , session
    } []
    ]
    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
    , langs: allLangs
    , onSearch: searchOn dispatch nodePopup
    , search
    , session
    } []
    ]
    where
    searchOn :: (Action -> Aff Unit)
    -> Maybe NodePopup
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Search/SearchBar.purs
    View file @ e8891f6a
    ......@@ -34,11 +34,11 @@ searchBarCpt = here.component "searchBar" cpt
    cpt { errors, langs, onSearch, search, session } _ = do
    --onSearchChange session s
    pure $ H.div { className: "search-bar" }
    [ searchField { databases: allDatabases
    , errors
    , langs
    , onSearch
    , search
    , session
    } []
    ]
    [ searchField { databases: allDatabases
    , errors
    , langs
    , onSearch
    , search
    , session
    } []
    ]
    src/Gargantext/Components/Forest/Tree/Node/Action/Search/SearchField.purs
    View file @ e8891f6a
    ......@@ -55,41 +55,40 @@ searchFieldCpt = here.component "searchField" cpt
    search' <- T.useLive T.unequal search
    iframeRef <- R.useRef null
    let params =
    [ searchInput { search } []
    -- , if length s.term < 3 -- search with love : <3
    -- then
    -- H.div {}[]
    -- else
    , H.div {} [ dataFieldNav { datafields: dataFields, search } []
    , if isExternal search'.datafield
    then databaseInput { databases: props.databases, search } []
    else H.div {} []
    , if isHAL search'.datafield
    then orgInput { orgs: allOrgs, search } []
    else H.div {} []
    , if isIMT search'.datafield
    then componentIMT { search } []
    else H.div {} []
    , if isCNRS search'.datafield
    then componentCNRS { search } []
    else H.div {} []
    , if needsLang search'.datafield
    then langNav { langs: props.langs, search } []
    else H.div {} []
    , H.div {} [ searchIframes { iframeRef, search } [] ]
    ]
    ]
    [ searchInput { search } []
    -- , if length s.term < 3 -- search with love : <3
    -- then
    -- H.div {}[]
    -- else
    , H.div {}
    [ dataFieldNav { datafields: dataFields, search } []
    , if isExternal search'.datafield
    then databaseInput { databases: props.databases, search } []
    else H.div {} []
    , if isHAL search'.datafield
    then orgInput { orgs: allOrgs, search } []
    else H.div {} []
    , if isIMT search'.datafield
    then componentIMT { search } []
    else H.div {} []
    , if isCNRS search'.datafield
    then componentCNRS { search } []
    else H.div {} []
    , if needsLang search'.datafield
    then langNav { langs: props.langs, search } []
    else H.div {} []
    , H.div {} [ searchIframes { iframeRef, search } [] ]
    ]
    ]
    let button = submitButton { errors, onSearch, search, session } []
    pure $
    H.div { className: "search-field" }
    [
    R.fragment params
    ......@@ -109,16 +108,17 @@ componentIMTCpt = here.component "componentIMT" cpt
    cpt { search } _ = do
    search' <- T.useLive T.unequal search
    let liCpt org = H.li {}
    [ H.input { type: "checkbox"
    , checked: isIn org search'.datafield
    , on: { change: \_ -> ( T.modify_ (_ { datafield = updateFilter org search'.datafield }) search)
    }
    }
    , if org == All_IMT
    then H.i {} [H.text $ " " <> show org]
    else H.text $ " " <> show org
    ]
    let liCpt org =
    H.li {}
    [ H.input { type: "checkbox"
    , checked: isIn org search'.datafield
    , on: { change: \_ -> ( T.modify_ (_ { datafield = updateFilter org search'.datafield }) search)
    }
    }
    , if org == All_IMT
    then H.i {} [H.text $ " " <> show org]
    else H.text $ " " <> show org
    ]
    pure $ R.fragment
    [ H.ul {} $ map liCpt allIMTorgs
    ......@@ -132,10 +132,10 @@ componentCNRSCpt :: R.Component ComponentProps
    componentCNRSCpt = here.component "componentCNRS" cpt
    where
    cpt { search } _ = do
    pure $ R.fragment [
    H.div {} []
    --, filterInput fi
    ]
    pure $ R.fragment
    [ H.div {} []
    --, filterInput fi
    ]
    isExternal :: Maybe DataField -> Boolean
    ......@@ -247,15 +247,17 @@ 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"]
    , H.div {className: "nav nav-tabs"} ((liItem search') <$> langs)
    ]
    pure $ R.fragment
    [ H.div {className: "text-primary center"} [H.text "with lang"]
    , H.div {className: "nav nav-tabs"} ((liItem search') <$> langs)
    ]
    where
    liItem :: Search -> Lang -> R.Element
    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,12 +273,13 @@ 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"]
    , H.div {className: "nav nav-tabs"} ((liItem search') <$> dataFields)
    , H.div {className: "center"} [ H.text
    $ maybe "TODO: add Doc Instance" doc 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
    ]
    ]
    where
    liItem :: Search -> DataField -> R.Element
    liItem { datafield } df' =
    ......@@ -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,16 +395,16 @@ searchInputCpt = here.component "searchInput" cpt
    { term } <- T.useLive T.unequal search
    valueRef <- R.useRef term
    pure $ H.div { className: "" } [
    inputWithEnter { onBlur: onBlur valueRef search
    , onEnter: onEnter valueRef search
    , onValueChanged: onValueChanged valueRef
    , autoFocus: false
    , className: "form-control"
    , defaultValue: R.readRef valueRef
    , placeholder: "Your query here"
    , type: "text" }
    ]
    pure $ H.div { className: "" }
    [ inputWithEnter { onBlur: onBlur valueRef search
    , onEnter: onEnter valueRef search
    , onValueChanged: onValueChanged valueRef
    , autoFocus: false
    , className: "form-control"
    , defaultValue: R.readRef valueRef
    , placeholder: "Your query here"
    , type: "text" }
    ]
    -- pure $
    -- H.div { className : "" }
    ......@@ -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 Gar