Commit 16437499 authored by Alfredo Di Napoli's avatar Alfredo Di Napoli

Add node_id query param to hframeUrl

parent 2fc0d89a
Pipeline #6435 passed with stages
in 21 minutes and 2 seconds
...@@ -21,6 +21,7 @@ here = R2.here "Gargantext.Components.Frame.Layout" ...@@ -21,6 +21,7 @@ here = R2.here "Gargantext.Components.Frame.Layout"
type Props = type Props =
( frame :: NodePoly Hyperdata ( frame :: NodePoly Hyperdata
, nodeType :: NodeType , nodeType :: NodeType
, nodeId :: Int
) )
layout :: R2.Leaf Props layout :: R2.Leaf Props
...@@ -29,6 +30,7 @@ layoutCpt :: R.Component Props ...@@ -29,6 +30,7 @@ layoutCpt :: R.Component Props
layoutCpt = here.component "main" cpt where layoutCpt = here.component "main" cpt where
cpt { frame: NodePoly { hyperdata: Hyperdata { base, frame_id } } cpt { frame: NodePoly { hyperdata: Hyperdata { base, frame_id } }
, nodeType , nodeType
, nodeId
} _ = case nodeType of } _ = case nodeType of
-- Visio Node -- Visio Node
...@@ -58,7 +60,7 @@ layoutCpt = here.component "main" cpt where ...@@ -58,7 +60,7 @@ layoutCpt = here.component "main" cpt where
, ,
H.a H.a
{ className : "fa fa-video-camera fa-5x" { className : "fa fa-video-camera fa-5x"
, href : hframeUrl nodeType base frame_id , href : hframeUrl nodeType base frame_id nodeId
, target: "_blank" , target: "_blank"
} }
[] []
...@@ -92,7 +94,7 @@ layoutCpt = here.component "main" cpt where ...@@ -92,7 +94,7 @@ layoutCpt = here.component "main" cpt where
[ [
-- H.script { src: "https://visio.gargantext.org/external_api.js"} [], -- H.script { src: "https://visio.gargantext.org/external_api.js"} [],
H.iframe H.iframe
{ src: hframeUrl nodeType base frame_id { src: hframeUrl nodeType base frame_id nodeId
, width: "100%" , width: "100%"
, height: "100%" , height: "100%"
} }
...@@ -132,8 +134,8 @@ layoutCpt = here.component "main" cpt where ...@@ -132,8 +134,8 @@ layoutCpt = here.component "main" cpt where
-------------------------------------------------------------- --------------------------------------------------------------
hframeUrl :: NodeType -> Base -> FrameId -> String hframeUrl :: NodeType -> Base -> FrameId -> Int -> String
hframeUrl NodeFrameNotebook base frame_id = base <> "/" <> frame_id -- Temp fix : frame_id is currently the whole url created 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 Calc base frame_id _ = base <> "/" <> frame_id
hframeUrl NodeFrameVisio base frame_id = base <> "/" <> frame_id hframeUrl NodeFrameVisio base frame_id _ = base <> "/" <> frame_id
hframeUrl _ base frame_id = base <> "/" <> frame_id <> "?view" -- "?both" hframeUrl _ base frame_id node_id = base <> "/" <> frame_id <> "?view&node_id=" <> show node_id -- "?both"
...@@ -70,6 +70,7 @@ nodeCpt = R2.hereComponent here "node" hCpt where ...@@ -70,6 +70,7 @@ nodeCpt = R2.hereComponent here "node" hCpt where
layout layout
{ frame { frame
, nodeType , nodeType
, nodeId
} }
} }
......
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