forest_liana 9.2.3 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcdaf1b17397f1c1ec06fdc9acca03b9ea8767955d3b566bfa9362726a3c6f88
-  data.tar.gz: d62c3053fe0a09caeef71c860552355ce2a39f7342ab023112264f89de186fc3
+  metadata.gz: 6e664c793d4ef91240c0b05cb55f708326f7dd3199cb92de39706ce0e01bef24
+  data.tar.gz: 64d6339a42a13cbe56cee058407c10ad4fd34fa886cec15176684f4ca4622d40
 SHA512:
-  metadata.gz: b67b71e1c252e8f8ca699c409e53afbfe65e6903627d51f7a0013556af46df0117220c55a7c1fe57a54b06877c57df17504ac3dc73ba309d949f354f4bbd4938
-  data.tar.gz: bcac101a28c5164488d3a320073cd64e461b8418acc339deeedf232cc5239f046804882e73c6511e4ed6c1b013cffb6036410677b7743754e7d1e4b9767276e4
+  metadata.gz: be5510da6372cdf5e96e6e96e61b7106bfec0ec79781513349325fcdb1c1e2b16565dcbc3ac57127bbaae2c832a58decbdaaaf9594d670b70c24eaf2e7b8abb2
+  data.tar.gz: 50ab4b2ed50028f210ee4a4bcb16822fca77d6765b5bfdb31372b9a15d931a79d5ff80c1d4e656aff348e9c579b08f4dc83fcbd557175404ea34dc3e7f7afb4c

data/app/services/forest_liana/ability/permission.rb

@@ -97,7 +97,7 @@ module ForestLiana
         Rails.cache.fetch('forest.stats', expires_in: TTL) do
           stat_hash = []
           get_permissions('/liana/v4/permissions/renderings/' + rendering_id)['stats'].each do |stat|
-            stat_hash << "#{stat['type']}:#{Digest::SHA1.hexdigest(stat.sort.to_h.to_s)}"
+            stat_hash << "#{stat['type']}:#{Digest::SHA1.hexdigest(stat.deep_sort.to_s)}"
           end
 
           stat_hash

data/app/services/forest_liana/search_query_builder.rb

@@ -160,12 +160,9 @@ module ForestLiana
     end
 
     def sort_query
-      column = nil
-      order = 'DESC'
-
       if @params[:sort]
         @params[:sort].split(',').each do |field|
-          order_detected = detect_sort_order(@params[:sort])
+          order_detected = detect_sort_order(field)
           order = order_detected.upcase
           field.slice!(0) if order_detected == :desc
 
@@ -175,14 +172,12 @@ module ForestLiana
           else
             column = field
           end
+
+          @records = @records.order(Arel.sql("#{column} #{order}"))
         end
       end
 
-      if column
-        @records = @records.order(Arel.sql("#{column} #{order}"))
-      else
-        @records
-      end
+      @records
     end
 
     def detect_reference(param)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.2.3"
+  VERSION = "9.3.1"
 end

data/spec/requests/stats_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 require 'json'
 
 describe "Stats", type: :request do
-  let(:rendering_id) { 13 }
+  let(:rendering_id) { '13' }
   let(:scopes) { {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}} }
   let(:schema) {
     [
@@ -23,7 +23,7 @@ describe "Stats", type: :request do
       team: 'Operations',
       rendering_id: rendering_id,
       exp: Time.now.to_i + 2.weeks.to_i,
-      permission_level: 'admin'
+      permission_level: 'user'
     }, ForestLiana.auth_secret, 'HS256')
   }
 
@@ -38,7 +38,7 @@ describe "Stats", type: :request do
   before do
     Rails.cache.write('forest.users', {'1' => { 'id' => 1, 'roleId' => 1, 'rendering_id' => '1' }})
     Rails.cache.write('forest.has_permission', true)
-    allow_any_instance_of(ForestLiana::Ability::Fetch)
+    allow_any_instance_of(ForestLiana::Ability::Permission)
       .to receive(:get_permissions)
         .and_return(
           {
@@ -50,6 +50,31 @@ describe "Stats", type: :request do
                 "aggregateFieldName" => nil,
                 "sourceCollectionName" => "Owner"
               },
+              {
+                "type" => "Objective",
+                "sourceCollectionName" => "Owner",
+                "aggregateFieldName" => nil,
+                "aggregator" => "Count",
+                "objective" => 200,
+                "filter" => nil,
+              },
+              {
+                "type" => "Pie",
+                "sourceCollectionName" => "Owner",
+                "aggregateFieldName" => nil,
+                "groupByFieldName" => "id",
+                "aggregator" => "Count",
+                "filter" => nil,
+              },
+              {
+                "type" => "Line",
+                "sourceCollectionName" => "Owner",
+                "aggregateFieldName" => nil,
+                "groupByFieldName" => "hired_at",
+                "aggregator" => "Count",
+                "timeRange" => "Week",
+                "filter" => nil,
+              },
               {
                 "type"  => "Value",
                 "query" => "SELECT COUNT(*) AS value FROM products;"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.2.3
+  version: 9.3.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails