Merge branch 'dev' into dev-list-charts

bin/gargantext-adaptative-phylo/Main.hs

@@ -10,13 +10,8 @@ Portability : POSIX
 Adaptative Phylo binaries
  -}
 
-{-# LANGUAGE DataKinds          #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE FlexibleInstances  #-}
-{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE Strict             #-}
 
 module Main where

bin/gargantext-cli/CleanCsvCorpus.hs

@@ -11,7 +11,6 @@ Given a Gargantext CSV File and its Query This script cleans and
 compress the contexts around the main terms of the query.
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module CleanCsvCorpus  where
 

bin/gargantext-cli/Main.hs

@@ -11,11 +11,6 @@ Main specifications to index a corpus with a term list
 
  -}
 
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeOperators     #-}
 {-# LANGUAGE Strict             #-}

bin/gargantext-import/Main.hs

@@ -11,10 +11,6 @@ Import a corpus binary.
 
  -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE Strict            #-}
 
 module Main where
@@ -60,7 +56,6 @@ main = do
     annuaire :: forall m. FlowCmdM DevEnv GargError m => m CorpusId
     annuaire = flowAnnuaire (UserName $ cs user) (Left "Annuaire") (Multi EN) corpusPath
 
-
   {-
   let debatCorpus :: forall m. FlowCmdM DevEnv GargError m => m CorpusId
       debatCorpus = do
@@ -85,7 +80,6 @@ main = do
           then runCmdDev env corpusCsvHal
           else pure 0 --(cs "false")
  
-
     _ <- if fun == "annuaire"
             then runCmdDev env annuaire
             else pure 0

bin/gargantext-init/Main.hs

@@ -11,10 +11,6 @@ Import a corpus binary.
 
  -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE Strict            #-}
 
 module Main where

bin/gargantext-phylo/Main.hs

@@ -11,11 +11,6 @@ Phylo binaries
 
  -}
 
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeOperators      #-}
 {-# LANGUAGE Strict             #-}

bin/gargantext-server/Main.hs

@@ -11,11 +11,6 @@ Script to start gargantext with different modes (Dev, Prod, Mock).
 
 -}
 
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeOperators     #-}
 {-# LANGUAGE Strict             #-}

gargantext.ini_toModify

 [gargantext]
 MASTER_USER = gargantua
 
-[django]
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = PASSWORD_TO_CHANGE
-# Space-separated list of hosts
-ALLOWED_HOSTS = localhost
-# Time-zone, possible values here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-TIME_ZONE = Europe/Paris
+
+[database]
 # PostgreSQL access
 DB_HOST = 127.0.0.1
 DB_PORT = 5432
@@ -18,13 +12,6 @@ DB_NAME = gargandbV5
 DB_USER = gargantua
 DB_PASS = PASSWORD_TO_CHANGE
 # Logs
-LOG_FILE = /var/log/gargantext/backend/django.log
+LOG_FILE = /var/log/gargantext/backend.log
 LOG_LEVEL = DEBUG
 LOG_FORMATTER = verbose
-# Pidfile of django backend test server
-TESTSERVER_PIDFILE = /tmp/gargantext_testserver.pid
-# Celery
-CELERYD_PID_FILE = /tmp/celery.pid
-CELERYD_LOG_FILE = /var/log/gargantext/backend/celery.log
-CELERYD_LOG_LEVEL = DEBUG
-

package.yaml

 name: gargantext
-version: '0.0.1.4.2'
+version: '0.0.1.5.1'
 synopsis: Search, map, share
 description: Please see README.md
 category: Data
@@ -15,6 +15,16 @@ extra-libraries:
 dependencies:
 - extra
 - text
+default-extensions:
+  - DataKinds
+  - DeriveGeneric
+  - FlexibleContexts
+  - FlexibleInstances
+  - GeneralizedNewtypeDeriving
+  - MultiParamTypeClasses
+  - NoImplicitPrelude
+  - OverloadedStrings
+  - RankNTypes
 library:
   source-dirs: src
   ghc-options:

src-test/Main.hs

@@ -8,7 +8,6 @@ Stability   : experimental
 Portability : POSIX
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 import Gargantext.Prelude
 import Gargantext.Core (Lang(..))

src-test/Ngrams/Lang.hs

@@ -12,7 +12,6 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Ngrams.Lang where
 

src-test/Ngrams/Lang/En.hs

@@ -11,9 +11,7 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE NoImplicitPrelude   #-}
 
 module Ngrams.Lang.En where
 

src-test/Ngrams/Lang/Fr.hs

@@ -11,9 +11,7 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE NoImplicitPrelude   #-}
 
 module Ngrams.Lang.Fr where
 

src-test/Ngrams/Lang/Occurrences.hs

@@ -11,8 +11,6 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Ngrams.Lang.Occurrences where

src-test/Ngrams/Metrics.hs

@@ -14,8 +14,6 @@ commentary with @some markup@.
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {-# LANGUAGE CPP                  #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE OverloadedStrings    #-}
 
 module Ngrams.Metrics (main) where
 

src-test/Parsers/Date.hs

@@ -11,7 +11,6 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Parsers.Date where
 

src-test/Parsers/Types.hs

@@ -13,7 +13,6 @@ commentary with @some markup@.
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-{-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE StandaloneDeriving   #-}
 
 module Parsers.Types where

src-test/Parsers/WOS.hs

@@ -11,6 +11,5 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Parsers.WOS where

src/Gargantext.hs

@@ -10,7 +10,6 @@ Portability : POSIX
 @Gargantext@: search, map, share
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Gargantext ( module Gargantext.API
                   , module Gargantext.Core

src/Gargantext/API.hs

@@ -29,16 +29,9 @@ Pouillard (who mainly made it).
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 {-# LANGUAGE ConstraintKinds      #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE TemplateHaskell      #-}
 {-# LANGUAGE TypeOperators        #-}
 {-# LANGUAGE KindSignatures       #-}
-{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TypeFamilies         #-}
 {-# LANGUAGE UndecidableInstances #-}
@@ -88,7 +81,6 @@ import qualified Paths_gargantext           as PG -- cabal magic build module
 data Mode = Dev | Mock | Prod 
        deriving (Show, Read, Generic)
 
-
 -- | startGargantext takes as parameters port number and Ini file.
 startGargantext :: Mode -> PortNumber -> FilePath -> IO ()
 startGargantext mode port file = do
@@ -110,7 +102,6 @@ stopGargantext env = do
   T.putStrLn "----- Stopping gargantext -----"
   runReaderT saveRepo env
 
-
 -- | Output generated @swagger.json@ file for the @'TodoAPI'@.
 swaggerWriteJSON :: IO ()
 swaggerWriteJSON = BL8.writeFile "swagger.json" (encodePretty swaggerDoc)

src/Gargantext/API/Admin/Auth.hs

@@ -20,12 +20,6 @@ TODO-ACCESS Critical
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE DeriveGeneric       #-}
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RankNTypes          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell     #-}
 

src/Gargantext/API/Admin/FrontEnd.hs

@@ -11,8 +11,6 @@ Loads all static file for the front-end.
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE DataKinds            #-}
 {-# LANGUAGE TypeOperators        #-}
 
 ---------------------------------------------------------------------

src/Gargantext/API/Admin/Orchestrator.hs

@@ -9,30 +9,26 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE TypeOperators     #-}
 
 module Gargantext.API.Admin.Orchestrator where
 
-import Gargantext.Prelude
-import Gargantext.API.Admin.Settings
-import Gargantext.API.Admin.Orchestrator.Types
-import Gargantext.API.Admin.Orchestrator.Scrapy.Schedule
 import Control.Lens hiding (elements)
 import Data.Aeson
 import qualified Data.ByteString.Lazy.Char8 as LBS
+import Data.Text
 import Servant
 import Servant.Job.Async
 import Servant.Job.Client
 import Servant.Job.Server
 import Servant.Job.Utils (extendBaseUrl)
 
+import Gargantext.Prelude
+import Gargantext.API.Admin.Settings
+import Gargantext.API.Admin.Orchestrator.Types
+import Gargantext.API.Admin.Orchestrator.Scrapy.Schedule
+
 callJobScrapy :: (ToJSON e, FromJSON e, FromJSON o, MonadClientJob m)
               => JobServerURL e Schedule o
               -> (URL -> Schedule)
@@ -84,7 +80,7 @@ pipeline scrapyurl client_env input log_status = do
 scrapyOrchestrator :: Env -> IO (Server (WithCallbacks ScraperAPI))
 scrapyOrchestrator env = do
   apiWithCallbacksServer (Proxy :: Proxy ScraperAPI)
-    defaultSettings (extendBaseUrl ("scraper" :: String) $ env ^. env_self_url)
+    defaultSettings (extendBaseUrl ("scraper" :: Text) $ env ^. env_self_url)
     (env ^. env_manager) (LogEvent logConsole) $
     simpleServeJobsAPI (env ^. env_scrapers) .
       simpleJobFunction . pipeline (URL $ env ^. env_settings . scrapydUrl)

src/Gargantext/API/Admin/Orchestrator/Scrapy/Schedule.hs

@@ -9,9 +9,6 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeOperators #-}
 
 module Gargantext.API.Admin.Orchestrator.Scrapy.Schedule
@@ -21,6 +18,7 @@ import Control.Lens
 import Data.Aeson
 import Data.Text (Text)
 import GHC.Generics
+import Protolude
 import Servant
 import Servant.Client
 import Servant.Job.Utils (jsonOptions)

src/Gargantext/API/Admin/Orchestrator/Types.hs

 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE TypeOperators     #-}
 

src/Gargantext/API/Admin/Settings.hs

@@ -12,14 +12,6 @@ TODO-SECURITY: Critical
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE DeriveGeneric       #-}
-{-# LANGUAGE FlexibleContexts    #-}
-{-# LANGUAGE FlexibleInstances   #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE RankNTypes          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell     #-}
 
@@ -318,6 +310,7 @@ withDevEnv iniPath k = do
         }
 
 -- | Run Cmd Sugar for the Repl (GHCI)
+
 runCmdRepl :: Show err => Cmd' DevEnv err a -> IO a
 runCmdRepl f = withDevEnv "gargantext.ini" $ \env -> runCmdDev env f
 

src/Gargantext/API/Admin/Utils.hs

@@ -11,8 +11,6 @@ Mainly copied from Servant.Job.Utils (Thanks)
 
 -}
 
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE NoImplicitPrelude  #-}
 
 module Gargantext.API.Admin.Utils
   where

src/Gargantext/API/Count.hs

@@ -12,13 +12,9 @@ Count API part of Gargantext.
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE TemplateHaskell    #-}
 {-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE DeriveAnyClass     #-}
-{-# LANGUAGE OverloadedStrings  #-}
 
 module Gargantext.API.Count
       where

src/Gargantext/API/Metrics.hs

@@ -13,12 +13,6 @@ Metrics API
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-{-# LANGUAGE DataKinds          #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RankNTypes         #-}
 {-# LANGUAGE TemplateHaskell    #-}
 {-# LANGUAGE TypeOperators      #-}
 

src/Gargantext/API/Ngrams.hs

@@ -17,18 +17,9 @@ add get
 -}
 
 {-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE TypeOperators     #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE TypeFamilies      #-}
 {-# OPTIONS -fno-warn-orphans #-}
 

src/Gargantext/API/Ngrams/List.hs

@@ -9,14 +9,6 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE TypeOperators     #-}
 

src/Gargantext/API/Ngrams/NTree.hs

@@ -9,11 +9,6 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE TemplateHaskell   #-}
 
 module Gargantext.API.Ngrams.NTree

src/Gargantext/API/Ngrams/Tools.hs

@@ -9,10 +9,6 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.API.Ngrams.Tools
   where

src/Gargantext/API/Node.hs

@@ -23,13 +23,6 @@ Node API
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-{-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE OverloadedStrings    #-}
-{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TemplateHaskell      #-}
 {-# LANGUAGE TypeOperators        #-}
@@ -53,6 +46,9 @@ import Gargantext.API.Metrics
 import Gargantext.API.Ngrams (TabType(..), TableNgramsApi, apiNgramsTableCorpus, QueryParamR)
 import Gargantext.API.Ngrams.NTree (MyTree)
 import Gargantext.API.Node.New
+import qualified Gargantext.API.Node.Share  as Share
+import qualified Gargantext.API.Node.Update as Update
+
 import Gargantext.API.Search (SearchDocsAPI, searchDocs, SearchPairsAPI, searchPairs)
 import Gargantext.API.Table
 import Gargantext.Core.Types (NodeTableResult)
@@ -60,27 +56,29 @@ import Gargantext.Core.Types.Main (Tree, NodeTree, ListType)
 import Gargantext.Database.Action.Flow.Pairing (pairing)
 import Gargantext.Database.Admin.Types.Metrics (ChartMetrics)
 import Gargantext.Database.Query.Facet (FacetDoc, OrderBy(..))
+import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Children (getChildren)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Query.Table.Node.User
-import Gargantext.Database.Query.Tree (treeDB)
-import Gargantext.Database.Admin.Config (nodeTypeId)
+import Gargantext.Database.Query.Tree (tree, TreeMode(..))
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Prelude -- (Cmd, CmdM)
-import Gargantext.Database.Schema.Node (_node_typename)
 import Gargantext.Database.Query.Table.NodeNode
 import Gargantext.Prelude
 import Gargantext.Viz.Phylo.API (PhyloAPI, phyloAPI)
 import Gargantext.Viz.Types
 import qualified Gargantext.Database.Query.Table.Node.Update as U (update, Update(..))
+import qualified Gargantext.Database.Action.Delete as Action (deleteNode)
 
 {-
 import qualified Gargantext.Text.List.Learn as Learn
 import qualified Data.Vector as Vec
 --}
 
+-- | Admin NodesAPI
+-- TODO
 type NodesAPI  = Delete '[JSON] Int
 
 -- | Delete Nodes
@@ -129,11 +127,12 @@ type NodeAPI a = Get '[JSON] (Node a)
              :<|> "children"  :> ChildrenApi a
 
              -- TODO gather it
-             :<|> "table"     :> TableApi
-             :<|> "ngrams"    :> TableNgramsApi
+             :<|> "table"      :> TableApi
+             :<|> "ngrams"     :> TableNgramsApi
 
-             :<|> "category"  :> CatApi
+             :<|> "category"   :> CatApi
              :<|> "search"     :> SearchDocsAPI
+             :<|> "share"      :> Share.API
 
              -- Pairing utilities
              :<|> "pairwith"   :> PairWith
@@ -148,6 +147,7 @@ type NodeAPI a = Get '[JSON] (Node a)
              :<|> "tree"      :> TreeApi
              :<|> "phylo"     :> PhyloAPI
              -- :<|> "add"       :> NodeAddAPI
+             :<|> "update"     :> Update.API
 
 -- TODO-ACCESS: check userId CanRenameNode nodeId
 -- TODO-EVENTS: NodeRenamed RenameNode or re-use some more general NodeEdited...
@@ -198,16 +198,16 @@ nodeAPI p uId id' = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode
            :<|> postNode  uId id'
            :<|> postNodeAsyncAPI  uId id'
            :<|> putNode       id'
-           :<|> deleteNodeApi id'
+           :<|> Action.deleteNode (RootId $ NodeId uId) id'
            :<|> getChildren   id' p
 
            -- TODO gather it
            :<|> tableApi             id'
            :<|> apiNgramsTableCorpus id'
-
+            
            :<|> catApi      id'
-
            :<|> searchDocs  id'
+           :<|> Share.api   id'
            -- Pairing Tools
            :<|> pairWith    id'
            :<|> pairs       id'
@@ -221,12 +221,7 @@ nodeAPI p uId id' = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode
            :<|> phyloAPI   id' uId
            -- :<|> nodeAddAPI id'
            -- :<|> postUpload id'
-
-    deleteNodeApi id'' = do
-      node' <- getNode id''
-      if _node_typename node' == nodeTypeId NodeUser
-         then panic "not allowed"  -- TODO add proper Right Management Type
-         else deleteNode id''
+           :<|> Update.api  uId id'
 
 scatterApi :: NodeId -> GargServer ScatterAPI
 scatterApi id' =  getScatter id'
@@ -328,11 +323,10 @@ type TreeApi = Summary " Tree API"
              -- :<|> "process"  :> MultipartForm MultipartData :> Post '[JSON] Text
 
 ------------------------------------------------------------------------
-
 type TreeAPI   = QueryParams "type" NodeType :> Get '[JSON] (Tree NodeTree)
 
 treeAPI :: NodeId -> GargServer TreeAPI
-treeAPI = treeDB
+treeAPI = tree Advanced
 
 ------------------------------------------------------------------------
 -- | Check if the name is less than 255 char

src/Gargantext/API/Node/Corpus/Annuaire.hs

@@ -8,14 +8,8 @@ Stability   : experimental
 Portability : POSIX
 -}
 
-{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE RankNTypes         #-}
 
 module Gargantext.API.Node.Corpus.Annuaire
       where
@@ -44,17 +38,17 @@ type Api = Summary "New Annuaire endpoint"
 
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
-data WithForm = WithForm
+data AnnuaireWithForm = AnnuaireWithForm
   { _wf_filetype :: !NewFile.FileType
   , _wf_data     :: !Text
   , _wf_lang     :: !(Maybe Lang)
   } deriving (Eq, Show, Generic)
 
-makeLenses ''WithForm
-instance FromForm WithForm
-instance FromJSON WithForm where
+makeLenses ''AnnuaireWithForm
+instance FromForm AnnuaireWithForm
+instance FromJSON AnnuaireWithForm where
   parseJSON = genericParseJSON $ jsonOptions "_wf_"
-instance ToSchema WithForm where
+instance ToSchema AnnuaireWithForm where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wf_")
 
 ------------------------------------------------------------------------
@@ -68,15 +62,15 @@ type AddWithForm = Summary "Add with FormUrlEncoded to annuaire endpoint"
    :> "add"
    :> "form"
    :> "async"
-   :> AsyncJobs ScraperStatus '[FormUrlEncoded] WithForm ScraperStatus
+   :> AsyncJobs ScraperStatus '[FormUrlEncoded] AnnuaireWithForm ScraperStatus
 
 ------------------------------------------------------------------------
 addToAnnuaireWithForm :: FlowCmdM env err m
                     => AnnuaireId
-                    -> WithForm
+                    -> AnnuaireWithForm
                     -> (ScraperStatus -> m ())
                     -> m ScraperStatus
-addToAnnuaireWithForm _cid (WithForm ft _d _l) logStatus = do
+addToAnnuaireWithForm _cid (AnnuaireWithForm ft _d _l) logStatus = do
 
   printDebug "ft" ft
 

src/Gargantext/API/Node/Corpus/Export.hs

@@ -13,12 +13,6 @@ Main exports of Gargantext:
 - lists
 -}
 
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE TypeOperators     #-}
 

src/Gargantext/API/Node/Corpus/New.hs

@@ -12,14 +12,8 @@ New corpus means either:
 - new data in existing corpus
 -}
 
-{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE RankNTypes         #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Gargantext.API.Node.Corpus.New
@@ -158,18 +152,18 @@ instance ToSchema WithQuery where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wq_")
 
 -------------------------------------------------------
-data WithForm = WithForm
+data NewWithForm = NewWithForm
   { _wf_filetype :: !FileType
   , _wf_data     :: !Text
   , _wf_lang     :: !(Maybe Lang)
   , _wf_name     :: !Text
   } deriving (Eq, Show, Generic)
 
-makeLenses ''WithForm
-instance FromForm WithForm
-instance FromJSON WithForm where
+makeLenses ''NewWithForm
+instance FromForm NewWithForm
+instance FromJSON NewWithForm where
   parseJSON = genericParseJSON $ jsonOptions "_wf_"
-instance ToSchema WithForm where
+instance ToSchema NewWithForm where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_wf_")
 
 ------------------------------------------------------------------------
@@ -201,7 +195,7 @@ type AddWithForm = Summary "Add with FormUrlEncoded to corpus endpoint"
    :> "add"
    :> "form"
    :> "async"
-     :> AsyncJobs ScraperStatus '[FormUrlEncoded] WithForm ScraperStatus
+     :> AsyncJobs ScraperStatus '[FormUrlEncoded] NewWithForm ScraperStatus
 
 
 ------------------------------------------------------------------------
@@ -237,10 +231,10 @@ addToCorpusWithQuery u cid (WithQuery q dbs l _nid) logStatus = do
 addToCorpusWithForm :: FlowCmdM env err m
                     => User
                     -> CorpusId
-                    -> WithForm
+                    -> NewWithForm
                     -> (ScraperStatus -> m ())
                     -> m ScraperStatus
-addToCorpusWithForm user cid (WithForm ft d l _n) logStatus = do
+addToCorpusWithForm user cid (NewWithForm ft d l _n) logStatus = do
 
   let
     parse = case ft of

src/Gargantext/API/Node/Corpus/New/File.hs

@@ -11,13 +11,6 @@ Portability : POSIX
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-{-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE OverloadedStrings    #-}
-{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TemplateHaskell      #-}
 {-# LANGUAGE TypeOperators        #-}

src/Gargantext/API/Node/New.hs

@@ -12,14 +12,8 @@ Async new node feature
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE RankNTypes         #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Gargantext.API.Node.New

src/Gargantext/API/Node/Share.hs

+{-|
+Module      : Gargantext.API.Node.Share
+Description :
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+{-# LANGUAGE TemplateHaskell    #-}
+{-# LANGUAGE TypeOperators      #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Gargantext.API.Node.Share
+      where
+
+import Data.Aeson
+import Data.Swagger
+import Data.Text (Text)
+import GHC.Generics (Generic)
+import Gargantext.Core.Types.Individu (User(..))
+import Gargantext.Database.Action.Share (shareNodeWith)
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Prelude
+import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
+import Gargantext.Prelude
+import Servant
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary
+
+------------------------------------------------------------------------
+data ShareNode = ShareNode { username :: Text }
+  deriving (Generic)
+------------------------------------------------------------------------
+-- TODO unPrefix "pn_" FromJSON, ToJSON, ToSchema, adapt frontend.
+instance FromJSON  ShareNode
+instance ToJSON    ShareNode
+instance ToSchema  ShareNode
+instance Arbitrary ShareNode where
+  arbitrary = elements [ ShareNode "user1"
+                       , ShareNode "user2"
+                       ]
+------------------------------------------------------------------------
+-- TODO permission
+api :: HasNodeError err
+    => NodeId
+    -> ShareNode
+    -> Cmd err Int
+api nId (ShareNode user) =
+  fromIntegral <$> shareNodeWith nId (UserName user)
+
+------------------------------------------------------------------------
+type API = Summary " Share Node with username"
+         :> ReqBody '[JSON] ShareNode
+         :> Post    '[JSON] Int
+

src/Gargantext/API/Node/Update.hs

+{-|
+Module      : Gargantext.API.Node.Update
+Description :
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+{-# LANGUAGE TemplateHaskell    #-}
+{-# LANGUAGE TypeOperators      #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Gargantext.API.Node.Update
+      where
+
+import Data.Aeson
+import Data.Swagger
+import GHC.Generics (Generic)
+import Gargantext.API.Admin.Orchestrator.Types (ScraperStatus(..))
+import Gargantext.API.Node.Corpus.New (AsyncJobs)
+import Gargantext.API.Prelude (GargServer, simuLogs)
+import Gargantext.Database.Action.Flow.Types (FlowCmdM)
+import Gargantext.Database.Admin.Types.Node
+import Gargantext.Prelude (Ord, Eq, (<$>), ($), liftBase, (.))
+import Prelude (Enum, Bounded, minBound, maxBound)
+import Servant
+import Servant.Job.Async (JobFunction(..), serveJobsAPI)
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary
+
+
+
+
+------------------------------------------------------------------------
+data UpdateNodeParams = UpdateNodeParamsList  { methodList  :: Method      }
+                      | UpdateNodeParamsGraph { methodGraph :: GraphMetric }
+                      | UpdateNodeParamsTexts { methodTexts :: Granularity }
+                      | UpdateNodeParamsBoard { methodBoard :: Charts      }
+    deriving (Generic)
+
+----------------------------------------------------------------------
+data Method = Basic | Advanced | WithModel
+    deriving (Generic, Eq, Ord, Enum, Bounded)
+
+----------------------------------------------------------------------
+data GraphMetric = Order1 | Order2
+    deriving (Generic, Eq, Ord, Enum, Bounded)
+
+----------------------------------------------------------------------
+data Granularity = NewNgrams | NewTexts | Both
+    deriving (Generic, Eq, Ord, Enum, Bounded)
+
+----------------------------------------------------------------------
+data Charts = Sources | Authors | Institutes | Ngrams | All
+    deriving (Generic, Eq, Ord, Enum, Bounded)
+
+------------------------------------------------------------------------
+-- TODO unPrefix "pn_" FromJSON, ToJSON, ToSchema, adapt frontend.
+instance FromJSON  UpdateNodeParams
+instance ToJSON    UpdateNodeParams
+instance ToSchema  UpdateNodeParams
+instance Arbitrary UpdateNodeParams where
+  arbitrary = do
+    l <- UpdateNodeParamsList  <$> arbitrary
+    g <- UpdateNodeParamsGraph <$> arbitrary
+    t <- UpdateNodeParamsTexts <$> arbitrary
+    b <- UpdateNodeParamsBoard <$> arbitrary
+    elements [l,g,t,b]
+
+instance FromJSON  Method
+instance ToJSON    Method
+instance ToSchema  Method
+instance Arbitrary Method where
+  arbitrary = elements [ minBound .. maxBound ]
+
+instance FromJSON  GraphMetric
+instance ToJSON    GraphMetric
+instance ToSchema  GraphMetric
+instance Arbitrary GraphMetric where
+  arbitrary = elements [ minBound .. maxBound ]
+
+instance FromJSON  Granularity
+instance ToJSON    Granularity
+instance ToSchema  Granularity
+instance Arbitrary Granularity where
+  arbitrary = elements [ minBound .. maxBound ]
+
+instance FromJSON  Charts
+instance ToJSON    Charts
+instance ToSchema  Charts
+instance Arbitrary Charts where
+  arbitrary = elements [ minBound .. maxBound ]
+
+------------------------------------------------------------------------
+api :: UserId -> NodeId -> GargServer API
+api uId nId =
+  serveJobsAPI $ 
+    JobFunction (\p logs -> updateNode uId nId p (liftBase . logs))
+
+
+updateNode :: FlowCmdM env err m
+    => UserId
+    -> NodeId
+    -> UpdateNodeParams
+    -> (ScraperStatus -> m ())
+    -> m ScraperStatus
+updateNode _uId _nId _ logStatus = do
+  simuLogs logStatus 100
+
+------------------------------------------------------------------------
+type API = Summary " Share Node with username"
+         :> AsyncJobs ScraperStatus '[JSON] UpdateNodeParams ScraperStatus

src/Gargantext/API/Prelude.hs

@@ -10,13 +10,7 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE ConstraintKinds        #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE TypeOperators          #-}
 {-# LANGUAGE UndecidableInstances   #-}
@@ -28,6 +22,7 @@ module Gargantext.API.Prelude
   )
   where
 
+import Control.Concurrent (threadDelay)
 import Control.Exception (Exception)
 import Control.Lens (Prism', (#))
 import Control.Lens.TH (makePrisms)
@@ -42,9 +37,9 @@ import Gargantext.API.Admin.Orchestrator.Types
 import Gargantext.API.Admin.Settings
 import Gargantext.API.Ngrams
 import Gargantext.Core.Types
-import Gargantext.Database.Query.Tree
-import Gargantext.Database.Query.Table.Node.Error (NodeError(..), HasNodeError(..))
 import Gargantext.Database.Prelude
+import Gargantext.Database.Query.Table.Node.Error (NodeError(..), HasNodeError(..))
+import Gargantext.Database.Query.Tree
 import Gargantext.Prelude
 import Servant
 import Servant.Job.Async (HasJobEnv)
@@ -106,7 +101,9 @@ type EnvC env =
   , HasJobEnv env ScraperStatus ScraperStatus
   )
 
-
+-------------------------------------------------------------------
+runCmdReplEasy :: Cmd' DevEnv GargError a -> IO a
+runCmdReplEasy f = withDevEnv "gargantext.ini" $ \env -> runCmdDev env f
 
 -------------------------------------------------------------------
 -- | This Type is needed to prepare the function before the GargServer
@@ -150,3 +147,45 @@ instance HasServerError GargError where
 
 instance HasJoseError GargError where
   _JoseError = _GargJoseError
+
+
+------------------------------------------------------------------------
+-- | Utils
+-- | Simulate logs
+
+simuLogs  :: MonadBase IO m
+         => (ScraperStatus -> m a)
+         -> Int
+         -> m ScraperStatus
+simuLogs logStatus t = do
+  let task = ScraperStatus { _scst_succeeded = Just 0
+                           , _scst_failed    = Just 0
+                           , _scst_remaining = Just 0
+                           , _scst_events    = Just []
+                           }
+  f <- foldM' (\status n -> simuTask logStatus status n t) task $ take t [1..]
+  pure f
+
+
+simuTask :: MonadBase IO m
+         => (ScraperStatus -> m a)
+         -> ScraperStatus
+         -> Int
+         -> Int
+         -> m ScraperStatus
+simuTask logStatus (ScraperStatus s f _r e) n t = do
+  let
+    m = (10 :: Int) ^ (6 :: Int)
+  _ <- liftBase $ threadDelay ( m * 10)
+
+  let status =  ScraperStatus { _scst_succeeded = (+) <$> s <*> Just n
+                              , _scst_failed    = f
+                              , _scst_remaining = (-) <$> Just t <*> s
+                              , _scst_events    = e
+                              }
+  printDebug "status" status
+  _ <- logStatus status
+  pure status
+
+
+

src/Gargantext/API/Routes.hs

@@ -13,16 +13,9 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 {-# LANGUAGE ConstraintKinds      #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE TemplateHaskell      #-}
 {-# LANGUAGE TypeOperators        #-}
 {-# LANGUAGE KindSignatures       #-}
-{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TypeFamilies         #-}
 {-# LANGUAGE UndecidableInstances #-}

src/Gargantext/API/Search.hs

@@ -12,15 +12,9 @@ Count API part of Gargantext.
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE TemplateHaskell    #-}
 {-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE DeriveAnyClass     #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RankNTypes         #-}
 
 module Gargantext.API.Search
       where

src/Gargantext/API/Table.hs

@@ -24,13 +24,6 @@ Node API
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-{-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE OverloadedStrings    #-}
-{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TemplateHaskell      #-}
 {-# LANGUAGE TypeOperators        #-}

src/Gargantext/Core.hs

@@ -9,10 +9,7 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE OverloadedStrings #-}
 
 module Gargantext.Core
   where

src/Gargantext/Core/Auth.hs

@@ -9,8 +9,6 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
 
 module Gargantext.Core.Auth ( createPasswordHash
                             , checkPassword

src/Gargantext/Core/Flow/Ngrams.hs

@@ -10,8 +10,6 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE ConstrainedClassMethods #-}
 
 module Gargantext.Core.Flow.Ngrams where

src/Gargantext/Core/Flow/Types.hs

@@ -10,9 +10,6 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE ConstrainedClassMethods #-}
 
 module Gargantext.Core.Flow.Types where

src/Gargantext/Core/Statistics.hs

@@ -9,7 +9,6 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Gargantext.Core.Statistics
   where

src/Gargantext/Core/Types.hs

@@ -12,8 +12,6 @@ commentary with @some markup@.
 -}
 
 ------------------------------------------------------------------------
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE TemplateHaskell      #-}
 
 module Gargantext.Core.Types ( module Gargantext.Core.Types.Main

src/Gargantext/Core/Types/Individu.hs

@@ -11,10 +11,6 @@ Individu defintions
 -}
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
-{-# LANGUAGE DeriveGeneric               #-}
-{-# LANGUAGE NoImplicitPrelude           #-}
-{-# LANGUAGE FlexibleInstances           #-}
-{-# LANGUAGE OverloadedStrings           #-}
 
 module Gargantext.Core.Types.Individu
   where

src/Gargantext/Core/Types/Main.hs

@@ -11,10 +11,6 @@ Portability : POSIX
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 
 -----------------------------------------------------------------------

src/Gargantext/Core/Types/Phylo.hs

@@ -19,8 +19,6 @@ Phylomemy was first described in Chavalarias, D., Cointet, J.-P., 2013. Phylomem
 .
 -}
 
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE TemplateHaskell   #-}
 
 module Gargantext.Core.Types.Phylo where

src/Gargantext/Core/Utils.hs

@@ -11,7 +11,6 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Gargantext.Core.Utils ( 
                            -- module Gargantext.Utils.Chronos

src/Gargantext/Core/Utils/Count.purs

@@ -14,10 +14,8 @@ Inspired from Gabriel Gonzales, "beautiful folds" talk.
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE RankNTypes                #-}
 
 module Gargantext.Core.Utils.Count (head, last, all, any, sum, product, length)
     where

src/Gargantext/Core/Utils/DateUtils.hs

@@ -8,7 +8,6 @@ Stability   : experimental
 Portability : POSIX
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Gargantext.Core.Utils.DateUtils where
 

src/Gargantext/Core/Utils/Prefix.hs

@@ -11,7 +11,6 @@ Here is a longer description of this module, containing some
 commentary with @some markup@.
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Gargantext.Core.Utils.Prefix where
 

src/Gargantext/Database.hs

@@ -14,7 +14,6 @@ Gargantext's database.
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Gargantext.Database ( module Gargantext.Database.Prelude
                         -- , module Gargantext.Database.Bashql
@@ -23,3 +22,6 @@ module Gargantext.Database ( module Gargantext.Database.Prelude
 
 import Gargantext.Database.Prelude (connectGargandb)
 -- import Gargantext.Database.Bashql
+
+
+

src/Gargantext/Database/Action/Delete.hs

+{-|
+Module      : Gargantext.Database.Action.Delete
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+TODO: right managements of nodes children of node Team
+-- TODO add proper Right Management Type
+
+TODO: NodeError
+
+-}
+
+module Gargantext.Database.Action.Delete
+  where
+
+import Gargantext.Core.Types.Individu (User(..))
+import Gargantext.Database.Action.Flow.Utils (getUserId)
+import Gargantext.Database.Admin.Config (hasNodeType)
+import Gargantext.Database.Admin.Types.Node (NodeId)
+import Gargantext.Database.Admin.Types.Node -- (NodeType(..))
+import Gargantext.Database.Prelude (Cmd)
+import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
+import Gargantext.Database.Schema.Node
+import Gargantext.Prelude
+import qualified Gargantext.Database.Query.Table.Node as N (getNode, deleteNode)
+import Gargantext.Database.Action.Share (delFolderTeam)
+
+deleteNode :: HasNodeError err 
+           => User
+           -> NodeId
+           -> Cmd err Int
+deleteNode u nodeId = do
+  node' <- N.getNode nodeId
+  if hasNodeType node' NodeUser
+     then panic "Not allowed to delete NodeUser (yet)"
+     else if hasNodeType node' NodeTeam
+             then do
+                uId   <- getUserId u
+                if _node_userId node' == uId
+                   then N.deleteNode    nodeId
+                   else delFolderTeam u nodeId
+             else N.deleteNode nodeId
+
+

src/Gargantext/Database/Action/Flow.hs

@@ -18,14 +18,9 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans    #-}
 
 {-# LANGUAGE ConstraintKinds         #-}
-{-# LANGUAGE RankNTypes              #-}
 {-# LANGUAGE ConstrainedClassMethods #-}
 {-# LANGUAGE ConstraintKinds         #-}
-{-# LANGUAGE DeriveGeneric           #-}
-{-# LANGUAGE FlexibleContexts        #-}
 {-# LANGUAGE InstanceSigs            #-}
-{-# LANGUAGE NoImplicitPrelude       #-}
-{-# LANGUAGE OverloadedStrings       #-}
 {-# LANGUAGE TemplateHaskell         #-}
 
 module Gargantext.Database.Action.Flow -- (flowDatabase, ngrams2list)

src/Gargantext/Database/Action/Flow/Annuaire.hs

@@ -10,11 +10,6 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE DeriveGeneric     #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
-{-# LANGUAGE FlexibleContexts  #-}
 
 module Gargantext.Database.Action.Flow.Annuaire
     where

src/Gargantext/Database/Action/Flow/List.hs

@@ -12,14 +12,9 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans    #-}
 
 {-# LANGUAGE ConstraintKinds         #-}
-{-# LANGUAGE RankNTypes              #-}
 {-# LANGUAGE ConstrainedClassMethods #-}
 {-# LANGUAGE ConstraintKinds         #-}
-{-# LANGUAGE DeriveGeneric           #-}
-{-# LANGUAGE FlexibleContexts        #-}
 {-# LANGUAGE InstanceSigs            #-}
-{-# LANGUAGE NoImplicitPrelude       #-}
-{-# LANGUAGE OverloadedStrings       #-}
 
 module Gargantext.Database.Action.Flow.List
     where

src/Gargantext/Database/Action/Flow/Pairing.hs

@@ -9,11 +9,7 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 -- {-# LANGUAGE Arrows #-}
 
 module Gargantext.Database.Action.Flow.Pairing

src/Gargantext/Database/Action/Flow/Types.hs

@@ -12,14 +12,9 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans    #-}
 
 {-# LANGUAGE ConstraintKinds         #-}
-{-# LANGUAGE RankNTypes              #-}
 {-# LANGUAGE ConstrainedClassMethods #-}
 {-# LANGUAGE ConstraintKinds         #-}
-{-# LANGUAGE DeriveGeneric           #-}
-{-# LANGUAGE FlexibleContexts        #-}
 {-# LANGUAGE InstanceSigs            #-}
-{-# LANGUAGE NoImplicitPrelude       #-}
-{-# LANGUAGE OverloadedStrings       #-}
 
 module Gargantext.Database.Action.Flow.Types
     where

src/Gargantext/Database/Action/Flow/Utils.hs

@@ -9,10 +9,6 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Action.Flow.Utils
     where

src/Gargantext/Database/Action/Learn.hs

@@ -9,11 +9,7 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE RankNTypes        #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE MonoLocalBinds    #-}
 
 module Gargantext.Database.Action.Learn

src/Gargantext/Database/Action/Metrics.hs

@@ -11,9 +11,6 @@ Node API
 -}
 
 
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleContexts  #-}
 
 module Gargantext.Database.Action.Metrics
   where

src/Gargantext/Database/Action/Metrics/Lists.hs

@@ -12,15 +12,8 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans        #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE DeriveGeneric          #-}
 {-# LANGUAGE ConstraintKinds        #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Action.Metrics.Lists

src/Gargantext/Database/Action/Metrics/NgramsByNode.hs

@@ -11,11 +11,7 @@ Ngrams by node enable contextual metrics.
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Action.Metrics.NgramsByNode
   where

src/Gargantext/Database/Action/Node.hs

@@ -12,15 +12,8 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans        #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE DeriveGeneric          #-}
 {-# LANGUAGE ConstraintKinds        #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE TypeFamilies           #-}
 

src/Gargantext/Database/Action/Search.hs

@@ -9,10 +9,6 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE Arrows            #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Action.Search where
 

src/Gargantext/Database/Action/Share.hs

+{-|
+Module      : Gargantext.Database.Action.Share
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+module Gargantext.Database.Action.Share
+  where
+
+import Control.Lens (view)
+import Gargantext.Core.Types.Individu (User(..))
+import Gargantext.Database.Action.Flow.Utils (getUserId)
+import Gargantext.Database.Admin.Config (hasNodeType)
+import Gargantext.Database.Admin.Types.Node (NodeId)
+import Gargantext.Database.Admin.Types.Node -- (NodeType(..))
+import Gargantext.Database.Prelude (Cmd)
+import Gargantext.Database.Query.Table.Node (getNode, getNodesWith)
+import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
+import Gargantext.Database.Query.Table.NodeNode (insertNodeNode, deleteNodeNode)
+import Gargantext.Database.Query.Tree.Root (getRootId)
+import Gargantext.Database.Schema.Node
+import Gargantext.Database.Schema.NodeNode (NodeNodePoly(..))
+import Gargantext.Prelude
+
+------------------------------------------------------------------------
+shareNodeWith :: HasNodeError err
+              => NodeId
+              -> User
+              -> Cmd err Int64
+shareNodeWith n u = do
+  nodeToCheck <- getNode   n
+  userIdCheck <- getUserId u
+  if not (hasNodeType nodeToCheck NodeTeam)
+    then panic "Can share node Team only"
+    else if (view node_userId nodeToCheck == userIdCheck)
+     then panic "Can share to others only"
+     else do 
+       folderSharedId  <- getFolderSharedId u
+       insertNodeNode [NodeNode folderSharedId n Nothing Nothing]
+------------------------------------------------------------------------
+
+getFolderSharedId :: User -> Cmd err NodeId
+getFolderSharedId u = do
+  rootId <- getRootId u
+  s <- getNodesWith rootId HyperdataAny (Just NodeFolderShared) Nothing Nothing
+  case head s of
+    Nothing -> panic "No folder shared found"
+    Just  f -> pure (_node_id f)
+
+type TeamId = NodeId
+
+delFolderTeam :: User -> TeamId -> Cmd err Int
+delFolderTeam u nId = do
+  folderSharedId <- getFolderSharedId u
+  deleteNodeNode folderSharedId nId
+
+

src/Gargantext/Database/Admin/Access.hs

@@ -10,7 +10,6 @@ Portability : POSIX
 TODO-SECURITY review purpose of this module
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
 
 
 module Gargantext.Database.Admin.Access where

src/Gargantext/Database/Admin/Bashql.hs

@@ -60,9 +60,6 @@ TODO-ACCESS: should the checks be done here or before.
 
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Admin.Bashql () {-( get
                                   , ls

src/Gargantext/Database/Admin/Config.hs

@@ -13,17 +13,17 @@ Gargantext's database.
 TODO: configure nodes table in Haskell (Config typenames etc.)
 -}
 
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 
 module Gargantext.Database.Admin.Config
     where
 
+import Control.Lens     (view)
 import Data.List        (lookup)
 import Data.Maybe       (fromMaybe)
 import Data.Text        (Text,pack)
 import Data.Tuple.Extra (swap)
 import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Schema.Node
 import Gargantext.Prelude
 
 -- TODO put this in config.ini file
@@ -82,6 +82,9 @@ nodeTypeId n =
 --  NodeFavorites    -> 15
 
 
+hasNodeType :: forall a. Node a -> NodeType -> Bool
+hasNodeType n nt = (view node_typename n) == (nodeTypeId nt)
+
 --
 -- | Nodes are typed in the database according to a specific ID
 --

src/Gargantext/Database/Admin/Trigger/Init.hs

@@ -11,11 +11,7 @@ Ngrams by node enable contextual metrics.
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Admin.Trigger.Init
   where

src/Gargantext/Database/Admin/Trigger/NodeNodeNgrams.hs

@@ -11,11 +11,7 @@ Triggers on NodeNodeNgrams table.
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Admin.Trigger.NodeNodeNgrams
   where

src/Gargantext/Database/Admin/Trigger/Nodes.hs

@@ -11,11 +11,7 @@ Triggers on Nodes table.
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Admin.Trigger.Nodes
   where

src/Gargantext/Database/Admin/Trigger/NodesNodes.hs

@@ -11,11 +11,7 @@ Triggers on NodesNodes table.
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Admin.Trigger.NodesNodes
   where

src/Gargantext/Database/Admin/Types/Node.hs

@@ -12,12 +12,6 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {-# LANGUAGE BangPatterns               #-}
-{-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE FlexibleInstances          #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE OverloadedStrings          #-}
 {-# LANGUAGE TemplateHaskell            #-}
 
 -- {-# LANGUAGE DuplicateRecordFields #-}

src/Gargantext/Database/Prelude.hs

@@ -10,12 +10,6 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE ConstraintKinds   #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE RankNTypes                 #-}
 
 module Gargantext.Database.Prelude where
 
@@ -127,7 +121,7 @@ databaseParameters fp = do
         Left e     -> panic (pack $ "No ini file error" <> show e)
         Right ini' -> ini'
 
-  let val x = case (lookupValue (pack "django") (pack x) ini'') of
+  let val x = case (lookupValue (pack "database") (pack x) ini'') of
         Left _ -> panic (pack $ "no" <> x)
         Right p' -> unpack p'
 

src/Gargantext/Database/Query/Facet.hs

@@ -12,16 +12,9 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 {-# LANGUAGE Arrows                    #-}
-{-# LANGUAGE DeriveGeneric             #-}
-{-# LANGUAGE FlexibleContexts          #-}
-{-# LANGUAGE FlexibleInstances         #-}
 {-# LANGUAGE FunctionalDependencies    #-}
-{-# LANGUAGE MultiParamTypeClasses     #-}
 {-# LANGUAGE QuasiQuotes               #-}
-{-# LANGUAGE NoImplicitPrelude         #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
-{-# LANGUAGE OverloadedStrings         #-}
-{-# LANGUAGE RankNTypes                #-}
 {-# LANGUAGE TemplateHaskell           #-}
 {-# LANGUAGE TypeFamilies              #-}
 ------------------------------------------------------------------------

src/Gargantext/Database/Query/Filter.hs

@@ -11,11 +11,7 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE DeriveGeneric          #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
 {-# LANGUAGE TemplateHaskell        #-}
 {-# OPTIONS_GHC -fno-warn-orphans   #-}
 

src/Gargantext/Database/Query/Join.hs

@@ -15,15 +15,9 @@ Multiple Join functions with Opaleye.
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 {-# LANGUAGE Arrows                    #-}
-{-# LANGUAGE DeriveGeneric             #-}
-{-# LANGUAGE FlexibleContexts          #-}
-{-# LANGUAGE FlexibleInstances         #-}
 {-# LANGUAGE FunctionalDependencies    #-}
-{-# LANGUAGE MultiParamTypeClasses     #-}
 {-# LANGUAGE QuasiQuotes               #-}
-{-# LANGUAGE NoImplicitPrelude         #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
-{-# LANGUAGE OverloadedStrings         #-}
 {-# LANGUAGE TemplateHaskell           #-}
 
 ------------------------------------------------------------------------

src/Gargantext/Database/Query/Table/Ngrams.hs

@@ -10,11 +10,7 @@ Portability : POSIX
 -}
 
 {-# LANGUAGE Arrows            #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE RankNTypes        #-}
 {-# LANGUAGE TemplateHaskell   #-}
 
 module Gargantext.Database.Query.Table.Ngrams

src/Gargantext/Database/Query/Table/Node.hs

@@ -13,15 +13,8 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans        #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE DeriveGeneric          #-}
 {-# LANGUAGE ConstraintKinds        #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE TypeFamilies           #-}
 
@@ -161,6 +154,7 @@ getNodeWith nId _ = do
     Nothing -> nodeError (DoesNotExist nId)
     Just  r -> pure r
 
+
 ------------------------------------------------------------------------
 nodeContactW :: Maybe Name -> Maybe HyperdataContact
              -> AnnuaireId -> UserId -> NodeWrite

src/Gargantext/Database/Query/Table/Node/Children.hs

@@ -12,9 +12,6 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans        #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FlexibleInstances      #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE RankNTypes             #-}
 
 module Gargantext.Database.Query.Table.Node.Children
   where
@@ -22,6 +19,7 @@ module Gargantext.Database.Query.Table.Node.Children
 import Control.Arrow (returnA)
 import Data.Proxy
 import Opaleye
+import Protolude
 
 import Gargantext.Core.Types
 import Gargantext.Database.Admin.Config (nodeTypeId)

src/Gargantext/Database/Query/Table/Node/Contact.hs

@@ -9,12 +9,7 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE DeriveGeneric          #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE FlexibleInstances      #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.Node.Contact

src/Gargantext/Database/Query/Table/Node/Document/Add.hs

@@ -12,14 +12,7 @@ Add Documents/Contact to a Corpus/Annuaire.
 -}
 ------------------------------------------------------------------------
 {-# LANGUAGE DeriveDataTypeable   #-}
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE QuasiQuotes          #-}
-{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 
 ------------------------------------------------------------------------

src/Gargantext/Database/Query/Table/Node/Document/Insert.hs

@@ -48,13 +48,7 @@ the concatenation of the parameters defined by @shaParameters@.
 
 -}
 ------------------------------------------------------------------------
-{-# LANGUAGE DeriveGeneric        #-}
-{-# LANGUAGE FlexibleContexts     #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
-{-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE QuasiQuotes          #-}
-{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 ------------------------------------------------------------------------
 module Gargantext.Database.Query.Table.Node.Document.Insert

src/Gargantext/Database/Query/Table/Node/Error.hs

@@ -12,15 +12,8 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans        #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE DeriveGeneric          #-}
 {-# LANGUAGE ConstraintKinds        #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE TypeFamilies           #-}
 

src/Gargantext/Database/Query/Table/Node/Select.hs

@@ -10,14 +10,14 @@ Portability : POSIX
 
 
 {-# LANGUAGE Arrows            #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Query.Table.Node.Select
   where
 
 import Control.Arrow (returnA)
+import Opaleye
+import Protolude
+
 import Gargantext.Core.Types
 import Gargantext.Core.Types.Individu (Username)
 import Gargantext.Database.Admin.Config
@@ -25,19 +25,18 @@ import Gargantext.Database.Prelude
 import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.User
 import Gargantext.Database.Query.Table.User
-import Opaleye
 
 selectNodesWithUsername :: NodeType -> Username -> Cmd err [NodeId]
 selectNodesWithUsername nt u = runOpaQuery (q u)
   where
     q u' = proc () -> do
-      (n,usrs) <- join -< ()
+      (n,usrs) <- join' -< ()
       restrict -< user_username usrs .== (toNullable $ pgStrictText u')
       restrict -< _node_typename n .== (pgInt4 $ nodeTypeId nt)
       returnA  -< _node_id n
 
-    join :: Query (NodeRead, UserReadNull)
-    join = leftJoin queryNodeTable queryUserTable on1
+    join' :: Query (NodeRead, UserReadNull)
+    join' = leftJoin queryNodeTable queryUserTable on1
       where
         on1 (n,us) = _node_userId n .== user_id us
 

src/Gargantext/Database/Query/Table/Node/Update.hs

@@ -9,11 +9,7 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Query.Table.Node.Update (Update(..), update)
   where

src/Gargantext/Database/Query/Table/Node/UpdateOpaleye.hs

@@ -9,11 +9,7 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes       #-}
-{-# LANGUAGE RankNTypes        #-}
 
 
 module Gargantext.Database.Query.Table.Node.UpdateOpaleye

src/Gargantext/Database/Query/Table/Node/User.hs

@@ -9,14 +9,7 @@ Portability : POSIX
 
 -}
 
-{-# LANGUAGE DeriveGeneric          #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.Node.User

src/Gargantext/Database/Query/Table/NodeNgrams.hs

@@ -14,14 +14,8 @@ NodeNgrams register Context of Ngrams (named Cgrams then)
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE QuasiQuotes            #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.NodeNgrams 

src/Gargantext/Database/Query/Table/NodeNode.hs

@@ -14,14 +14,8 @@ commentary with @some markup@.
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE QuasiQuotes            #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE OverloadedStrings      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.NodeNode
@@ -33,6 +27,7 @@ module Gargantext.Database.Query.Table.NodeNode
   , nodeNodesCategory
   , getNodeNode
   , insertNodeNode
+  , deleteNodeNode
   )
   where
 
@@ -74,9 +69,10 @@ getNodeNode n = runOpaQuery (selectNodeNode $ pgNodeId n)
       restrict -< _nn_node1_id ns .== n'
       returnA -< ns
 
--------------------------
+------------------------------------------------------------------------
 insertNodeNode :: [NodeNode] -> Cmd err Int64
-insertNodeNode ns = mkCmd $ \conn -> runInsert_ conn $ Insert nodeNodeTable ns' rCount Nothing
+insertNodeNode ns = mkCmd $ \conn -> runInsert_ conn
+                          $ Insert nodeNodeTable ns' rCount Nothing
   where
     ns' :: [NodeNodeWrite]
     ns' = map (\(NodeNode n1 n2 x y)
@@ -86,7 +82,17 @@ insertNodeNode ns = mkCmd $ \conn -> runInsert_ conn $ Insert nodeNodeTable ns'
                             (pgInt4   <$> y)
               ) ns
 
+------------------------------------------------------------------------
+type Node1_Id = NodeId
+type Node2_Id = NodeId
+
+deleteNodeNode :: Node1_Id -> Node2_Id -> Cmd err Int
+deleteNodeNode n1 n2 = mkCmd $ \conn ->
+  fromIntegral <$> runDelete conn nodeNodeTable
+                 (\(NodeNode n1_id n2_id _ _) -> n1_id .== pgNodeId n1
+                                             .&& n2_id .== pgNodeId n2 )
 
+------------------------------------------------------------------------
 -- | Favorite management
 _nodeNodeCategory :: CorpusId -> DocId -> Int -> Cmd err [Int]
 _nodeNodeCategory cId dId c = map (\(PGS.Only a) -> a) <$> runPGSQuery favQuery (c,cId,dId)

src/Gargantext/Database/Query/Table/NodeNodeNgrams.hs

@@ -12,12 +12,7 @@ Portability : POSIX
 {-#  OPTIONS_GHC -fno-warn-orphans  #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.NodeNodeNgrams

src/Gargantext/Database/Query/Table/NodeNodeNgrams2.hs

@@ -12,12 +12,7 @@ Portability : POSIX
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {-# LANGUAGE Arrows                 #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE NoImplicitPrelude      #-}
-{-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
 module Gargantext.Database.Query.Table.NodeNodeNgrams2