Add output panel

lib/livebook/notebook.ex

@@ -34,7 +34,7 @@ defmodule Livebook.Notebook do
 
   alias Livebook.Notebook.{Section, Cell, AppSettings}
   alias Livebook.Utils.Graph
-  import Livebook.Utils, only: [access_by_id: 1]
+  import Livebook.Utils, only: [access_by_id: 1, access_by_id: 2]
 
   @type t :: %__MODULE__{
           name: String.t(),
@@ -74,9 +74,8 @@ defmodule Livebook.Notebook do
   @type output_panel_row :: %{items: list(output_panel_item)}
 
   @type output_panel_item :: %{
-          id: Livebook.Utils.id(),
-          width: 1..12,
-          outputs: list(Cell.indexed_output())
+          cell_id: Livebook.Utils.id(),
+          width: 1..12
         }
 
   @version "1.0"
@@ -112,8 +111,7 @@ defmodule Livebook.Notebook do
   """
   @spec add_output_to_output_panel(t(), Cell.id()) :: t()
   def add_output_to_output_panel(notebook, cell_id) do
-    {:ok, cell, _section} = fetch_cell_and_section(notebook, cell_id)
-    row = %{items: [%{id: cell_id, width: 12, outputs: cell.outputs}]}
+    row = %{items: [%{cell_id: cell_id, width: 12}]}
     put_in(notebook.output_panel.rows, notebook.output_panel.rows ++ [row])
   end
 
@@ -128,7 +126,7 @@ defmodule Livebook.Notebook do
         Access.key(:rows),
         Access.all(),
         Access.key(:items),
-        access_by_id(cell_id)
+        access_by_id(cell_id, :cell_id)
       ])
 
     notebook
@@ -159,7 +157,7 @@ defmodule Livebook.Notebook do
       Access.all(),
       Access.key(:items),
       Access.all(),
-      Access.key(:id)
+      Access.key(:cell_id)
     ])
     |> List.flatten()
   end

lib/livebook/session/data.ex

@@ -382,8 +382,7 @@ defmodule Livebook.Session.Data do
   end
 
   def apply_operation(data, {:add_output_to_output_panel, _client_id, cell_id}) do
-    with {:ok, cell, _section} <- Notebook.fetch_cell_and_section(data.notebook, cell_id),
-         eval_info <- data.cell_infos[cell_id].eval,
+    with eval_info <- data.cell_infos[cell_id].eval,
          true <- eval_info.validity == :evaluated,
          false <- cell_id in Notebook.output_panel_ids(data.notebook) do
       data

lib/livebook/utils.ex

@@ -112,17 +112,17 @@ defmodule Livebook.Utils do
       ** (RuntimeError) Livebook.Utils.access_by_id/1 expected a list, got: %{}
 
   """
-  @spec access_by_id(term()) ::
+  @spec access_by_id(term(), atom()) ::
           Access.access_fun(data :: struct() | map(), current_value :: term())
-  def access_by_id(id) do
+  def access_by_id(id, field \\ :id) do
     fn
       :get, data, next when is_list(data) ->
         data
-        |> Enum.find(fn item -> item.id == id end)
+        |> Enum.find(fn item -> Map.get(item, field) == id end)
         |> next.()
 
       :get_and_update, data, next when is_list(data) ->
-        case Enum.split_while(data, fn item -> item.id != id end) do
+        case Enum.split_while(data, fn item -> Map.get(item, field) != id end) do
           {prev, [item | cons]} ->
             case next.(item) do
               {get, update} ->

lib/livebook_web/live/session_live/external_window_live.ex

@@ -56,7 +56,15 @@ defmodule LivebookWeb.SessionLive.ExternalWindowLive do
 
     %{
       notebook_name: data.notebook.name,
-      output_panel: data.notebook.output_panel
+      output_view: update_in(data.notebook.output_panel, [
+        Access.key(:rows),
+        Access.all(),
+        Access.key(:items),
+        Access.all()
+      ], fn item ->
+        {:ok, cell, _section} = Notebook.fetch_cell_and_section(data.notebook, item.cell_id)
+        Map.put(item, :outputs, cell.outputs)
+      end)
     }
   end
 
@@ -71,15 +79,15 @@ defmodule LivebookWeb.SessionLive.ExternalWindowLive do
         </h1>
       </div>
       <div class="grid grid-cols-12">
-        <%= for output_row <- @data_view.output_panel.rows do %>
+        <%= for output_row <- @data_view.output_view.rows do %>
           <div :for={item <- output_row.items} class="grid col-span-12">
             <LivebookWeb.Output.outputs
               outputs={item.outputs}
               dom_id_map={%{}}
               session_id={@session.id}
               session_pid={@session.pid}
               client_id={@client_id}
-              cell_id={item.id}
+              cell_id={item.cell_id}
               input_views={%{}}
             />
           </div>