workarea-admin 3.4.40 → 3.4.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fede43e115b6d31e72911580a8cc645b3aa5fcf832fd8fb852a9573eba0b0c36
-  data.tar.gz: 1baf9db2421c79be86be5fc9e3a0feb0584c1adefd6ec331e9fa602945e27528
+  metadata.gz: 0c84756944dc5f44d22e54a2aa4005e30d9781b6d469e82e5514f3850c252569
+  data.tar.gz: ae603e360abc2b179fe563b97cc1507a17314f5a2f4f383143e44fa72e29473e
 SHA512:
-  metadata.gz: f3a221e08bc1de51163a31a1ab052e8775714ed046d6fb358d178f2fd106d0e3e2e95e3bd6e6a66dedb86f51dfb992a8daf21099f19e98a8942c16f02aefed98
-  data.tar.gz: 1fd67b28d825b84faba507e7c8ac83075e0ad025e67632e5cc63fd890663b2e1a187ee9b4d5caac72b7b5c95e0b36c3d8a183fc4233071bd8262f8730c531e29
+  metadata.gz: 6937f139d1cd3f7ce9b9e470223f41dc9e7abfe6b14e8766e4b9e68ab37101a45f93bb877f74f786a92208a13d13300b3ec39cb116772eb6004ca71e087893bd
+  data.tar.gz: 720b5c953ac40eab32674a0ddf27e750bb283c3adc9bcde77da1c892f989d169b557c14d5c73c6dd0e312f26bc72d9872ccf75f2c7edf171a00663f041a61d6f

data/app/assets/javascripts/workarea/admin/modules/new_navigation_taxons.js

@@ -23,8 +23,9 @@ WORKAREA.registerModule('newNavigationTaxons', (function () {
         createRemoteSelect = function (event) {
             var $typeSelect = $(event.currentTarget),
                 $idSelect = $('[name=navigable_id]', event.delegateTarget),
+                $section = $typeSelect.closest('[data-new-navigation-taxon]'),
                 settings = getConfig($typeSelect),
-                selected = $typeSelect.data('newNavigationTaxon');
+                selected = $section.data('newNavigationTaxon');
 
             if ($idSelect.is('.select2-hidden-accessible') && _.isUndefined(selected)) {
                 destroyRemoteSelect($idSelect);

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

@@ -27,7 +27,8 @@ module Workarea
         self.current_order = nil
 
         flash[:success] = t('workarea.admin.users.flash_messages.stopped')
-        redirect_to user_path(previous_user_id)
+        referrer = URI.parse(request.referrer).request_uri rescue nil
+        redirect_back_or(referrer.presence || user_path(previous_user_id))
       end
     end
   end

data/app/helpers/workarea/admin/application_helper.rb

@@ -166,6 +166,10 @@ module Workarea
           .map     { |unit, val| t("workarea.duration.#{unit}", count: val) }
           .to_sentence
       end
+
+      def navigation_redirects_enabled?
+        !Rails.application.config.consider_all_requests_local
+      end
     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_categories/edit.html.haml

@@ -60,6 +60,9 @@
             .property
               = label_tag 'category_default_sort', t('workarea.admin.fields.default_sort'), class: 'property__name'
               = select_tag 'category[default_sort]', options_for_select(@category.sort_options, selected: @category.default_sort)
+              - if @category.featured_products?
+                %span.property__note
+                  = t('workarea.admin.catalog_categories.edit.default_sort_note')
 
         .property
           = label_tag 'category_terms_facets_list', t('workarea.admin.fields.terms_facets_list'), class: 'property__name'

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/navigation_redirects/index.html.haml

@@ -5,6 +5,11 @@
     .view__heading
       = link_to "↑ #{t('workarea.admin.navigation_redirects.index.dashboard_link')}", settings_dashboards_path, class: 'view__dashboard-button'
       %h1= t('workarea.admin.navigation_redirects.index.title')
+      - unless navigation_redirects_enabled?
+        .grid.grid--center
+          .grid__cell.grid__cell--50
+            = render_message 'warning' do
+              = t('workarea.admin.navigation_redirects.index.disabled')
 
   .view__container
 

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/app/views/workarea/admin/users/insights.html.haml

@@ -90,6 +90,18 @@
                     = @user.insights.average_order_value_percentile.ordinalize
                     = t('workarea.admin.users.insights.percentile')
 
+        .align-center
+          = link_to '#customer-insights-info', data: { tooltip: { side: 'bottom', interactive: true } } do
+            = t('workarea.admin.users.insights.customer_insights')
+          #customer-insights-info.tooltip-content.align-center
+            = t( |
+              'workarea.admin.users.insights.customer_insights_info_html', |
+              best_customers_path: insights_report_path(type: Workarea::Insights::BestCustomers), |
+              customers_at_risk_path: insights_report_path(type: Workarea::Insights::CustomersAtRisk), |
+              repeat_purchase_rate_path: insights_report_path(type: Workarea::Insights::RepeatPurchaseRate), |
+              orders_path: orders_user_path(@user) |
+            ) |
+
     .section
       %h2.align-center= t('workarea.admin.users.insights.recently_viewed.title')
       .grid.grid--center

data/config/locales/en.yml

@@ -286,6 +286,7 @@ en:
             views: views
         edit:
           client_id_note: Identifies the category for product import
+          default_sort_note: 'Since this category has featured products, this sort controls the products listed after the selected featured products.'
           filters_note_html: 'Comma separated: just, like, this. If these fields are blank, the global values will be used from %{search_settings_link}.'
           page_title: Attributes for %{category}
           search_settings: search settings
@@ -2287,6 +2288,10 @@ en:
           destination_label: Redirect To
           destination_note: Can be any URL
           destination_placeholder: "/new/path.html"
+          disabled: >
+            This application is configured to consider requests to be local, so the Workarea exception handling isn't used.
+            This is most likely because it's running the development environment, where you want exceptions to be seen in responses.
+            These redirects won't work without this.
           from: From
           import: Import Redirects
           modified: Modified
@@ -3189,10 +3194,10 @@ en:
             description: Define what filters should be shown on search results and categories.
             title: Filters
           synonyms:
-            description: Define groups of search terms that should return the same result.
+            description: Define groups of search terms that mean the same thing. Keep in mind this is not the same as "return the same results". For that task, use search customizations.
             phrase_example: united states,u s a,united states of america => usa
             phrase_example_description: 'You can create synonym functionality out of a phrase like so:'
-            simple_example: "tshirt, t-shirt, tee-shirt \nskirt, skort"
+            simple_example: "denim, jeans, dungarees \nshirt, pullover, blouse"
             simple_example_description: 'Enter one synonym group per line, for example:'
             title: Synonyms
           title: Search Settings
@@ -3512,7 +3517,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:
@@ -3553,6 +3558,17 @@ en:
           aov: AOV
           insights_for_this_customer: Insights for this Customer
           percentile: percentile
+          customer_insights: Wondering about how Workarea customer insights work?
+          customer_insights_info_html: >
+            <strong>How are customer metrics tracked?</strong>
+            <p>Workarea's metrics engine saves reporting and insights data based on the customer's email address.
+            This allows for the best tracking of customers for generating helpful insights like
+            <a href="%{best_customers_path}">Best Customers</a>, <a href="%{customers_at_risk_path}">Customers at Risk</a>,
+            and <a href="%{repeat_purchase_rate_path}">Repeat Purchase Rate</a> as accurately as possible across both
+            guest and account checkouts.</p>
+            <strong>Wondering why some numbers don't line up?</strong>
+            <p>Because reporting is tracked by email address, changes in email address and/or having an account
+            can cause mismatch between the <a href="%{orders_path}">Orders</a> card and these insights.</p>
         login:
           never: Never logged in
           time_ago: "%{period} ago"

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

@@ -70,9 +70,34 @@ module Workarea
         post admin.impersonations_path, params: { user_id: @user.id }
         delete admin.impersonations_path
 
-        assert(response.redirect?)
         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
+
+        assert_equal(previous_user_id, response_cookies['user_id'])
+        assert(session['admin_id'].blank?)
+      end
+
+      def test_redirection_after_destroy
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path
+        assert_redirected_to(admin.user_path(@user.id))
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path(return_to: '/foo')
+        assert_redirected_to('/foo')
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path(return_to: '/foo'),
+          headers: { 'HTTP_REFERER' => admin.catalog_products_path }
+        assert_redirected_to('/foo')
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path,
+          headers: { 'HTTP_REFERER' => admin.catalog_products_url(host: 'foo.com') }
+        assert_redirected_to(admin.catalog_products_path)
       end
     end
   end

data/test/javascripts/fixtures/existing_navigation_taxon.html.haml

@@ -0,0 +1,10 @@
+.new-navigation-link__section{ data: { new_navigation_taxon: 'bar' } }
+  %fieldset
+    %legend
+      %span.heading.heading--2 Existing
+    .property
+      = label_tag 'navigable_type', 'Type', class: 'property__name'
+      = select_tag 'navigable_type', options_for_select([['Foo', 'foo', { data: { new_navigation_taxon_endpoint: 'http://foo.com' } }], ['Bar', 'bar', { data: { new_navigation_taxon_endpoint: 'http://bar.com' } }]])
+    .property
+      = label_tag 'navigable_id', 'Name', class: 'property__name'
+      = select_tag 'navigable_id', options_for_select([['Bar', 'bar']], 'bar'), include_blank: true

data/test/javascripts/new_navigation_taxons_spec.js

@@ -6,7 +6,6 @@
             it('initializes select2 on navigable id select', function () {
                 var markup = 'new_navigation_taxon.html',
                     $fixture = $(fixture.load(markup, true)),
-
                     $select = $('[name=navigable_id]', $fixture);
 
                 expect($select.is('.select2-hidden-accessible')).to.not.be.ok;
@@ -14,6 +13,18 @@
                 WORKAREA.newNavigationTaxons.init($fixture);
 
                 expect($select.is('.select2-hidden-accessible')).to.be.ok;
+                expect($select.val()).to.equal('');
+            });
+
+            it('saves with the existing data', function () {
+                var markup = 'existing_navigation_taxon.html',
+                    $fixture = $(fixture.load(markup, true)),
+                    $select = $('[name=navigable_id]', $fixture);
+
+                WORKAREA.newNavigationTaxons.init($fixture);
+
+                expect($select.is('.select2-hidden-accessible')).to.be.ok;
+                expect($select.val()).to.equal('bar');
             });
         });
     });

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'))
 
@@ -52,7 +49,7 @@ module Workarea
           click_button 'Stop Impersonation'
         end
 
-        assert_equal(admin.user_path(user), current_path)
+        assert_equal(admin.root_path, current_path)
         assert(page.has_content?('Success'))
       end
     end

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.45
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2021-01-20 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.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.40
+        version: 3.4.45
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.40
+        version: 3.4.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.40
+        version: 3.4.45
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1270,6 +1270,7 @@ files:
 - test/javascripts/fixtures/datepicker_fields.html.haml
 - test/javascripts/fixtures/datetimepicker_fields.html.haml
 - test/javascripts/fixtures/direct_upload.html.haml
+- test/javascripts/fixtures/existing_navigation_taxon.html.haml
 - test/javascripts/fixtures/help_lookup_button.haml
 - test/javascripts/fixtures/menu_editor_menu_list_sortable.html.haml
 - test/javascripts/fixtures/new_navigation_taxon.html.haml
@@ -1401,7 +1402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Admin for the Workarea Commerce Platform