workarea-admin 3.4.40 → 3.4.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fede43e115b6d31e72911580a8cc645b3aa5fcf832fd8fb852a9573eba0b0c36
-  data.tar.gz: 1baf9db2421c79be86be5fc9e3a0feb0584c1adefd6ec331e9fa602945e27528
+  metadata.gz: ed933df39aba5d5b13faebdf4f3c6332aa85ad0ca50f6051f097d60ea25fba49
+  data.tar.gz: ff1cb5e0520f6d27cdf660bfc417ba883c9a8b091c5a73ca539694f45f265d3c
 SHA512:
-  metadata.gz: f3a221e08bc1de51163a31a1ab052e8775714ed046d6fb358d178f2fd106d0e3e2e95e3bd6e6a66dedb86f51dfb992a8daf21099f19e98a8942c16f02aefed98
-  data.tar.gz: 1fd67b28d825b84faba507e7c8ac83075e0ad025e67632e5cc63fd890663b2e1a187ee9b4d5caac72b7b5c95e0b36c3d8a183fc4233071bd8262f8730c531e29
+  metadata.gz: a9fd510c48c7e45c668cc0f8e38b9ebcfe9b259886ba01b98d37a52486af906497f81621f1de45f759d6b0135da773529829ad9b9cacc3f9c02526fee4e29596
+  data.tar.gz: 0ecda3e157ed89ea43c75ab5bcc0ad0dedec90ad66eb1238242fa00105588dc9ac9bde9a7d2fbb5ca2364dd95f8e72a61c47acca8a21f0d6c04dcaf0b73cbf12

data/app/controllers/workarea/admin/impersonations_controller.rb

@@ -27,7 +27,7 @@ module Workarea
         self.current_order = nil
 
         flash[:success] = t('workarea.admin.users.flash_messages.stopped')
-        redirect_to user_path(previous_user_id)
+        redirect_back_or(user_path(previous_user_id))
       end
     end
   end

data/app/view_models/workarea/admin/product_view_model.rb

@@ -42,7 +42,7 @@ module Workarea
       def storefront_view_model
         @storefront_view_model ||= Storefront::ProductViewModel.wrap(
           model,
-          @options
+          options
         )
       end
 
@@ -93,16 +93,13 @@ module Workarea
         end
       end
 
-      def options
-        variants.reduce({}) do |memo, variant|
+      def variant_details
+        variants.each_with_object({}) do |variant, memo|
           variant.details.each do |name, value|
             memo[name] ||= []
-            memo[name] << value
-            memo[name].flatten!
+            memo[name] += Array.wrap(value)
             memo[name].uniq!
           end
-
-          memo
         end
       end
 
@@ -125,7 +122,7 @@ module Workarea
       end
 
       def insights
-        @insights ||= Insights::ProductViewModel.wrap(model, @options)
+        @insights ||= Insights::ProductViewModel.wrap(model, options)
       end
 
       def inventory

data/app/views/workarea/admin/catalog_products/_cards.html.haml

@@ -110,7 +110,7 @@
               %p.align-center= t('workarea.admin.fields.inventory')
 
               %span.heading.heading--3.heading--no-margin.align-center
-                = model.options.keys.to_sentence
+                = model.variant_details.keys.to_sentence
               %p.align-center= t('workarea.admin.fields.options')
 
               = link_to catalog_product_variants_path(model), class: 'card__button' do

data/app/views/workarea/admin/navigation_menus/_summary.html.haml

@@ -6,5 +6,5 @@
         #{local_time_ago(model.updated_at)}
       - else
         %span.summary__info-text-inactive= t('workarea.admin.navigation_menus.summary.inactive')
-    %span.summary__info= t('workarea.admin.navigation_menus.summary.content_block', count: model.content.try(:blocks).size)
+    %span.summary__info= t('workarea.admin.navigation_menus.summary.content_block', count: model.content&.blocks&.size.to_i)
   %span.summary__type{ title: t('workarea.admin.navigation_menus.summary.type') }= t('workarea.admin.navigation_menus.summary.type')

data/app/views/workarea/admin/pricing_discounts/properties/_product_attribute.html.haml

@@ -5,7 +5,7 @@
     %span.discount__node
       %span.property.property--inline
         = text_field_tag 'discount[amount]', @discount.amount, class: 'text-box text-box--small', title: 'Amount of Discount', placeholder: '10', required: true
-    %span.discount__node off products
+    %span.discount__node off the item's unit price
 
 .discount__node-line
   %p.discount__node-group

data/app/views/workarea/admin/toolbar/show.html.haml

@@ -67,6 +67,7 @@
                       = link_to current_impersonation.email, user_path(current_impersonation)
                     %br
                     = form_tag impersonations_path, method: 'delete', data: { disable_delete_confirmation: '' } do
+                      = hidden_field_tag :return_to, return_to
                       = button_tag t('workarea.admin.toolbar.stop_impersonation'), class: 'text-button text-button--destroy'
 
             - if allow_pricing_override?

data/config/locales/en.yml

@@ -3512,7 +3512,7 @@ en:
           changes_saved: Your changes have been saved
           saved: Your changes have been saved
           started: You are now browsing as %{email}
-          stopped: Impersonation for this user has been stopped.
+          stopped: Impersonation has been stopped, you are now browsing as your account.
           created: This account has been created
           error: There was an error saving this account
         index:

data/test/integration/workarea/admin/impersonations_integration_test.rb

@@ -70,7 +70,14 @@ module Workarea
         post admin.impersonations_path, params: { user_id: @user.id }
         delete admin.impersonations_path
 
-        assert(response.redirect?)
+        assert_redirected_to(admin.user_path(@user.id))
+        assert_equal(previous_user_id, response_cookies['user_id'])
+        assert(session['admin_id'].blank?)
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path(return_to: '/foo')
+
+        assert_redirected_to('/foo')
         assert_equal(previous_user_id, response_cookies['user_id'])
         assert(session['admin_id'].blank?)
       end

data/test/system/workarea/admin/impersonation_system_test.rb

@@ -34,12 +34,9 @@ module Workarea
           click_button 'Stop Impersonation'
         end
 
-        assert_equal(admin.user_path(user), current_path)
+        assert_equal(storefront.root_path, current_path)
         assert(page.has_content?('Success'))
 
-        find('.view').hover # Ensure tooltipster menu isn't open
-        assert(page.has_content?('bcrouse@workarea.com'))
-
         visit storefront.users_account_path
         assert(page.has_no_content?('impersonated@workarea.com'))
 

data/test/view_models/workarea/admin/product_view_model_test.rb

@@ -23,7 +23,7 @@ module Workarea
         end
       end
 
-      def test_options
+      def test_variant_details
         @view_model.variants.build(
           sku: 'SKU1',
           name: 'name',
@@ -42,7 +42,7 @@ module Workarea
 
         assert_equal(
           { 'Color' => ['Red', 'Black', 'White'], 'Size' => ['S', 'M', 'L'] },
-          @view_model.options
+          @view_model.variant_details
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.4.40
+  version: 3.4.41
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.40
+        version: 3.4.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.40
+        version: 3.4.41
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.40
+        version: 3.4.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.40
+        version: 3.4.41
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email: