From 93fe2f9b61a76c2da9d2bfb7a86f5d6e230154a5 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Tue, 11 Nov 2025 19:04:58 +0200 Subject: [PATCH 01/24] Remove useless modal popup --- .../live/users/media.html.heex | 152 ------------------ .../live/users/media_detail.html.heex | 1 - 2 files changed, 153 deletions(-) diff --git a/lib/phoenix_kit_web/live/users/media.html.heex b/lib/phoenix_kit_web/live/users/media.html.heex index f4365f819..8616357fc 100644 --- a/lib/phoenix_kit_web/live/users/media.html.heex +++ b/lib/phoenix_kit_web/live/users/media.html.heex @@ -30,156 +30,6 @@ - <%!-- Image Preview Modal (Client-side controlled) --%> - -
- <%!-- Large Image Preview --%> -
- Image preview - -
- - <%!-- File Info --%> -

-
- - - -
- - <%!-- Download Links --%> -
-

Download variants:

- -
- - <%!-- Close Button --%> -
- -
-
-
- -
- - - <%!-- Modal Control Script --%> - - <%!-- Uploaded Files --%> <%= if @total_count > 0 do %>
@@ -198,8 +48,6 @@ <.link navigate={PhoenixKit.Utils.Routes.path("/admin/users/media/#{file.file_id}")} class="group relative aspect-square bg-base-300 rounded-lg overflow-hidden cursor-pointer hover:shadow-lg transition-shadow" - data-file-id={file.file_id} - data-file-data={Jason.encode!(file)} > <% image_url = file.urls["medium"] || file.urls["original"] %> <%= if image_url do %> diff --git a/lib/phoenix_kit_web/live/users/media_detail.html.heex b/lib/phoenix_kit_web/live/users/media_detail.html.heex index 09c3efb76..791216fc0 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.html.heex +++ b/lib/phoenix_kit_web/live/users/media_detail.html.heex @@ -18,7 +18,6 @@ <%= if @file_data do %>

{@file_data.filename}

-

Shareable media file

<% else %>

File Not Found

The requested media file could not be found

From c53700fd53a0ef4581eb351fa970367d6d939787 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Tue, 11 Nov 2025 20:15:42 +0200 Subject: [PATCH 02/24] Updated media details page --- .../live/users/media_detail.ex | 62 +++++++++ .../live/users/media_detail.html.heex | 121 +++++++++++++++++- 2 files changed, 181 insertions(+), 2 deletions(-) diff --git a/lib/phoenix_kit_web/live/users/media_detail.ex b/lib/phoenix_kit_web/live/users/media_detail.ex index cbca8ab25..26c60efb3 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.ex +++ b/lib/phoenix_kit_web/live/users/media_detail.ex @@ -10,6 +10,7 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do require Logger alias PhoenixKit.Settings + alias PhoenixKit.Storage alias PhoenixKit.Storage.File alias PhoenixKit.Storage.FileInstance alias PhoenixKit.Storage.URLSigner @@ -43,6 +44,56 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do {:ok, socket} end + def handle_event("toggle_edit", _params, socket) do + {:noreply, assign(socket, :edit_mode, !socket.assigns.edit_mode)} + end + + def handle_event("save_metadata", params, socket) do + %{"title" => title, "description" => description, "tags" => tags_input} = params + + # Parse tags from comma-separated string + tags = + tags_input + |> String.split(",") + |> Enum.map(&String.trim/1) + |> Enum.filter(&(String.length(&1) > 0)) + + # Update metadata + updated_metadata = + (socket.assigns.file.metadata || %{}) + |> Map.put("title", title) + |> Map.put("description", description) + |> Map.put("tags", tags) + + case Storage.update_file(socket.assigns.file, %{metadata: updated_metadata}) do + {:ok, updated_file} -> + # Update file_data with new metadata + updated_file_data = + socket.assigns.file_data + |> Map.put(:title, title) + |> Map.put(:description, description) + |> Map.put(:tags, tags) + |> Map.put(:metadata, updated_metadata) + + socket = + socket + |> assign(:file, updated_file) + |> assign(:file_data, updated_file_data) + |> assign(:edit_mode, false) + |> put_flash(:info, "Metadata saved successfully!") + + {:noreply, socket} + + {:error, _changeset} -> + socket = put_flash(socket, :error, "Failed to save metadata") + {:noreply, socket} + end + end + + def handle_event("cancel_edit", _params, socket) do + {:noreply, assign(socket, :edit_mode, false)} + end + defp load_file_data(socket, file_id) do repo = Application.get_env(:phoenix_kit, :repo) import Ecto.Query @@ -63,6 +114,12 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do # Generate URLs from instances urls = generate_urls_from_instances(instances, file_id) + # Extract metadata + metadata = file.metadata || %{} + title = metadata["title"] || "" + description = metadata["description"] || "" + tags = metadata["tags"] || [] + # Build file data map file_data = %{ file_id: file.id, @@ -73,6 +130,10 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do size: file.size || 0, status: file.status, urls: urls, + title: title, + description: description, + tags: tags, + metadata: metadata, inserted_at: file.inserted_at, updated_at: file.updated_at } @@ -80,6 +141,7 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do socket |> assign(:file, file) |> assign(:file_data, file_data) + |> assign(:edit_mode, false) end end diff --git a/lib/phoenix_kit_web/live/users/media_detail.html.heex b/lib/phoenix_kit_web/live/users/media_detail.html.heex index 791216fc0..568779803 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.html.heex +++ b/lib/phoenix_kit_web/live/users/media_detail.html.heex @@ -54,6 +54,125 @@ <% end %>
+ <%!-- Metadata Section --%> +
+
+

Media Information

+ +
+ + <%= if @edit_mode do %> +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ <% else %> +
+
+
+ Title + + <%= if String.length(@file_data.title) > 0 do %> + {@file_data.title} + <% else %> + — + <% end %> + +
+
+ +
+
+ Description + + <%= if String.length(@file_data.description) > 0 do %> + {@file_data.description} + <% else %> + — + <% end %> + +
+
+ +
+ Tags +
+ <%= if Enum.empty?(@file_data.tags) do %> + — + <% else %> + <%= for tag <- @file_data.tags do %> + {tag} + <% end %> + <% end %> +
+
+
+ <% end %> +
+ + <%!-- Divider --%> +
+ <%!-- File Information --%>
@@ -119,8 +238,6 @@ <%!-- Download Links --%> <%= if map_size(@file_data.urls) > 0 do %> -
-

Download Variants:

From 228d5efe490494115c91ed548405030eb93e4296 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Tue, 11 Nov 2025 20:49:44 +0200 Subject: [PATCH 03/24] Made sure bucket shuffling does work when uploading files --- lib/phoenix_kit/storage.ex | 36 +++++++++++++++++- lib/phoenix_kit/storage/manager.ex | 40 ++++++++++---------- lib/phoenix_kit/storage/variant_generator.ex | 33 ++++++++++++++-- 3 files changed, 85 insertions(+), 24 deletions(-) diff --git a/lib/phoenix_kit/storage.ex b/lib/phoenix_kit/storage.ex index f20e223c3..165f56fd2 100644 --- a/lib/phoenix_kit/storage.ex +++ b/lib/phoenix_kit/storage.ex @@ -476,6 +476,20 @@ defmodule PhoenixKit.Storage do repo().get_by(FileInstance, file_id: file_id, variant_name: variant_name) end + @doc """ + Gets the bucket IDs where a file instance is stored. + + Returns a list of bucket IDs from the file_locations for the given file instance. + """ + def get_file_instance_bucket_ids(file_instance_id) do + import Ecto.Query + + FileLocation + |> where([fl], fl.file_instance_id == ^file_instance_id and fl.status == "active") + |> select([fl], fl.bucket_id) + |> repo().all() + end + @doc """ Creates a new file instance. """ @@ -803,7 +817,7 @@ defmodule PhoenixKit.Storage do original_path = "#{file_path}/#{md5_hash}_original.#{ext}" case Manager.store_file(source_path, path_prefix: original_path) do - {:ok, _storage_info} -> + {:ok, storage_info} -> # Create file instance for original original_instance_attrs = %{ variant_name: "original", @@ -817,7 +831,9 @@ defmodule PhoenixKit.Storage do } case create_file_instance(original_instance_attrs) do - {:ok, _instance} -> + {:ok, instance} -> + # Create file location records for each bucket where the file was stored + _ = create_file_locations(instance.id, storage_info.bucket_ids, original_path) {:ok, file} {:error, changeset} -> @@ -1055,4 +1071,20 @@ defmodule PhoenixKit.Storage do random_name = :crypto.strong_rand_bytes(8) |> Base.encode16(case: :lower) Path.join(temp_dir, "phoenix_kit_#{random_name}") end + + defp create_file_locations(file_instance_id, bucket_ids, file_path) do + Enum.each(bucket_ids, fn bucket_id -> + location_attrs = %{ + path: file_path, + status: "active", + priority: 0, + file_instance_id: file_instance_id, + bucket_id: bucket_id + } + + repo().insert(%FileLocation{} |> FileLocation.changeset(location_attrs)) + end) + + :ok + end end diff --git a/lib/phoenix_kit/storage/manager.ex b/lib/phoenix_kit/storage/manager.ex index db97fc6e6..af41bfdc6 100644 --- a/lib/phoenix_kit/storage/manager.ex +++ b/lib/phoenix_kit/storage/manager.ex @@ -18,6 +18,7 @@ defmodule PhoenixKit.Storage.Manager do - `:redundancy_copies` - Number of copies to store (default: from settings) - `:priority_buckets` - List of specific bucket IDs to use (default: auto-select) + - `:force_bucket_ids` - List of specific bucket IDs to use (overrides priority_buckets) - `:generate_variants` - Whether to generate variants (default: from settings) ## Returns @@ -28,11 +29,15 @@ defmodule PhoenixKit.Storage.Manager do def store_file(source_path, opts \\ []) do # Get redundancy settings redundancy_copies = Keyword.get(opts, :redundancy_copies, get_redundancy_copies()) + force_bucket_ids = Keyword.get(opts, :force_bucket_ids, []) priority_buckets = Keyword.get(opts, :priority_buckets, []) _generate_variants = Keyword.get(opts, :generate_variants, get_auto_generate_variants()) + # Use force_bucket_ids if provided, otherwise use priority_buckets + buckets_to_use = if Enum.empty?(force_bucket_ids), do: priority_buckets, else: force_bucket_ids + # Select buckets for storage - buckets = select_buckets_for_storage(redundancy_copies, priority_buckets) + buckets = select_buckets_for_storage(redundancy_copies, buckets_to_use) if Enum.empty?(buckets) do {:error, "No available storage buckets"} @@ -113,13 +118,24 @@ defmodule PhoenixKit.Storage.Manager do defp select_buckets_for_storage(redundancy_copies, priority_buckets) do if Enum.empty?(priority_buckets) do - # Auto-select buckets based on priority and available space - get_enabled_buckets() - |> Enum.sort_by(&bucket_priority/1) + # Get fresh bucket list from database (don't use cache for selection) + # This ensures we get the current state and can shuffle properly + all_buckets = PhoenixKit.Storage.list_enabled_buckets() + + # Separate buckets by priority + {auto_priority_buckets, fixed_priority_buckets} = + Enum.split_with(all_buckets, &(&1.priority == 0)) + + # Shuffle auto-priority buckets (priority = 0) for random distribution + # Fixed priority buckets are deterministic + shuffled_auto = Enum.shuffle(auto_priority_buckets) + + # Combine: fixed priority buckets first (sorted), then shuffled auto-priority + (Enum.sort_by(fixed_priority_buckets, & &1.priority) ++ shuffled_auto) |> Enum.take(redundancy_copies) else # Use specified buckets - get_enabled_buckets() + PhoenixKit.Storage.list_enabled_buckets() |> Enum.filter(&(&1.id in priority_buckets)) |> Enum.take(redundancy_copies) end @@ -189,20 +205,6 @@ defmodule PhoenixKit.Storage.Manager do provider_module end - defp bucket_priority(bucket) do - if bucket.priority == 0 do - # Random priority - use available space as tiebreaker - used_space = PhoenixKit.Storage.calculate_bucket_usage(bucket.id) - # Large default - max_space = bucket.max_size_mb || 1_000_000 - free_space_ratio = (max_space - used_space) / max_space - # Negative for descending sort - {0, -free_space_ratio} - else - {bucket.priority, 0} - end - end - defp generate_destination_path(source_path, opts) do original_name = Path.basename(source_path) extension = Path.extname(original_name) diff --git a/lib/phoenix_kit/storage/variant_generator.ex b/lib/phoenix_kit/storage/variant_generator.ex index 279fc044e..9d83ffa11 100644 --- a/lib/phoenix_kit/storage/variant_generator.ex +++ b/lib/phoenix_kit/storage/variant_generator.ex @@ -116,7 +116,7 @@ defmodule PhoenixKit.Storage.VariantGenerator do process_variant(original_path, variant_path, file.mime_type, dimension), {:ok, file_stats} <- get_variant_file_stats(variant_path), {:ok, _storage_info} <- - store_variant_file(variant_path, variant_name, variant_storage_path), + store_variant_file(variant_path, variant_name, variant_storage_path, file.id), {:ok, instance} <- create_variant_instance( file, @@ -147,10 +147,37 @@ defmodule PhoenixKit.Storage.VariantGenerator do end end - defp store_variant_file(variant_path, variant_name, storage_path) do + defp store_variant_file(variant_path, variant_name, storage_path, file_id) do Logger.info("Storing variant #{variant_name} to storage buckets at path: #{storage_path}") - case Manager.store_file(variant_path, generate_variants: false, path_prefix: storage_path) do + # Get the bucket IDs from the original file instance if available + opts = + case file_id do + nil -> + [generate_variants: false, path_prefix: storage_path] + + file_id -> + # Get the original instance's bucket IDs + case Storage.get_file_instance_by_name(file_id, "original") do + %Storage.FileInstance{id: original_instance_id} -> + bucket_ids = Storage.get_file_instance_bucket_ids(original_instance_id) + + if Enum.empty?(bucket_ids) do + [generate_variants: false, path_prefix: storage_path] + else + [ + generate_variants: false, + path_prefix: storage_path, + force_bucket_ids: bucket_ids + ] + end + + nil -> + [generate_variants: false, path_prefix: storage_path] + end + end + + case Manager.store_file(variant_path, opts) do {:ok, _storage_info} = success -> Logger.info("Variant #{variant_name} stored successfully in buckets") success From ec1972d5b23723a91183cbc3e73588a49aaab5c9 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Tue, 11 Nov 2025 21:21:24 +0200 Subject: [PATCH 04/24] Added storage locations in the media details page --- .../live/users/media_detail.ex | 28 ++++++++++++++++++- .../live/users/media_detail.html.heex | 20 +++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/lib/phoenix_kit_web/live/users/media_detail.ex b/lib/phoenix_kit_web/live/users/media_detail.ex index 26c60efb3..1c0a591d2 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.ex +++ b/lib/phoenix_kit_web/live/users/media_detail.ex @@ -13,6 +13,7 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do alias PhoenixKit.Storage alias PhoenixKit.Storage.File alias PhoenixKit.Storage.FileInstance + alias PhoenixKit.Storage.FileLocation alias PhoenixKit.Storage.URLSigner alias PhoenixKit.Utils.Routes alias PhoenixKit.Utils.Date, as: UtilsDate @@ -114,6 +115,13 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do # Generate URLs from instances urls = generate_urls_from_instances(instances, file_id) + # Load file locations for the original instance + locations = + case Enum.find(instances, &(&1.variant_name == "original")) do + nil -> [] + original_instance -> load_file_locations(original_instance.id, repo) + end + # Extract metadata metadata = file.metadata || %{} title = metadata["title"] || "" @@ -135,7 +143,8 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do tags: tags, metadata: metadata, inserted_at: file.inserted_at, - updated_at: file.updated_at + updated_at: file.updated_at, + locations: locations } socket @@ -153,6 +162,23 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do end) end + # Load file locations with bucket information + defp load_file_locations(file_instance_id, repo) do + import Ecto.Query + + FileLocation + |> where([fl], fl.file_instance_id == ^file_instance_id and fl.status == "active") + |> preload(:bucket) + |> repo.all() + |> Enum.map(fn location -> + %{ + bucket_name: location.bucket.name, + bucket_provider: location.bucket.provider, + path: location.path + } + end) + end + # Format file size in human-readable format defp format_file_size(bytes) when is_integer(bytes) do cond do diff --git a/lib/phoenix_kit_web/live/users/media_detail.html.heex b/lib/phoenix_kit_web/live/users/media_detail.html.heex index 568779803..f3720e10a 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.html.heex +++ b/lib/phoenix_kit_web/live/users/media_detail.html.heex @@ -236,6 +236,26 @@
+ <%!-- Storage Locations --%> + <%= if not Enum.empty?(@file_data.locations) do %> +
+ +
+ <%= for location <- @file_data.locations do %> +
+
+
+

{location.bucket_name}

+

{location.path}

+

Provider: {String.upcase(location.bucket_provider)}

+
+
+
+ <% end %> +
+
+ <% end %> + <%!-- Download Links --%> <%= if map_size(@file_data.urls) > 0 do %>
From d744aa0733dd259bb3b109c58b020cfad3e884fa Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 17:53:09 +0200 Subject: [PATCH 05/24] Updated the Upload file button to cleaner layout --- .../components/core/file_upload.ex | 49 ++++++++------ lib/phoenix_kit_web/live/users/media.ex | 5 ++ .../live/users/media.html.heex | 67 ++++++++++++++----- 3 files changed, 84 insertions(+), 37 deletions(-) diff --git a/lib/phoenix_kit_web/components/core/file_upload.ex b/lib/phoenix_kit_web/components/core/file_upload.ex index 6a69ccb1a..bfffc87c8 100644 --- a/lib/phoenix_kit_web/components/core/file_upload.ex +++ b/lib/phoenix_kit_web/components/core/file_upload.ex @@ -33,29 +33,40 @@ defmodule PhoenixKitWeb.Components.Core.FileUpload do def file_upload(assigns) do ~H"""
- <%!-- Upload Form with phx-change on form not file input --%>
@upload.ref}> - - <.live_file_input upload={@upload} class="hidden" /> -
+ <%!-- Drag and Drop Zone --%> +
@upload.ref} + > + + <.live_file_input upload={@upload} class="hidden" /> +
- <%!-- File Type and Size Info --%> - <%= if @accept_description != nil or @max_size_description != nil do %> -

- <%= if @accept_description do %> - Supported formats: {@accept_description} + <%!-- File Type and Size Info --%> + <%= if @accept_description != nil or @max_size_description != nil do %> +

<%= if @max_size_description do %> -
+ Maximum file size: {@max_size_description} <% end %> - <% end %> - <%= if @max_size_description do %> - Maximum file size: {@max_size_description} - <% end %> -

- <% end %> +

+ <% end %> + <%!-- Active Uploads --%> <%= if length(@upload.entries) > 0 do %> diff --git a/lib/phoenix_kit_web/live/users/media.ex b/lib/phoenix_kit_web/live/users/media.ex index 5d064faa8..2eb13e3c6 100644 --- a/lib/phoenix_kit_web/live/users/media.ex +++ b/lib/phoenix_kit_web/live/users/media.ex @@ -40,6 +40,7 @@ defmodule PhoenixKitWeb.Live.Users.Media do |> assign(:project_title, settings["project_title"]) |> assign(:current_locale, locale) |> assign(:url_path, Routes.path("/admin/users/media")) + |> assign(:show_upload, false) {:ok, socket} end @@ -64,6 +65,10 @@ defmodule PhoenixKitWeb.Live.Users.Media do {:noreply, socket} end + def handle_event("toggle_upload", _params, socket) do + {:noreply, assign(socket, :show_upload, !socket.assigns.show_upload)} + end + def handle_event("validate", _params, socket) do # File selection event - files will auto-upload entries = socket.assigns.uploads.media_files.entries diff --git a/lib/phoenix_kit_web/live/users/media.html.heex b/lib/phoenix_kit_web/live/users/media.html.heex index 8616357fc..ab05b2a00 100644 --- a/lib/phoenix_kit_web/live/users/media.html.heex +++ b/lib/phoenix_kit_web/live/users/media.html.heex @@ -12,30 +12,44 @@

Manage user media and uploads

- <%!-- Upload Section --%> -
-
-

Upload Media

-

- Upload images, videos, or PDFs. Files are automatically processed and optimized. -

+ <%!-- Upload Section (Hidden by default) --%> + <%= if @show_upload do %> +
+
+

Upload Media

+

+ Upload images, videos, or PDFs. Files are automatically processed and optimized. +

- <.file_upload - upload={@uploads.media_files} - label="Upload Media Files" - icon="hero-cloud-arrow-up" - accept_description="JPG, PNG, WebP, MP4, WebM, PDF" - max_size_description="100MB per file" - /> + <.file_upload + upload={@uploads.media_files} + label="Upload Media Files" + icon="hero-cloud-arrow-up" + accept_description="JPG, PNG, WebP, MP4, WebM, PDF" + max_size_description="100MB per file" + /> +
-
+ <% end %> <%!-- Uploaded Files --%> <%= if @total_count > 0 do %>
-

Uploaded Files ({@total_count})

+
+

Uploaded Files ({@total_count})

+ +
<.pagination_info page={@current_page} per_page={@per_page} @@ -89,8 +103,25 @@
<% else %> -
-

No media uploaded yet. Upload your first file above!

+
+
+
+

Uploaded Files

+ +
+
+

No media uploaded yet. Upload your first file above!

+
+
<% end %>
From 6b6fc7d50451bdc25e8b15a8604b051897df6a46 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 18:00:22 +0200 Subject: [PATCH 06/24] Added uploaded by to media details page --- lib/phoenix_kit_web/live/users/media_detail.ex | 15 ++++++++++++++- .../live/users/media_detail.html.heex | 5 +++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/phoenix_kit_web/live/users/media_detail.ex b/lib/phoenix_kit_web/live/users/media_detail.ex index 1c0a591d2..ceb0b1240 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.ex +++ b/lib/phoenix_kit_web/live/users/media_detail.ex @@ -128,6 +128,18 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do description = metadata["description"] || "" tags = metadata["tags"] || [] + # Get user information if available + user_name = + case file.user_id do + nil -> "Unknown" + user_id -> + alias_module = Application.get_env(:phoenix_kit, :users_module, PhoenixKit.Users.Auth.User) + case repo.get(alias_module, user_id) do + nil -> "Unknown" + user -> user.email + end + end + # Build file data map file_data = %{ file_id: file.id, @@ -144,7 +156,8 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do metadata: metadata, inserted_at: file.inserted_at, updated_at: file.updated_at, - locations: locations + locations: locations, + user_name: user_name } socket diff --git a/lib/phoenix_kit_web/live/users/media_detail.html.heex b/lib/phoenix_kit_web/live/users/media_detail.html.heex index f3720e10a..b7bccd2a0 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.html.heex +++ b/lib/phoenix_kit_web/live/users/media_detail.html.heex @@ -209,6 +209,11 @@

{@file_data.mime_type}

+
+ +

{@file_data.user_name}

+
+

From 2ab617a532c74dfd27c762da5433e475ce3b0d40 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 18:49:43 +0200 Subject: [PATCH 07/24] Updated the upload component to return the file id that was uploaded. --- .../components/core/file_upload.ex | 1 + lib/phoenix_kit_web/live/users/media.ex | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/lib/phoenix_kit_web/components/core/file_upload.ex b/lib/phoenix_kit_web/components/core/file_upload.ex index bfffc87c8..2ecb154d8 100644 --- a/lib/phoenix_kit_web/components/core/file_upload.ex +++ b/lib/phoenix_kit_web/components/core/file_upload.ex @@ -29,6 +29,7 @@ defmodule PhoenixKitWeb.Components.Core.FileUpload do attr :icon, :string, default: "hero-cloud-arrow-up" attr :accept_description, :string, default: nil attr :max_size_description, :string, default: nil + attr :uploaded_file_ids, :list, default: nil, doc: "List of file IDs from last upload (for external use)" def file_upload(assigns) do ~H""" diff --git a/lib/phoenix_kit_web/live/users/media.ex b/lib/phoenix_kit_web/live/users/media.ex index 2eb13e3c6..ff013ef0f 100644 --- a/lib/phoenix_kit_web/live/users/media.ex +++ b/lib/phoenix_kit_web/live/users/media.ex @@ -41,6 +41,7 @@ defmodule PhoenixKitWeb.Live.Users.Media do |> assign(:current_locale, locale) |> assign(:url_path, Routes.path("/admin/users/media")) |> assign(:show_upload, false) + |> assign(:last_uploaded_file_ids, []) {:ok, socket} end @@ -86,6 +87,13 @@ defmodule PhoenixKitWeb.Live.Users.Media do {:noreply, cancel_upload(socket, :media_files, ref)} end + def handle_info({:file_uploaded, file_id}, socket) do + # This event can be used by other modules listening to uploaded files + # For example, avatar upload systems can listen for this event + Logger.info("File uploaded with ID: #{file_id}") + {:noreply, socket} + end + def handle_info(:check_uploads_complete, socket) do entries = socket.assigns.uploads.media_files.entries @@ -168,16 +176,23 @@ defmodule PhoenixKitWeb.Live.Users.Media do {refreshed_files, total_count} = load_existing_files(page, per_page) total_pages = ceil(total_count / per_page) + # Extract file IDs for callbacks + file_ids = Enum.map(uploaded_files, &get_file_id/1) + socket = socket |> assign(:uploaded_files, refreshed_files) |> assign(:total_count, total_count) |> assign(:total_pages, total_pages) + |> assign(:last_uploaded_file_ids, file_ids) |> put_flash(:info, "Upload successful! #{length(uploaded_files)} file(s) processed") {:noreply, socket} end + defp get_file_id({:ok, %{file_id: file_id}}), do: file_id + defp get_file_id(_), do: nil + # Generate URLs from pre-loaded instances (no database query needed) defp generate_urls_from_instances(instances, file_id) do Enum.reduce(instances, %{}, fn instance, acc -> From 74d2d045d481e19abc068c55c3585c1e42982bfb Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:16:17 +0200 Subject: [PATCH 08/24] Created single public update_user_avatar that would create instances and update the avatar id --- lib/phoenix_kit/users/auth.ex | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/lib/phoenix_kit/users/auth.ex b/lib/phoenix_kit/users/auth.ex index ed37cf08d..929c1a4c1 100644 --- a/lib/phoenix_kit/users/auth.ex +++ b/lib/phoenix_kit/users/auth.ex @@ -910,6 +910,89 @@ defmodule PhoenixKit.Users.Auth do update_user_custom_fields(user, merged_custom_fields) end + @doc """ + Update a user's avatar by storing the file and saving the file ID. + + This function handles the complete avatar upload workflow: + 1. Stores the file in configured storage buckets + 2. Automatically queues background job for variant generation + 3. Saves the file ID to the user's custom_fields + + This is a convenience function that combines file storage with user update. + Can be called from any context (LiveView, controllers, scripts, etc.) outside + of the PhoenixKit project. + + ## Parameters + - `user` - The User struct to update + - `file_path` - Path to the uploaded file (temporary location) + - `filename` - Original filename for the upload + - `user_id` - The user ID owning this file (defaults to user.id) + + ## Returns + - `{:ok, user}` - Avatar saved successfully + - `{:error, reason}` - File storage or update failed + + ## Examples + + # Store avatar in default location with automatic variant generation + {:ok, updated_user} = Auth.update_user_avatar(user, "/tmp/upload_xyz", "avatar.jpg") + + # Store with explicit user_id (for custom workflows) + {:ok, updated_user} = Auth.update_user_avatar(user, "/tmp/upload_xyz", "avatar.jpg", custom_user_id) + + ## Automatically Generated Variants + The storage layer automatically generates these image variants: + - original - Full-size image + - large - 800x800px + - medium - 400x400px + - small - 200x200px + - thumbnail - 100x100px + """ + def update_user_avatar(%User{} = user, file_path, filename, user_id \\ nil) do + user_id = user_id || user.id + + # Calculate file hash + file_hash = calculate_file_hash(file_path) + + # Get file extension + ext = Path.extname(filename) |> String.replace_leading(".", "") + + # Store file in buckets (automatically queues ProcessFileJob for variants) + case PhoenixKit.Storage.store_file_in_buckets( + file_path, + "image", + user_id, + file_hash, + ext, + filename + ) do + {:ok, file} -> + # Save the file ID to user's custom fields + update_user_fields(user, %{"avatar_file_id" => file.id}) + + {:error, reason} -> + {:error, reason} + end + end + + @doc """ + Calculate SHA256 hash of a file. + + Used internally for file integrity verification. + + ## Parameters + - `file_path` - Path to the file + + ## Returns + - String containing the lowercase hexadecimal SHA256 hash + """ + def calculate_file_hash(file_path) do + file_path + |> File.read!() + |> then(fn data -> :crypto.hash(:sha256, data) end) + |> Base.encode16(case: :lower) + end + @doc """ Bulk update multiple users with the same field values. From 0f6019a1cba33eabd049a4d609175a03f914b15a Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:18:25 +0200 Subject: [PATCH 09/24] Added proccessing file in the upload function to create instances --- lib/phoenix_kit/storage.ex | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/phoenix_kit/storage.ex b/lib/phoenix_kit/storage.ex index 165f56fd2..b98476fd2 100644 --- a/lib/phoenix_kit/storage.ex +++ b/lib/phoenix_kit/storage.ex @@ -834,6 +834,13 @@ defmodule PhoenixKit.Storage do {:ok, instance} -> # Create file location records for each bucket where the file was stored _ = create_file_locations(instance.id, storage_info.bucket_ids, original_path) + + # Queue background job for variant processing + _ = + %{file_id: file.id, user_id: user_id, filename: orig_filename} + |> PhoenixKit.Storage.Workers.ProcessFileJob.new() + |> Oban.insert() + {:ok, file} {:error, changeset} -> From 9759e979dfc750d540c23cc90e03ed7aa100bf1d Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:19:36 +0200 Subject: [PATCH 10/24] Updated media upload --- .../components/core/file_upload.ex | 63 ++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/lib/phoenix_kit_web/components/core/file_upload.ex b/lib/phoenix_kit_web/components/core/file_upload.ex index 2ecb154d8..45ba7c50b 100644 --- a/lib/phoenix_kit_web/components/core/file_upload.ex +++ b/lib/phoenix_kit_web/components/core/file_upload.ex @@ -29,9 +29,23 @@ defmodule PhoenixKitWeb.Components.Core.FileUpload do attr :icon, :string, default: "hero-cloud-arrow-up" attr :accept_description, :string, default: nil attr :max_size_description, :string, default: nil - attr :uploaded_file_ids, :list, default: nil, doc: "List of file IDs from last upload (for external use)" + + attr :uploaded_file_ids, :list, + default: nil, + doc: "List of file IDs from last upload (for external use)" + + attr :variant, :string, + default: "full", + doc: "Display variant - 'full' for drag-drop zone, 'button' for simple button only" def file_upload(assigns) do + case assigns.variant do + "button" -> button_upload(assigns) + _ -> full_upload(assigns) + end + end + + defp full_upload(assigns) do ~H"""

@upload.ref}> @@ -107,4 +121,51 @@ defmodule PhoenixKitWeb.Components.Core.FileUpload do
""" end + + defp button_upload(assigns) do + ~H""" +
+ @upload.ref}> + + <.live_file_input upload={@upload} class="hidden" /> + + + <%!-- Active Uploads --%> + <%= if length(@upload.entries) > 0 do %> +
+ <%= for entry <- @upload.entries do %> +
+
+

{entry.client_name}

+ + {entry.progress}% + +
+ + <%!-- Cancel Button --%> + +
+ <% end %> +
+ <% end %> +
+ """ + end end From e0ecbd8bec226b601363d34ec936a7b9f17ac702 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:20:55 +0200 Subject: [PATCH 11/24] Moved the process file logic --- lib/phoenix_kit_web/live/users/media.ex | 37 ++++--------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/lib/phoenix_kit_web/live/users/media.ex b/lib/phoenix_kit_web/live/users/media.ex index ff013ef0f..03a200358 100644 --- a/lib/phoenix_kit_web/live/users/media.ex +++ b/lib/phoenix_kit_web/live/users/media.ex @@ -12,7 +12,7 @@ defmodule PhoenixKitWeb.Live.Users.Media do alias PhoenixKit.Settings alias PhoenixKit.Storage.FileInstance alias PhoenixKit.Storage.URLSigner - alias PhoenixKit.Storage.Workers.ProcessFileJob + alias PhoenixKit.Users.Auth alias PhoenixKit.Utils.Routes def mount(params, _session, socket) do @@ -132,7 +132,7 @@ defmodule PhoenixKitWeb.Live.Users.Media do file_size = stat.size # Calculate hash - file_hash = calculate_file_hash(path) + file_hash = Auth.calculate_file_hash(path) # Store file in storage case PhoenixKit.Storage.store_file_in_buckets( @@ -144,14 +144,8 @@ defmodule PhoenixKitWeb.Live.Users.Media do entry.client_name ) do {:ok, file} -> - # Queue background job for processing - _job = - %{file_id: file.id, user_id: user_id, filename: entry.client_name} - |> ProcessFileJob.new() - |> Oban.insert() - - # Generate URLs for available variants (start with original) - urls = generate_file_urls(file.id) + # Note: ProcessFileJob is now automatically queued in Storage.store_file_in_buckets + # Variants will be generated asynchronously and loaded when page data is refreshed {:ok, %{ @@ -161,7 +155,7 @@ defmodule PhoenixKitWeb.Live.Users.Media do mime_type: mime_type, size: file_size, status: file.status, - urls: urls + urls: %{} }} {:error, reason} -> @@ -201,27 +195,6 @@ defmodule PhoenixKitWeb.Live.Users.Media do end) end - # Legacy function for cases where we need to query a single file's instances - defp generate_file_urls(file_id) do - import Ecto.Query - - repo = Application.get_env(:phoenix_kit, :repo) - - instances = - FileInstance - |> where([fi], fi.file_id == ^file_id) - |> repo.all() - - generate_urls_from_instances(instances, file_id) - end - - defp calculate_file_hash(file_path) do - file_path - |> Elixir.File.read!() - |> then(fn data -> :crypto.hash(:sha256, data) end) - |> Base.encode16(case: :lower) - end - defp determine_file_type(mime_type) do cond do String.starts_with?(mime_type, "image/") -> "image" From 86d0ee6202543260fe38a017090850a030c5dfef Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:21:29 +0200 Subject: [PATCH 12/24] Added avatar upload logic for the user edit page --- lib/phoenix_kit_web/users/user_form.ex | 131 ++++++++++++++++++ lib/phoenix_kit_web/users/user_form.html.heex | 79 +++++++++++ 2 files changed, 210 insertions(+) diff --git a/lib/phoenix_kit_web/users/user_form.ex b/lib/phoenix_kit_web/users/user_form.ex index e5716c348..104d0d481 100644 --- a/lib/phoenix_kit_web/users/user_form.ex +++ b/lib/phoenix_kit_web/users/user_form.ex @@ -8,6 +8,8 @@ defmodule PhoenixKitWeb.Users.UserForm do """ use PhoenixKitWeb, :live_view + require Logger + alias PhoenixKit.Settings alias PhoenixKit.Users.Auth alias PhoenixKit.Users.CustomFields @@ -34,6 +36,12 @@ defmodule PhoenixKitWeb.Users.UserForm do socket = socket + |> allow_upload(:avatar, + accept: ["image/*"], + max_entries: 1, + max_file_size: 10_000_000, + auto_upload: true + ) |> assign(:current_locale, locale) |> assign(:mode, mode) |> assign(:user_id, user_id) @@ -45,12 +53,30 @@ defmodule PhoenixKitWeb.Users.UserForm do |> assign(:all_roles, all_roles) |> assign(:pending_roles, []) |> assign(:default_role, default_role) + |> assign(:last_uploaded_avatar_id, nil) |> load_user_data(mode, user_id) |> load_form_data() {:ok, socket} end + def handle_event("validate", %{"_target" => ["avatar"]}, socket) do + # Avatar file selection event - files will auto-upload + entries = socket.assigns.uploads.avatar.entries + Logger.info("avatar validate event: entries=#{length(entries)}") + + if entries != [] do + Logger.info("avatar validate: scheduling check_uploads_complete") + Process.send_after(self(), :check_avatar_uploads_complete, 500) + end + + {:noreply, socket} + end + + def handle_event("cancel_upload", %{"ref" => ref}, socket) do + {:noreply, cancel_upload(socket, :avatar, ref)} + end + def handle_event("validate_user", %{"user" => user_params}, socket) do # Filter password from params if password field is not shown filtered_params = @@ -558,4 +584,109 @@ defmodule PhoenixKitWeb.Users.UserForm do Roles.sync_user_roles(user, pending_roles) end end + + def handle_info(:check_avatar_uploads_complete, socket) do + entries = socket.assigns.uploads.avatar.entries + + Logger.info( + "check_avatar_uploads_complete: entries=#{length(entries)}, done?=#{inspect(Enum.map(entries, & &1.done?))}" + ) + + # Check if all entries are done uploading + if entries != [] && Enum.all?(entries, & &1.done?) do + Logger.info("Avatar uploads done! Processing...") + # All done - process them + process_avatar_uploads(socket) + else + # Still uploading - check again later + Logger.info("Still uploading avatar, checking again...") + Process.send_after(self(), :check_avatar_uploads_complete, 500) + {:noreply, socket} + end + end + + defp process_avatar_uploads(socket) do + # Process uploaded avatar files + uploaded_avatars = + consume_uploaded_entries(socket, :avatar, fn %{path: path}, entry -> + # Get file info + ext = Path.extname(entry.client_name) |> String.replace_leading(".", "") + + # Get current user + current_user = socket.assigns.phoenix_kit_current_user + user_id = if current_user, do: current_user.id, else: 1 + + # Get file size + {:ok, stat} = Elixir.File.stat(path) + file_size = stat.size + + # Calculate hash + file_hash = Auth.calculate_file_hash(path) + + # Store file in storage + case PhoenixKit.Storage.store_file_in_buckets( + path, + "image", + user_id, + file_hash, + ext, + entry.client_name + ) do + {:ok, file} -> + Logger.info("Avatar file stored with ID: #{file.id}") + + # Note: ProcessFileJob is now automatically queued in Storage.store_file_in_buckets + + {:ok, + %{ + file_id: file.id, + filename: entry.client_name, + size: file_size + }} + + {:error, reason} -> + Logger.error("Storage Error: #{inspect(reason)}") + {:error, reason} + end + end) + + # Extract file IDs for use + Logger.info("Uploaded avatars: #{inspect(uploaded_avatars)}") + avatar_file_ids = Enum.map(uploaded_avatars, &get_avatar_file_id/1) + Logger.info("Avatar file IDs: #{inspect(avatar_file_ids)}") + avatar_file_id = List.first(avatar_file_ids) + Logger.info("First avatar file ID: #{inspect(avatar_file_id)}") + + # Save the avatar file ID to the user's custom fields + socket = + if avatar_file_id && avatar_file_id != nil do + user = socket.assigns.user + + case Auth.update_user_fields(user, %{"avatar_file_id" => avatar_file_id}) do + {:ok, updated_user} -> + Logger.info("Avatar file ID saved: #{avatar_file_id}") + + socket + |> assign(:user, updated_user) + |> assign(:last_uploaded_avatar_id, avatar_file_id) + |> put_flash(:info, "Avatar uploaded successfully!") + + {:error, changeset} -> + Logger.error("Failed to save avatar file ID: #{inspect(changeset)}") + + socket + |> assign(:last_uploaded_avatar_id, avatar_file_id) + |> put_flash(:error, "Avatar uploaded but failed to save to profile") + end + else + socket + |> put_flash(:error, "Failed to upload avatar") + end + + {:noreply, socket} + end + + defp get_avatar_file_id(%{file_id: file_id}), do: file_id + defp get_avatar_file_id({:ok, %{file_id: file_id}}), do: file_id + defp get_avatar_file_id(_), do: nil end diff --git a/lib/phoenix_kit_web/users/user_form.html.heex b/lib/phoenix_kit_web/users/user_form.html.heex index fe75c15e8..fa4cb21df 100644 --- a/lib/phoenix_kit_web/users/user_form.html.heex +++ b/lib/phoenix_kit_web/users/user_form.html.heex @@ -32,6 +32,85 @@ <%!-- User Form --%>
+ <%!-- Avatar Upload Section (Edit mode only) --%> + <%= if @mode == :edit do %> +
+
+ <%!-- Avatar Preview (Left) --%> +
+ <% avatar_file_id = + @last_uploaded_avatar_id || + (@user.custom_fields && @user.custom_fields["avatar_file_id"]) %> + <% variant = if @last_uploaded_avatar_id, do: "original", else: "medium" %> +
+ <%= if avatar_file_id do %> + <% avatar_url = + PhoenixKit.Storage.URLSigner.signed_url(avatar_file_id, variant) %> + Avatar + + <% else %> + <% initials = + (@user.first_name || @user.email) + |> String.first() + |> String.upcase() %> +
+

{initials}

+
+ <% end %> +
+
+ + <%!-- Upload Controls (Right) --%> +
+
+
+ +

+ Supports JPG, PNG, WebP formats up to 10MB +

+
+ + <%!-- Avatar Upload Component (Separate form to avoid validate_user conflict) --%> + <.file_upload + upload={@uploads.avatar} + label="Choose Avatar" + icon="hero-cloud-arrow-up" + variant="button" + /> + + <%!-- Success Message --%> + <%= if @last_uploaded_avatar_id do %> +
+ <.icon name="hero-check-circle" class="w-5 h-5" /> +
+

Avatar uploaded successfully!

+

{@last_uploaded_avatar_id}

+
+
+ <% end %> +
+
+
+
+ +
+ <% end %> + <.form :let={form} for={@changeset} From 1aef1ba203a35a81637392563fc52c2b3b134b0c Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:21:34 +0200 Subject: [PATCH 13/24] Mix format --- lib/phoenix_kit/storage/manager.ex | 3 ++- lib/phoenix_kit_web/live/users/media.html.heex | 8 +++++--- lib/phoenix_kit_web/live/users/media_detail.ex | 8 ++++++-- .../live/users/media_detail.html.heex | 12 +++++++++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lib/phoenix_kit/storage/manager.ex b/lib/phoenix_kit/storage/manager.ex index af41bfdc6..8a571f42a 100644 --- a/lib/phoenix_kit/storage/manager.ex +++ b/lib/phoenix_kit/storage/manager.ex @@ -34,7 +34,8 @@ defmodule PhoenixKit.Storage.Manager do _generate_variants = Keyword.get(opts, :generate_variants, get_auto_generate_variants()) # Use force_bucket_ids if provided, otherwise use priority_buckets - buckets_to_use = if Enum.empty?(force_bucket_ids), do: priority_buckets, else: force_bucket_ids + buckets_to_use = + if Enum.empty?(force_bucket_ids), do: priority_buckets, else: force_bucket_ids # Select buckets for storage buckets = select_buckets_for_storage(redundancy_copies, buckets_to_use) diff --git a/lib/phoenix_kit_web/live/users/media.html.heex b/lib/phoenix_kit_web/live/users/media.html.heex index ab05b2a00..d95183c37 100644 --- a/lib/phoenix_kit_web/live/users/media.html.heex +++ b/lib/phoenix_kit_web/live/users/media.html.heex @@ -41,7 +41,7 @@

Uploaded Files ({@total_count})

-

No media uploaded yet. Upload your first file above!

+

+ No media uploaded yet. Upload your first file above! +

diff --git a/lib/phoenix_kit_web/live/users/media_detail.ex b/lib/phoenix_kit_web/live/users/media_detail.ex index ceb0b1240..9dbba54d2 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.ex +++ b/lib/phoenix_kit_web/live/users/media_detail.ex @@ -131,9 +131,13 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do # Get user information if available user_name = case file.user_id do - nil -> "Unknown" + nil -> + "Unknown" + user_id -> - alias_module = Application.get_env(:phoenix_kit, :users_module, PhoenixKit.Users.Auth.User) + alias_module = + Application.get_env(:phoenix_kit, :users_module, PhoenixKit.Users.Auth.User) + case repo.get(alias_module, user_id) do nil -> "Unknown" user -> user.email diff --git a/lib/phoenix_kit_web/live/users/media_detail.html.heex b/lib/phoenix_kit_web/live/users/media_detail.html.heex index b7bccd2a0..ce1a994b5 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.html.heex +++ b/lib/phoenix_kit_web/live/users/media_detail.html.heex @@ -244,15 +244,21 @@ <%!-- Storage Locations --%> <%= if not Enum.empty?(@file_data.locations) do %>
- +
<%= for location <- @file_data.locations do %>

{location.bucket_name}

-

{location.path}

-

Provider: {String.upcase(location.bucket_provider)}

+

+ {location.path} +

+

+ Provider: {String.upcase(location.bucket_provider)} +

From 224d84a5ce2bdb348411246a021de53d8ce07c79 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:31:10 +0200 Subject: [PATCH 14/24] Updated the navbar to show the users avatar --- lib/phoenix_kit_web/components/admin_nav.ex | 50 +++++++++++++++++++-- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/lib/phoenix_kit_web/components/admin_nav.ex b/lib/phoenix_kit_web/components/admin_nav.ex index f68ec1662..72b31634e 100644 --- a/lib/phoenix_kit_web/components/admin_nav.ex +++ b/lib/phoenix_kit_web/components/admin_nav.ex @@ -270,6 +270,14 @@ defmodule PhoenixKitWeb.Components.AdminNav do attr(:current_locale, :string, default: "en") def admin_user_dropdown(assigns) do + user = PhoenixKit.Users.Auth.Scope.user(assigns.scope) + avatar_file_id = user && user.custom_fields && user.custom_fields["avatar_file_id"] + + assigns = + assigns + |> assign(:avatar_file_id, avatar_file_id) + |> assign(:user, user) + ~H""" <%= if @scope && PhoenixKit.Users.Auth.Scope.authenticated?(@scope) do %>
@@ -277,9 +285,22 @@ defmodule PhoenixKitWeb.Components.AdminNav do
- {String.first(PhoenixKit.Users.Auth.Scope.user_email(@scope) || "?") |> String.upcase()} + <%= if @avatar_file_id do %> + <% avatar_url = PhoenixKit.Storage.URLSigner.signed_url(@avatar_file_id, "medium") %> + Avatar + + <% else %> + {String.first(PhoenixKit.Users.Auth.Scope.user_email(@scope) || "?") |> String.upcase()} + <% end %>
<%!-- Dropdown Menu --%> @@ -382,12 +403,33 @@ defmodule PhoenixKitWeb.Components.AdminNav do attr(:scope, :any, default: nil) def admin_user_info(assigns) do + user = PhoenixKit.Users.Auth.Scope.user(assigns.scope) + avatar_file_id = user && user.custom_fields && user.custom_fields["avatar_file_id"] + + assigns = + assigns + |> assign(:avatar_file_id, avatar_file_id) + |> assign(:user, user) + ~H""" <%= if @scope && PhoenixKit.Users.Auth.Scope.authenticated?(@scope) do %>
-
- {String.first(PhoenixKit.Users.Auth.Scope.user_email(@scope) || "?") |> String.upcase()} +
+ <%= if @avatar_file_id do %> + <% avatar_url = PhoenixKit.Storage.URLSigner.signed_url(@avatar_file_id, "small") %> + Avatar + + <% else %> + {String.first(PhoenixKit.Users.Auth.Scope.user_email(@scope) || "?") |> String.upcase()} + <% end %>
From bcc2abbea12125000fc2f8de7072ba8ec7b59964 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 21:36:36 +0200 Subject: [PATCH 15/24] Fixed the uesr edit page clearing untouched fields --- lib/phoenix_kit_web/users/user_form.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/phoenix_kit_web/users/user_form.ex b/lib/phoenix_kit_web/users/user_form.ex index 104d0d481..e699fec57 100644 --- a/lib/phoenix_kit_web/users/user_form.ex +++ b/lib/phoenix_kit_web/users/user_form.ex @@ -383,7 +383,8 @@ defmodule PhoenixKitWeb.Users.UserForm do end defp update_custom_fields(user, custom_fields_params) do - case Auth.update_user_custom_fields(user, custom_fields_params) do + # Use update_user_fields instead of update_user_custom_fields to preserve existing fields (like avatar_file_id) + case Auth.update_user_fields(user, custom_fields_params) do {:ok, updated_user} -> {:ok, updated_user} {:error, _changeset} -> {:error, :custom_fields_save} end From 028ebd449ce994ed10a92ff87115e0426877c308 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Wed, 12 Nov 2025 22:45:23 +0200 Subject: [PATCH 16/24] Fixed credo issues --- lib/phoenix_kit/storage.ex | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/phoenix_kit/storage.ex b/lib/phoenix_kit/storage.ex index c3b286cb6..9b5afe4f5 100644 --- a/lib/phoenix_kit/storage.ex +++ b/lib/phoenix_kit/storage.ex @@ -28,6 +28,7 @@ defmodule PhoenixKit.Storage do # The dedicated storage/media APIs under development should replace this fallback once available. alias PhoenixKit.Storage.URLSigner alias PhoenixKit.Storage.VariantGenerator + alias PhoenixKit.Storage.Workers.ProcessFileJob # ===== BUCKETS ===== @@ -818,11 +819,9 @@ defmodule PhoenixKit.Storage do end defp signed_file_url(file_id, variant_name) do - try do - URLSigner.signed_url(file_id, variant_name, locale: :none) - rescue - _ -> nil - end + URLSigner.signed_url(file_id, variant_name, locale: :none) + rescue + _ -> nil end @doc """ @@ -922,7 +921,7 @@ defmodule PhoenixKit.Storage do # Queue background job for variant processing _ = %{file_id: file.id, user_id: user_id, filename: orig_filename} - |> PhoenixKit.Storage.Workers.ProcessFileJob.new() + |> ProcessFileJob.new() |> Oban.insert() {:ok, file} From a493caa854bce94a6b789460966cbdc3a453abd2 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Thu, 13 Nov 2025 00:23:12 +0200 Subject: [PATCH 17/24] Fixed issues with user name on the user editing page --- lib/phoenix_kit_web/users/user_form.ex | 58 ++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/lib/phoenix_kit_web/users/user_form.ex b/lib/phoenix_kit_web/users/user_form.ex index 29ac4e5eb..5d24b1600 100644 --- a/lib/phoenix_kit_web/users/user_form.ex +++ b/lib/phoenix_kit_web/users/user_form.ex @@ -87,6 +87,16 @@ defmodule PhoenixKitWeb.Users.UserForm do user_params end + # In edit mode, ensure username is preserved to prevent regeneration from email + filtered_params = + if socket.assigns.mode == :edit do + filtered_params = Map.put_new(filtered_params, "username", socket.assigns.user.username) + Logger.info("validate_user - user_params username: #{inspect(Map.get(user_params, "username"))}, filtered_params username: #{inspect(Map.get(filtered_params, "username"))}") + filtered_params + else + filtered_params + end + changeset = case socket.assigns.mode do :new -> Auth.change_user_registration(%Auth.User{}, filtered_params) @@ -97,7 +107,7 @@ defmodule PhoenixKitWeb.Users.UserForm do socket = socket |> assign(:changeset, changeset) - |> assign(:form_data, user_params) + |> assign(:form_data, filtered_params) |> assign( :custom_fields_data, Map.get(user_params, "custom_fields", socket.assigns.custom_fields_data) @@ -376,7 +386,25 @@ defmodule PhoenixKitWeb.Users.UserForm do update_profile_and_password(socket, user, profile_params) else cleaned_params = Map.delete(profile_params, "password") - Auth.update_user_profile(user, cleaned_params) + # Pass validate_email: false to skip uniqueness validation for username/email + # This allows users to keep their current username without it being regenerated + update_user_profile_without_validation(user, cleaned_params) + end + end + + defp update_user_profile_without_validation(user, attrs) do + Logger.info("update_user_profile_without_validation - attrs username: #{inspect(Map.get(attrs, "username"))}") + changeset = Auth.User.profile_changeset(user, attrs, validate_email: false) + Logger.info("After profile_changeset, changeset changes username: #{inspect(Ecto.Changeset.get_change(changeset, :username))}, field: #{inspect(Ecto.Changeset.get_field(changeset, :username))}") + + case changeset |> PhoenixKit.RepoHelper.repo().update() do + {:ok, updated_user} -> + Logger.info("After DB update, saved username: #{inspect(updated_user.username)}") + PhoenixKit.Admin.Events.broadcast_user_updated(updated_user) + {:ok, updated_user} + + {:error, changeset} -> + {:error, changeset} end end @@ -393,9 +421,17 @@ defmodule PhoenixKitWeb.Users.UserForm do end end - defp handle_update_result(socket, {:ok, _}) do + defp handle_update_result(socket, {:ok, _result}) do + # _result could be either the updated user or role assignments (from sync_user_roles) + # In both cases, we need to reload the user from the database to get the fresh data + user_id = socket.assigns.user.id + fresh_user = Auth.get_user!(user_id) + Logger.info("handle_update_result - fresh_user username from DB: #{inspect(fresh_user.username)}") + socket = socket + |> assign(:user, fresh_user) + |> reload_changeset_with_updated_user(fresh_user) |> put_flash(:info, "User updated successfully.") |> push_navigate(to: Routes.path("/admin/users")) @@ -413,6 +449,15 @@ defmodule PhoenixKitWeb.Users.UserForm do {:noreply, socket} end + defp reload_changeset_with_updated_user(socket, updated_user) do + form_data = socket.assigns.form_data || %{} + # Ensure username is in form_data to prevent regeneration from email + form_data = Map.put_new(form_data, "username", updated_user.username) + # Use profile_changeset for edit mode to avoid username regeneration + changeset = Auth.User.profile_changeset(updated_user, form_data, validate_email: false) + assign(socket, :changeset, changeset) + end + defp format_role_update_error(:owner_role_protected) do "User profile updated but Owner role cannot be manually assigned." end @@ -485,12 +530,17 @@ defmodule PhoenixKitWeb.Users.UserForm do end defp load_form_data(%{assigns: %{mode: :edit, user: user}} = socket) do - changeset = Auth.change_user_registration(user, %{}) + # For edit mode, use profile_changeset instead of registration_changeset + # profile_changeset doesn't call maybe_generate_username_from_email like registration_changeset does + Logger.info("Loading form for user #{user.id}: DB username=#{inspect(user.username)}") + changeset = Auth.User.profile_changeset(user, %{"username" => user.username}, validate_email: false) + Logger.info("After creating changeset, changeset changes: #{inspect(Ecto.Changeset.get_change(changeset, :username))}, changeset field: #{inspect(Ecto.Changeset.get_field(changeset, :username))}") socket |> assign(:changeset, changeset) |> assign(:form_data, %{ "email" => user.email || "", + "username" => user.username || "", "first_name" => user.first_name || "", "last_name" => user.last_name || "" }) From aa02d858601680ab914d16fe7dbdde2d543b86a0 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Thu, 13 Nov 2025 18:48:43 +0200 Subject: [PATCH 18/24] Added file instance creator on the fly --- .../controllers/file_controller.ex | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/phoenix_kit_web/controllers/file_controller.ex b/lib/phoenix_kit_web/controllers/file_controller.ex index 561614fd5..1d406635f 100644 --- a/lib/phoenix_kit_web/controllers/file_controller.ex +++ b/lib/phoenix_kit_web/controllers/file_controller.ex @@ -6,9 +6,8 @@ defmodule PhoenixKitWeb.FileController do """ use PhoenixKitWeb, :controller + alias PhoenixKit.Storage.{Manager, URLSigner, Workers.ProcessFileJob} alias PhoenixKit.Storage - alias PhoenixKit.Storage.Manager - alias PhoenixKit.Storage.URLSigner alias PhoenixKit.Utils.Routes @doc """ @@ -154,11 +153,39 @@ defmodule PhoenixKitWeb.FileController do defp get_file_instance(file_id, variant) do case Storage.get_file_instance_by_name(file_id, variant) do - nil -> {:error, :not_found} - instance -> {:ok, instance} + nil -> + # Variant doesn't exist, try to get the original to queue generation + case Storage.get_file_instance_by_name(file_id, "original") do + nil -> + {:error, :not_found} + + original_instance -> + # Queue the variant for generation if not already requested + queue_missing_variant(file_id, variant, original_instance) + # Return the original for now + {:ok, original_instance} + end + + instance -> + {:ok, instance} end end + defp queue_missing_variant(file_id, _variant, original_instance) do + # Queue background job to generate the missing variant + Task.start(fn -> + case Storage.get_file(file_id) do + nil -> + :error + + file -> + %{file_id: file_id, user_id: file.user_id, filename: original_instance.file_name} + |> ProcessFileJob.new() + |> Oban.insert() + end + end) + end + defp verify_token(file_id, variant, token) do if URLSigner.verify_token(file_id, variant, token) do :ok From c1979475ec4b8891194896448a24821a45d4ff9a Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Thu, 13 Nov 2025 20:29:53 +0200 Subject: [PATCH 19/24] Making sure you can't upload duplicate files --- lib/phoenix_kit/migrations/postgres.ex | 27 +++++--- lib/phoenix_kit/migrations/postgres/v24.ex | 69 ++++++++++++++++++++ lib/phoenix_kit/storage.ex | 41 +++++++++++- lib/phoenix_kit/storage/variant_generator.ex | 37 +++++++---- lib/phoenix_kit_web/live/users/media.ex | 40 +++++++++++- lib/phoenix_kit_web/users/user_form.ex | 11 ++++ 6 files changed, 198 insertions(+), 27 deletions(-) create mode 100644 lib/phoenix_kit/migrations/postgres/v24.ex diff --git a/lib/phoenix_kit/migrations/postgres.ex b/lib/phoenix_kit/migrations/postgres.ex index 1c9d193b3..acea50975 100644 --- a/lib/phoenix_kit/migrations/postgres.ex +++ b/lib/phoenix_kit/migrations/postgres.ex @@ -149,7 +149,7 @@ defmodule PhoenixKit.Migrations.Postgres do - Metadata storage for additional context in audit logs - Performance indexes for efficient querying by user, action, and date - ### V23 - Session Fingerprinting ⚡ LATEST + ### V23 - Session Fingerprinting - Session fingerprinting columns (ip_address, user_agent_hash) in phoenix_kit_users_tokens - Prevents session hijacking by detecting suspicious session usage patterns - IP address tracking: Detects when session is used from different IP @@ -158,18 +158,25 @@ defmodule PhoenixKit.Migrations.Postgres do - Configurable strictness: Can log warnings or force re-authentication - Performance indexes for efficient fingerprint verification + ### V24 - File Checksum Unique Index ⚡ LATEST + - Unique index on phoenix_kit_files.checksum for O(1) duplicate detection + - Enables automatic deduplication of uploaded files + - Prevents redundant storage of identical files + - Improves performance of duplicate file lookups + ## Migration Paths ### Fresh Installation (0 → Current) - Runs all migrations V01 through V23 in sequence. + Runs all migrations V01 through V24 in sequence. ### Incremental Updates - - V01 → V23: Runs V02 through V23 in sequence - - V22 → V23: Runs V23 only (adds session fingerprinting) - - V21 → V23: Runs V22 and V23 in sequence - - V20 → V23: Runs V21, V22, and V23 in sequence + - V01 → V24: Runs V02 through V24 in sequence + - V23 → V24: Runs V24 only (adds file checksum unique index) + - V22 → V24: Runs V23 and V24 in sequence + - V20 → V24: Runs V21, V22, V23, and V24 in sequence ### Rollback Support + - V24 → V23: Removes unique index on checksum - V23 → V22: Removes session fingerprinting columns and indexes - V22 → V21: Removes audit logging system, email orphaned events, and email metrics - V21 → V20: Removes composite message ID index @@ -186,14 +193,14 @@ defmodule PhoenixKit.Migrations.Postgres do ## Usage Examples - # Update to latest version (V23) + # Update to latest version (V24) PhoenixKit.Migrations.Postgres.up(prefix: "myapp") # Update to specific version - PhoenixKit.Migrations.Postgres.up(prefix: "myapp", version: 23) + PhoenixKit.Migrations.Postgres.up(prefix: "myapp", version: 24) # Rollback to specific version - PhoenixKit.Migrations.Postgres.down(prefix: "myapp", version: 22) + PhoenixKit.Migrations.Postgres.down(prefix: "myapp", version: 23) # Complete rollback PhoenixKit.Migrations.Postgres.down(prefix: "myapp", version: 0) @@ -211,7 +218,7 @@ defmodule PhoenixKit.Migrations.Postgres do use Ecto.Migration @initial_version 1 - @current_version 23 + @current_version 24 @default_prefix "public" @doc false diff --git a/lib/phoenix_kit/migrations/postgres/v24.ex b/lib/phoenix_kit/migrations/postgres/v24.ex new file mode 100644 index 000000000..d0c4309bd --- /dev/null +++ b/lib/phoenix_kit/migrations/postgres/v24.ex @@ -0,0 +1,69 @@ +defmodule PhoenixKit.Migrations.Postgres.V24 do + @moduledoc """ + PhoenixKit V24 Migration: File Checksum Unique Index + + This migration adds a unique index on the checksum field of the phoenix_kit_files table + to enable efficient duplicate file detection and prevent duplicate file storage. + + ## Changes + + ### File Deduplication Support + - Adds unique index on phoenix_kit_files.checksum for O(1) duplicate lookups + - Enables automatic deduplication of uploaded files + - Prevents redundant storage of identical files + + ## PostgreSQL Support + - Supports PostgreSQL prefix for schema isolation + - Creates unique index for fast duplicate detection + """ + use Ecto.Migration + + @doc """ + Run the V24 file checksum indexing migration. + + Handles existing duplicate checksums by keeping the oldest file and deleting newer duplicates. + """ + def up(%{prefix: prefix} = _opts) do + # First, remove duplicate checksums by keeping the oldest file (first inserted) + # This ensures the migration won't fail due to existing duplicates + remove_duplicate_checksums(prefix) + + # Create unique index on checksum for duplicate detection + create_if_not_exists unique_index(:phoenix_kit_files, [:checksum], prefix: prefix) + + # Set version comment on phoenix_kit table for version tracking + execute "COMMENT ON TABLE #{prefix_table_name("phoenix_kit", prefix)} IS '24'" + end + + @doc """ + Rollback the V24 file checksum indexing migration. + """ + def down(%{prefix: prefix} = _opts) do + # Drop unique index on checksum + drop_if_exists unique_index(:phoenix_kit_files, [:checksum], prefix: prefix) + + # Update version comment on phoenix_kit table to previous version + execute "COMMENT ON TABLE #{prefix_table_name("phoenix_kit", prefix)} IS '23'" + end + + # Helper function to remove duplicate checksums + # Keeps the oldest file (earliest inserted_at) and deletes newer duplicates + defp remove_duplicate_checksums(prefix) do + table_name = prefix_table_name("phoenix_kit_files", prefix) + + sql = """ + DELETE FROM #{table_name} f1 + WHERE id NOT IN ( + SELECT DISTINCT ON (checksum) id + FROM #{table_name} + ORDER BY checksum, inserted_at ASC + ) + """ + + execute(sql) + end + + # Helper function to build table name with prefix + defp prefix_table_name(table_name, nil), do: table_name + defp prefix_table_name(table_name, prefix), do: "#{prefix}.#{table_name}" +end diff --git a/lib/phoenix_kit/storage.ex b/lib/phoenix_kit/storage.ex index 9b5afe4f5..127ffb762 100644 --- a/lib/phoenix_kit/storage.ex +++ b/lib/phoenix_kit/storage.ex @@ -415,7 +415,7 @@ defmodule PhoenixKit.Storage do Gets a file by its hash. """ def get_file_by_hash(hash) do - repo().get_by(PhoenixKit.Storage.File, hash: hash) + repo().get_by(PhoenixKit.Storage.File, checksum: hash) end @doc """ @@ -861,6 +861,36 @@ defmodule PhoenixKit.Storage do ext, original_filename \\ nil ) do + # Check if file already exists by hash + case get_file_by_hash(file_hash) do + %PhoenixKit.Storage.File{} = existing_file -> + # File already exists, return existing file with duplicate flag + # Ensure variants are generated for this file (in case it's old and missing variants) + _ = queue_variant_generation(existing_file, user_id, original_filename) + + {:ok, existing_file, :duplicate} + + nil -> + # File is new, proceed with storage + store_new_file_in_buckets( + source_path, + file_type, + user_id, + file_hash, + ext, + original_filename + ) + end + end + + defp store_new_file_in_buckets( + source_path, + file_type, + user_id, + file_hash, + ext, + original_filename + ) do # Calculate MD5 hash for path structure md5_hash = source_path @@ -945,6 +975,15 @@ defmodule PhoenixKit.Storage do # ===== HELPER FUNCTIONS ===== + defp queue_variant_generation(file, user_id, original_filename) do + # Queue variant generation to ensure all variants exist for this file + Task.start(fn -> + %{file_id: file.id, user_id: user_id, filename: original_filename} + |> ProcessFileJob.new() + |> Oban.insert() + end) + end + defp generate_uuidv7 do UUIDv7.generate() end diff --git a/lib/phoenix_kit/storage/variant_generator.ex b/lib/phoenix_kit/storage/variant_generator.ex index 9d83ffa11..5f156eca5 100644 --- a/lib/phoenix_kit/storage/variant_generator.ex +++ b/lib/phoenix_kit/storage/variant_generator.ex @@ -188,20 +188,29 @@ defmodule PhoenixKit.Storage.VariantGenerator do end defp create_variant_instance(file, variant_name, storage_path, mime_type, ext, stats) do - instance_attrs = %{ - variant_name: variant_name, - file_name: storage_path, - mime_type: mime_type, - ext: ext, - checksum: stats.checksum, - size: stats.size, - width: stats.width, - height: stats.height, - processing_status: "completed", - file_id: file.id - } - - Storage.create_file_instance(instance_attrs) + # Check if variant already exists + case Storage.get_file_instance_by_name(file.id, variant_name) do + %Storage.FileInstance{} = existing_instance -> + # Variant already exists, return it + {:ok, existing_instance} + + nil -> + # Create new variant instance + instance_attrs = %{ + variant_name: variant_name, + file_name: storage_path, + mime_type: mime_type, + ext: ext, + checksum: stats.checksum, + size: stats.size, + width: stats.width, + height: stats.height, + processing_status: "completed", + file_id: file.id + } + + Storage.create_file_instance(instance_attrs) + end end defp cleanup_temp_files(paths) do diff --git a/lib/phoenix_kit_web/live/users/media.ex b/lib/phoenix_kit_web/live/users/media.ex index 03a200358..56366434c 100644 --- a/lib/phoenix_kit_web/live/users/media.ex +++ b/lib/phoenix_kit_web/live/users/media.ex @@ -143,8 +143,22 @@ defmodule PhoenixKitWeb.Live.Users.Media do ext, entry.client_name ) do + {:ok, file, :duplicate} -> + # File is a duplicate, still return success but mark it + {:ok, + %{ + file_id: file.id, + filename: entry.client_name, + file_type: file_type, + mime_type: mime_type, + size: file_size, + status: file.status, + urls: %{}, + duplicate: true + }} + {:ok, file} -> - # Note: ProcessFileJob is now automatically queued in Storage.store_file_in_buckets + # New file - ProcessFileJob is now automatically queued in Storage.store_file_in_buckets # Variants will be generated asynchronously and loaded when page data is refreshed {:ok, @@ -173,13 +187,35 @@ defmodule PhoenixKitWeb.Live.Users.Media do # Extract file IDs for callbacks file_ids = Enum.map(uploaded_files, &get_file_id/1) + # Check for duplicates and create appropriate flash message + duplicate_count = Enum.count(uploaded_files, fn + %{duplicate: true} -> true + _ -> false + end) + new_count = length(uploaded_files) - duplicate_count + + flash_message = + case {new_count, duplicate_count} do + {0, n} when n > 0 -> + "Already have #{n} duplicate file(s). No new files were added." + + {n, 0} when n > 0 -> + "Upload successful! #{n} new file(s) processed" + + {n, d} when n > 0 and d > 0 -> + "Upload successful! #{n} new file(s) added. #{d} file(s) were already uploaded." + + _ -> + "Upload processed" + end + socket = socket |> assign(:uploaded_files, refreshed_files) |> assign(:total_count, total_count) |> assign(:total_pages, total_pages) |> assign(:last_uploaded_file_ids, file_ids) - |> put_flash(:info, "Upload successful! #{length(uploaded_files)} file(s) processed") + |> put_flash(:info, flash_message) {:noreply, socket} end diff --git a/lib/phoenix_kit_web/users/user_form.ex b/lib/phoenix_kit_web/users/user_form.ex index 5d24b1600..43a297b5d 100644 --- a/lib/phoenix_kit_web/users/user_form.ex +++ b/lib/phoenix_kit_web/users/user_form.ex @@ -714,6 +714,17 @@ defmodule PhoenixKitWeb.Users.UserForm do ext, entry.client_name ) do + {:ok, file, :duplicate} -> + Logger.info("Avatar file is duplicate with ID: #{file.id}") + + {:ok, + %{ + file_id: file.id, + filename: entry.client_name, + size: file_size, + duplicate: true + }} + {:ok, file} -> Logger.info("Avatar file stored with ID: #{file.id}") From b3115887ffa7e05d9e3aa8a2bb7ad0d575e1fcbd Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Thu, 13 Nov 2025 20:49:32 +0200 Subject: [PATCH 20/24] Fixed username reseting when changing users timezone --- lib/phoenix_kit_web/users/user_form.ex | 10 ++++++++-- lib/phoenix_kit_web/users/user_form.html.heex | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/phoenix_kit_web/users/user_form.ex b/lib/phoenix_kit_web/users/user_form.ex index 43a297b5d..de2eb5cf5 100644 --- a/lib/phoenix_kit_web/users/user_form.ex +++ b/lib/phoenix_kit_web/users/user_form.ex @@ -35,6 +35,10 @@ defmodule PhoenixKitWeb.Users.UserForm do # Load default role for new user creation default_role = Settings.get_setting("new_user_default_role", "User") + # Load timezone options + setting_options = Settings.get_setting_options() + timezone_options = [{"Use System Default", nil} | setting_options["time_zone"]] + socket = socket |> allow_upload(:avatar, @@ -54,6 +58,7 @@ defmodule PhoenixKitWeb.Users.UserForm do |> assign(:all_roles, all_roles) |> assign(:pending_roles, []) |> assign(:default_role, default_role) + |> assign(:timezone_options, timezone_options) |> assign(:last_uploaded_avatar_id, nil) |> load_user_data(mode, user_id) |> load_form_data() @@ -100,7 +105,7 @@ defmodule PhoenixKitWeb.Users.UserForm do changeset = case socket.assigns.mode do :new -> Auth.change_user_registration(%Auth.User{}, filtered_params) - :edit -> Auth.change_user_registration(socket.assigns.user, filtered_params) + :edit -> Auth.User.profile_changeset(socket.assigns.user, filtered_params, validate_email: false) end |> Map.put(:action, :validate) @@ -542,7 +547,8 @@ defmodule PhoenixKitWeb.Users.UserForm do "email" => user.email || "", "username" => user.username || "", "first_name" => user.first_name || "", - "last_name" => user.last_name || "" + "last_name" => user.last_name || "", + "user_timezone" => user.user_timezone || "0" }) |> assign(:custom_fields_data, user.custom_fields || %{}) end diff --git a/lib/phoenix_kit_web/users/user_form.html.heex b/lib/phoenix_kit_web/users/user_form.html.heex index fa4cb21df..39d786229 100644 --- a/lib/phoenix_kit_web/users/user_form.html.heex +++ b/lib/phoenix_kit_web/users/user_form.html.heex @@ -179,6 +179,15 @@ />
+ + <%!-- Personal Timezone --%> +
+ <.select + field={form[:user_timezone]} + label="Personal Timezone" + options={@timezone_options} + /> +
<%!-- Password Change Section (Edit mode, Admin/Owner only) --%> From 3be961db95d3e1b5a7cc6ca062954a8262794e35 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Thu, 13 Nov 2025 21:45:10 +0200 Subject: [PATCH 21/24] Added instance recreation when it has broken media --- lib/phoenix_kit/storage.ex | 156 ++++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 4 deletions(-) diff --git a/lib/phoenix_kit/storage.ex b/lib/phoenix_kit/storage.ex index 127ffb762..9c81ad3de 100644 --- a/lib/phoenix_kit/storage.ex +++ b/lib/phoenix_kit/storage.ex @@ -17,6 +17,7 @@ defmodule PhoenixKit.Storage do """ import Ecto.Query, warn: false + require Logger alias PhoenixKit.Settings alias PhoenixKit.Storage.Bucket @@ -864,13 +865,40 @@ defmodule PhoenixKit.Storage do # Check if file already exists by hash case get_file_by_hash(file_hash) do %PhoenixKit.Storage.File{} = existing_file -> - # File already exists, return existing file with duplicate flag - # Ensure variants are generated for this file (in case it's old and missing variants) - _ = queue_variant_generation(existing_file, user_id, original_filename) + Logger.info("=== DUPLICATE FILE DETECTED ===") + Logger.info("File ID: #{existing_file.id}, Checksum: #{file_hash}") + Logger.info("File path: #{existing_file.file_path}") + + # File already exists, but check if instances and actual files are healthy + case get_file_instance_by_name(existing_file.id, "original") do + %FileInstance{file_name: stored_file_path} -> + Logger.info("Original instance record found: #{stored_file_path}") + + # Instance record exists, verify actual file exists in storage + case verify_file_in_storage(stored_file_path) do + :exists -> + Logger.info("Duplicate file is healthy in storage. Queueing variant generation.") + # File is healthy in storage, ensure other variants are generated + _ = queue_variant_generation(existing_file, user_id, original_filename) + {:ok, existing_file, :duplicate} + + :missing -> + # File record exists but actual file is missing from storage + # Need to re-store the file and recreate instances + Logger.warning("Duplicate file detected but missing from storage: #{existing_file.id}") + restore_missing_file(existing_file, source_path, file_hash, user_id, original_filename) + end - {:ok, existing_file, :duplicate} + nil -> + # File record exists but instance record is missing + # Need to recreate instances from the stored file + Logger.warning("Duplicate file detected but missing instance record: #{existing_file.id}") + Logger.info("Attempting to recreate instances...") + recreate_file_instances(existing_file, source_path, file_hash, user_id, original_filename) + end nil -> + Logger.info("New file detected (no existing hash match). Proceeding with storage.") # File is new, proceed with storage store_new_file_in_buckets( source_path, @@ -984,6 +1012,126 @@ defmodule PhoenixKit.Storage do end) end + defp verify_file_in_storage(stored_file_path) do + # Check if file actually exists in storage buckets + Logger.info("Verifying file in storage: #{stored_file_path}") + exists = Manager.file_exists?(stored_file_path) + Logger.info("File exists? #{exists}") + if exists, do: :exists, else: :missing + end + + defp restore_missing_file(existing_file, source_path, file_hash, user_id, original_filename) do + # File record exists but actual file is missing from storage + # Delete broken instances and recreate them (which will also store the file) + + Logger.warning("=== RECOVERING MISSING FILE ===") + Logger.warning("File ID: #{existing_file.id}") + Logger.warning("File path: #{existing_file.file_path}") + Logger.warning("Source path: #{source_path}") + + # First, delete all broken instances for this file + deleted_count = delete_file_instances_for_file(existing_file.id) + Logger.info("Deleted #{deleted_count} broken instances for file: #{existing_file.id}") + + # Recreate instance and store the file (combined in one operation) + Logger.info("Recreating instances for file #{existing_file.id}") + recreate_file_instances(existing_file, source_path, file_hash, user_id, original_filename) + end + + defp delete_file_instances_for_file(file_id) do + # Delete all file instances for a file (to clean up broken ones) + {deleted_count, _} = + from(fi in FileInstance, where: fi.file_id == ^file_id) + |> repo().delete_all() + + Logger.info("Deleted #{deleted_count} file instances for file_id: #{file_id}") + deleted_count + end + + defp recreate_file_instances(file, source_path, file_hash, user_id, original_filename) do + # File record exists but instances are missing or broken + # First store the file in buckets, then recreate the instance record + + Logger.info("Starting recreate_file_instances for file: #{file.id}, file_path: #{file.file_path}") + + {:ok, stat} = Elixir.File.stat(source_path) + file_size = stat.size + + # Reconstruct the full storage path for the original instance + # file.file_path is "user_prefix/hash_prefix/md5_hash" + # We need to extract md5_hash and build the original path + [_user_prefix, _hash_prefix, md5_hash | _rest] = String.split(file.file_path, "/") + original_path = "#{file.file_path}/#{md5_hash}_original.#{file.ext}" + + Logger.info("Reconstructed original path for instance: #{original_path}") + Logger.info("About to store file from source_path: #{source_path} to storage path: #{original_path}") + + # First, store the file in buckets using Manager + case Manager.store_file(source_path, path_prefix: original_path) do + {:ok, storage_info} -> + Logger.info("File stored in buckets: #{original_path}, bucket_ids: #{inspect(storage_info.bucket_ids)}") + + # Now create the file instance record pointing to the stored file + original_instance_attrs = %{ + variant_name: "original", + file_name: original_path, + mime_type: file.mime_type, + ext: file.ext, + checksum: file_hash, + size: file_size, + processing_status: "completed", + file_id: file.id + } + + case create_file_instance(original_instance_attrs) do + {:ok, _instance} -> + Logger.info("Recreated original instance for file: #{file.id}, path: #{original_path}") + # Delete any remaining broken variant instances BEFORE queuing ProcessFileJob + # This ensures ProcessFileJob creates fresh instances with correct paths + deleted_variants = delete_variant_instances(file.id) + Logger.info("Deleted #{deleted_variants} broken variant instances before regeneration") + # Queue variant generation for the recovered file + _ = queue_variant_generation(file, user_id, original_filename) + {:ok, file, :duplicate} + + {:error, reason} -> + # Instance creation failed, might be duplicate constraint + # Try deleting old broken instances and recreating + Logger.warning("Instance creation failed for file #{file.id}: #{inspect(reason)}, attempting cleanup and retry") + _ = delete_file_instances_for_file(file.id) + + case create_file_instance(original_instance_attrs) do + {:ok, _instance} -> + Logger.info("Recreated original instance for file (after cleanup): #{file.id}, path: #{original_path}") + # Delete any remaining broken variant instances + deleted_variants = delete_variant_instances(file.id) + Logger.info("Deleted #{deleted_variants} broken variant instances before regeneration") + _ = queue_variant_generation(file, user_id, original_filename) + {:ok, file, :duplicate} + + {:error, final_reason} -> + Logger.error("Failed to recreate instance for file #{file.id}: #{inspect(final_reason)}") + {:error, final_reason} + end + end + + {:error, store_error} -> + Logger.error("Failed to store file in buckets for recreate_file_instances: #{inspect(store_error)}") + {:error, store_error} + end + end + + defp delete_variant_instances(file_id) do + # Delete only the variant instances (not the original), to clean up broken ones + {deleted_count, _} = + from(fi in FileInstance, + where: fi.file_id == ^file_id and fi.variant_name != "original" + ) + |> repo().delete_all() + + deleted_count + end + defp generate_uuidv7 do UUIDv7.generate() end From 13ed7cee705547fb98c39e76838ffe67f6cf090f Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Thu, 13 Nov 2025 22:35:53 +0200 Subject: [PATCH 22/24] Added maintain aspect ratio toggle feature --- lib/phoenix_kit/migrations/postgres.ex | 2 +- lib/phoenix_kit/migrations/postgres/v25.ex | 54 +++++++++++ lib/phoenix_kit/storage.ex | 91 ++++++++++++++----- lib/phoenix_kit/storage/dimension.ex | 42 +++++++-- lib/phoenix_kit/storage/variant_generator.ex | 35 ++++--- .../live/settings/storage/dimension_form.ex | 20 +++- .../settings/storage/dimension_form.html.heex | 86 +++++++++++++----- .../settings/storage/dimensions.html.heex | 44 ++++++++- lib/phoenix_kit_web/live/users/media.ex | 10 +- lib/phoenix_kit_web/users/user_form.ex | 37 ++++++-- 10 files changed, 335 insertions(+), 86 deletions(-) create mode 100644 lib/phoenix_kit/migrations/postgres/v25.ex diff --git a/lib/phoenix_kit/migrations/postgres.ex b/lib/phoenix_kit/migrations/postgres.ex index acea50975..4999eda52 100644 --- a/lib/phoenix_kit/migrations/postgres.ex +++ b/lib/phoenix_kit/migrations/postgres.ex @@ -218,7 +218,7 @@ defmodule PhoenixKit.Migrations.Postgres do use Ecto.Migration @initial_version 1 - @current_version 24 + @current_version 25 @default_prefix "public" @doc false diff --git a/lib/phoenix_kit/migrations/postgres/v25.ex b/lib/phoenix_kit/migrations/postgres/v25.ex new file mode 100644 index 000000000..17fb1c22e --- /dev/null +++ b/lib/phoenix_kit/migrations/postgres/v25.ex @@ -0,0 +1,54 @@ +defmodule PhoenixKit.Migrations.Postgres.V25 do + @moduledoc """ + PhoenixKit V25 Migration: Aspect Ratio Control for Dimensions + + This migration adds support for aspect ratio preservation in dimension configuration. + Allows users to choose between maintaining aspect ratio (width only) or fixed dimensions. + + ## Changes + + ### Storage Dimensions Table (phoenix_kit_storage_dimensions) + - Adds `maintain_aspect_ratio` boolean column (default: true) + - When true: Only width is used, height is calculated to preserve aspect ratio + - When false: Both width and height are used as fixed dimensions (for thumbnails/crops) + + ## Features + + - **Aspect Ratio Mode**: Responsive sizing with width-only specification + - **Fixed Dimension Mode**: Exact pixel dimensions for square crops/thumbnails + - **Per-Dimension Control**: Each variant can independently choose its mode + - **Default to Aspect Ratio**: All dimensions default to maintaining aspect ratio + """ + use Ecto.Migration + + @doc """ + Run the V25 migration to add aspect ratio control. + """ + def up(%{prefix: prefix} = _opts) do + # Add maintain_aspect_ratio column to dimensions table + alter table(:phoenix_kit_storage_dimensions, prefix: prefix) do + add :maintain_aspect_ratio, :boolean, default: true, null: false + end + + # Set version comment on phoenix_kit table for version tracking + execute "COMMENT ON TABLE #{prefix_table_name("phoenix_kit", prefix)} IS '25'" + end + + @doc """ + Rollback the V25 migration. + """ + def down(%{prefix: prefix} = _opts) do + # Remove maintain_aspect_ratio column from dimensions table + alter table(:phoenix_kit_storage_dimensions, prefix: prefix) do + remove :maintain_aspect_ratio + end + + # Update version comment on phoenix_kit table to previous version + execute "COMMENT ON TABLE #{prefix_table_name("phoenix_kit", prefix)} IS '24'" + end + + # Helper functions + + defp prefix_table_name(table_name, nil), do: table_name + defp prefix_table_name(table_name, prefix), do: "#{prefix}.#{table_name}" +end diff --git a/lib/phoenix_kit/storage.ex b/lib/phoenix_kit/storage.ex index 9c81ad3de..4e9360031 100644 --- a/lib/phoenix_kit/storage.ex +++ b/lib/phoenix_kit/storage.ex @@ -885,16 +885,35 @@ defmodule PhoenixKit.Storage do :missing -> # File record exists but actual file is missing from storage # Need to re-store the file and recreate instances - Logger.warning("Duplicate file detected but missing from storage: #{existing_file.id}") - restore_missing_file(existing_file, source_path, file_hash, user_id, original_filename) + Logger.warning( + "Duplicate file detected but missing from storage: #{existing_file.id}" + ) + + restore_missing_file( + existing_file, + source_path, + file_hash, + user_id, + original_filename + ) end nil -> # File record exists but instance record is missing # Need to recreate instances from the stored file - Logger.warning("Duplicate file detected but missing instance record: #{existing_file.id}") + Logger.warning( + "Duplicate file detected but missing instance record: #{existing_file.id}" + ) + Logger.info("Attempting to recreate instances...") - recreate_file_instances(existing_file, source_path, file_hash, user_id, original_filename) + + recreate_file_instances( + existing_file, + source_path, + file_hash, + user_id, + original_filename + ) end nil -> @@ -912,13 +931,13 @@ defmodule PhoenixKit.Storage do end defp store_new_file_in_buckets( - source_path, - file_type, - user_id, - file_hash, - ext, - original_filename - ) do + source_path, + file_type, + user_id, + file_hash, + ext, + original_filename + ) do # Calculate MD5 hash for path structure md5_hash = source_path @@ -1052,7 +1071,9 @@ defmodule PhoenixKit.Storage do # File record exists but instances are missing or broken # First store the file in buckets, then recreate the instance record - Logger.info("Starting recreate_file_instances for file: #{file.id}, file_path: #{file.file_path}") + Logger.info( + "Starting recreate_file_instances for file: #{file.id}, file_path: #{file.file_path}" + ) {:ok, stat} = Elixir.File.stat(source_path) file_size = stat.size @@ -1064,12 +1085,17 @@ defmodule PhoenixKit.Storage do original_path = "#{file.file_path}/#{md5_hash}_original.#{file.ext}" Logger.info("Reconstructed original path for instance: #{original_path}") - Logger.info("About to store file from source_path: #{source_path} to storage path: #{original_path}") + + Logger.info( + "About to store file from source_path: #{source_path} to storage path: #{original_path}" + ) # First, store the file in buckets using Manager case Manager.store_file(source_path, path_prefix: original_path) do {:ok, storage_info} -> - Logger.info("File stored in buckets: #{original_path}, bucket_ids: #{inspect(storage_info.bucket_ids)}") + Logger.info( + "File stored in buckets: #{original_path}, bucket_ids: #{inspect(storage_info.bucket_ids)}" + ) # Now create the file instance record pointing to the stored file original_instance_attrs = %{ @@ -1085,11 +1111,18 @@ defmodule PhoenixKit.Storage do case create_file_instance(original_instance_attrs) do {:ok, _instance} -> - Logger.info("Recreated original instance for file: #{file.id}, path: #{original_path}") + Logger.info( + "Recreated original instance for file: #{file.id}, path: #{original_path}" + ) + # Delete any remaining broken variant instances BEFORE queuing ProcessFileJob # This ensures ProcessFileJob creates fresh instances with correct paths deleted_variants = delete_variant_instances(file.id) - Logger.info("Deleted #{deleted_variants} broken variant instances before regeneration") + + Logger.info( + "Deleted #{deleted_variants} broken variant instances before regeneration" + ) + # Queue variant generation for the recovered file _ = queue_variant_generation(file, user_id, original_filename) {:ok, file, :duplicate} @@ -1097,26 +1130,42 @@ defmodule PhoenixKit.Storage do {:error, reason} -> # Instance creation failed, might be duplicate constraint # Try deleting old broken instances and recreating - Logger.warning("Instance creation failed for file #{file.id}: #{inspect(reason)}, attempting cleanup and retry") + Logger.warning( + "Instance creation failed for file #{file.id}: #{inspect(reason)}, attempting cleanup and retry" + ) + _ = delete_file_instances_for_file(file.id) case create_file_instance(original_instance_attrs) do {:ok, _instance} -> - Logger.info("Recreated original instance for file (after cleanup): #{file.id}, path: #{original_path}") + Logger.info( + "Recreated original instance for file (after cleanup): #{file.id}, path: #{original_path}" + ) + # Delete any remaining broken variant instances deleted_variants = delete_variant_instances(file.id) - Logger.info("Deleted #{deleted_variants} broken variant instances before regeneration") + + Logger.info( + "Deleted #{deleted_variants} broken variant instances before regeneration" + ) + _ = queue_variant_generation(file, user_id, original_filename) {:ok, file, :duplicate} {:error, final_reason} -> - Logger.error("Failed to recreate instance for file #{file.id}: #{inspect(final_reason)}") + Logger.error( + "Failed to recreate instance for file #{file.id}: #{inspect(final_reason)}" + ) + {:error, final_reason} end end {:error, store_error} -> - Logger.error("Failed to store file in buckets for recreate_file_instances: #{inspect(store_error)}") + Logger.error( + "Failed to store file in buckets for recreate_file_instances: #{inspect(store_error)}" + ) + {:error, store_error} end end diff --git a/lib/phoenix_kit/storage/dimension.ex b/lib/phoenix_kit/storage/dimension.ex index 5d521cfc5..96972a1ee 100644 --- a/lib/phoenix_kit/storage/dimension.ex +++ b/lib/phoenix_kit/storage/dimension.ex @@ -83,6 +83,7 @@ defmodule PhoenixKit.Storage.Dimension do field :format, :string field :applies_to, :string field :enabled, :boolean, default: true + field :maintain_aspect_ratio, :boolean, default: true field :order, :integer, default: 0 timestamps(type: :naive_datetime) @@ -95,11 +96,18 @@ defmodule PhoenixKit.Storage.Dimension do - `name` - `applies_to` + - `width` - Required when `maintain_aspect_ratio` is true or false + + ## Optional Fields + + - `height` - Required when `maintain_aspect_ratio` is false (fixed dimensions) + - `maintain_aspect_ratio` - Whether to preserve aspect ratio (default: true) ## Validation Rules - Name must be unique - - At least width or height must be specified + - Width must be specified (always required) + - Height must be specified when `maintain_aspect_ratio` is false - Width and height must be positive integers - Quality must be between 1-100 for images or 0-51 for videos - Applies to must be one of: "image", "video", "both" @@ -116,6 +124,7 @@ defmodule PhoenixKit.Storage.Dimension do :format, :applies_to, :enabled, + :maintain_aspect_ratio, :order ]) |> validate_required([:name, :applies_to]) @@ -133,15 +142,21 @@ defmodule PhoenixKit.Storage.Dimension do |> unique_constraint(:name, name: :phoenix_kit_storage_dimensions_name_index) end - # Validate that at least width or height is specified + # Validate dimensions based on maintain_aspect_ratio setting defp validate_dimension_size(changeset) do width = get_field(changeset, :width) height = get_field(changeset, :height) + maintain_aspect = get_field(changeset, :maintain_aspect_ratio) - if is_nil(width) && is_nil(height) do - add_error(changeset, :width, "at least width or height must be specified") - else - changeset + cond do + is_nil(width) -> + add_error(changeset, :width, "width is required") + + maintain_aspect == false && is_nil(height) -> + add_error(changeset, :height, "height is required when not maintaining aspect ratio") + + true -> + changeset end end @@ -224,18 +239,25 @@ defmodule PhoenixKit.Storage.Dimension do def applies_to_videos?(_), do: false @doc """ - Returns whether this dimension preserves aspect ratio (only one dimension specified). + Returns whether this dimension preserves aspect ratio. """ - def preserve_aspect_ratio?(%__MODULE__{width: width, height: height}) do - is_nil(width) || is_nil(height) + def preserve_aspect_ratio?(%__MODULE__{maintain_aspect_ratio: maintain_aspect}) do + maintain_aspect == true end @doc """ Returns a human-readable description of this dimension. """ - def description(%__MODULE__{name: name, width: width, height: height, format: format}) do + def description(%__MODULE__{ + name: name, + width: width, + height: height, + format: format, + maintain_aspect_ratio: maintain_aspect + }) do size_desc = cond do + maintain_aspect && width -> "#{width}px wide (aspect ratio maintained)" width && height -> "#{width}×#{height}" width -> "#{width}px wide" height -> "#{height}px tall" diff --git a/lib/phoenix_kit/storage/variant_generator.ex b/lib/phoenix_kit/storage/variant_generator.ex index 5f156eca5..db9f90beb 100644 --- a/lib/phoenix_kit/storage/variant_generator.ex +++ b/lib/phoenix_kit/storage/variant_generator.ex @@ -311,30 +311,37 @@ defmodule PhoenixKit.Storage.VariantGenerator do defp process_image_variant(input_path, output_path, _mime_type, dimension) do Logger.info( - "process_image_variant: input=#{input_path} output=#{output_path} width=#{dimension.width} height=#{dimension.height}" + "process_image_variant: input=#{input_path} output=#{output_path} width=#{dimension.width} height=#{dimension.height} maintain_aspect=#{dimension.maintain_aspect_ratio}" ) quality = dimension.quality || 85 format = dimension.format - # Use center-crop for dimensions with both width and height (e.g., thumbnails) - # Use regular resize for dimensions with only one specified (maintains aspect ratio) - case {dimension.width, dimension.height} do - {w, h} when w != nil and h != nil -> - # Both dimensions specified - use center-crop with gravity - Logger.info("Using center-crop for #{dimension.name} (#{w}x#{h})") + # Decision based on maintain_aspect_ratio setting + case dimension.maintain_aspect_ratio do + true -> + # Maintain aspect ratio - use only width + Logger.info("Using responsive resize for #{dimension.name} (width: #{dimension.width}px)") - ImageProcessor.resize_and_crop_center(input_path, output_path, w, h, + ImageProcessor.resize(input_path, output_path, dimension.width, nil, quality: quality, - format: format, - background: "white" + format: format + ) + + false -> + # Fixed dimensions - use center-crop with gravity + Logger.info( + "Using center-crop for #{dimension.name} (#{dimension.width}x#{dimension.height})" ) - _ -> - # Only one dimension specified - use regular resize to maintain aspect ratio - ImageProcessor.resize(input_path, output_path, dimension.width, dimension.height, + ImageProcessor.resize_and_crop_center( + input_path, + output_path, + dimension.width, + dimension.height, quality: quality, - format: format + format: format, + background: "white" ) end end diff --git a/lib/phoenix_kit_web/live/settings/storage/dimension_form.ex b/lib/phoenix_kit_web/live/settings/storage/dimension_form.ex index 669acd3ed..45dc03dfe 100644 --- a/lib/phoenix_kit_web/live/settings/storage/dimension_form.ex +++ b/lib/phoenix_kit_web/live/settings/storage/dimension_form.ex @@ -36,6 +36,14 @@ defmodule PhoenixKitWeb.Live.Settings.Storage.DimensionForm do end def handle_event("validate", %{"dimension" => dimension_params}, socket) do + # Convert maintain_aspect_ratio string to boolean + dimension_params = + case dimension_params["maintain_aspect_ratio"] do + "true" -> Map.put(dimension_params, "maintain_aspect_ratio", true) + "false" -> Map.put(dimension_params, "maintain_aspect_ratio", false) + _ -> dimension_params + end + changeset = case socket.assigns.mode do :new -> @@ -54,6 +62,14 @@ defmodule PhoenixKitWeb.Live.Settings.Storage.DimensionForm do end def handle_event("save", %{"dimension" => dimension_params}, socket) do + # Convert maintain_aspect_ratio string to boolean + dimension_params = + case dimension_params["maintain_aspect_ratio"] do + "true" -> Map.put(dimension_params, "maintain_aspect_ratio", true) + "false" -> Map.put(dimension_params, "maintain_aspect_ratio", false) + _ -> dimension_params + end + case socket.assigns.mode do :new -> create_dimension(socket, dimension_params) :edit -> update_dimension(socket, dimension_params) @@ -152,8 +168,8 @@ defmodule PhoenixKitWeb.Live.Settings.Storage.DimensionForm do # Helper function to get field value from changeset or data defp get_field_value(changeset, field) do case changeset do - %Ecto.Changeset{changes: changes, data: data} -> - Map.get(changes, field) || Map.get(data, field) + %Ecto.Changeset{} -> + Ecto.Changeset.get_field(changeset, field) _ -> nil diff --git a/lib/phoenix_kit_web/live/settings/storage/dimension_form.html.heex b/lib/phoenix_kit_web/live/settings/storage/dimension_form.html.heex index 1bb01027e..087649919 100644 --- a/lib/phoenix_kit_web/live/settings/storage/dimension_form.html.heex +++ b/lib/phoenix_kit_web/live/settings/storage/dimension_form.html.heex @@ -50,11 +50,49 @@ {render_error(@changeset, :name)}
+ <%!-- Aspect Ratio Toggle --%> +
+ +

+ <%= if get_field_value(@changeset, :maintain_aspect_ratio) != false do %> + When enabled: Only width is used, height is calculated automatically + <% else %> + When disabled: Both width and height are used for fixed dimensions (crops/thumbnails) + <% end %> +

+
+
{render_error(@changeset, :width)}
-
- - - {render_error(@changeset, :height)} -
+ <%= if get_field_value(@changeset, :maintain_aspect_ratio) == false do %> +
+ + + {render_error(@changeset, :height)} +
+ <% end %>
<%!-- Quality and Format --%> @@ -197,10 +239,10 @@

Dimension Configuration Guide

- Size Settings: - Width and height define the target dimensions
- Aspect Ratio: - Leave one dimension empty to maintain aspect ratio
+ Maintain Aspect Ratio (Default ON): + When enabled, only the width is used and height is calculated automatically to preserve the image's aspect ratio. Perfect for responsive images.
+ Fixed Dimensions (When Aspect Ratio OFF): + Both width and height are used for exact dimensions. Images are center-cropped to fit. Great for thumbnails and square previews.
Quality Settings: Images use 1-100 (compression quality), Videos use CRF 0-51 (constant rate factor)
Format Override: diff --git a/lib/phoenix_kit_web/live/settings/storage/dimensions.html.heex b/lib/phoenix_kit_web/live/settings/storage/dimensions.html.heex index 349e09728..97de134b0 100644 --- a/lib/phoenix_kit_web/live/settings/storage/dimensions.html.heex +++ b/lib/phoenix_kit_web/live/settings/storage/dimensions.html.heex @@ -101,7 +101,14 @@ Name - Size + + <%= if Enum.any?(Enum.filter(@dimensions, & &1.applies_to in ["image", "both"]), & &1.maintain_aspect_ratio) do %> + Target Width / Size + <% else %> + Size + <% end %> + + Mode Quality Format Status @@ -116,9 +123,20 @@ - {format_dimension_size(dimension.width, dimension.height)} + <%= if dimension.maintain_aspect_ratio do %> + {dimension.width}px + <% else %> + {format_dimension_size(dimension.width, dimension.height)} + <% end %> + + <%= if dimension.maintain_aspect_ratio do %> + Aspect Ratio + <% else %> + Fixed + <% end %> + {dimension.quality}% @@ -205,7 +223,14 @@ Name - Resolution + + <%= if Enum.any?(Enum.filter(@dimensions, & &1.applies_to in ["video", "both"]), & &1.maintain_aspect_ratio) do %> + Target Width / Resolution + <% else %> + Resolution + <% end %> + + Mode Quality (CRF) Codec Status @@ -220,9 +245,20 @@ - {format_dimension_size(dimension.width, dimension.height)} + <%= if dimension.maintain_aspect_ratio do %> + {dimension.width}px + <% else %> + {format_dimension_size(dimension.width, dimension.height)} + <% end %> + + <%= if dimension.maintain_aspect_ratio do %> + Aspect Ratio + <% else %> + Fixed + <% end %> + {dimension.quality} diff --git a/lib/phoenix_kit_web/live/users/media.ex b/lib/phoenix_kit_web/live/users/media.ex index 56366434c..e4e628ada 100644 --- a/lib/phoenix_kit_web/live/users/media.ex +++ b/lib/phoenix_kit_web/live/users/media.ex @@ -188,10 +188,12 @@ defmodule PhoenixKitWeb.Live.Users.Media do file_ids = Enum.map(uploaded_files, &get_file_id/1) # Check for duplicates and create appropriate flash message - duplicate_count = Enum.count(uploaded_files, fn - %{duplicate: true} -> true - _ -> false - end) + duplicate_count = + Enum.count(uploaded_files, fn + %{duplicate: true} -> true + _ -> false + end) + new_count = length(uploaded_files) - duplicate_count flash_message = diff --git a/lib/phoenix_kit_web/users/user_form.ex b/lib/phoenix_kit_web/users/user_form.ex index de2eb5cf5..dfd9fc0a4 100644 --- a/lib/phoenix_kit_web/users/user_form.ex +++ b/lib/phoenix_kit_web/users/user_form.ex @@ -96,7 +96,11 @@ defmodule PhoenixKitWeb.Users.UserForm do filtered_params = if socket.assigns.mode == :edit do filtered_params = Map.put_new(filtered_params, "username", socket.assigns.user.username) - Logger.info("validate_user - user_params username: #{inspect(Map.get(user_params, "username"))}, filtered_params username: #{inspect(Map.get(filtered_params, "username"))}") + + Logger.info( + "validate_user - user_params username: #{inspect(Map.get(user_params, "username"))}, filtered_params username: #{inspect(Map.get(filtered_params, "username"))}" + ) + filtered_params else filtered_params @@ -104,8 +108,11 @@ defmodule PhoenixKitWeb.Users.UserForm do changeset = case socket.assigns.mode do - :new -> Auth.change_user_registration(%Auth.User{}, filtered_params) - :edit -> Auth.User.profile_changeset(socket.assigns.user, filtered_params, validate_email: false) + :new -> + Auth.change_user_registration(%Auth.User{}, filtered_params) + + :edit -> + Auth.User.profile_changeset(socket.assigns.user, filtered_params, validate_email: false) end |> Map.put(:action, :validate) @@ -398,9 +405,15 @@ defmodule PhoenixKitWeb.Users.UserForm do end defp update_user_profile_without_validation(user, attrs) do - Logger.info("update_user_profile_without_validation - attrs username: #{inspect(Map.get(attrs, "username"))}") + Logger.info( + "update_user_profile_without_validation - attrs username: #{inspect(Map.get(attrs, "username"))}" + ) + changeset = Auth.User.profile_changeset(user, attrs, validate_email: false) - Logger.info("After profile_changeset, changeset changes username: #{inspect(Ecto.Changeset.get_change(changeset, :username))}, field: #{inspect(Ecto.Changeset.get_field(changeset, :username))}") + + Logger.info( + "After profile_changeset, changeset changes username: #{inspect(Ecto.Changeset.get_change(changeset, :username))}, field: #{inspect(Ecto.Changeset.get_field(changeset, :username))}" + ) case changeset |> PhoenixKit.RepoHelper.repo().update() do {:ok, updated_user} -> @@ -431,7 +444,10 @@ defmodule PhoenixKitWeb.Users.UserForm do # In both cases, we need to reload the user from the database to get the fresh data user_id = socket.assigns.user.id fresh_user = Auth.get_user!(user_id) - Logger.info("handle_update_result - fresh_user username from DB: #{inspect(fresh_user.username)}") + + Logger.info( + "handle_update_result - fresh_user username from DB: #{inspect(fresh_user.username)}" + ) socket = socket @@ -538,8 +554,13 @@ defmodule PhoenixKitWeb.Users.UserForm do # For edit mode, use profile_changeset instead of registration_changeset # profile_changeset doesn't call maybe_generate_username_from_email like registration_changeset does Logger.info("Loading form for user #{user.id}: DB username=#{inspect(user.username)}") - changeset = Auth.User.profile_changeset(user, %{"username" => user.username}, validate_email: false) - Logger.info("After creating changeset, changeset changes: #{inspect(Ecto.Changeset.get_change(changeset, :username))}, changeset field: #{inspect(Ecto.Changeset.get_field(changeset, :username))}") + + changeset = + Auth.User.profile_changeset(user, %{"username" => user.username}, validate_email: false) + + Logger.info( + "After creating changeset, changeset changes: #{inspect(Ecto.Changeset.get_change(changeset, :username))}, changeset field: #{inspect(Ecto.Changeset.get_field(changeset, :username))}" + ) socket |> assign(:changeset, changeset) From ad5c3a286bd0de759d8cbd403ba27d8141d738e2 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Thu, 13 Nov 2025 22:42:05 +0200 Subject: [PATCH 23/24] Fixed deleting of buckets --- lib/phoenix_kit_web/live/settings/storage.ex | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/phoenix_kit_web/live/settings/storage.ex b/lib/phoenix_kit_web/live/settings/storage.ex index 9728247c1..7d3e89724 100644 --- a/lib/phoenix_kit_web/live/settings/storage.ex +++ b/lib/phoenix_kit_web/live/settings/storage.ex @@ -256,6 +256,31 @@ defmodule PhoenixKitWeb.Live.Settings.Storage do end end + def handle_event("delete_bucket", %{"id" => bucket_id}, socket) do + bucket = PhoenixKit.Storage.get_bucket(bucket_id) + + case PhoenixKit.Storage.delete_bucket(bucket) do + {:ok, _bucket} -> + # Reload buckets and recalculate max redundancy + buckets = PhoenixKit.Storage.list_buckets() + active_buckets_count = Enum.count(buckets, & &1.enabled) + max_redundancy = max(1, active_buckets_count) + + socket = + socket + |> assign(:buckets, buckets) + |> assign(:active_buckets_count, active_buckets_count) + |> assign(:max_redundancy, max_redundancy) + |> put_flash(:info, "Bucket deleted successfully") + + {:noreply, socket} + + {:error, _changeset} -> + socket = put_flash(socket, :error, "Failed to delete bucket") + {:noreply, socket} + end + end + defp get_current_path(_socket, _session) do # For Storage settings page Routes.path("/admin/settings/storage") From 31d8b56bb23367b5b029658a165a94bbabef3197 Mon Sep 17 00:00:00 2001 From: Alexander Don Date: Fri, 14 Nov 2025 19:19:44 +0200 Subject: [PATCH 24/24] Fixed credo issues --- lib/phoenix_kit_web/components/admin_nav.ex | 5 +- .../controllers/file_controller.ex | 2 +- lib/phoenix_kit_web/live/users/media.ex | 161 +++++++++--------- .../live/users/media_detail.ex | 117 +++++++------ lib/phoenix_kit_web/users/user_form.ex | 3 +- 5 files changed, 147 insertions(+), 141 deletions(-) diff --git a/lib/phoenix_kit_web/components/admin_nav.ex b/lib/phoenix_kit_web/components/admin_nav.ex index 72b31634e..a55a5c970 100644 --- a/lib/phoenix_kit_web/components/admin_nav.ex +++ b/lib/phoenix_kit_web/components/admin_nav.ex @@ -10,6 +10,7 @@ defmodule PhoenixKitWeb.Components.AdminNav do alias PhoenixKit.Module.Languages alias PhoenixKit.Settings alias PhoenixKit.ThemeConfig + alias PhoenixKit.Users.Auth.Scope alias PhoenixKit.Utils.Routes import PhoenixKitWeb.Components.Core.Icon @@ -270,7 +271,7 @@ defmodule PhoenixKitWeb.Components.AdminNav do attr(:current_locale, :string, default: "en") def admin_user_dropdown(assigns) do - user = PhoenixKit.Users.Auth.Scope.user(assigns.scope) + user = Scope.user(assigns.scope) avatar_file_id = user && user.custom_fields && user.custom_fields["avatar_file_id"] assigns = @@ -403,7 +404,7 @@ defmodule PhoenixKitWeb.Components.AdminNav do attr(:scope, :any, default: nil) def admin_user_info(assigns) do - user = PhoenixKit.Users.Auth.Scope.user(assigns.scope) + user = Scope.user(assigns.scope) avatar_file_id = user && user.custom_fields && user.custom_fields["avatar_file_id"] assigns = diff --git a/lib/phoenix_kit_web/controllers/file_controller.ex b/lib/phoenix_kit_web/controllers/file_controller.ex index 1d406635f..c2b50e844 100644 --- a/lib/phoenix_kit_web/controllers/file_controller.ex +++ b/lib/phoenix_kit_web/controllers/file_controller.ex @@ -6,8 +6,8 @@ defmodule PhoenixKitWeb.FileController do """ use PhoenixKitWeb, :controller - alias PhoenixKit.Storage.{Manager, URLSigner, Workers.ProcessFileJob} alias PhoenixKit.Storage + alias PhoenixKit.Storage.{Manager, URLSigner, Workers.ProcessFileJob} alias PhoenixKit.Utils.Routes @doc """ diff --git a/lib/phoenix_kit_web/live/users/media.ex b/lib/phoenix_kit_web/live/users/media.ex index e4e628ada..5ce38d003 100644 --- a/lib/phoenix_kit_web/live/users/media.ex +++ b/lib/phoenix_kit_web/live/users/media.ex @@ -118,64 +118,7 @@ defmodule PhoenixKitWeb.Live.Users.Media do # Process uploaded files uploaded_files = consume_uploaded_entries(socket, :media_files, fn %{path: path}, entry -> - # Get file info - ext = Path.extname(entry.client_name) |> String.replace_leading(".", "") - mime_type = entry.client_type || MIME.from_path(entry.client_name) - file_type = determine_file_type(mime_type) - - # Get current user - current_user = socket.assigns.phoenix_kit_current_user - user_id = if current_user, do: current_user.id, else: 1 - - # Get file size - {:ok, stat} = Elixir.File.stat(path) - file_size = stat.size - - # Calculate hash - file_hash = Auth.calculate_file_hash(path) - - # Store file in storage - case PhoenixKit.Storage.store_file_in_buckets( - path, - file_type, - user_id, - file_hash, - ext, - entry.client_name - ) do - {:ok, file, :duplicate} -> - # File is a duplicate, still return success but mark it - {:ok, - %{ - file_id: file.id, - filename: entry.client_name, - file_type: file_type, - mime_type: mime_type, - size: file_size, - status: file.status, - urls: %{}, - duplicate: true - }} - - {:ok, file} -> - # New file - ProcessFileJob is now automatically queued in Storage.store_file_in_buckets - # Variants will be generated asynchronously and loaded when page data is refreshed - - {:ok, - %{ - file_id: file.id, - filename: entry.client_name, - file_type: file_type, - mime_type: mime_type, - size: file_size, - status: file.status, - urls: %{} - }} - - {:error, reason} -> - Logger.error("Storage Error: #{inspect(reason)}") - {:error, reason} - end + process_single_upload(socket, path, entry) end) # Reload paginated data from database to show newly uploaded files @@ -187,29 +130,8 @@ defmodule PhoenixKitWeb.Live.Users.Media do # Extract file IDs for callbacks file_ids = Enum.map(uploaded_files, &get_file_id/1) - # Check for duplicates and create appropriate flash message - duplicate_count = - Enum.count(uploaded_files, fn - %{duplicate: true} -> true - _ -> false - end) - - new_count = length(uploaded_files) - duplicate_count - - flash_message = - case {new_count, duplicate_count} do - {0, n} when n > 0 -> - "Already have #{n} duplicate file(s). No new files were added." - - {n, 0} when n > 0 -> - "Upload successful! #{n} new file(s) processed" - - {n, d} when n > 0 and d > 0 -> - "Upload successful! #{n} new file(s) added. #{d} file(s) were already uploaded." - - _ -> - "Upload processed" - end + # Build flash message based on upload results + flash_message = build_upload_flash_message(uploaded_files) socket = socket @@ -315,4 +237,81 @@ defmodule PhoenixKitWeb.Live.Users.Media do {existing_files, total_count} end + + defp process_single_upload(socket, path, entry) do + # Get file info + ext = Path.extname(entry.client_name) |> String.replace_leading(".", "") + mime_type = entry.client_type || MIME.from_path(entry.client_name) + file_type = determine_file_type(mime_type) + + # Get current user + current_user = socket.assigns.phoenix_kit_current_user + user_id = if current_user, do: current_user.id, else: 1 + + # Get file size + {:ok, stat} = Elixir.File.stat(path) + file_size = stat.size + + # Calculate hash + file_hash = Auth.calculate_file_hash(path) + + # Store file in storage + case PhoenixKit.Storage.store_file_in_buckets( + path, + file_type, + user_id, + file_hash, + ext, + entry.client_name + ) do + {:ok, file, :duplicate} -> + build_upload_result(file, entry, file_type, mime_type, file_size, true) + + {:ok, file} -> + build_upload_result(file, entry, file_type, mime_type, file_size, false) + + {:error, reason} -> + Logger.error("Storage Error: #{inspect(reason)}") + {:error, reason} + end + end + + defp build_upload_result(file, entry, file_type, mime_type, file_size, is_duplicate) do + result = %{ + file_id: file.id, + filename: entry.client_name, + file_type: file_type, + mime_type: mime_type, + size: file_size, + status: file.status, + urls: %{} + } + + result = if is_duplicate, do: Map.put(result, :duplicate, true), else: result + {:ok, result} + end + + defp build_upload_flash_message(uploaded_files) do + duplicate_count = + Enum.count(uploaded_files, fn + %{duplicate: true} -> true + _ -> false + end) + + new_count = length(uploaded_files) - duplicate_count + + case {new_count, duplicate_count} do + {0, n} when n > 0 -> + "Already have #{n} duplicate file(s). No new files were added." + + {n, 0} when n > 0 -> + "Upload successful! #{n} new file(s) processed" + + {n, d} when n > 0 and d > 0 -> + "Upload successful! #{n} new file(s) added. #{d} file(s) were already uploaded." + + _ -> + "Upload processed" + end + end end diff --git a/lib/phoenix_kit_web/live/users/media_detail.ex b/lib/phoenix_kit_web/live/users/media_detail.ex index d6380ac3c..c96a93f4b 100644 --- a/lib/phoenix_kit_web/live/users/media_detail.ex +++ b/lib/phoenix_kit_web/live/users/media_detail.ex @@ -97,7 +97,6 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do defp load_file_data(socket, file_id) do repo = Application.get_env(:phoenix_kit, :repo) - import Ecto.Query case repo.get(File, file_id) do nil -> @@ -106,63 +105,14 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do |> assign(:file_data, nil) file -> - # Load file instances for this file - instances = - FileInstance - |> where([fi], fi.file_id == ^file_id) - |> repo.all() - - # Generate URLs from instances + instances = load_file_instances(file_id, repo) urls = generate_urls_from_instances(instances, file_id) + locations = load_original_locations(instances, repo) + {title, description, tags} = extract_metadata_fields(file.metadata) + user_name = get_user_name(file.user_id, repo) - # Load file locations for the original instance - locations = - case Enum.find(instances, &(&1.variant_name == "original")) do - nil -> [] - original_instance -> load_file_locations(original_instance.id, repo) - end - - # Extract metadata - metadata = file.metadata || %{} - title = metadata["title"] || "" - description = metadata["description"] || "" - tags = metadata["tags"] || [] - - # Get user information if available - user_name = - case file.user_id do - nil -> - "Unknown" - - user_id -> - alias_module = - Application.get_env(:phoenix_kit, :users_module, PhoenixKit.Users.Auth.User) - - case repo.get(alias_module, user_id) do - nil -> "Unknown" - user -> user.email - end - end - - # Build file data map - file_data = %{ - file_id: file.id, - filename: file.original_file_name || file.file_name || "Unknown", - original_filename: file.original_file_name, - file_type: file.file_type, - mime_type: file.mime_type, - size: file.size || 0, - status: file.status, - urls: urls, - title: title, - description: description, - tags: tags, - metadata: metadata, - inserted_at: file.inserted_at, - updated_at: file.updated_at, - locations: locations, - user_name: user_name - } + file_data = + build_file_data(file, urls, locations, {title, description, tags}, user_name) socket |> assign(:file, file) @@ -171,6 +121,61 @@ defmodule PhoenixKitWeb.Live.Users.MediaDetail do end end + defp load_file_instances(file_id, repo) do + import Ecto.Query + + FileInstance + |> where([fi], fi.file_id == ^file_id) + |> repo.all() + end + + defp load_original_locations(instances, repo) do + case Enum.find(instances, &(&1.variant_name == "original")) do + nil -> [] + original_instance -> load_file_locations(original_instance.id, repo) + end + end + + defp extract_metadata_fields(metadata) do + metadata = metadata || %{} + title = metadata["title"] || "" + description = metadata["description"] || "" + tags = metadata["tags"] || [] + {title, description, tags} + end + + defp get_user_name(nil, _repo), do: "Unknown" + + defp get_user_name(user_id, repo) do + alias_module = Application.get_env(:phoenix_kit, :users_module, PhoenixKit.Users.Auth.User) + + case repo.get(alias_module, user_id) do + nil -> "Unknown" + user -> user.email + end + end + + defp build_file_data(file, urls, locations, {title, description, tags}, user_name) do + %{ + file_id: file.id, + filename: file.original_file_name || file.file_name || "Unknown", + original_filename: file.original_file_name, + file_type: file.file_type, + mime_type: file.mime_type, + size: file.size || 0, + status: file.status, + urls: urls, + title: title, + description: description, + tags: tags, + metadata: file.metadata || %{}, + inserted_at: file.inserted_at, + updated_at: file.updated_at, + locations: locations, + user_name: user_name + } + end + # Generate URLs from pre-loaded instances (no database query needed) defp generate_urls_from_instances(instances, file_id) do Enum.reduce(instances, %{}, fn instance, acc -> diff --git a/lib/phoenix_kit_web/users/user_form.ex b/lib/phoenix_kit_web/users/user_form.ex index dfd9fc0a4..a9ec32c21 100644 --- a/lib/phoenix_kit_web/users/user_form.ex +++ b/lib/phoenix_kit_web/users/user_form.ex @@ -10,6 +10,7 @@ defmodule PhoenixKitWeb.Users.UserForm do require Logger + alias PhoenixKit.Admin.Events alias PhoenixKit.Settings alias PhoenixKit.Users.Auth alias PhoenixKit.Users.CustomFields @@ -418,7 +419,7 @@ defmodule PhoenixKitWeb.Users.UserForm do case changeset |> PhoenixKit.RepoHelper.repo().update() do {:ok, updated_user} -> Logger.info("After DB update, saved username: #{inspect(updated_user.username)}") - PhoenixKit.Admin.Events.broadcast_user_updated(updated_user) + Events.broadcast_user_updated(updated_user) {:ok, updated_user} {:error, changeset} ->