refactor: cleanup mix credo issues
This commit is contained in:
@@ -7,9 +7,7 @@ defmodule ComponentsElixirWeb.CategoriesLive do
|
||||
@impl true
|
||||
def mount(_params, session, socket) do
|
||||
# Check authentication
|
||||
unless Auth.authenticated?(session) do
|
||||
{:ok, socket |> push_navigate(to: ~p"/login")}
|
||||
else
|
||||
if Auth.authenticated?(session) do
|
||||
categories = Inventory.list_categories()
|
||||
|
||||
{:ok,
|
||||
@@ -22,6 +20,8 @@ defmodule ComponentsElixirWeb.CategoriesLive do
|
||||
|> assign(:form, nil)
|
||||
|> assign(:expanded_categories, MapSet.new())
|
||||
|> assign(:page_title, "Category Management")}
|
||||
else
|
||||
{:ok, socket |> push_navigate(to: ~p"/login")}
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -2,16 +2,14 @@ defmodule ComponentsElixirWeb.ComponentsLive do
|
||||
use ComponentsElixirWeb, :live_view
|
||||
|
||||
alias ComponentsElixir.{Inventory, Auth}
|
||||
alias ComponentsElixir.Inventory.{Component, Category, StorageLocation, Hierarchical}
|
||||
alias ComponentsElixir.Inventory.{Component, StorageLocation, Hierarchical}
|
||||
|
||||
@items_per_page 20
|
||||
|
||||
@impl true
|
||||
def mount(_params, session, socket) do
|
||||
# Check authentication
|
||||
unless Auth.authenticated?(session) do
|
||||
{:ok, socket |> push_navigate(to: ~p"/login")}
|
||||
else
|
||||
if Auth.authenticated?(session) do
|
||||
categories = Inventory.list_categories()
|
||||
storage_locations = Inventory.list_storage_locations()
|
||||
stats = Inventory.component_stats()
|
||||
@@ -53,6 +51,8 @@ defmodule ComponentsElixirWeb.ComponentsLive do
|
||||
max_file_size: 10_000_000
|
||||
)
|
||||
|> load_components()}
|
||||
else
|
||||
{:ok, socket |> push_navigate(to: ~p"/login")}
|
||||
end
|
||||
end
|
||||
|
||||
@@ -431,55 +431,66 @@ defmodule ComponentsElixirWeb.ComponentsLive do
|
||||
DateTime.compare(now, socket.assigns.sort_freeze_until) != :lt
|
||||
|
||||
if should_reload do
|
||||
# Normal loading - query database with current sort criteria
|
||||
filters =
|
||||
[
|
||||
search: socket.assigns.search,
|
||||
sort_criteria: socket.assigns.sort_criteria,
|
||||
category_id: socket.assigns.selected_category,
|
||||
storage_location_id: socket.assigns.selected_storage_location,
|
||||
limit: @items_per_page,
|
||||
offset: socket.assigns.offset
|
||||
]
|
||||
|> Enum.reject(fn
|
||||
{_, v} when is_nil(v) -> true
|
||||
{:search, v} when v == "" -> true
|
||||
{_, _} -> false
|
||||
end)
|
||||
|
||||
%{components: new_components, has_more: has_more} =
|
||||
Inventory.paginate_components(filters)
|
||||
|
||||
components =
|
||||
if append do
|
||||
socket.assigns.components ++ new_components
|
||||
else
|
||||
new_components
|
||||
end
|
||||
|
||||
socket
|
||||
|> assign(:components, components)
|
||||
|> assign(:has_more, has_more)
|
||||
load_components_from_db(socket, append)
|
||||
else
|
||||
# Frozen - just update the specific component in place without reordering
|
||||
if socket.assigns.interacting_with do
|
||||
updated_components =
|
||||
Enum.map(socket.assigns.components, fn component ->
|
||||
if to_string(component.id) == socket.assigns.interacting_with do
|
||||
# Reload this specific component to get updated count
|
||||
Inventory.get_component!(component.id)
|
||||
else
|
||||
component
|
||||
end
|
||||
end)
|
||||
|
||||
assign(socket, :components, updated_components)
|
||||
else
|
||||
socket
|
||||
end
|
||||
update_frozen_components(socket)
|
||||
end
|
||||
end
|
||||
|
||||
defp load_components_from_db(socket, append) do
|
||||
filters = build_component_filters(socket)
|
||||
%{components: new_components, has_more: has_more} = Inventory.paginate_components(filters)
|
||||
|
||||
components =
|
||||
if append do
|
||||
socket.assigns.components ++ new_components
|
||||
else
|
||||
new_components
|
||||
end
|
||||
|
||||
socket
|
||||
|> assign(:components, components)
|
||||
|> assign(:has_more, has_more)
|
||||
end
|
||||
|
||||
defp update_frozen_components(socket) do
|
||||
if socket.assigns.interacting_with do
|
||||
updated_components = update_interacting_component(socket)
|
||||
assign(socket, :components, updated_components)
|
||||
else
|
||||
socket
|
||||
end
|
||||
end
|
||||
|
||||
defp update_interacting_component(socket) do
|
||||
interacting_id = socket.assigns.interacting_with
|
||||
|
||||
Enum.map(socket.assigns.components, fn component ->
|
||||
if to_string(component.id) == interacting_id do
|
||||
# Reload this specific component to get updated count
|
||||
Inventory.get_component!(component.id)
|
||||
else
|
||||
component
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
defp build_component_filters(socket) do
|
||||
[
|
||||
search: socket.assigns.search,
|
||||
sort_criteria: socket.assigns.sort_criteria,
|
||||
category_id: socket.assigns.selected_category,
|
||||
storage_location_id: socket.assigns.selected_storage_location,
|
||||
limit: @items_per_page,
|
||||
offset: socket.assigns.offset
|
||||
]
|
||||
|> Enum.reject(fn
|
||||
{_, v} when is_nil(v) -> true
|
||||
{:search, v} when v == "" -> true
|
||||
{_, _} -> false
|
||||
end)
|
||||
end
|
||||
|
||||
defp build_query_params(socket, overrides) do
|
||||
params = %{
|
||||
search: Map.get(overrides, :search, socket.assigns.search),
|
||||
@@ -1539,9 +1550,6 @@ defmodule ComponentsElixirWeb.ComponentsLive do
|
||||
|
||||
# Helper functions for image upload handling
|
||||
defp save_uploaded_image(socket, component_params) do
|
||||
IO.puts("=== DEBUG: Starting save_uploaded_image ===")
|
||||
IO.inspect(socket.assigns.uploads.image.entries, label: "Upload entries")
|
||||
|
||||
uploaded_files =
|
||||
consume_uploaded_entries(socket, :image, fn %{path: path}, entry ->
|
||||
filename = "#{System.unique_integer([:positive])}_#{entry.client_name}"
|
||||
@@ -1549,47 +1557,29 @@ defmodule ComponentsElixirWeb.ComponentsLive do
|
||||
upload_dir = Path.join([uploads_dir, "images"])
|
||||
dest = Path.join(upload_dir, filename)
|
||||
|
||||
IO.puts("=== DEBUG: Processing upload ===")
|
||||
IO.puts("Filename: #{filename}")
|
||||
IO.puts("Upload dir: #{upload_dir}")
|
||||
IO.puts("Destination: #{dest}")
|
||||
|
||||
# Ensure the upload directory exists
|
||||
File.mkdir_p!(upload_dir)
|
||||
|
||||
# Copy the file
|
||||
case File.cp(path, dest) do
|
||||
:ok ->
|
||||
IO.puts("=== DEBUG: File copy successful ===")
|
||||
{:ok, filename}
|
||||
|
||||
{:error, reason} ->
|
||||
IO.puts("=== DEBUG: File copy failed: #{inspect(reason)} ===")
|
||||
{:postpone, {:error, reason}}
|
||||
end
|
||||
end)
|
||||
|
||||
IO.inspect(uploaded_files, label: "Uploaded files result")
|
||||
case uploaded_files do
|
||||
[filename] when is_binary(filename) ->
|
||||
Map.put(component_params, "image_filename", filename)
|
||||
|
||||
result =
|
||||
case uploaded_files do
|
||||
[filename] when is_binary(filename) ->
|
||||
IO.puts("=== DEBUG: Adding filename to params: #{filename} ===")
|
||||
Map.put(component_params, "image_filename", filename)
|
||||
[] ->
|
||||
component_params
|
||||
|
||||
[] ->
|
||||
IO.puts("=== DEBUG: No files uploaded ===")
|
||||
component_params
|
||||
|
||||
_error ->
|
||||
IO.puts("=== DEBUG: Upload error ===")
|
||||
IO.inspect(uploaded_files, label: "Unexpected upload result")
|
||||
component_params
|
||||
end
|
||||
|
||||
IO.inspect(result, label: "Final component_params")
|
||||
IO.puts("=== DEBUG: End save_uploaded_image ===")
|
||||
result
|
||||
_error ->
|
||||
component_params
|
||||
end
|
||||
end
|
||||
|
||||
# Helper function for datasheet upload handling
|
||||
|
||||
@@ -11,9 +11,7 @@ defmodule ComponentsElixirWeb.StorageLocationsLive do
|
||||
@impl true
|
||||
def mount(_params, session, socket) do
|
||||
# Check authentication
|
||||
unless Auth.authenticated?(session) do
|
||||
{:ok, socket |> push_navigate(to: ~p"/login")}
|
||||
else
|
||||
if Auth.authenticated?(session) do
|
||||
storage_locations = list_storage_locations()
|
||||
|
||||
{:ok,
|
||||
@@ -28,6 +26,8 @@ defmodule ComponentsElixirWeb.StorageLocationsLive do
|
||||
|> assign(:scanned_tags, [])
|
||||
|> assign(:expanded_locations, MapSet.new())
|
||||
|> assign(:page_title, "Storage Location Management")}
|
||||
else
|
||||
{:ok, socket |> push_navigate(to: ~p"/login")}
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user