Commit 229f9ba3 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

[simple-json] fixes to sessions and other endpoints

parent 81e21c97
This diff is collapsed.
...@@ -101,7 +101,7 @@ let additions = ...@@ -101,7 +101,7 @@ let additions =
, repo = "https://github.com/purescript-contrib/purescript-precise" , repo = "https://github.com/purescript-contrib/purescript-precise"
, version = "v4.0.0" , version = "v4.0.0"
} }
, reactix = {- , reactix =
{ dependencies = { dependencies =
[ "aff" [ "aff"
, "dom-simple" , "dom-simple"
...@@ -114,7 +114,7 @@ let additions = ...@@ -114,7 +114,7 @@ let additions =
] ]
, repo = "https://github.com/irresponsible/purescript-reactix" , repo = "https://github.com/irresponsible/purescript-reactix"
, version = "v0.4.11" , version = "v0.4.11"
} } -}
, simple-json-generics = , simple-json-generics =
{ dependencies = { dependencies =
[ "simple-json" ] [ "simple-json" ]
...@@ -172,4 +172,8 @@ let additions = ...@@ -172,4 +172,8 @@ let additions =
} }
} }
in upstream // overrides // additions let localPackages = {
reactix = ../../purescript-reactix/spago.dhall as Location
}
in upstream // overrides // additions // localPackages
...@@ -19,7 +19,23 @@ let ...@@ -19,7 +19,23 @@ let
#build-purs #build-purs
echo "Bundling" echo "Bundling"
#yarn pulp browserify --skip-compile -t dist/bundle.js --src-path output #yarn pulp browserify --skip-compile -t dist/bundle.js --src-path output
yarn spago bundle-app --to dist/bundle.js yarn spago build
browserify
'';
build-watch = pkgs.writeShellScriptBin "build-watch" ''
#!/usr/bin/env bash
set -e
echo "Build watch"
yarn spago build -w --then browserify
'';
browserify = pkgs.writeShellScriptBin "browserify" ''
#!/usr/bin/env bash
set -e
yarn pulp browserify --skip-compile -t dist/bundle.js --src-path output
''; '';
repl = pkgs.writeShellScriptBin "repl" '' repl = pkgs.writeShellScriptBin "repl" ''
...@@ -45,7 +61,9 @@ pkgs.mkShell { ...@@ -45,7 +61,9 @@ pkgs.mkShell {
easy-ps.purs-0_14_2 easy-ps.purs-0_14_2
easy-ps.psc-package easy-ps.psc-package
easy-ps.dhall-json-simple easy-ps.dhall-json-simple
browserify
build-purs build-purs
build-watch
build build
repl repl
pkgs.spago pkgs.spago
......
module Gargantext.Components.App (app) where module Gargantext.Components.App (app) where
import Data.Set as Set
import Reactix as R import Reactix as R
import Toestand as T import Toestand as T
......
This diff is collapsed.
...@@ -3,6 +3,7 @@ module Gargantext.Components.Node ...@@ -3,6 +3,7 @@ module Gargantext.Components.Node
import Data.Generic.Rep (class Generic) import Data.Generic.Rep (class Generic)
import Data.Eq.Generic (genericEq) import Data.Eq.Generic (genericEq)
import Data.Maybe (Maybe)
import Data.Newtype (class Newtype) import Data.Newtype (class Newtype)
import Simple.JSON as JSON import Simple.JSON as JSON
...@@ -34,7 +35,7 @@ instance JSON.ReadForeign a => JSON.ReadForeign (NodePoly a) where ...@@ -34,7 +35,7 @@ instance JSON.ReadForeign a => JSON.ReadForeign (NodePoly a) where
, date: inst.date , date: inst.date
, hyperdata: inst.hyperdata } , hyperdata: inst.hyperdata }
newtype HyperdataList = HyperdataList { preferences :: String } newtype HyperdataList = HyperdataList { preferences :: Maybe String }
derive instance Generic HyperdataList _ derive instance Generic HyperdataList _
derive instance Newtype HyperdataList _ derive instance Newtype HyperdataList _
derive newtype instance JSON.ReadForeign HyperdataList derive newtype instance JSON.ReadForeign HyperdataList
...@@ -7,7 +7,6 @@ import Data.Tuple.Nested ((/\)) ...@@ -7,7 +7,6 @@ import Data.Tuple.Nested ((/\))
import Effect.Aff (launchAff_) import Effect.Aff (launchAff_)
import Reactix as R import Reactix as R
import Reactix.DOM.HTML as H import Reactix.DOM.HTML as H
import Record as Record
import Toestand as T import Toestand as T
import Gargantext.Prelude import Gargantext.Prelude
......
...@@ -58,7 +58,7 @@ router :: R2.Leaf Props ...@@ -58,7 +58,7 @@ router :: R2.Leaf Props
router props = R.createElement routerCpt props [] router props = R.createElement routerCpt props []
routerCpt :: R.Component Props routerCpt :: R.Component Props
routerCpt = here.component "router" cpt where routerCpt = here.component "router" cpt where
cpt props@{ boxes: boxes@{ handed } } _ = do cpt { boxes: boxes@{ handed } } _ = do
handed' <- T.useLive T.unequal handed handed' <- T.useLive T.unequal handed
let handedClassName = case handed' of let handedClassName = case handed' of
...@@ -90,13 +90,13 @@ topBar :: R2.Leaf Props ...@@ -90,13 +90,13 @@ topBar :: R2.Leaf Props
topBar p = R.createElement topBarCpt p [] topBar p = R.createElement topBarCpt p []
topBarCpt :: R.Component Props topBarCpt :: R.Component Props
topBarCpt = here.component "topBar" cpt where topBarCpt = here.component "topBar" cpt where
cpt props@{ boxes: boxes@{ handed cpt { boxes: boxes@{ handed
, route , route
, showTree } } _ = do , showTree } } _ = do
route' <- T.useLive T.unequal boxes.route route' <- T.useLive T.unequal route
let children = case route' of let children = case route' of
GR.PGraphExplorer s g -> [ GETB.topBar { boxes } ] GR.PGraphExplorer _s _g -> [ GETB.topBar { boxes } ]
_ -> [] _ -> []
pure $ TopBar.topBar { handed, showTree } children pure $ TopBar.topBar { handed, showTree } children
...@@ -112,7 +112,7 @@ forest :: R2.Leaf Props ...@@ -112,7 +112,7 @@ forest :: R2.Leaf Props
forest p = R.createElement forestCpt p [] forest p = R.createElement forestCpt p []
forestCpt :: R.Component Props forestCpt :: R.Component Props
forestCpt = here.component "forest" cpt where forestCpt = here.component "forest" cpt where
cpt props@{ boxes: boxes@{ backend cpt { boxes: { backend
, forestOpen , forestOpen
, handed , handed
, reloadForest , reloadForest
...@@ -140,13 +140,8 @@ sidePanel :: R2.Leaf Props ...@@ -140,13 +140,8 @@ sidePanel :: R2.Leaf Props
sidePanel p = R.createElement sidePanelCpt p [] sidePanel p = R.createElement sidePanelCpt p []
sidePanelCpt :: R.Component Props sidePanelCpt :: R.Component Props
sidePanelCpt = here.component "sidePanel" cpt where sidePanelCpt = here.component "sidePanel" cpt where
cpt props@{ boxes: boxes@{ graphVersion cpt props@{ boxes: { session
, reloadForest , sidePanelState } } _ = do
, session
, sidePanelGraph
, sidePanelState
, sidePanelLists
, sidePanelTexts } } _ = do
session' <- T.useLive T.unequal session session' <- T.useLive T.unequal session
sidePanelState' <- T.useLive T.unequal sidePanelState sidePanelState' <- T.useLive T.unequal sidePanelState
...@@ -220,7 +215,7 @@ openedSidePanel :: R2.Component (WithSession Props) ...@@ -220,7 +215,7 @@ openedSidePanel :: R2.Component (WithSession Props)
openedSidePanel = R.createElement openedSidePanelCpt openedSidePanel = R.createElement openedSidePanelCpt
openedSidePanelCpt :: R.Component (WithSession Props) openedSidePanelCpt :: R.Component (WithSession Props)
openedSidePanelCpt = here.component "openedSidePanel" cpt where openedSidePanelCpt = here.component "openedSidePanel" cpt where
cpt props@{ boxes: boxes@{ graphVersion cpt { boxes: { graphVersion
, reloadForest , reloadForest
, route , route
, sidePanelGraph , sidePanelGraph
...@@ -236,12 +231,12 @@ openedSidePanelCpt = here.component "openedSidePanel" cpt where ...@@ -236,12 +231,12 @@ openedSidePanelCpt = here.component "openedSidePanel" cpt where
let wrapper = H.div { className: "side-panel" } let wrapper = H.div { className: "side-panel" }
case route' of case route' of
GR.Lists s n -> do GR.Lists _s _n -> do
pure $ wrapper pure $ wrapper
[ Lists.sidePanel { session [ Lists.sidePanel { session
, sidePanel: sidePanelLists , sidePanel: sidePanelLists
, sidePanelState } [] ] , sidePanelState } [] ]
GR.PGraphExplorer s g -> do GR.PGraphExplorer _s g -> do
case (mGraph' /\ mGraphMetaData') of case (mGraph' /\ mGraphMetaData') of
(Nothing /\ _) -> pure $ wrapper [] (Nothing /\ _) -> pure $ wrapper []
(_ /\ Nothing) -> pure $ wrapper [] (_ /\ Nothing) -> pure $ wrapper []
...@@ -258,7 +253,7 @@ openedSidePanelCpt = here.component "openedSidePanel" cpt where ...@@ -258,7 +253,7 @@ openedSidePanelCpt = here.component "openedSidePanel" cpt where
, session , session
, sideTab , sideTab
} [] ] } [] ]
GR.Texts s n -> do GR.Texts _s _n -> do
pure $ wrapper pure $ wrapper
[ Texts.sidePanel { session [ Texts.sidePanel { session
, sidePanel: sidePanelTexts , sidePanel: sidePanelTexts
...@@ -269,7 +264,7 @@ annuaire :: R2.Component SessionNodeProps ...@@ -269,7 +264,7 @@ annuaire :: R2.Component SessionNodeProps
annuaire = R.createElement annuaireCpt annuaire = R.createElement annuaireCpt
annuaireCpt :: R.Component SessionNodeProps annuaireCpt :: R.Component SessionNodeProps
annuaireCpt = here.component "annuaire" cpt where annuaireCpt = here.component "annuaire" cpt where
cpt props@{ boxes, nodeId } _ = do cpt props@{ nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
annuaireLayout { frontends: defaultFrontends annuaireLayout { frontends: defaultFrontends
...@@ -296,7 +291,7 @@ corpusDocument = R.createElement corpusDocumentCpt ...@@ -296,7 +291,7 @@ corpusDocument = R.createElement corpusDocumentCpt
corpusDocumentCpt :: R.Component CorpusDocumentProps corpusDocumentCpt :: R.Component CorpusDocumentProps
corpusDocumentCpt = here.component "corpusDocument" cpt corpusDocumentCpt = here.component "corpusDocument" cpt
where where
cpt props@{ boxes, corpusId: corpusId', listId, nodeId } _ = do cpt props@{ corpusId: corpusId', listId, nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
documentMainLayout { mCorpusId: Just corpusId' documentMainLayout { mCorpusId: Just corpusId'
...@@ -309,7 +304,7 @@ dashboard = R.createElement dashboardCpt ...@@ -309,7 +304,7 @@ dashboard = R.createElement dashboardCpt
dashboardCpt :: R.Component SessionNodeProps dashboardCpt :: R.Component SessionNodeProps
dashboardCpt = here.component "dashboard" cpt dashboardCpt = here.component "dashboard" cpt
where where
cpt props@{ boxes, nodeId } _ = do cpt props@{ nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
dashboardLayout { nodeId, session } [] } sessionProps) [] dashboardLayout { nodeId, session } [] } sessionProps) []
...@@ -320,7 +315,7 @@ document :: R2.Component DocumentProps ...@@ -320,7 +315,7 @@ document :: R2.Component DocumentProps
document = R.createElement documentCpt document = R.createElement documentCpt
documentCpt :: R.Component DocumentProps documentCpt :: R.Component DocumentProps
documentCpt = here.component "document" cpt where documentCpt = here.component "document" cpt where
cpt props@{ boxes, listId, nodeId } _ = do cpt props@{ listId, nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
documentMainLayout { listId documentMainLayout { listId
...@@ -344,7 +339,7 @@ phyloExplorer = R.createElement phyloExplorerCpt ...@@ -344,7 +339,7 @@ phyloExplorer = R.createElement phyloExplorerCpt
phyloExplorerCpt :: R.Component SessionNodeProps phyloExplorerCpt :: R.Component SessionNodeProps
phyloExplorerCpt = here.component "phylo" cpt phyloExplorerCpt = here.component "phylo" cpt
where where
cpt props@{ boxes, nodeId } _ = do cpt props@{ nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
phyloLayout { nodeId, session } [] } sessionProps) [] phyloLayout { nodeId, session } [] } sessionProps) []
...@@ -355,22 +350,16 @@ home :: R2.Component Props ...@@ -355,22 +350,16 @@ home :: R2.Component Props
home = R.createElement homeCpt home = R.createElement homeCpt
homeCpt :: R.Component Props homeCpt :: R.Component Props
homeCpt = here.component "home" cpt where homeCpt = here.component "home" cpt where
cpt props@{ boxes: boxes@{ backend, sessions, showLogin, tasks, reloadForest} } _ = do cpt { boxes: { backend, sessions, showLogin, tasks, reloadForest} } _ = do
pure $ homeLayout { backend, lang: LL_EN, sessions, showLogin, tasks, reloadForest } pure $ homeLayout { backend, lang: LL_EN, sessions, showLogin, tasks, reloadForest }
lists :: R2.Component SessionNodeProps lists :: R2.Component SessionNodeProps
lists = R.createElement listsCpt lists = R.createElement listsCpt
listsCpt :: R.Component SessionNodeProps listsCpt :: R.Component SessionNodeProps
listsCpt = here.component "lists" cpt where listsCpt = here.component "lists" cpt where
cpt props@{ boxes: { backend cpt props@{ boxes: { reloadForest
, forestOpen
, handed
, reloadForest
, reloadMainPage , reloadMainPage
, reloadRoot , reloadRoot
, route
, sessions
, showLogin
, sidePanelState , sidePanelState
, sidePanelLists , sidePanelLists
, tasks } , tasks }
...@@ -399,7 +388,7 @@ routeFile = R.createElement routeFileCpt ...@@ -399,7 +388,7 @@ routeFile = R.createElement routeFileCpt
routeFileCpt :: R.Component SessionNodeProps routeFileCpt :: R.Component SessionNodeProps
routeFileCpt = here.component "routeFile" cpt where routeFileCpt = here.component "routeFile" cpt where
cpt props@{ boxes, nodeId } _ = do cpt props@{ nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
fileLayout { nodeId, session } } sessionProps) [] fileLayout { nodeId, session } } sessionProps) []
...@@ -413,7 +402,7 @@ routeFrame :: R2.Component RouteFrameProps ...@@ -413,7 +402,7 @@ routeFrame :: R2.Component RouteFrameProps
routeFrame = R.createElement routeFrameCpt routeFrame = R.createElement routeFrameCpt
routeFrameCpt :: R.Component RouteFrameProps routeFrameCpt :: R.Component RouteFrameProps
routeFrameCpt = here.component "routeFrame" cpt where routeFrameCpt = here.component "routeFrame" cpt where
cpt props@{ boxes, nodeId, nodeType } _ = do cpt props@{ nodeId, nodeType } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
frameLayout { nodeId, nodeType, session } } sessionProps) [] frameLayout { nodeId, nodeType, session } } sessionProps) []
...@@ -425,24 +414,18 @@ teamCpt = here.component "team" cpt where ...@@ -425,24 +414,18 @@ teamCpt = here.component "team" cpt where
cpt props@{ boxes, nodeId } _ = do cpt props@{ boxes, nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
corpusLayout { nodeId, session, tasks: boxes.tasks, reloadForest: boxes.reloadForest } } sessionProps) [] corpusLayout { nodeId
, session
, tasks: boxes.tasks
, reloadForest: boxes.reloadForest } } sessionProps) []
texts :: R2.Component SessionNodeProps texts :: R2.Component SessionNodeProps
texts = R.createElement textsCpt texts = R.createElement textsCpt
textsCpt :: R.Component SessionNodeProps textsCpt :: R.Component SessionNodeProps
textsCpt = here.component "texts" cpt textsCpt = here.component "texts" cpt
where where
cpt props@{ boxes: { backend cpt props@{ boxes: { sidePanelState
, forestOpen , sidePanelTexts }
, handed
, reloadForest
, reloadRoot
, route
, sessions
, showLogin
, sidePanelState
, sidePanelTexts
, tasks }
, nodeId } _ = do , nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
...@@ -456,7 +439,7 @@ user :: R2.Component SessionNodeProps ...@@ -456,7 +439,7 @@ user :: R2.Component SessionNodeProps
user = R.createElement userCpt user = R.createElement userCpt
userCpt :: R.Component SessionNodeProps userCpt :: R.Component SessionNodeProps
userCpt = here.component "user" cpt where userCpt = here.component "user" cpt where
cpt props@{ boxes: boxes@{ reloadForest cpt props@{ boxes: { reloadForest
, reloadRoot , reloadRoot
, sidePanelState , sidePanelState
, sidePanelTexts , sidePanelTexts
...@@ -487,7 +470,7 @@ contactCpt = here.component "contact" cpt where ...@@ -487,7 +470,7 @@ contactCpt = here.component "contact" cpt where
, tasks } , tasks }
, nodeId } _ = do , nodeId } _ = do
let sessionProps = RE.pick props :: Record SessionProps let sessionProps = RE.pick props :: Record SessionProps
let forestedProps = RE.pick props :: Record Props -- let forestedProps = RE.pick props :: Record Props
pure $ authed (Record.merge { content: \session -> pure $ authed (Record.merge { content: \session ->
contactLayout { annuaireId contactLayout { annuaireId
, frontends: defaultFrontends , frontends: defaultFrontends
......
...@@ -3,12 +3,7 @@ module Gargantext.Ends ...@@ -3,12 +3,7 @@ module Gargantext.Ends
-- ( ) -- ( )
where where
import Prelude import Prelude (class Eq, class Show, show, ($), (/=), (<<<), (<>), (==))
( class Eq, class Show, bind, pure, show
, ($), (/=), (<<<), (<>), (==) )
import Data.Argonaut
( class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject
, (:=), (~>), (.:) )
import Data.Foldable (foldMap) import Data.Foldable (foldMap)
import Data.Generic.Rep (class Generic) import Data.Generic.Rep (class Generic)
import Data.Eq.Generic (genericEq) import Data.Eq.Generic (genericEq)
...@@ -18,7 +13,6 @@ import Simple.JSON as JSON ...@@ -18,7 +13,6 @@ import Simple.JSON as JSON
import Gargantext.Routes as R import Gargantext.Routes as R
import Gargantext.Types (ApiVersion, ChartType(..), Limit, NodePath, NodeType(..), Offset, TabType(..), TermSize(..), nodePath, nodeTypePath, showTabType', TermList(MapTerm)) import Gargantext.Types (ApiVersion, ChartType(..), Limit, NodePath, NodeType(..), Offset, TabType(..), TermSize(..), nodePath, nodeTypePath, showTabType', TermList(MapTerm))
import Prelude (class Eq, class Show, identity, show, ($), (<>), bind, pure, (<<<), (==), (/=))
-- | A means of generating a url to visit, a destination -- | A means of generating a url to visit, a destination
class ToUrl conf p where class ToUrl conf p where
...@@ -38,6 +32,9 @@ derive instance Generic Backend _ ...@@ -38,6 +32,9 @@ derive instance Generic Backend _
derive instance Newtype Backend _ derive instance Newtype Backend _
derive newtype instance JSON.ReadForeign Backend derive newtype instance JSON.ReadForeign Backend
derive newtype instance JSON.WriteForeign Backend derive newtype instance JSON.WriteForeign Backend
instance Eq Backend where eq = genericEq
instance Show Backend where show (Backend {name}) = name
instance ToUrl Backend String where toUrl = backendUrl
backend :: ApiVersion -> String -> String -> String -> Backend backend :: ApiVersion -> String -> String -> String -> Backend
backend version prePath baseUrl name = Backend { name, version, prePath, baseUrl } backend version prePath baseUrl name = Backend { name, version, prePath, baseUrl }
...@@ -46,15 +43,6 @@ backend version prePath baseUrl name = Backend { name, version, prePath, baseUrl ...@@ -46,15 +43,6 @@ backend version prePath baseUrl name = Backend { name, version, prePath, baseUrl
backendUrl :: Backend -> String -> String backendUrl :: Backend -> String -> String
backendUrl (Backend b) path = b.baseUrl <> b.prePath <> show b.version <> "/" <> path backendUrl (Backend b) path = b.baseUrl <> b.prePath <> show b.version <> "/" <> path
instance Eq Backend where
eq = genericEq
instance Show Backend where
show (Backend {name}) = name
instance ToUrl Backend String where
toUrl = backendUrl
-- | Encapsulates the data needed to construct a url to a frontend -- | Encapsulates the data needed to construct a url to a frontend
-- | server (either for the app or static content) -- | server (either for the app or static content)
newtype Frontend = Frontend newtype Frontend = Frontend
...@@ -63,12 +51,11 @@ newtype Frontend = Frontend ...@@ -63,12 +51,11 @@ newtype Frontend = Frontend
, prePath :: String } , prePath :: String }
derive instance Generic Frontend _ derive instance Generic Frontend _
instance Eq Frontend where eq = genericEq
instance Eq Frontend where instance ToUrl Frontend NodePath where toUrl front np = frontendUrl front (nodePath np)
eq = genericEq instance Show Frontend where show (Frontend {name}) = name
instance ToUrl Frontend String where toUrl = frontendUrl
instance ToUrl Frontend NodePath where instance ToUrl Frontend R.AppRoute where toUrl f r = frontendUrl f (R.appPath r)
toUrl front np = frontendUrl front (nodePath np)
-- | Creates a frontend -- | Creates a frontend
frontend :: String -> String -> String -> Frontend frontend :: String -> String -> String -> Frontend
...@@ -78,25 +65,12 @@ frontend baseUrl prePath name = Frontend { name, baseUrl, prePath } ...@@ -78,25 +65,12 @@ frontend baseUrl prePath name = Frontend { name, baseUrl, prePath }
frontendUrl :: Frontend -> String -> String frontendUrl :: Frontend -> String -> String
frontendUrl (Frontend f) path = f.baseUrl <> f.prePath <> path frontendUrl (Frontend f) path = f.baseUrl <> f.prePath <> path
instance Show Frontend where
show (Frontend {name}) = name
instance ToUrl Frontend String where
toUrl = frontendUrl
instance ToUrl Frontend R.AppRoute where
toUrl f r = frontendUrl f (R.appPath r)
-- | The currently selected App and Static configurations -- | The currently selected App and Static configurations
newtype Frontends = Frontends { app :: Frontend, static :: Frontend } newtype Frontends = Frontends { app :: Frontend, static :: Frontend }
derive instance Eq Frontends derive instance Eq Frontends
instance ToUrl Frontends R.AppRoute where toUrl f r = appUrl f (R.appPath r)
instance ToUrl Frontends R.AppRoute where instance ToUrl Frontends NodePath where toUrl (Frontends {app}) np = frontendUrl app (nodePath np)
toUrl f r = appUrl f (R.appPath r)
instance ToUrl Frontends NodePath where
toUrl (Frontends {app}) np = frontendUrl app (nodePath np)
-- | Creates an app url from a Frontends and the path as a string -- | Creates an app url from a Frontends and the path as a string
appUrl :: Frontends -> String -> String appUrl :: Frontends -> String -> String
......
...@@ -8,28 +8,28 @@ module Gargantext.Sessions ...@@ -8,28 +8,28 @@ module Gargantext.Sessions
, getCacheState, setCacheState , getCacheState, setCacheState
) where ) where
import Gargantext.Prelude
import DOM.Simple.Console (log2) import DOM.Simple.Console (log2)
import Data.Either (Either(..), hush) import Data.Either (Either(..), hush)
import Data.Map as Map import Data.Map as Map
import Data.Maybe (Maybe(..), fromMaybe) import Data.Maybe (Maybe(..), fromMaybe)
import Effect (Effect) import Effect (Effect)
import Effect.Aff (Aff) import Effect.Aff (Aff)
import Reactix as R
import Simple.JSON as JSON
import Toestand as T
import Web.Storage.Storage (getItem, removeItem, setItem)
import Gargantext.Prelude
import Gargantext.Components.Login.Types (AuthData(..), AuthInvalid(..), AuthRequest(..), AuthResponse(..)) import Gargantext.Components.Login.Types (AuthData(..), AuthInvalid(..), AuthRequest(..), AuthResponse(..))
import Gargantext.Components.Nodes.Lists.Types as NT import Gargantext.Components.Nodes.Lists.Types as NT
import Gargantext.Config.REST as REST import Gargantext.Config.REST as REST
import Gargantext.Ends (class ToUrl, Backend, toUrl) import Gargantext.Ends (class ToUrl, Backend, toUrl)
import Gargantext.Sessions.Types (Session(..), Sessions(..), OpenNodes, NodeId, mkNodeId, sessionUrl, sessionId, empty, null, unSessions, lookup, cons, tryCons, update, remove, tryRemove) import Gargantext.Sessions.Types (Session(..), Sessions(..), OpenNodes, NodeId, mkNodeId, sessionUrl, sessionId, empty, null, unSessions, lookup, cons, tryCons, update, remove, tryRemove)
import Gargantext.Utils.Reactix (getls, stringify) import Gargantext.Utils.Reactix as R2
import Prim.Row (class Lacks, class Nub)
import Reactix as R here :: R2.Here
import Record as Record here = R2.here "Gargantext.Sessions"
import Record.Extra as REX
import Simple.JSON as JSON
import Toestand as T
import Web.HTML.Event.EventTypes (offline)
import Web.Storage.Storage (getItem, removeItem, setItem)
type WithSession c = type WithSession c =
( session :: Session ( session :: Session
...@@ -86,7 +86,7 @@ setCacheState (Session session@{ caches }) nodeId cacheState = ...@@ -86,7 +86,7 @@ setCacheState (Session session@{ caches }) nodeId cacheState =
-- | if decoding fails -- | if decoding fails
loadSessions :: Effect Sessions loadSessions :: Effect Sessions
loadSessions = do loadSessions = do
storage <- getls storage <- R2.getls
mItem :: Maybe String <- getItem localStorageKey storage mItem :: Maybe String <- getItem localStorageKey storage
case mItem of case mItem of
Nothing -> pure empty Nothing -> pure empty
...@@ -95,7 +95,7 @@ loadSessions = do ...@@ -95,7 +95,7 @@ loadSessions = do
case hush r of case hush r of
Nothing -> pure empty Nothing -> pure empty
Just p -> pure p Just p -> pure p
-- loadSessions = getls >>= getItem localStorageKey >>= handleMaybe -- loadSessions = R2.getls >>= getItem localStorageKey >>= handleMaybe
-- where -- where
-- -- a localstorage lookup can find nothing -- -- a localstorage lookup can find nothing
-- handleMaybe (Just val) = handleEither (JSON.readJSON val) -- handleMaybe (Just val) = handleEither (JSON.readJSON val)
...@@ -105,14 +105,10 @@ loadSessions = do ...@@ -105,14 +105,10 @@ loadSessions = do
-- handleEither (Left err) = err *> pure empty -- handleEither (Left err) = err *> pure empty
-- handleEither (Right ss) = pure ss -- handleEither (Right ss) = pure ss
mapLeft :: forall l m r. (l -> m) -> Either l r -> Either m r
mapLeft f (Left l) = Left (f l)
mapLeft _ (Right r) = Right r
saveSessions :: Sessions -> Effect Sessions saveSessions :: Sessions -> Effect Sessions
saveSessions sessions = effect *> pure sessions where saveSessions sessions = effect *> pure sessions where
rem = getls >>= removeItem localStorageKey rem = R2.getls >>= removeItem localStorageKey
set v = getls >>= setItem localStorageKey v set v = R2.getls >>= setItem localStorageKey v
effect effect
| null sessions = rem | null sessions = rem
| otherwise = set (JSON.writeJSON sessions) | otherwise = set (JSON.writeJSON sessions)
......
...@@ -18,6 +18,7 @@ import Data.Sequence (Seq) ...@@ -18,6 +18,7 @@ import Data.Sequence (Seq)
import Data.Sequence as Seq import Data.Sequence as Seq
import Data.Set (Set) import Data.Set (Set)
import Data.Set as Set import Data.Set as Set
import Data.Show.Generic (genericShow)
import Data.Tuple (Tuple) import Data.Tuple (Tuple)
import Foreign.Object as Object import Foreign.Object as Object
import Reactix as R import Reactix as R
...@@ -60,21 +61,11 @@ instance JSON.WriteForeign Session where ...@@ -60,21 +61,11 @@ instance JSON.WriteForeign Session where
JSON.writeImpl { backend, caches: caches', token, treeId, username } JSON.writeImpl { backend, caches: caches', token, treeId, username }
where where
caches' = JSON.writeImpl $ Object.fromFoldable (GUT.mapFst show <$> Map.toUnfoldable caches :: Array (Tuple String NT.CacheState)) caches' = JSON.writeImpl $ Object.fromFoldable (GUT.mapFst show <$> Map.toUnfoldable caches :: Array (Tuple String NT.CacheState))
instance Eq Session where eq = genericEq
instance Eq Session where instance Show Session where show (Session {backend, username}) = username <> "@" <> show backend
eq = genericEq instance ToUrl Session SessionRoute where toUrl (Session {backend}) r = backendUrl backend (sessionPath r)
instance ToUrl Session NodePath where toUrl (Session {backend}) np = backendUrl backend (nodePath np)
instance Show Session where instance ToUrl Session String where toUrl = sessionUrl
show (Session {backend, username}) = username <> "@" <> show backend
instance ToUrl Session SessionRoute where
toUrl (Session {backend}) r = backendUrl backend (sessionPath r)
instance ToUrl Session NodePath where
toUrl (Session {backend}) np = backendUrl backend (nodePath np)
instance ToUrl Session String where
toUrl = sessionUrl
sessionUrl :: Session -> String -> String sessionUrl :: Session -> String -> String
sessionUrl (Session {backend}) = backendUrl backend sessionUrl (Session {backend}) = backendUrl backend
...@@ -93,9 +84,8 @@ instance JSON.ReadForeign Sessions where ...@@ -93,9 +84,8 @@ instance JSON.ReadForeign Sessions where
pure $ Sessions { sessions } pure $ Sessions { sessions }
instance JSON.WriteForeign Sessions where instance JSON.WriteForeign Sessions where
writeImpl (Sessions { sessions }) = GJSON.writeSequence sessions writeImpl (Sessions { sessions }) = GJSON.writeSequence sessions
instance Eq Sessions where eq = genericEq
instance Eq Sessions where instance Show Sessions where show = genericShow
eq = genericEq
empty :: Sessions empty :: Sessions
empty = Sessions { sessions: Seq.empty } empty = Sessions { sessions: Seq.empty }
......
...@@ -425,17 +425,20 @@ instance JSON.WriteForeign OrderBy where writeImpl = JSON.writeImpl <<< show ...@@ -425,17 +425,20 @@ instance JSON.WriteForeign OrderBy where writeImpl = JSON.writeImpl <<< show
data ApiVersion = V0 | V10 | V11 data ApiVersion = V0 | V10 | V11
derive instance Generic ApiVersion _ derive instance Generic ApiVersion _
instance JSON.ReadForeign ApiVersion where readImpl = JSONG.enumSumRep instance JSON.ReadForeign ApiVersion where
readImpl f = do
s <- JSON.readImpl f
case s of
"v0" -> pure V0
"v1.0" -> pure V10
"v1.1" -> pure V11
x -> F.fail $ F.ErrorAtProperty x $ F.ForeignError "unknown API value"
instance JSON.WriteForeign ApiVersion where instance JSON.WriteForeign ApiVersion where
writeImpl V0 = F.unsafeToForeign $ JSON.writeImpl "v0" writeImpl v = F.unsafeToForeign $ JSON.writeImpl $ show v
writeImpl V10 = F.unsafeToForeign $ JSON.writeImpl "v1.0"
writeImpl V11 = F.unsafeToForeign $ JSON.writeImpl "v1.1"
instance Show ApiVersion where instance Show ApiVersion where
show V0 = "v0" show V0 = "v0"
show V10 = "v1.0" show V10 = "v1.0"
show V11 = "v1.1" show V11 = "v1.1"
instance Eq ApiVersion where instance Eq ApiVersion where
eq V10 V10 = true eq V10 V10 = true
eq V11 V11 = true eq V11 V11 = true
......
exports._makeRequest = function() { exports._makeRequest = function(url) {
return function(url) {
return function(options) { return function(options) {
return new Request(url, options); return new Request(url, options);
}
} }
} }
......
...@@ -6,7 +6,7 @@ import Control.Monad.Except (withExcept) ...@@ -6,7 +6,7 @@ import Control.Monad.Except (withExcept)
import Data.Int as Int import Data.Int as Int
import Data.List as List import Data.List as List
import Data.Map as Map import Data.Map as Map
import Data.Maybe (fromJust, Maybe(..)) import Data.Maybe (Maybe(..))
import Data.Sequence as Seq import Data.Sequence as Seq
import Data.Traversable (sequence) import Data.Traversable (sequence)
import Data.TraversableWithIndex (traverseWithIndex) import Data.TraversableWithIndex (traverseWithIndex)
...@@ -14,10 +14,8 @@ import Data.Tuple (Tuple(..)) ...@@ -14,10 +14,8 @@ import Data.Tuple (Tuple(..))
import Foreign (F, Foreign, ForeignError(..), readArray, unsafeToForeign) import Foreign (F, Foreign, ForeignError(..), readArray, unsafeToForeign)
import Foreign as F import Foreign as F
import Foreign.Object as Object import Foreign.Object as Object
import Simple.JSON (writeImpl)
import Simple.JSON as JSON import Simple.JSON as JSON
import Gargantext.Utils.Tuple as GUT
readSequence :: forall a. JSON.ReadForeign a => Foreign -> F (Seq.Seq a) readSequence :: forall a. JSON.ReadForeign a => Foreign -> F (Seq.Seq a)
readSequence f = do readSequence f = do
...@@ -28,7 +26,7 @@ readSequence f = do ...@@ -28,7 +26,7 @@ readSequence f = do
readAtIdx i f' = withExcept (map (ErrorAtIndex i)) (JSON.readImpl f') readAtIdx i f' = withExcept (map (ErrorAtIndex i)) (JSON.readImpl f')
writeSequence :: forall a. JSON.WriteForeign a => Seq.Seq a -> Foreign writeSequence :: forall a. JSON.WriteForeign a => Seq.Seq a -> Foreign
writeSequence xs = unsafeToForeign $ JSON.writeImpl <$> xs writeSequence xs = unsafeToForeign $ JSON.writeImpl $ (Seq.toUnfoldable xs :: Array a)
readList :: forall a. JSON.ReadForeign a => Foreign -> F (List.List a) readList :: forall a. JSON.ReadForeign a => Foreign -> F (List.List a)
readList f = do readList f = do
......
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