Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Przemyslaw Kaminski
purescript-gargantext
Commits
306b283c
Commit
306b283c
authored
Jun 09, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[REFACT|Tree] Search is enabled in the Tree only (because of session).
parent
740e7237
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
33 deletions
+38
-33
Tree.purs
src/Gargantext/Components/Forest/Tree.purs
+0
-1
Rename.purs
...Gargantext/Components/Forest/Tree/Node/Action/Rename.purs
+0
-4
SearchBar.purs
.../Components/Forest/Tree/Node/Action/Search/SearchBar.purs
+3
-4
SearchField.purs
...omponents/Forest/Tree/Node/Action/Search/SearchField.purs
+2
-2
Types.purs
...text/Components/Forest/Tree/Node/Action/Search/Types.purs
+1
-1
Box.purs
src/Gargantext/Components/Forest/Tree/Node/Box.purs
+5
-5
Types.purs
src/Gargantext/Types.purs
+27
-16
No files found.
src/Gargantext/Components/Forest/Tree.purs
View file @
306b283c
...
@@ -198,7 +198,6 @@ performAction { reload: (_ /\ setReload)
...
@@ -198,7 +198,6 @@ performAction { reload: (_ /\ setReload)
liftEffect $ onTaskAdd task
liftEffect $ onTaskAdd task
liftEffect $ log2 "[performAction] UpdateNode task:" task
liftEffect $ log2 "[performAction] UpdateNode task:" task
performAction p@{ reload: (_ /\ setReload)
performAction p@{ reload: (_ /\ setReload)
, session
, session
, tree: (NTree (LNode {id}) _) } (RenameNode name) = do
, tree: (NTree (LNode {id}) _) } (RenameNode name) = do
...
...
src/Gargantext/Components/Forest/Tree/Node/Action/Rename.purs
View file @
306b283c
...
@@ -10,7 +10,6 @@ import Gargantext.Types as GT
...
@@ -10,7 +10,6 @@ import Gargantext.Types as GT
import Gargantext.Types (ID)
import Gargantext.Types (ID)
import Gargantext.Routes as GR
import Gargantext.Routes as GR
import Gargantext.Sessions (Session, put)
import Gargantext.Sessions (Session, put)
import Gargantext.Components.Forest.Tree.Node.Tools as Tools
------------------------------------------------------------------------
------------------------------------------------------------------------
rename :: Session -> ID -> RenameValue -> Aff (Array ID)
rename :: Session -> ID -> RenameValue -> Aff (Array ID)
...
@@ -30,6 +29,3 @@ instance encodeJsonRenameValue :: EncodeJson RenameValue where
...
@@ -30,6 +29,3 @@ instance encodeJsonRenameValue :: EncodeJson RenameValue where
~> jsonEmptyObject
~> jsonEmptyObject
------------------------------------------------------------------------
------------------------------------------------------------------------
textInputBox :: Record Tools.TextInputBoxProps -> R.Element
textInputBox = Tools.textInputBox
src/Gargantext/Components/Search/SearchBar.purs
→
src/Gargantext/Components/
Forest/Tree/Node/Action/
Search/SearchBar.purs
View file @
306b283c
module Gargantext.Components.Search.SearchBar
module Gargantext.Components.
Forest.Tree.Node.Action.
Search.SearchBar
( Props, searchBar, searchBarCpt
( Props, searchBar, searchBarCpt
) where
) where
...
@@ -7,11 +7,10 @@ import Data.Nullable (Nullable)
...
@@ -7,11 +7,10 @@ import Data.Nullable (Nullable)
import Reactix as R
import Reactix as R
import Reactix.DOM.HTML as H
import Reactix.DOM.HTML as H
import Gargantext.Components.Search.Types -- (Database, SearchQuery(..), defaultSearchQuery, performSearch, Lang(..))
import Gargantext.Components.
Forest.Tree.Node.Action.
Search.Types -- (Database, SearchQuery(..), defaultSearchQuery, performSearch, Lang(..))
import Effect (Effect)
import Effect (Effect)
import Gargantext.Components.Lang (Lang)
import Gargantext.Components.Lang (Lang)
import Gargantext.Components.Search.SearchField (Search, searchField)
import Gargantext.Components.Forest.Tree.Node.Action.Search.SearchField (Search, searchField)
import Gargantext.Components.Search.Types (allDatabases) -- (Database, SearchQuery(..), defaultSearchQuery, performSearch, Lang(..))
import Gargantext.Prelude (Unit, pure, ($))
import Gargantext.Prelude (Unit, pure, ($))
import Gargantext.Sessions (Session)
import Gargantext.Sessions (Session)
import Gargantext.Types as GT
import Gargantext.Types as GT
...
...
src/Gargantext/Components/Search/SearchField.purs
→
src/Gargantext/Components/
Forest/Tree/Node/Action/
Search/SearchField.purs
View file @
306b283c
module Gargantext.Components.Search.SearchField
module Gargantext.Components.
Forest.Tree.Node.Action.
Search.SearchField
( Search, Props, defaultSearch, searchField, searchFieldComponent, isIsTex, isIsTex_Advanced) where
( Search, Props, defaultSearch, searchField, searchFieldComponent, isIsTex, isIsTex_Advanced) where
import Data.Maybe (Maybe(..), maybe, fromMaybe, isJust)
import Data.Maybe (Maybe(..), maybe, fromMaybe, isJust)
...
@@ -20,7 +20,7 @@ import Gargantext.Prelude (Unit, bind, const, discard, map, pure, show, ($), (&&
...
@@ -20,7 +20,7 @@ import Gargantext.Prelude (Unit, bind, const, discard, map, pure, show, ($), (&&
import Gargantext.Data.Array (catMaybes)
import Gargantext.Data.Array (catMaybes)
import Gargantext.Components.Lang (Lang)
import Gargantext.Components.Lang (Lang)
import Gargantext.Components.Search.Types (DataOriginApi(..), DataField(..), Database(..), IMT_org(..), Org(..), SearchQuery(..), allIMTorgs, allOrgs, dataFields, defaultSearchQuery, doc, performSearch, readDatabase, readOrg, datafield2database)
import Gargantext.Components.
Forest.Tree.Node.Action.
Search.Types (DataOriginApi(..), DataField(..), Database(..), IMT_org(..), Org(..), SearchQuery(..), allIMTorgs, allOrgs, dataFields, defaultSearchQuery, doc, performSearch, readDatabase, readOrg, datafield2database)
import Gargantext.Sessions (Session)
import Gargantext.Sessions (Session)
import Gargantext.Types as GT
import Gargantext.Types as GT
import Gargantext.Utils.Reactix as R2
import Gargantext.Utils.Reactix as R2
...
...
src/Gargantext/Components/Search/Types.purs
→
src/Gargantext/Components/
Forest/Tree/Node/Action/
Search/Types.purs
View file @
306b283c
module Gargantext.Components.Search.Types where
module Gargantext.Components.
Forest.Tree.Node.Action.
Search.Types where
import Data.Array (concat)
import Data.Array (concat)
import Data.Argonaut (class EncodeJson, encodeJson, jsonEmptyObject, (:=), (~>))
import Data.Argonaut (class EncodeJson, encodeJson, jsonEmptyObject, (:=), (~>))
...
...
src/Gargantext/Components/Forest/Tree/Node/Box.purs
View file @
306b283c
...
@@ -24,10 +24,10 @@ import Web.File.FileReader.Aff (readAsText)
...
@@ -24,10 +24,10 @@ import Web.File.FileReader.Aff (readAsText)
import Gargantext.AsyncTasks as GAT
import Gargantext.AsyncTasks as GAT
import Gargantext.Components.Forest.Tree.Node (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
import Gargantext.Components.Forest.Tree.Node (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
import Gargantext.Components.Forest.Tree.Node.Action (Action(..), FileType(..), UploadFileContents(..)
, icon, text
)
import Gargantext.Components.Forest.Tree.Node.Action (Action(..), FileType(..), UploadFileContents(..))
import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), addNodeView)
import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), addNodeView)
import Gargantext.Components.Forest.Tree.Node.Action.CopyFrom (copyFromCorpusView)
import Gargantext.Components.Forest.Tree.Node.Action.CopyFrom (copyFromCorpusView)
import Gargantext.Components.Forest.Tree.Node.Action.Rename (
textInputBox,
renameAction)
import Gargantext.Components.Forest.Tree.Node.Action.Rename (renameAction)
import Gargantext.Components.Forest.Tree.Node.Action.Share as Share
import Gargantext.Components.Forest.Tree.Node.Action.Share as Share
import Gargantext.Components.Forest.Tree.Node.Action.Upload (DroppedFile(..), uploadFileView, fileTypeView, uploadTermListView)
import Gargantext.Components.Forest.Tree.Node.Action.Upload (DroppedFile(..), uploadFileView, fileTypeView, uploadTermListView)
import Gargantext.Components.Forest.Tree.Node.ProgressBar (asyncProgressBar, BarType(..))
import Gargantext.Components.Forest.Tree.Node.ProgressBar (asyncProgressBar, BarType(..))
...
@@ -36,9 +36,9 @@ import Gargantext.Components.GraphExplorer.API as GraphAPI
...
@@ -36,9 +36,9 @@ import Gargantext.Components.GraphExplorer.API as GraphAPI
import Gargantext.Components.Lang (allLangs, Lang(EN))
import Gargantext.Components.Lang (allLangs, Lang(EN))
import Gargantext.Components.NgramsTable.API as NTAPI
import Gargantext.Components.NgramsTable.API as NTAPI
import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
import Gargantext.Components.Search.SearchBar (searchBar)
import Gargantext.Components.
Forest.Tree.Node.Action.
Search.SearchBar (searchBar)
import Gargantext.Components.Search.SearchField (Search, defaultSearch, isIsTex_Advanced)
import Gargantext.Components.
Forest.Tree.Node.Action.
Search.SearchField (Search, defaultSearch, isIsTex_Advanced)
import Gargantext.Components.Search.Types (DataField(..))
import Gargantext.Components.
Forest.Tree.Node.Action.
Search.Types (DataField(..))
import Gargantext.Ends (Frontends, url)
import Gargantext.Ends (Frontends, url)
import Gargantext.Hooks.Loader (useLoader)
import Gargantext.Hooks.Loader (useLoader)
import Gargantext.Prelude (Unit, bind, const, discard, identity, map, pure, show, unit, void, ($), (+), (<>), (==))
import Gargantext.Prelude (Unit, bind, const, discard, identity, map, pure, show, unit, void, ($), (+), (<>), (==))
...
...
src/Gargantext/Types.purs
View file @
306b283c
...
@@ -440,7 +440,10 @@ instance showTabType :: Show TabType where
...
@@ -440,7 +440,10 @@ instance showTabType :: Show TabType where
type TableResult a = {count :: Int, docs :: Array a}
type TableResult a = {count :: Int, docs :: Array a}
type AffTableResult a = Aff (TableResult a)
type AffTableResult a = Aff (TableResult a)
data Mode = Authors | Sources | Institutes | Terms
data Mode = Authors
| Sources
| Institutes
| Terms
derive instance genericMode :: Generic Mode _
derive instance genericMode :: Generic Mode _
instance showMode :: Show Mode where
instance showMode :: Show Mode where
...
@@ -471,6 +474,7 @@ data AsyncTaskType = Form
...
@@ -471,6 +474,7 @@ data AsyncTaskType = Form
| GraphT
| GraphT
| Query
| Query
| AddNode
| AddNode
derive instance genericAsyncTaskType :: Generic AsyncTaskType _
derive instance genericAsyncTaskType :: Generic AsyncTaskType _
instance eqAsyncTaskType :: Eq AsyncTaskType where
instance eqAsyncTaskType :: Eq AsyncTaskType where
eq = genericEq
eq = genericEq
...
@@ -496,7 +500,13 @@ asyncTaskTypePath AddNode = "async/nobody/"
...
@@ -496,7 +500,13 @@ asyncTaskTypePath AddNode = "async/nobody/"
type AsyncTaskID = String
type AsyncTaskID = String
data AsyncTaskStatus = Running | Pending | Received | Started | Failed | Finished | Killed
data AsyncTaskStatus = Running
| Pending
| Received
| Started
| Failed
| Finished
| Killed
derive instance genericAsyncTaskStatus :: Generic AsyncTaskStatus _
derive instance genericAsyncTaskStatus :: Generic AsyncTaskStatus _
instance showAsyncTaskStatus :: Show AsyncTaskStatus where
instance showAsyncTaskStatus :: Show AsyncTaskStatus where
show = genericShow
show = genericShow
...
@@ -518,10 +528,11 @@ readAsyncTaskStatus "IsRunning" = Running
...
@@ -518,10 +528,11 @@ readAsyncTaskStatus "IsRunning" = Running
readAsyncTaskStatus "IsStarted" = Started
readAsyncTaskStatus "IsStarted" = Started
readAsyncTaskStatus _ = Running
readAsyncTaskStatus _ = Running
newtype AsyncTask = AsyncTask {
newtype AsyncTask =
id :: AsyncTaskID
AsyncTask { id :: AsyncTaskID
, status :: AsyncTaskStatus
, status :: AsyncTaskStatus
}
}
derive instance genericAsyncTask :: Generic AsyncTask _
derive instance genericAsyncTask :: Generic AsyncTask _
instance eqAsyncTask :: Eq AsyncTask where
instance eqAsyncTask :: Eq AsyncTask where
eq = genericEq
eq = genericEq
...
@@ -532,8 +543,8 @@ instance encodeJsonAsyncTask :: EncodeJson AsyncTask where
...
@@ -532,8 +543,8 @@ instance encodeJsonAsyncTask :: EncodeJson AsyncTask where
~> jsonEmptyObject
~> jsonEmptyObject
instance decodeJsonAsyncTask :: DecodeJson AsyncTask where
instance decodeJsonAsyncTask :: DecodeJson AsyncTask where
decodeJson json = do
decodeJson json = do
obj <- decodeJson json
obj
<- decodeJson json
id <- obj .: "id"
id
<- obj .: "id"
status <- obj .: "status"
status <- obj .: "status"
pure $ AsyncTask { id, status }
pure $ AsyncTask { id, status }
...
@@ -551,9 +562,9 @@ instance encodeJsonAsyncTaskWithType :: EncodeJson AsyncTaskWithType where
...
@@ -551,9 +562,9 @@ instance encodeJsonAsyncTaskWithType :: EncodeJson AsyncTaskWithType where
~> jsonEmptyObject
~> jsonEmptyObject
instance decodeJsonAsyncTaskWithType :: DecodeJson AsyncTaskWithType where
instance decodeJsonAsyncTaskWithType :: DecodeJson AsyncTaskWithType where
decodeJson json = do
decodeJson json = do
obj <- decodeJson json
obj
<- decodeJson json
task <- obj .: "task"
task <- obj .: "task"
typ <- obj .: "typ"
typ
<- obj .: "typ"
pure $ AsyncTaskWithType { task, typ }
pure $ AsyncTaskWithType { task, typ }
newtype AsyncProgress = AsyncProgress {
newtype AsyncProgress = AsyncProgress {
...
@@ -564,9 +575,9 @@ newtype AsyncProgress = AsyncProgress {
...
@@ -564,9 +575,9 @@ newtype AsyncProgress = AsyncProgress {
derive instance genericAsyncProgress :: Generic AsyncProgress _
derive instance genericAsyncProgress :: Generic AsyncProgress _
instance decodeJsonAsyncProgress :: DecodeJson AsyncProgress where
instance decodeJsonAsyncProgress :: DecodeJson AsyncProgress where
decodeJson json = do
decodeJson json = do
obj <- decodeJson json
obj
<- decodeJson json
id <- obj .: "id"
id
<- obj .: "id"
log <- obj .: "log"
log
<- obj .: "log"
status <- obj .: "status"
status <- obj .: "status"
pure $ AsyncProgress {id, log, status}
pure $ AsyncProgress {id, log, status}
...
@@ -579,9 +590,9 @@ newtype AsyncTaskLog = AsyncTaskLog {
...
@@ -579,9 +590,9 @@ newtype AsyncTaskLog = AsyncTaskLog {
derive instance genericAsyncTaskLog :: Generic AsyncTaskLog _
derive instance genericAsyncTaskLog :: Generic AsyncTaskLog _
instance decodeJsonAsyncTaskLog :: DecodeJson AsyncTaskLog where
instance decodeJsonAsyncTaskLog :: DecodeJson AsyncTaskLog where
decodeJson json = do
decodeJson json = do
obj <- decodeJson json
obj
<- decodeJson json
events <- obj .: "events"
events
<- obj .: "events"
failed <- obj .: "failed"
failed
<- obj .: "failed"
remaining <- obj .: "remaining"
remaining <- obj .: "remaining"
succeeded <- obj .: "succeeded"
succeeded <- obj .: "succeeded"
pure $ AsyncTaskLog {events, failed, remaining, succeeded}
pure $ AsyncTaskLog {events, failed, remaining, succeeded}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment