workarea-core 3.5.22 → 3.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48dfcf76f720a117fd8f3a16cdbef856816837692dc53f731b38729c5d37b9ef
-  data.tar.gz: a1ffa660f618f5d1b428ce4db9c6d768f0a12c3490ea45f02d699fa4b5ff441f
+  metadata.gz: 32ecae47fa5ca7ba205b50342ca4e7bc8cbe85981eff0ffe1f40bb60499f7665
+  data.tar.gz: c4b7d437765e253511e50774d8fdfc005b5e2bad6d8831e1b3e1a25c2ac4c346
 SHA512:
-  metadata.gz: 509b598d21369c93345837d160e2a95d271c4c0d06276192f050a2997badec0b1542a012be9c1ed10d7bb176816372825abc08370d8fb67b3cd961a96ecb6246
-  data.tar.gz: 0cf582e5e981a1524f7b1cb2229f542c2d99f8b152802386aa68a42a09de7c84602ee8c07659011ecc3a1bec1ca6ddcfdb85c2e7aa8ecdcf6333c42808b81027
+  metadata.gz: f2e1c494c51dc1cb87d6051ab653ae8a998c32a44a9d469a0e289fe4eb5b9f7132afc29bf4b97ecb8e349047466e71e45a6ef8210457cfd9f0fe5b37f807d5b9
+  data.tar.gz: 223ac060a3bbbf35fedc8c44170835b677c6d9b2a70697cc210f37de84a9c319529784df6a030e03238cdbe4beb527e233401c477f6a6f0371831f267b605d1f

data/app/models/workarea/configuration/params.rb

@@ -27,7 +27,9 @@ module Workarea
       end
 
       def array(field, value)
-        Array.wrap(CSV.parse(value).first).map(&:strip)
+        Array.wrap(CSV.parse(value).first)
+             .map(&:strip)
+             .map { |v| field.values_type_class.mongoize(v) }
       end
 
       def hash(field, value)

data/app/models/workarea/release.rb

@@ -13,7 +13,7 @@ module Workarea
     field :undo_job_id, type: String # TODO deprecated, remove in v3.6
 
     has_many :changesets, class_name: 'Workarea::Release::Changeset'
-    has_one :undo, class_name: 'Workarea::Release', inverse_of: :undoes
+    has_many :undos, class_name: 'Workarea::Release', inverse_of: :undoes
     belongs_to :undoes, class_name: 'Workarea::Release', inverse_of: :undo, optional: true
 
     index({ publish_at: 1 })
@@ -180,11 +180,10 @@ module Workarea
     end
 
     def build_undo(attributes = {})
-      result = undo || Release.new(attributes)
+      result = undos.build(attributes)
 
       result.name ||= I18n.t('workarea.release.undo', name: name)
       result.tags = %w(undo) if result.tags.blank?
-      self.undo = result
 
       result
     end

data/app/models/workarea/release/changeset.rb

@@ -15,10 +15,36 @@ module Workarea
       belongs_to :release, class_name: 'Workarea::Release', index: true
       belongs_to :releasable, polymorphic: true, index: true, optional: true
 
-      index({ 'document_path.type' => 1, 'document_path.document_id' => 1 })
+      index(
+        { 'document_path.type' => 1, 'document_path.document_id' => 1 },
+        { name: 'document_path' }
+      )
       index('changeset.product_ids' => 1)
       index('original.product_ids' => 1)
       index('releasable_type' => 1, 'releasable_id' => 1)
+      index(updated_at: 1)
+
+      def self.latest(limit = Workarea.config.per_page)
+        order(updated_at: :desc).limit(limit)
+      end
+
+      def self.summary(release_id)
+        collection.aggregate([
+          { '$match' => { 'release_id' => release_id } },
+          {
+            '$addFields' => {
+              'root' => { '$arrayElemAt' => ['$document_path', 0] }
+            }
+          },
+          {
+            '$group' => {
+              '_id' => '$root.type',
+              'count' => { '$sum' => 1 }
+            }
+          },
+          { '$sort' => { '_id' => 1 } }
+        ]).to_a
+      end
 
       # Finds changeset by whether the passed document is in the document
       # path of the changeset. Useful for showing embedded changes in the

data/app/models/workarea/search/admin.rb

@@ -38,7 +38,7 @@ module Workarea
         aggregation = search(query)['aggregations']['grouped_by_type']['type']
         aggregation['buckets']
           .reduce([]) { |m, b| m + b['top']['hits']['hits'] }
-          .sort_by { |r| [r['_source']['jump_to_position'], r['_score']] }
+          .sort_by { |r| [r['_source']['jump_to_position'] || 999, r['_score'] || 0] }
           .map do |result|
             {
               label: result['_source']['jump_to_text'],
@@ -51,10 +51,14 @@ module Workarea
       end
 
       def self.for(model)
+        find_for_model(model)
+      rescue NameError
+        find_for_model(model._root) rescue nil
+      end
+
+      def self.find_for_model(model)
         subclass = model.model_name.singular_route_key.camelize
         "Workarea::Search::Admin::#{subclass}".constantize.new(model)
-      rescue NameError
-        nil
       end
 
       # Allows subclass instances to specify whether they should be included in

data/app/models/workarea/search/admin/releasable.rb

@@ -24,7 +24,9 @@ module Workarea
         end
 
         def model_changesets
-          model.changesets.any_in(release_id: upcoming_release_ids)
+          Workarea::Release::Changeset
+            .by_document_path(model)
+            .any_in(release_id: upcoming_release_ids)
         end
 
         def content_changesets

data/app/models/workarea/search/admin/search_customization.rb

@@ -0,0 +1,25 @@
+module Workarea
+  module Search
+    class Admin
+      class SearchCustomization < Search::Admin
+        include Admin::Releasable
+
+        def type
+          'search_customization'
+        end
+
+        def search_text
+          model.name
+        end
+
+        def jump_to_text
+          "#{model.id} - #{model.name}"
+        end
+
+        def jump_to_position
+          99
+        end
+      end
+    end
+  end
+end

data/app/workers/workarea/build_release_undo_changesets.rb

@@ -0,0 +1,23 @@
+module Workarea
+  class BuildReleaseUndoChangesets
+    include Sidekiq::Worker
+
+    def perform(undo_release_id, release_id)
+      release = Release.find(release_id)
+      undo_release = Release.find(undo_release_id)
+
+      existing_changesets = undo_release.changesets.to_a
+      matching_changeset = ->(changeset, existing_changesets) do
+        existing_changesets.any? do |cs|
+          changeset.releasable_type == cs.releasable_type &&
+          changeset.releasable_id == cs.releasable_id
+        end
+      end
+
+      release.changesets.each_by(500) do |changeset|
+        next if matching_changeset.call(changeset, existing_changesets)
+        changeset.build_undo(release: undo_release).save!
+      end
+    end
+  end
+end

data/app/workers/workarea/index_admin_search.rb

@@ -9,7 +9,7 @@ module Workarea
       query_cache: true,
       enqueue_on: {
         ApplicationDocument => [:save, :touch, :destroy],
-        with: -> { [self.class.name, id] },
+        with: -> { IndexAdminSearch.job_arguments(self) },
         ignore_if: -> { !IndexAdminSearch.should_enqueue?(self) }
       }
     )
@@ -19,6 +19,11 @@ module Workarea
       search_model.present? && search_model.should_be_indexed?
     end
 
+    def self.job_arguments(model)
+      search_model = Search::Admin.for(model)
+      [search_model.model.class.name, search_model.model.id]
+    end
+
     def self.perform(model)
       search_model = Search::Admin.for(model)
       return false if search_model.blank?

data/config/initializers/00_configuration.rb

@@ -60,6 +60,7 @@ Workarea::Configuration.define_fields do
     field 'Shipping Dimensions',
       type: :array,
       default: [1, 1, 1],
+      values_type: :integer,
       description: %(
         Default package dimensions to use for calculating shipping costs.
         It's recommended to set these to your average or standard box size when

data/lib/workarea/configuration/administrable/field.rb

@@ -32,7 +32,7 @@ module Workarea
         end
 
         def values_type_class
-          return unless type == :hash
+          return unless type.in?(%i(hash array))
 
           values_type = options.values_type || :string
           Workarea.config.configurable_field_types[values_type]&.constantize

data/lib/workarea/configuration/localized_active_fields.rb

@@ -14,7 +14,7 @@ module Workarea
         return if Workarea.config.localized_active_fields
 
         ::Mongoid.models.each do |klass|
-          if klass < Releasable
+          if klass < Releasable && klass.localized_fields['active'].present?
             klass.localized_fields.delete('active')
             klass.field(:active, type: Boolean, default: true, localize: false)
             klass.index(active: 1)

data/lib/workarea/tasks/services.rb

@@ -4,7 +4,7 @@ module Workarea
       extend self
 
       def assert_docker_compose_installed!
-        unless system('docker-compose -v > /dev/null 2>&1')
+        unless system('docker-compose --version > /dev/null 2>&1')
           STDERR.puts <<~eos
   **************************************************
   ⛔️ ERROR: workarea:services tasks depend on Docker Compose being installed. \

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 22
+    PATCH = 27
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

data/test/lib/workarea/configuration/administrable/field_test.rb

@@ -68,6 +68,14 @@ module Workarea
           )
 
           assert_equal(Integer, field.values_type_class)
+
+          field = Field.new(
+            'Bar',
+            type: :array,
+            values_type: :integer
+          )
+
+          assert_equal(Integer, field.values_type_class)
         end
 
         def test_overridden?

data/test/models/workarea/configuration/params_test.rb

@@ -11,6 +11,7 @@ module Workarea
           field 'baz', type: :string, allow_blank: true
 
           field 'foo_hash', type: :hash, values_type: :integer
+          field 'foo_array', type: :array, values_type: :integer
           field 'bar_array', type: :array
           field 'baz_duration', type: :duration
         end
@@ -20,6 +21,7 @@ module Workarea
           bar: nil,
           baz: '',
           foo_hash: ['one', '1', 'two', '', '', ''],
+          foo_array: '1,2,3',
           bar_array: 'one, two, three',
           baz_duration: %w(20 minutes)
         }
@@ -29,6 +31,7 @@ module Workarea
         assert_equal('test', result[:bar])
         assert_equal('', result[:baz])
         assert_equal({ 'one' => 1 }, result[:foo_hash])
+        assert_equal([1, 2, 3], result[:foo_array])
         assert_equal(%w(one two three), result[:bar_array])
         assert_equal(20.minutes, result[:baz_duration])
       end

data/test/models/workarea/releasable_active_test.rb

@@ -35,6 +35,14 @@ module Workarea
       @release = create_release
     end
 
+    def active?(changeset)
+      if Workarea.config.localized_active_fields
+        changeset['active'][I18n.locale.to_s]
+      else
+        changeset['active']
+      end
+    end
+
     def test_save_can_schedule_activation
       model = Foo.create!(
         name: 'Test',
@@ -48,9 +56,9 @@ module Workarea
       assert_equal(1, model.changesets.length)
       assert_equal(@release.id, model.changesets.first.release_id)
       assert_equal(1, model.changesets.first.changeset.size)
-      assert(model.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(model.changesets.first.changeset))
       assert_equal(1, model.changesets.first.original.size)
-      refute(model.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(model.changesets.first.original))
     end
 
     def test_save_can_schedule_activation_for_an_embedded_document
@@ -74,17 +82,17 @@ module Workarea
       assert_equal(1, embedded_1.changesets.length)
       assert_equal(@release.id, embedded_1.changesets.first.release_id)
       assert_equal(1, embedded_1.changesets.first.changeset.size)
-      assert(embedded_1.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(embedded_1.changesets.first.changeset))
       assert_equal(1, embedded_1.changesets.first.original.size)
-      refute(embedded_1.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(embedded_1.changesets.first.original))
 
       refute(embedded_2.active)
       assert_equal(1, embedded_2.changesets.length)
       assert_equal(@release.id, embedded_2.changesets.first.release_id)
       assert_equal(1, embedded_2.changesets.first.changeset.size)
-      assert(embedded_2.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(embedded_2.changesets.first.changeset))
       assert_equal(1, embedded_2.changesets.first.original.size)
-      refute(embedded_2.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(embedded_2.changesets.first.original))
     end
 
     def test_creating_and_activating_embedded
@@ -104,9 +112,9 @@ module Workarea
       assert_equal(1, embedded.changesets.length)
       assert_equal(@release.id, embedded.changesets.first.release_id)
       assert_equal(1, embedded.changesets.first.changeset.size)
-      assert(embedded.changesets.first.changeset['active'][I18n.locale.to_s])
+      assert(active?(embedded.changesets.first.changeset))
       assert_equal(1, embedded.changesets.first.original.size)
-      refute(embedded.changesets.first.original['active'][I18n.locale.to_s])
+      refute(active?(embedded.changesets.first.original))
       assert(embedded.changesets.first.document_path.present?)
     end
   end

data/test/models/workarea/release/changeset_test.rb

@@ -3,6 +3,23 @@ require 'test_helper'
 module Workarea
   class Release
     class ChangesetTest < TestCase
+      def test_summary
+        release = create_release
+        product_one = create_product(id: 'PROD1')
+        product_two = create_product(id: 'PROD2')
+        page = create_page
+
+        release.as_current do
+          product_one.variants.first.update!(details: { 'Color' => 'Orange' })
+          product_two.update!(name: 'Test Product Changed')
+          page.update!(name: 'Test Page Changed')
+        end
+
+        summary = Changeset.summary(release.id)
+        assert_includes(summary, { '_id' => 'Workarea::Catalog::Product', 'count' => 2 })
+        assert_includes(summary, { '_id' => 'Workarea::Content::Page', 'count' => 1 })
+      end
+
       def test_build_undo
         releasable = create_page(name: 'Foo')
         release = create_release

data/test/models/workarea/search/admin/releasable_test.rb

@@ -28,6 +28,20 @@ module Workarea
           assert_includes(search_model.facets[:upcoming_changes], release_two.id)
           refute_includes(search_model.facets[:upcoming_changes], release_three.id)
         end
+
+        def test_upcoming_changes
+          release_one = create_release
+          release_two = create_release
+
+          product = create_product
+
+          release_one.as_current { product.update!(name: 'Changed Name') }
+          release_two.as_current { product.variants.first.update!(name: 'Changed Name') }
+
+          search_model = Foo.new(product)
+          assert_includes(search_model.facets[:upcoming_changes], release_one.id)
+          assert_includes(search_model.facets[:upcoming_changes], release_two.id)
+        end
       end
     end
   end

data/test/workers/workarea/build_release_undo_changesets_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Workarea
+  class BuildReleaseUndoChangesetsTest < TestCase
+    def test_perform
+      releasable_one = create_page(name: 'Foo')
+      releasable_two = create_page(name: 'Bar')
+      release = create_release
+
+      release.as_current do
+        releasable_one.update!(name: 'Changed Foo')
+        releasable_two.update!(name: 'Changed Bar')
+      end
+
+      undo_release = release.build_undo.tap(&:save!)
+      release.changesets.first.build_undo(release: undo_release).save!
+
+      BuildReleaseUndoChangesets.new.perform(undo_release.id, release.id)
+
+      undo_release.reload
+      assert_equal(2, undo_release.changesets.count)
+      assert_includes(undo_release.changesets.map(&:releasable), releasable_one)
+      assert_includes(undo_release.changesets.map(&:releasable), releasable_two)
+    end
+  end
+end

data/test/workers/workarea/index_admin_search_test.rb

@@ -6,5 +6,26 @@ module Workarea
       refute(IndexAdminSearch.should_enqueue?(create_order))
       assert(IndexAdminSearch.should_enqueue?(create_placed_order))
     end
+
+    def test_enqueuing_embedded_documents
+      content = create_content
+
+      Sidekiq::Testing.fake!
+      IndexAdminSearch.drain
+      Sidekiq::Callbacks.async(IndexAdminSearch)
+      Sidekiq::Callbacks.enable(IndexAdminSearch)
+
+      assert_difference 'IndexAdminSearch.jobs.size', 1 do
+        content.blocks.create!(type: :html)
+      end
+
+      args = IndexAdminSearch.jobs.first['args']
+      assert_equal(Content.name, args.first)
+      assert_equal(content.id.to_s, args.second)
+
+    ensure
+      IndexAdminSearch.drain
+      Sidekiq::Testing.inline!
+    end
   end
 end

data/workarea-core.gemspec

@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n-js', '~> 3.2.1'
   s.add_dependency 'local_time', '~> 1.0.3'
   s.add_dependency 'lodash-rails', '~> 4.17.4'
-  s.add_dependency 'jquery-rails', '~> 4.3.1'
+  s.add_dependency 'jquery-rails', '~> 4.4.0'
   s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
   s.add_dependency 'tooltipster-rails', '~> 4.1.2'
   s.add_dependency 'chart-js-rails', '~> 0.0.9' # TODO remove v4
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'wysihtml-rails', '~> 0.6.0.beta2'
   s.add_dependency 'rack-attack', '~> 6.3.1'
   s.add_dependency 'jquery-livetype-rails', '~> 0.1.0' # TODO remove v4
-  s.add_dependency 'redcarpet', '~> 3.4.0'
+  s.add_dependency 'redcarpet', '~> 3.5.1', '>= 3.5.1'
   s.add_dependency 'jquery-unique-clone-rails', '~> 1.0.0'
   s.add_dependency 'avalanche-rails', '~> 1.2.0'
   s.add_dependency 'inline_svg', '~> 1.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.22
+  version: 3.5.27
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -646,14 +646,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -772,14 +772,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: jquery-unique-clone-rails
   requirement: !ruby/object:Gem::Requirement
@@ -910,22 +916,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -1532,6 +1538,7 @@ files:
 - app/models/workarea/search/admin/pricing_sku.rb
 - app/models/workarea/search/admin/releasable.rb
 - app/models/workarea/search/admin/release.rb
+- app/models/workarea/search/admin/search_customization.rb
 - app/models/workarea/search/admin/segment.rb
 - app/models/workarea/search/admin/user.rb
 - app/models/workarea/search/customization.rb
@@ -1749,6 +1756,7 @@ files:
 - app/view_models/workarea/shipping_carrier_view_model.rb
 - app/workers/sidekiq/callbacks.rb
 - app/workers/sidekiq/callbacks_worker.rb
+- app/workers/workarea/build_release_undo_changesets.rb
 - app/workers/workarea/bulk_index_admin.rb
 - app/workers/workarea/bulk_index_products.rb
 - app/workers/workarea/bulk_index_searches.rb
@@ -2466,6 +2474,7 @@ files:
 - test/view_models/workarea/shipping_carrier_view_model_test.rb
 - test/workarea_test.rb
 - test/workers/sidekiq/callbacks_test.rb
+- test/workers/workarea/build_release_undo_changesets_test.rb
 - test/workers/workarea/bulk_index_admin_test.rb
 - test/workers/workarea/bulk_index_products_test.rb
 - test/workers/workarea/bulk_index_searches_test.rb
@@ -2747,7 +2756,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform