mirror of
https://github.com/livebook-dev/livebook.git
synced 2024-09-20 18:15:56 +08:00
Deployment groups adjustments (#2414)
Co-authored-by: Jonatan Kłosko <jonatanklosko@gmail.com>
This commit is contained in:
parent
04299baf49
commit
4f38fea5cd
|
@ -31,7 +31,7 @@ defmodule Livebook.Config do
|
|||
name: "Teleport",
|
||||
value: "Teleport cluster address",
|
||||
module: Livebook.ZTA.Teleport,
|
||||
help: "Example: https://[cluster-name]:3080"
|
||||
placeholder: "https://[cluster-name]:3080"
|
||||
}
|
||||
]
|
||||
|
||||
|
|
|
@ -354,7 +354,8 @@ defmodule Livebook.LiveMarkdown.Import do
|
|||
if is_nil(hub_id) or Hubs.hub_exists?(hub_id) do
|
||||
{attrs, true, messages}
|
||||
else
|
||||
{Map.delete(attrs, :hub_id), false, messages ++ [@unknown_hub_message]}
|
||||
{Map.drop(attrs, [:hub_id, :deployment_group_id]), false,
|
||||
messages ++ [@unknown_hub_message]}
|
||||
end
|
||||
|
||||
# We identify a single leading cell as the setup cell, in any
|
||||
|
|
|
@ -160,7 +160,7 @@ defmodule LivebookWeb.AppHelpers do
|
|||
:if={zta_metadata = zta_metadata(@form[:zta_provider].value)}
|
||||
field={@form[:zta_key]}
|
||||
label={zta_metadata.value}
|
||||
help={zta_help(zta_metadata)}
|
||||
placeholder={zta_placeholder(zta_metadata)}
|
||||
phx-debounce
|
||||
disabled={@form[:ready_only].value}
|
||||
class="disabled:cursor-not-allowed"
|
||||
|
@ -301,6 +301,6 @@ defmodule LivebookWeb.AppHelpers do
|
|||
Enum.reject(apps, &(&1.slug == app.slug))
|
||||
end
|
||||
|
||||
defp zta_help(%{help: help}), do: "#{help}"
|
||||
defp zta_help(_), do: nil
|
||||
defp zta_placeholder(%{placeholder: placeholder}), do: placeholder
|
||||
defp zta_placeholder(_), do: nil
|
||||
end
|
||||
|
|
|
@ -105,11 +105,7 @@ defmodule LivebookWeb.SessionLive.AppDockerComponent do
|
|||
id="select_deployment_group_form"
|
||||
>
|
||||
<.select_field
|
||||
help={
|
||||
~S'''
|
||||
Share deployment credentials, secrets, and configuration with deployment groups.
|
||||
'''
|
||||
}
|
||||
help={deployment_group_help()}
|
||||
field={@deployment_group_form[:deployment_group_id]}
|
||||
options={deployment_group_options(@deployment_groups)}
|
||||
label="Deployment Group"
|
||||
|
@ -119,7 +115,9 @@ defmodule LivebookWeb.SessionLive.AppDockerComponent do
|
|||
</.form>
|
||||
<% else %>
|
||||
<p class="text-gray-700">
|
||||
<.label>Deployment Group</.label>
|
||||
<.label help={deployment_group_help()}>
|
||||
Deployment Group
|
||||
</.label>
|
||||
<span>No deployment groups available</span>
|
||||
</p>
|
||||
<% end %>
|
||||
|
@ -285,4 +283,8 @@ defmodule LivebookWeb.SessionLive.AppDockerComponent do
|
|||
assigns.changeset
|
||||
end
|
||||
end
|
||||
|
||||
defp deployment_group_help() do
|
||||
"Share deployment credentials, secrets, and configuration with deployment groups."
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue