workarea-admin 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5341f457a231d57f8903f5300d3ba014713adb1ae1b18a0497fed5215812e272
-  data.tar.gz: 6bd7f5868b117fd2b837e8020cfda2422fb38e0e21fc3a2f3992d1d9e77cd774
+  metadata.gz: eb536eb2ddc3f8671312c61b42ab98cd2b22b2bdf430976a7ea6985e87925043
+  data.tar.gz: babe1c17567016f9cc95f3a95cb4b7285d6abb8a8360b9a4f60d3ae8c4720245
 SHA512:
-  metadata.gz: f9aaf000aced6215c42222f10b4b925e1037b18b5782538be8244589194b23f6bc3f4e2ecb6b417459d98427392caa64aff7a4c8a1a1aed029ff7aec45aa544f
-  data.tar.gz: 59934acecd3201289f6346ac94fae1381968137672e41f1dce637a94b958152e9d2104e7f86f39376adcb1df9cea6d25021b26e864f7efb958d47e666d89b1a8
+  metadata.gz: 4d5b3e614913fae1bb119973806d4c720f8c1dcdaf79334be6b5b40ed75475bd273562b4279d0ccbbe8c8f5a2d90428eafea2d47517fd471e460c03da18faf4e
+  data.tar.gz: fb4002effffbad7bdf6d57164306bc872b27e278e103c2febd887b87ee5490c7a61872b4cd6ff4cf27a16c8b7ac0353c4edf6aa1e6a5d4e7f434857f7c0be82f

data/app/view_models/workarea/admin/content_view_model.rb

@@ -80,8 +80,29 @@ module Workarea
       #
       # @return [Boolean]
       #
-      def new_block?
-        options[:new_block].present?
+      def new_block?(at: nil)
+        return false unless options[:new_block].present?
+        at.blank? || new_block.position == at
+      end
+
+      # HACK
+      #
+      # This method returns whether we can reliably determine the position of
+      # the new block being added. This can be very difficult to generate due to
+      # possible resorting of blocks within a release combined with release
+      # previewing based on publishing time.
+      #
+      # The only time this has caused an issue in use is adding a new first
+      # block, so this is used in combination with the above `new_block?` to
+      # decide whether to render the first block.
+      #
+      # @return [Boolean]
+      #
+      def ambiguous_new_block_position?
+        return false unless options[:new_block].present?
+
+        known_positions = [0] + current_blocks.map { |b| b.position + 1 }
+        known_positions.exclude?(new_block.position)
       end
 
       # An instance of the new block being created.

data/app/view_models/workarea/admin/dashboards/marketing_view_model.rb

@@ -37,17 +37,17 @@ module Workarea
                   {
                     '$match' => {
                       'created_at' => {
-                        '$gte' => starts_at.beginning_of_day,
-                        '$lte' => ends_at.end_of_day
+                        '$gte' => starts_at.beginning_of_day.utc,
+                        '$lte' => ends_at.end_of_day.utc
                       }
                     }
                   },
                   {
                     '$group' => {
                       '_id' => {
-                        'day' => { '$dayOfMonth' => '$created_at' },
-                        'month' => { '$month' => '$created_at' },
-                        'year' => { '$year' => '$created_at' }
+                        'day' => { '$dayOfMonth' => created_at_in_time_zone },
+                        'month' => { '$month' => created_at_in_time_zone },
+                        'year' => { '$year' => created_at_in_time_zone }
                       },
                       'created_at' => { '$first' => '$created_at' },
                       'count' => { '$sum' => 1 }
@@ -61,6 +61,10 @@ module Workarea
             end
         end
 
+        def created_at_in_time_zone
+          { 'date' => '$created_at', 'timezone' => Time.zone.tzinfo.name }
+        end
+
         def insights
           @insights ||= InsightViewModel.wrap(
             Workarea::Insights::Base.by_dashboard('marketing').page(options[:page])

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

@@ -30,7 +30,7 @@
 
   - else
     .content-editor__area
-      - if content.new_block? && content.new_block.position == 0
+      - if content.new_block?(at: 0) || content.ambiguous_new_block_position?
         .content-block{ id: dom_id(content.new_block), data: { content_block: storefront.draft_content_block_path(content.new_block_draft) }, class: ('content-block--active' if content.new_block?), style: "order: #{content.new_block.position}" }
           .content-block__iframe-placeholder
         = form_tag content_area_blocks_path(content, content.current_area), method: :post, class: 'content-editor__form', data: { content_editor_form: { previewId: "##{dom_id(content.new_block)}", params: { 'block[content_id]': content.id, 'block[type_id]': content.new_block.type_id, 'block[area]': content.current_area } }.to_json, unsaved_changes: '' } do
@@ -54,7 +54,7 @@
         = form_tag content_area_block_path(content, content.current_area, block), method: :patch, class: 'content-editor__form', data: { content_editor_form: { previewId: "##{dom_id(block)}", params: { 'block[content_id]': content.id, 'block[type_id]': block.type_id, 'block[area]': content.current_area } }.to_json, unsaved_changes: '' } do
           = render 'workarea/admin/content/form', content: content, block: block
 
-        - if content.new_block? && content.new_block.position == block.position + 1
+        - if content.new_block?(at: block.position + 1)
           .content-block{ id: dom_id(content.new_block), data: { content_block: storefront.draft_content_block_path(content.new_block_draft) }, class: ('content-block--active' if content.new_block?), style: "order: #{content.new_block.position}" }
             .content-block__iframe-placeholder
           = form_tag content_area_blocks_path(content, content.current_area), method: :post, class: 'content-editor__form', data: { content_editor_form: { previewId: "##{dom_id(content.new_block)}", params: { 'block[content_id]': content.id, 'block[type_id]': content.new_block.type_id, 'block[area]': content.current_area } }.to_json, unsaved_changes: '' } do

data/app/views/workarea/admin/create_releases/setup.html.haml

@@ -28,7 +28,7 @@
               .grid__cell.grid__cell--50-at-medium
                 .property
                   = label_tag 'release_publish_at', t('workarea.admin.fields.publish_at'), class: 'property__name'
-                  .box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true } }
+                  .box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } } }
 
       .workflow-bar
         .grid.grid--middle

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

@@ -28,4 +28,4 @@
       - if current_user.can_publish_now?
         .property
           = label_tag 'release[publish_at]', t('workarea.admin.releases.publish.when_does_it_publish'), class: 'property__name'
-          = hidden_field_tag 'release[publish_at]', nil, placeholder: t('workarea.admin.releases.publish.when_does_it_publish'), data: { datetimepicker_field: { inline: true } }
+          = hidden_field_tag 'release[publish_at]', nil, placeholder: t('workarea.admin.releases.publish.when_does_it_publish'), data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }

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

@@ -37,7 +37,7 @@
                 = label_tag 'release_publish_at', t('workarea.admin.fields.publish_at'), class: 'property__name'
 
                 - if current_user.can_publish_now?
-                  .box.box--rounded.box--padded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true } }
+                  .box.box--rounded.box--padded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } } }
                 - elsif @release.publish_at.present?
                   = local_time(@release.publish_at)
                 - else

data/test/system/workarea/admin/content_system_test.rb

@@ -63,52 +63,6 @@ module Workarea
         assert(page.has_selector?('.ui-sortable'))
       end
 
-      def test_active_by_segment
-        create_life_cycle_segments
-        create_content(name: 'home_page')
-
-        visit admin.content_index_path
-        click_link 'Home Page'
-        within '.card--content' do
-          click_link 'Content'
-        end
-
-        click_link 'add_new_block'
-        click_link 'HTML'
-
-        fill_in 'block[data][html]', with: '<h1>Some Content!</h1>'
-        click_button 'create_block'
-        assert(page.has_content?('Success'))
-
-        find('.content-block-list__name', text: 'HTML').click
-        find('.tabs__menu-link', text: t('workarea.admin.content.form.display')).click
-
-        within '.tabs__panel' do
-          find('.select2-selection--multiple').click
-        end
-
-        find('.select2-results__option:first-of-type').click
-
-        find('body').click # close the select2 UI
-
-        click_button t('workarea.admin.form.save_changes')
-        assert(page.has_content?('Success'))
-
-        find('.content-block-list__name', text: 'HTML').click
-        click_link t('workarea.admin.content.form.display')
-
-        assert_selector('.select2-selection__choice')
-        find('.select2-selection__choice__remove').click
-
-        click_button t('workarea.admin.form.save_changes')
-        assert(page.has_content?('Success'))
-
-        find('.content-block-list__name', text: 'HTML').click
-        click_link t('workarea.admin.content.form.display')
-
-        refute_selector('.select2-selection__choice')
-      end
-
       def test_managing_content_blocks_for_a_release
         home = create_content(name: 'home_page', blocks: [])
         release = create_release(name: 'Foo')

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

@@ -106,6 +106,31 @@ module Workarea
 
         refute(og_asset.open_graph_placeholder?)
       end
+
+      def test_ambiguous_new_block_position
+        content = create_content
+        refute(ContentViewModel.wrap(content).ambiguous_new_block_position?)
+
+        new_block_params = { type_id: 'text', position: 0 }
+        view_model = ContentViewModel.wrap(content, new_block: new_block_params)
+        refute(view_model.ambiguous_new_block_position?)
+
+        view_model = ContentViewModel.wrap(content, new_block: new_block_params.merge(position: 1))
+        assert(view_model.ambiguous_new_block_position?)
+
+        release = create_release
+        content.blocks.create!(type_id: 'text', position: 0, activate_with: release.id)
+        content.blocks.create!(type_id: 'text', position: 1)
+
+        view_model = ContentViewModel.wrap(content, new_block: new_block_params)
+        refute(view_model.ambiguous_new_block_position?)
+
+        view_model = ContentViewModel.wrap(content, new_block: new_block_params.merge(position: 1))
+        assert(view_model.ambiguous_new_block_position?)
+
+        view_model = ContentViewModel.wrap(content, new_block: new_block_params.merge(position: 2))
+        refute(view_model.ambiguous_new_block_position?)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-18 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.0
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.1
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1284,6 +1284,7 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/dummy/tmp/screenshots/.keep
 - test/helpers/workarea/admin/application_helper_test.rb
 - test/helpers/workarea/admin/facets_helper_test.rb
 - test/helpers/workarea/admin/icons_helper_test.rb