forest_admin_agent 1.0.0.pre.beta.44 → 1.0.0.pre.beta.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ded7762b962301e5061c77a905615c8fee282138051ecaa65f50c6d22f32c332
-  data.tar.gz: 1c924f9b07890c13b48c6f6306dcacc6a1a117e1d83506d80b71660fc111f121
+  metadata.gz: 902dc1f47c4e03c5c095ed68b4ba425fe9bc4254cadf75f9f8f6a2ecbe2518c9
+  data.tar.gz: f005862d1078eddd5564089e7d6c0aefa6a1a8396b66d7dc9eb0f36f80bce5a2
 SHA512:
-  metadata.gz: 1e6b48d2d0a28fa4ab8bf127d46517f36008b64554fe3e1ee8e612b565622fdf103710aeb1b164659baaa3d486578d5d6afc3262049360fc4803243edd0411d8
-  data.tar.gz: 0e241c487a0660c1ce1e788b6eeab72881a408b3c375138081a14c5fe4c86d2a11e5544b4ed85068a3e4ff82236329acee79bcfa659621e8ca3cd363c8ff6106
+  metadata.gz: 484f457793fd4ac6b07419d243584293a9532b1d8d2dbb1ed04b0eb5258bf1355bfcdb3b5bbbd0bc68bb444e12792e071f1061ac037d2f9cbfbe39a74f7adf8d
+  data.tar.gz: 789321428f95b0f2e183be61888c890ce9b9b2feef8a7928658d16d87db3a529ed1a54936ca13b73a4bf4d4fb076bc70c615ee13fe12003806bc984b1d55ad3f

data/lib/forest_admin_agent/builder/agent_factory.rb

@@ -49,7 +49,6 @@ module ForestAdminAgent
                          @container.resolve(:schema_file_hash).get('value') == schema[:meta][:schemaFileHash]
 
         if !schema_is_know || force
-          #   Logger::log('Info', 'schema was updated, sending new version');
           client = ForestAdminAgent::Http::ForestAdminApiRequester.new
           client.post('/forest/apimaps', schema.to_json)
           schema_file_hash_cache = FileCache.new('app', @options[:cache_dir].to_s, TTL_SCHEMA)
@@ -57,9 +56,10 @@ module ForestAdminAgent
             schema[:meta][:schemaFileHash]
           end
           @container.register(:schema_file_hash, schema_file_hash_cache)
+          ForestAdminAgent::Facades::Container.logger.log('Info', 'schema was updated, sending new version')
         else
           @container.resolve(:logger)
-          # TODO:  Logger::log('Info', 'Schema was not updated since last run');
+          ForestAdminAgent::Facades::Container.logger.log('Info', 'Schema was not updated since last run')
         end
       end
 

data/lib/forest_admin_agent/services/permissions.rb

@@ -32,8 +32,7 @@ module ForestAdminAgent
 
         cache.delete(id_cache) unless cache.get(id_cache).nil?
 
-        # TODO: HANDLE LOGGER
-        # logger.debug("Invalidating #{id_cache} cache..")
+        ForestAdminAgent::Facades::Container.logger.log('Info', "Invalidating #{id_cache} cache..")
       end
 
       def can?(action, collection, allow_fetch: false)
@@ -66,13 +65,17 @@ module ForestAdminAgent
 
         # still not allowed - throw forbidden message
         unless is_allowed
-          # TODO: HANDLE LOGGER
-          # logger.debug("User #{caller.id} cannot retrieve chart on rendering #{caller.rendering_id}")
+          ForestAdminAgent::Facades::Container.logger.log(
+            'Debug',
+            "User #{caller.id} cannot retrieve chart on rendering #{caller.rendering_id}"
+          )
           raise ForbiddenError, "You don't have permission to access this collection."
         end
 
-        # TODO: HANDLE LOGGER
-        # logger.debug("User #{caller.id} can retrieve chart on rendering #{caller.rendering_id}")
+        ForestAdminAgent::Facades::Container.logger.log(
+          'Debug',
+          "User #{caller.id} can retrieve chart on rendering #{caller.rendering_id}"
+        )
 
         is_allowed
       end
@@ -93,8 +96,10 @@ module ForestAdminAgent
         )
 
         smart_action_approval.can_execute?
-        # TODO: HANDLE LOGGER
-        # logger.debug("User #{user_data[:roleId]} is #{is_allowed ? '' : 'not'} allowed to perform #{action['name']}")
+        ForestAdminAgent::Facades::Container.logger.log(
+          'Debug',
+          "User #{user_data[:roleId]} is #{is_allowed ? "" : "not"} allowed to perform #{action["name"]}"
+        )
       end
 
       def get_scope(collection)
@@ -120,8 +125,7 @@ module ForestAdminAgent
             users[user[:id].to_s] = user
           end
 
-          # TODO: HANDLE LOGGER
-          # logger.debug('Refreshing user permissions cache')
+          ForestAdminAgent::Facades::Container.logger.log('Debug', 'Refreshing user permissions cache')
 
           users
         end[user_id.to_s]
@@ -146,8 +150,7 @@ module ForestAdminAgent
             collections[name] = decode_crud_permissions(collection).merge(decode_action_permissions(collection))
           end
 
-          # TODO: HANDLE LOGGER
-          # logger.debug('Fetching environment permissions')
+          ForestAdminAgent::Facades::Container.logger.log('Debug', 'Fetching environment permissions')
 
           collections
         end
@@ -164,8 +167,10 @@ module ForestAdminAgent
             stat_hash << "#{stat[:type]}:#{array_hash(stat)}"
           end
 
-          # TODO: HANDLE LOGGER
-          # logger.debug("Loading rendering permissions for rendering #{rendering_id}")
+          ForestAdminAgent::Facades::Container.logger.log(
+            'Debug',
+            "Loading rendering permissions for rendering #{rendering_id}"
+          )
 
           stat_hash
         end

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -106,15 +106,24 @@ module ForestAdminAgent
       end
 
       def self.parse_sort(collection, args)
-        sort_string = args.dig(:params, :sort)
+        raw_sort_string = args.dig(:params, :sort)
 
-        return SortUtils::SortFactory.by_primary_keys(collection) unless sort_string
+        return SortUtils::SortFactory.by_primary_keys(collection) unless raw_sort_string
 
-        sort = Sort.new([
-                          { field: sort_string.gsub(/^-/, '').tr('.', ':'), ascending: !sort_string.start_with?('-') }
-                        ])
+        sort_list = []
+        raw_sort_string.split(',').map do |sort_string|
+          field = sort_string.tr('.', ':')
+          ascending = !sort_string.start_with?('-')
+          field = field[1..] unless ascending
+
+          sort_list.push({ field: field, ascending: ascending })
+        end
+
+        sort = Sort.new(sort_list)
 
         ForestAdminDatasourceToolkit::Validations::SortValidator.validate(collection, sort)
+
+        sort
       end
     end
   end

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "forest-rails"
 
-        LIANA_VERSION = "1.0.0-beta.44"
+        LIANA_VERSION = "1.0.0-beta.46"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)
@@ -15,7 +15,11 @@ module ForestAdminAgent
             schema = if schema_path && File.exist?(schema_path)
                        JSON.parse(File.read(schema_path), { symbolize_names: true })
                      else
-                       # TODO: Logger::log('Warn', 'The .forestadmin-schema.json file doesn\'t exist')
+                       ForestAdminAgent::Facades::Container.logger.log(
+                         'Warn',
+                         'The .forestadmin-schema.json file doesn\'t exist'
+                       )
+
                        {
                          meta: meta(Digest::SHA1.hexdigest('')),
                          collections: {}

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.44"
+  VERSION = "1.0.0-beta.46"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.44
+  version: 1.0.0.pre.beta.46
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport