[NgramsTable] edit works now but with bugs

src/Gargantext/Components/NgramsTable.purs

@@ -3,6 +3,7 @@ module Gargantext.Components.NgramsTable
   , CommonProps
   , TreeEdit
   , NgramsTreeEditProps
+  , getNgramsChildrenAff
   , initialTreeEdit
   , mainNgramsTable
   ) where
@@ -31,11 +32,12 @@ import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff)
+import Effect.Class (liftEffect)
 import Gargantext.Components.App.Store (Boxes)
 import Gargantext.Components.Bootstrap as B
 import Gargantext.Components.Bootstrap.Types (ButtonVariant(..), Variant(..))
 import Gargantext.Components.NgramsTable.Components as NTC
-import Gargantext.Components.NgramsTable.Core (Action(..), CoreAction(..), CoreState, Dispatch, NgramsActionRef, NgramsClick, NgramsDepth, NgramsElement(..), NgramsPatch(..), NgramsTable, NgramsTerm, PageParams, PatchMap(..), Versioned(..), VersionedNgramsTable, VersionedWithCountNgramsTable, _NgramsElement, _NgramsRepoElement, _NgramsTable, _children, _list, _ngrams, _ngrams_repo_elements, _ngrams_scores, _occurrences, _root, addNewNgramA, applyNgramsPatches, applyPatchSet, chartsAfterSync, commitPatch, convOrderBy, coreDispatch, filterTermSize, fromNgramsPatches, ngramsRepoElementToNgramsElement, ngramsTermText, normNgram, patchSetFromMap, replace, setTermListA, singletonNgramsTablePatch, syncResetButtons, toVersioned)
+import Gargantext.Components.NgramsTable.Core (Action(..), CoreAction(..), CoreState, Dispatch, NgramsActionRef, NgramsClick, NgramsDepth, NgramsElement(..), NgramsPatch(..), NgramsTable, NgramsTerm(..), PageParams, PatchMap(..), Versioned(..), VersionedNgramsTable, VersionedWithCountNgramsTable, _NgramsElement, _NgramsRepoElement, _NgramsTable, _children, _list, _ngrams, _ngrams_repo_elements, _ngrams_scores, _occurrences, _root, addNewNgramA, applyNgramsPatches, applyPatchSet, chartsAfterSync, commitPatch, convOrderBy, coreDispatch, filterTermSize, fromNgramsPatches, ngramsRepoElementToNgramsElement, ngramsTermText, normNgram, patchSetFromMap, replace, setTermListA, singletonNgramsTablePatch, syncResetButtons, toVersioned)
 import Gargantext.Components.NgramsTable.Loader (useLoaderWithCacheAPI)
 import Gargantext.Components.Nodes.Lists.Types as NT
 import Gargantext.Components.Table as TT
@@ -44,7 +46,7 @@ import Gargantext.Config.REST (AffRESTError, logRESTError)
 import Gargantext.Hooks.Loader (useLoaderBox)
 import Gargantext.Routes (SessionRoute(..)) as R
 import Gargantext.Sessions (Session, get)
-import Gargantext.Types (CTabNgramType, NodeID, OrderBy(..), SearchQuery, TabType, TermList(..), TermSize, termLists, termSizes)
+import Gargantext.Types (CTabNgramType, ListId, NodeID, OrderBy(..), SearchQuery, TabType, TermList(..), TermSize, termLists, termSizes)
 import Gargantext.Utils (queryExactMatchesLabel, queryMatchesLabel, toggleSet, sortWith)
 import Gargantext.Utils.CacheAPI as GUC
 import Gargantext.Utils.Reactix as R2
@@ -122,7 +124,6 @@ type TableContainerProps =
   , queryExactMatches :: Boolean
   , syncResetButton   :: Array R.Element
   , tabNgramType      :: CTabNgramType
-  , treeEdit          :: TreeEdit
   )
 
 tableContainer :: Record TableContainerProps -> Record TT.TableContainerProps -> R.Element
@@ -137,8 +138,6 @@ tableContainerCpt { addCallback
                   , queryExactMatches
                   , syncResetButton
                   , tabNgramType
-                  , treeEdit: { ngramsChildrenDiff
-                              , ngramsParent }
                   } = here.component "tableContainer" cpt
   where
     cpt props _ = do
@@ -199,7 +198,6 @@ tableContainerCpt { addCallback
                   ]
                 ]
             ]
-          , editor
           , if (selectionsExist ngramsSelection)
             then H.li {className: "list-group-item"}
                  [selectButtons true]
@@ -226,35 +224,6 @@ tableContainerCpt { addCallback
     setTermSizeFilter x = T.modify (_ { termSizeFilter = x }) path
     setSelection term = dispatch $ setTermListSetA ngramsTableCache ngramsSelection term
 
-    editor = H.div {} $ maybe [] edit ngramsParent
-      where
-        edit ngrams = [ H.p {} [H.text $ "Editing " <> ngramsTermText ngrams]
-                   , NTC.renderNgramsTree { getNgramsChildren
-                                          , ngramsChildren
-                                          , ngramsClick
-                                          , ngramsDepth
-                                          , ngramsEdit
-                                          , ngramsStyle: []
-                                          }
-                   , H.button { className: "btn btn-primary"
-                              , on: {click: (const $ dispatch AddTermChildren)}
-                              } [H.text "Save"]
-                   , H.button { className: "btn btn-primary"
-                              , on: {click: (const $ dispatch ClearTreeEdit)}
-                              } [H.text "Cancel"]
-                   ]
-          where
-            ngramsChildren = ngramsTable ^.. ix ngrams <<< _NgramsRepoElement <<< _children <<< folded
-            ngramsDepth = { ngrams, depth: 0 }
-            ngramsTable = ngramsTableCache # at ngrams
-                          <<< _Just
-                          <<< _NgramsRepoElement
-                          <<< _children
-                          %~ applyPatchSet (patchSetFromMap ngramsChildrenDiff)
-            ngramsClick {depth: 1, ngrams: child} = Just $ dispatch $ ToggleChild false child
-            ngramsClick _ = Nothing
-            ngramsEdit  _ = Nothing
-
     selectionsExist :: Set NgramsTerm -> Boolean
     selectionsExist = not <<< Set.isEmpty
 
@@ -455,7 +424,6 @@ loadedNgramsTableBodyCpt = here.component "loadedNgramsTableBody" cpt where
           , queryExactMatches: exactMatches
           , syncResetButton: [ syncResetButton ]
           , tabNgramType
-          , treeEdit: treeEdit'
           }
         , params
         , rows: filteredConvertedRows
@@ -498,14 +466,16 @@ mkDispatch { filteredRows
     performAction :: Action -> Effect Unit
     performAction ClearTreeEdit = do
       T.write_ initialTreeEdit treeEdit.box
-    performAction (SetParentResetChildren p c) = do
-      T.write_ { ngramsChildren: c
+    performAction (SetParentResetChildren ngramsParent ngramsChildren) = do
+      T.write_ { ngramsChildren
                , ngramsChildrenDiff: Map.empty
-               , ngramsParent: p } treeEdit.box
-    performAction (ToggleChild b c) =
-      T.modify_ (\g@{ ngramsChildrenDiff: nc } -> g { ngramsChildrenDiff = newNC nc }) treeEdit.box
+               , ngramsParent } treeEdit.box
+    performAction (ToggleChild b c) = do
+      here.log2 "[mkDispatch] ToggleChild b" b
+      here.log2 "[mkDispatch] ToggleChild c" c
+      T.modify_ (\g@{ ngramsChildrenDiff: ncd } -> g { ngramsChildrenDiff = newNC ncd }) treeEdit.box
       where
-        newNC nc = Map.alter (maybe (Just b) (const Nothing)) c nc
+        newNC ncd = Map.alter (maybe (Just b) (const Nothing)) c ncd
     performAction (ToggleSelect c) =
       T.modify_ (\s@{ ngramsSelection: ns } -> s { ngramsSelection = toggleSet c ns }) state
     performAction ToggleSelectAll = do
@@ -524,13 +494,10 @@ mkDispatch { filteredRows
           -- impossible but harmless
           pure unit
         Just parent -> do
-          here.log2 "[performAction] AddTermChildren, parent" parent
-          here.log2 "[performAction] AddTermChildren, ngramsChildrenDiff" ngramsChildrenDiff
           let pc = patchSetFromMap ngramsChildrenDiff
               pe = NgramsPatch { patch_list: mempty, patch_children: pc }
               pt = singletonNgramsTablePatch parent pe
           performAction ClearTreeEdit
-          here.log2 "[performAction] pt" pt
           -- let ppt = case (A.head $ Set.toUnfoldable $ Map.keys ngramsChildrenDiff) of
           --       Nothing -> mempty
           --       Just h  ->
@@ -599,18 +566,18 @@ type MainNgramsTableProps = (
   | CommonProps
   )
 
-getNgramsChildrenAff :: Session -> NodeID -> TabType -> NgramsTerm -> Aff (Array NgramsTerm)
-getNgramsChildrenAff session nodeId tabType ngrams = do
+getNgramsChildrenAff :: Session -> NodeID -> Array ListId -> TabType -> NgramsTerm -> Aff (Array NgramsTerm)
+getNgramsChildrenAff session nodeId listIds tabType (NormNgramsTerm ngrams) = do
   res <- get session $ R.GetNgrams params (Just nodeId)
   case res of
     Left err -> pure []
     Right r -> pure r
   where
     params = { limit: 10
-             , listIds: []
+             , listIds
              , offset: Nothing
              , orderBy: Nothing
-             , searchQuery: show ngrams
+             , searchQuery: ngrams
              , tabType
              , termListFilter: Nothing
              , termSizeFilter: Nothing }
@@ -620,7 +587,7 @@ mainNgramsTable = R.createElement mainNgramsTableCpt
 mainNgramsTableCpt :: R.Component MainNgramsTableProps
 mainNgramsTableCpt = here.component "mainNgramsTable" cpt
   where
-    cpt props@{ cacheState, path, session, tabType } _ = do
+    cpt props@{ cacheState, path, session, tabType, treeEdit } _ = do
       searchQuery <- T.useFocused (_.searchQuery) (\a b -> b { searchQuery = a }) path
       cacheState' <- T.useLive T.unequal cacheState
       onCancelRef <- R.useRef Nothing
@@ -631,6 +598,13 @@ mainNgramsTableCpt = here.component "mainNgramsTable" cpt
       nodeId <- T.useFocused (_.nodeId) (\a b -> b { nodeId = a }) path
       nodeId' <- T.useLive T.unequal nodeId
 
+      -- let treeEdit = { box: treeEditBox
+      --                , getNgramsChildren: getNgramsChildrenAff session nodeId' tabType
+      --                , onCancelRef
+      --                , onNgramsClickRef
+      --                , onSaveRef 
+      --                }
+
       -- let path = initialPageParams session nodeId [defaultListId] tabType
 
       case cacheState' of
@@ -642,19 +616,8 @@ mainNgramsTableCpt = here.component "mainNgramsTable" cpt
         NT.CacheOff -> pure $ R.fragment
           [
             loadedNgramsTableHeader { searchQuery } []
-          , ngramsTreeEdit { box: treeEditBox
-                           , getNgramsChildren: getNgramsChildrenAff session nodeId' tabType
-                           , onCancelRef
-                           , onNgramsClickRef
-                           , onSaveRef } []
-          , mainNgramsTableCacheOff (Record.merge props
-                                     { treeEdit: { box: treeEditBox
-                                                 , onCancelRef
-                                                 , onNgramsClickRef
-                                                 , onSaveRef 
-                                                 , getNgramsChildren: getNgramsChildrenAff session nodeId' tabType
-                                                 }
-                                     }) []
+          , ngramsTreeEdit treeEdit []
+          , mainNgramsTableCacheOff props []
           ]
 
 type NgramsTreeEditProps =
@@ -670,9 +633,11 @@ ngramsTreeEdit = R.createElement ngramsTreeEditCpt
 ngramsTreeEditCpt :: R.Component NgramsTreeEditProps
 ngramsTreeEditCpt = here.component "ngramsTreeEdit" cpt where
   cpt props@{ box } _ = do
-    { ngramsParent } <- T.useLive T.unequal box
+    box' <- T.useLive T.unequal box
+    ngramsParentFocused <- T.useFocused (_.ngramsParent) (\a b -> b { ngramsParent = a }) box
+    ngramsParentFocused' <- T.useLive T.unequal ngramsParentFocused
 
-    pure $ case ngramsParent of
+    pure $ case ngramsParentFocused' of
       Nothing -> H.div {} []
       Just ngramsParent' -> ngramsTreeEditReal (Record.merge props { ngramsParent' }) []
 
@@ -690,12 +655,16 @@ ngramsTreeEditRealCpt = here.component "ngramsTreeEditReal" cpt where
     let ngramsDepth = { depth: 1, ngrams: ngramsParent' }
         ngramsChildrenPatched :: Set NgramsTerm
         ngramsChildrenPatched = applyPatchSet (patchSetFromMap ngramsChildrenDiff) $ Set.fromFoldable ngramsChildren
+        gnc ngrams = if ngrams == ngramsParent'
+                       then do
+                         pure $ A.fromFoldable ngramsChildrenPatched
+                       else do
+                         pure []
 
     pure $ H.div {}
       [ H.p {}
         [ H.text $ "Editing " <> ngramsTermText ngramsDepth.ngrams ]
-      , NTC.renderNgramsTree { getNgramsChildren
-                             , ngramsChildren: List.fromFoldable ngramsChildrenPatched
+      , NTC.renderNgramsTree { getNgramsChildren: gnc
                              , ngramsClick
                              , ngramsDepth
                              , ngramsEdit
@@ -709,11 +678,6 @@ ngramsTreeEditRealCpt = here.component "ngramsTreeEditReal" cpt where
                  } [ H.text "Cancel" ]
       ]
       where
-        -- ngramsTable = ngramsTableCache # at ngrams
-        --               <<< _Just
-        --               <<< _NgramsRepoElement
-        --               <<< _children
-        --               %~ applyPatchSet (patchSetFromMap ngramsChildrenDiff)
         --ngramsClick {depth: 1, ngrams: child} = Just $ dispatch $ ToggleChild false child
         --ngramsClick _ = Nothing
         ngramsClick :: NgramsClick
@@ -890,7 +854,6 @@ mainNgramsTablePaintNoCacheCpt = here.component "mainNgramsTablePaintNoCache" cp
       state <- T.useBox $ initialState versioned
 
       pure $
-
         loadedNgramsTableBody
         { afterSync
         , boxes

src/Gargantext/Components/NgramsTable/Components.purs

 module Gargantext.Components.NgramsTable.Components where
 
+import Data.Either (Either(..))
 import Data.Lens ((^..), (^.), view)
 import Data.Lens.At (at)
 import Data.Lens.Fold (folded)
 import Data.Lens.Index (ix)
 import Data.List (List)
-import Data.List (null, toUnfoldable) as L
+import Data.List as L
 import Data.Maybe (Maybe(..), maybe, isJust)
 import Data.Nullable (null, toMaybe)
 import Data.Set (Set)
@@ -16,6 +17,8 @@ import Effect.Class (liftEffect)
 import FFI.Simple (delay)
 import Gargantext.Components.NgramsTable.Core (Action(..), Dispatch, NgramsClick, NgramsDepth, NgramsElement, NgramsTable, NgramsTablePatch, NgramsTerm, _NgramsElement, _NgramsRepoElement, _PatchMap, _children, _list, _ngrams, _occurrences, ngramsTermText, replace, setTermListA)
 import Gargantext.Components.Table as Tbl
+import Gargantext.Config.REST (logRESTError)
+import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Prelude (Unit, bind, const, discard, map, not, otherwise, pure, show, unit, ($), (+), (/=), (<<<), (<>), (==), (>), (||))
 import Gargantext.Types as GT
 import Gargantext.Utils.Reactix as R2
@@ -23,7 +26,9 @@ import React.DOM (a, span, text)
 import React.DOM.Props as DOM
 import Reactix as R
 import Reactix.DOM.HTML as H
+import Record as Record
 import Toestand as T
+import Type.Proxy (Proxy(..))
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.NgramsTable.Components"
@@ -121,7 +126,7 @@ selectionCheckboxCpt = here.component "selectionCheckbox" cpt
 
 type RenderNgramsTree =
   ( getNgramsChildren :: NgramsTerm -> Aff (Array NgramsTerm)
-  , ngramsChildren    :: List NgramsTerm
+  --, ngramsChildren    :: List NgramsTerm
   , ngramsClick       :: NgramsClick
   , ngramsDepth       :: NgramsDepth
   , ngramsEdit        :: NgramsClick
@@ -134,12 +139,12 @@ renderNgramsTree p = R.createElement renderNgramsTreeCpt p []
 renderNgramsTreeCpt :: R.Component RenderNgramsTree
 renderNgramsTreeCpt = here.component "renderNgramsTree" cpt
   where
-    cpt { getNgramsChildren, ngramsChildren, ngramsClick, ngramsDepth, ngramsEdit, ngramsStyle } _ =
+    cpt { getNgramsChildren, ngramsClick, ngramsDepth, ngramsEdit, ngramsStyle } _ =
       pure $ H.ul {}
       [ H.span { className: "tree" }
         [ H.span { className: "righthanded" }
           [ tree { getNgramsChildren
-                 , ngramsChildren
+                 --, ngramsChildren
                  , ngramsClick
                  , ngramsDepth
                  , ngramsEdit
@@ -168,7 +173,6 @@ tag tagProps =
 
 type TreeProps =
   ( getNgramsChildren :: NgramsTerm -> Aff (Array NgramsTerm)
-  , ngramsChildren    :: List NgramsTerm
   , ngramsEdit        :: NgramsClick
   --, ngramsTable :: NgramsTable
   | TagProps
@@ -177,15 +181,29 @@ type TreeProps =
 tree :: Record TreeProps -> R.Element
 tree p = R.createElement treeCpt p []
 treeCpt :: R.Component TreeProps
-treeCpt = here.component "tree" cpt
+treeCpt = here.component "tree" cpt where
+  cpt props@{ getNgramsChildren, ngramsDepth } _ = do
+    let loader p = do
+          res <- getNgramsChildren p
+          pure $ Right res
+    let render nc = treeLoaded (Record.merge props { ngramsChildren: L.fromFoldable nc })
+
+    useLoader { errorHandler
+              , loader
+              , path: ngramsDepth.ngrams
+              , render }
     where
-    cpt params@{ getNgramsChildren, ngramsChildren, ngramsClick, ngramsDepth, ngramsEdit, ngramsStyle } _ = do
-      R.useEffect' $ do
-        launchAff_ $ do
-          c <- getNgramsChildren ngramsDepth.ngrams
-          liftEffect $ here.log2 "[tree] ngrams" ngramsDepth.ngrams
-          liftEffect $ here.log2 "[tree] children" c
+      errorHandler = logRESTError here "[tree]"
 
+type TreeLoaded =
+  ( ngramsChildren    :: List NgramsTerm
+  | TreeProps )
+
+treeLoaded :: Record TreeLoaded -> R.Element
+treeLoaded p = R.createElement treeLoadedCpt p []
+treeLoadedCpt :: R.Component TreeLoaded
+treeLoadedCpt = here.component "treeLoaded" cpt where
+  cpt params@{ ngramsChildren, ngramsClick, ngramsDepth, ngramsEdit, ngramsStyle } _ = do
     pure $
       H.li { style: { width : "100%" } }
       ([ H.i { className, style } [] ]
@@ -216,8 +234,7 @@ treeCpt = here.component "tree" cpt
         if depth > 10 then
           const $ H.text "ERROR DEPTH > 10"
         else
-            H.ul {} <<< map (\ngrams -> tree (params { ngramsDepth = {depth, ngrams} })) <<< L.toUnfoldable
-
+          H.ul {} <<< map (\ngrams -> tree ((Record.delete (Proxy :: Proxy "ngramsChildren") params) { ngramsDepth = {depth, ngrams} })) <<< L.toUnfoldable
 
 type RenderNgramsItem =
   ( dispatch          :: Action -> Effect Unit
@@ -254,21 +271,20 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
         , checkbox GT.StopTerm
         , H.div {}
           ( if ngramsParent == Nothing
-            then [renderNgramsTree { getNgramsChildren
-                                   , ngramsChildren
+            then [ renderNgramsTree { getNgramsChildren
                                     , ngramsClick
                                     , ngramsDepth
                                     , ngramsEdit
-                                   , ngramsStyle }]
-            else [H.a { on: { click: const $ dispatch $ ToggleChild true ngrams } }
-                  [ H.i { className: "fa fa-plus" } []]
+                                    , ngramsStyle } ]
+            else [ H.a { on: { click: const $ dispatch $ ToggleChild true ngrams } }
+                   [ H.i { className: "fa fa-plus" } [] ]
                  , R2.buff $ tag [ text $ " " <> ngramsTermText ngramsDepth.ngrams ]
                  ]
           )
         , H.text $ show (ngramsElement ^. _NgramsElement <<< _occurrences)
       ]
       where
-        ngramsDepth= { ngrams, depth: 0 }
+        ngramsDepth = { ngrams, depth: 0 }
         tag =
           case ngramsClick ngramsDepth of
             Just effect ->

src/Gargantext/Components/Nodes/Annuaire.purs

@@ -151,16 +151,15 @@ pageLayoutCpt = here.component "pageLayout" cpt
         errorHandler = logRESTError here "[pageLayout]"
 
 type PageProps = 
-  ( session   :: Session
-  , frontends :: Frontends
+  ( frontends :: Frontends
   , pagePath  :: T.Box PagePath
   -- , info :: AnnuaireInfo
+  , session   :: Session
   , table     :: TableResult CT.NodeContact
   )
 
 page :: Record PageProps -> R.Element
 page props = R.createElement pageCpt props []
-
 pageCpt :: R.Component PageProps
 pageCpt = here.component "page" cpt
   where

src/Gargantext/Components/Nodes/Lists/Tabs.purs

@@ -100,13 +100,13 @@ ngramsViewCpt = here.component "ngramsView" cpt where
         R.fragment
         [
           ngramsView'
-          { mode
-          , boxes
-          , session
-          , params
+          { boxes
+          , corpusData: props.corpusData
           , listIds
+          , mode
           , nodeId
-          , corpusData: props.corpusData
+          , params
+          , session
           } []
         ,
           NT.mainNgramsTable
@@ -119,7 +119,7 @@ ngramsViewCpt = here.component "ngramsView" cpt where
           , tabNgramType
           , tabType
           , treeEdit: { box: treeEditBox
-                      , getNgramsChildren: \_ -> pure []
+                      , getNgramsChildren: NT.getNgramsChildrenAff session nodeId listIds tabType
                       , onCancelRef
                       , onNgramsClickRef
                       , onSaveRef }
@@ -148,26 +148,28 @@ ngramsViewCpt = here.component "ngramsView" cpt where
 
 -- @XXX re-render issue -> clone component
 type NgramsViewProps' =
-  ( mode          :: Mode
-  , boxes         :: Boxes
-  , session       :: Session
+  ( boxes         :: Boxes
+  , corpusData    :: CorpusData
   , listIds       :: Array Int
-  , params        :: Params
+  , mode          :: Mode
   , nodeId        :: Int
-  , corpusData    :: CorpusData
+  , params        :: Params
+  , session       :: Session
   )
 
 ngramsView' :: R2.Component NgramsViewProps'
 ngramsView' = R.createElement ngramsViewCpt'
-ngramsViewCpt' :: R.Memo NgramsViewProps'
-ngramsViewCpt' = R.memo' $ here.component "ngramsView_clone" cpt where
-  cpt { mode
-      , boxes
-      , session
+--ngramsViewCpt' :: R.Memo NgramsViewProps'
+--ngramsViewCpt' = R.memo' $ here.component "ngramsView_clone" cpt where
+ngramsViewCpt' :: R.Component NgramsViewProps'
+ngramsViewCpt' = here.component "ngramsView_clone" cpt where
+  cpt { boxes
+      , corpusData: { defaultListId }
       , listIds
-      , params
+      , mode
       , nodeId
-      , corpusData: { defaultListId }
+      , params
+      , session
       } _ = do
 
     let path' = {