workarea-admin 3.5.19 → 3.5.25

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

@@ -20,6 +20,11 @@
         .grid__cell.grid__cell--80
           .grid.grid--auto.grid--right
             - if !@release.has_changes?
+              .grid__cell
+                = link_to t('workarea.admin.releases.show.build_undo'), '#no-changes-to-undo-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button'
+                #no-changes-to-undo-info.tooltip-content
+                  %p= t('workarea.admin.releases.show.no_changes_to_undo')
+
               .grid__cell
                 = link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#no-changes-to-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'
                 #no-changes-to-preview-info.tooltip-content
@@ -31,6 +36,9 @@
                   %p= t('workarea.admin.releases.show.no_changes_to_publish')
 
             - else
+              .grid__cell
+                = link_to t('workarea.admin.releases.show.build_undo'), new_release_undo_path(@release), class: 'workflow-bar__button'
+
               .grid__cell
                 - if @release.published? && !@release.scheduled?
                   = link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#cannot-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'

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

@@ -37,7 +37,7 @@
             %ul.list-reset
               - model.newest_rates.each do |rate|
                 %li
-                  %strong= number_to_percentage(rate.percentage * 100, precision: 1)
+                  %strong= number_to_percentage(rate.percentage * 100, strip_insignificant_zeros: true)
 
                   - if rate.tier_min.present? && rate.tier_max.present?
                     #{number_to_currency(rate.tier_min)} - #{number_to_currency(rate.tier_max)},

data/app/views/workarea/admin/tax_rates/edit.html.haml

@@ -21,7 +21,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_country_percentage', t('workarea.admin.tax_rates.index.table.country_percentage'), class: 'property__name'
-            = number_field_tag 'rate[country_percentage]', @rate.country_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box text-box--i18n'
+            = number_field_tag 'rate[country_percentage]', @rate.country_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box text-box--i18n'
 
         .grid__cell.grid__cell--50
           .property
@@ -31,7 +31,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_region_percentage', t('workarea.admin.tax_rates.index.table.region_percentage'), class: 'property__name'
-            = number_field_tag 'rate[region_percentage]', @rate.region_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box text-box--i18n'
+            = number_field_tag 'rate[region_percentage]', @rate.region_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box text-box--i18n'
 
         .grid__cell.grid__cell--50
           .property
@@ -41,7 +41,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_postal_code_percentage', t('workarea.admin.tax_rates.index.table.postal_code_percentage'), class: 'property__name'
-            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box text-box--i18n'
+            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box text-box--i18n'
 
         .grid__cell.grid__cell--33
           .property

data/app/views/workarea/admin/tax_rates/index.html.haml

@@ -56,9 +56,9 @@
               %td.align-center= rate.country.try(&:alpha2) || '-'
               %td.align-center= rate.region || '-'
               %td.align-center= rate.postal_code.presence || '-'
-              %td.align-center= number_to_percentage(rate.country_percentage * 100, precision: 1)
-              %td.align-center= number_to_percentage(rate.region_percentage * 100, precision: 1)
-              %td.align-center= number_to_percentage(rate.postal_code_percentage * 100, precision: 1)
+              %td.align-center= number_to_percentage(rate.country_percentage.to_f * 100, strip_insignificant_zeros: true)
+              %td.align-center= number_to_percentage(rate.region_percentage.to_f * 100, strip_insignificant_zeros: true)
+              %td.align-center= number_to_percentage(rate.postal_code_percentage.to_f * 100, strip_insignificant_zeros: true)
               %td.align-center= rate.tier_min.present? ? number_to_currency(rate.tier_min) : t('workarea.admin.tax_rates.index.not_applicable')
               %td.align-center= rate.tier_max.present? ? number_to_currency(rate.tier_max) : t('workarea.admin.tax_rates.index.not_applicable')
               %td.align-center= rate.charge_on_shipping ? t('workarea.admin.true') : t('workarea.admin.false')

data/app/views/workarea/admin/tax_rates/new.html.haml

@@ -19,7 +19,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_country_percentage', t('workarea.admin.tax_rates.index.table.country_percentage'), class: 'property__name'
-            = number_field_tag 'rate[country_percentage]', @rate.country_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+            = number_field_tag 'rate[country_percentage]', @rate.country_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box'
 
         .grid__cell.grid__cell--50
           .property
@@ -29,7 +29,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_region_percentage', t('workarea.admin.tax_rates.index.table.region_percentage'), class: 'property__name'
-            = number_field_tag 'rate[region_percentage]', @rate.region_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+            = number_field_tag 'rate[region_percentage]', @rate.region_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box'
 
         .grid__cell.grid__cell--50
           .property
@@ -39,7 +39,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_postal_code_percentage', t('workarea.admin.tax_rates.index.table.postal_code_percentage'), class: 'property__name'
-            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box'
 
         .grid__cell.grid__cell--33
           .property

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

@@ -81,6 +81,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

@@ -106,6 +106,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

@@ -303,6 +303,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
@@ -580,8 +581,12 @@ en:
         no_changesets: There aren't any planned changes for this release.
         plan_some_changes: Go plan some changes!
         planned_changes_for: Planned Changes For
+        pluralize_change:
+          one: '%{count} Change'
+          other: '%{count} Changes'
         published_on: Published On
         publishes_on: Publishes On
+        recent: Recent Changes
         releases: Releases
         unscheduled: Unscheduled
       catalog_product_copies:
@@ -1215,6 +1220,7 @@ en:
         review:
           title: Review Undo Changes for %{name}
           changes_description_html: These changes have been saved on the %{undo} release. They are the opposite of the changes in the %{original} release. You can view, edit, or delete these changes like changes in a normal release.
+          change_count_message: The full list of changes is generating and too large to display. To make further changes, finish creating the release then view the changes card.
         workflow:
           setup: Setup
           review: Review
@@ -2489,6 +2495,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
@@ -3100,19 +3110,6 @@ en:
             changes: Changes
             empty_note: You can view and manage changes for this release once they are planned.
             planned: Planned
-          undo:
-            title: Undo
-            not_setup: This release doesn't have an undo setup.
-            build_an_undo: Build an Undo
-            set_to_publish_html: "%{link} is set to publish at <strong>%{at}</strong>."
-            published_html: "%{link} published at <strong>%{at}</strong>."
-            unscheduled_html: "%{link} is unscheduled."
-            undo_html: The %{link} release was created <strong>%{at}</strong> to undo this release.
-            learn_more: Learn More
-          original:
-            title: Original Release
-            undoes_html: This release undoes the %{link} release.
-            learn_more: Learn More
         edit:
           index_link: Release calendar
           last_published_at: Last Published at
@@ -3178,6 +3175,7 @@ en:
           view: View
           view_release: View Release
         show:
+          build_undo: Build Undo
           index_link: Release calendar
           plan_changes_to_preview: Plan some changes to preview this release
           publish_now: Publish Now
@@ -3190,8 +3188,6 @@ en:
           no_changes_to_publish: There are no changes to publish for this release. Click on the Plan Changes card to start!
           no_changes_to_undo: There are no changes to undo for this release. Click on the Plan Changes card to start!
           user_cannot_publish_info: You do not have permission to publish a release.
-          cannot_undo_info: You cannot undo a release that's not published or already undone.
-          user_cannot_undo_info: You do not have permission to undo a release.
         summary:
           change:
             one: "%{count} Change"
@@ -3216,24 +3212,6 @@ en:
           starts_on: Starts on %{date}
           ends_on: Ends on %{date}
           no_undo_date: There is no undo date set for this release.
-        undo:
-          page_title: Undo %{name}
-          index_link: Release calendar
-          plan_changes: Plan Changes
-          no_changes_html: There are no changes to undo for this release! Head to %{plan_changes} to make some.
-          undoing: Undoing a Release
-          description: You can setup an undo to automatically revert the changes in this release at a future point in time. After being setup, this "undo release" will behave like any other release. You'll be able to edit, reschdule, or modify the changes as you please.
-          build_an_undo_now: Build an Undo Now
-          created_description_html: "%{undo} was created %{at} to undo the %{original} release."
-          no_changes_for_this_release: No changes for this release now.
-          view_the_undo_release: View the Undo Release
-        original:
-          page_title: Original Release for %{name}
-          index_link: Release calendar
-          title: Original Release
-          created_description_html: "%{undo} was created %{at} to undo the %{original} release."
-          no_changes_for_this_release: No changes for this release now.
-          view_the_original_release: View the Original Release
       reports:
         all_reports: View All Reports
         average_order_value:
@@ -3506,10 +3484,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
@@ -4024,7 +4002,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
           password_reset: Password reset created. User will receive an email shortly.
@@ -4067,6 +4045,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/config/routes.rb

@@ -108,15 +108,13 @@ Workarea::Admin::Engine.routes.draw do
     resources :releases do
       resources :changesets, only: [:index, :destroy]
       resources :releasables, only: [:index, :show]
-      resource :undo, controller: 'create_release_undos', only: [:new, :create] do
-        get :review
-        post :complete
+
+      resources :undos, controller: 'create_release_undos', only: [:new, :create] do
+        member { get :review }
       end
 
       member do
         get 'edit_for/:type', action: :edit_for, as: :edit_for
-        get :undo
-        get :original
         patch :publish
       end
 

data/test/helpers/workarea/admin/changesets_helper_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class ChangesetsHelperTest < ViewTest
+      def test_releasable_icon_path
+        assert_equal(
+          releasable_icon_path(nil),
+          'workarea/admin/icons/release.svg'
+        )
+
+        assert_equal(
+          releasable_icon_path('product'),
+          'workarea/admin/icons/products.svg'
+        )
+
+        assert_equal(
+          releasable_icon_path('variants'),
+          'workarea/admin/icons/variants.svg'
+        )
+      end
+    end
+  end
+end

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

@@ -10,19 +10,44 @@ module Workarea
         release = create_release
 
         release.as_current { releasable.update_attributes!(name: 'Bar') }
+        release.changesets.create!(releasable: Catalog::Product.new) # test missing releasable
 
-        post admin.release_undo_path(release),
+        post admin.release_undos_path(release),
           params: { release: { name: 'Undo Bar', tag_list: 'foo,bar,baz' } }
 
         assert_equal(2, Release.count)
         undo_release = Release.desc(:created_at).first
 
-        assert_equal(undo_release, release.reload.undo)
+        assert_equal(undo_release, release.reload.undos.first)
         assert_equal('Undo Bar', undo_release.name)
         assert_equal(%w(foo bar baz), undo_release.tags)
         assert_equal(1, undo_release.changesets.size)
         assert_equal(1, undo_release.changesets.first.changeset.size)
         assert_equal(releasable, undo_release.changesets.first.releasable)
+        assert_equal([releasable], Search::AdminSearch.new(upcoming_changes: [undo_release.id]).results)
+      end
+
+      def test_create_for_large_changesets
+        Sidekiq::Testing.fake!
+
+        Workarea.config.per_page = 1
+
+        releasable_one = create_page(name: 'Foo')
+        releasable_two = create_page(name: 'Bar')
+        release = create_release
+
+        release.as_current do
+          releasable_one.update!(name: 'Changed Foo')
+          releasable_two.update!(name: 'Changed Bar')
+        end
+
+        post admin.release_undos_path(release),
+          params: { release: { name: 'Undo Test' } }
+
+        assert_equal(2, Release.count)
+        undo_release = Release.desc(:created_at).first
+        assert_equal(1, undo_release.changesets.size)
+        assert_equal(1, BuildReleaseUndoChangesets.jobs.size)
       end
     end
   end

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

@@ -50,11 +50,34 @@ module Workarea
 
         post admin.impersonations_path, params: { user_id: @user.id }
         delete admin.impersonations_path
+        assert_equal(previous_user_id, session[:user_id])
+        assert(session[:admin_id].blank?)
 
-        assert(response.redirect?)
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path
         assert_equal(previous_user_id, session[: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
 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/assets_system_test.rb

@@ -27,7 +27,7 @@ module Workarea
 
         assert_current_path(admin.content_assets_path)
         assert(page.has_content?('Success'))
-        refute(page.has_content?('Edited Asset'))
+        refute_text('Edited Asset')
       end
 
       def test_insertion

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

@@ -16,7 +16,7 @@ module Workarea
 
         find('.message__dismiss-button').click
         find('#shortcuts_menu').hover
-        refute(page.has_content?('Current Page'))
+        refute_text('Current Page')
 
         find('#shortcuts_menu').hover
         menu_item = all('.menu__item').last
@@ -24,7 +24,7 @@ module Workarea
         find('.menu__delete-link').click
         assert_current_path(admin.root_path)
         assert(page.has_content?('Success'))
-        refute(page.has_content?('Current Page'))
+        refute_text('Current Page')
       end
     end
   end