workarea-admin 3.5.19 → 3.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa740ba48b4fdf3285077508f27e804b4d04dce69d08981d4e3d72174bdae82
-  data.tar.gz: 51da60eac496d3e4133ad3667f9c2e72b4a541ebff5e5f397f603d0f7e6e45b7
+  metadata.gz: 0a649d1cba8728c8b979eeeef3750e773851272517069f56c09203900e3e57d6
+  data.tar.gz: bbd0c3d025a9a58c6366f7267157eae4aff5018d39e7728e8a9e30b4c3e4d15d
 SHA512:
-  metadata.gz: 869f45549bf0f404dca21df06c01bed3de546d2d7203a99138e83ca82bfac2098990fc99c379ed5e08837e277c6e16945abf2eb8ed37aaf19ea9e49a66849cb6
-  data.tar.gz: 06eadc8f2a5f7be3d4a24b76d57e9bee8b66a31d7c5a060c86700782b24b617518e6820c9f063242efae9ce97148212dac8fa3aa16009b47cfb8b471b6000987
+  metadata.gz: 6dbae9d3250a480c3da57725d1019c7c4203008e472ce83b6f90d21dd5caf6ac7df19d24098d4fe7ba3c3a2201072d37951cda6398f7aeba34816f827a16afc5
+  data.tar.gz: c768147f8682d314fa9ff3abc50712c5811d9614cb5aa5ceeb38452b86c5ddc26239c743602b89c2fcbc4c65a40b3900969b2e8784203c0c2909f85fee574a3f

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

@@ -108,7 +108,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/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_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/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]