workarea-admin 3.5.10 → 3.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e1c6efc45b20cb32df207cbcb07a914752f4196d61b792ef01198641c50ef2f
-  data.tar.gz: 60408041549bd4b362f89dea3b8f2bea0f41254fcb83a576a847b8c15092778a
+  metadata.gz: 22151d97339dcf587e89454822b83969e0eb2a164c7f5748a34dec5d427b90c5
+  data.tar.gz: '0279175251fddeff03ab8132ada998f4ec8e15aa9f8cc58968170de06f6d7299'
 SHA512:
-  metadata.gz: 736af63a13d6eea04361dd06639c66f8fb9f9562472e8e3d5393bed6fe206e35c0f9eef55620bf43604958118fc50a6fcda73435969c50fd31c4a913bfda8132
-  data.tar.gz: 5a04cbdfcab0622d3cef5b110bd804e977a8dff4e484d7c452a0bf02f99a5e48fa89872c8cfcbe995b1bcbfbe3ea8eaef4df5e251757382c263b0be5e4a4c064
+  metadata.gz: e5ee00e2c8de2a4009fe2e5b57b9299511e682ecd62ac30de7dd6bee8ebe249a69ec69956d5f14f2e01c5cd03a4d2af58a3b76af7eedfbf36ee822b08a9729a6
+  data.tar.gz: 214e7cdb84936b2a2e40232f4fbd8876b7e7d327951ec6caaf8ca59058c52c0ae6e8ed1df7f2618c56bace59758d480074033e510f1edf107151454ed3be13ad

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/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/view_models/workarea/admin/code_list_view_model.rb

@@ -10,7 +10,7 @@ module Workarea
       end
 
       def used_count
-        model.count - unused_promo_codes.count
+        model.promo_codes.count - unused_promo_codes.count
       end
 
       def last_used_at

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/create_segments/setup.html.haml

@@ -10,6 +10,8 @@
       = render_message 'error', message
 
     = form_tag create_segments_path, method: 'post' do
+      = hidden_field_tag :id, @segment.id unless @segment.new_record?
+
       .section
         .property.property--required
           = label_tag 'segment_name', t('workarea.admin.fields.name'), class: 'property__name'

data/app/views/workarea/admin/create_users/admin.html.haml

@@ -140,6 +140,8 @@
                           = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon')
                           %span= t('workarea.admin.users.permissions.help')
 
+                    = append_partials('admin.user_permissions')
+
       .workflow-bar
         .grid.grid--middle
           .grid__cell.grid__cell--20

data/app/views/workarea/admin/facets/_applied.html.haml

@@ -10,7 +10,7 @@
       - @search.facet_selections.each do |facet, values|
         - values.each do |value|
           %li.browsing-controls__applied-filter
-            %span= value.titleize
+            %span= facet_value_display_name(facet, value)
             = link_to facet_path(facet, value), class: 'browsing-controls__applied-remove-link' do
               = inline_svg('workarea/admin/icons/close.svg', class: 'browsing-controls__applied-icon svg-icon svg-icon--small svg-icon--black', title: t('workarea.admin.facets.applied.remove_filter'))
 

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/app/views/workarea/admin/pricing_discount_code_lists/_cards.html.haml

@@ -45,7 +45,7 @@
             .grid
               .grid__cell.grid__cell--50
                 .align-center
-                  %h2.heading.heading--no-margin= model.count
+                  %h2.heading.heading--no-margin= model.promo_codes.count
                   %p #{t('workarea.admin.pricing_discount_code_lists.cards.promo_codes.total')}
               .grid__cell.grid__cell--50
                 .align-center

data/app/views/workarea/admin/pricing_discount_code_lists/promo_codes.html.haml

@@ -17,7 +17,7 @@
 
   .view__container.view__container--narrow
     = render_cards_for(@code_list, :promo_codes)
-    %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.count)
+    %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.promo_codes.count)
 
     %table
       %thead

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

@@ -32,7 +32,11 @@
 
             - else
               .grid__cell
-                - if current_release.try(:id) == @release.id
+                - if @release.published? && !@release.scheduled?
+                  = link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#cannot-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
+                  #cannot-preview-info.tooltip-content
+                    %p= t('workarea.admin.releases.show.unscheduled_republish_preview_info')
+                - elsif current_release.try(:id) == @release.id
                   = link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), storefront.root_path, class: 'workflow-bar__button workflow-bar__button--update'
                 - else
                   = form_tag release_session_path, method: :post do

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
@@ -3189,6 +3189,7 @@ en:
           start_preview_in_storefront: Start preview in storefront
           undo: Undo
           visit_storefront_to_preview: Preview
+          unscheduled_republish_preview_info: This release is already published, you'll need to schedule it again to preview its changes.
           no_changes_to_preview: There are no changes to preview. Click on the Plan Changes card to start!
           no_changes_to_publish: There are no changes to publish for this release. Click on the Plan Changes card to start!
           no_changes_to_undo: There are no changes to undo for this release. Click on the Plan Changes card to start!

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

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

@@ -21,6 +21,11 @@ module Workarea
 
         view_model = CodeListViewModel.wrap(code_list)
         assert_equal(1, view_model.used_count)
+
+        code_list.promo_codes.create!(code: "#{code_list.prefix}123")
+
+        view_model = CodeListViewModel.wrap(code_list)
+        assert_equal(1, view_model.used_count)
       end
 
       def test_last_used_at

metadata

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