workarea-admin 3.4.37 → 3.4.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89563d62b41645ebdde7c2fbfc6d85571e1746bc6c063b72bb3752875a736d9f
-  data.tar.gz: 9498efc069915970ece5e12dc22ad218e5809dd486fc613f41f98df732d5071a
+  metadata.gz: 48f2aebd5326ae73d326a0da5946c65394af32592db518b99386d710a4843f3e
+  data.tar.gz: 56f42f24deb50a9f8508ae4c187b6c940a0205ae922544b2edb208e5028fafec
 SHA512:
-  metadata.gz: f2bbb6e0a67747bbaca53d6e48b10c817556903a37a2b7cc85656e96bd10ef8a5d913844f8a2b3358efc9b04669fa8439955233e1bd6d9ff0ee20c61ff0cd367
-  data.tar.gz: e5ed533b1ce16b6ddd78942510efe4fa61f123bb00efa8336de36378b5aec30401bc72ff18e02d8be9cf3f7820441f361e092d44fad3b5003d7f64ae4c9c3378
+  metadata.gz: '02804b99d7bd74e9b2e466e770d9c769a3937010a361f30c0f73e6904f16ee930d5385e9b49b66356ac82ccf855a6cae0c87a854d48f2328afbc4668ef9c18d0'
+  data.tar.gz: 0ea526e27c8248f012b08a700c4fada40867e1f41caef37b9fce47699d55b2fe49bf8933ad95ed4c955c05860e355d53656543365af092f2eafadf8af2e975de

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/assets/stylesheets/workarea/admin/components/_toggle_button.scss

@@ -20,6 +20,10 @@ $toggle-button-status-negative-color:  $red !default;
     display: inline-block;
 }
 
+.toggle-button--disabled {
+    opacity: 0.5;
+}
+
     /**
      * 1. provides positiioning context for `.toggle-button__label`
      * 2. height + vertical margin = `.text-box` height

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

@@ -21,8 +21,9 @@ module Workarea
         end
 
         if attributes[:inventory].present?
-          inventory = Inventory::Sku.find_or_create_by(id: variant.sku)
+          inventory = Inventory::Sku.find_or_initialize_by(id: variant.sku)
           inventory.available = attributes[:inventory]
+          inventory.policy = 'standard' if inventory.new_record?
           inventory.save!
         end
       end

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

@@ -27,7 +27,7 @@ module Workarea
         self.current_order = nil
 
         flash[:success] = t('workarea.admin.users.flash_messages.stopped')
-        redirect_to user_path(previous_user_id)
+        redirect_back_or(user_path(previous_user_id))
       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/views/workarea/admin/catalog_product_images/edit.html.haml

@@ -25,7 +25,7 @@
           .product-images__image-group
             .product-images__image
               .product-images__image-summary
-                .product-images__image-summary-container= image_tag product_image_url(@image, :small), alt: "#{@image.option} #{t('workarea.admin.catalog_product_images.edit.image')}", id: @image.option.parameterize, class: 'product-images__image-summary-image'
+                .product-images__image-summary-container= image_tag product_image_url(@image, :small), alt: "#{@image.option} #{t('workarea.admin.catalog_product_images.edit.image')}", class: 'product-images__image-summary-image'
 
     .section
       %h2= t('workarea.admin.catalog_product_images.edit.edit_image')

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

@@ -110,7 +110,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/catalog_variants/edit.html.haml

@@ -63,11 +63,6 @@
                 .property
                   = text_field_tag 'new_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_variants.edit.options.new_attribute_value'), placeholder: t('workarea.admin.catalog_variants.edit.options.new_attribute_value_placeholder')
                   %span.property__note= t('workarea.admin.catalog_variants.edit.options.new_attribute_value_note')
-                  %span.property__note
-                    = t('workarea.admin.catalog_variants.edit.options.new_attribute_value_csv')
-                    = link_to '#csv-help', data: { tooltip: '' } do
-                      = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_variants.edit.options.learn_more'))
-                  = render 'workarea/admin/shared/csv_formatting_tooltip'
               %td.align-center -
 
       .workflow-bar

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

@@ -55,11 +55,6 @@
                 .property
                   = text_field_tag 'new_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_variants.new.options.new_attribute_value'), placeholder: t('workarea.admin.catalog_variants.new.options.new_attribute_value_placeholder')
                   %span.property__note= t('workarea.admin.catalog_variants.new.options.new_attribute_value_note')
-                  %span.property__note
-                    = t('workarea.admin.catalog_variants.new.options.new_attribute_value_csv')
-                    = link_to '#csv-help', data: { tooltip: '' } do
-                      = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_variants.new.options.learn_more'))
-                  = render 'workarea/admin/shared/csv_formatting_tooltip'
               %td.align-center -
 
       .workflow-bar

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/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/shared/_toggle_button.html.haml

@@ -1,4 +1,4 @@
-.toggle-button{ data: data }
+.toggle-button{ data: data, class: disabled ? 'toggle-button--disabled' : nil }
   .toggle-button__switch
     = radio_button_tag input_name, true, condition, disabled: disabled, class: 'toggle-button__input toggle-button__input--positive', title: title_true, id: "#{dom_id}_true"
     = label_tag "#{dom_id}_false", label_true, class: 'toggle-button__label toggle-button__label--positive', id: "#{dom_id}_false_label"

data/app/views/workarea/admin/toolbar/show.html.haml

@@ -67,6 +67,7 @@
                       = link_to current_impersonation.email, user_path(current_impersonation)
                     %br
                     = form_tag impersonations_path, method: 'delete', data: { disable_delete_confirmation: '' } do
+                      = hidden_field_tag :return_to, return_to
                       = button_tag t('workarea.admin.toolbar.stop_impersonation'), class: 'text-button text-button--destroy'
 
             - if allow_pricing_override?

data/config/locales/en.yml

@@ -485,7 +485,6 @@ en:
             new_attribute_name_note: 'Example: Material'
             new_attribute_name_placeholder: New Attribute Name
             new_attribute_value: New Attribute Value
-            new_attribute_value_csv: 'Comma separated: just, like, this'
             new_attribute_value_note: 'Example: Cotton'
             new_attribute_value_placeholder: New Attribute Value
             remove: Remove
@@ -524,7 +523,6 @@ en:
             new_attribute_name_note: 'Example: Material'
             new_attribute_name_placeholder: New Attribute Name
             new_attribute_value: New Attribute Value
-            new_attribute_value_csv: 'Comma separated: just, like, this'
             new_attribute_value_note: 'Example: Cotton'
             new_attribute_value_placeholder: New Attribute Value
             remove: Remove
@@ -3191,10 +3189,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
@@ -3514,7 +3512,7 @@ en:
           changes_saved: Your changes have been saved
           saved: Your changes have been saved
           started: You are now browsing as %{email}
-          stopped: Impersonation for this user has been stopped.
+          stopped: Impersonation has been stopped, you are now browsing as your account.
           created: This account has been created
           error: There was an error saving this account
         index:

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

@@ -70,7 +70,14 @@ module Workarea
         post admin.impersonations_path, params: { user_id: @user.id }
         delete admin.impersonations_path
 
-        assert(response.redirect?)
+        assert_redirected_to(admin.user_path(@user.id))
+        assert_equal(previous_user_id, response_cookies['user_id'])
+        assert(session['admin_id'].blank?)
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path(return_to: '/foo')
+
+        assert_redirected_to('/foo')
         assert_equal(previous_user_id, response_cookies['user_id'])
         assert(session['admin_id'].blank?)
       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

@@ -34,12 +34,9 @@ module Workarea
           click_button 'Stop Impersonation'
         end
 
-        assert_equal(admin.user_path(user), current_path)
+        assert_equal(storefront.root_path, current_path)
         assert(page.has_content?('Success'))
 
-        find('.view').hover # Ensure tooltipster menu isn't open
-        assert(page.has_content?('bcrouse@workarea.com'))
-
         visit storefront.users_account_path
         assert(page.has_no_content?('impersonated@workarea.com'))
 

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

@@ -23,7 +23,7 @@ module Workarea
         end
       end
 
-      def test_options
+      def test_variant_details
         @view_model.variants.build(
           sku: 'SKU1',
           name: 'name',
@@ -42,7 +42,7 @@ module Workarea
 
         assert_equal(
           { 'Color' => ['Red', 'Black', 'White'], 'Size' => ['S', 'M', 'L'] },
-          @view_model.options
+          @view_model.variant_details
         )
       end
 

metadata

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