workarea-admin 3.5.20 → 3.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a607bf3907ae033b463b4ea975e63e3baa64fb962d657df6cf0441071b815660
-  data.tar.gz: df1ead081c2c5fe988c3f982ee90aaf27c98f45e7d1b3834e5586c1edd6059c0
+  metadata.gz: 63e71785795f88b55b9472da8afe05b1c3a8af3ae039fc631a190f1abe8910e1
+  data.tar.gz: 9fecf928a3ac3cb6e6f10dc0d5b854d0cdfb201ba2c787cfe1c8307786ea9849
 SHA512:
-  metadata.gz: 201839f44d3f88443143a796a34c6062d9b6ed0abc417ae2e1c54ae661ef767d5d288bd6a3f540c0ecebb464970a6750b550082f7617b1083c8ab8432551d8cd
-  data.tar.gz: 114f7ae013a9df030ddac85460e6e3c689c44243726698a0de307678aeee2d707cef52d7d5d9195f9577121416588007423f09a2a0a7300e48ed117fa0664f7a
+  metadata.gz: 7fdb291a95851692d78d2f9e3a7cdf0e4411ad8dc2b94a805e9b88d005ea1045ba9f59bdf51eb8e316d0bc94c65a20820598d1c1052cf89645942919c2e7cfaa
+  data.tar.gz: 74997eb59bce76b12c712b0a553b2b9a64a9570567af778dc103401a27918c200481bbcf27fd04f753db364754f34c8e1be3f1a83691e8bd23fde3f90faae109

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/create_release_undos_controller.rb

@@ -13,12 +13,20 @@ module Workarea
         @undo_release.attributes = params[:release]
 
         if @undo_release.save
-          @release.changesets.each do |changeset|
-            changeset.build_undo(release: @undo_release.model).save!
+          @release.changesets.limit(Workarea.config.per_page).each do |changeset|
+            if changeset.releasable.present?
+              changeset.build_undo(release: @undo_release.model).save!
+              changeset.releasable.run_callbacks(:save)
+            end
           end
 
+          BuildReleaseUndoChangesets.perform_async(
+            @undo_release.id,
+            @release.id
+          ) if @release.changeset_count > Workarea.config.per_page
+
           flash[:success] = t('workarea.admin.create_release_undos.flash_messages.saved')
-          redirect_to review_release_undo_path(@release)
+          redirect_to review_release_undo_path(@release, @undo_release)
         else
           render :new, status: :unprocessable_entity
         end
@@ -35,8 +43,14 @@ module Workarea
       end
 
       def find_undo_release
-        model = @release.model.undo || @release.build_undo(params[:release])
-        @undo_release = ReleaseViewModel.new(model, view_model_options)
+        model =
+          if params[:id].present?
+            @release.model.undos.find(params[:id])
+          else
+            @release.build_undo
+          end
+
+        @undo_release = ReleaseViewModel.wrap(model, view_model_options)
       end
     end
   end

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

@@ -27,7 +27,8 @@ module Workarea
         clear_current_order
 
         flash[:success] = t('workarea.admin.users.flash_messages.stopped')
-        redirect_back_or(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/controllers/workarea/admin/releases_controller.rb

@@ -43,9 +43,6 @@ module Workarea
         end
       end
 
-      def original
-      end
-
       def publish
         self.current_release = nil
         PublishRelease.perform_async(@release.id)
@@ -59,7 +56,7 @@ module Workarea
         @release.destroy
 
         flash[:success] = t('workarea.admin.releases.flash_messages.removed')
-        redirect_to releases_path
+        redirect_back_or releases_path
       end
 
       def calendar_feed

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

@@ -175,6 +175,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/helpers/workarea/admin/changesets_helper.rb

@@ -2,13 +2,29 @@ module Workarea
   module Admin::ChangesetsHelper
     def changeset_icon(changeset, options = {})
       type = changeset.root.model_name.element
-      inline_svg(icon_path(type), options)
+      inline_svg(
+        releasable_icon_path(type),
+        options.reverse_merge(fallback: default_releasable_icon_path)
+      )
     end
 
-    private
+    def releaseable_icon(model, options = {})
+      type = model.model_name.element
+      inline_svg(
+        releasable_icon_path(type),
+        options.reverse_merge(fallback: default_releasable_icon_path)
+      )
+    end
+
+    def releasable_icon_path(type)
+      return default_releasable_icon_path unless type.present?
+
+      Workarea.config.releasable_icons[type.to_sym] ||
+      "workarea/admin/icons/#{type}.svg"
+    end
 
-    def icon_path(type)
-      Workarea.config.releasable_icons[type.to_sym] || "workarea/admin/icons/#{type}.svg"
+    def default_releasable_icon_path
+      'workarea/admin/icons/release.svg'
     end
   end
 end

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

@@ -0,0 +1,39 @@
+module Workarea
+  module Admin
+    class ChangesetSummaryViewModel < ApplicationViewModel
+      delegate :model_name, to: :model_class
+
+      def count
+        model['count']
+      end
+
+      def type
+        model['_id']
+      end
+
+      def type_filter
+        search_model&.type || model_name.param_key
+      end
+
+      def label
+        type_filter.titleize.pluralize(count)
+      end
+
+      def searchable?
+        search_model.present?
+      end
+
+      private
+
+      def model_class
+        @model_class ||= type.constantize
+      end
+
+      def search_model
+        return @search_model if defined?(@serch_model)
+
+        @search_model = Search::Admin.for(model_class.new)
+      end
+    end
+  end
+end

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

@@ -7,9 +7,29 @@ module Workarea
         @timeline ||= TimelineViewModel.new(model)
       end
 
+      def changeset_count
+        @changeset_count ||= model.changesets.count
+      end
+
+      def additional_changesets_count
+        [changeset_count - Workarea.config.per_page, 0].max
+      end
+
+      def show_changeset_summary?
+        changeset_count > Workarea.config.per_page
+      end
+
+      def changeset_summary
+        @changeset_summary ||=
+          Release::Changeset.summary(model.id).map do |type|
+            ChangesetSummaryViewModel.new(type)
+          end
+      end
+
       def changesets_with_releasable
         @changesets_with_releasable ||= model
                           .changesets
+                          .latest
                           .map { |c| ChangesetViewModel.wrap(c) }
                           .select { |changeset| changeset.root.present? }
                           .reject { |changeset| changeset.releasable.blank? }
@@ -23,9 +43,8 @@ module Workarea
         calendar_at&.to_date
       end
 
-      def undo
-        return unless undo?
-        @undo ||= ReleaseViewModel.wrap(model.undo, options)
+      def undos
+        @undos ||= ReleaseViewModel.wrap(model.undos, options)
       end
 
       def undoes

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

@@ -13,12 +13,37 @@
   .view__container
     = render_cards_for(@release, :planned_changes)
 
-    - if @release.changesets_with_releasable.blank?
+    - if @release.changeset_count.zero?
       .section.align-center
         %p.heading.heading--3= t('workarea.admin.changesets.no_changesets')
         %p.heading.heading--3= link_to t('workarea.admin.changesets.plan_some_changes'), release_releasables_path(@release)
 
+    .browsing-controls.browsing-controls--with-divider
+      %p.browsing-controls__count{ data: { browsing_controls_count: @release.changeset_count } }
+        = t('workarea.admin.changesets.pluralize_change', count: @release.changeset_count)
+
+
     .grid.grid--center
+      - if @release.show_changeset_summary?
+        .grid__cell.grid__cell--80-at-medium
+          .section
+            .grid.grid--center.grid--auto
+              - @release.changeset_summary.each do |summary|
+                .grid__cell
+                  - if summary.searchable?
+                    .card.card--button
+                      = link_to search_path(type: [summary.type_filter], upcoming_changes: [@release.id]), class: 'card__header' do
+                        .card__header-text #{summary.count} #{summary.label}
+                        = releaseable_icon summary, { class: 'card__icon'}
+                  - else
+                    .card
+                      .card__header
+                        .card__header-text #{summary.count} #{summary.label}
+                        = releaseable_icon summary, { class: 'card__icon'}
+
+        .grid__cell.grid__cell--80-at-medium
+          %h2.align-center= t('workarea.admin.changesets.recent')
+
       .grid__cell.grid__cell--80-at-medium
         %ul.list-reset
           - @release.changesets_with_releasable.each do |changeset|
@@ -42,3 +67,7 @@
                 .release-changeset__body
                   - changeset.changed_fields.each do |field|
                     = render_changeset_field(changeset, field)
+
+          - if @release.show_changeset_summary?
+            %li.text.text--large.align-center
+              = link_to t('workarea.admin.cards.more', amount: @release.additional_changesets_count ), search_path(upcoming_changes: [@release.id])

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

@@ -9,7 +9,7 @@
     - @undo_release.errors.full_messages.each do |message|
       = render_message 'error', message
 
-    = form_tag release_undo_path(@release), method: 'post' do
+    = form_tag release_undos_path(@release), method: 'post' do
       .section
         .property.property--required
           = label_tag 'release_name', t('workarea.admin.fields.name'), class: 'property__name'
@@ -26,12 +26,15 @@
               .grid__cell.grid__cell--50-at-medium
                 .property
                   = label_tag 'release_publish_at', t('workarea.admin.fields.undo_at'), class: 'property__name'
-                  .box.box--rounded= hidden_field_tag 'release[publish_at]', @undo_release.publish_at, data: { datetimepicker_field: { inline: true } }
+                  .box.box--rounded= hidden_field_tag 'release[publish_at]', @undo_release.publish_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: (@release.publish_at.present? ? @release.publish_at.to_s(:date_only) : 0) } } }
 
       .workflow-bar
         .grid.grid--middle
           .grid__cell.grid__cell--20
-            = link_to t('workarea.admin.form.cancel'), undo_release_path(@release), class: 'workflow-bar__button workflow-bar__button--delete'
+            - if @undo_release.persisted?
+              = link_to t('workarea.admin.form.cancel'), release_path(@undo_release, return_to: release_path(@release)), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.create_release_undos.workflow.delete_confirmation') }
+            - else
+              = link_to t('workarea.admin.form.cancel'), release_path(@release), class: 'workflow-bar__button workflow-bar__button--delete'
 
           .grid__cell.grid__cell--60
             %ol.workflow-bar__steps

data/app/views/workarea/admin/create_release_undos/review.html.haml

@@ -34,15 +34,21 @@
                   - changeset.changed_fields.each do |field|
                     = render_changeset_field(changeset, field)
 
+          - if @release.show_changeset_summary?
+            %li.text.text--large.align-center
+              = t('workarea.admin.cards.more', amount: @release.additional_changesets_count )
+
+              %p= t('workarea.admin.create_release_undos.review.change_count_message')
+
     .workflow-bar
       .grid.grid--middle
         .grid__cell.grid__cell--20
-          = link_to t('workarea.admin.form.cancel'), release_path(@undo_release), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.create_release_undos.workflow.delete_confirmation') }
+          = link_to t('workarea.admin.form.cancel'), release_path(@undo_release, return_to: release_path(@release)), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.create_release_undos.workflow.delete_confirmation') }
 
         .grid__cell.grid__cell--60
           %ol.workflow-bar__steps
             %li.workflow-bar__step
-              1) #{link_to t('workarea.admin.create_release_undos.workflow.setup'), new_release_undo_path(@release)}
+              1) #{link_to t('workarea.admin.create_release_undos.workflow.setup'), new_release_undo_path(@release, id: @undo_release.id)}
             %li.workflow-bar__step
               %strong 2) #{t('workarea.admin.create_release_undos.workflow.review')}
 

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/releases/_cards.html.haml

@@ -62,80 +62,21 @@
 
       - if local_assigns[:active].blank?
         .card__body
-          - if model.changesets_with_releasable.empty?
+          - if model.changeset_count.zero?
             %p.card__empty-note= t('workarea.admin.releases.cards.planned_changes.empty_note')
             = link_to release_changesets_path(model), class: 'card__button' do
               %span.button.button--small= t('workarea.admin.releases.cards.planned_changes.button')
           - else
-            - model.changesets_with_releasable.take(3).each do |changeset|
-
-              .activity
-                .activity__header
-                  .activity__avatar
-                    = changeset_icon changeset, { class: 'svg-icon'}
-                  .activity__name= changeset.name
-                  .activity__time
-                    = changeset.publish_humanized
-                    - if changeset.release_date.present?
-                      = local_time(changeset.release_date, :long)
-                .activity__message
-                  .release-changeset.release-changeset--activity
-                    .release-changeset__body
-                      - changeset.changed_fields.each do |field|
-                        = render_changeset_field(changeset, field)
+            %table
+              %tbody
+                - model.changeset_summary.each do |summary|
+                  %tr
+                    %td.align-right
+                      %strong= summary.count
+                    %td= summary.label
 
             = link_to release_changesets_path(model), class: 'card__button' do
               %span.button.button--small= t('workarea.admin.releases.cards.planned_changes.button')
 
-  .grid__cell
-    - if model.undoes?
-      .card{ class: card_classes(:original, local_assigns[:active]) }
-        = link_to original_release_path(model), class: 'card__header' do
-          %span.card__header-text= t('workarea.admin.releases.cards.original.title')
-          = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
-
-        - if local_assigns[:active].blank?
-          .card__body
-            .card__empty-note
-              %p= t('workarea.admin.releases.cards.original.undoes_html', link: link_to(model.undoes.name, release_path(model.undoes)))
-
-              - if model.undoes.publish_at.present? && model.undoes.publish_at.future?
-                %p= t('workarea.admin.releases.cards.undo.set_to_publish_html', link: link_to(model.undoes.name, release_path(model.undoes)), at: local_time_ago(model.undoes.publish_at))
-              - elsif model.undoes.published_at.present?
-                %p= t('workarea.admin.releases.cards.undo.published_html', link: link_to(model.undoes.name, release_path(model.undoes)), at: local_time_ago(model.undoes.published_at))
-              - else
-                %p= t('workarea.admin.releases.cards.undo.unscheduled_html', link: link_to(model.undoes.name, release_path(model.undoes)))
-
-            = link_to original_release_path(model), class: 'card__button' do
-              %span.button.button--small= t('workarea.admin.releases.cards.original.learn_more')
-
-    - else
-      .card{ class: card_classes(:undo, local_assigns[:active]) }
-        = link_to undo_release_path(model), class: 'card__header' do
-          %span.card__header-text= t('workarea.admin.releases.cards.undo.title')
-          = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
-
-        - if local_assigns[:active].blank?
-          .card__body
-            .card__empty-note
-              - if model.undo.blank?
-                %p= t('workarea.admin.releases.cards.undo.not_setup')
-
-                = link_to undo_release_path(model), class: 'card__button' do
-                  %span.button.button--small= t('workarea.admin.releases.cards.undo.build_an_undo')
-
-              - else
-                %p= t('workarea.admin.releases.cards.undo.undo_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.created_at))
-
-                - if model.undo.publish_at.present? && model.undo.publish_at.future?
-                  %p= t('workarea.admin.releases.cards.undo.set_to_publish_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.publish_at))
-                - elsif model.undo.published_at.present?
-                  %p= t('workarea.admin.releases.cards.undo.published_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.published_at))
-                - else
-                  %p= t('workarea.admin.releases.cards.undo.unscheduled_html', link: link_to(model.undo.name, release_path(model.undo)))
-
-                = link_to undo_release_path(model), class: 'card__button' do
-                  %span.button.button--small= t('workarea.admin.releases.cards.undo.learn_more')
-
   .grid__cell
     = render 'workarea/admin/comments/card', commentable: model, active: local_assigns[:active]

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/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
@@ -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,17 +50,33 @@ 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_redirected_to(admin.user_path(@user.id))
+        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')
-        assert_equal(previous_user_id, session[:user_id])
-        assert(session[:admin_id].blank?)
+
+        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

@@ -49,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/system/workarea/admin/releases_system_test.rb

@@ -124,6 +124,11 @@ module Workarea
         end
 
         visit admin.release_path(Release.first)
+        assert(page.has_content?('2 Products'))
+        assert(page.has_content?('1 Pricing Sku'))
+        assert(page.has_content?('1 Discount'))
+        assert(page.has_content?('1 System Page'))
+
         click_link t('workarea.admin.releases.cards.planned_changes.planned')
         assert(page.has_content?('Test Page'))
         assert(page.has_content?('Foo Bar'))
@@ -228,10 +233,7 @@ module Workarea
 
         visit admin.list_releases_path
         click_link 'Foo Release'
-        click_link t('workarea.admin.releases.cards.undo.title')
-
-        assert(page.has_content?(t('workarea.admin.releases.undo.undoing')))
-        click_link "#{t('workarea.admin.releases.undo.build_an_undo_now')} →"
+        click_link t('workarea.admin.releases.show.build_undo')
 
         fill_in 'release[name]', with: 'Foo Bar Undo'
         click_button t('workarea.admin.create_release_undos.workflow.create_undo')
@@ -240,19 +242,9 @@ module Workarea
 
         click_link "#{t('workarea.admin.create_release_undos.workflow.done')} →"
         assert(page.has_content?('Foo Bar Undo'))
+        assert(page.has_content?('1 Content Page'))
 
-        click_link t('workarea.admin.releases.cards.original.title')
-        assert(page.has_content?('Foo Release'))
-        assert(page.has_content?('Test Page'))
-        assert(page.has_content?('Foo Bar'))
-
-        within('.text.text--large', match: :first) { click_link 'Foo Release' }
-        assert(page.has_content?('Foo Release'))
-        assert(page.has_content?('Test Page'))
-        assert(page.has_content?('Foo Bar'))
-
-        click_link t('workarea.admin.releases.cards.undo.title')
-        assert(page.has_content?('Foo Bar Undo'))
+        click_link t('workarea.admin.releases.cards.planned_changes.planned')
         assert(page.has_content?('Test Page'))
         assert(page.has_content?('Foo Bar'))
       end
@@ -341,6 +333,43 @@ module Workarea
           assert(page.has_content?('Release Six'))
         end
       end
+
+      def test_viewing_large_changesets
+        Workarea.config.per_page = 2
+
+        release = create_release
+        product_one = create_product(id: 'PROD1', name: 'Product One')
+        product_two = create_product(id: 'PROD2', name: 'Product Two')
+        content_page = create_page(name: 'Test Page')
+
+        release.as_current do
+          product_one.variants.first.update!(details: { 'Color' => 'Orange' })
+          product_two.update!(name: 'Test Product Changed')
+          content_page.update!(name: 'Test Page Changed')
+        end
+
+        visit admin.release_path(release)
+
+        assert(page.has_content?('2 Products'))
+        assert(page.has_content?('1 Content Page'))
+
+        click_link t('workarea.admin.releases.cards.planned_changes.planned')
+
+        assert(page.has_content?('2 Products'))
+        assert(page.has_content?('1 Content Page'))
+
+        assert(page.has_content?('Test Product Changed'))
+        assert(page.has_content?('Test Page Changed'))
+        assert(page.has_no_content?('Orange'))
+
+        assert(page.has_content?(t('workarea.admin.changesets.recent')))
+        assert(page.has_content?(t('workarea.admin.cards.more', amount: 1)))
+
+        click_link '2 Products'
+
+        assert(page.has_content?('Product One'))
+        assert(page.has_content?('Product Two'))
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.20
+  version: 3.5.26
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 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.5.20
+        version: 3.5.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.20
+        version: 3.5.26
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.20
+        version: 3.5.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.20
+        version: 3.5.26
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -551,6 +551,7 @@ files:
 - app/view_models/workarea/admin/bulk_action_sequential_product_edit_view_model.rb
 - app/view_models/workarea/admin/category_view_model.rb
 - app/view_models/workarea/admin/changes_view_model.rb
+- app/view_models/workarea/admin/changeset_summary_view_model.rb
 - app/view_models/workarea/admin/changeset_view_model.rb
 - app/view_models/workarea/admin/code_list_view_model.rb
 - app/view_models/workarea/admin/comment_view_model.rb
@@ -1065,9 +1066,7 @@ files:
 - app/views/workarea/admin/releases/index.html.haml
 - app/views/workarea/admin/releases/list.html.haml
 - app/views/workarea/admin/releases/new.html.haml
-- app/views/workarea/admin/releases/original.html.haml
 - app/views/workarea/admin/releases/show.html.haml
-- app/views/workarea/admin/releases/undo.html.haml
 - app/views/workarea/admin/reports/_export.html.haml
 - app/views/workarea/admin/reports/_group_by_time.html.haml
 - app/views/workarea/admin/reports/average_order_value.html.haml
@@ -1289,6 +1288,7 @@ files:
 - test/dummy/tmp/screenshots/.keep
 - test/helpers/workarea/admin/application_helper_test.rb
 - test/helpers/workarea/admin/buttons_helper_test.rb
+- test/helpers/workarea/admin/changesets_helper_test.rb
 - test/helpers/workarea/admin/content_helper_test.rb
 - test/helpers/workarea/admin/facets_helper_test.rb
 - test/helpers/workarea/admin/icons_helper_test.rb
@@ -1390,6 +1390,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
@@ -1527,7 +1528,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

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

@@ -1,50 +0,0 @@
-- @page_title = t('workarea.admin.releases.original.page_title', name: @release.name)
-
-.view
-  .view__header
-    .grid.grid--middle.grid--right
-      .grid__cell.grid__cell--50
-        .view__heading
-          = link_to "↑ #{t('workarea.admin.releases.original.index_link')}", releases_path
-          %h1= link_to @release.name, url_for(@release)
-      .grid__cell.grid__cell--25
-        = render_aux_navigation_for(@release)
-
-  .view__container
-    = render_cards_for(@release, :original)
-
-  .view__container.view__container--narrow
-    .section
-      .grid.grid--center
-        .grid__cell.grid__cell--25
-          %p.text.text--large= t('workarea.admin.releases.original.created_description_html', undo: link_to(@release.name, @release), original: link_to(@release.undoes.name, @release.undoes), at: local_time_ago(@release.created_at))
-        .grid__cell.grid__cell--25.align-center
-          .card{ class: card_classes(:planned_changes) }
-            = link_to @release.undoes, class: 'card__header' do
-              %span.card__header-text= @release.undoes.name
-              = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
-
-            .card__body
-              - if @release.undoes.changesets_with_releasable.empty?
-                %p.card__empty-note= t('workarea.admin.releases.original.no_changes_for_this_release')
-              - else
-                - @release.undoes.changesets_with_releasable.take(3).each do |changeset|
-                  .activity
-                    .activity__header
-                      .activity__avatar
-                        = changeset_icon changeset, { class: 'svg-icon'}
-                      .activity__name= changeset.release.name
-                      .activity__time
-                        = changeset.publish_humanized
-                        - if changeset.release_date.present?
-                          = local_time(changeset.release_date, :long)
-                    .activity__message
-                      .release-changeset.release-changeset--activity
-                        .release-changeset__body
-                          - changeset.changed_fields.each do |field|
-                            = render_changeset_field(changeset, field)
-
-                = link_to @release.undoes, class: 'card__button' do
-                  %span.button.button--small= t('workarea.admin.releases.original.view_the_original_release')
-
-

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

@@ -1,64 +0,0 @@
-- @page_title = t('workarea.admin.releases.undo.page_title', name: @release.name)
-
-.view
-  .view__header
-    .grid.grid--middle.grid--right
-      .grid__cell.grid__cell--50
-        .view__heading
-          = link_to "↑ #{t('workarea.admin.releases.undo.index_link')}", releases_path
-          %h1= link_to @release.name, url_for(@release)
-      .grid__cell.grid__cell--25
-        = render_aux_navigation_for(@release)
-
-  .view__container
-    = render_cards_for(@release, :undo)
-
-  .view__container.view__container--narrow
-    .section
-      - if @release.changesets_with_releasable.empty?
-        .grid.grid--center
-          .grid__cell.grid__cell--50
-            %h2.align-center= t('workarea.admin.releases.undo.undoing')
-            %p.align-center= t('workarea.admin.releases.undo.no_changes_html', plan_changes: link_to(t('workarea.releases.undo.plan_changes'), release_releasables_path(@release)))
-
-      - elsif @release.undo.blank?
-        .grid.grid--center
-          .grid__cell.grid__cell--50
-            %h2.align-center= t('workarea.admin.releases.undo.undoing')
-            %p.align-center= t('workarea.admin.releases.undo.description')
-            %p.align-center= link_to "#{t('workarea.admin.releases.undo.build_an_undo_now')} →", new_release_undo_path(@release), class: 'button'
-      - else
-        .grid.grid--center
-          .grid__cell.grid__cell--25
-            %p.text.text--large= t('workarea.admin.releases.undo.created_description_html', undo: link_to(@release.undo.name, @release.undo), original: link_to(@release.name, @release), at: local_time_ago(@release.created_at))
-          .grid__cell.grid__cell--25.align-center
-            .card{ class: card_classes(:planned_changes) }
-              = link_to @release.undo, class: 'card__header' do
-                %span.card__header-text= @release.undo.name
-                = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
-
-              .card__body
-                - if @release.undo.changesets_with_releasable.empty?
-                  %p.card__empty-note= t('workarea.admin.releases.undo.no_changes_for_this_release')
-                - else
-                  - @release.undo.changesets_with_releasable.take(3).each do |changeset|
-                    .activity
-                      .activity__header
-                        .activity__avatar
-                          = changeset_icon changeset, { class: 'svg-icon'}
-                        .activity__name= changeset.release.name
-                        .activity__time
-                          = changeset.publish_humanized
-                          - if changeset.release_date.present?
-                            = local_time(changeset.release_date, :long)
-                      .activity__message
-                        .release-changeset.release-changeset--activity
-                          .release-changeset__body
-                            - changeset.changed_fields.each do |field|
-                              = render_changeset_field(changeset, field)
-
-                  = link_to @release.undo, class: 'card__button' do
-                    %span.button.button--small= t('workarea.admin.releases.undo.view_the_undo_release')
-
-
-