eco-helpers 2.7.8 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73af9e54de9fc73f1986db49810ae91ad2a8c0153c26d40681873cc52754a923
-  data.tar.gz: eb978a976711797b852cfbf2d39f68cfc760906463753a8440e9c6f595269c51
+  metadata.gz: 41e63439f7a3d89c5e3c9e10be328b9487ecffe4dde6a83a6fd6f9a561d924a8
+  data.tar.gz: bafc6c443ce57b2611c177b00eca9aca0fd06718712511eb2b93762ff957179b
 SHA512:
-  metadata.gz: c454c5ec9ed3713e6bb4fd0e73b582343d5bc96fe6de677b63070838af87b93cb86dad96d1446ba4c6ead007587798c90d30d7c73cea601067db6acd9da32156
-  data.tar.gz: afd3bb1f221ddd4db2056a5347799f88c0ad70bbf6dbf868c1f8a231a1ee311df252db2e899f95ada3e31925b8376d74145bb55b0449aa88793d10b33dea1583
+  metadata.gz: '0094ce51df0b47838a44b679fe82a4acacfc64953edeea38ef2c51b6efeb08f0629f019751b319542dddcac5e77838786cdd1b7333b16babb0bf02ad4e197fb3'
+  data.tar.gz: ee5243547b98cdeabba4cf1fdbbd8759b0f24d1e5ea4f4e42b998569ebe0c00bf3d5139ef2c28886bfa96efe6cd7e65344245b4eb6d7c9bb0a08964d075ddd12

data/CHANGELOG.md

@@ -1,12 +1,18 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.7.9] - 2024-05-xx
+## [2.7.10] - 2024-05-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.7.9] - 2024-05-16
+
+### Fixed
+  - `Eco::Data::Locations::NodeDiff::NodesDiff#unarchive`
+    - It must include archived nodes that will receive new children
+
 ## [2.7.8] - 2024-05-16
 
 ### Added

data/lib/eco/api/usecases/graphql/helpers/location/command/diff/as_update.rb

@@ -35,8 +35,10 @@ class Eco::API::UseCases::GraphQL::Helpers::Location::Command::Diff
             h['parentId'] = after_id_update ? parent_id : parent_id_prev
           end
         else
+          return h if marked_for_unarchive?
+
           # Something is wrong (not expected to be any other category)
-          raise "Unexpected condition, please review code base"
+          raise "Please review code base, unexpected condition for #{h.pretty_inspect}"
         end
       end
     end

data/lib/eco/data/locations/node_diff/accessors.rb

@@ -20,8 +20,8 @@ class Eco::Data::Locations::NodeDiff
       def attr_expose(*attrs)
         attrs.each do |attr|
           meth  = attr.to_sym
-          methp = "#{meth}_prev".to_sym
-          methq = "#{meth}?".to_sym
+          methp = :"#{meth}_prev"
+          methq = :"#{meth}?"
 
           # current value
           define_method meth do

data/lib/eco/data/locations/node_diff/nodes_diff/selectors.rb

@@ -5,8 +5,9 @@ class Eco::Data::Locations::NodeDiff::NodesDiff
     # @note the selector method name with a question mark should exist in the `diff_result_class`
     def selector(*attrs)
       attrs.each do |attr|
-        meth  = attr.to_sym
-        methq = "#{meth}?".to_sym
+        meth = attr.to_sym
+        methq = :"#{meth}?"
+
         define_method meth do
           diffs.select(&methq)
         end

data/lib/eco/data/locations/node_diff/nodes_diff.rb

@@ -21,6 +21,7 @@ class Eco::Data::Locations::NodeDiff
     def initialize(*args, original_tree:, **kargs, &block)
       super(*args, **kargs, &block)
       @original_tree = original_tree
+      mark_implicit_unarchive!
     end
 
     def diffs
@@ -95,6 +96,14 @@ class Eco::Data::Locations::NodeDiff
       msg.compact.join("\n")
     end
 
+    alias_method :unarchive_src, :unarchive
+
+    # @note we must unarchive destination parents that will get
+    #   some children as well
+    def unarchive
+      unarchive_src | @implicit_unarchive
+    end
+
     private
 
     def when_present(list, default = nil)
@@ -103,5 +112,26 @@ class Eco::Data::Locations::NodeDiff
       return yield(count) if count&.positive?
       default
     end
+
+    def mark_implicit_unarchive!
+      @implicit_unarchive = source_results.select do |result|
+        result.archived_prev && implicit_unarchive?(result)
+      end.tap do |results|
+        results.each(&:unarchive!)
+      end
+    end
+
+    def implicit_unarchive?(result)
+      [result.node_id, result.node_id_prev].compact.any? do |id|
+        target_parent_ids.include?(id)
+      end
+    end
+
+    def target_parent_ids
+      return @target_parent_ids if instance_variable_defined?(:@target_parent_ids)
+
+      @target_parent_ids  = insert.map(&:parent_id).uniq
+      @target_parent_ids |= move.map(&:parent_id)
+    end
   end
 end

data/lib/eco/data/locations/node_diff.rb

@@ -59,8 +59,17 @@ module Eco::Data::Locations
       parent_id?
     end
 
+    def unarchive!
+      @marked_for_unarchived = true
+    end
+
+    def marked_for_unarchive?
+      @marked_for_unarchived || false
+    end
+
     # Has the `archived` property changed and it was `true`?
     def unarchive?
+      return true  if     marked_for_unarchive?
       return false if     archived
       return false unless update?
       archived?

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.8'.freeze
+  VERSION = '2.7.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.9
 platform: ruby
 authors:
 - Oscar Segura