workarea-admin 3.5.8 → 3.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53aa69458136ce8230480fc4b89e0fc9dc19cd05fdab78b277f287593c5497d3
-  data.tar.gz: 6935d4c3bf8d003af7090e5185e7b47c755c259a94b37df926a1399ca9cd638a
+  metadata.gz: '098a9ad9021d540d19a295ea8a02b2977d741bfceea307bc6ec4a5f5af89220c'
+  data.tar.gz: 04c129147a023ced5857739fb66c749f1360e47f97b11961e99453b58ba1219b
 SHA512:
-  metadata.gz: 9a8f7c29d253e12b2957552bc5739f4224dd63a40635bfb31baeb68539da0416da5e0e82dc478e47def44533fa30db49697c132bce882b4e68c1aa50dcea0896
-  data.tar.gz: 535dfa3ce18d746840c40d4f66d7bcaf41c75bddc3c6bb4e3359f988a67a33c853bf55d0bd02a5a8f4d0dded4bad3c25c40ef02bf9cd508d4b9c480b3f6c160c
+  metadata.gz: 855fa89d046ba65fa09c03ae3f82f34cfb508db818ab381b0c25c5fd353b5628003d4087c9ceae11daa1cb2cf7a12c97ae36c9c8166f8a0611f7df3390ec6b17
+  data.tar.gz: '0601691b31b981310a4a139ee8ef894e16a0e5afcafcb87ba8c01c79e568ace43469da3c78dd180a6794644f6034d6e49d039c6c8566b5c7ff58e0c72c541048'

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/assets/javascripts/workarea/admin/modules/release_calendar_placeholders.js

@@ -15,17 +15,6 @@ WORKAREA.registerModule('releaseCalendarPlaceholders', (function () {
             WORKAREA.initModules($calendar);
         },
 
-        now = new Date(),
-
-        standardTimezoneOffset = function() {
-            var jan = new Date(now.getFullYear(), 0, 1).getTimezoneOffset(),
-                jul = new Date(now.getFullYear(), 6, 1).getTimezoneOffset();
-
-            return Math.max(jan, jul);
-        },
-
-        isDSTObserved = now.getTimezoneOffset() < standardTimezoneOffset(),
-
         /**
          * Makes the AJAX request for a new calendar based on a supplied time.
          * When the promise resolves the supplied placeholder element is
@@ -40,16 +29,7 @@ WORKAREA.registerModule('releaseCalendarPlaceholders', (function () {
          * @param {string} endpoint - the endpoint for the AJAX request
          */
         requestCalendar = function (startDate, placeholder, endpoint) {
-            var timeOffset = parseInt(strftime('%z', new Date()));
-
-            if (isDSTObserved) {
-                timeOffset = timeOffset - 100;
-            }
-
-            $.get(endpoint, {
-                start_date: startDate,
-                time_offset: timeOffset
-            })
+            $.get(endpoint, { start_date: startDate })
             .done(_.partial(displayCalendar, placeholder))
             .fail(
                 _.partial(

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/controllers/workarea/admin/releases_controller.rb

@@ -9,7 +9,6 @@ module Workarea
       before_action :find_calendar, only: [:index, :update]
       before_action :authenticate_user_by_token, only: :calendar_feed
       skip_before_action :require_login, :require_admin, only: :calendar_feed
-      around_action :set_time_zone, only: :index
 
       def index
       end
@@ -71,15 +70,6 @@ module Workarea
 
       private
 
-      def set_time_zone
-        old_time_zone = Time.zone
-        time_offset = params[:time_offset].to_i / 100
-        Time.zone = time_offset.hours unless params[:time_offset].blank?
-        yield
-      ensure
-        Time.zone = old_time_zone
-      end
-
       def find_release
         model = if params[:id].present?
                   Release.find(params[:id])

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

@@ -34,6 +34,8 @@
           = label_tag "product[meta_description]", t('workarea.admin.fields.meta_description'), class: 'property__name'
           = text_field_tag 'product[meta_description]', @product.meta_description, class: 'text-box text-box--i18n', id: "product_meta_description"
 
+        = append_partials('admin.product_content_fields', product: @product)
+
       .workflow-bar
         .grid.grid--auto.grid--right.grid--middle
           .grid__cell= render 'workarea/admin/shared/publishing_select'

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

@@ -110,6 +110,8 @@
                       = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_products.edit.details.learn_more'))
               %td.align-center -
 
+      = append_partials('admin.additional_product_details_information', product: @product)
+
       .section
 
         %h2= t('workarea.admin.catalog_products.edit.filters.label')
@@ -147,6 +149,8 @@
                       = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_products.edit.filters.learn_more'))
               %td.align-center -
 
+        = append_partials('admin.additional_product_filters_information', product: @product)
+
         .grid.grid--huge
           .grid__cell.grid__cell--50.grid__cell--25-at-medium
             .property

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

@@ -70,6 +70,8 @@
                   = render 'workarea/admin/shared/csv_formatting_tooltip'
               %td.align-center -
 
+      = append_partials('admin.additional_variant_information_fields', variant: @variant)
+
       .workflow-bar
         .grid.grid--auto.grid--right.grid--middle
           .grid__cell= render 'workarea/admin/shared/publishing_select'

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/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/inventory_skus/edit.html.haml

@@ -56,6 +56,8 @@
               = label_tag 'sku[backordered_until]', t('workarea.admin.inventory_skus.edit.backordered_ship_date'), class: 'property__name'
               = datetime_picker_tag 'sku[backordered_until]', @sku.backordered_until.try(:to_s, :date_only), class: 'text-box text-box--medium', data: { datepicker_field: { } }
 
+        = append_partials('admin.inventory_sku_fields', sku: @sku)
+
         .grid.grid--huge
           .grid__cell.grid__cell--50.grid__cell--25-at-medium
             .property

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

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.8
+  version: 3.5.13
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 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.5.8
+        version: 3.5.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.8
+        version: 3.5.13
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.8
+        version: 3.5.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.8
+        version: 3.5.13
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email: