From 551aa0ce54577d417e7edfffa191e8891d0bcd8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Delano=C3=AB?= <devel+git@delanoe.org> Date: Mon, 5 Jun 2023 09:41:22 +0200 Subject: [PATCH] Revert "[DOC] NodeFrameWrite -> Notes" This reverts commit a0952447f1c2d984f2a4650c6a5ff12444210f4d. --- .../Components/Forest/Tree/Node/Settings.purs | 32 +++++++++---------- src/Gargantext/Components/Router.purs | 2 +- src/Gargantext/Routes.purs | 2 +- src/Gargantext/Types.purs | 16 +++++----- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Gargantext/Components/Forest/Tree/Node/Settings.purs b/src/Gargantext/Components/Forest/Tree/Node/Settings.purs index faae3555f..9133b6cac 100644 --- a/src/Gargantext/Components/Forest/Tree/Node/Settings.purs +++ b/src/Gargantext/Components/Forest/Tree/Node/Settings.purs @@ -111,11 +111,12 @@ settingsBox FolderPrivate = SettingsBox { show : true , edit : false , doc : Documentation FolderPrivate - , buttons : [ Add [ Notes + , buttons : [ Add [ NodeFrameWrite , Corpus , NodeFrameCalc , Folder , Annuaire + , NodeFrameCalc -- , NodeFrameNotebook ] ] @@ -125,16 +126,16 @@ settingsBox Team = SettingsBox { show : true , edit : true , doc : Documentation Team - , buttons : [ Add [ Notes + , buttons : [ Add [ NodeFrameWrite , Corpus , NodeFrameCalc , Folder , Annuaire , Team - , Annuaire -- , NodeFrameNotebook , FolderShared , NodeFrameVisio + , Annuaire ] , Share , ManageTeam @@ -162,11 +163,10 @@ settingsBox Folder = SettingsBox { show : true , edit : true , doc : Documentation Folder - , buttons : [ Add [ Notes + , buttons : [ Add [ NodeFrameWrite , Corpus , Folder , Annuaire - , Notes , NodeFrameCalc -- , NodeFrameNotebook ] @@ -180,7 +180,7 @@ settingsBox Corpus = , edit : true , doc : Documentation Corpus , buttons : [ Add [ Graph - , Notes + , NodeFrameWrite , NodeTexts , NodeList , Graph @@ -316,11 +316,11 @@ settingsBox Annuaire = } -settingsBox Notes = +settingsBox NodeFrameWrite = SettingsBox { show : true , edit : true - , doc : Documentation Notes - , buttons : [ Add [ Notes + , doc : Documentation NodeFrameWrite + , buttons : [ Add [ NodeFrameWrite , NodeFrameCalc , Folder , Corpus @@ -337,7 +337,7 @@ settingsBox NodeFrameCalc = , doc : Documentation NodeFrameCalc , buttons : [ Upload , Add [ NodeFrameCalc - , Notes + , NodeFrameWrite ] , Move moveFrameParameters , Delete @@ -349,7 +349,7 @@ settingsBox NodeFrameNotebook = , edit : true , doc : Documentation NodeFrameNotebook , buttons : [ Add [ NodeFrameCalc - , Notes + , NodeFrameWrite -- , NodeFrameNotebook ] , Move moveFrameParameters @@ -363,7 +363,7 @@ settingsBox NodeFrameVisio = , edit : true , doc : Documentation NodeFrameVisio , buttons : [ Add [ NodeFrameVisio - , Notes + , NodeFrameWrite , NodeFrameCalc ] , Delete @@ -395,14 +395,14 @@ moveParameters = { subTreeParams : SubTreeParams , Team , FolderPublic , Folder - , Notes + , NodeFrameWrite , Corpus ] , valitypes: [ FolderPrivate , Team -- , FolderPublic , Folder - , Notes + , NodeFrameWrite , Corpus ] } @@ -416,7 +416,7 @@ moveFrameParameters = { subTreeParams : SubTreeParams , FolderPublic , Folder , Corpus - , Notes + , NodeFrameWrite , NodeFrameCalc ] , valitypes: [ FolderPrivate @@ -424,7 +424,7 @@ moveFrameParameters = { subTreeParams : SubTreeParams -- , FolderPublic , Folder , Corpus - , Notes + , NodeFrameWrite , NodeFrameCalc ] } diff --git a/src/Gargantext/Components/Router.purs b/src/Gargantext/Components/Router.purs index 0d8fdec4e..de12c670f 100644 --- a/src/Gargantext/Components/Router.purs +++ b/src/Gargantext/Components/Router.purs @@ -325,7 +325,7 @@ renderRouteCpt = R.memo' $ here.component "renderRoute" cpt where GR.PGraphExplorer s g -> graphExplorer (sessionNodeProps s g) [] 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.RouteFrameWrite s n -> routeFrame (Record.merge { nodeType: NodeFrameWrite } $ 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) [] diff --git a/src/Gargantext/Routes.purs b/src/Gargantext/Routes.purs index c6e1234db..0d2229797 100644 --- a/src/Gargantext/Routes.purs +++ b/src/Gargantext/Routes.purs @@ -111,7 +111,7 @@ nodeTypeAppRoute GT.NodeList s i = Just $ Lists s i 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.NodeFrameWrite s i = Just $ RouteFrameWrite s i nodeTypeAppRoute GT.NodeFrameCalc s i = Just $ RouteFrameCalc s i nodeTypeAppRoute GT.NodeFrameVisio s i = Just $ RouteFrameVisio s i nodeTypeAppRoute _ _ _ = Nothing diff --git a/src/Gargantext/Types.purs b/src/Gargantext/Types.purs index edaf54f3e..a8ffac64d 100644 --- a/src/Gargantext/Types.purs +++ b/src/Gargantext/Types.purs @@ -157,7 +157,7 @@ data NodeType = Annuaire | NodeFile | NodeFrameCalc | NodeFrameNotebook - | Notes + | NodeFrameWrite | NodeFrameVisio | NodePublic NodeType derive instance Generic NodeType _ @@ -197,7 +197,7 @@ instance Show NodeType where show Team = "NodeTeam" show NodeList = "NodeList" show NodeTexts = "NodeTexts" - show Notes = "Notes" + show NodeFrameWrite = "NodeFrameWrite" show NodeFrameCalc = "NodeFrameCalc" show NodeFrameNotebook = "NodeFrameNotebook" show NodeFrameVisio = "NodeFrameVisio" @@ -227,7 +227,7 @@ instance Read NodeType where read "NodeList" = Just NodeList read "NodeTexts" = Just NodeTexts read "Annuaire" = Just Annuaire - read "Notes" = Just Notes + read "NodeFrameWrite" = Just NodeFrameWrite read "NodeFrameCalc" = Just NodeFrameCalc read "NodeFrameNotebook" = Just NodeFrameNotebook read "NodeFrameVisio" = Just NodeFrameVisio @@ -269,7 +269,7 @@ translateFR = case _ of NodeFile -> "Fichier" NodeFrameCalc -> "Feuilles de calcul" NodeFrameNotebook -> "Carnet de notes" - Notes -> "Éditeur de texte" + NodeFrameWrite -> "Éditeur de texte" NodeFrameVisio -> "Visio" NodePublic n -> translateFR n @@ -300,7 +300,7 @@ translateEN = case _ of NodeFile -> "File" NodeFrameCalc -> "Calc" NodeFrameNotebook -> "Notebook" - Notes -> "Notes" + NodeFrameWrite -> "Write" NodeFrameVisio -> "Visio" NodePublic n -> translateEN n @@ -343,8 +343,8 @@ getIcon Annuaire false = "address-card" getIcon NodeContact true = "address-card-o" getIcon NodeContact false = "address-card" -getIcon Notes true = "file-text-o" -getIcon Notes false = "file-text" +getIcon NodeFrameWrite true = "file-text-o" +getIcon NodeFrameWrite false = "file-text" getIcon NodeFrameCalc true = "calculator" getIcon NodeFrameCalc false = "calculator" @@ -409,7 +409,7 @@ nodeTypePath Tree = "tree" nodeTypePath NodeList = "lists" nodeTypePath NodeTexts = "texts" nodeTypePath Team = "team" -nodeTypePath Notes = "write" +nodeTypePath NodeFrameWrite = "write" nodeTypePath NodeFrameCalc = "calc" nodeTypePath NodeFrameNotebook = "code" nodeTypePath NodeFrameVisio = "visio" -- GitLab