Merge branch 'dev' into 395-dev-ps-0.15-update

CODE_OF_CONDUCT.md

-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [sos AT gargantext DOT org]. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+# GarganText "Code of Conduct"
+
+The GarganText Project, the contributors of the GarganText eco-system,
+have adopted a code of conduct for participants to any modes of
+communication within the project.
+
+## Be respectful
+
+In a project the size of GarganText, inevitably there will be people
+with whom you may disagree, or find it difficult to cooperate. Accept
+that, but even so, remain respectful. Disagreement is no excuse for poor
+behaviour or personal attacks, and a community in which people feel
+threatened is not a healthy community.
+
+## Assume good faith
+
+GarganText Contributors have many ways of reaching our common goal of
+a free digital ecosystem which may differ from your ways. Assume that
+other people are working towards this goal.
+
+Note that many of our Contributors are not native English speakers
+or may have different cultural backgrounds.
+
+## Be collaborative
+
+GarganText is a large and complex project; there is always more to
+learn within GarganText. It's good to ask for help when you need it.
+Similarly, offers for help should be seen in the context of our shared
+goal of improving GarganText.
+
+When you make something for the benefit of the project, be willing
+to explain to others how it works, so that they can build on your work
+to make it even better.
+
+## Try to be concise
+
+Keep in mind that what you write once will be read by many others
+persons. Writing a short email means people can understand the
+conversation as efficiently as possible. When a long explanation is
+necessary, consider adding a summary.
+
+Try to bring new arguments to a conversation so that each comment
+adds something unique to the thread, keeping in mind that the rest of
+the thread still contains the other messages with arguments that have
+already been made.
+
+Try to stay on topic, especially in discussions that are already
+fairly large.
+
+## Be open
+
+Most ways of communication used within GarganText allow for public and
+private communication. You should preferably use public methods of
+communication for GarganText-related messages, unless posting something
+sensitive.
+
+This applies to messages for help or GarganText-related support,
+too; not only is a public support request much more likely to
+result in an answer to your question, it also makes sure that any
+inadvertent mistakes made by people answering your question will be
+more easily detected and corrected.
+
+While this code of conduct should be adhered to by participants,
+we recognize that sometimes people may have a bad day, or be unaware
+of some of the guidelines in this code of conduct. When that happens,
+you may reply to them and point out this code of conduct. Such messages
+may be in public or in private, whatever is most appropriate. However,
+regardless of whether the message is public or not, it should still
+adhere to the relevant parts of this code of conduct; in particular, it
+should not be abusive or disrespectful. Assume good faith; it is more
+likely that participants are unaware of their bad behaviour than that
+they intentionally try to degrade the quality of the discussion.
+
+Serious or persistent offenders will be temporarily or permanently
+banned from communicating through GarganText's ecosystem. Complaints
+should be made (in private) to the administrators of the GarganText
+communication forum in question. To find contact information for these
+administrators, please see the page on GarganText's organizational
+structure.

dist/index.html

@@ -12,6 +12,8 @@
     <body>
         <div id="app"></div>
         <div id="portal"></div>
+        <script src="js/jquery@3.5.1/jquery.slim.min.js"></script>
+        <script src="js/bootstrap@4.6.2/bootstrap.bundle.min.js"></script>
         <script src="bundle.js"></script>
     </body>
 </html>

nix/easy-ps.nix

 { pkgs ? import ./pinned.nix { } }:
 
-import
-  (
-    pkgs.fetchFromGitHub {
-      owner = "justinwoo";
-      repo = "easy-purescript-nix";
-      rev = "0ad5775c1e80cdd952527db2da969982e39ff592";
-      sha256 = "bwbpXSTD8Hf7tlCXfZuLfo2QivvX1ZDJ1PijXXRTo3Q=";
-    }
-  ) {
+import /home/przemek/git-work/github/easy-purescript-nix
+  # (
+    # pkgs.fetchFromGitHub {
+    #   owner = "justinwoo";
+    #   repo = "easy-purescript-nix";
+    #   rev = "5dca2f0f3b9ec0bceabb23fa1fd2b5f8ec30fa53";
+    #   sha256 = "1vsc08ik9rs7vhnv8bg6bqf6gyqvywjfr5502rw1wpird74whhcs";
+    # }
+  # ) {
+  {
   inherit pkgs;
 }

package.json

 {
     "name": "Gargantext",
-    "version": "0.0.5.8.9",
+    "version": "0.0.5.9.6",
     "scripts": {
         "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
         "generate-psc-packages-nix": "./nix/generate-packages-json.bash",

shell.nix

@@ -108,7 +108,7 @@ let
 in
 pkgs.mkShell {
   buildInputs = [
-    easy-ps.purs-0_15_0
+    easy-ps.purs-0_15_4
     easy-ps.psc-package
     easy-ps.dhall-json-simple
     easy-ps.zephyr

src/Gargantext/Components/Annotation/Menu.purs

--- | A ContextMenU that allows you to add terms to a list
-module Gargantext.Components.Annotation.Menu where
+module Gargantext.Components.Annotation.Menu
+  ( annotationMenu
+  , AnnotationMenu
+  ) where
 
+import Gargantext.Prelude
 
-import Data.Array as A
-import Data.Generic.Rep (class Generic)
-import Data.Eq.Generic (genericEq)
 import Data.Maybe (Maybe(..))
+import Data.String (toLower)
 import Effect (Effect)
-import Reactix as R
-import Reactix.DOM.HTML as HTML
-import Toestand as T
-
-import Gargantext.Prelude
-
+import Gargantext.Components.Annotation.Types (MenuType(..), termClass)
+import Gargantext.Components.Bootstrap as B
+import Gargantext.Components.Bootstrap.Types (ComponentStatus(..))
 import Gargantext.Types (TermList(..), termListName)
-import Gargantext.Components.Annotation.Utils (termBootstrapClass)
-
-import Gargantext.Components.ContextMenu.ContextMenu as CM
 import Gargantext.Utils.Reactix as R2
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Annotation.Menu"
 
-data MenuType = NewNgram | SetTermListItem
-derive instance Generic MenuType _
-instance Eq MenuType where
-  eq = genericEq
-
 type Props =
-  ( list     :: Maybe TermList
-  , menuType :: MenuType
-  , setList  :: TermList -> Effect Unit -- not a state hook setter
+  ( menuRef :: R.Ref (Maybe (Record AnnotationMenu))
   )
 
-type AnnotationMenu = (
-    onClose    :: Effect Unit
-  , redrawMenu :: T.Box Boolean
-  , x          :: Number
-  , y          :: Number
-  | Props
+type AnnotationMenu =
+  ( closeCallback :: Unit -> Effect Unit
+  , redrawMenu    :: T.Box Boolean
+  , x             :: Number
+  , y             :: Number
+  , list          :: Maybe TermList
+  , menuType      :: MenuType
+  , setList       :: TermList -> Effect Unit -- not a state hook setter
   )
 
-type AnnotationMenuWrapper =
-  (
-    menuRef :: R.Ref (Maybe (Record AnnotationMenu))
-  )
+annotationMenu :: R2.Leaf Props
+annotationMenu = R2.leaf annotationMenuCpt
 
-eqAnnotationMenu :: Record AnnotationMenu -> Record AnnotationMenu -> Boolean
-eqAnnotationMenu new old = new.list == old.list &&
-                           new.menuType == old.menuType &&
-                           new.x == old.x &&
-                           new.y == old.y
-
-eqAnnotationMenuWrapper :: { new :: Maybe (Record AnnotationMenu)
-                           , old :: Maybe (Record AnnotationMenu) } -> Effect Boolean
-eqAnnotationMenuWrapper { new: Nothing, old: Nothing } = pure $ true
-eqAnnotationMenuWrapper { new: Nothing, old: Just _ } = pure $ false
-eqAnnotationMenuWrapper { new: Just _, old: Nothing } = pure $ false
-eqAnnotationMenuWrapper { new: Just n, old: Just o } = pure $ eqAnnotationMenu n o
-
-annotationMenuWrapper :: R2.Leaf AnnotationMenuWrapper
-annotationMenuWrapper = R2.leafComponent annotationMenuWrapperCpt
-annotationMenuWrapperCpt :: R.Component AnnotationMenuWrapper
-annotationMenuWrapperCpt = here.component "annotationMenuWrapper" cpt where
+annotationMenuCpt :: R.Component Props
+annotationMenuCpt = here.component "main" cpt where
   cpt { menuRef } _ = do
-    case R.readRef menuRef of
-      Nothing -> pure $ HTML.div {} []
-      Just menu -> pure $ annotationMenu menu
-
--- | An Annotation Menu is parameterised by a Maybe Termlist of the
--- | TermList the currently selected text belongs to
-annotationMenu :: R2.Leaf AnnotationMenu
-annotationMenu = R2.leafComponent annotationMenuCpt
-annotationMenuCpt :: R.Component AnnotationMenu
-annotationMenuCpt = here.component "annotationMenu" cpt where
-  cpt { x, y, list, menuType, onClose, redrawMenu, setList } _ = do
-    redrawMenu' <- T.useLive T.unequal redrawMenu
-
-    pure $ CM.contextMenu {x, y, onClose} [
-        annotationMenuInner { list, menuType, setList }
-      ]
-
-annotationMenuInner :: R2.Leaf Props
-annotationMenuInner = R2.leafComponent annotationMenuInnerCpt
-annotationMenuInnerCpt :: R.Component Props
-annotationMenuInnerCpt = here.component "annotationMenuInner" cpt where
-  cpt props _ = pure $ R.fragment $ A.mapMaybe (addToList props) [ MapTerm, CandidateTerm, StopTerm ]
-
--- | Given the TermList to render the item for zand the Maybe TermList the item may belong to, possibly render the menuItem
-addToList :: Record Props -> TermList -> Maybe R.Element
-addToList {list: Just t'} t
-  | t == t'   = Nothing
-addToList {menuType, setList} t = Just $ CM.contextMenuItem {} [ link ]
-  where
-    link = HTML.a { on: { click }, className: className } [ HTML.text (label menuType) ]
-    label NewNgram = "Add to " <> termListName t
-    label SetTermListItem = "Change to " <> termListName t
-    className = "list-group-item list-group-item-" <> (termBootstrapClass t)
-    click _ = setList t
+    -- Render
+    pure $
+
+      R2.fromMaybe (R.readRef menuRef) \props' ->
+
+        B.contextMenu
+        { x: props'.x
+        , y: props'.y
+        , closeCallback: props'.closeCallback
+        } $
+        (addToList props') <$> [ MapTerm, CandidateTerm, StopTerm ]
+
+--------------------------------------------------------------------------
+
+-- addToList :: Record AnnotationMenu -> TermList -> Maybe R.Element
+-- addToList {list: Just t'} t
+--   | t == t'   = Nothing
+
+-- addToList {menuType, setList} t = Just $
+--   B.contextMenuItem
+--   { callback: click }
+--   [
+--     B.icon
+--     { name: "circle"
+--     , className: "mr-2 " <> termClass t
+--     }
+--   ,
+--     H.text (label menuType)
+--   ]
+
+--   where
+--     label NewNgram        = "Add to "    <> (toLower $ termListName t)
+--     label SetTermListItem = "Change to " <> (toLower $ termListName t)
+--     click _ = setList t
+
+addToList :: Record AnnotationMenu -> TermList -> R.Element
+addToList {list: Just t', menuType} t
+  | t == t' =
+    B.contextMenuItem
+    { callback: const R.nothing
+    , status: Disabled
+    }
+    [
+      B.icon
+      { name: "circle"
+      , className: "mr-2 disabled-term"
+      }
+    ,
+      H.text (label t menuType)
+    ]
+
+addToList {menuType, setList} t =
+    B.contextMenuItem
+    { callback: const $ setList t }
+    [
+      B.icon
+      { name: "circle"
+      , className: "mr-2 " <> termClass t
+      }
+    ,
+      H.text (label t menuType)
+    ]
+
+label :: TermList -> MenuType -> String
+label t NewNgram        = "Add to "    <> (toLower $ termListName t)
+label t SetTermListItem = "Change to " <> (toLower $ termListName t)

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/Forest/Tree/Node/Action/Search/SearchBar.purs

@@ -33,7 +33,7 @@ searchBarCpt = here.component "searchBar" cpt
   where
     cpt { errors, langs, onSearch, search, session } _ = do
       --onSearchChange session s
-      pure $ H.div { className: "search-bar" }
+      pure $ H.div { className: "search-bar m-1" }
         [ searchField { databases: allDatabases
                       , errors
                       , langs