From 8c76b7bc19e651a1db8d0a8507dbd9ad50709f87 Mon Sep 17 00:00:00 2001
From: Przemek Kaminski <pk@intrepidus.pl>
Date: Thu, 28 Nov 2019 10:09:47 +0100
Subject: [PATCH] Fix more warning errors
---
.../Components/Forest/Tree/Node.purs | 7 +--
.../Components/GraphExplorer/Types.purs | 1 -
src/Gargantext/Components/Loader.purs | 2 +-
src/Gargantext/Components/Login/Types.purs | 6 +-
src/Gargantext/Components/Nodes/Annuaire.purs | 2 +-
.../Nodes/Annuaire/User/Contacts/Types.purs | 56 +++++++++----------
.../Components/Nodes/Corpus/Chart/Histo.purs | 1 -
.../Nodes/Corpus/Chart/Metrics.purs | 1 -
.../Components/Nodes/Corpus/Chart/Pie.purs | 1 -
.../Components/Nodes/Corpus/Chart/Tree.purs | 1 -
src/Gargantext/Components/Search/Types.purs | 10 +---
src/Gargantext/Components/Tab.purs | 2 +-
src/Gargantext/Components/Table.purs | 2 -
src/Gargantext/Data/Array.purs | 1 -
src/Gargantext/Hooks/Loader.purs | 6 +-
src/Gargantext/Hooks/Sigmax/Sigma.purs | 40 ++++++-------
src/Gargantext/Utils/Reactix.purs | 2 +-
17 files changed, 61 insertions(+), 80 deletions(-)
diff --git a/src/Gargantext/Components/Forest/Tree/Node.purs b/src/Gargantext/Components/Forest/Tree/Node.purs
index 404ec3b5..4be0e29b 100644
--- a/src/Gargantext/Components/Forest/Tree/Node.purs
+++ b/src/Gargantext/Components/Forest/Tree/Node.purs
@@ -1,13 +1,8 @@
module Gargantext.Components.Forest.Tree.Node where
-import Prelude
+import Prelude (class Eq, class Show, show, (&&), (<>), (==))
import Data.Array (foldl)
import Gargantext.Types
-import Effect.Uncurried (mkEffectFn1)
--- import Data.Set
-import Data.Array (filter)
-import Reactix.DOM.HTML as H
-import Effect.Aff (Aff, launchAff, runAff)
------------------------------------------------------------------------
------------------------------------------------------------------------
diff --git a/src/Gargantext/Components/GraphExplorer/Types.purs b/src/Gargantext/Components/GraphExplorer/Types.purs
index 6dfd5ff5..dcea2756 100644
--- a/src/Gargantext/Components/GraphExplorer/Types.purs
+++ b/src/Gargantext/Components/GraphExplorer/Types.purs
@@ -6,7 +6,6 @@ import Data.Array ((!!), length)
import Data.Maybe (Maybe(..), fromJust)
import Data.Newtype (class Newtype)
import Partial.Unsafe (unsafePartial)
-import Reactix as R
newtype Node = Node
{ id_ :: String
diff --git a/src/Gargantext/Components/Loader.purs b/src/Gargantext/Components/Loader.purs
index b829e1d6..195c49b4 100644
--- a/src/Gargantext/Components/Loader.purs
+++ b/src/Gargantext/Components/Loader.purs
@@ -1,7 +1,7 @@
module Gargantext.Components.Loader where
import Prelude
-import Data.Maybe (Maybe(..), isNothing, maybe, maybe')
+import Data.Maybe (Maybe(..), maybe')
import Data.Tuple.Nested ((/\))
import Effect.Aff (Aff)
import Effect.Class (liftEffect)
diff --git a/src/Gargantext/Components/Login/Types.purs b/src/Gargantext/Components/Login/Types.purs
index a3342434..5885571d 100644
--- a/src/Gargantext/Components/Login/Types.purs
+++ b/src/Gargantext/Components/Login/Types.purs
@@ -2,7 +2,7 @@ module Gargantext.Components.Login.Types where
import Prelude
import Data.Argonaut ( class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject
- , (.:), (.??), (:=), (~>)
+ , (.:), (.:!), (:=), (~>)
)
import Data.Generic.Rep (class Generic)
import Data.Generic.Rep.Eq (genericEq)
@@ -52,8 +52,8 @@ instance decodeAuthInvalid :: DecodeJson AuthInvalid where
instance decodeAuthResponse :: DecodeJson AuthResponse where
decodeJson json = do
obj <- decodeJson json
- valid <- obj .?? "valid"
- inval <- obj .?? "inval"
+ valid <- obj .:! "valid"
+ inval <- obj .:! "inval"
pure $ AuthResponse {valid, inval}
instance decodeAuthData :: DecodeJson AuthData where
diff --git a/src/Gargantext/Components/Nodes/Annuaire.purs b/src/Gargantext/Components/Nodes/Annuaire.purs
index 29eece24..74d6c6c4 100644
--- a/src/Gargantext/Components/Nodes/Annuaire.purs
+++ b/src/Gargantext/Components/Nodes/Annuaire.purs
@@ -15,7 +15,7 @@ import Gargantext.Ends (url, Frontends)
import Gargantext.Routes (SessionRoute(..))
import Gargantext.Routes as Routes
import Gargantext.Sessions (Session, sessionId, get)
-import Gargantext.Types (NodePath(..), NodeType(..))
+import Gargantext.Types (NodeType(..))
import Gargantext.Hooks.Loader (useLoader)
newtype IndividuView =
diff --git a/src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Types.purs b/src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Types.purs
index 4405d3cb..0a70d5a0 100644
--- a/src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Types.purs
+++ b/src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Types.purs
@@ -2,7 +2,7 @@ module Gargantext.Components.Nodes.Annuaire.User.Contacts.Types where
import Prelude
-import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.??))
+import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.:!))
import Data.Maybe (Maybe, fromMaybe)
import Data.Map (Map)
import Gargantext.Utils.DecodeMaybe ((.?|))
@@ -36,11 +36,11 @@ instance decodeContactWho :: DecodeJson ContactWho
where
decodeJson json = do
obj <- decodeJson json
- idWho <- obj .?? "id"
- firstName <- obj .?? "firstName"
- lastName <- obj .?? "lastName"
- keywords <- obj .?? "keywords"
- freetags <- obj .?? "freetags"
+ idWho <- obj .:! "id"
+ firstName <- obj .:! "firstName"
+ lastName <- obj .:! "lastName"
+ keywords <- obj .:! "keywords"
+ freetags <- obj .:! "freetags"
let k = fromMaybe [] keywords
let f = fromMaybe [] freetags
@@ -69,15 +69,15 @@ instance decodeContactWhere :: DecodeJson ContactWhere
where
decodeJson json = do
obj <- decodeJson json
- organization <- obj .?? "organization"
- labTeamDepts <- obj .?? "labTeamDepts"
- role <- obj .?? "role"
- office <- obj .?? "office"
- country <- obj .?? "country"
- city <- obj .?? "city"
- touch <- obj .?? "touch"
- entry <- obj .?? "entry"
- exit <- obj .?? "exit"
+ organization <- obj .:! "organization"
+ labTeamDepts <- obj .:! "labTeamDepts"
+ role <- obj .:! "role"
+ office <- obj .:! "office"
+ country <- obj .:! "country"
+ city <- obj .:! "city"
+ touch <- obj .:! "touch"
+ entry <- obj .:! "entry"
+ exit <- obj .:! "exit"
let o = fromMaybe [] organization
let l = fromMaybe [] labTeamDepts
@@ -96,9 +96,9 @@ instance decodeContactTouch :: DecodeJson ContactTouch
where
decodeJson json = do
obj <- decodeJson json
- mail <- obj .?? "mail"
- phone <- obj .?? "phone"
- url <- obj .?? "url"
+ mail <- obj .:! "mail"
+ phone <- obj .:! "phone"
+ url <- obj .:! "url"
pure $ ContactTouch {mail, phone, url}
@@ -118,14 +118,14 @@ instance decodeHyperdataContact :: DecodeJson HyperdataContact
where
decodeJson json = do
obj <- decodeJson json
- bdd <- obj .?? "bdd"
- who <- obj .?? "who"
- ou <- obj .?? "where"
- title <- obj .?? "title"
- source <- obj .?? "source"
- lastValidation <- obj .?? "lastValidation"
- uniqId <- obj .?? "uniqId"
- uniqIdBdd <- obj .?? "uniqIdBdd"
+ bdd <- obj .:! "bdd"
+ who <- obj .:! "who"
+ ou <- obj .:! "where"
+ title <- obj .:! "title"
+ source <- obj .:! "source"
+ lastValidation <- obj .:! "lastValidation"
+ uniqId <- obj .:! "uniqId"
+ uniqIdBdd <- obj .:! "uniqIdBdd"
let ou' = fromMaybe [] ou
@@ -152,9 +152,9 @@ instance decodeUser :: DecodeJson Contact where
obj <- decodeJson json
id <- obj .: "id"
typename <- obj .?| "typename"
- userId <- obj .?? "userId"
+ userId <- obj .:! "userId"
parentId <- obj .?| "parentId"
- name <- obj .?? "name"
+ name <- obj .:! "name"
date <- obj .?| "date"
hyperdata <- obj .: "hyperdata"
pure $ Contact { id, typename, userId
diff --git a/src/Gargantext/Components/Nodes/Corpus/Chart/Histo.purs b/src/Gargantext/Components/Nodes/Corpus/Chart/Histo.purs
index 7a52537f..20b7c170 100644
--- a/src/Gargantext/Components/Nodes/Corpus/Chart/Histo.purs
+++ b/src/Gargantext/Components/Nodes/Corpus/Chart/Histo.purs
@@ -11,7 +11,6 @@ import Gargantext.Components.Charts.Options.Series (seriesBarD1)
import Gargantext.Components.Charts.Options.Color (grey)
import Gargantext.Components.Charts.Options.Font (itemStyle, mkTooltip, templateFormatter)
import Gargantext.Components.Charts.Options.Data (dataSerie)
-import Gargantext.Ends (url)
import Gargantext.Hooks.Loader (useLoader)
import Gargantext.Components.Nodes.Corpus.Chart.Utils as U
import Gargantext.Routes (SessionRoute(..))
diff --git a/src/Gargantext/Components/Nodes/Corpus/Chart/Metrics.purs b/src/Gargantext/Components/Nodes/Corpus/Chart/Metrics.purs
index 0c57c4c7..e13e5d40 100644
--- a/src/Gargantext/Components/Nodes/Corpus/Chart/Metrics.purs
+++ b/src/Gargantext/Components/Nodes/Corpus/Chart/Metrics.purs
@@ -15,7 +15,6 @@ import Gargantext.Components.Charts.Options.Series (Series, seriesScatterD2)
import Gargantext.Components.Charts.Options.Color (green, grey, red)
import Gargantext.Components.Charts.Options.Font (itemStyle, mkTooltip, templateFormatter)
import Gargantext.Components.Charts.Options.Data (dataSerie)
-import Gargantext.Ends (url)
import Gargantext.Hooks.Loader (useLoader)
import Gargantext.Components.Nodes.Corpus.Chart.Utils as U
import Gargantext.Routes (SessionRoute(..))
diff --git a/src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs b/src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
index 64276c9c..bc930dd4 100644
--- a/src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
+++ b/src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
@@ -15,7 +15,6 @@ import Gargantext.Components.Charts.Options.Series (seriesBarD1, seriesPieD1)
import Gargantext.Components.Charts.Options.Color (blue)
import Gargantext.Components.Charts.Options.Font (itemStyle, mkTooltip, templateFormatter)
import Gargantext.Components.Charts.Options.Data (dataSerie)
-import Gargantext.Ends (url)
import Gargantext.Hooks.Loader (useLoader)
import Gargantext.Components.Nodes.Corpus.Chart.Utils as U
import Gargantext.Routes (SessionRoute(..))
diff --git a/src/Gargantext/Components/Nodes/Corpus/Chart/Tree.purs b/src/Gargantext/Components/Nodes/Corpus/Chart/Tree.purs
index 612db3d3..aee8e8c0 100644
--- a/src/Gargantext/Components/Nodes/Corpus/Chart/Tree.purs
+++ b/src/Gargantext/Components/Nodes/Corpus/Chart/Tree.purs
@@ -10,7 +10,6 @@ import Reactix.DOM.HTML as H
import Gargantext.Components.Charts.Options.ECharts (Options(..), chart, xAxis', yAxis')
import Gargantext.Components.Charts.Options.Series (TreeNode, Trees(..), mkTree)
import Gargantext.Components.Charts.Options.Font (mkTooltip, templateFormatter)
-import Gargantext.Ends (url)
import Gargantext.Hooks.Loader (useLoader)
import Gargantext.Components.Nodes.Corpus.Chart.Utils as U
import Gargantext.Routes (SessionRoute(..))
diff --git a/src/Gargantext/Components/Search/Types.purs b/src/Gargantext/Components/Search/Types.purs
index 2fcd26a5..76f6cb83 100644
--- a/src/Gargantext/Components/Search/Types.purs
+++ b/src/Gargantext/Components/Search/Types.purs
@@ -1,23 +1,19 @@
module Gargantext.Components.Search.Types where
-import Prelude (class Eq, class Show, show, ($), (<>), map, (&&), (==))
+import Prelude (class Eq, class Show, show, ($), (<>), map)
import Data.Set (Set)
import Data.Ord
import Data.Set as Set
import Data.Array (concat)
import Data.Argonaut (class EncodeJson, class DecodeJson, jsonEmptyObject, (:=), (~>), encodeJson)
-import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Eq (genericEq)
-import Data.Generic.Rep.Show (genericShow)
import Data.Maybe (Maybe(..), fromMaybe, maybe)
import Data.Newtype (class Newtype)
import Data.Tuple (Tuple)
import Data.Tuple.Nested ((/\))
import Effect.Aff (Aff)
import Gargantext.Ends (class ToUrl, backendUrl)
-import Gargantext.Routes (SessionRoute(..))
-import Gargantext.Sessions (Session(..), post, put)
-import Gargantext.Types (class ToQuery, toQuery, NodeType(..))
+import Gargantext.Sessions (Session(..), post)
+import Gargantext.Types (class ToQuery, toQuery)
import Gargantext.Utils (id)
import URI.Extra.QueryPairs as QP
import URI.Query as Q
diff --git a/src/Gargantext/Components/Tab.purs b/src/Gargantext/Components/Tab.purs
index 8a80ae69..32c6dea3 100644
--- a/src/Gargantext/Components/Tab.purs
+++ b/src/Gargantext/Components/Tab.purs
@@ -30,7 +30,7 @@ tabsCpt = R.hooksComponent "G.C.Tab.tabs" cpt
eq = index == selected
className = "nav-item nav-link" <> (if eq then " active" else "")
click e = setActiveTab (const index)
- item selected index (_ /\ cpt) = tab { selected, index } [ cpt ]
+ item selected index (_ /\ cpt') = tab { selected, index } [ cpt' ]
-- TODO: document what these are (selection, item indices)
type TabProps = ( selected :: Int, index :: Int )
diff --git a/src/Gargantext/Components/Table.purs b/src/Gargantext/Components/Table.purs
index f9a71fcb..d2c22e19 100644
--- a/src/Gargantext/Components/Table.purs
+++ b/src/Gargantext/Components/Table.purs
@@ -7,8 +7,6 @@ import Data.Generic.Rep.Show (genericShow)
import Data.Maybe (Maybe(..))
import Data.Tuple (fst, snd)
import Data.Tuple.Nested ((/\))
-import DOM.Simple.Console (log2)
-import Effect (Effect)
import Reactix as R
import Reactix.DOM.HTML as H
import Gargantext.Utils.Reactix as R2
diff --git a/src/Gargantext/Data/Array.purs b/src/Gargantext/Data/Array.purs
index 1a6a0a17..8723efed 100644
--- a/src/Gargantext/Data/Array.purs
+++ b/src/Gargantext/Data/Array.purs
@@ -4,7 +4,6 @@ module Gargantext.Data.Array
import Data.Tuple (Tuple(..))
import Data.Array as DA
-import Data.Maybe as DM
import Data.Sequence as DS
diff --git a/src/Gargantext/Hooks/Loader.purs b/src/Gargantext/Hooks/Loader.purs
index 158f5d2d..7ab3815e 100644
--- a/src/Gargantext/Hooks/Loader.purs
+++ b/src/Gargantext/Hooks/Loader.purs
@@ -1,13 +1,11 @@
module Gargantext.Hooks.Loader where
import Gargantext.Prelude
-import Data.Maybe (Maybe(..), isJust, isNothing, maybe, maybe')
-import Data.Tuple (fst, Tuple(..))
+import Data.Maybe (Maybe(..), isJust, maybe)
+import Data.Tuple (fst)
import Data.Tuple.Nested ((/\))
-import DOM.Simple.Console (log, log2)
import Effect.Aff (Aff)
import Effect.Class (liftEffect)
-import FFI.Simple (delay)
import Reactix as R
import Gargantext.Utils.Reactix as R2
import Gargantext.Components.LoadingSpinner (loadingSpinner)
diff --git a/src/Gargantext/Hooks/Sigmax/Sigma.purs b/src/Gargantext/Hooks/Sigmax/Sigma.purs
index d80b7336..274cad6a 100644
--- a/src/Gargantext/Hooks/Sigmax/Sigma.purs
+++ b/src/Gargantext/Hooks/Sigmax/Sigma.purs
@@ -3,9 +3,9 @@ module Gargantext.Hooks.Sigmax.Sigma where
import Prelude
import Data.Either (Either(..))
import Data.Nullable (notNull, null, Nullable)
-import DOM.Simple.Console (log, log2)
+import DOM.Simple.Console (log2)
import DOM.Simple.Types (Element)
-import FFI.Simple (delay, (..))
+import FFI.Simple ((..))
import Effect (Effect, foreachE)
import Effect.Timer (setTimeout)
import Effect.Uncurried (EffectFn1, mkEffectFn1, runEffectFn1, EffectFn2, runEffectFn2, EffectFn3, runEffectFn3, EffectFn4, runEffectFn4)
@@ -82,19 +82,19 @@ foreign import _killRenderer
(Either err Unit)
getRendererContainer :: Sigma -> Effect Element
-getRendererContainer sigma = runEffectFn1 _getRendererContainer sigma
+getRendererContainer = runEffectFn1 _getRendererContainer
foreign import _getRendererContainer
:: EffectFn1 Sigma Element
swapRendererContainer :: R.Ref (Nullable Element) -> Sigma -> Effect Unit
-swapRendererContainer ref sigma = do
- el <- getRendererContainer sigma
+swapRendererContainer ref s = do
+ el <- getRendererContainer s
log2 "[swapRendererContainer] el" el
R.setRef ref $ notNull el
setRendererContainer :: Sigma -> Element -> Effect Unit
-setRendererContainer sigma el = runEffectFn2 _setRendererContainer sigma el
+setRendererContainer = runEffectFn2 _setRendererContainer
foreign import _setRendererContainer
:: EffectFn2 Sigma Element Unit
@@ -119,10 +119,10 @@ bind_ s e h = runEffectFn3 _bind s e (mkEffectFn1 h)
foreign import _bind :: forall e. EffectFn3 Sigma String (EffectFn1 e Unit) Unit
-unbind_ :: forall e. Sigma -> String -> Effect Unit
+unbind_ :: Sigma -> String -> Effect Unit
unbind_ s e = runEffectFn2 _unbind s e
-foreign import _unbind :: forall e. EffectFn2 Sigma String Unit
+foreign import _unbind :: EffectFn2 Sigma String Unit
forEachNode :: Sigma -> (Record Types.Node -> Effect Unit) -> Effect Unit
forEachNode s f = runEffectFn2 _forEachNode s (mkEffectFn1 f)
@@ -135,17 +135,17 @@ forEachEdge s f = runEffectFn2 _forEachEdge s (mkEffectFn1 f)
foreign import _forEachEdge :: EffectFn2 Sigma (EffectFn1 (Record Types.Edge) Unit) Unit
bindClickNode :: Sigma -> (Record Types.Node -> Effect Unit) -> Effect Unit
-bindClickNode sigma f = bind_ sigma "clickNode" $ \e -> do
+bindClickNode s f = bind_ s "clickNode" $ \e -> do
let node = e .. "data" .. "node" :: Record Types.Node
f node
unbindClickNode :: Sigma -> Effect Unit
-unbindClickNode sigma = unbind_ sigma "clickNode"
+unbindClickNode s = unbind_ s "clickNode"
setSettings :: forall settings. Sigma -> settings -> Effect Unit
-setSettings sigma settings = do
- runEffectFn2 _setSettings sigma settings
- refresh sigma
+setSettings s settings = do
+ runEffectFn2 _setSettings s settings
+ refresh s
foreign import _setSettings :: forall settings. EffectFn2 Sigma settings Unit
@@ -153,7 +153,7 @@ startForceAtlas2 :: forall settings. Sigma -> settings -> Effect Unit
startForceAtlas2 = runEffectFn2 _startForceAtlas2
restartForceAtlas2 :: Sigma -> Effect Unit
-restartForceAtlas2 sigma = runEffectFn2 _startForceAtlas2 sigma null
+restartForceAtlas2 s = runEffectFn2 _startForceAtlas2 s null
stopForceAtlas2 :: Sigma -> Effect Unit
stopForceAtlas2 = runEffectFn1 _stopForceAtlas2
@@ -170,15 +170,15 @@ foreign import _killForceAtlas2 :: EffectFn1 Sigma Unit
foreign import _isForceAtlas2Running :: EffectFn1 Sigma Boolean
refreshForceAtlas :: Sigma -> Effect Unit
-refreshForceAtlas sigma = do
- isRunning <- isForceAtlas2Running sigma
+refreshForceAtlas s = do
+ isRunning <- isForceAtlas2Running s
if isRunning then
pure unit
else do
_ <- setTimeout 100 $ do
- restartForceAtlas2 sigma
+ restartForceAtlas2 s
_ <- setTimeout 100 $
- stopForceAtlas2 sigma
+ stopForceAtlas2 s
pure unit
pure unit
@@ -224,6 +224,6 @@ goTo props cam = do
foreign import _goTo :: EffectFn2 CameraInstance (Record CameraProps) Unit
goToAllCameras :: Sigma -> Record CameraProps -> Effect Unit
-goToAllCameras sigma props = do
- cs <- cameras sigma
+goToAllCameras s props = do
+ cs <- cameras s
foreachE cs (goTo props)
diff --git a/src/Gargantext/Utils/Reactix.purs b/src/Gargantext/Utils/Reactix.purs
index 5277e28b..0655fe84 100644
--- a/src/Gargantext/Utils/Reactix.purs
+++ b/src/Gargantext/Utils/Reactix.purs
@@ -3,7 +3,7 @@ module Gargantext.Utils.Reactix where
import Prelude
import DOM.Simple as DOM
-import DOM.Simple.Console (log, log2)
+import DOM.Simple.Console (log2)
import DOM.Simple.Document (document)
import DOM.Simple.Element as Element
import DOM.Simple.Event as DE
--
2.21.0