diff --git a/admin/app/components/solidus_admin/properties/edit/component.html.erb b/admin/app/components/solidus_admin/properties/edit/component.html.erb
new file mode 100644
index 0000000000..b68489b2f6
--- /dev/null
+++ b/admin/app/components/solidus_admin/properties/edit/component.html.erb
@@ -0,0 +1,17 @@
+<%= turbo_frame_tag :edit_property_modal do %>
+ <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+ <%= form_for @property, url: solidus_admin.property_path(@property), html: { id: form_id } do |f| %>
+
+ <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+ <%= render component("ui/forms/field").text_field(f, :presentation, class: "required") %>
+
+ <% modal.with_actions do %>
+
+ <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+ <% end %>
+ <% end %>
+ <% end %>
+<% end %>
+<%= render component("properties/index").new(page: @page) %>
\ No newline at end of file
diff --git a/admin/app/components/solidus_admin/properties/edit/component.rb b/admin/app/components/solidus_admin/properties/edit/component.rb
new file mode 100644
index 0000000000..b2ed34d911
--- /dev/null
+++ b/admin/app/components/solidus_admin/properties/edit/component.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Properties::Edit::Component < SolidusAdmin::BaseComponent
+ def initialize(page:, property:)
+ @page = page
+ @property = property
+ end
+
+ def form_id
+ dom_id(@property, "#{stimulus_id}_edit_property_form")
+ end
+end
diff --git a/admin/app/components/solidus_admin/properties/edit/component.yml b/admin/app/components/solidus_admin/properties/edit/component.yml
new file mode 100644
index 0000000000..bed9d213c8
--- /dev/null
+++ b/admin/app/components/solidus_admin/properties/edit/component.yml
@@ -0,0 +1,4 @@
+en:
+ title: "Edit Property"
+ cancel: "Cancel"
+ submit: "Update Property"
diff --git a/admin/app/components/solidus_admin/properties/index/component.rb b/admin/app/components/solidus_admin/properties/index/component.rb
index 75099d15f9..2603c6c435 100644
--- a/admin/app/components/solidus_admin/properties/index/component.rb
+++ b/admin/app/components/solidus_admin/properties/index/component.rb
@@ -14,14 +14,21 @@ def search_url
end
def row_url(property)
- spree.edit_admin_property_path(property)
+ spree.edit_admin_property_path(property, _turbo_frame: :edit_property_modal)
+ end
+
+ def turbo_frames
+ %w[
+ new_property_modal
+ edit_property_modal
+ ]
end
def page_actions
render component("ui/button").new(
tag: :a,
text: t('.add'),
- href: spree.new_admin_property_path,
+ href: solidus_admin.new_property_path, data: { turbo_frame: :new_property_modal },
icon: "add-line",
)
end
diff --git a/admin/app/components/solidus_admin/properties/new/component.html.erb b/admin/app/components/solidus_admin/properties/new/component.html.erb
new file mode 100644
index 0000000000..0522aabdd8
--- /dev/null
+++ b/admin/app/components/solidus_admin/properties/new/component.html.erb
@@ -0,0 +1,18 @@
+<%= turbo_frame_tag :new_property_modal do %>
+ <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+ <%= form_for @property, url: solidus_admin.properties_path, html: { id: form_id } do |f| %>
+
+ <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+ <%= render component("ui/forms/field").text_field(f, :presentation, class: "required") %>
+
+ <% modal.with_actions do %>
+
+ <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+ <% end %>
+ <% end %>
+ <% end %>
+<% end %>
+
+<%= render component("properties/index").new(page: @page) %>
\ No newline at end of file
diff --git a/admin/app/components/solidus_admin/properties/new/component.rb b/admin/app/components/solidus_admin/properties/new/component.rb
new file mode 100644
index 0000000000..55e8806c68
--- /dev/null
+++ b/admin/app/components/solidus_admin/properties/new/component.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Properties::New::Component < SolidusAdmin::BaseComponent
+ def initialize(page:, property:)
+ @page = page
+ @property = property
+ end
+
+ def form_id
+ dom_id(@property, "#{stimulus_id}_new_property_form")
+ end
+end
diff --git a/admin/app/components/solidus_admin/properties/new/component.yml b/admin/app/components/solidus_admin/properties/new/component.yml
new file mode 100644
index 0000000000..e91d4784c5
--- /dev/null
+++ b/admin/app/components/solidus_admin/properties/new/component.yml
@@ -0,0 +1,4 @@
+en:
+ title: "New Property"
+ cancel: "Cancel"
+ submit: "Add Property"
diff --git a/admin/app/controllers/solidus_admin/properties_controller.rb b/admin/app/controllers/solidus_admin/properties_controller.rb
index 666451459d..feff935a27 100644
--- a/admin/app/controllers/solidus_admin/properties_controller.rb
+++ b/admin/app/controllers/solidus_admin/properties_controller.rb
@@ -4,7 +4,11 @@ module SolidusAdmin
class PropertiesController < SolidusAdmin::BaseController
include SolidusAdmin::ControllerHelpers::Search
+ before_action :find_property, only: %i[edit update]
+
def index
+ set_index_page
+
properties = apply_search_to(
Spree::Property.order(created_at: :desc, id: :desc),
param: :q,
@@ -19,6 +23,76 @@ def index
end
end
+ def new
+ @property = Spree::Property.new
+
+ set_index_page
+
+ respond_to do |format|
+ format.html { render component('properties/new').new(page: @page, property: @property) }
+ end
+ end
+
+ def create
+ @property = Spree::Property.new(property_params)
+
+ if @property.save
+ respond_to do |format|
+ flash[:notice] = t('.success')
+
+ format.html do
+ redirect_to solidus_admin.properties_path, status: :see_other
+ end
+
+ format.turbo_stream do
+ render turbo_stream: ''
+ end
+ end
+ else
+ set_index_page
+
+ respond_to do |format|
+ format.html do
+ page_component = component('properties/new').new(page: @page, property: @property)
+ render page_component, status: :unprocessable_entity
+ end
+ end
+ end
+ end
+
+ def edit
+ set_index_page
+
+ respond_to do |format|
+ format.html { render component('properties/edit').new(page: @page, property: @property) }
+ end
+ end
+
+ def update
+ if @property.update(property_params)
+ respond_to do |format|
+ flash[:notice] = t('.success')
+
+ format.html do
+ redirect_to solidus_admin.properties_path, status: :see_other
+ end
+
+ format.turbo_stream do
+ render turbo_stream: ''
+ end
+ end
+ else
+ set_index_page
+
+ respond_to do |format|
+ format.html do
+ page_component = component('properties/edit').new(page: @page, property: @property)
+ render page_component, status: :unprocessable_entity
+ end
+ end
+ end
+ end
+
def destroy
@properties = Spree::Property.where(id: params[:id])
@@ -29,5 +103,24 @@ def destroy
flash[:notice] = t('.success')
redirect_to properties_path, status: :see_other
end
+
+ private
+
+ def find_property
+ @property = Spree::Property.find(params[:id])
+ end
+
+ def property_params
+ params.require(:property).permit(:name, :presentation)
+ end
+
+ def set_index_page
+ properties = apply_search_to(
+ Spree::Property.unscoped.order(id: :desc),
+ param: :q,
+ )
+
+ set_page_and_extract_portion_from(properties)
+ end
end
end
diff --git a/admin/config/locales/properties.en.yml b/admin/config/locales/properties.en.yml
index 5bc4aec5cb..b5b4b0e3d7 100644
--- a/admin/config/locales/properties.en.yml
+++ b/admin/config/locales/properties.en.yml
@@ -4,3 +4,7 @@ en:
title: "Properties"
destroy:
success: "Properties were successfully removed."
+ create:
+ success: "Property was successfully created."
+ update:
+ success: "Property was successfully updated."
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index c42101b772..70ef4c7e50 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -56,7 +56,7 @@
end
admin_resources :promotions, only: [:index, :destroy]
- admin_resources :properties, only: [:index, :destroy]
+ admin_resources :properties, except: [:show]
admin_resources :option_types, only: [:index, :destroy], sortable: true
admin_resources :taxonomies, only: [:index, :destroy], sortable: true
admin_resources :promotion_categories, only: [:index, :destroy]
diff --git a/admin/spec/features/properties_spec.rb b/admin/spec/features/properties_spec.rb
index 7c2025e5bf..83c19a961e 100644
--- a/admin/spec/features/properties_spec.rb
+++ b/admin/spec/features/properties_spec.rb
@@ -21,4 +21,91 @@
expect(page).not_to have_content("Type prop")
expect(Spree::Property.count).to eq(1)
end
+
+ context "creating a new property" do
+ it "creates a new product property" do
+ visit "/admin/properties"
+ click_on "Add new"
+
+ fill_in "Name", with: "Color"
+ fill_in "Presentation", with: "Cool Color"
+ click_on "Add Property"
+
+ expect(page).to have_content("Property was successfully created.")
+ expect(page).to have_content("Color")
+ expect(page).to have_content("Cool Color")
+ expect(Spree::Property.count).to eq(1)
+ end
+
+ it "shows validation errors" do
+ visit "/admin/properties"
+ click_on "Add new"
+
+ fill_in "Name", with: ""
+ click_on "Add Property"
+
+ expect(page).to have_content("can't be blank")
+ expect(Spree::Property.count).to eq(0)
+ end
+ end
+
+ context "editing an existing property" do
+ let!(:property) { create(:property, name: "Color", presentation: "Cool Color") }
+
+ it "updates the property" do
+ visit "/admin/properties"
+ # Find the row containing the property with name "Color"
+ find('tr', text: 'Color').click
+
+ fill_in "Name", with: "Size"
+ fill_in "Presentation", with: "Cool Size"
+ click_on "Update Property"
+
+ expect(page).to have_content("Property was successfully updated.")
+ expect(page).to have_content("Size")
+ expect(page).to have_content("Cool Size")
+ expect(Spree::Property.count).to eq(1)
+ end
+
+ it "shows validation errors" do
+ visit "/admin/properties"
+ find('tr', text: 'Color').click
+
+ fill_in "Name", with: ""
+ click_on "Update Property"
+
+ expect(page).to have_content("can't be blank")
+ expect(Spree::Property.count).to eq(1)
+ end
+ end
+
+ context "editing an existing property" do
+ let!(:property) { create(:property, name: "Color", presentation: "Cool Color") }
+
+ it "updates the property" do
+ visit "/admin/properties"
+ # Find the row containing the property with name "Color"
+ find('tr', text: 'Color').click
+
+ fill_in "Name", with: "Size"
+ fill_in "Presentation", with: "Cool Size"
+ click_on "Update Property"
+
+ expect(page).to have_content("Property was successfully updated.")
+ expect(page).to have_content("Size")
+ expect(page).to have_content("Cool Size")
+ expect(Spree::Property.count).to eq(1)
+ end
+
+ it "shows validation errors" do
+ visit "/admin/properties"
+ find('tr', text: 'Color').click
+
+ fill_in "Name", with: ""
+ click_on "Update Property"
+
+ expect(page).to have_content("can't be blank")
+ expect(Spree::Property.count).to eq(1)
+ end
+ end
end