Skip to content

P
purescript-gargantext
Commit 95f4a9c1 authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

Revert "Revert "[DOC] NodeFrameCalc -> Calc only"" 

This reverts commit da3485fd.
parent a656825c
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 26 deletions
src/Gargantext/Components/Forest/Tree/Node/Action/Upload.purs
View file @ 95f4a9c1
......@@ -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: NodeFrameCalc } _ = pure $ uploadFrameCalcView props []
cpt props@{ nodeType: Calc } _ = 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
View file @ 95f4a9c1
......@@ -113,7 +113,7 @@ settingsBox FolderPrivate =
, doc : Documentation FolderPrivate
, buttons : [ Add [ Notes
, Corpus
, NodeFrameCalc
, Calc
, Folder
, Annuaire
-- , NodeFrameNotebook
......@@ -127,9 +127,8 @@ settingsBox Team =
, doc : Documentation Team
, buttons : [ Add [ Notes
, Corpus
, NodeFrameCalc
, Calc
, Folder
, Annuaire
, Team
, Annuaire
-- , NodeFrameNotebook
......@@ -164,10 +163,9 @@ settingsBox Folder =
, doc : Documentation Folder
, buttons : [ Add [ Notes
, Corpus
, Calc
, Folder
, Annuaire
, Notes
, NodeFrameCalc
-- , NodeFrameNotebook
]
, Move moveParameters
......@@ -185,7 +183,6 @@ settingsBox Corpus =
, NodeList
, Graph
, Dashboard
, NodeFrameCalc
, Phylo
-- , NodeFrameNotebook
]
......@@ -321,7 +318,7 @@ settingsBox Notes =
, edit : true
, doc : Documentation Notes
, buttons : [ Add [ Notes
, NodeFrameCalc
, Calc
, Folder
, Corpus
]
......@@ -331,12 +328,12 @@ settingsBox Notes =
}
settingsBox NodeFrameCalc =
settingsBox Calc =
SettingsBox { show : true
, edit : true
, doc : Documentation NodeFrameCalc
, doc : Documentation Calc
, buttons : [ Upload
, Add [ NodeFrameCalc
, Add [ Calc
, Notes
]
, Move moveFrameParameters
......@@ -348,7 +345,7 @@ settingsBox NodeFrameNotebook =
SettingsBox { show : true
, edit : true
, doc : Documentation NodeFrameNotebook
, buttons : [ Add [ NodeFrameCalc
, buttons : [ Add [ Calc
, Notes
-- , NodeFrameNotebook
]
......@@ -364,7 +361,7 @@ settingsBox NodeFrameVisio =
, doc : Documentation NodeFrameVisio
, buttons : [ Add [ NodeFrameVisio
, Notes
, NodeFrameCalc
, Calc
]
, Delete
]
......@@ -417,7 +414,7 @@ moveFrameParameters = { subTreeParams : SubTreeParams
, Folder
, Corpus
, Notes
, NodeFrameCalc
, Calc
]
, valitypes: [ FolderPrivate
, Team
......@@ -425,7 +422,7 @@ moveFrameParameters = { subTreeParams : SubTreeParams
, Folder
, Corpus
, Notes
, NodeFrameCalc
, Calc
]
}
}
......
src/Gargantext/Components/Frame/Layout.purs
View file @ 95f4a9c1
......@@ -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 NodeFrameCalc base frame_id = base <> "/" <> frame_id
hframeUrl Calc 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
View file @ 95f4a9c1
......@@ -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: NodeFrameCalc } $ sessionNodeProps s n) []
GR.RouteFrameCalc s n -> routeFrame (Record.merge { nodeType: Calc } $ 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
View file @ 95f4a9c1
......@@ -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.NodeFrameCalc s i = Just $ RouteFrameCalc s i
nodeTypeAppRoute GT.Calc s i = Just $ RouteFrameCalc s i
nodeTypeAppRoute GT.NodeFrameVisio s i = Just $ RouteFrameVisio s i
nodeTypeAppRoute _ _ _ = Nothing
......
src/Gargantext/Types.purs
View file @ 95f4a9c1
......@@ -155,7 +155,7 @@ data NodeType = Annuaire
| Url_Document
-- TODO Optional Nodes
| NodeFile
| NodeFrameCalc
| Calc
| NodeFrameNotebook
| Notes
| NodeFrameVisio
......@@ -198,7 +198,7 @@ instance Show NodeType where
show NodeList = "NodeList"
show NodeTexts = "NodeTexts"
show Notes = "Notes"
show NodeFrameCalc = "NodeFrameCalc"
show Calc = "Calc"
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 "NodeFrameCalc" = Just NodeFrameCalc
read "Calc" = Just Calc
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"
NodeFrameCalc -> "Feuilles de calcul"
Calc -> "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"
NodeFrameCalc -> "Calc"
Calc -> "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 NodeFrameCalc true = "calculator"
getIcon NodeFrameCalc false = "calculator"
getIcon Calc true = "calculator"
getIcon Calc 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 NodeFrameCalc = "calc"
nodeTypePath Calc = "calc"
nodeTypePath NodeFrameNotebook = "code"
nodeTypePath NodeFrameVisio = "visio"
nodeTypePath (NodePublic nt) = nodeTypePath nt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment