eco-helpers 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b034981dcaa5e5ecfb1778df6fed175e4631d1244372c475bd5049e8e97c67
-  data.tar.gz: ca64274315a6da975781f3d8198b3a58956e9f665a674392ba03090feb284488
+  metadata.gz: 3c2d5e728987bee135ac2297b0a84858dfb14eab79b3decebc59ced1a74ccc4a
+  data.tar.gz: b906c449d80dbc1440c1b7e7d91565bad53409167cae3c07b0788870f842cf5e
 SHA512:
-  metadata.gz: 33d6ba24ecab02c3bb10d11577ed067b7eab05e4c1fa0af17c72405cb16fd135b253a0414d33a14821b0684129e921eee0cb65eec8ac88558e3931c5d3bbcb8c
-  data.tar.gz: db51965c0d7b2a607a3cd6a1fbbdac48430be4804367d9746d448141c5fe00e04e835c202e696b42bc68e6c153b511f45c3a11b38ee7c6c1701fbb46d3cf9f23
+  metadata.gz: e7a9781490f01e1d9ffafdec19179d492d760c9dca676e2e6f2771b61a8f422d5c9f481bb03c71563c91df97b72f89cee0e8aa664be42dcf1dd5d99576177add
+  data.tar.gz: 44eed6e779b8ffdfdc1bea5913090713cc15dba649b7c2eddc9f333a8be67f92afa1ec6e1d06b0c31bcf2b29d062b92cac26c7c53b07404e50d089ae56698202

data/CHANGELOG.md

@@ -1,12 +1,34 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.4.3] - 2023-03-xx
+## [2.4.5] - 2023-03-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.4.4] - 2023-03-29
+
+### Added
+  - `Eco::API:Organization::TagTree`
+    - Added **methods** `#each` and `#all_nodes` allow to loop through all nodes
+    - Added `parent` to refer to the parent node.
+
+### Changed
+  - `Eco::API:Organization::TagTree` made **Enumerable**
+
+### Fixed
+  - `Eco:API::Session#live_tree` pass `enviro`
+  - `Eco::API::UseCases::OozeSamples::RegisterUpdateCase`
+    - Fix typo on error message.
+
+## [2.4.3] - 2023-03-23
+
+### Fixed
+  - `Eco::API::MicroCases#take_email_from_account` it was failing at the very (when restoring the original account)
+    - Comes from back-end issue. Adding account with preferences.kiosk_enabled would return:
+    - `{"errors"=>["account > preferences > kiosk_enabled is an unknown field"]}`
+
 ## [2.4.2] - 2023-03-17
 
 ### Fixed

data/lib/eco/api/microcases/take_email_from_account.rb

@@ -36,27 +36,33 @@ module Eco
           return false if dest_email.to_s.strip.empty?
         end
 
-        account_json  = JSON.parse(account.to_json)
+        account_json  = _take_email_account_json(account)
         person.email = account_email
 
         if success = _take_email_remove_account!(person, context: context)
           if success = _take_email_acquire_account!(person, target_email, account: {}, context: context)
             if success = _take_email_email_free_up!(person, dest_email: dest_email, context: context)
               if success = _take_email_remove_account!(person, context: context)
+                # Bring back the original account
                 if success = _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+                  success = true
                   person.email = target_email
                 end
               end
             else # free up target email
               # restore
-              if _take_email_remove_account!(person, context: context)
-                _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+              reverted = false
+              if reverted ||= _take_email_remove_account!(person, context: context)
+                reverted ||= _take_email_acquire_account!(person, account_email, account: account_json, context: context)
               end
+              puts "Could not revert back to the original account #{person.identify}" unless reverted
               success = false
             end
           else # aquire other account
             # restore
-            _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+            unless _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+              puts "Could not bring back the original account we want to update the email to '#{target_email}' #{person.identify}"
+            end
             success = false
           end
         end
@@ -65,6 +71,21 @@ module Eco
 
       private
 
+      def _take_email_account_json(account)
+         JSON.parse(account.to_json).tap do |hash|
+           hash.delete("user_id")
+           hash.delete("permissions_merged")
+           hash.delete("permissions_preset")
+           hash.delete("prefilter")
+           if pref = hash["preferences"]
+             hash["preferences"] = pref.reject do |attr, value|
+               attr.start_with?("kiosk")
+             end
+           end
+         end
+      end
+
+      # Bring the account of the `target_email` taken, so we can change the email of this account
       def _take_email_acquire_account!(person, target_email, account: {}, context: "Session")
         person.account = account
         person.account.send_invites = false
@@ -72,6 +93,7 @@ module Eco
         micro.person_update!(person, reason: "bring account with email '#{target_email}'", context: context)
       end
 
+      # Free up the email (`target_email`) of the account that has it taken to `dest_email`
       def _take_email_email_free_up!(person, dest_email:, target_email: nil, context: "Session")
         target_email ||= person.email
         person.email   = dest_email.is_a?(Proc)? dest_email.call(target_email) : dest_email
@@ -83,7 +105,6 @@ module Eco
         person.account = nil
         micro.person_update!(person, reason: "remove account", context: context)
       end
-
     end
   end
 end

data/lib/eco/api/organization/tag_tree.rb

@@ -7,10 +7,13 @@ module Eco
         alias_method :tag, :id
         attr_accessor :name
 
+        attr_reader :parent
         attr_reader :nodes, :children_count
         attr_reader :depth, :path
         attr_reader :enviro
 
+        include Enumerable
+
         # @example Node format:
         #     {"tag": "NODE NAME", "nodes": subtree}
         # @example Tree/subtree format:
@@ -21,8 +24,9 @@ module Eco
         #    ]}]
         #    tree = TagTree.new(tree.to_json)
         # @param tagtree [String] representation of the tagtree in json.
-        def initialize(tagtree = [], name: nil, id: nil, depth: -1, path: [], enviro: nil)
-          @depth = depth
+        def initialize(tagtree = [], name: nil, id: nil, depth: -1, path: [], parent: nil, enviro: nil)
+          @depth  = depth
+          @parent = parent
 
           case tagtree
           when String
@@ -48,7 +52,7 @@ module Eco
           @path.push(@id) unless top?
 
           @nodes = @row_nodes.map do |cnode|
-            TagTree.new(cnode, depth: depth + 1, path: @path.dup, enviro: @enviro)
+            TagTree.new(cnode, depth: depth + 1, path: @path.dup, parent: self, enviro: @enviro)
           end
 
           init_hashes
@@ -59,6 +63,27 @@ module Eco
           self.class.new(as_json)
         end
 
+        # Iterate through all the nodes of this tree
+        # @yield [node] do some stuff with one of the nodes of the tree
+        # @yieldparam node [Eco::API::Organization::TagTree] a node of the tree
+        # @return [Enumerable<Eco::API::Organization::TagTree>]
+        def each(&block)
+          return to_enum(:each) unless block
+          all_nodes.each(&block)
+        end
+
+        # All actual nodes of this tree
+        # @note order is that of the parent to child relationships
+        # @return [Array[]]
+        def all_nodes(&block)
+          [].tap do |all_nodes|
+            all_nodes.push(self) unless top?
+            nodes.each do |node|
+              all_nodes.concat(node.all_nodes)
+            end
+          end
+        end
+
         # @return [Array] with the differences
         def diff(tagtree, differences: {}, level: 0, **options)
           require 'hashdiff'

data/lib/eco/api/session.rb

@@ -46,7 +46,7 @@ module Eco
 
       # @see Eco::API::Session::Config#live_tree
       def live_tree
-        config.live_tree
+        config.live_tree(enviro: enviro)
       end
 
       # @see Eco::API::Session::Config#schemas

data/lib/eco/api/usecases/ooze_samples/register_update_case.rb

@@ -109,7 +109,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
           if dirty?(pending)
             msg  = "Inconsistent search results. "
             msg << "Launching update on '#{object_reference(pending)}' to be able to queue it back"
-            console.warn msg
+            logger.warn msg
             update_ooze(pending)
           end
         end
@@ -118,7 +118,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
           yield(ooz)
         else
           @non_retrieved_oozes += 1
-          console.warn "Could not get page #{page_result.id}"
+          logger.warn "Could not get page #{page_result.id}"
         end
       end
       update_oozes

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.4.2"
+  VERSION = "2.4.4"
 end

metadata

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