<%= @title %>
@@ -151,8 +185,108 @@ defmodule LivebookWeb.Hub.NewLive do
"""
end
+ defp disabled_class(true), do: "opacity-30 pointer-events-none"
+ defp disabled_class(false), do: ""
+
+ defp card_item_border_class(id, id), do: "border-gray-200"
+ defp card_item_border_class(_, _), do: "border-gray-100"
+
+ defp card_item_class(id, id), do: "bg-gray-200"
+ defp card_item_class(_, _), do: "bg-gray-100"
+
@impl true
- def handle_event("select_type", %{"value" => service}, socket) do
- {:noreply, assign(socket, selected_type: service)}
+ def handle_event("select_option", %{"value" => option}, socket) do
+ {:noreply,
+ socket
+ |> assign(selected_option: option)
+ |> assign_form(option)}
+ end
+
+ def handle_event("validate", %{"new_org" => attrs}, socket) do
+ changeset =
+ socket.assigns.org
+ |> Teams.change_org(attrs)
+ |> Map.replace!(:action, :validate)
+
+ {:noreply, assign_form(socket, changeset)}
+ end
+
+ def handle_event("save", %{"new_org" => attrs}, socket) do
+ case Teams.create_org(socket.assigns.org, attrs) do
+ {:ok, response} ->
+ attrs = Map.merge(attrs, response)
+ changeset = Teams.change_org(socket.assigns.org, attrs)
+ org = Ecto.Changeset.apply_action!(changeset, :insert)
+
+ Process.send_after(self(), :check_completion_data, @check_completion_data_internal)
+
+ {:noreply,
+ socket
+ |> assign(requested_code: true, org: org, verification_uri: response["verification_uri"])
+ |> assign_form(changeset)}
+
+ {:error, changeset} ->
+ {:noreply, assign_form(socket, changeset)}
+
+ {:transport_error, message} ->
+ {:noreply, put_flash(socket, :error, message)}
+ end
+ end
+
+ @impl true
+ def handle_info(:check_completion_data, %{assigns: %{org: org}} = socket) do
+ case Teams.get_org_request_completion_data(org) do
+ {:ok, :awaiting_confirmation} ->
+ Process.send_after(self(), :check_completion_data, @check_completion_data_internal)
+
+ {:noreply, socket}
+
+ {:ok, %{"id" => _id, "session_token" => _session_token} = response} ->
+ hub =
+ Teams.create_hub!(%{
+ org_id: response["id"],
+ user_id: response["user_id"],
+ org_key_id: response["org_key_id"],
+ session_token: response["session_token"],
+ teams_key: org.teams_key,
+ hub_name: org.name,
+ hub_emoji: org.emoji
+ })
+
+ {:noreply,
+ socket
+ |> put_flash(:success, "Hub added successfully")
+ |> push_navigate(to: ~p"/hub/#{hub.id}")}
+
+ {:error, :expired} ->
+ changeset = Teams.change_org(org, %{user_code: nil})
+
+ {:noreply,
+ socket
+ |> assign(requested_code: false, org: org, verification_uri: nil)
+ |> put_flash(
+ :error,
+ "Oh no! Your org creation request expired, could you please try again?"
+ )
+ |> assign_form(changeset)}
+
+ {:transport_error, message} ->
+ {:noreply, put_flash(socket, :error, message)}
+ end
+ end
+
+ def handle_info(_any, socket), do: {:noreply, socket}
+
+ defp assign_form(socket, "new-org") do
+ org = %Org{emoji: "💡"}
+ changeset = Teams.change_org(org)
+
+ socket
+ |> assign(org: org)
+ |> assign_form(changeset)
+ end
+
+ defp assign_form(socket, %Ecto.Changeset{} = changeset) do
+ assign(socket, org_form: to_form(changeset, as: :new_org))
end
end
diff --git a/test/livebook_web/live/hub/new_live_test.exs b/test/livebook_web/live/hub/new_live_test.exs
index f4ea3c8e8..c4307b6ef 100644
--- a/test/livebook_web/live/hub/new_live_test.exs
+++ b/test/livebook_web/live/hub/new_live_test.exs
@@ -1,166 +1,62 @@
defmodule LivebookWeb.Hub.NewLiveTest do
- use LivebookWeb.ConnCase
+ use Livebook.TeamsIntegrationCase, async: true
import Phoenix.LiveViewTest
- alias Livebook.Hubs
-
test "render hub selection cards", %{conn: conn} do
- {:ok, _view, html} = live(conn, ~p"/hub")
+ {:ok, view, _html} = live(conn, ~p"/hub")
- assert html =~ "Fly"
- assert html =~ "Livebook Teams"
+ # shows the new options
+ assert has_element?(view, "#new-org")
+ assert has_element?(view, "#join-org")
end
- describe "fly" do
- test "persists new hub", %{conn: conn} do
- fly_bypass("123456789")
+ describe "new-org" do
+ test "persist a new hub", %{conn: conn, node: node, user: user} do
+ name = "New Org Test #{System.unique_integer([:positive])}"
+ teams_key = Livebook.Teams.Org.teams_key()
{:ok, view, _html} = live(conn, ~p"/hub")
+ path = ~p"/hub/team-#{name}"
+ # select the new org option
assert view
- |> element("#fly")
- |> render_click() =~ "2. Configure your Hub"
+ |> element("#new-org")
+ |> render_click() =~ "2. Create your Organization"
- assert view
- |> element(~s/input[name="fly[access_token]"]/)
- |> render_change(%{"fly" => %{"access_token" => "dummy access token"}}) =~
- ~s(
)
+ # builds the form data
+ org_attrs = %{"new_org" => %{"name" => name, "teams_key" => teams_key, "emoji" => "🐈"}}
- attrs = %{
- "access_token" => "dummy access token",
- "application_id" => "123456789",
- "hub_name" => "My Foo Hub",
- "hub_emoji" => "🐈"
- }
+ # finds the form and change data
+ new_org_form = element(view, "#new-org-form")
+ render_change(new_org_form, org_attrs)
- view
- |> element("#fly-form")
- |> render_change(%{"fly" => attrs})
+ # submits the form
+ render_submit(new_org_form, org_attrs)
- refute view
- |> element("#fly-form .invalid-feedback")
- |> has_element?()
+ # check if the form has the url to confirm
+ link_element = element(view, "#new-org-form a")
+ html = render(link_element)
+ parsed_html = Floki.parse_document!(html)
+ assert [url] = Floki.attribute(parsed_html, "href")
+ assert [_port, [org_request_id]] = Regex.scan(~r/(?<=\D|^)\d{1,4}(?=\D|$)/, url)
+ id = String.to_integer(org_request_id)
- assert {:ok, view, _html} =
- view
- |> element("#fly-form")
- |> render_submit(%{"fly" => attrs})
- |> follow_redirect(conn)
+ # force org request confirmation
+ org_request = :erpc.call(node, Hub.Integration, :get_org_request!, [id])
+ :erpc.call(node, Hub.Integration, :confirm_org_request, [org_request, user])
- assert render(view) =~ "Hub added successfully"
+ # wait for the c:handle_info/2 cycle
+ # check if the page redirected to edit hub page
+ # and check the flash message
+ %{"success" => "Hub added successfully"} = assert_redirect(view, path, 1200)
+ # checks if the hub is in the sidebar
+ {:ok, view, _html} = live(conn, path)
hubs_html = view |> element("#hubs") |> render()
-
assert hubs_html =~ "🐈"
- assert hubs_html =~ "/hub/fly-123456789"
- assert hubs_html =~ "My Foo Hub"
+ assert hubs_html =~ path
+ assert hubs_html =~ name
end
-
- test "fails to create existing hub", %{conn: conn} do
- hub = insert_hub(:fly, id: "fly-foo", application_id: "foo")
- fly_bypass(hub.application_id)
-
- {:ok, view, _html} = live(conn, ~p"/hub")
-
- assert view
- |> element("#fly")
- |> render_click() =~ "2. Configure your Hub"
-
- assert view
- |> element(~s/input[name="fly[access_token]"]/)
- |> render_change(%{"fly" => %{"access_token" => "dummy access token"}}) =~
- ~s(
)
-
- attrs = %{
- "access_token" => "dummy access token",
- "application_id" => "foo",
- "hub_name" => "My Foo Hub",
- "hub_emoji" => "🐈"
- }
-
- view
- |> element("#fly-form")
- |> render_change(%{"fly" => attrs})
-
- refute view
- |> element("#fly-form .invalid-feedback")
- |> has_element?()
-
- assert view
- |> element("#fly-form")
- |> render_submit(%{"fly" => attrs}) =~ "already exists"
-
- assert_hub(view, hub)
- assert Hubs.fetch_hub!(hub.id) == hub
- end
- end
-
- defp fly_bypass(app_id) do
- bypass = Bypass.open()
- Application.put_env(:livebook, :fly_graphql_endpoint, "http://localhost:#{bypass.port}")
-
- Bypass.expect(bypass, "POST", "/", fn conn ->
- {:ok, body, conn} = Plug.Conn.read_body(conn)
- body = Jason.decode!(body)
-
- response =
- cond do
- body["query"] =~ "apps" -> fetch_apps_response(app_id)
- body["query"] =~ "app" -> fetch_app_response(app_id)
- end
-
- conn
- |> Plug.Conn.put_resp_content_type("application/json")
- |> Plug.Conn.resp(200, Jason.encode!(response))
- end)
- end
-
- defp fetch_apps_response(app_id) do
- app = %{
- "id" => app_id,
- "organization" => %{
- "id" => "l3soyvjmvtmwtl6l2drnbfuvltipprge",
- "name" => "Foo Bar",
- "type" => "PERSONAL"
- }
- }
-
- %{"data" => %{"apps" => %{"nodes" => [app]}}}
- end
-
- defp fetch_app_response(app_id) do
- app = %{
- "id" => app_id,
- "name" => app_id,
- "hostname" => app_id <> ".fly.dev",
- "platformVersion" => "nomad",
- "deployed" => true,
- "status" => "running",
- "secrets" => [
- %{
- "createdAt" => to_string(DateTime.utc_now()),
- "digest" => to_string(Livebook.Utils.random_cookie()),
- "id" => Livebook.Utils.random_short_id(),
- "name" => "LIVEBOOK_PASSWORD"
- },
- %{
- "createdAt" => to_string(DateTime.utc_now()),
- "digest" => to_string(Livebook.Utils.random_cookie()),
- "id" => Livebook.Utils.random_short_id(),
- "name" => "LIVEBOOK_SECRET_KEY_BASE"
- }
- ]
- }
-
- %{"data" => %{"app" => app}}
- end
-
- defp assert_hub(view, hub) do
- hubs_html = view |> element("#hubs") |> render()
-
- assert hubs_html =~ hub.hub_emoji
- assert hubs_html =~ ~p"/hub/#{hub.id}"
- assert hubs_html =~ hub.hub_name
end
end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 12a4f0a55..e4a3d233c 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -31,15 +31,17 @@ defmodule Livebook.Factory do
end
def build(:enterprise) do
- id = Livebook.Utils.random_id()
+ name = "Enteprise #{Livebook.Utils.random_short_id()}"
%Livebook.Hubs.Enterprise{
- id: "enterprise-#{id}",
- hub_name: "Enterprise",
+ id: "enterprise-#{name}",
+ hub_name: name,
hub_emoji: "🏭",
- external_id: id,
- token: Livebook.Utils.random_cookie(),
- url: "http://localhost"
+ org_id: 1,
+ user_id: 1,
+ org_key_id: 1,
+ teams_key: Livebook.Utils.random_id(),
+ session_token: Livebook.Utils.random_cookie()
}
end
@@ -74,6 +76,7 @@ defmodule Livebook.Factory do
def build(:org) do
%Livebook.Teams.Org{
id: nil,
+ emoji: "🏭",
name: "Org Name #{System.unique_integer([:positive])}",
teams_key: Livebook.Teams.Org.teams_key(),
user_code: "request"
-
- <:headline>
- Control access, manage secrets, and deploy notebooks within your team.
-
-
-