Revert "[DOC] NodeFrameCalc -> Calc only"

This reverts commit 73ac77d8.

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

@@ -66,7 +66,7 @@ actionUploadCpt = here.component "actionUpload" cpt where
   cpt { nodeType: NodeList, dispatch, id, session } _ =
     pure $ uploadTermListView { dispatch, id, nodeType: GT.NodeList, session } []
 
-  cpt props@{ nodeType: Calc } _ = pure $ uploadFrameCalcView props []
+  cpt props@{ nodeType: NodeFrameCalc } _ = pure $ uploadFrameCalcView props []
 
   cpt props@{ nodeType: Annuaire, dispatch, id, session } _ =
     pure $ uploadListView { dispatch, id, nodeType: GT.Annuaire, session }

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

@@ -113,7 +113,7 @@ settingsBox FolderPrivate =
               , doc  : Documentation FolderPrivate
               , buttons : [ Add [ Notes
                                 , Corpus
-                                , Calc
+                                , NodeFrameCalc
                                 , Folder
                                 , Annuaire
                                 -- , NodeFrameNotebook
@@ -127,8 +127,9 @@ settingsBox Team =
               , doc  : Documentation Team
               , buttons : [ Add [ Notes
                                 , Corpus
-                                , Calc
+                                , NodeFrameCalc
                                 , Folder
+                                , Annuaire
                                 , Team
                                 , Annuaire
                                 -- , NodeFrameNotebook
@@ -163,9 +164,10 @@ settingsBox Folder =
               , doc  : Documentation Folder
               , buttons : [ Add [ Notes
                                 , Corpus
-                                , Calc
                                 , Folder
                                 , Annuaire
+                                , Notes
+                                , NodeFrameCalc
                                 -- , NodeFrameNotebook
                                 ]
                           , Move moveParameters
@@ -183,6 +185,7 @@ settingsBox Corpus =
                                 , NodeList
                                 , Graph
                                 , Dashboard
+                                , NodeFrameCalc
                                 , Phylo
                                 -- , NodeFrameNotebook
                                 ]
@@ -318,7 +321,7 @@ settingsBox Notes =
               , edit : true
               , doc  : Documentation Notes
               , buttons : [ Add [ Notes
-                                , Calc
+                                , NodeFrameCalc
                                 , Folder
                                 , Corpus
                                 ]
@@ -328,12 +331,12 @@ settingsBox Notes =
               }
 
 
-settingsBox Calc =
+settingsBox NodeFrameCalc =
   SettingsBox { show : true
               , edit : true
-              , doc  : Documentation Calc
+              , doc  : Documentation NodeFrameCalc
               , buttons : [ Upload
-                          , Add [ Calc
+                          , Add [ NodeFrameCalc
                                 , Notes
                                 ]
                           , Move moveFrameParameters
@@ -345,7 +348,7 @@ settingsBox NodeFrameNotebook =
   SettingsBox { show : true
               , edit : true
               , doc  : Documentation NodeFrameNotebook
-              , buttons : [ Add [ Calc
+              , buttons : [ Add [ NodeFrameCalc
                                 , Notes
                                 -- , NodeFrameNotebook
                                 ]
@@ -361,7 +364,7 @@ settingsBox NodeFrameVisio =
               , doc  : Documentation NodeFrameVisio
               , buttons : [ Add [ NodeFrameVisio
                                 , Notes
-                                , Calc
+                                , NodeFrameCalc
                                 ]
                           , Delete
                           ]
@@ -414,7 +417,7 @@ moveFrameParameters = { subTreeParams : SubTreeParams
                                               , Folder
                                               , Corpus
                                               , Notes
-                                              , Calc
+                                              , NodeFrameCalc
                                               ]
                                  , valitypes: [ FolderPrivate
                                               , Team
@@ -422,7 +425,7 @@ moveFrameParameters = { subTreeParams : SubTreeParams
                                               , Folder
                                               , Corpus
                                               , Notes
-                                              , Calc
+                                              , NodeFrameCalc
                                               ]
                                  }
                   }

src/Gargantext/Components/Frame/Layout.purs

@@ -146,6 +146,6 @@ nodeFrameVisioCpt = here.component "nodeFrameVisio" cpt where
 
 hframeUrl :: NodeType -> Base -> FrameId -> String
 hframeUrl NodeFrameNotebook base frame_id = base <> "/" <> frame_id  -- Temp fix : frame_id is currently the whole url created
-hframeUrl Calc  base frame_id    = base <> "/" <> frame_id
+hframeUrl NodeFrameCalc  base frame_id    = base <> "/" <> frame_id
 hframeUrl NodeFrameVisio base frame_id    = base <> "/" <> frame_id
 hframeUrl _ base frame_id                 = base <> "/" <> frame_id <> "?view" -- "?both"

src/Gargantext/Components/Router.purs

@@ -326,7 +326,7 @@ renderRouteCpt = R.memo' $ here.component "renderRoute" cpt where
         GR.PhyloExplorer s g      -> phyloExplorer (sessionNodeProps s g) []
         GR.RouteFile s n          -> routeFile (sessionNodeProps s n) []
         GR.RouteFrameWrite s n    -> routeFrame (Record.merge { nodeType: Notes    } $ sessionNodeProps s n) []
-        GR.RouteFrameCalc  s n    -> routeFrame (Record.merge { nodeType: Calc     } $ sessionNodeProps s n) []
+        GR.RouteFrameCalc  s n    -> routeFrame (Record.merge { nodeType: NodeFrameCalc     } $ sessionNodeProps s n) []
         GR.RouteFrameCode  s n    -> routeFrame (Record.merge { nodeType: NodeFrameNotebook } $ sessionNodeProps s n) []
         GR.RouteFrameVisio s n    -> routeFrame (Record.merge { nodeType: NodeFrameVisio    } $ sessionNodeProps s n) []
         GR.Team s n               -> team (sessionNodeProps s n) []

src/Gargantext/Routes.purs

@@ -112,7 +112,7 @@ nodeTypeAppRoute GT.NodeUser s i       = Just $ UserPage s i
 nodeTypeAppRoute GT.Team s i           = Just $ Team s i
 nodeTypeAppRoute GT.NodeTexts s i      = Just $ NodeTexts s i
 nodeTypeAppRoute GT.Notes s i = Just $ RouteFrameWrite s i
-nodeTypeAppRoute GT.Calc  s i = Just $ RouteFrameCalc  s i
+nodeTypeAppRoute GT.NodeFrameCalc  s i = Just $ RouteFrameCalc  s i
 nodeTypeAppRoute GT.NodeFrameVisio s i = Just $ RouteFrameVisio s i
 nodeTypeAppRoute _ _ _                 = Nothing
 

src/Gargantext/Types.purs

@@ -155,7 +155,7 @@ data NodeType = Annuaire
               | Url_Document
               -- TODO Optional Nodes
               | NodeFile
-              | Calc
+              | NodeFrameCalc
               | NodeFrameNotebook
               | Notes
               | NodeFrameVisio
@@ -198,7 +198,7 @@ instance Show NodeType where
   show NodeList          = "NodeList"
   show NodeTexts         = "NodeTexts"
   show Notes             = "Notes"
-  show Calc     = "Calc"
+  show NodeFrameCalc     = "NodeFrameCalc"
   show NodeFrameNotebook = "NodeFrameNotebook"
   show NodeFrameVisio    = "NodeFrameVisio"
   show (NodePublic nt)   = "NodePublic" <> show nt
@@ -228,7 +228,7 @@ instance Read NodeType where
   read "NodeTexts"         = Just NodeTexts
   read "Annuaire"          = Just Annuaire
   read "Notes"    = Just Notes
-  read "Calc"     = Just Calc
+  read "NodeFrameCalc"     = Just NodeFrameCalc
   read "NodeFrameNotebook" = Just NodeFrameNotebook
   read "NodeFrameVisio"    = Just NodeFrameVisio
   read "NodeFile"          = Just NodeFile
@@ -267,7 +267,7 @@ translateFR = case _ of
   Url_Document        -> "Document URL"
   --
   NodeFile            -> "Fichier"
-  Calc       -> "Feuilles de calcul"
+  NodeFrameCalc       -> "Feuilles de calcul"
   NodeFrameNotebook   -> "Carnet de notes"
   Notes      -> "Éditeur de texte"
   NodeFrameVisio      -> "Visio"
@@ -298,7 +298,7 @@ translateEN = case _ of
   Url_Document        -> "URL document"
   --
   NodeFile            -> "File"
-  Calc       -> "Calc"
+  NodeFrameCalc       -> "Calc"
   NodeFrameNotebook   -> "Notebook"
   Notes               -> "Notes"
   NodeFrameVisio      -> "Visio"
@@ -346,8 +346,8 @@ getIcon NodeContact false = "address-card"
 getIcon Notes true  = "file-text-o"
 getIcon Notes false = "file-text"
 
-getIcon Calc true  = "calculator"
-getIcon Calc false = "calculator"
+getIcon NodeFrameCalc true  = "calculator"
+getIcon NodeFrameCalc false = "calculator"
 
 getIcon NodeFrameNotebook true  = "file-code-o"
 getIcon NodeFrameNotebook false = "code"
@@ -410,7 +410,7 @@ nodeTypePath NodeList          = "lists"
 nodeTypePath NodeTexts         = "texts"
 nodeTypePath Team              = "team"
 nodeTypePath Notes    = "write"
-nodeTypePath Calc     = "calc"
+nodeTypePath NodeFrameCalc     = "calc"
 nodeTypePath NodeFrameNotebook = "code"
 nodeTypePath NodeFrameVisio    = "visio"
 nodeTypePath (NodePublic nt)   = nodeTypePath nt