Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Admin] Add stock_items/edit modal component #5543

Merged
merged 9 commits into from
Dec 12, 2023
Merged

[Admin] Add stock_items/edit modal component #5543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
670814c
Add new `ui/resource_item` component
rainerdema Dec 7, 2023
5ac3ac6
Add new `ui/switch_field` component
rainerdema Dec 7, 2023
6383bcc
Enable logging for view components
rainerdema Dec 7, 2023
5b15958
Introduce stock movements column in stock items index
rainerdema Dec 7, 2023
db985f2
Add missing translation in stock items index image column
rainerdema Dec 7, 2023
3f588ef
Introude new edit and update action for stock item records
rainerdema Dec 7, 2023
dc8cfdf
Introduce new `stock_items/edit` component
rainerdema Dec 7, 2023
d2e55ee
Implement redirect to previous page after stock item saving
rainerdema Dec 7, 2023
29e3134
Don't use the same name for a circleci job and command
elia Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add new ui/resource_item component 
Co-Authored-By: Elia Schito <[email protected]>
  • Loading branch information
@rainerdema @elia
rainerdema and elia committed Dec 11, 2023
commit 670814caafcefeb1b4b04b6dbcf5cf208f5e5c79
19 changes: 5 additions & 14 deletions admin/app/components/solidus_admin/orders/cart/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,11 @@
<% @order.line_items.each do |line_item| %>
<tr class="border-gray-100 border-t">
<td class="px-6 py-4">
<div class="flex gap-2 grow">
<% variant = line_item.variant %>
<%= render component("ui/thumbnail").new(
src: (variant.images.first || variant.product.gallery.images.first)&.url(:small),
alt: variant.name
) %>
<div class="flex-col">
<div class="leading-5 text-black body-small-bold"><%= variant.name %></div>
<div class="leading-5 text-gray-500 body-small">
SKU: <%= variant.sku %>
<%= variant.options_text.presence&.prepend("- ") %>
</div>
</div>
</div>
<%= render component("ui/resource_item").new(
thumbnail: (line_item.variant.images.first || line_item.variant.product.gallery.images.first)&.url(:small),
title: line_item.variant.name,
subtitle: "#{line_item.variant.sku}#{line_item.variant.options_text.presence&.prepend("- ")}",
) %>
</td>
<td class="px-6 py-4">
<%= form_for(line_item, url: solidus_admin.order_line_item_path(@order, line_item), html: {
Expand Down
10 changes: 10 additions & 0 deletions admin/app/components/solidus_admin/ui/resource_item/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="flex gap-2 grow">
<%= render component("ui/thumbnail").new(
src: @thumbnail,
alt: @title,
) if @thumbnail %>
<div class="flex-col">
<div class="leading-5 text-black body-small-bold"><%= @title %></div>
<div class="leading-5 text-gray-500 body-small"><%= @subtitle %></div>
</div>
</div>
9 changes: 9 additions & 0 deletions admin/app/components/solidus_admin/ui/resource_item/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

class SolidusAdmin::UI::ResourceItem::Component < SolidusAdmin::BaseComponent
def initialize(title:, subtitle:, thumbnail: nil)
@thumbnail = thumbnail
@title = title
@subtitle = subtitle
end
end
21 changes: 21 additions & 0 deletions admin/spec/components/previews/solidus_admin/ui/resource_item/component_preview.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# frozen_string_literal: true

# @component "ui/resource_item"
class SolidusAdmin::UI::ResourceItem::ComponentPreview < ViewComponent::Preview
include SolidusAdmin::Preview

def overview
render_with_template
end

# @param thumbnail text
# @param title text
# @param subtitle text
def render_resource_item(title: "Your Title", subtitle: "Your Subtitle", thumbnail: "https://picsum.photos/200/300")
render current_component.new(
title: title,
subtitle: subtitle,
thumbnail: thumbnail
)
end
end
7 changes: 7 additions & 0 deletions ...ec/components/previews/solidus_admin/ui/resource_item/component_preview/overview.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="mb-8">
<%= render current_component.new(
title: "Sample Product Name",
subtitle: "SKU12345 - Additional details here",
thumbnail: "https://picsum.photos/200/300"
) %>
</div>
9 changes: 9 additions & 0 deletions admin/spec/components/solidus_admin/ui/resource_item/component_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

require "spec_helper"

RSpec.describe SolidusAdmin::UI::ResourceItem::Component, type: :component do
it "renders the overview preview" do
render_preview(:overview)
end
end