diff --git a/lib/plausible_web/live/imports_exports_settings.ex b/lib/plausible_web/live/imports_exports_settings.ex
index dffd6b244..0bdc76780 100644
--- a/lib/plausible_web/live/imports_exports_settings.ex
+++ b/lib/plausible_web/live/imports_exports_settings.ex
@@ -42,7 +42,39 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do
end
def render(assigns) do
+ import_in_progress? =
+ Enum.any?(
+ assigns.site_imports,
+ &(&1.live_status in [SiteImport.pending(), SiteImport.importing()])
+ )
+
+ assigns = assign(assigns, :import_in_progress?, import_in_progress?)
+
~H"""
+
+ <.button_link
+ class="w-36 h-20"
+ theme="bright"
+ disabled={@import_in_progress?}
+ href={Plausible.Google.API.import_authorize_url(@site.id, "import", legacy: false)}
+ >
+

+
+
+ <.button_link
+ class="w-36 h-20"
+ theme="bright"
+ disabled={@import_in_progress?}
+ href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}
+ >
+

+
+
+
+
+ No new imports can be started until the import in progress is completed or cancelled.
+
+
Existing Imports
diff --git a/lib/plausible_web/templates/site/settings_imports_exports.html.heex b/lib/plausible_web/templates/site/settings_imports_exports.html.heex
index 4011ac033..5236c1601 100644
--- a/lib/plausible_web/templates/site/settings_imports_exports.html.heex
+++ b/lib/plausible_web/templates/site/settings_imports_exports.html.heex
@@ -10,24 +10,6 @@
-
-
-
-
-
-
-
-
-
-
<%= live_render(@conn, PlausibleWeb.Live.ImportsExportsSettings,
session: %{"domain" => @site.domain}
) %>
diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs
index 6b6d0cb22..eae1a62c0 100644
--- a/test/plausible_web/controllers/site_controller_test.exs
+++ b/test/plausible_web/controllers/site_controller_test.exs
@@ -680,6 +680,25 @@ defmodule PlausibleWeb.SiteControllerTest do
assert resp =~ "Google Analytics (123456)"
assert resp =~ "(98 page views)"
end
+
+ test "disables import buttons when there's import in progress", %{conn: conn, site: site} do
+ _site_import1 = insert(:site_import, site: site, status: SiteImport.completed())
+ _site_import2 = insert(:site_import, site: site, status: SiteImport.importing())
+
+ conn = get(conn, "/#{site.domain}/settings/imports-exports")
+ assert html_response(conn, 200) =~ "No new imports can be started"
+ end
+
+ test "enables import buttons when all imports are in completed or failed state", %{
+ conn: conn,
+ site: site
+ } do
+ _site_import1 = insert(:site_import, site: site, status: SiteImport.completed())
+ _site_import2 = insert(:site_import, site: site, status: SiteImport.failed())
+
+ conn = get(conn, "/#{site.domain}/settings/imports-exports")
+ refute html_response(conn, 200) =~ "No new imports can be started"
+ end
end
describe "GET /:website/settings/integrations for self-hosting" do