[FIX] Merge

src/Gargantext/Components/Annotation/Types.purs

+module Gargantext.Components.Annotation.Types
+  ( MenuType(..)
+  , termClass
+  )
+  where
+
+import Gargantext.Prelude
+
+import Data.Eq.Generic (genericEq)
+import Data.Generic.Rep (class Generic)
+import Gargantext.Types (TermList(..))
+
+data MenuType = NewNgram | SetTermListItem
+derive instance Generic MenuType _
+instance Eq MenuType where
+  eq = genericEq
+
+termClass :: TermList -> String
+termClass CandidateTerm = "candidate-term"
+termClass MapTerm       = "graph-term"
+termClass StopTerm      = "stop-term"

src/Gargantext/Components/Annotation/Utils.purs

-module Gargantext.Components.Annotation.Utils where
-
-import Gargantext.Types ( TermList(..) )
-
-termClass :: TermList -> String
-termClass CandidateTerm = "candidate-term"
-termClass MapTerm = "graph-term"
-termClass StopTerm = "stop-term"
-
-termBootstrapClass :: TermList -> String
--- termBootstrapClass CandidateTerm = "warning"
-termBootstrapClass MapTerm = "success"
-termBootstrapClass StopTerm = "danger"
-termBootstrapClass CandidateTerm = "primary"

src/Gargantext/Components/Bootstrap/Abstract/Cloak.purs

@@ -170,9 +170,9 @@ component = R.hooksComponent cname cpt where
 
       R.fragment
       [
-        R2.if' canCloakBeDisplayed    props.cloakSlot
+        R2.when canCloakBeDisplayed    props.cloakSlot
       ,
-        R2.if' canContentBeDisplayed  props.defaultSlot
+        R2.when canContentBeDisplayed  props.defaultSlot
       ]
 
 

src/Gargantext/Components/Bootstrap/Block/Spinner.purs

@@ -36,14 +36,15 @@ component :: R.Component Props
 component = R.hooksComponent componentName cpt where
   cpt props _ = do
     -- Computed
-    className <- pure $ intercalate " "
-      -- provided custom className
-      [ props.className
-      -- BEM classNames
-      , componentName
-      -- Bootstrap specific classNames
-      , bootstrapName <> "-" <> show props.theme
-      ]
+    let
+      className = intercalate " "
+        -- provided custom className
+        [ props.className
+        -- BEM classNames
+        , componentName
+        -- Bootstrap specific classNames
+        , bootstrapName <> "-" <> show props.theme
+        ]
     -- Render
     pure $
 

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

@@ -434,7 +434,7 @@ fileTypeViewCpt = here.component "fileTypeView" cpt
 
       pure $
 
-        R2.fromMaybe_ droppedFile' \df ->
+        R2.fromMaybe droppedFile' \df ->
 
           H.div
           tooltipProps

src/sass/_modules.sass

 @import './modules/_form'
 @import './modules/_layout'
+@import './modules/_annotation'