RubyGems - avo - Versions diffs - 1.3.0.pre.1 → 1.3.4 - Mend

avo 1.3.0.pre.1 → 1.3.4

Potentially problematic release.

This version of avo might be problematic. Click here for more details.

Files changed (88) hide show

data/app/views/avo/home/index.html.erb CHANGED Viewed

@@ -27,7 +27,7 @@
               <li><span class="mr-2">👍</span> Grid view</li>
               <li><span class="mr-2">👍</span> Authorization</li>
               <li><span class="mr-2">👍</span> Localization</li>
-              <li><span class="mr-2">⏳</span> Custom tools</li>
+              <li><span class="mr-2">👍</span> Custom tools</li>
               <li><span class="mr-2">⏳</span> Custom fields</li>
               <li><span class="mr-2">⏳</span> Search</li>
               <li><span class="mr-2">🕐</span> Dashboards</li>

data/app/views/avo/partials/_custom_tools_alert.html.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
+  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-green-700 text-white py-2 px-4 text-sm block items-center flex leading-tight">
+    <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0" %> Warning. Your license is invalid or doesn't support custom tools. This page will not be visible in a production environment.
+  </a>
+</div>

data/app/views/avo/partials/_head.html.erb ADDED Viewed

File without changes

data/app/views/avo/partials/_logo.html.erb CHANGED Viewed

	@@ -1 +1 @@
1	- <%= ~~image_pack_tag~~ 'logo.png', class: 'h-full', title: 'Avo' %>
1	+ <%= image_manifest_tag 'logo.png', class: 'h-full', title: 'Avo' %>

data/app/views/avo/sidebar/_license_warning.html.erb CHANGED Viewed

@@ -1,12 +1,8 @@
 <div class="w-10/12 ml-1/12 inset-auto bottom-0 z-50 my-4 opacity-50 hover:opacity-100 transition-opacity duration-150 group">
-  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-teal-700 text-white py-2 px-4 text-sm block group-hover:pt-4">
-    <% if icon.present? %>
-      <div class="h-6 inline mr-1 text-bold" :is="iconElement" v-if="icon">
-        <%= title %>
-      </div>
-    <% end %>
+  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-green-700 text-white py-2 px-4 text-sm block group-hover:pt-4">
+    <%= svg 'exclamation', class: 'h-6 inline mr-1 text-bold' %> <%= title %>
     <div class="group-hover:block hidden py-2">
-      <%= message %> <arrow-circle-right-icon class="h-6 inline float-right"></arrow-circle-right-icon>
+      <%= message %> <%= svg 'arrow-circle-right', class: "h-6 inline float-right" %>
     </div>
   </a>
 </div>

data/app/views/avo/sidebar/_sidebar.html.erb CHANGED Viewed

@@ -6,7 +6,8 @@
     <div class="flex-1 flex flex-col justify-between">
       <div class="tools py-4">
-        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: '/avo', active: :exclusive if Rails.env.development? %>
+        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: Avo.configuration.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
         <div class="w-full">

data/app/views/layouts/avo/application.html.erb CHANGED Viewed

@@ -7,9 +7,10 @@
   <%= csp_meta_tag %>
   <%= render partial: 'avo/partials/javascript' %>
+  <%= render partial: 'avo/partials/head' %>
-  <%= javascript_pack_tag 'application' %>
-  <%= stylesheet_pack_tag 'application', media: 'all' %>
+  <%= javascript_manifest_tag 'application' %>
+  <%= stylesheet_manifest_tag 'application', media: 'all' %>
 </head>
 <body class="bg-blue-gray-200">
@@ -30,8 +31,12 @@
       </div>
       <div class="content p-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
-        <%= yield %>
-        <%= render partial: "avo/partials/footer" %>
+        <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>
+        <div class="flex flex-1 flex-col justify-between items-stretch">
+          <%= yield %>
+          <%= render partial: "avo/partials/footer" %>
+        </div>
       </div>
     </div>
   </div>

data/avo.gemspec CHANGED Viewed

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails", ">= 6.0"
   spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk"
-  spec.add_dependency "webpacker"
   spec.add_dependency "countries"
   spec.add_dependency "pundit"
   spec.add_dependency "httparty"
@@ -45,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
+  spec.add_dependency "manifester"
 end

data/bin/helpers.rb CHANGED Viewed

@@ -23,7 +23,7 @@ end
 def ask(question:, valid_answers: [])
   puts "\n#{question} (#{valid_answers.join('/')})"
-  input = gets.downcase.chomp
+  input = gets.chomp
   while !valid_answers.include?(input)
     puts 'Invalid input, please try again.'

data/bin/spring CHANGED Viewed

@@ -4,14 +4,14 @@
 # It gets overwritten when you run the `spring binstub` command.
 unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
+  require "rubygems"
+  require "bundler"
   lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
+  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
   if spring
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
-    gem 'spring', spring.version
-    require 'spring/binstub'
+    gem "spring", spring.version
+    require "spring/binstub"
   end
 end

data/config/webpacker.yml CHANGED Viewed

@@ -13,7 +13,7 @@ default: &default
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  additional_paths_paths: []
+  additional_paths: []
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false

data/lib/avo.rb CHANGED Viewed

@@ -10,6 +10,10 @@ module Avo
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
+  class LicenseVerificationTemperedError < StandardError; end
+  class LicenseInvalidError < StandardError; end
   class << self
     def webpacker
       @webpacker ||= ::Webpacker::Instance.new(
@@ -17,6 +21,15 @@ module Avo
         config_path: ROOT_PATH.join("config/webpacker.yml")
       )
     end
+    def manifester
+      @manifester ||= ::Manifester::Instance.new(
+        root_path: ROOT_PATH,
+        public_output_dir: "avo-packs",
+        cache_manifest: Rails.env.production?,
+        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT || Rails.env.test?}
+      )
+    end
   end
 end

data/lib/avo/app.rb CHANGED Viewed

@@ -26,12 +26,16 @@ module Avo
         self.request = request
         self.context = context
+        self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
         # Set the current host for ActiveStorage
-        ActiveStorage::Current.host = request.base_url
+        begin
+          ActiveStorage::Current.host = request.base_url
+        rescue => exception
+          Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.host, #{exception.inspect}"
+        end
         init_resources
-        self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
       end
       def cache_store

data/lib/avo/configuration.rb CHANGED Viewed

@@ -21,6 +21,7 @@ module Avo
     attr_accessor :context
     attr_accessor :display_breadcrumbs
     attr_accessor :initial_breadcrumbs
+    attr_accessor :home_path
     def initialize
       @root_path = "/avo"
@@ -54,6 +55,7 @@ module Avo
         add_breadcrumb I18n.t("avo.home").humanize, avo.root_path
       }
       @display_breadcrumbs = true
+      @home_path = nil
     end
     def locale_tag
@@ -81,6 +83,10 @@ module Avo
     def set_initial_breadcrumbs(&block)
       @initial_breadcrumbs = block if block.present?
     end
+    def namespace
+      root_path.delete "/"
+    end
   end
   def self.configuration

data/lib/avo/fields/base_field.rb CHANGED Viewed

@@ -33,6 +33,7 @@ module Avo
       attr_accessor :meta
       attr_accessor :panel_name
       attr_accessor :link_to_resource
+      attr_accessor :options
       class_attribute :field_name_attribute
@@ -67,7 +68,8 @@ module Avo
           default: nil,
           visible: true,
           meta: {},
-          panel_name: nil
+          panel_name: nil,
+          options: {}
         }
         # Set the values in the following order

data/lib/avo/fields/key_value_field.rb CHANGED Viewed

@@ -3,11 +3,6 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
-      attr_reader :key_label
-      attr_reader :value_label
-      attr_reader :action_text
-      attr_reader :disable_adding_rows
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: "key-value-field"
@@ -38,13 +33,7 @@ module Avo
         [:"#{id}", "#{id}": {}]
       end
-      def parsed_value
-        value.to_json
-      rescue
-        {}
-      end
-      def options
+      def hydrate_field(fields, model, resource, view)
         {
           key_label: @key_label,
           value_label: @value_label,
@@ -55,18 +44,6 @@ module Avo
           disable_deleting_rows: @disable_deleting_rows
         }
       end
-      def fill_field(model, key, value)
-        begin
-          new_value = JSON.parse(value)
-        rescue
-          new_value = {}
-        end
-        model[key] = new_value
-        model
-      end
     end
   end
 end

data/lib/avo/fields/markdown_field.rb CHANGED Viewed

@@ -12,10 +12,9 @@ module Avo
         @always_show = args[:always_show].present? ? args[:always_show] : false
         @height = args[:height].present? ? args[:height].to_s : "auto"
-      end
-      def hydrate_field(fields, model, resource, view)
-        {
+        @spell_checker = args[:spell_checker].present? ? args[:spell_checker] : false
+        @options = {
+          spell_checker: @spell_checker,
           always_show: @always_show,
           height: @height
         }

data/lib/avo/licensing/h_q.rb CHANGED Viewed

@@ -3,8 +3,8 @@ module Avo
     class HQ
       attr_accessor :current_request
-      ENDPOINT = "https://avohq.io/api/v1/licenses/check" unless const_defined?(:ENDPOINT)
-      CACHE_KEY = "avo.hq.response" unless const_defined?(:CACHE_KEY)
+      ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
+      CACHE_KEY = "avo.hq.response".freeze unless const_defined?(:CACHE_KEY)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
       def initialize(current_request)
@@ -54,7 +54,7 @@ module Avo
       end
       def perform_request
-        puts "Performing request to avohq.io API to check license availability.".inspect if Rails.env.development?
+        ::Rails.logger.debug "[Avo] Performing request to avohq.io API to check license availability." if Rails.env.development?
         HTTParty.post ENDPOINT, body: payload.to_json, headers: {'Content-type': "application/json"}, timeout: REQUEST_TIMEOUT
       end

data/lib/avo/licensing/license.rb CHANGED Viewed

@@ -4,11 +4,13 @@ module Avo
       attr_accessor :id
       attr_accessor :response
       attr_accessor :valid
+      attr_accessor :payload
       def initialize(response)
         @response = response
         @id = response["id"]
         @valid = response["valid"]
+        @payload = response["payload"]
       end
       def valid?

data/lib/avo/licensing/pro_license.rb CHANGED Viewed

@@ -3,7 +3,8 @@ module Avo
     class ProLicense < License
       def abilities
         [
-          :authorization
+          :authorization,
+          :custom_tools
         ]
       end
     end

data/lib/avo/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.3.0.pre.1"
+  VERSION = "1.3.4"
 end

data/lib/generators/avo/action_generator.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module Generators
       namespace "avo:action"
       def create_resource_file
-        template "action.rb", "app/avo/actions/#{singular_name}.rb"
+        template "action.tt", "app/avo/actions/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/avo/eject_generator.rb CHANGED Viewed

@@ -12,10 +12,11 @@ module Generators
       TEMPLATES = {
         sidebar: "app/views/avo/sidebar/_sidebar.html.erb",
-        logo: "app/views/avo/partials/logo.html.erb",
-        header: "app/views/avo/partials/header.html.erb",
-        footer: "app/views/avo/partials/footer.html.erb",
-        scripts: "app/views/avo/partials/scripts.html.erb"
+        logo: "app/views/avo/partials/_logo.html.erb",
+        head: "app/views/avo/partials/_head.html.erb",
+        header: "app/views/avo/partials/_header.html.erb",
+        footer: "app/views/avo/partials/_footer.html.erb",
+        scripts: "app/views/avo/partials/_scripts.html.erb"
       }
       def handle

data/lib/generators/avo/filter_generator.rb CHANGED Viewed

@@ -13,7 +13,7 @@ module Generators
         type = "select" if options[:select]
-        template "filters/#{type}_filter.rb", "app/services/avo/filters/#{singular_name}.rb"
+        template "filters/#{type}_filter.tt", "app/services/avo/filters/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/avo/locales_generator.rb CHANGED Viewed

@@ -6,10 +6,10 @@ module Generators
       source_root File.expand_path("templates", __dir__)
       namespace "avo:locales"
-      desc "Creates an Avo initializer adds the route to the routes file."
+      desc "Add Avo locale files to your project."
       def create_files
-        template "locales/avo.en.yml", "config/locales/avo.en.yml"
+        directory File.join(__dir__, "templates", "locales"), "config/locales"
       end
     end
   end

data/lib/generators/avo/resource_generator.rb CHANGED Viewed

@@ -10,9 +10,6 @@ module Generators
       def create
         template "resource/resource.tt", "app/avo/resources/#{resource_name}.rb"
         template "resource/controller.tt", "app/controllers/avo/#{controller_name}.rb"
-        # Show a warning if the model doesn't exists
-        say("We couldn't find the #{class_name} model in your codebase. You should have one present for Avo to display the resource.", :yellow) unless current_models.include? class_name
       end
       def resource_class
@@ -20,7 +17,7 @@ module Generators
       end
       def controller_class
-        "Avo::#{plural_name.humanize}Controller"
+        "Avo::#{class_name.camelize.pluralize}Controller"
       end
       def resource_name

data/lib/generators/avo/templates/action.tt CHANGED Viewed

@@ -1,13 +1,9 @@
-module Avo
-  module Actions
-    class <%= class_name.camelize %> < Action
-      self.name = '<%= name.underscore.humanize %>'
+class <%= class_name.camelize %> < Avo::BaseAction
+  self.name = '<%= name.underscore.humanize %>'
-      def handle(models:, fields:)
-        models.each do |model|
-          # Do something with your models.
-        end
-      end
+  def handle(models:, fields:)
+    models.each do |model|
+      # Do something with your models.
     end
   end
 end

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

@@ -29,10 +29,10 @@ Avo.configure do |config|
   # }
   ## == Localization ==
+  # config.locale = 'en-US'
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
-  # config.locale = 'en-US'
   # config.timezone = 'UTC'
   # config.currency = 'USD'
   # config.per_page = 24
@@ -43,4 +43,13 @@ Avo.configure do |config|
   # config.full_width_container = false
   # config.full_width_index_view = false
   # config.cache_resources_on_index_view = true
+  # 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
 end