From d498e5146d4c2a4de0e6d89da88f4f3c3dd7791e Mon Sep 17 00:00:00 2001 From: ruslandoga <67764432+ruslandoga@users.noreply.github.com> Date: Sat, 6 Apr 2024 17:53:10 +0800 Subject: [PATCH] clamp import date ranges --- lib/plausible_web/live/csv_import.ex | 92 ++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 6 deletions(-) diff --git a/lib/plausible_web/live/csv_import.ex b/lib/plausible_web/live/csv_import.ex index 9b9211d6c..b3b9ace06 100644 --- a/lib/plausible_web/live/csv_import.ex +++ b/lib/plausible_web/live/csv_import.ex @@ -2,7 +2,9 @@ defmodule PlausibleWeb.Live.CSVImport do @moduledoc """ LiveView allowing uploading CSVs for imported tables to S3 or local storage """ + use PlausibleWeb, :live_view + require Plausible.Imported.SiteImport alias Plausible.Imported.CSVImporter # :not_mounted_at_router ensures we have already done auth checks in the controller @@ -45,13 +47,26 @@ defmodule PlausibleWeb.Live.CSVImport do end end + %{assigns: %{site: site}} = + socket = assign_new(socket, :site, fn -> Plausible.Repo.get!(Plausible.Site, site_id) end) + + occupied_ranges = + site + |> Plausible.Imported.list_all_imports(Plausible.Imported.SiteImport.completed()) + |> Enum.reject(&(Date.diff(&1.end_date, &1.start_date) < 2)) + |> Enum.map(&Date.range(&1.start_date, &1.end_date)) + + cutoff_date = Plausible.Sites.native_stats_start_date(site) || Timex.today(site.timezone) + socket = socket |> assign( site_id: site_id, user_id: user_id, storage: storage, - upload_consumer: upload_consumer + upload_consumer: upload_consumer, + occupied_ranges: occupied_ranges, + cutoff_date: cutoff_date ) |> allow_upload(:import, upload_opts) |> process_imported_tables() @@ -65,8 +80,12 @@ defmodule PlausibleWeb.Live.CSVImport do