<%= live_component @socket, LiveBookWeb.InsertCellActions,
+ id: "#{@section.id}:0",
section_id: @section.id,
index: 0 %>
<%= for {cell, index} <- Enum.with_index(@section.cells) do %>
<%= live_component @socket, LiveBookWeb.Cell,
+ id: cell.id,
cell: cell,
cell_info: @cell_infos[cell.id],
focused: @selected and cell.id == @focused_cell_id,
expanded: @selected and cell.id == @focused_cell_id and @focused_cell_expanded %>
<%= live_component @socket, LiveBookWeb.InsertCellActions,
+ id: "#{@section.id}:#{index + 1}",
section_id: @section.id,
index: index + 1 %>
<% end %>
diff --git a/lib/live_book_web/live/session_live.ex b/lib/live_book_web/live/session_live.ex
index 5d0118331..854ac823d 100644
--- a/lib/live_book_web/live/session_live.ex
+++ b/lib/live_book_web/live/session_live.ex
@@ -75,6 +75,7 @@ defmodule LiveBookWeb.SessionLive do
<%= for section <- @data.notebook.sections do %>
<%= live_component @socket, LiveBookWeb.Section,
+ id: section.id,
section: section,
selected: section.id == @selected_section_id,
cell_infos: @data.cell_infos,
@@ -187,6 +188,20 @@ defmodule LiveBookWeb.SessionLive do
end
end
+ def handle_event("queue_cell_evaluation", %{"cell_id" => cell_id}, socket) do
+ Session.queue_cell_evaluation(socket.assigns.session_id, cell_id)
+
+ {:noreply, socket}
+ end
+
+ def handle_event("queue_cell_evaluation", %{}, socket) do
+ if socket.assigns.focused_cell_id do
+ Session.queue_cell_evaluation(socket.assigns.session_id, socket.assigns.focused_cell_id)
+ end
+
+ {:noreply, socket}
+ end
+
@impl true
def handle_info({:operation, operation}, socket) do
case Session.Data.apply_operation(socket.assigns.data, operation) do
diff --git a/test/live_book/session/data_test.exs b/test/live_book/session/data_test.exs
index 3686c80b1..1679d8360 100644
--- a/test/live_book/session/data_test.exs
+++ b/test/live_book/session/data_test.exs
@@ -252,14 +252,73 @@ defmodule LiveBook.Session.DataTest do
end
describe "apply_operation/2 given :add_cell_evaluation_stdout" do
- test "update the cell output" do
- # TODO assert against output being updated once we do so
+ test "updates the cell outputs" do
+ data =
+ data_after_operations!([
+ {:insert_section, 0, "s1"},
+ {:insert_cell, "s1", 0, :elixir, "c1"},
+ {:queue_cell_evaluation, "c1"}
+ ])
+
+ operation = {:add_cell_evaluation_stdout, "c1", "Hello!"}
+
+ assert {:ok,
+ %{
+ notebook: %{
+ sections: [
+ %{
+ cells: [%{outputs: ["Hello!"]}]
+ }
+ ]
+ }
+ }, []} = Data.apply_operation(data, operation)
+ end
+
+ test "merges consecutive stdout results" do
+ data =
+ data_after_operations!([
+ {:insert_section, 0, "s1"},
+ {:insert_cell, "s1", 0, :elixir, "c1"},
+ {:queue_cell_evaluation, "c1"},
+ {:add_cell_evaluation_stdout, "c1", "Hello"}
+ ])
+
+ operation = {:add_cell_evaluation_stdout, "c1", " amigo!"}
+
+ assert {:ok,
+ %{
+ notebook: %{
+ sections: [
+ %{
+ cells: [%{outputs: ["Hello amigo!"]}]
+ }
+ ]
+ }
+ }, []} = Data.apply_operation(data, operation)
end
end
describe "apply_operation/2 given :add_cell_evaluation_response" do
- test "update the cell output" do
- # TODO assert against output being updated once we do so
+ test "updates the cell outputs" do
+ data =
+ data_after_operations!([
+ {:insert_section, 0, "s1"},
+ {:insert_cell, "s1", 0, :elixir, "c1"},
+ {:queue_cell_evaluation, "c1"}
+ ])
+
+ operation = {:add_cell_evaluation_response, "c1", {:ok, [1, 2, 3]}}
+
+ assert {:ok,
+ %{
+ notebook: %{
+ sections: [
+ %{
+ cells: [%{outputs: [{:ok, [1, 2, 3]}]}]
+ }
+ ]
+ }
+ }, []} = Data.apply_operation(data, operation)
end
test "marks the cell as evaluated" do
diff --git a/test/live_book_web/live/session_live_test.exs b/test/live_book_web/live/session_live_test.exs
index 6d3f62c80..819c27a1b 100644
--- a/test/live_book_web/live/session_live_test.exs
+++ b/test/live_book_web/live/session_live_test.exs
@@ -3,7 +3,7 @@ defmodule LiveBookWeb.SessionLiveTest do
import Phoenix.LiveViewTest
- alias LiveBook.{SessionSupervisor, Session}
+ alias LiveBook.{SessionSupervisor, Session, Delta}
setup do
{:ok, session_id} = SessionSupervisor.create_session()
@@ -29,48 +29,42 @@ defmodule LiveBookWeb.SessionLiveTest do
test "renders a newly inserted section", %{conn: conn, session_id: session_id} do
{:ok, view, _} = live(conn, "/sessions/#{session_id}")
- Session.insert_section(session_id, 0)
- %{notebook: %{sections: [section]}} = Session.get_data(session_id)
+ section_id = insert_section(session_id)
- assert render(view) =~ section.id
+ assert render(view) =~ section_id
end
test "renders an updated section name", %{conn: conn, session_id: session_id} do
- Session.insert_section(session_id, 0)
- %{notebook: %{sections: [section]}} = Session.get_data(session_id)
+ section_id = insert_section(session_id)
{:ok, view, _} = live(conn, "/sessions/#{session_id}")
- Session.set_section_name(session_id, section.id, "My section")
+ Session.set_section_name(session_id, section_id, "My section")
wait_for_session_update(session_id)
assert render(view) =~ "My section"
end
test "renders a newly inserted cell", %{conn: conn, session_id: session_id} do
- Session.insert_section(session_id, 0)
- %{notebook: %{sections: [section]}} = Session.get_data(session_id)
+ section_id = insert_section(session_id)
{:ok, view, _} = live(conn, "/sessions/#{session_id}")
- Session.insert_cell(session_id, section.id, 0, :markdown)
- %{notebook: %{sections: [%{cells: [cell]}]}} = Session.get_data(session_id)
+ cell_id = insert_cell(session_id, section_id, :markdown)
- assert render(view) =~ cell.id
+ assert render(view) =~ cell_id
end
test "un-renders a deleted cell", %{conn: conn, session_id: session_id} do
- Session.insert_section(session_id, 0)
- %{notebook: %{sections: [section]}} = Session.get_data(session_id)
- Session.insert_cell(session_id, section.id, 0, :markdown)
- %{notebook: %{sections: [%{cells: [cell]}]}} = Session.get_data(session_id)
+ section_id = insert_section(session_id)
+ cell_id = insert_cell(session_id, section_id, :markdown)
{:ok, view, _} = live(conn, "/sessions/#{session_id}")
- Session.delete_cell(session_id, cell.id)
+ Session.delete_cell(session_id, cell_id)
wait_for_session_update(session_id)
- refute render(view) =~ cell.id
+ refute render(view) =~ cell_id
end
end
@@ -97,6 +91,40 @@ defmodule LiveBookWeb.SessionLiveTest do
assert %{notebook: %{sections: [%{cells: [%{type: :markdown}]}]}} =
Session.get_data(session_id)
end
+
+ test "queueing cell evaluation updates the shared state", %{conn: conn, session_id: session_id} do
+ section_id = insert_section(session_id)
+ cell_id = insert_cell(session_id, section_id, :elixir, "Process.sleep(5)")
+
+ {:ok, view, _} = live(conn, "/sessions/#{session_id}")
+
+ view
+ |> element("#session")
+ |> render_hook("queue_cell_evaluation", %{"cell_id" => cell_id})
+
+ assert %{cell_infos: %{^cell_id => %{evaluation_status: :evaluating}}} =
+ Session.get_data(session_id)
+ end
+
+ test "queueing cell evaluation defaults to the focused cell if no cell id is given",
+ %{conn: conn, session_id: session_id} do
+
+ section_id = insert_section(session_id)
+ cell_id = insert_cell(session_id, section_id, :elixir, "Process.sleep(5)")
+
+ {:ok, view, _} = live(conn, "/sessions/#{session_id}")
+
+ view
+ |> element("#session")
+ |> render_hook("focus_cell", %{"cell_id" => cell_id})
+
+ view
+ |> element("#session")
+ |> render_hook("queue_cell_evaluation", %{})
+
+ assert %{cell_infos: %{^cell_id => %{evaluation_status: :evaluating}}} =
+ Session.get_data(session_id)
+ end
end
defp wait_for_session_update(session_id) do
@@ -105,4 +133,23 @@ defmodule LiveBookWeb.SessionLiveTest do
Session.get_data(session_id)
:ok
end
+
+ # Utils for sending session requests, waiting for the change to be applied
+ # and retrieving new ids if applicable.
+
+ defp insert_section(session_id) do
+ Session.insert_section(session_id, 0)
+ %{notebook: %{sections: [section]}} = Session.get_data(session_id)
+ section.id
+ end
+
+ defp insert_cell(session_id, section_id, type, content \\ "") do
+ Session.insert_cell(session_id, section_id, 0, type)
+ %{notebook: %{sections: [%{cells: [cell]}]}} = Session.get_data(session_id)
+
+ delta = Delta.new(insert: content)
+ Session.apply_cell_delta(session_id, self(), cell.id, delta, 1)
+
+ cell.id
+ end
end