avo 1.4.1 → 1.4.5.pre.1

data/app/packs/stylesheets/components/status.css

@@ -1,30 +1,41 @@
 .spinner {
+  width: 16px;
+  height: 16px;
+
   position: relative;
-  display: inline-block;
-  width: 18px;
-  height: 18px;
-  top: 3px;
+}
+
+
+.double-bounce1, .double-bounce2 {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
   background-color: #333;
-  border-radius: 100%;
-  -webkit-animation: sk-scaleout 1.0s infinite ease-in-out;
-  animation: sk-scaleout 1.0s infinite ease-in-out;
+  opacity: 0.6;
+  position: absolute;
+  top: 0;
+  left: 0;
+
+  -webkit-animation: sk-bounce 2.0s infinite ease-in-out;
+  animation: sk-bounce 2.0s infinite ease-in-out;
 }
 
-@-webkit-keyframes sk-scaleout {
-  0% { -webkit-transform: scale(0) }
-  100% {
-    -webkit-transform: scale(1.0);
-    opacity: 0;
-  }
+.double-bounce2 {
+  -webkit-animation-delay: -1.0s;
+  animation-delay: -1.0s;
 }
 
-@keyframes sk-scaleout {
-  0% {
-    -webkit-transform: scale(0);
-    transform: scale(0);
-  } 100% {
-    -webkit-transform: scale(1.0);
+@-webkit-keyframes sk-bounce {
+  0%, 100% { -webkit-transform: scale(0.0) }
+  50% { -webkit-transform: scale(1.0) }
+}
+
+@keyframes sk-bounce {
+  0%, 100% {
+    transform: scale(0.0);
+    -webkit-transform: scale(0.0);
+  } 50% {
     transform: scale(1.0);
-    opacity: 0;
+    -webkit-transform: scale(1.0);
   }
 }

data/app/packs/stylesheets/search.css

@@ -0,0 +1,79 @@
+:root {
+  --aa-primary-color: --tw-ring-color;
+  --aa-selected-color: --tw-ring-color;
+  --aa-primary-color-rgb: 5, 150, 105;
+}
+
+.global-search {
+  .aa-DetachedSearchButton:focus,
+  .aa-DetachedSearchButton {
+    border: none !important;
+  }
+}
+
+.resource-search {
+  .aa-Autocomplete {
+    @apply w-full;
+  }
+
+  .aa-DetachedSearchButton {
+    @apply rounded-full border-gray-300;
+  }
+}
+
+.aa-SourceHeader {
+  @apply uppercase text-xs font-semibold;
+}
+
+.aa-DetachedFormContainer,
+.aa-DetachedContainer .aa-Panel {
+  @apply bg-blue-gray-100 border-b-0;
+}
+
+.aa-Form {
+  &:focus-within {
+    @apply ring-0 !important;
+  }
+
+  input {
+    @apply focus:ring-0 !important;
+  }
+  &:focus-within {
+    .aa-InputWrapperPrefix{
+      .aa-SubmitButton {
+        @apply ring-0;
+      }
+    }
+  }
+}
+.aa-Input {
+  @apply focus:ring-green-600;
+}
+
+.aa-DetachedContainer {
+  .aa-PanelLayout {
+    @apply pt-0 space-y-3;
+  }
+
+  .aa-Source {
+    .aa-List {
+      @apply space-y-1;
+
+      .aa-Item {
+        @apply bg-white rounded-md px-3 py-4 shadow;
+
+        .aa-ItemDescription {
+          @apply text-gray-500 text-sm;
+        }
+
+        &[aria-selected=true]{
+          @apply bg-blue-700 text-white;
+
+          .aa-ItemDescription {
+            @apply text-white;
+          }
+        }
+      }
+    }
+  }
+}

data/app/packs/svgs/check-circle-sm.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+  <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
+</svg>

data/app/packs/svgs/x-circle-sm.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+  <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
+</svg>

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

@@ -0,0 +1,17 @@
+<div data-controller="search" class="global-search" data-turbo-remove-before-cache>
+  <div class="inline-block"
+    data-search-target="autocomplete"
+    data-search-resource="global"
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
+  >
+  </div>
+  <div class="relative top-[-5px] inline-flex text-gray-400 text-sm leading-5 py-0.5 px-1.5 border border-gray-300 rounded-md cursor-pointer"
+    data-search-target="button"
+  >
+    <span class="sr-only">Press </span>
+    <kbd class="font-sans"><abbr title="Command" class="no-underline">⌘</abbr></kbd>
+    <span class="sr-only"> and </span>
+    <kbd class="font-sans">K</kbd><span class="sr-only"> to search</span>
+  </div>
+</div>

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

@@ -0,0 +1,10 @@
+<div data-controller="search" class="resource-search flex items-center h-full w-full" data-turbo-remove-before-cache>
+  <div class="w-full"
+    data-search-target="autocomplete"
+    data-search-resource="<%= resource %>"
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
+  >
+  </div>
+  <div class="relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>
+</div>

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

@@ -23,10 +23,8 @@
         <div>
           <%= render partial: "avo/partials/header" %>
         </div>
-        <div class="flex-1 flex justify-center">
-          <div class="w-64 flex">
-            <%# <resources-search :global="true"> %>
-          </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>
         <div class="align-end">
           <%= render partial: "avo/partials/profile_dropdown" %>

data/avo.gemspec

@@ -45,4 +45,5 @@ 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,6 +4,8 @@ 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
 
@@ -27,10 +29,4 @@ 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,6 +6,7 @@ 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
@@ -20,9 +21,10 @@ module Avo
         end
       end
 
-      def init(request:, context:)
+      def init(request:, context:, current_user:)
         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, default: [:id]
+    class_attribute :search_query, default: nil
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
@@ -42,6 +42,18 @@ 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)
@@ -65,7 +77,7 @@ module Avo
         field.hydrate(resource: self, panel_name: default_panel_name, user: user)
       end
 
-      if Avo::App.license.invalid? || Avo::App.license.lacks(:custom_fields)
+      if Avo::App.license.has_with_trial(:custom_fields)
         fields = fields.reject do |field|
           field.custom?
         end
@@ -96,9 +108,9 @@ module Avo
         end
       end
 
-      fields.map do |field|
-        field.hydrate(model: @model, view: @view, resource: self)
-      end
+      hydrate_fields(model: @model, view: @view)
+
+      fields
     end
 
     def get_grid_fields
@@ -119,8 +131,16 @@ 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[:related_name].present?
+      return @params[:related_name].capitalize if @params.present? && @params[:related_name].present?
 
       case @view
       when :show
@@ -226,7 +246,11 @@ module Avo
 
     def fill_model(model, params)
       # Map the received params to their actual fields
-      fields_by_database_id = get_field_definitions.map { |field| [field.database_id(model).to_s, field] }.to_h
+      fields_by_database_id = get_field_definitions
+        .reject do |field|
+          field.computed
+        end
+        .map { |field| [field.database_id(model).to_s, field] }.to_h
 
       params.each do |key, value|
         field = fields_by_database_id[key]
@@ -301,5 +325,57 @@ 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,6 +22,7 @@ module Avo
     attr_accessor :display_breadcrumbs
     attr_accessor :initial_breadcrumbs
     attr_accessor :home_path
+    attr_accessor :search_debounce
 
     def initialize
       @root_path = "/avo"
@@ -56,6 +57,7 @@ module Avo
       }
       @display_breadcrumbs = true
       @home_path = nil
+      @search_debounce = 300
     end
 
     def locale_tag

data/lib/avo/fields/base_field.rb

@@ -19,6 +19,9 @@ 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
@@ -53,6 +56,9 @@ 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/external_image_field.rb

@@ -4,6 +4,7 @@ module Avo
       attr_reader :width
       attr_reader :height
       attr_reader :radius
+      attr_reader :link_to_resource
 
       def initialize(id, **args, &block)
         super(id, **args, &block)

data/lib/avo/fields/file_field.rb

@@ -20,6 +20,10 @@ 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,6 +47,16 @@ 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