workarea-core 3.4.25 → 3.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2118c9b5b0ade92acd9c13b30653e284ba0c023604b5b7772e7096ea910dde8f
-  data.tar.gz: fa1e82be47c368fe38b01d4b240684bbfc1adac6f04004aba3f2adf7752e38b5
+  metadata.gz: 565180173a33822af9ccf9869c938b7a279aa4af98d302d5eb294ae92a64ddcd
+  data.tar.gz: 7e8a3f3affcb68255b2015abbc0215b07e074d4678f4ac5e949fd790f78a8497
 SHA512:
-  metadata.gz: d7a37a60631f30c2ba201887d08e7caa7e810b3e3d4fc161958b8475b52b73a87cdc4f463ceffcde04d5a664c3799a48638e660e1f1167a0bfbd12dd9d9e6a2f
-  data.tar.gz: 8e298ac7fb22d77a5ad7f6aceecec00bb16bce30b6fd4943d020d7c2985734b49c4569bb2d10bd625fd81c8caf5c1ae9a0c9b4b89c924b1e4ab6a4ddb8718c8f
+  metadata.gz: 233b6a7ea863877f716e809c348c921155fbf868db0a462bbcc57fe540aebe0008f44dc1a58d9fface1d04deb5bc0450938c8f53941a393246e5b9fffc3373a7
+  data.tar.gz: db0b7774e57ef6c9f59e3c171c998a53400fc316500fd246ab1aadffc604bb473292edcc3371b7a06a42fa087a1bd5f0fddd50b8c974e50f55b7a48903116582

data/app/assets/javascripts/workarea/core/modules/duplicate_id.js

@@ -54,13 +54,17 @@ WORKAREA.registerModule('duplicateId', (function () {
             }).toArray();
         },
 
+        hasIdValue = function (_, element) {
+            return element.id !== '';
+        },
+
         /**
          * @method
          * @name init
          * @memberof WORKAREA.duplicateId
          */
         init = function () {
-            var $elements = $('[id]'),
+            var $elements = $('[id]').filter(hasIdValue),
                 ids = getIdValues($elements);
 
             if (_.isEmpty($elements) || noDuplicateIds(ids)) { return; }

data/app/models/workarea/release.rb

@@ -155,7 +155,8 @@ module Workarea
       self.publish_at = nil
       save!
 
-      changesets.each(&:publish!)
+      ordered_changesets.each(&:publish!)
+      touch_releasables
     end
 
     def undo!
@@ -163,7 +164,8 @@ module Workarea
       self.undone_at = Time.current
       save!
 
-      changesets.each(&:undo!)
+      ordered_changesets.each(&:undo!)
+      touch_releasables
     end
 
     def set_publish_job
@@ -193,6 +195,18 @@ module Workarea
       StatusCalculator.new(calculators, self).results
     end
 
+    # Get changesets ordered based on publish priority set by configuration.
+    #
+    # @return [Array<Workarea::Release::Changeset>]
+    #
+    def ordered_changesets
+      ordering = Workarea.config.release_changeset_ordering
+
+      changesets.sort_by do |changeset|
+        ordering[changeset.releasable_type].presence || 999
+      end
+    end
+
     private
 
     def publish_at_status
@@ -228,5 +242,15 @@ module Workarea
         errors.add(:undo_at, I18n.t('workarea.errors.messages.undo_unpublished_release'))
       end
     end
+
+    def touch_releasables
+      Sidekiq::Callbacks.disable do
+        changesets
+          .map(&:releasable_from_document_path)
+          .compact
+          .uniq
+          .each(&:touch)
+      end
+    end
   end
 end

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

@@ -100,15 +100,6 @@ module Workarea
         end
       end
 
-      private
-
-      def apply_changeset(model, changeset)
-        changeset.each do |field, new_value|
-          model.send(:attribute_will_change!, field) # required for correct dirty tracking
-          model.attributes[field] = new_value
-        end
-      end
-
       def releasable_from_document_path
         return @releasable_from_document_path if defined?(@releasable_from_document_path)
 
@@ -120,6 +111,15 @@ module Workarea
           end
       end
 
+      private
+
+      def apply_changeset(model, changeset)
+        changeset.each do |field, new_value|
+          model.send(:attribute_will_change!, field) # required for correct dirty tracking
+          model.attributes[field] = new_value
+        end
+      end
+
       def build_undo(model = releasable_from_document_path)
         self.undo = changeset.keys.inject({}) do |memo, key|
           old_value = model.attributes[key]

data/lib/workarea/configuration.rb

@@ -1268,6 +1268,21 @@ module Workarea
       # if your CSV files are failing to import with a UTF-8 encoding
       # error.
       config.csv_import_options = { encoding: 'bom|utf-8' }
+
+      # Define the priority order that releasable models' changesets get
+      # published in. Workarea::Navigation::Menu should always be last. Any
+      # model without a defined position will automatically set as 999.
+      config.release_changeset_ordering = {
+        'Workarea::Pricing::Price' => 0,
+        'Workarea::Pricing::Sku' => 1,
+        'Workarea::Catalog::Variant' => 2,
+        'Workarea::Catalog::Product' => 3,
+        'Workarea::Content::Block' => 4,
+        'Workarea::Content' => 5,
+        'Workarea::Content::Page' => 6,
+        'Workarea::Catalog::Category' => 7,
+        'Workarea::Navigation::Menu' => 1_000
+      }
     end
   end
 end

data/lib/workarea/version.rb

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

data/test/javascripts/duplicate_id_spec.js

@@ -1,4 +1,5 @@
 //= require workarea/core/modules/environment
+//= require workarea/core/modules/string
 //= require workarea/core/modules/duplicate_id
 
 (function () {
@@ -7,9 +8,14 @@
     describe('WORKAREA.duplicateId', function () {
         describe('init', function () {
             it('throws error on duplicate ids', function () {
-                this.fixtures = fixture.load('duplicate_id.html');
+                this.fixtures = fixture.load('duplicate_id_fail.html');
                 expect(WORKAREA.duplicateId.init).to.throw(Error, /foo|bar/);
             });
+
+            it('should allow for empty ID values', function () {
+                this.fixtures = fixture.load('duplicate_id_pass.html');
+                expect(WORKAREA.duplicateId.init).to.not.throw(Error);
+            });
         });
     });
 }());

data/test/javascripts/fixtures/{duplicate_id.html.haml → duplicate_id_fail.html.haml}

@@ -4,3 +4,4 @@
   #bar
   #foo
 #baz
+

data/test/javascripts/fixtures/duplicate_id_pass.html.haml

@@ -0,0 +1,2 @@
+%div{ id: '' }
+%div{ id: '' }

data/test/models/workarea/release_test.rb

@@ -204,6 +204,34 @@ module Workarea
       refute(release.valid?)
       assert_includes(release.errors.full_messages.to_sentence, I18n.t('workarea.errors.messages.undo_unpublished_release'))
     end
+
+    def test_ordered_changesets
+      release = create_release
+      [
+        { releasable_type: 'Workarea::Catalog::Category', releasable_id: '123' },
+        { releasable_type: 'Workarea::Catalog::Product', releasable_id: 'PROD1' },
+        { releasable_type: 'Workarea::Catalog::Variant', releasable_id: 'VAR1' },
+        { releasable_type: 'Workarea::Content::Page', releasable_id: 'PAGE1' },
+        { releasable_type: 'Workarea::Navigation::Menu', releasable_id: 'NAV1' },
+        { releasable_type: 'Workarea::Content', releasable_id: 'CON1' },
+        { releasable_type: 'Workarea::Search::Customization', releasable_id: 'CUS1' },
+        { releasable_type: 'Workarea::Content::Block', releasable_id: 'BLC1' }
+      ].each { |changeset| release.changesets.build(changeset) }
+
+      assert_equal(
+        %w(
+          Workarea::Catalog::Variant
+          Workarea::Catalog::Product
+          Workarea::Content::Block
+          Workarea::Content
+          Workarea::Content::Page
+          Workarea::Catalog::Category
+          Workarea::Search::Customization
+          Workarea::Navigation::Menu
+        ),
+        release.ordered_changesets.map(&:releasable_type)
+      )
+    end
   end
 
   class ReleaseJobsTest < TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.25
+  version: 3.4.26
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -882,22 +882,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
@@ -1987,7 +1987,8 @@ files:
 - test/javascripts/deletion_forms_spec.js
 - test/javascripts/duplicate_id_spec.js
 - test/javascripts/fixtures/deletion_forms.html.haml
-- test/javascripts/fixtures/duplicate_id.html.haml
+- test/javascripts/fixtures/duplicate_id_fail.html.haml
+- test/javascripts/fixtures/duplicate_id_pass.html.haml
 - test/javascripts/fixtures/form_submitting_controls.html.haml
 - test/javascripts/fixtures/reveal_password.html.haml
 - test/javascripts/fixtures/workarea_scope.html.haml
@@ -2608,7 +2609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform