workarea-admin 3.4.29 → 3.4.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da8bc75f20143ab5701f535e4cce9e2b4a84f9330faab4cbd5fed620cdf6093
-  data.tar.gz: 6e06dfa75cc2b6292032eba0cd2ca07b14b2948b582e33eeecac0a1320a8646d
+  metadata.gz: e5230f58914602ef18cf228a8b7cd3f02e2b1dd9c3d172b14714c7ce7c58f624
+  data.tar.gz: cc2a6bf7861708d6e12803b4008633192700c28cb50005b376cc59153aac3fab
 SHA512:
-  metadata.gz: 0b679c8124fd1b8d5ebf95d68665229a27ba2c16ca6299bac8cc578181b3e14fd2bbca99fc9bc1f0c744699121aa793f39ef2c6ea934ab6d73f995423de4ba65
-  data.tar.gz: 935c49a925308f4158eb9800bab1775ccd2e3383306126da65974436e4c59bd951f272c1730811c12cbd78bdc67f8bf79c33655fe6da07ebc5e285d416535162
+  metadata.gz: 2bb2e8897d7291d59a3cfd4f35eeb896cd93762ca61a4f79a14d299a280391abc0a2c41e26c0397c0e02f8f46e6f4ad4e1eb33f92500da29056ee64496f12f93
+  data.tar.gz: 76f1ec690b2cc56c7e36ae3ee5ed6228c41246ae6fd40111bf3459ac8394dbe0bea6dfa2d2c36a58315cca08fc02aff5454a7355f7ad587c7de929c0d4961da1

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/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

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

@@ -64,7 +64,7 @@
                 = 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/users/index.html.haml

@@ -2,7 +2,7 @@
 
 .view
   .view__header
-    .grid.grid--middle.grid--right
+    .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'

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

@@ -252,6 +252,17 @@ module Workarea
           )
         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(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.4.29
+  version: 3.4.34
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-06-11 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.29
+        version: 3.4.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.29
+        version: 3.4.34
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.29
+        version: 3.4.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.29
+        version: 3.4.34
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1401,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