Merge pull request #12710 from chahmedejaz/bugfix/12705-fix-products-index-page

[BUU] Fixes Products Page ActionView::Template::Error

app/helpers/admin/products_helper.rb

@@ -11,19 +11,20 @@ module Admin
     end
 
     def prepare_new_variant(product)
-      product.variants.build do |variant|
-        variant.unit_value = 1.0 * (product.variant_unit_scale || 1)
-        variant.unit_presentation = VariantUnits::OptionValueNamer.new(variant).name
-      end
+      product.variants.build
     end
 
     def unit_value_with_description(variant)
-      scaled_unit_value = variant.unit_value / (variant.product.variant_unit_scale || 1)
-      precised_unit_value = number_with_precision(
-        scaled_unit_value,
-        precision: nil,
-        strip_insignificant_zeros: true
-      )
+      precised_unit_value = nil
+
+      if variant.unit_value
+        scaled_unit_value = variant.unit_value / (variant.product.variant_unit_scale || 1)
+        precised_unit_value = number_with_precision(
+          scaled_unit_value,
+          precision: nil,
+          strip_insignificant_zeros: true
+        )
+      end
 
       [precised_unit_value, variant.unit_description].compact_blank.join(" ")
     end

app/views/admin/products_v3/_variant_row.html.haml

@@ -18,7 +18,7 @@
       = f.hidden_field :unit_value
       = f.hidden_field :unit_description
       = f.text_field :unit_value_with_description,
-          value: unit_value_with_description(variant), 'aria-label': t('admin.products_page.columns.unit_value'), required: true
+          value: unit_value_with_description(variant), 'aria-label': t('admin.products_page.columns.unit_value')
     .field
       = f.label :display_as, t('admin.products_page.columns.display_as')
       = f.text_field :display_as, placeholder: VariantUnits::OptionValueNamer.new(variant).name

spec/helpers/admin/products_helper_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Admin::ProductsHelper do
+  describe '#unit_value_with_description' do
+    let(:product) { create(:product, variant_unit_scale: 1000.0) }
+    let(:variant) { create(:variant, product:, unit_value: 2000.0, unit_description: 'kg') }
+
+    context 'when unit_value and unit_description are present' do
+      it 'returns the scaled unit value with the description' do
+        expect(helper.unit_value_with_description(variant)).to eq('2 kg')
+      end
+    end
+
+    context 'when unit_value is nil' do
+      before { variant.update_column(:unit_value, nil) }
+
+      it 'returns the description' do
+        expect(helper.unit_value_with_description(variant)).to eq('kg')
+      end
+    end
+
+    context 'when unit_description is nil' do
+      before { variant.update_column(:unit_description, nil) }
+
+      it 'returns only the scaled unit value' do
+        expect(helper.unit_value_with_description(variant)).to eq('2')
+      end
+    end
+
+    context 'when variant_unit_scale is nil' do
+      before { product.update_column(:variant_unit_scale, nil) }
+
+      it 'uses default scale of 1 and returns the unscaled unit value with the description' do
+        expect(helper.unit_value_with_description(variant)).to eq('2000 kg')
+      end
+    end
+
+    context 'when both unit_value and unit_description are nil' do
+      before { variant.update_columns(unit_description: nil, unit_value: nil) }
+
+      it 'returns empty string' do
+        expect(helper.unit_value_with_description(variant)).to eq('')
+      end
+    end
+  end
+end

spec/system/admin/products_v3/create_spec.rb

@@ -46,15 +46,15 @@ RSpec.describe 'As an enterprise user, I can manage my products' do
       expect(page).to have_content "New variant"
     end
 
-    it "has the 1 unit value for the new variant display_as by default" do
+    it "has the empty unit value for the new variant display_as by default" do
       new_variant_button.click
 
       within new_variant_row do
         unit_button = find('button[aria-label="Unit"]')
-        expect(unit_button.text.strip).to eq('1kg')
+        expect(unit_button.text.strip).to eq('')
 
         unit_button.click
-        expect(page).to have_field "Display unit as", placeholder: "1kg"
+        expect(page).to have_field "Display unit as", placeholder: ""
       end
     end
 

spec/system/admin/products_v3/update_spec.rb

@@ -51,20 +51,20 @@ RSpec.describe 'As an enterprise user, I can update my products' do
         fill_in "SKU", with: "POM-00"
         tomselect_select "Volume (mL)", from: "Unit scale"
       end
-      within row_containing_name("Medium box") do
-        fill_in "Name", with: "Large box"
-        fill_in "SKU", with: "POM-01"
-
-        click_on "Unit" # activate popout
-      end
 
       # Unit popout
-      fill_in "Unit value", with: ""
-      click_button "Save changes" # attempt to save or close the popout
-      expect(page).to have_field "Unit value", with: "" # popout is still open
+      click_on "Unit" # activate popout
+      # have to use below method to trigger the +change+ event,
+      #   +fill_in "Unit value", with: ""+ does not trigger +change+ event
+      find_field('Unit value').send_keys(:control, 'a', :backspace) # empty the field
+      click_button "Save changes" # attempt to save and should fail with below error
+      expect(page).to have_content "must be greater than 0"
+      click_on "Unit" # activate popout
       fill_in "Unit value", with: "500.1"
 
       within row_containing_name("Medium box") do
+        fill_in "Name", with: "Large box"
+        fill_in "SKU", with: "POM-01"
         fill_in "Price", with: "10.25"
 
         click_on "On Hand" # activate popout
@@ -524,6 +524,7 @@ RSpec.describe 'As an enterprise user, I can update my products' do
             expect(page.find('.col-producer')).to have_content('must exist')
             expect(page.find('.col-category')).to have_content('must exist')
             expect(page.find_button("Unit")).to have_text "" # have_button selector don't work here
+            expect(page).to have_content "can't be blank"
             expect(page).to have_field "Price", with: "10.25" # other updated value is retained
           end