avo 2.3.1.pre.1 → 2.3.1.pre.2

data/lib/avo/filters/text_filter.rb

@@ -4,10 +4,6 @@ module Avo
       class_attribute :button_label
 
       self.template = "avo/base/text_filter"
-
-      def selected_value(applied_filters)
-        applied_or_default_value
-      end
     end
   end
 end

data/lib/avo/licensing/h_q.rb

@@ -13,13 +13,62 @@ module Avo
       end
 
       def response
-        @hq_response || request
+        make_request
+      end
+
+      def fresh_response
+        make_request(fresh: true)
+      end
+
+      def payload
+        {
+          license: Avo.configuration.license,
+          license_key: Avo.configuration.license_key,
+          avo_version: Avo::VERSION,
+          rails_version: Rails::VERSION::STRING,
+          ruby_version: RUBY_VERSION,
+          environment: Rails.env,
+          ip: current_request.ip,
+          host: current_request.host,
+          port: current_request.port,
+          app_name: app_name
+        }
+      end
+
+      def avo_metadata
+        resources = App.resources
+        field_definitions = resources.map(&:get_field_definitions)
+        fields_count = field_definitions.map(&:count).sum
+        fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
+
+        field_types = {}
+        custom_fields_count = 0
+        field_definitions.each do |fields|
+          fields.each do |field|
+            field_types[field.type] ||= 0
+            field_types[field.type] += 1
+
+            custom_fields_count += 1 if field.custom?
+          end
+        end
+
+        {
+          resources_count: resources.count,
+          fields_count: fields_count,
+          fields_per_resource: fields_per_resource,
+          custom_fields_count: custom_fields_count,
+          field_types: field_types,
+          **other_metadata(:actions),
+          **other_metadata(:filters),
+          main_menu_present: Avo::App.main_menu.present?,
+          profile_menu_present: Avo::App.profile_menu.present?,
+        }
       end
 
       private
 
-      def request
-        return cached_response if has_cached_response
+      def make_request(fresh: false)
+        return cached_response if has_cached_response && !fresh
 
         begin
           perform_and_cache_request
@@ -51,13 +100,12 @@ module Avo
       def cache_response(time, response)
         response.merge!(
           expiry: time,
+          fetched_at: Time.now,
           **payload
         ).stringify_keys!
 
         @cache_store.write(CACHE_KEY, response, expires_in: time)
 
-        @hq_response = response
-
         response
       end
 
@@ -67,55 +115,12 @@ module Avo
         HTTParty.post ENDPOINT, body: payload.to_json, headers: {'Content-type': "application/json"}, timeout: REQUEST_TIMEOUT
       end
 
-      def payload
-        {
-          license: Avo.configuration.license,
-          license_key: Avo.configuration.license_key,
-          avo_version: Avo::VERSION,
-          rails_version: Rails::VERSION::STRING,
-          ruby_version: RUBY_VERSION,
-          environment: Rails.env,
-          ip: current_request.ip,
-          host: current_request.host,
-          port: current_request.port,
-          app_name: app_name
-        }
-      end
-
       def app_name
         Rails.application.class.to_s.split("::").first
       rescue
         nil
       end
 
-      def avo_metadata
-        resources = App.resources
-        field_definitions = resources.map(&:get_field_definitions)
-        fields_count = field_definitions.map(&:count).sum
-        fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
-
-        field_types = {}
-        custom_fields_count = 0
-        field_definitions.each do |fields|
-          fields.each do |field|
-            field_types[field.type] ||= 0
-            field_types[field.type] += 1
-
-            custom_fields_count += 1 if field.custom?
-          end
-        end
-
-        {
-          resources_count: resources.count,
-          fields_count: fields_count,
-          fields_per_resource: fields_per_resource,
-          custom_fields_count: custom_fields_count,
-          field_types: field_types,
-          **other_metadata(:actions),
-          **other_metadata(:filters),
-        }
-      end
-
       def other_metadata(type = :actions)
         resources = App.resources
 

data/lib/avo/licensing/license.rb

@@ -59,6 +59,14 @@ module Avo
       def lacks_with_trial(ability)
         !has_with_trial ability
       end
+
+      def name
+        if id.present?
+          id.humanize
+        else
+          self.class.to_s.split('::').last.underscore.humanize.gsub ' license', ''
+        end
+      end
     end
   end
 end

data/lib/avo/licensing/license_manager.rb

@@ -15,6 +15,10 @@ module Avo
           NullLicense.new @hq_response
         end
       end
+
+      def self.refresh_license(request)
+        self.new(Licensing::HQ.new(request).fresh_response).license
+      end
     end
   end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.3.1.pre.1"
+  VERSION = "2.3.1.pre.2" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -3,6 +3,9 @@ Avo.configure do |config|
   ## == Routing ==
   config.root_path = '/<%= options[:path] %>'
 
+  # Where should the user be redirected when he hits the `/<%= options[:path] %>` url
+  # config.home_path = nil
+
   ## == Licensing ==
   config.license = 'community' # change this to 'pro' when you add the license key
   # config.license_key = ENV['AVO_LICENSE_KEY']
@@ -26,6 +29,7 @@ Avo.configure do |config|
   #   create: 'create?',
   #   destroy: 'destroy?',
   # }
+  # config.raise_error_on_missing_policy = false
 
   ## == Localization ==
   # config.locale = 'en-US'
@@ -45,14 +49,30 @@ Avo.configure do |config|
   # config.search_debounce = 300
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
+  # config.disabled_features = []
 
 
-  # Where should the user be redirected when he hits the `/<%= options[:path] %>` url
-  # config.home_path = nil
-
   ## == Breadcrumbs ==
   # config.display_breadcrumbs = true
   # config.set_initial_breadcrumbs do
   #   add_breadcrumb "Home", '/<%= options[:path] %>'
   # end
+
+  ## == Menus ==
+  # config.main_menu = -> {
+  #   section "Dashboards", icon: "dashboards" do
+  #     all_dashboards
+  #   end
+
+  #   section "Resources", icon: "resources" do
+  #     all_resources
+  #   end
+
+  #   section "Tools", icon: "tools" do
+  #     all_tools
+  #   end
+  # }
+  # config.profile_menu = -> {
+  #   link "Profile", path: "/<%= options[:path] %>/profile", icon: "user-circle"
+  # }
 end

data/public/avo-assets/avo.css

@@ -6280,6 +6280,14 @@ progress[value]::-moz-progress-bar{
   z-index:60
 }
 
+.col-span-1{
+  grid-column:span 1 / span 1
+}
+
+.col-span-2{
+  grid-column:span 2 / span 2
+}
+
 .col-span-full{
   grid-column:1 / -1
 }
@@ -7476,6 +7484,11 @@ progress[value]::-moz-progress-bar{
   line-height:1
 }
 
+.text-xl{
+  font-size:1.25rem;
+  line-height:1.75rem
+}
+
 .text-2xl{
   font-size:1.5rem;
   line-height:2rem
@@ -7669,6 +7682,11 @@ progress[value]::-moz-progress-bar{
   color:rgb(30 41 59 / var(--tw-text-opacity))
 }
 
+.text-red-600{
+  --tw-text-opacity:1;
+  color:rgb(220 38 38 / var(--tw-text-opacity))
+}
+
 .text-gray-300{
   --tw-text-opacity:1;
   color:rgb(183 187 194 / var(--tw-text-opacity))
@@ -7684,11 +7702,6 @@ progress[value]::-moz-progress-bar{
   color:rgb(0 0 0 / var(--tw-text-opacity))
 }
 
-.text-red-600{
-  --tw-text-opacity:1;
-  color:rgb(220 38 38 / var(--tw-text-opacity))
-}
-
 .text-slate-600{
   --tw-text-opacity:1;
   color:rgb(71 85 105 / var(--tw-text-opacity))