Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/livebook/apps/teams_app_spec.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ defmodule Livebook.Apps.TeamsAppSpec do

@enforce_keys [:slug, :version, :hub_id, :app_deployment_id]

defstruct [:slug, :version, :hub_id, :app_deployment_id]
defstruct [:slug, :version, :hub_id, :app_deployment_id, :app_folder_id]
end

defimpl Livebook.Apps.AppSpec, for: Livebook.Apps.TeamsAppSpec do
Expand Down
3 changes: 2 additions & 1 deletion lib/livebook/hubs/team.ex
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ defimpl Livebook.Hubs.Provider, for: Livebook.Hubs.Team do
slug: app_deployment.slug,
version: app_deployment.version,
hub_id: app_deployment.hub_id,
app_deployment_id: app_deployment.id
app_deployment_id: app_deployment.id,
app_folder_id: app_deployment.app_folder_id
}
end
end
Expand Down
15 changes: 15 additions & 0 deletions lib/livebook/hubs/team_client.ex
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ defmodule Livebook.Hubs.TeamClient do
@spec get_app_folders(String.t()) :: list(Teams.AppFolder.t())
def get_app_folders(id) do
GenServer.call(registry_name(id), :get_app_folders)
catch
:exit, _ -> []
end

@doc """
Expand Down Expand Up @@ -865,6 +867,19 @@ defmodule Livebook.Hubs.TeamClient do
defp handle_event(:app_deployment_updated, %Teams.AppDeployment{} = app_deployment, state) do
manager_sync(app_deployment, state)
Teams.Broadcasts.app_deployment_updated(app_deployment)

with {:ok, current_app_deployment} <- fetch_app_deployment(app_deployment.id, state) do
if state.deployment_group_id &&
(current_app_deployment.app_folder_id !=
app_deployment.app_folder_id or
current_app_deployment.authorization_groups != app_deployment.authorization_groups) do
{:ok, deployment_group} =
fetch_deployment_group(app_deployment.deployment_group_id, state)

Teams.Broadcasts.server_authorization_updated(deployment_group)
end
end

put_app_deployment(state, app_deployment)
end

Expand Down
18 changes: 8 additions & 10 deletions lib/livebook/live_markdown/import.ex
Original file line number Diff line number Diff line change
Expand Up @@ -667,25 +667,23 @@ defmodule Livebook.LiveMarkdown.Import do
# validate it against the public key).
teams_enabled = is_struct(hub, Livebook.Hubs.Team) and (hub.offline == nil or stamp_verified?)

{app_settings, messages} =
messages =
if app_folder_id = notebook.app_settings.app_folder_id do
app_folders = Hubs.Provider.get_app_folders(hub)

if Enum.any?(app_folders, &(&1.id == app_folder_id)) do
{notebook.app_settings, messages}
messages
else
{Map.replace!(notebook.app_settings, :app_folder_id, nil),
messages ++
[
"notebook is assigned to a non-existent app folder, defaulting to ungrouped app folder"
]}
messages ++
[
"notebook is assigned to a non-existent app folder, defaulting to ungrouped app folder"
]
end
else
{notebook.app_settings, messages}
messages
end

{%{notebook | app_settings: app_settings, teams_enabled: teams_enabled}, stamp_verified?,
messages}
{%{notebook | teams_enabled: teams_enabled}, stamp_verified?, messages}
end

defp safe_binary_split(binary, offset)
Expand Down
Loading