forest_admin_agent 1.0.0.pre.beta.45 → 1.0.0.pre.beta.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d61e45333bea735ec3c47b19b761f8081bc6bf3cb7e78f2df61ed43eecf4ce9
-  data.tar.gz: 833560b6f78019008a1f7c8dd8a640b65cb1870ae7f341a10d22986d244bc300
+  metadata.gz: 902dc1f47c4e03c5c095ed68b4ba425fe9bc4254cadf75f9f8f6a2ecbe2518c9
+  data.tar.gz: f005862d1078eddd5564089e7d6c0aefa6a1a8396b66d7dc9eb0f36f80bce5a2
 SHA512:
-  metadata.gz: 00a941a6b5c3417233a5a141451d145282e4a1dd6765dd782742d886ed8f10eadea02cdcb92285f614f6c04deb6b1359a43ba2ae2f286f110bde6f8ebf717d04
-  data.tar.gz: 07db816bfdc85d3228f11515a4e9ba56be78425b6cba049176f837c72e3555cc325cc5481409ef302eadc81781efcad44d9648a1dcc7e363df39ab2cd3eef12e
+  metadata.gz: 484f457793fd4ac6b07419d243584293a9532b1d8d2dbb1ed04b0eb5258bf1355bfcdb3b5bbbd0bc68bb444e12792e071f1061ac037d2f9cbfbe39a74f7adf8d
+  data.tar.gz: 789321428f95b0f2e183be61888c890ce9b9b2feef8a7928658d16d87db3a529ed1a54936ca13b73a4bf4d4fb076bc70c615ee13fe12003806bc984b1d55ad3f

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.45"
+        LIANA_VERSION = "1.0.0-beta.46"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.45"
+  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.45
+  version: 1.0.0.pre.beta.46
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport