From d6f758661b42b27d9dbfdf804b6ba6f6058f6022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonatan=20K=C5=82osko?= <jonatanklosko@gmail.com>
Date: Sat, 7 Jan 2023 15:18:31 +0100
Subject: [PATCH] Make automatic reevaluation more accessible (#1628)

---
 lib/livebook_web/live/session_live.ex         | 14 ++++
 .../live/session_live/cell_component.ex       | 71 +++++++++++++------
 .../live/session_live/section_component.ex    |  2 +-
 test/livebook_web/live/session_live_test.exs  | 14 ++++
 4 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/lib/livebook_web/live/session_live.ex b/lib/livebook_web/live/session_live.ex
index 6803ed980..a1df0f652 100644
--- a/lib/livebook_web/live/session_live.ex
+++ b/lib/livebook_web/live/session_live.ex
@@ -1260,6 +1260,20 @@ defmodule LivebookWeb.SessionLive do
     {:noreply, socket}
   end
 
+  def handle_event(
+        "set_reevaluate_automatically",
+        %{"value" => value, "cell_id" => cell_id},
+        socket
+      ) do
+    assert_policy!(socket, :edit)
+
+    Session.set_cell_attributes(socket.assigns.session.pid, cell_id, %{
+      reevaluate_automatically: value
+    })
+
+    {:noreply, socket}
+  end
+
   def handle_event("save", %{}, socket) do
     assert_policy!(socket, :edit)
 
diff --git a/lib/livebook_web/live/session_live/cell_component.ex b/lib/livebook_web/live/session_live/cell_component.ex
index 01ec93eb8..0a6570e16 100644
--- a/lib/livebook_web/live/session_live/cell_component.ex
+++ b/lib/livebook_web/live/session_live/cell_component.ex
@@ -295,31 +295,56 @@ defmodule LivebookWeb.SessionLive.CellComponent do
     """
   end
 
-  defp cell_evaluation_button(%{status: :ready, reevaluate_automatically: true} = assigns)
-       when assigns.validity in [:evaluated, :stale] do
-    ~H"""
-    <%= live_patch to: Routes.session_path(@socket, :cell_settings, @session_id, @cell_id),
-          class: "text-gray-600 hover:text-gray-800 focus:text-gray-800 flex space-x-1 items-center" do %>
-      <.remix_icon icon="check-line" class="text-xl" />
-      <span class="text-sm font-medium">
-        Reevaluates automatically
-      </span>
-    <% end %>
-    """
-  end
-
   defp cell_evaluation_button(%{status: :ready} = assigns) do
     ~H"""
-    <button
-      class="text-gray-600 hover:text-gray-800 focus:text-gray-800 flex space-x-1 items-center"
-      data-el-queue-cell-evaluation-button
-      data-cell-id={@cell_id}
-    >
-      <.remix_icon icon="play-circle-fill" class="text-xl" />
-      <span class="text-sm font-medium">
-        <%= if(@validity == :evaluated, do: "Reevaluate", else: "Evaluate") %>
-      </span>
-    </button>
+    <div class="flex items-center space-x-1">
+      <button
+        class="text-gray-600 hover:text-gray-800 focus:text-gray-800 flex space-x-1 items-center"
+        data-el-queue-cell-evaluation-button
+        data-cell-id={@cell_id}
+      >
+        <%= cond do %>
+          <% @reevaluate_automatically and @validity in [:evaluated, :stale] -> %>
+            <.remix_icon icon="check-line" class="text-xl" />
+            <span class="text-sm font-medium">Reevaluates automatically</span>
+          <% @validity == :evaluated -> %>
+            <.remix_icon icon="play-circle-fill" class="text-xl" />
+            <span class="text-sm font-medium">Reevaluate</span>
+          <% true -> %>
+            <.remix_icon icon="play-circle-fill" class="text-xl" />
+            <span class="text-sm font-medium">Evaluate</span>
+        <% end %>
+      </button>
+      <.menu id={"cell-#{@cell_id}-evaluation-menu"} position="bottom-left" distant>
+        <:toggle>
+          <button class="flex text-gray-600 hover:text-gray-800 focus:text-gray-800">
+            <.remix_icon icon="arrow-down-s-line" class="text-xl" />
+          </button>
+        </:toggle>
+        <:content>
+          <button
+            class={"menu-item #{if(not @reevaluate_automatically, do: "text-gray-900", else: "text-gray-500")}"}
+            role="menuitem"
+            phx-click={
+              JS.push("set_reevaluate_automatically", value: %{value: false, cell_id: @cell_id})
+            }
+          >
+            <.remix_icon icon="check-line" class={if(@reevaluate_automatically, do: "invisible")} />
+            <span class="font-medium">Evaluate on demand</span>
+          </button>
+          <button
+            class={"menu-item #{if(@reevaluate_automatically, do: "text-gray-900", else: "text-gray-500")}"}
+            role="menuitem"
+            phx-click={
+              JS.push("set_reevaluate_automatically", value: %{value: true, cell_id: @cell_id})
+            }
+          >
+            <.remix_icon icon="check-line" class={if(not @reevaluate_automatically, do: "invisible")} />
+            <span class="font-medium">Reevaluate automatically</span>
+          </button>
+        </:content>
+      </.menu>
+    </div>
     """
   end
 
diff --git a/lib/livebook_web/live/session_live/section_component.ex b/lib/livebook_web/live/session_live/section_component.ex
index bc266f9b4..f7f853939 100644
--- a/lib/livebook_web/live/session_live/section_component.ex
+++ b/lib/livebook_web/live/session_live/section_component.ex
@@ -54,7 +54,7 @@ defmodule LivebookWeb.SessionLive.SectionComponent do
                     </button>
                   <% else %>
                     <button
-                      class="menu-item text-gray-500 bg-gray-50"
+                      class="menu-item text-gray-500"
                       phx-click="set_section_parent"
                       phx-value-section_id={@section_view.id}
                       phx-value-parent_id={parent.id}
diff --git a/test/livebook_web/live/session_live_test.exs b/test/livebook_web/live/session_live_test.exs
index ace44a679..a98a5036d 100644
--- a/test/livebook_web/live/session_live_test.exs
+++ b/test/livebook_web/live/session_live_test.exs
@@ -194,6 +194,20 @@ defmodule LivebookWeb.SessionLiveTest do
                Session.get_data(session.pid)
     end
 
+    test "setting cell to always reevaluating", %{conn: conn, session: session} do
+      section_id = insert_section(session.pid)
+      cell_id = insert_text_cell(session.pid, section_id, :code)
+
+      {:ok, view, _} = live(conn, "/sessions/#{session.id}")
+
+      view
+      |> element("#cell-#{cell_id}-evaluation-menu button", "Reevaluate automatically")
+      |> render_click()
+
+      assert %{notebook: %{sections: [%{cells: [%Cell.Code{reevaluate_automatically: true}]}]}} =
+               Session.get_data(session.pid)
+    end
+
     test "inserting a cell below the given cell", %{conn: conn, session: session} do
       section_id = insert_section(session.pid)
       cell_id = insert_text_cell(session.pid, section_id, :code)