<.remix_icon icon="windy-line" class="text-xl" />
No results
<% true -> %>
- <%= for {entry, idx} <- Enum.with_index(@entries) do %>
- <.dependency_entry entry={entry} idx={idx} />
+ <%= for {package, idx} <- Enum.with_index(@packages) do %>
+ <.package package={package} idx={idx} />
<% end %>
<% end %>
@@ -66,20 +66,20 @@ defmodule LivebookWeb.SessionLive.DependencySearchLive do
"""
end
- defp dependency_entry(assigns) do
+ defp package(assigns) do
~H"""
- <%= if @entry[:url] do %>
-
<%= @entry.name %>
+ <%= if @package[:url] do %>
+
<%= @package.name %>
<% else %>
-
<%= @entry.name %>
+
<%= @package.name %>
<% end %>
-
<%= @entry.version %>
+
<%= @package.version %>
- <%= @entry.description %>
+ <%= @package.description %>
@@ -102,7 +102,7 @@ defmodule LivebookWeb.SessionLive.DependencySearchLive do
@impl true
def handle_event("submit", %{}, socket) do
socket =
- case socket.assigns.entries do
+ case socket.assigns.packages do
[] -> socket
[first | _] -> add_dependency(socket, first.dependency)
end
@@ -112,20 +112,20 @@ defmodule LivebookWeb.SessionLive.DependencySearchLive do
@impl true
def handle_event("add", %{"idx" => idx}, socket) do
- entry = Enum.fetch!(socket.assigns.entries, idx)
- socket = add_dependency(socket, entry.dependency)
+ package = Enum.fetch!(socket.assigns.packages, idx)
+ socket = add_dependency(socket, package.dependency)
{:noreply, socket}
end
@impl true
def handle_info(
- {:runtime_search_dependencies_response, ref, response},
+ {:runtime_search_packages_response, ref, response},
%{assigns: %{search_ref: ref}} = socket
) do
socket =
case response do
- {:ok, entries} ->
- assign(socket, entries: entries, error_message: nil)
+ {:ok, packages} ->
+ assign(socket, packages: packages, error_message: nil)
{:error, message} ->
assign(socket, error_message: Livebook.Utils.upcase_first(message))
@@ -137,7 +137,7 @@ defmodule LivebookWeb.SessionLive.DependencySearchLive do
def handle_info(_message, socket), do: {:noreply, socket}
defp do_search(socket, search) do
- search_ref = Livebook.Runtime.search_dependencies(socket.assigns.runtime, self(), search)
+ search_ref = Livebook.Runtime.search_packages(socket.assigns.runtime, self(), search)
assign(socket, search_ref: search_ref, search: search)
end
diff --git a/lib/livebook_web/live/session_live/shortcuts_component.ex b/lib/livebook_web/live/session_live/shortcuts_component.ex
index ad9276a12..42c38dc44 100644
--- a/lib/livebook_web/live/session_live/shortcuts_component.ex
+++ b/lib/livebook_web/live/session_live/shortcuts_component.ex
@@ -101,7 +101,7 @@ defmodule LivebookWeb.SessionLive.ShortcutsComponent do
%{seq: ["s", "u"], desc: "Toggle users panel"},
%{seq: ["s", "r"], desc: "Show runtime panel"},
%{seq: ["s", "b"], desc: "Show bin"},
- %{seq: ["s", "d"], desc: "Show dependency search"},
+ %{seq: ["s", "p"], desc: "Show package search"},
%{seq: ["0", "0"], desc: "Reconnect current runtime"}
],
universal: [
diff --git a/lib/livebook_web/router.ex b/lib/livebook_web/router.ex
index 070e4ac7e..eac9b9b47 100644
--- a/lib/livebook_web/router.ex
+++ b/lib/livebook_web/router.ex
@@ -65,7 +65,7 @@ defmodule LivebookWeb.Router do
live "/sessions/:id/cell-settings/:cell_id", SessionLive, :cell_settings
live "/sessions/:id/cell-upload/:cell_id", SessionLive, :cell_upload
live "/sessions/:id/delete-section/:section_id", SessionLive, :delete_section
- live "/sessions/:id/dependency-search", SessionLive, :dependency_search
+ live "/sessions/:id/package-search", SessionLive, :package_search
get "/sessions/:id/images/:image", SessionController, :show_image
live "/sessions/:id/*path_parts", SessionLive, :catch_all
end
diff --git a/test/livebook/runtime/dependencies_test.exs b/test/livebook/runtime/dependencies_test.exs
index 830d7fc73..666fd9b48 100644
--- a/test/livebook/runtime/dependencies_test.exs
+++ b/test/livebook/runtime/dependencies_test.exs
@@ -196,7 +196,7 @@ defmodule Livebook.Runtime.DependenciesTest do
{:ok, bypass: bypass}
end
- test "parses the response into dependency entries", %{bypass: bypass} do
+ test "parses the response into a list of packages", %{bypass: bypass} do
Bypass.expect_once(bypass, "GET", "/api/packages", fn conn ->
conn
|> Plug.Conn.put_resp_content_type("application/json")
diff --git a/test/livebook_web/live/session_live_test.exs b/test/livebook_web/live/session_live_test.exs
index c562b0ed2..4614e7877 100644
--- a/test/livebook_web/live/session_live_test.exs
+++ b/test/livebook_web/live/session_live_test.exs
@@ -896,9 +896,9 @@ defmodule LivebookWeb.SessionLiveTest do
end
end
- describe "dependency search" do
+ describe "package search" do
test "lists search entries", %{conn: conn, session: session} do
- {:ok, view, _} = live(conn, "/sessions/#{session.id}/dependency-search")
+ {:ok, view, _} = live(conn, "/sessions/#{session.id}/package-search")
[search_view] = live_children(view)
diff --git a/test/support/noop_runtime.ex b/test/support/noop_runtime.ex
index c95d1c295..9bc3e72b7 100644
--- a/test/support/noop_runtime.ex
+++ b/test/support/noop_runtime.ex
@@ -37,6 +37,6 @@ defmodule Livebook.Runtime.NoopRuntime do
Livebook.Runtime.Dependencies.add_mix_deps(code, dependencies)
end
- def search_dependencies(_, _, _), do: make_ref()
+ def search_packages(_, _, _), do: make_ref()
end
end
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 2f5718cd4..b821318e6 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -18,8 +18,8 @@ Application.put_env(:livebook, :runtime_modules, [
Livebook.Runtime.Embedded
])
-defmodule Livebook.Runtime.Embedded.Dependencies do
- def entries() do
+defmodule Livebook.Runtime.Embedded.Packages do
+ def list() do
[
%{
dependency: {:jason, "~> 1.3.0"},
@@ -34,7 +34,7 @@ end
# Enable dependency saerch for the embedded runtime
Application.put_env(:livebook, Livebook.Runtime.Embedded,
- load_dependency_entries: {Livebook.Runtime.Embedded.Dependencies, :entries, []}
+ load_packages: {Livebook.Runtime.Embedded.Packages, :list, []}
)
# Disable autosaving