[upload] frame calc async upload

src/Gargantext/AsyncTasks.purs

@@ -94,9 +94,9 @@ asyncTaskTTriggersMainPageReload :: GT.AsyncTaskWithType -> Boolean
 asyncTaskTTriggersMainPageReload (GT.AsyncTaskWithType { typ }) = asyncTaskTriggersMainPageReload typ
 
 asyncTaskTriggersTreeReload :: GT.AsyncTaskType -> Boolean
-asyncTaskTriggersTreeReload GT.Form       = true
-asyncTaskTriggersTreeReload GT.UploadFile = true
-asyncTaskTriggersTreeReload _            = false
+asyncTaskTriggersTreeReload GT.CorpusFormUpload = true
+asyncTaskTriggersTreeReload GT.UploadFile       = true
+asyncTaskTriggersTreeReload _                   = false
 
 asyncTaskTTriggersTreeReload :: GT.AsyncTaskWithType -> Boolean
 asyncTaskTTriggersTreeReload (GT.AsyncTaskWithType { typ }) = asyncTaskTriggersTreeReload typ

src/Gargantext/Components/FolderView.purs

@@ -8,6 +8,11 @@ import Data.Traversable (traverse_)
 import Effect (Effect)
 import Effect.Aff (Aff)
 import Effect.Class (liftEffect)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Record as Record
+import Toestand as T
+
 import Gargantext.AsyncTasks as GAT
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
 import Gargantext.Components.Forest.Tree.Node.Action.Add (AddNodeValue(..), addNode)
@@ -32,10 +37,6 @@ import Gargantext.Types as GT
 import Gargantext.Utils.Popover as Popover
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
-import Reactix as R
-import Reactix.DOM.HTML as H
-import Record as Record
-import Toestand as T
 
 foreign import back :: Effect Unit
 foreign import link :: String -> Effect Unit

src/Gargantext/Components/Forest/Tree.purs

@@ -27,7 +27,7 @@ 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.Update (updateRequest)
-import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadFile, uploadArbitraryFile)
+import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadFile, uploadArbitraryFile, uploadFrameCalc)
 import Gargantext.Components.Forest.Tree.Node.Tools.FTree (FTree, LNode(..), NTree(..), fTreeID)
 import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut(..))
 import Gargantext.Ends (Frontends)
@@ -249,6 +249,12 @@ uploadArbitraryFile' mName blob p@{ tasks, tree: (NTree (LNode { id }) _) } = do
     GAT.insert id task tasks
     log2 "[performAction] UploadArbitraryFile, uploaded, task:" task
 
+uploadFrameCalc' p@{ tasks, tree: (NTree (LNode { id }) _) } = do
+  task <- uploadFrameCalc p.session id
+  liftEffect $ do
+    GAT.insert id task tasks
+    log2 "[performAction] UploadFrameCalc, uploaded, task:" task
+
 moveNode params p@{ forestOpen, session } = traverse_ f params where
   f (SubTreeOut { in: in', out }) = do
     void $ moveNodeReq p.session in' out
@@ -278,6 +284,7 @@ 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 UploadFrameCalc p = uploadFrameCalc' p
 performAction DownloadNode _ = liftEffect $ log "[performAction] DownloadNode"
 performAction (MoveNode {params}) p = moveNode params p
 performAction (MergeNode {params}) p = mergeNode params p

src/Gargantext/Components/Forest/Tree/Node.purs

@@ -5,8 +5,6 @@ import Gargantext.Prelude
 import Data.Maybe (Maybe(..))
 import Data.Nullable (null)
 import Data.Symbol (SProxy(..))
-import Data.Tuple (fst, snd)
-import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff, launchAff)
 import Effect.Class (liftEffect)
@@ -127,7 +125,7 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
                    , nodeType
                    , session } []
 
-                , fileTypeView { dispatch, droppedFile, id, isDragOver, nodeType }
+                , fileTypeView { dispatch, droppedFile, id, isDragOver, nodeType } []
                 , H.div {} (map (\t -> asyncProgressBar { asyncTask: t
                                                        , barType: Pie
                                                        , nodeId: id

src/Gargantext/Components/Forest/Tree/Node/Action.purs

 module Gargantext.Components.Forest.Tree.Node.Action where
 
+import Gargantext.Prelude
+
 import Data.Generic.Rep (class Generic)
-import Data.Eq.Generic (genericEq)
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff)
 
-import Gargantext.Prelude
-
-import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut, SubTreeParams(..))
-import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), glyphiconNodeAction)
-import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType, UploadFileBlob)
-import Gargantext.Components.Forest.Tree.Node.Action.Update.Types (UpdateNodeParams)
 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.Settings (NodeAction(..), glyphiconNodeAction)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut, SubTreeParams(..))
 import Gargantext.Sessions (Session)
-import Gargantext.Types  as GT
+import Gargantext.Types as GT
 
 type Props =
   ( dispatch :: Action -> Aff Unit
@@ -30,6 +29,7 @@ data Action = AddNode     String GT.NodeType
             | DoSearch    GT.AsyncTaskWithType
             | UploadFile  GT.NodeType FileType (Maybe String) String
             | UploadArbitraryFile  (Maybe String) UploadFileBlob
+            | UploadFrameCalc
             | DownloadNode
             | RefreshTree
             | ClosePopover
@@ -68,6 +68,7 @@ instance Eq Action where
   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 UploadFrameCalc UploadFrameCalc = eq true true
   eq DownloadNode DownloadNode = true
   eq RefreshTree RefreshTree = true
   eq ClosePopover ClosePopover = true
@@ -91,6 +92,7 @@ instance Show Action where
   show (DoSearch    _      )      = "SearchQuery"
   show (UploadFile  _ _ _ _)      = "UploadFile"
   show (UploadArbitraryFile  _ _) = "UploadArbitraryFile"
+  show  UploadFrameCalc           = "UploadFrameCalc"
   show  RefreshTree               = "RefreshTree"
   show  ClosePopover              = "ClosePopover"
   show  DownloadNode              = "Download"
@@ -110,7 +112,8 @@ 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 (UploadArbitraryFile _ _ )   = glyphiconNodeAction Upload
+icon  UploadFrameCalc             = glyphiconNodeAction Upload
 icon  RefreshTree                 = glyphiconNodeAction Refresh
 icon  ClosePopover                = glyphiconNodeAction CloseNodePopover
 icon  DownloadNode                = glyphiconNodeAction Download
@@ -133,6 +136,7 @@ text (SharePublic _      )      = "Publish !"
 text (DoSearch    _      )      = "Launch search !"
 text (UploadFile  _ _ _ _)      = "Upload File !"
 text (UploadArbitraryFile  _ _) = "Upload arbitrary file !"
+text  UploadFrameCalc           = "Upload frame calc !"
 text  RefreshTree               = "Refresh Tree !"
 text  ClosePopover              = "Close Popover !"
 text DownloadNode               = "Download !"

src/Gargantext/Components/Forest/Tree/Node/Box.purs

@@ -5,7 +5,11 @@ import Gargantext.Prelude
 import Data.Array as A
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff)
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
+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.Add (NodePopup(..), addNodeView)
 import Gargantext.Components.Forest.Tree.Node.Action.Contact as Contact
 import Gargantext.Components.Forest.Tree.Node.Action.Delete (actionDelete)
@@ -22,15 +26,12 @@ import Gargantext.Components.Forest.Tree.Node.Action.Upload (actionUpload)
 import Gargantext.Components.Forest.Tree.Node.Box.Types (NodePopupProps, NodePopupS)
 import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
 import Gargantext.Components.Forest.Tree.Node.Status (Status(..), hasStatus)
-import Gargantext.Components.Forest.Tree.Node.Tools (textInputBox, fragmentPT, panel)
+import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT, textInputBox)
 import Gargantext.Sessions (Session)
 import Gargantext.Types (Name, ID, prettyNodeType)
 import Gargantext.Types as GT
 import Gargantext.Utils.Glyphicon (glyphicon, glyphiconActive)
 import Gargantext.Utils.Reactix as R2
-import Reactix as R
-import Reactix.DOM.HTML as H
-import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Forest.Tree.Node.Box"

src/Gargantext/Components/Forest/Tree/Node/Settings.purs

@@ -327,7 +327,8 @@ settingsBox NodeFrameCalc =
   SettingsBox { show : true
               , edit : true
               , doc  : Documentation NodeFrameCalc
-              , buttons : [ Add [ NodeFrameCalc
+              , buttons : [ Upload
+                          , Add [ NodeFrameCalc
                                 , NodeFrameWrite
                                 ]
                           , Move moveFrameParameters

src/Gargantext/Components/Forest/Tree/Node/Tools/Sync.purs

 module Gargantext.Components.Forest.Tree.Node.Tools.Sync where
 
-import Gargantext.Prelude
-  ( Unit, bind, const, discard, pure, unit, ($), (<>), (==) )
+import Gargantext.Prelude (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

src/Gargantext/Components/NgramsTable/Core.purs

@@ -12,7 +12,7 @@ module Gargantext.Components.NgramsTable.Core
   , NgramsPatch(..)
   , NgramsPatches
   , _NgramsTable
-  , NgramsTerm
+  , NgramsTerm(..)
   , normNgram
   , ngramsTermText
   , findNgramRoot
@@ -23,7 +23,7 @@ module Gargantext.Components.NgramsTable.Core
   , VersionedWithCount(..)
   , toVersioned
   , VersionedNgramsPatches
-  , AsyncNgramsChartsUpdate
+  , AsyncNgramsChartsUpdate(..)
   , VersionedNgramsTable
   , VersionedWithCountNgramsTable
   , NgramsTablePatch
@@ -103,7 +103,6 @@ import Data.List as L
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe(..), fromMaybe, fromMaybe', isJust)
-import Data.Monoid (class Monoid)
 import Data.Monoid.Additive (Additive(..))
 import Data.Newtype (class Newtype)
 import Data.Set (Set)
@@ -117,9 +116,9 @@ import Data.Symbol (SProxy(..))
 import Data.These (These(..))
 import Data.Traversable (for, traverse_, traverse)
 import Data.TraversableWithIndex (traverseWithIndex)
-import Data.Tuple (Tuple(..), snd)
+import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
-import DOM.Simple.Console (log, log2)
+import DOM.Simple.Console (log2)
 import Effect.Aff (Aff, launchAff_)
 import Effect (Effect)
 import Effect.Class (liftEffect)
@@ -127,25 +126,23 @@ import Effect.Exception.Unsafe (unsafeThrow)
 import Foreign as F
 import Foreign.Object as FO
 import FFI.Simple.Functions (delay)
-import Reactix as R
+import Reactix (Component, Element, createElement) as R
 import Reactix.DOM.HTML as H
-import Record as Record
 import Partial (crashWith)
 import Partial.Unsafe (unsafePartial)
 import Simple.JSON as JSON
-import Toestand as T
+import Toestand (Box, modify_, read, unequal, useBox, useLive, write_) as T
 
 import Gargantext.Prelude
 
 import Gargantext.AsyncTasks as GAT
-import Gargantext.Components.Table       as T
-import Gargantext.Components.Table.Types as T
+import Gargantext.Components.Table (initialParams) as T
+import Gargantext.Components.Table.Types (ColumnName(..), OrderByDirection(..), Params) as T
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get, post, put)
 import Gargantext.Types (AsyncTaskType(..), AsyncTaskWithType(..), CTabNgramType(..), ListId, OrderBy(..), ScoreType(..), TabSubType(..), TabType(..), TermList(..), TermSize(..))
 import Gargantext.Utils.KarpRabin (indicesOfAny)
 import Gargantext.Utils.Reactix as R2
-import Gargantext.Utils.Toestand as T2
   
 here :: R2.Here
 here = R2.here "Gargantext.Components.NgramsTable.Core"

src/Gargantext/Components/Nodes/Annuaire/User/Contact.purs

@@ -3,11 +3,9 @@ module Gargantext.Components.Nodes.Annuaire.User.Contact
   , contactLayout
   ) where
 
-import Gargantext.Prelude
-  ( Unit, bind, const, discard, pure, show, ($), (<$>), (*>), (<<<), (<>) )
+import Gargantext.Prelude (Unit, bind, discard, pure, show, ($), (*>), (<$>), (<<<), (<>))
 import Data.Lens as L
 import Data.Maybe (Maybe(..), fromMaybe)
-import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff, launchAff_)
 import Effect.Class (liftEffect)

src/Gargantext/Components/Nodes/Corpus.purs

@@ -7,7 +7,6 @@ import Data.Eq.Generic (genericEq)
 import Data.Show.Generic (genericShow)
 import Data.List as List
 import Data.Maybe (Maybe(..), fromMaybe)
-import Data.Tuple (Tuple(..))
 import DOM.Simple.Console (log2)
 import Effect (Effect)
 import Effect.Aff (Aff, launchAff_, throwError)

src/Gargantext/Config/REST.purs

 module Gargantext.Config.REST where
 
 import Affjax (defaultRequest, printError, request)
-import Affjax.RequestBody (RequestBody(..), formData, formURLEncoded, string)
+import Affjax.RequestBody (formData, formURLEncoded, string)
 import Affjax.RequestHeader as ARH
 import Affjax.ResponseFormat as ResponseFormat
-import DOM.Simple.Console (log, log2)
+import DOM.Simple.Console (log)
 import Data.Argonaut.Core as AC
 import Data.Either (Either(..))
 import Data.Foldable (foldMap)
@@ -12,13 +12,10 @@ import Data.FormURLEncoded as FormURLEncoded
 import Data.HTTP.Method (Method(..))
 import Data.Maybe (Maybe(..))
 import Data.MediaType.Common (applicationFormURLEncoded, applicationJSON, multipartFormData)
-import Data.Tuple (Tuple(..))
-import DOM.Simple.Console (log2)
+import Data.Tuple (Tuple)
 import Effect.Aff (Aff, throwError)
 import Effect.Class (liftEffect)
 import Effect.Exception (error)
-import Milkis as Milkis
-import Unsafe.Coerce (unsafeCoerce)
 import Simple.JSON as JSON
 import Web.XHR.FormData as XHRFormData
 

src/Gargantext/Types.purs

@@ -650,7 +650,7 @@ modeFromString _            = Nothing
 
 -- corresponds to /add/form/async or /add/query/async
 data AsyncTaskType = AddNode
-                   | Form  -- this is file upload too
+                   | CorpusFormUpload  -- this is file upload too
                    | GraphRecompute
                    | ListUpload
                    | ListCSVUpload  -- legacy v3 CSV upload for lists
@@ -658,6 +658,7 @@ data AsyncTaskType = AddNode
                    | UpdateNgramsCharts
                    | UpdateNode
                    | UploadFile
+                   | UploadFrameCalc
 
 derive instance Generic AsyncTaskType _
 instance JSON.ReadForeign AsyncTaskType where
@@ -669,7 +670,7 @@ instance Show AsyncTaskType where
 
 asyncTaskTypePath :: AsyncTaskType -> String
 asyncTaskTypePath AddNode            = "async/nobody/"
-asyncTaskTypePath Form               = "add/form/async/"
+asyncTaskTypePath CorpusFormUpload   = "add/form/async/"
 asyncTaskTypePath GraphRecompute     = "async/recompute/"
 asyncTaskTypePath ListUpload         = "add/form/async/"
 asyncTaskTypePath ListCSVUpload      = "csv/add/form/async/"
@@ -677,6 +678,7 @@ asyncTaskTypePath Query              = "query/"
 asyncTaskTypePath UpdateNgramsCharts = "ngrams/async/charts/update/"
 asyncTaskTypePath UpdateNode         = "update/"
 asyncTaskTypePath UploadFile         = "async/file/add/"
+asyncTaskTypePath UploadFrameCalc    = "add/framecalc/async/"
 
 
 type AsyncTaskID = String