Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 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
11 changes: 10 additions & 1 deletion lib/livebook/apps/manager.ex
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,13 @@ defmodule Livebook.Apps.Manager do
{state, up_to_date_app_specs, schedule_sync?} ->
case fetch_app(app_spec.slug) do
{:ok, _state, app} when app.app_spec.version == app_spec.version ->
{state, [app_spec | up_to_date_app_specs], schedule_sync?}
if changed_app_folder?(app.app_spec, app_spec) do
ref = redeploy(app, app_spec)
state = track_deployment(state, app_spec, ref)
{state, up_to_date_app_specs, schedule_sync?}
else
{state, [app_spec | up_to_date_app_specs], schedule_sync?}
end

{:ok, :reachable, app} ->
ref = redeploy(app, app_spec)
Expand Down Expand Up @@ -338,4 +344,7 @@ defmodule Livebook.Apps.Manager do
deployment.ref == ref && deployment
end)
end

defp changed_app_folder?(%{app_folder_id: id}, %{app_folder_id: id2}), do: id != id2
defp changed_app_folder?(_, _), do: false
end
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
2 changes: 2 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
Loading
Loading