Trim down descriptions (#2673)

This commit is contained in:
José Valim 2024-06-24 22:34:09 +02:00 committed by GitHub
parent 726a668f53
commit 50afcf2b60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 29 deletions

View file

@ -45,16 +45,9 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
App server setup App server setup
</h3> </h3>
<p class="text-gray-700"> <p class="text-gray-700 mb-2">
App server is an instance of Livebook where you can deploy Livebook App servers are instances of Livebook running inside your infrastructure
apps via Livebook Teams. Each app server belongs to a specific that you deploy your apps to. Follow the instructions below to start new instances.
deployment group.
</p>
<p class="mb-5 text-gray-700">
Use the instructions below to set up an instance in your own infrastructure.
Once the instance is running, it will connect to Livebook Teams and become
available for app deployments.
</p> </p>
<div :if={@messages != []} class="flex flex-col gap-2"> <div :if={@messages != []} class="flex flex-col gap-2">
@ -63,8 +56,17 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
</.message_box> </.message_box>
</div> </div>
<.form :let={f} for={@changeset} as={:data} phx-change="validate" phx-target={@myself}>
<.radio_field
label="Base Docker image"
field={f[:docker_tag]}
options={LivebookWeb.AppComponents.docker_tag_options()}
/>
</.form>
<.form <.form
:let={f} :let={f}
:if={match?([_, _ | _], @deployment_group.agent_keys)}
for={%{"id" => @agent_key_id}} for={%{"id" => @agent_key_id}}
as={:agent_key} as={:agent_key}
phx-change="select_agent_key" phx-change="select_agent_key"
@ -83,16 +85,8 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
</div> </div>
</.form> </.form>
<.form :let={f} for={@changeset} as={:data} phx-change="validate" phx-target={@myself}>
<.radio_field
label="Base image"
field={f[:docker_tag]}
options={LivebookWeb.AppComponents.docker_tag_options()}
/>
</.form>
<%= if @agent_key_id do %> <%= if @agent_key_id do %>
<div class="mt-5"> <div class="mt-2">
<.tabs id="deployment-instruction" default="docker"> <.tabs id="deployment-instruction" default="docker">
<:tab id="docker" label="Docker"> <:tab id="docker" label="Docker">
<div class="flex flex-col gap-3"> <div class="flex flex-col gap-3">
@ -117,7 +111,7 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
<:tab id="fly_io" label="Fly.io"> <:tab id="fly_io" label="Fly.io">
<div class="flex flex-col gap-3"> <div class="flex flex-col gap-3">
<p class="text-gray-700"> <p class="text-gray-700">
Deploy an app server to Fly.io with a few simple commands. Deploy an app server to Fly.io with a few commands.
</p> </p>
<div> <div>
<div class="flex items-end mb-1 gap-1"> <div class="flex items-end mb-1 gap-1">

View file

@ -152,8 +152,8 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
</.message_box> </.message_box>
<% else %> <% else %>
<.message_box kind={:info}> <.message_box kind={:info}>
Awaiting an app server to be set up. If you deploy the app, Awaiting an app server to be set up. If you click "Deploy anyway",
it will only start once there is an app server to run it. the app will only start once there is an app server.
</.message_box> </.message_box>
<% end %> <% end %>
<div class="flex gap-2"> <div class="flex gap-2">
@ -180,15 +180,14 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
~H""" ~H"""
<div class="flex flex-col gap-6"> <div class="flex flex-col gap-6">
<p class="text-gray-700"> <p class="text-gray-700">
Deploy this app to your cloud infrastructure. The app will be pushed to the Livebook Deploy this app to your cloud infrastructure using the <.workspace hub={@hub} /> workspace.
Teams app servers associated with the deployment group that you choose.
</p> </p>
<%= if @deployment_group do %> <%= if @deployment_group do %>
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<div class="flex justify-between items-center"> <div class="flex justify-between items-center">
<p class="text-gray-700"> <p class="text-gray-700">
Using deployment group in <.workspace hub={@hub} /> workspace: Deploying to:
</p> </p>
<button class="font-medium text-blue-600" phx-click="unselect_deployment_group"> <button class="font-medium text-blue-600" phx-click="unselect_deployment_group">
Change Change
@ -205,13 +204,13 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
</div> </div>
<div :if={@app_deployment} class="space-y-3"> <div :if={@app_deployment} class="space-y-3">
<p class="text-gray-700">Currently deployed version:</p> <p class="text-gray-700">Current version:</p>
<.app_deployment_card app_deployment={@app_deployment} /> <.app_deployment_card app_deployment={@app_deployment} />
</div> </div>
<.message_box :if={@num_agents[@deployment_group.id] == nil} kind={:warning}> <.message_box :if={@num_agents[@deployment_group.id] == nil} kind={:warning}>
The selected deployment group has no app servers. If you deploy the app, The selected deployment group has no app servers. If you click "Deploy anyway",
it will only start once there is an app server to run it. the app will only start once there is an app server.
</.message_box> </.message_box>
<%= if @num_agents[@deployment_group.id] do %> <%= if @num_agents[@deployment_group.id] do %>
@ -243,7 +242,7 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
<div :if={@deployment_groups != []} class="flex flex-col gap-2"> <div :if={@deployment_groups != []} class="flex flex-col gap-2">
<p class="text-gray-700"> <p class="text-gray-700">
Online deployment groups in <.workspace hub={@hub} /> workspace: Choose a deployment group:
</p> </p>
<div class="flex flex-col gap-3"> <div class="flex flex-col gap-3">
<.deployment_group_entry <.deployment_group_entry
@ -341,6 +340,9 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
defp app_deployment_card(assigns) do defp app_deployment_card(assigns) do
~H""" ~H"""
<div class="flex gap-4 sm:gap-12 border border-gray-200 rounded-lg p-4"> <div class="flex gap-4 sm:gap-12 border border-gray-200 rounded-lg p-4">
<.labeled_text label="Slug">
/<%= @app_deployment.slug %>
</.labeled_text>
<.labeled_text label="Title"> <.labeled_text label="Title">
<%= @app_deployment.title %> <%= @app_deployment.title %>
</.labeled_text> </.labeled_text>