workarea-admin 3.5.7 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50c0890b678de1a3775d9227c9a1cf3a9c2a874e933342d986c943937d9b369
-  data.tar.gz: 0d30f205a6b061caa140360efdc87ebc9bc580a1673d09fb256a7dfc5a70b501
+  metadata.gz: 53aa69458136ce8230480fc4b89e0fc9dc19cd05fdab78b277f287593c5497d3
+  data.tar.gz: 6935d4c3bf8d003af7090e5185e7b47c755c259a94b37df926a1399ca9cd638a
 SHA512:
-  metadata.gz: 04c7943314cf9a6fc8ffe116bbdd0f6d15ccfa0f13f55e037869106593759a03d70e7554f1d898d9c9e740a8602722de9383bf067427d59a1f7ad56b6d2d3085
-  data.tar.gz: b305c1426413775da437f2887b25f42d8c4da83c75b4fbb32cf6a19bd05c1949b06425d25cc30feaeb7b2db35ecc64c6daef6ad50264d7c8a7b81a5a32ade014
+  metadata.gz: 9a8f7c29d253e12b2957552bc5739f4224dd63a40635bfb31baeb68539da0416da5e0e82dc478e47def44533fa30db49697c132bce882b4e68c1aa50dcea0896
+  data.tar.gz: 535dfa3ce18d746840c40d4f66d7bcaf41c75bddc3c6bb4e3359f988a67a33c853bf55d0bd02a5a8f4d0dded4bad3c25c40ef02bf9cd508d4b9c480b3f6c160c

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.8
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-31 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.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 3.5.8
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 3.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 3.5.8
 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