workarea-admin 3.4.21 → 3.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eaf9d9ae8fc24cd0abfe8bd0cc1370c93d64e8e323c3108d7263c05f73559f7
-  data.tar.gz: cffc4dc0fcb75d3808ca0b2e19c1e99ffba229cacc2e6e4b02caa87a7f3d0512
+  metadata.gz: b32e6145f8e516f84b24cea472151ef5821625ad0bb9b58b63d190b38cadd82b
+  data.tar.gz: 10600313f90bff7a68beeb48f734e050e8d97de0d8b8a11d6a2b5dbed7b441aa
 SHA512:
-  metadata.gz: 430625b82db3973e9d4e3f031a3a8ccf69247b54c0182f272e63babebf6dbd644614cdce1cb4229ec687395f774017823eae9c38710cc52a1d2107545a44695c
-  data.tar.gz: 9776eed1419df56f641ef9cec71f36469d2de8b5dbf7c0b2fad572891131803ec7d7513057d483b37f16e0fa5417a09257e4295b2a1e833824d20fcc2c1ae1dd
+  metadata.gz: 6dfc32ad70d7d4f0171d9afda5ca88ff69b263939fb6f730c8615be88b462c929d88fdbcf4429cdc894ad5f136fb642b3b5a46d7b1f1d563410b6ad28ace69ae
+  data.tar.gz: cb490aad1714c7c2679ace4c67657d9ac2665a9bce53f4c9e42b9035070f8c3d5155b7a88a7093f73429ff0e214428ea4a1c671af19f260d8af3a6105f322c40

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

@@ -7,9 +7,7 @@ module Workarea
     after_action :track_index_filters, only: :index
 
     def index
-      if Configuration::S3.configured? && !request.xhr?
-        DirectUpload.ensure_cors!(request.url)
-      end
+      DirectUpload.ensure_cors!(request.url) if Configuration::S3.configured?
 
       search = Search::AdminAssets.new(params)
       @search = Admin::SearchViewModel.new(search, view_model_options)

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

@@ -8,7 +8,7 @@ module Workarea
 
       def sample
         filename = "#{@import.name.downcase.underscore}.#{@import.file_type}"
-        send_data @import.sample_file_content, filename: filename, type: @import.file_type
+        send_data @import.sample_file_content, filename: filename, type: @import.mime_type, disposition: :attachment
       end
 
       def create

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

@@ -156,6 +156,16 @@ module Workarea
         new_query_string_params = request.query_parameters.merge(page: page)
         "#{request.path}?#{new_query_string_params.to_query}"
       end
+
+      def duration_in_words(duration)
+        parts = duration.parts
+        return t('workarea.duration.seconds', count: 0) if parts.empty?
+
+        parts
+          .sort_by { |unit,  _ | ActiveSupport::Duration::PARTS.index(unit) }
+          .map     { |unit, val| t("workarea.duration.#{unit}", count: val) }
+          .to_sentence
+      end
     end
   end
 end

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

@@ -33,7 +33,7 @@
               - Workarea.config.data_file_formats.each do |file_type|
                 = link_to_unless @import.file_type.to_s == file_type.to_s, file_type.upcase, url_for(import: { model_type: @import.model_type, file_type: file_type }), data: { turbolinks: false }
               %br
-              = link_to t('workarea.admin.data_file_imports.new.download_sample'), url_for(params.merge(action: 'sample')) if @import.samples.present?
+              = link_to t('workarea.admin.data_file_imports.new.download_sample'), url_for(params.merge(action: 'sample', format: @import.file_type)) if @import.samples.present?
 
             - if @import.samples.blank?
               %p.align-center= t('workarea.admin.data_file_imports.new.no_samples')

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

@@ -30,11 +30,22 @@
           = text_field_tag  'discount[tag_list]', @discount.tag_list, class: 'text-box'
           %span.property__note= t('workarea.admin.form.csv_field_note')
 
-        .property
-          %span.property__name
-            = t('workarea.admin.fields.active')
-            = inline_svg('workarea/admin/i18n.svg', class: 'svg-icon svg-icon--small') if locale_options.many? && Workarea.config.localized_active_fields
-          = toggle_button_for 'discount[active]', @discount.active?
+        .grid
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              %span.property__name
+                = t('workarea.admin.fields.active')
+                = inline_svg('workarea/admin/i18n.svg', class: 'svg-icon svg-icon--small') if locale_options.many? && Workarea.config.localized_active_fields
+              = toggle_button_for 'discount[active]', @discount.active?
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              %span.property__name
+                = t('workarea.admin.fields.auto_deactivate')
+                = link_to '#auto-deactivate-info', data: { tooltip: '' } do
+                  = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue')
+              = toggle_button_for 'discount[auto_deactivate]', @discount.auto_deactivate?
+
+            #auto-deactivate-info.tooltip-content= t('workarea.admin.pricing_discounts.edit.auto_deactivate_info', duration: duration_in_words(Workarea.config.discount_staleness_ttl))
 
         .grid
           .grid__cell.grid__cell--33.grid__cell--25-at-medium

data/config/locales/en.yml

@@ -1502,6 +1502,7 @@ en:
         allow_sale_items: Allow Sale Items
         allow_sale_items: Allow Sale Items
         amount: Amount
+        auto_deactivate: Auto Deactivate
         automate_metadata: Automate Metadata
         available: Available Units
         avatar: Avatar
@@ -2661,6 +2662,7 @@ en:
             list_help: You can allow more than one user tag for this discount by separating them with commas, e.g. vip, employee.
         edit:
           page_title: Attributes for %{name}
+          auto_deactivate_info: A discount that can be auto-deactivated will becomes inactive automatically if it has not been updated or redeemed in the last %{duration}.
         flash_messages:
           removed: These changes have been removed
           saved: Your changes have been saved

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

@@ -78,6 +78,22 @@ module Workarea
         result = pagination_path_for(page: 2)
         assert_equal('/foo?asdf=blah&page=2', result)
       end
+
+      def test_duration_in_words
+        assert_equal(
+          t('workarea.duration.days', count: 2),
+          duration_in_words(2.days)
+        )
+
+        assert_equal(
+          [
+            t('workarea.duration.years', count: 1),
+            t('workarea.duration.months', count: 2),
+            t('workarea.duration.days', count: 12),
+          ].to_sentence,
+          duration_in_words(2.months + 1.years + 12.days)
+        )
+      end
     end
   end
 end

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

@@ -6,13 +6,15 @@ module Workarea
       include Admin::IntegrationTest
 
       def test_ensures_cors_policy_for_bulk_upload
-        DirectUpload.expects(:ensure_cors!).once
+        Workarea.s3.expects(:put_bucket_cors).once
         get admin.content_assets_path
         assert(response.ok?)
 
-        DirectUpload.expects(:ensure_cors!).never
         get admin.content_assets_path, xhr: true
         assert(response.ok?)
+
+        get admin.content_assets_path
+        assert(response.ok?)
       end
 
       def test_can_create_an_asset

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

@@ -79,6 +79,14 @@ module Workarea
 
           file = create_tempfile(response.body, extension: file_type)
           assert(IO.read(file.path).present?)
+          assert_equal(
+            "#{MIME::Types.type_for(file_type).first.to_s}; charset=utf-8",
+            response.headers['Content-Type']
+          )
+          assert_equal(
+            %(attachment; filename="catalog product.#{file_type}"),
+            response.headers['Content-Disposition']
+          )
 
           assert_no_changes 'Catalog::Product.first' do
             post admin.data_file_imports_path,

metadata

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