workarea-admin 3.5.7 → 3.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50c0890b678de1a3775d9227c9a1cf3a9c2a874e933342d986c943937d9b369
-  data.tar.gz: 0d30f205a6b061caa140360efdc87ebc9bc580a1673d09fb256a7dfc5a70b501
+  metadata.gz: fe1f232d46f475f09894f0127f8f8995bf5bfa4ef38f0041d5258f995860b7da
+  data.tar.gz: a7cb09eaab5a17df1faf5270f6cfc2c720f84823071765326019416eb4443106
 SHA512:
-  metadata.gz: 04c7943314cf9a6fc8ffe116bbdd0f6d15ccfa0f13f55e037869106593759a03d70e7554f1d898d9c9e740a8602722de9383bf067427d59a1f7ad56b6d2d3085
-  data.tar.gz: b305c1426413775da437f2887b25f42d8c4da83c75b4fbb32cf6a19bd05c1949b06425d25cc30feaeb7b2db35ecc64c6daef6ad50264d7c8a7b81a5a32ade014
+  metadata.gz: 7bbda6fefd1b7212742dfe6fdb1516165302725d29dad9de5f11e75fdb07fc98c679388f1f9543a39a46e0c38dac738f6bd4f7f15701726bcc5b10c8ac2f1d81
+  data.tar.gz: 7bfdf3b873d3126c88c176c826667adde296ae7118bb40474455dc482fb4d59d38822de59b7843146d4d8ad6e7c6a4d69ba1c3d0e60e610891674752831ec600

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/helpers/workarea/admin/navigation_helper.rb

@@ -65,6 +65,9 @@ module Workarea
             action: 'index'
           )
         )
+
+      rescue ActionController::UrlGenerationError
+        nil
       end
     end
   end

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

@@ -41,17 +41,6 @@
             .comments__comment-body
               %p= comment.body
 
-      .section
-        - if @commentable.subscribed_user_ids.include?(current_user.id.to_s)
-          = form_tag unsubscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
-            = button_tag t('workarea.admin.comments.index.unsubscribe'), value: 'comments_unsubscribe', class: 'button button--small'
-            %span= t('workarea.admin.comments.index.subscribe_message')
-        - else
-          = form_tag subscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
-            = button_tag t('workarea.admin.comments.index.subscribe'), value: 'comments_subscribe', class: 'button button--small'
-            %span= t('workarea.admin.comments.index.unsubscribe_message')
-
-
       .section
         .comments__new-comment
           %h2= t('workarea.admin.comments.index.new')
@@ -66,5 +55,17 @@
               %span.property__note= t('workarea.admin.comments.index.mention_note')
 
             .workflow-bar
-              .grid.grid--auto.grid--right.grid--middle
-                .grid__cell= button_tag t('workarea.admin.comments.index.create'), value: 'create_comment', class: 'workflow-bar__button workflow-bar__button--create'
+              .grid.grid--middle
+                .grid__cell.grid__cell--80
+                  - if @commentable.subscribed_user_ids.include?(current_user.id.to_s)
+                    = link_to t('workarea.admin.comments.index.unsubscribe'), unsubscribe_commentable_comments_path(@commentable.to_global_id), data: { method: 'put', tooltip: { content_id: '#unsubscribe-info' } }, class: 'workflow-bar__button'
+                    #unsubscribe-info.tooltip-content
+                      %p= t('workarea.admin.comments.index.unsubscribe_message')
+
+                  - else
+                    = link_to t('workarea.admin.comments.index.subscribe'), subscribe_commentable_comments_path(@commentable.to_global_id), data: { method: 'put', tooltip: { content_id: '#subscribe-info' } }, class: 'workflow-bar__button'
+                    #subscribe-info.tooltip-content
+                      %p= t('workarea.admin.comments.index.subscribe_message')
+
+                .grid__cell.grid__cell--20
+                  .align-right= button_tag t('workarea.admin.comments.index.create'), value: 'create_comment', class: 'workflow-bar__button workflow-bar__button--create'

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/data_file_mailer/import.html.haml

@@ -1,4 +1,7 @@
-= render_schema_org(email_action_schema(index_url_for(@import.model_class), t('workarea.admin.data_file_mailer.import.email_action.name'), t('workarea.admin.data_file_mailer.import.email_action.description')))
+- index_url = index_url_for(@import.model_class, only_path: false)
+
+- if index_url.present?
+  = render_schema_org(email_action_schema(index_url, t('workarea.admin.data_file_mailer.import.email_action.name'), t('workarea.admin.data_file_mailer.import.email_action.description')))
 
 %tr
   %td
@@ -7,7 +10,9 @@
   %td
     %p
       = t('workarea.admin.data_file_mailer.import.success', count: pluralize(@import.succeeded, @import.format.unit.downcase))
-%tr
-  %td
-    %p
-      = link_to t('workarea.admin.data_file_mailer.import.link_text', name: @import.name.pluralize), index_url_for(@import.model_class, only_path: false)
+
+- if index_url.present?
+  %tr
+    %td
+      %p
+        = link_to t('workarea.admin.data_file_mailer.import.link_text', name: @import.name.pluralize), index_url

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

@@ -631,8 +631,8 @@ en:
           removed: Your comment has been removed
           saved: Your comment has been saved
           saved_error: There was a problem saving your comment
-          comment_subscribed: Your comments subscription has been added. You will be notified of any future comments.
-          comment_unsubscribed: You have been unsubscribed from future comments.
+          comment_subscribed: You have been subscribed to comment notifications.
+          comment_unsubscribed: You have been unsubscribed from comment notifications.
         index:
           body: Comment Body
           create: Create Comment
@@ -642,10 +642,10 @@ en:
           new: New Comment
           notify: Notify Admins
           subscribe: Subscribe
-          subscribe_message: to receive emails about future comments.
+          subscribe_message: You'll be emailed when a new comment is posted on this.
           title: Comments on %{name}
           unsubscribe: Unsubscribe
-          unsubscribe_message: to stop receiving emails about future comments.
+          unsubscribe_message: Click this to stop receiving email about future comments.
         icon:
           viewed: Comments
           unviewed: Unread Comments
@@ -975,6 +975,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/helpers/workarea/admin/navigation_helper_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class NavigationHelperTest < ViewTest
+      include Engine.routes.url_helpers
+
+      def test_index_url_for
+        assert_equal(admin.catalog_products_path, index_url_for(Catalog::Product))
+        assert_equal(admin.catalog_products_path, index_url_for(create_product))
+        assert_nil(index_url_for(Fulfillment))
+        assert_raises { index_url_for('foo') }
+      end
+    end
+  end
+end

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

@@ -250,6 +250,17 @@ module Workarea
           results.map { |r| r['type'] }
         )
       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/comments_system_test.rb

@@ -53,10 +53,10 @@ module Workarea
         visit admin.user_path(user)
 
         click_link 'Comments'
-        click_button t('workarea.admin.comments.index.subscribe')
+        click_link t('workarea.admin.comments.index.subscribe')
         assert(page.has_content?('Success'))
 
-        click_button t('workarea.admin.comments.index.unsubscribe')
+        click_link t('workarea.admin.comments.index.unsubscribe')
         assert(page.has_content?('Success'))
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.12
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 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.5.7
+        version: 3.5.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 3.5.12
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 3.5.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 3.5.12
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1293,6 +1293,7 @@ files:
 - test/helpers/workarea/admin/icons_helper_test.rb
 - test/helpers/workarea/admin/imports_helper_test.rb
 - test/helpers/workarea/admin/insights_helper_test.rb
+- test/helpers/workarea/admin/navigation_helper_test.rb
 - test/helpers/workarea/admin/products_helper_test.rb
 - test/helpers/workarea/admin/releases_helper_test.rb
 - test/helpers/workarea/admin/settings_helper_test.rb
@@ -1525,7 +1526,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