avo 1.4.4.pre.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f0c2d5d6e682ac63dd8df4b1ab8abc4044d8108790ae9e99df9b045b6a300d
-  data.tar.gz: a57bd4485774a118a2856bd6507ff16e55552b62dfa1d8818c4764d93ed119dc
+  metadata.gz: 4ab528ed4c8361ffed46892c8e838897c9f834a6bba2ad4d5c2134a33381bcb0
+  data.tar.gz: 6a01552f743f231a4e1de2a81a85814b9a5e4708a22c514f54e1f48df37b9319
 SHA512:
-  metadata.gz: 67738924720441151703681c6638a773bb4ce0c666b9ff21cecf719b5dce767fa816f9a5a63776aaf298da63466a59ace314cef70cb067da89081ee7074d4d70
-  data.tar.gz: 34f5f367d6f2b5da48a481ab1f3e4e3e448d68ffba91d44a510c639e496d44de876f3b39ffdb43540aee0ca2354c7f479f47ca4957b20e6e376c8d2e7579ab01
+  metadata.gz: 2d46d15e71d47b3eaf1f698572aa9f5edb2de0a5699926ef57373bce6f45b00afded60f8cf74016a1d393cadddf3aa807ea16fe7a6e4f3812f44b04ac9ce2bb7
+  data.tar.gz: 8d62dfe3b1e41ee0a91281b848eb5a5af48738d5c85bd25c94c0167813df1a5378b3b9393d7d0778630757ccb336801382e8b59d8769b790825138699ddbff32

data/Gemfile

@@ -125,5 +125,3 @@ gem 'meta-tags'
 gem 'breadcrumbs_on_rails'
 
 gem 'manifester'
-
-gem 'ransack'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.4.4.pre.1)
+    avo (1.4.4)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -14,7 +14,6 @@ PATH
       pagy
       pundit
       rails (>= 6.0)
-      ransack
       view_component
       zeitwerk
 
@@ -236,10 +235,6 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.3)
-    ransack (2.4.2)
-      activerecord (>= 5.2.4)
-      activesupport (>= 5.2.4)
-      i18n
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -395,7 +390,6 @@ DEPENDENCIES
   pundit
   rails (~> 6.0.2, >= 6.0.2.2)
   rails-controller-testing
-  ransack
   rspec-rails (~> 4.0.0)
   ruby-debug-ide
   sass-rails (>= 6)

data/README.md

@@ -29,13 +29,13 @@ Avo is a beautiful next-generation framework that empowers you, the developer, t
   - **Actions** - Run custom actions to one or more of your resources with as little as pressing a button 💪
   - **Filters** - Write your own custom filters to quickly segment your data.
   - **Keeps your app clean** - You don't need to change your app to use Avo. Drop it in your existing app or add it to a new one and you're done 🙌
-  - **Custom fields**- No worries if we missed a field you need. Generate a custom field in a jiffy.
+  - **Custom fields***- No worries if we missed a field you need. Generate a custom field in a jiffy.
+  - **Dashboard widgets and metrics*** - Customize your dashboard with the tools and analytics you need.
   - **Custom tools** - You need to add a page with something completely new, you've got it!
   - **Authorization** - Leverage Pundit policies to build a robust and scalable authorization system.
-  - **Localization** - Have it available in any language you need.
-  - **No asset pipeline pollution** - Bring your own asset pipeline.
-  - **Dashboard widgets and metrics*** - Customize your dashboard with the tools and analytics you need.
   - **Themable*** - Dress it up into your own colors.
+  - **Localization*** - Have it available in any language you need.
+  - **No asset pipeline pollution** - Bring your own asset pipeline.
 
 *Features still under development
 

data/app/components/avo/views/resource_index_component.html.erb

@@ -22,12 +22,12 @@
   <% end %>
 
   <% c.body do %>
-    <div class="flex justify-between pt-2 pb-2 min-h-16"
+    <div class="flex justify-between py-6 min-h-24"
       data-selected-resources-name="<%= @resource.plural_name.downcase %>"
       data-selected-resources="[]"
     >
       <div class="flex items-center px-6 w-64">
-        <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} if @resource.search_query.present? %>
+        <%# search %>
       </div>
       <div class="flex justify-end items-center px-6 space-x-3">
         <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>
@@ -36,7 +36,7 @@
     </div>
 
     <% if view_type.to_sym == :table %>
-      <div class="w-full overflow-auto flex flex-col mt-4">
+      <div class="w-full overflow-auto flex flex-col">
         <div class="relative flex-1 flex">
           <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
         </div>

data/app/controllers/avo/application_controller.rb

@@ -17,7 +17,7 @@ module Avo
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.init request: request, context: context, current_user: _current_user
+      Avo::App.init request: request, context: context
 
       @license = Avo::App.license
     end
@@ -38,25 +38,18 @@ module Avo
     def render(*args)
       raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:check_avo_license).source_location.first.match?(/.*\/app\/controllers\/avo\/application_controller\.rb/)
 
-      if params[:controller] == "avo/search" && params[:action] == "index"
-        raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:index).source_location.first.match?(/.*\/app\/controllers\/avo\/search_controller\.rb/)
-      end
-
       super(*args)
     end
 
     def check_avo_license
-      # Check to see if the path is on a custom tool
       unless on_root_path || on_resources_path || on_api_path
-        # Display alert on custom tool page if in development.
-        if @license.lacks(:custom_tools) || @license.invalid?
-          if Rails.env.development? || Rails.env.test?
+        if @license.invalid? || @license.lacks(:custom_tools)
+          if Rails.env.development?
             @custom_tools_alert_visible = true
+          else
+            raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools."
           end
         end
-
-        # Raise error in non-development environments.
-        raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools." if @license.lacks_with_trial(:custom_tools)
       end
     end
 
@@ -164,9 +157,9 @@ module Avo
 
     def authorize_action
       if @model.present?
-        @authorization.set_record(@model).authorize_action action_name.to_sym
+        @authorization.set_record(@model).authorize_action :index
       else
-        @authorization.set_record(@resource.model_class).authorize_action action_name.to_sym
+        @authorization.set_record(@resource.model_class).authorize_action :index
       end
     end
 

data/app/controllers/avo/relations_controller.rb

@@ -17,7 +17,7 @@ module Avo
       @resource = @related_resource
       @parent_model = @parent_resource.model_class.find(params[:id])
       @parent_resource.hydrate(model: @parent_model)
-      @query = @authorization.apply_policy @parent_model.public_send(params[:related_name])
+      @query = @parent_model.public_send(params[:related_name])
 
       super
     end

data/app/controllers/avo/search_controller.rb

@@ -2,71 +2,56 @@ require_dependency "avo/application_controller"
 
 module Avo
   class SearchController < ApplicationController
-    before_action :set_resource_name, only: [:show]
-    before_action :set_resource, only: [:show]
+    # before_action :authorize_user
 
     def index
-      raise ActionController::BadRequest.new("This feature requires the pro license https://avohq.io/purchase/pro") if App.license.lacks_with_trial(:global_search)
+      @authorization.set_record(resource_model).authorize_action :index
+      resources = []
+
+      App.resources
+        .select { |resource| resource.search.present? }
+        .select { |resource| AuthorizationService.authorize_action _current_user, resource.model, "index" }
+        .each do |resource_model|
+          found_resources = add_link_to_search_results(search_resource(resource_model), resource_model)
+          resources.push({
+            label: resource_model.name,
+            resources: found_resources
+          })
+        end
 
-      render json: search_resources(Avo::App.resources)
+      render json: {
+        resources: resources
+      }
     end
 
-    def show
-      render json: search_resources([resource])
+    def resource
+      render json: {
+        resources: add_link_to_search_results(search_resource(avo_resource), avo_resource)
+      }
     end
 
     private
 
-    def search_resources(resources)
-      resources.map do |resource|
-        # Apply authorization
-        next unless @authorization.set_record(resource.model_class).authorize_action(:index, raise_exception: false)
-        # Filter out the models without a search_query
-        next if resource.search_query.nil?
-
-        search_resource resource
+    def add_link_to_search_results(resources, avo_resource)
+      resources.map do |model|
+        {
+          id: model.id,
+          search_label: model.send(avo_resource.class.title),
+          link: "/resources/#{model.class.to_s.singularize.underscore}/#{model.id}"
+        }
       end
-        .select do |payload|
-          payload.present?
-        end
-        .sort do |payload|
-          payload.last[:count]
-        end
-        .reverse
-        .to_h
     end
 
-    def search_resource(resource)
-      results = apply_search_metadata(resource.search_query.call(params: params).limit(8), resource)
-
-      result_object = {
-        header: resource.name.pluralize,
-        results: results,
-        count: results.length
-      }
-
-      [resource.name.pluralize.downcase, result_object]
+    def search_resource(avo_resource)
+      avo_resource.query_search(query: params[:q], via_resource_name: params[:via_resource_name], via_resource_id: params[:via_resource_id], user: _current_user)
     end
 
-    def apply_search_metadata(models, avo_resource)
-      models.map do |model|
-        resource = avo_resource.dup.hydrate(model: model).hydrate_fields(model: model)
+    # def authorize_user
+    #   return if params[:action] == 'index'
 
-        result = {
-          _id: model.id,
-          _label: resource.label,
-          _url: resource.avo_path,
-          model: model
-        }
+    #   action = params[:action] == 'resource' ? :index : params[:action]
 
-        if App.license.has_with_trial(:enhanced_search_results)
-          result[:_description] = resource.description
-          result[:_avatar] = resource.avatar
-          result[:_avatar_type] = resource.avatar_type
-        end
-
-        result
-      end
-    end
+    #   return render_unauthorized unless AuthorizationService::authorize_action _current_user, avo_resource.model, action
+    # end
   end
 end

data/app/packs/entrypoints/application.css

@@ -4,7 +4,7 @@
 @import './../../../node_modules/tippy.js/themes/light.css';
 @import './../../../node_modules/trix/dist/trix.css';
 @import './../../../node_modules/flatpickr/dist/flatpickr.css';
-@import './../../../node_modules/@algolia/autocomplete-theme-classic/dist/theme.css';
+
 
 @import './../stylesheets/tailwindcss/base.css';
 
@@ -15,7 +15,6 @@
 @import './../stylesheets/loader.css';
 @import './../stylesheets/pagination.css';
 @import './../stylesheets/breadcrumbs.css';
-@import './../stylesheets/search.css';
 
 @import './../stylesheets/components/status.css';
 @import './../stylesheets/components/code.css';

data/app/packs/entrypoints/application.js

@@ -45,9 +45,6 @@ document.addEventListener('turbo:load', () => {
 })
 document.addEventListener('turbo:visit', () => document.body.classList.add('turbo-loading'))
 document.addEventListener('turbo:submit-start', () => document.body.classList.add('turbo-loading'))
-document.addEventListener('turbo:before-cache', () => {
-  document.querySelectorAll('[data-turbo-remove-before-cache]').forEach((element) => element.remove())
-})
 
 // Uncomment to copy all static images under ../images to the output folder and reference
 // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)

data/app/views/avo/partials/_profile_dropdown.html.erb

@@ -1,19 +1,23 @@
 <div data-controller="toggle-panel">
   <a href="javascript:void(0);" class="flex items-center cursor-pointer font-semibold text-gray-700" data-action="click->toggle-panel#togglePanel">
-    <% if _current_user.respond_to? 'avatar' %>
-      <%= image_tag _current_user.avatar, class: "h-12 rounded-full border-4 border-white mr-1" if _current_user.avatar.present? %>
+    <% if _current_user.respond_to?(:avatar) &&  _current_user.avatar.present? %>
+      <%= image_tag _current_user.avatar, class: "h-12 rounded-full border-4 border-white mr-1" %>
     <% end %>
-    <% if _current_user.name.present? %>
+    <% if _current_user.respond_to?(:name) && _current_user.name.present? %>
       <%= _current_user.name %>
-    <% elsif _current_user.email.present? %>
+    <% elsif _current_user.respond_to?(:email) && _current_user.email.present? %>
       <%= _current_user.email %>
     <% else %>
       Avo user
     <% end %>
-    <%= svg 'chevron-down', class: "ml-1 h-4" %>
+    <% if main_app.respond_to?(:destroy_user_session_path) %>
+      <%= svg 'chevron-down', class: "ml-1 h-4" %>
+    <% end %>
   </a>
 
-  <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
-    <%= button_to "Sign out", main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
-  </div>
+  <% if main_app.respond_to?(:destroy_user_session_path) %>
+    <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
+      <%= button_to "Sign out", main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+    </div>
+  <% end %>
 </div>

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

@@ -23,8 +23,10 @@
         <div>
           <%= render partial: "avo/partials/header" %>
         </div>
-        <div class="flex-1 flex ml-4 pl-4">
-          <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) %>
+        <div class="flex-1 flex justify-center">
+          <div class="w-64 flex">
+            <%# <resources-search :global="true"> %>
+          </div>
         </div>
         <div class="align-end">
           <%= render partial: "avo/partials/profile_dropdown" %>

data/avo.gemspec

@@ -45,5 +45,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
   spec.add_dependency "manifester"
-  spec.add_dependency "ransack"
 end

data/config/routes.rb

@@ -4,8 +4,6 @@ Avo::Engine.routes.draw do
   get "resources", to: redirect("/avo")
 
   scope "avo_api", as: "avo_api" do
-    get "/search", to: "search#index"
-    get "/:resource_name/search", to: "search#show"
     post "/resources/:resource_name/:id/attachments/", to: "attachments#create"
   end
 
@@ -29,4 +27,10 @@ Avo::Engine.routes.draw do
     post "/:resource_name/:id/:related_name", to: "relations#create"
     delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy"
   end
+
+  # get '/avo-api/search',                  to: 'search#index'
+  # get '/avo-api/:resource_name/search',   to: 'search#resource'
+
+  # Tools
+  # get '/avo-tools/resource-overview', to: 'resource_overview#index'
 end

data/lib/avo/app.rb

@@ -6,7 +6,6 @@ module Avo
     class_attribute :request, default: nil
     class_attribute :context, default: nil
     class_attribute :license, default: nil
-    class_attribute :current_user, default: nil
 
     class << self
       def boot
@@ -21,10 +20,9 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:)
+      def init(request:, context:)
         self.request = request
         self.context = context
-        self.current_user = current_user
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
 

data/lib/avo/base_resource.rb

@@ -11,7 +11,7 @@ module Avo
 
     class_attribute :id, default: :id
     class_attribute :title, default: :id
-    class_attribute :search_query, default: nil
+    class_attribute :search, default: [:id]
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
@@ -42,18 +42,6 @@ module Avo
 
         self.filters_loader.use filter_class
       end
-
-      def scope
-        authorization.apply_policy model_class
-      end
-
-      def authorization
-        Avo::Services::AuthorizationService.new Avo::App.current_user
-      end
-    end
-
-    def initialize
-      self.class.model_class = model_class
     end
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
@@ -77,7 +65,7 @@ module Avo
         field.hydrate(resource: self, panel_name: default_panel_name, user: user)
       end
 
-      if Avo::App.license.has_with_trial(:custom_fields)
+      if Avo::App.license.invalid? || Avo::App.license.lacks(:custom_fields)
         fields = fields.reject do |field|
           field.custom?
         end
@@ -108,9 +96,9 @@ module Avo
         end
       end
 
-      hydrate_fields(model: @model, view: @view)
-
-      fields
+      fields.map do |field|
+        field.hydrate(model: @model, view: @view, resource: self)
+      end
     end
 
     def get_grid_fields
@@ -131,16 +119,8 @@ module Avo
       self.class.actions_loader.bag
     end
 
-    def hydrate_fields(model: nil, view: nil)
-      fields.map do |field|
-        field.hydrate(model: @model, view: @view, resource: self)
-      end
-
-      self
-    end
-
     def default_panel_name
-      return @params[:related_name].capitalize if @params.present? && @params[:related_name].present?
+      return @params[:related_name].capitalize if @params[:related_name].present?
 
       case @view
       when :show
@@ -246,11 +226,7 @@ module Avo
 
     def fill_model(model, params)
       # Map the received params to their actual fields
-      fields_by_database_id = get_field_definitions
-        .reject do |field|
-          field.computed
-        end
-        .map { |field| [field.database_id(model).to_s, field] }.to_h
+      fields_by_database_id = get_field_definitions.map { |field| [field.database_id(model).to_s, field] }.to_h
 
       params.each do |key, value|
         field = fields_by_database_id[key]
@@ -325,57 +301,5 @@ module Avo
         end
       end
     end
-
-    def avo_path
-      "#{Avo.configuration.root_path}/resources/#{model_class.model_name.route_key}/#{model.id}"
-    end
-
-    def label_field
-      get_field_definitions.find do |field|
-        field.as_label.present?
-      end
-    rescue
-      nil
-    end
-
-    def label
-      label_field.value || model_title
-    rescue
-      model_title
-    end
-
-    def avatar_field
-      get_field_definitions.find do |field|
-        field.as_avatar.present?
-      end
-    rescue
-      nil
-    end
-
-    def avatar
-      avatar_field.to_image
-    rescue
-      nil
-    end
-
-    def avatar_type
-      avatar_field.as_avatar
-    rescue
-      nil
-    end
-
-    def description_field
-      get_field_definitions.find do |field|
-        field.as_description.present?
-      end
-    rescue
-      nil
-    end
-
-    def description
-      description_field.value
-    rescue
-      nil
-    end
   end
 end

data/lib/avo/configuration.rb

@@ -22,7 +22,6 @@ module Avo
     attr_accessor :display_breadcrumbs
     attr_accessor :initial_breadcrumbs
     attr_accessor :home_path
-    attr_accessor :search_debounce
 
     def initialize
       @root_path = "/avo"
@@ -57,7 +56,6 @@ module Avo
       }
       @display_breadcrumbs = true
       @home_path = nil
-      @search_debounce = 300
     end
 
     def locale_tag

data/lib/avo/fields/base_field.rb

@@ -19,9 +19,6 @@ module Avo
       attr_reader :help
       attr_reader :default
       attr_reader :visible
-      attr_reader :as_label
-      attr_reader :as_avatar
-      attr_reader :as_description
 
       # Private options
       attr_reader :updatable
@@ -56,9 +53,6 @@ module Avo
         @help = args[:help] || nil
         @default = args[:default] || nil
         @visible = args[:visible] || true
-        @as_label = args[:as_label] || false
-        @as_avatar = args[:as_avatar] || false
-        @as_description = args[:as_description] || false
 
         @updatable = true
         @computable = true

data/lib/avo/fields/file_field.rb

@@ -20,10 +20,6 @@ module Avo
       def variant(resize_to_limit: [128, 128])
         value.variant(resize_to_limit: resize_to_limit).processed.service_url
       end
-
-      def to_image
-        return variant(resize_to_limit: [320, 320]) if is_image
-      end
     end
   end
 end

data/lib/avo/licensing/license.rb

@@ -47,16 +47,6 @@ module Avo
 
       alias_method :has, :can
       alias_method :lacks, :cant
-
-      # Returns if has ability and if is a valid license or app is in development.
-      def has_with_trial(ability)
-        can(ability) && (valid? || Rails.env.development? || Rails.env.test?)
-      end
-
-      # Returns if lacks ability and if is a valid license or app is in development.
-      def lacks_with_trial(ability)
-        !can(ability) && (valid? || Rails.env.development? || Rails.env.test?)
-      end
     end
   end
 end

data/lib/avo/licensing/pro_license.rb

@@ -5,9 +5,7 @@ module Avo
         [
           :authorization,
           :custom_tools,
-          :custom_fields,
-          :global_search,
-          :enhanced_search_results
+          :custom_fields
         ]
       end
     end

data/lib/avo/services/authorization_service.rb

@@ -75,7 +75,7 @@ module Avo
         end
 
         def skip_authorization
-          Avo::App.license.lacks_with_trial :authorization
+          Avo::App.license.lacks :authorization
         end
 
         def authorized_methods(user, record)

data/lib/avo/version.rb

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

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

@@ -43,7 +43,6 @@ Avo.configure do |config|
   # config.full_width_container = false
   # config.full_width_index_view = false
   # config.cache_resources_on_index_view = true
-  # config.search_debounce = 300
 
   # Where should the user be redirected when he hits the `/<%= options[:path] %>` url
   # config.home_path = nil

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

@@ -1,9 +1,6 @@
 class <%= resource_class %> < Avo::BaseResource
   self.title = :id
   self.includes = []
-  # self.search_query = ->(params:) do
-    # scope.ransack(id_eq: params[:q], m: "or").result(distinct: false)
-  # end
 
   field :id, as: :id
   # add fields here

data/lib/generators/avo/templates/tool/sidebar_item.tt

@@ -1 +1 @@
-<%%= render Avo::NavigationLinkComponent.new label: '<%= human_name %>', path: '/avo/<%= file_name %>' %>
+<%%= render Avo::NavigationLinkComponent.new label: '<%= human_name %>', path: "#{Avo.configuration.root_path}/<%= file_name %>" %>