workarea-admin 3.4.28 → 3.4.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5e5e70ec8db64536691e2c00009ec4cc3fbeafa558d063613272f4e68d9d3a8
-  data.tar.gz: fb41f84d15df3ec6e66e5005186916fec71e2e6d59b715a353254fb067edad67
+  metadata.gz: 2618e587d46a52104fa76a1798bbd94109034bca062d5c8a2e54212f8e609e89
+  data.tar.gz: 2d1d7d707d4a3ecb3776d489b3b015606ed0ebdc23cba8d3cafbd91947178f04
 SHA512:
-  metadata.gz: a6dac33cba255d0f435cdfe82510a1bb048bab67b01a39c426441eb85edf362dd7f68be808c9eaa84594d1bb1c8eb79efff56bfce50b1ecd19d40194f66f5e22
-  data.tar.gz: 9155090353b2d4b80e7860c4d14892dbcfd3a60ea83b1af751fd8baacb9f96085f234e1c541a301cabded3afea9d03720248e640fec99074496a10e956c06546
+  metadata.gz: 6aa6da1272ece5cf37f633ef8f963f7be623694fa2dd32cafe525672af2536aa6e2b104c26d7312c2992e2fd0d89d3a0a245a377b2c22dc19b77dd3e12ca840c
+  data.tar.gz: 7c0444ca8d947657c7ca65a8c826be735cce3fdf667d86854a4a77e443895d5f6648de6b532ca173287c8785f399db141fd0f31b6274e273bd3a1853d7757250

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

@@ -5,7 +5,7 @@ WORKAREA.registerModule('categorizedAutocompleteFields', (function () {
     'use strict';
 
     var getSource = function (request, response) {
-            $.getJSON('/admin/jump_to', { q: request.term }, function (data) {
+            $.getJSON(WORKAREA.routes.admin.jumpToPath(), { q: request.term }, function (data) {
                 response(data.results);
             });
         },

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

@@ -102,7 +102,7 @@ module Workarea
       end
 
       def track_index_filters
-        session[:last_index_path] = request.fullpath
+        session[:last_index_path] = request.fullpath unless request.xhr? || request.format.json?
       end
     end
   end

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

@@ -64,19 +64,21 @@ module Workarea
       end
 
       def set_details
-        HashUpdate.new(
+        @product.details = HashUpdate.new(
+          original: @product.details,
           adds: params[:new_details],
           updates: params[:details],
           removes: params[:details_to_remove]
-        ).apply(@product.details)
+        ).result
       end
 
       def set_filters
-        HashUpdate.new(
+        @product.filters = HashUpdate.new(
+          original: @product.filters,
           adds: params[:new_filters],
           updates: params[:filters],
           removes: params[:filters_to_remove]
-        ).apply(@product.filters)
+        ).result
       end
 
       def set_images

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

@@ -64,19 +64,21 @@ module Workarea
     end
 
     def set_details
-      HashUpdate.new(
+      @product.details = HashUpdate.new(
+        original: @product.details,
         adds: params[:new_details],
         updates: params[:details],
         removes: params[:details_to_remove]
-      ).apply(@product.details)
+      ).result
     end
 
     def set_filters
-      HashUpdate.new(
+      @product.filters = HashUpdate.new(
+        original: @product.filters,
         adds: params[:new_filters],
         updates: params[:filters],
         removes: params[:filters_to_remove]
-      ).apply(@product.filters)
+      ).result
     end
   end
 end

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

@@ -83,11 +83,12 @@ module Workarea
     end
 
     def set_details
-      HashUpdate.new(
+      @variant.details = HashUpdate.new(
+        original: @variant.details,
         adds: params[:new_details],
         updates: params[:details],
         removes: params[:details_to_remove]
-      ).apply(@variant.details)
+      ).result
     end
   end
 end

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

@@ -74,8 +74,14 @@ module Workarea
       end
 
       def save_details
-        HashUpdate.new(updates: params[:filters]).apply(@product.filters)
-        HashUpdate.new(updates: params[:details]).apply(@product.details)
+        @product.filters = HashUpdate
+          .new(original: @product.filters, updates: params[:filters])
+          .result
+
+        @product.details = HashUpdate
+          .new(original: @product.details, updates: params[:details])
+          .result
+
         @product.save!
 
         flash[:success] = t('workarea.admin.create_catalog_products.flash_messages.saved')

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

@@ -30,14 +30,14 @@ module Workarea
       #
       # @return [Money]
       def min_price
-        sell_prices.first.sell
+        sell_prices.first&.sell
       end
 
       # The highest regular price set on this SKU.
       #
       # @return [Money]
       def max_price
-        sell_prices.last.sell
+        sell_prices.last&.sell
       end
 
       # Show a price range if the `min_price` and `max_price` are not
@@ -45,7 +45,7 @@ module Workarea
       #
       # @return [Boolean]
       def show_range?
-        min_price != max_price
+        min_price.present? && max_price.present? && min_price != max_price
       end
 
       # This SKU is considered "on sale" if it is marked as such, or if
@@ -62,7 +62,9 @@ module Workarea
       #
       # @return [String]
       def sell_price
+        return if min_price.blank?
         return min_price.format unless show_range?
+
         "#{max_price.format} – #{min_price.format}"
       end
     end

data/app/views/workarea/admin/create_catalog_products/content.html.haml

@@ -28,7 +28,7 @@
 
         .property
           = label_tag 'product[meta_description]', t('workarea.admin.create_catalog_products.content.meta_description'), class: 'property__name'
-          = text_field_tag 'product[meta_description]', @product.meta_description, class: 'text-box text-box--i18n', placeholder: t('workarea.admin.create_catalog_products.content.defaults_to_a_truncated_description')
+          = text_field_tag 'product[meta_description]', @product.meta_description, class: 'text-box text-box--i18n', placeholder: t('workarea.admin.create_catalog_products.content.defaults_to_description')
           %span.property__note= t('workarea.admin.create_catalog_products.content.provides_a_summary_that_is_displayed_on_search_engine_result_pages')
 
       .workflow-bar

data/app/views/workarea/admin/insights/_most_discounted_products.html.haml

@@ -18,15 +18,15 @@
                 = result.product_id
               - else
                 = link_to result.product.name, catalog_product_path(result.product)
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= insights_number_to_percentage(result.average_discount)
             = t('workarea.admin.insights.most_discounted_products.average_discount')
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= insights_number_to_percentage(result.discount_rate)
             = t('workarea.admin.insights.most_discounted_products.discount_rate')
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= number_with_delimiter(result.units_sold)
             = t('workarea.admin.insights.most_discounted_products.units_sold')
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= insights_number_to_percentage(result.conversion_rate)
             = t('workarea.admin.insights.most_discounted_products.conversion_rate')

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

@@ -14,25 +14,25 @@
             %li
               %strong #{t('workarea.admin.fields.tax_code')}:
               = model.tax_code.presence || '(none)'
-            %li
-              %strong #{t('workarea.admin.fields.msrp')}:
-              - if model.msrp.blank?
-                = t('workarea.admin.cards.attributes.no_value')
-              - else
-                = number_to_currency model.msrp
             %li
               %strong #{t('workarea.admin.fields.on_sale')}:
               = model.on_sale?.to_s.titleize
             %li
               %strong #{t('workarea.admin.fields.discountable')}:
               = model.discountable?.to_s.titleize
+            %li
+              %strong #{t('workarea.admin.fields.msrp')}:
+              - if model.msrp.blank?
+                = t('workarea.admin.cards.attributes.no_value')
+              - else
+                = number_to_currency model.msrp
+            = append_partials('admin.pricing_sku_attributes_card', pricing_sku: model)
             %li
               %strong= t('workarea.admin.fields.updated_at')
               #{local_time_ago(model.updated_at)}
             %li
               %strong= t('workarea.admin.fields.created_at')
               #{local_time_ago(model.created_at)}
-            = append_partials('admin.pricing_sku_attributes_card', pricing_sku: model)
 
           = link_to edit_pricing_sku_path(model), class: 'card__button' do
             %span.button.button--small= t('workarea.admin.cards.attributes.button')

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

@@ -31,11 +31,6 @@
           = label_tag 'sku[tax_code]', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'sku[tax_code]', @sku.tax_code, class: 'text-box'
 
-        .property
-          = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'
-          = currency_symbol
-          = text_field_tag 'sku[msrp]', @sku.msrp, class: 'text-box text-box--small'
-
         .grid
           .grid__cell.grid__cell--50.grid__cell--25-at-medium
             .property
@@ -47,6 +42,11 @@
               %span.property__name= t('workarea.admin.fields.discountable')
               = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
 
+        .property
+          = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'
+          = currency_symbol
+          = text_field_tag 'sku[msrp]', @sku.msrp, class: 'text-box text-box--small'
+
         = append_partials('admin.pricing_sku_fields', sku: @sku)
 
         .grid.grid--huge

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

@@ -46,6 +46,7 @@
                 = check_box_tag 'select_all', nil, false, id: 'select_all', class: 'checkbox__input', data: { bulk_action_select_all: '' }
                 = label_tag 'select_all', t('workarea.admin.bulk_actions.select_all'), class: 'checkbox__label'
             %th= t('workarea.admin.fields.sku')
+            = append_partials('admin.pricing_skus_additional_field_labels')
             %th.align-right= t('workarea.admin.fields.msrp')
             %th.align-right= t('workarea.admin.fields.sell_price')
             %th.align-center= t('workarea.admin.fields.on_sale')
@@ -61,8 +62,9 @@
               %td
                 = link_to result.id, pricing_sku_path(result)
                 = upcoming_changesets_icon_for(result)
+              = append_partials('admin.pricing_skus_additional_fields', result: result)
               %td.align-right= number_to_currency result.msrp
-              %td.align-right= result.sell_price
+              %td.align-right= result.sell_price || '–'
               %td.align-center= t("workarea.admin.#{result.on_sale?}")
               %td.align-center= t("workarea.admin.#{result.discountable?}")
               %td= local_time_ago(result.updated_at)

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

@@ -26,13 +26,16 @@
           = label_tag 'sku[tax_code]', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'sku[tax_code]', @sku.tax_code, class: 'text-box', placeholder: t('workarea.admin.pricing_skus.tax_code_placeholder')
 
-        .property
-          %span.property__name= t('workarea.admin.fields.on_sale')
-          = toggle_button_for 'sku[on_sale]', @sku.on_sale?, title_true: t('workarea.admin.pricing_skus.on_sale'), title_false: t('workarea.admin.pricing_skus.not_on_sale')
+        .grid
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              %span.property__name= t('workarea.admin.fields.on_sale')
+              = toggle_button_for 'sku[on_sale]', @sku.on_sale?, title_true: t('workarea.admin.pricing_skus.on_sale'), title_false: t('workarea.admin.pricing_skus.not_on_sale')
 
-        .property
-          %span.property__name= t('workarea.admin.fields.discountable')
-          = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              %span.property__name= t('workarea.admin.fields.discountable')
+              = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
 
         .property
           = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'

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

@@ -2,11 +2,13 @@
 
 .view
   .view__header
-    .grid.grid--middle.grid--center
+    .grid.grid--right
       .grid__cell.grid__cell--50
         .view__heading
           = link_to "↑ #{t('workarea.admin.users.index.dashboard_link')}", people_dashboards_path, class: 'view__dashboard-button'
           %h1= t('workarea.admin.users.index.title')
+      .grid__cell.grid__cell--25
+        = append_partials('admin.user_index_aux_navigation')
 
   .view__container
     .browsing-controls.browsing-controls--with-divider.browsing-controls--center{ class: ('browsing-controls--filters-displayed' unless @search.toggle_facets?) }

data/config/locales/en.yml

@@ -916,6 +916,7 @@ en:
           browser_title: Browser Title
           cancel: Cancel
           defaults_to_a_truncated_description: "(defaults to a truncated description)"
+          defaults_to_description: "(defaults to description)"
           description: Description
           meta_description: Meta Description
           or_skip_this: or skip this

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

@@ -6,9 +6,7 @@ module Workarea
       include Admin::IntegrationTest
 
       def test_ensures_cors_policy_for_bulk_upload
-        Workarea.s3.expects(:get_bucket_cors).returns(
-          mock('Excon::Response', data: { body: { 'CORSConfiguration' => [] } })
-        )
+        Workarea.s3.expects(:get_bucket_cors).returns(mock_s3_cors_response).once
         Workarea.s3.expects(:put_bucket_cors).once
         get admin.content_assets_path
         assert(response.ok?)

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

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class IndexTrackingIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_track_index_filters
+        get admin.pricing_skus_path
+
+        assert_equal(admin.pricing_skus_path, session[:last_index_path])
+        assert_no_changes -> { session[:last_index_path] } do
+          get admin.catalog_products_path(format: :json)
+        end
+        assert_no_changes -> { session[:last_index_path] } do
+          get admin.catalog_products_path, xhr: true
+        end
+      end
+    end
+  end
+end

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

@@ -234,6 +234,35 @@ module Workarea
         results = JSON.parse(response.body)['results']
         assert_equal(0, results.length)
       end
+
+      def test_limiting_results_by_type
+        Workarea.with_config do |config|
+          config.jump_to_type_limit = 2
+          config.jump_to_results_per_type = 2
+
+          5.times { |i| create_product(name: "Test Product #{i}") }
+          5.times { |i| create_category(name: "Test Category #{i}") }
+
+          get admin.jump_to_path(q: 'test')
+          results = JSON.parse(response.body)['results']
+
+          assert_equal(
+            %w(Products Products Categories Categories),
+            results.map { |r| r['type'] }
+          )
+        end
+      end
+
+      def test_sorting_by_recency
+        create_user(email: 'foo-one@workarea.com', updated_at: 1.day.ago)
+        create_user(email: 'foo-two@workarea.com', updated_at: 1.hour.ago)
+        get admin.jump_to_path(q: 'foo')
+
+        results = JSON.parse(response.body)['results']
+        assert_equal(2, results.length)
+        assert_match('foo-two@workarea.com', results.first['label'])
+        assert_match('foo-one@workarea.com', results.second['label'])
+      end
     end
   end
 end

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

@@ -16,6 +16,19 @@ module Workarea
         assert(product.active)
       end
 
+      def test_updating_hash_fields_in_locales
+        set_locales(available: [:en, :es], default: :en, current: :en)
+        product = create_product(filters_translations: { 'en' => { 'Size' => ['Large'] } })
+
+        patch admin.catalog_product_path(product, locale: 'es'),
+          params: { new_filters: %w(Color Roja) }
+
+        assert_equal(
+          { 'en' => { 'Size' => ['Large'] }, 'es' => { 'Color' => ['Roja'] } },
+          product.reload.filters_translations
+        )
+      end
+
       def test_returns_a_list_of_filters
         create_product(filters:  { 'Color' => 'Blue' })
 

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

@@ -5,14 +5,7 @@ module Workarea
     class AssetsSystemTest < SystemTest
       include Admin::IntegrationTest
 
-      def mock_get_bucket_cors
-        Workarea.s3.expects(:get_bucket_cors).returns(
-          mock('Excon::Response', data: { body: { 'CORSConfiguration' => [] } })
-        )
-      end
-
       def test_management
-        mock_get_bucket_cors
         visit admin.content_assets_path
         click_link 'add_asset'
 
@@ -38,7 +31,6 @@ module Workarea
       end
 
       def test_insertion
-        mock_get_bucket_cors
         asset = create_asset
 
         content = create_content(

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

@@ -30,6 +30,10 @@ module Workarea
         @sku.update!(on_sale: false)
 
         assert_equal(3.to_m, @sku.min_price)
+
+        @sku.prices.destroy_all
+
+        assert_nil(@sku.min_price)
       end
 
       def test_max_price
@@ -38,6 +42,10 @@ module Workarea
         @sku.update!(on_sale: false)
 
         assert_equal(4.to_m, @sku.max_price)
+
+        @sku.prices.destroy_all
+
+        assert_nil(@sku.min_price)
       end
 
       def test_show_range?
@@ -46,6 +54,10 @@ module Workarea
         @sku.prices.last.destroy!
 
         refute(@sku.show_range?)
+
+        @sku.prices.destroy_all
+
+        refute(@sku.show_range?)
       end
 
       def test_on_sale?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.4.28
+  version: 3.4.33
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.28
+        version: 3.4.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.28
+        version: 3.4.33
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.28
+        version: 3.4.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.28
+        version: 3.4.33
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1220,6 +1220,7 @@ files:
 - test/integration/workarea/admin/help_articles_integration_test.rb
 - test/integration/workarea/admin/impersonations_integration_test.rb
 - test/integration/workarea/admin/import_taxes_integration_test.rb
+- test/integration/workarea/admin/index_tracking_integration_test.rb
 - test/integration/workarea/admin/inventory_skus_integration_test.rb
 - test/integration/workarea/admin/jump_to_integration_test.rb
 - test/integration/workarea/admin/menus_integration_test.rb
@@ -1400,7 +1401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Admin for the Workarea Commerce Platform