[MERGE]

src/Gargantext/Components/App/App.purs

@@ -2,24 +2,90 @@ module Gargantext.Components.App (app) where
 
 import Gargantext.Prelude
 
+import Data.Tuple.Nested ((/\))
 import Gargantext.AsyncTasks as GAT
 import Gargantext.Components.App.Store as AppStore
 import Gargantext.Components.Router (router)
 import Gargantext.Hooks (useHashRouter)
+import Gargantext.Hooks.FirstEffect (useFirstEffect')
 import Gargantext.Router as Router
 import Gargantext.Sessions as Sessions
+import Gargantext.Types (CacheParams, defaultCacheParams)
+import Gargantext.Utils (getter)
 import Gargantext.Utils.Reactix as R2
 import Reactix as R
+import Record as Record
 import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.App"
 
-app :: R2.Component ()
-app = R.createElement appCpt
+
+app :: R2.Leaf ()
+app = R2.leaf appCpt
 
 appCpt :: R.Component ()
-appCpt = here.component "app" cpt where
+appCpt = here.component "container" cpt where
+  cpt _ _ = do
+    -- | States
+    -- |
+
+    cache' /\ cache <- R2.useBox' (defaultCacheParams :: CacheParams)
+
+    -- | Hooks
+    -- |
+
+    -- load Local Storage cache (if exists)
+    useFirstEffect' $
+      R2.loadLocalStorageState R2.appParamsKey cache
+
+    -- | Render
+    -- |
+    pure $
+
+      hydrateStore
+      { cacheParams: cache'
+      }
+
+--------------------------------------------------------------
+
+type HydrateStoreProps =
+  ( cacheParams :: CacheParams
+  )
+
+hydrateStore :: R2.Leaf HydrateStoreProps
+hydrateStore = R2.leaf hydrateStoreCpt
+
+hydrateStoreCpt :: R.Component HydrateStoreProps
+hydrateStoreCpt = here.component "hydrateStore" cpt where
+  cpt { cacheParams
+      } _ = do
+    -- | Computed
+    -- |
+    (state :: Record AppStore.State) <- pure $
+      -- (cache options)
+      { expandTableEdition: getter _.expandTableEdition cacheParams
+      -- (default options)
+      } `Record.merge` AppStore.options
+
+    -- | Render
+    -- |
+    pure $
+
+      AppStore.provide
+      state
+      [
+        mainApp
+        {}
+      ]
+
+--------------------------------------------------------------
+
+mainApp :: R2.Leaf ()
+mainApp = R2.leaf mainAppCpt
+
+mainAppCpt :: R.Component ()
+mainAppCpt = here.component "main" cpt where
   cpt _ _ = do
     boxes <- AppStore.use
     -- tasks   <- T.useBox Nothing             -- storage for asynchronous tasks reductor

src/Gargantext/Components/App/Store.purs

@@ -38,6 +38,7 @@ here = R2.here "Gargantext.Components.App.Store"
 type Store =
   ( backend             :: T.Box (Maybe Backend)
   , errors              :: T.Box (Array FrontendError)
+  , expandTableEdition  :: T.Box Boolean
   , forestOpen          :: T.Box OpenNodes
   , graphVersion        :: T2.ReloadS
   , handed              :: T.Box Handed
@@ -63,6 +64,7 @@ type Store =
 type State =
   ( backend             :: Maybe Backend
   , errors              :: Array FrontendError
+  , expandTableEdition  :: Boolean
   , forestOpen          :: OpenNodes
   , graphVersion        :: T2.Reload
   , handed              :: Handed
@@ -89,6 +91,7 @@ options :: Record State
 options =
   { backend             : Nothing
   , errors              : []
+  , expandTableEdition  : false
   , forestOpen          : OpenNodes $ Set.empty
   , graphVersion        : T2.newReload
   , handed              : RightHanded

src/Gargantext/Components/Bootstrap/Inline/IconButton.purs

@@ -24,6 +24,7 @@ type Options =
   , overlay   :: Boolean
   , elevation :: Elevation
   , variant   :: Variant
+  , focusRing :: Boolean
   )
 
 options :: Record Options
@@ -34,6 +35,7 @@ options =
   , overlay   : true
   , elevation : Level0
   , variant   : Dark
+  , focusRing : true
   }
 
 -- | Structural Component for a simple Glyphicon element with call-to-action
@@ -67,6 +69,9 @@ component = R.hooksComponent componentName cpt where
             componentName <> "--overlay" $
             ""
         , componentName <> "--" <> show props.elevation
+        , props.focusRing ?
+            componentName <> "--focus-ring" $
+            ""
         ]
 
       contentClassName = intercalate " "

src/Gargantext/Components/Corpus/EditionBlock.purs

+module Gargantext.Components.Corpus.EditionBlock
+  ( editionBlock
+  ) where
+
+import Gargantext.Prelude
+
+import Data.Maybe (Maybe(..), isJust)
+import Data.Tuple.Nested ((/\))
+import Gargantext.Components.Bootstrap as B
+import Gargantext.Components.Corpus.CodeSection (loadCorpus')
+import Gargantext.Components.Node (NodePoly(..))
+import Gargantext.Components.Nodes.Corpus.Types (CorpusInfo(..), Hyperdata(..), getCorpusInfo)
+import Gargantext.Components.Table (tableHeaderEditionBlock)
+import Gargantext.Config.REST (logRESTError)
+import Gargantext.Hooks.Loader (useLoaderEffect)
+import Gargantext.Hooks.Session (useSession)
+import Gargantext.Types (ID)
+import Gargantext.Utils.Reactix as R2
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Toestand as T
+
+type Props =
+  ( nodeId :: ID
+  )
+
+here :: R2.Here
+here = R2.here "Gargantext.Components.Corpus.EditionBlock"
+
+editionBlock :: R2.Leaf Props
+editionBlock = R2.leaf editionBlockCpt
+editionBlockCpt :: R.Component Props
+editionBlockCpt = here.component "main" cpt where
+  cpt { nodeId
+      } _ = do
+    -- | States
+    -- |
+    session <- useSession
+
+    state' /\ state <- R2.useBox' Nothing
+
+    -- | Computed
+    -- |
+    let
+      errorHandler = logRESTError here "[corpusLayout]"
+
+    -- | Hooks
+    -- |
+    useLoaderEffect
+      { errorHandler
+      , loader: loadCorpus'
+      , path: { nodeId, session }
+      , state
+      }
+
+    -- | Render
+    -- |
+    pure $
+
+      B.cloak
+      { isDisplayed: isJust state'
+      , cloakSlot:
+
+          -- (?) quick and dirty placeholder for the <tableHeaderEditionBlock>
+          H.div
+          { style:
+            { width: "100%"
+            , height: "136px"
+            , position: "relative"
+            }
+          }
+          [
+            B.preloader
+            {}
+          ]
+
+      , defaultSlot:
+          R2.fromMaybe state' \hyperdata ->
+
+            editionBlock_
+            { nodeId
+            , hyperdata
+            }
+      }
+
+----------------------------------------------------------------
+
+
+type Props_ =
+  ( nodeId      :: ID
+  , hyperdata   :: NodePoly Hyperdata
+  )
+
+editionBlock_ :: R2.Leaf Props_
+editionBlock_ = R2.leaf editionBlockCpt_
+editionBlockCpt_ :: R.Component Props_
+editionBlockCpt_ = here.component "main_" cpt where
+  cpt { nodeId
+      , hyperdata
+      } _ = do
+    -- | Computed
+    -- |
+    let
+      NodePoly { name, date, hyperdata } = hyperdata
+
+      Hyperdata h = hyperdata
+      corpusInfo = getCorpusInfo h.fields
+
+      CorpusInfo { title, desc, query, authors } = corpusInfo
+
+    -- -- | States
+    -- -- |
+    corpusInfoS <- T.useBox corpusInfo
+
+    session <- useSession
+
+    -- -- | Render
+    -- -- |
+    pure $
+
+      tableHeaderEditionBlock
+      { hyperdata
+      , nodeId
+      , session
+      , corpusInfoS
+      , defaultData:
+        { name
+        , date
+        , query
+        , desc
+        , title
+        , authors
+        }
+      }

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

@@ -23,9 +23,9 @@ import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType(..),
 import Gargantext.Components.Forest.Tree.Node.Box (nodePopupView)
 import Gargantext.Components.Forest.Tree.Node.Settings (SettingsBox(..), settingsBox)
 import Gargantext.Components.Forest.Tree.Node.Tools.Sync (nodeActionsGraph, nodeActionsNodeList)
+import Gargantext.Components.Corpus.CodeSection (loadCorpusWithChild)
 import Gargantext.Components.GraphExplorer.API as GraphAPI
 import Gargantext.Components.Lang (Lang(EN))
-import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
 import Gargantext.Config.REST (logRESTError)
 import Gargantext.Context.Progress (asyncContext, asyncProgress)
 import Gargantext.Ends (Frontends, url)

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

@@ -137,7 +137,7 @@ contactFormCpt = here.component "form" cpt where
                 }
               ]
             ]
-          , 
+          ,
             H.div
             { className: "form-group" }
             [
@@ -177,7 +177,7 @@ contactFormCpt = here.component "form" cpt where
                 }
               ]
             ]
-          , 
+          ,
             H.div
             { className: "form-group" }
             [
@@ -321,7 +321,7 @@ contactFormCpt = here.component "form" cpt where
         ]
       ,
         B.wad
-        [ "align-self-start", "ml-3" ]
+        [ "align-self-flex-start", "ml-3" ]
         [
           B.caveat
           {}

src/Gargantext/Components/Nodes/Corpus/Dashboard.purs

@@ -9,7 +9,7 @@ import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
 import Gargantext.Components.App.Store (Boxes)
-import Gargantext.Components.Nodes.Corpus (fieldsCodeEditor)
+import Gargantext.Components.Corpus.CodeSection (fieldsCodeEditor)
 import Gargantext.Components.Nodes.Corpus.Chart.Predefined as P
 import Gargantext.Components.Nodes.Dashboard.Types as DT
 import Gargantext.Components.Nodes.Types (FTFieldList(..), FTFieldsWithIndex(..), defaultField)

src/Gargantext/Components/Nodes/Lists.purs

@@ -5,9 +5,9 @@ import Gargantext.Prelude
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Gargantext.Components.App.Store (Boxes)
+import Gargantext.Components.Corpus.CodeSection (loadCorpusWithChild)
 import Gargantext.Components.NgramsTable.Loader (clearCache)
 import Gargantext.Components.Node (NodePoly(..))
-import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
 import Gargantext.Components.Nodes.Lists.Tabs as Tabs
 import Gargantext.Components.Nodes.Lists.Types (CacheState(..))
 import Gargantext.Components.Table as Table

src/Gargantext/Components/Nodes/Texts.purs

@@ -13,6 +13,7 @@ import Gargantext.Components.Bootstrap as B
 import Gargantext.Components.Bootstrap.Types (Elevation(..))
 import Gargantext.Components.Charts.Options.ECharts (dispatchAction)
 import Gargantext.Components.Charts.Options.Type (EChartsInstance, EChartActionData)
+import Gargantext.Components.Corpus.CodeSection (loadCorpusWithChild)
 import Gargantext.Components.DocsTable as DT
 import Gargantext.Components.DocsTable.Types (Year)
 import Gargantext.Components.Document.API (loadData)
@@ -20,10 +21,8 @@ import Gargantext.Components.Document.Layout (layout)
 import Gargantext.Components.Document.Types (LoadedData, DocPath)
 import Gargantext.Components.NgramsTable.Loader (clearCache)
 import Gargantext.Components.Node (NodePoly(..))
-import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
 import Gargantext.Components.Nodes.Corpus.Chart.Histo (histo)
 import Gargantext.Components.Nodes.Corpus.Chart.Types as CTypes
-import Gargantext.Components.Nodes.Corpus.Document as D
 import Gargantext.Components.Nodes.Corpus.Types (CorpusData)
 import Gargantext.Components.Nodes.Lists.Types as LT
 import Gargantext.Components.Nodes.Texts.Types as TT
@@ -35,7 +34,7 @@ import Gargantext.Config.REST (logRESTError)
 import Gargantext.Ends (Frontends)
 import Gargantext.Hooks.Loader (useLoader, useLoaderEffect)
 import Gargantext.Hooks.Session (useSession)
-import Gargantext.Sessions (Session, getCacheState, sessionId)
+import Gargantext.Sessions (Session, getCacheState)
 import Gargantext.Types (CTabNgramType(..), ListId, NodeID, SidePanelState(..), TabSubType(..), TabType(..))
 import Gargantext.Utils ((?))
 import Gargantext.Utils.Reactix as R2

src/Gargantext/Components/Renameable.purs

@@ -170,8 +170,8 @@ editingCpt = here.component "editing" cpt where
         T.write_ false isEditing
         onRename text
 
-      onReset _ = do
-        T.write_ false isEditing
+      -- onReset _ = do
+      --   T.write_ false isEditing
 
     -- | Render
     -- |