avo 1.19.1.pre.4 → 1.19.1.pre.5

data/app/assets/stylesheets/avo.css

@@ -76,3 +76,11 @@ body {
 .turbo-progress-bar {
   @apply bg-green-500;
 }
+
+body.os-mac .mac\:hidden {
+  display: none;
+}
+
+body.os-pc .pc\:hidden {
+  display: none;
+}

data/app/assets/stylesheets/css/search.css

@@ -27,7 +27,7 @@
 
 .aa-DetachedFormContainer,
 .aa-DetachedContainer .aa-Panel {
-  @apply bg-blue-gray-100 border-b-0;
+  @apply bg-slate-100 border-b-0;
 }
 
 .aa-Form {

data/app/components/avo/edit/field_wrapper_component.html.erb

@@ -1,5 +1,5 @@
 <div class="flex items-center py-0 leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
-  <div class="h-16 flex self-start items-center text-blue-gray-800">
+  <div class="h-16 flex self-start items-center text-slate-800">
     <div class="<% if @displayed_in_modal %> md:w-48 <% else %> md:w-64 <% end %> w-48 px-8 flex" data-slot="label">
       <%= @form.label @field.id, label %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>
     </div>

data/app/components/avo/fields/common/files_list_viewer_component.html.erb

@@ -1,4 +1,4 @@
-<div class="relative p-3 bg-blue-gray-200 grid grid-cols-3 xl:grid-cols-4 gap-3 rounded-xl">
+<div class="relative p-3 bg-slate-200 grid grid-cols-3 xl:grid-cols-4 gap-3 rounded-xl">
   <% @field.value.attachments.each do |file| %>
     <%= render Avo::Fields::Common::MultipleFileViewerComponent.new id: @field.id, file: file, is_image: @field.is_image, button_size: :xs, resource: @resource %>
   <% end %>

data/app/components/avo/fields/common/heading_component.html.erb

@@ -1,4 +1,4 @@
-<div class="flex items-start py-1 leading-tight border-t bg-blue-gray-600 text-white text-xs">
+<div class="flex items-start py-1 leading-tight border-t bg-slate-600 text-white text-xs">
   <div class="p-3 pl-6 h-full w-full">
     <% if @value.present? %>
       <% if @as_html %>

data/app/components/avo/index/field_wrapper_component.html.erb

@@ -1,4 +1,4 @@
-<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
+<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-slate-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>

data/app/components/avo/index/table_row_component.html.erb

@@ -1,5 +1,5 @@
 <tr
-  class="hover:bg-light-blue-50 hover:shadow-row relative z-20 border-b"
+  class="hover:bg-sky-50 hover:shadow-row relative z-20 border-b"
   <%== item_selector_init @resource %>
 >
   <td class="w-10">

data/app/components/avo/show/field_wrapper_component.html.erb

@@ -1,5 +1,5 @@
 <div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
-  <div class="h-16 flex self-start items-center text-blue-gray-800">
+  <div class="h-16 flex self-start items-center text-slate-800">
     <div class="w-48 md:w-64 px-8" data-slot="label">
       <%= @field.name %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>
     </div>

data/app/helpers/avo/application_helper.rb

@@ -135,12 +135,12 @@ module Avo
     end
 
     def input_classes(extra_classes = "", has_error: false)
-      classes = "appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-700 rounded-md py-2 px-3 leading-tight border outline-none outline"
+      classes = "appearance-none inline-flex bg-slate-100 disabled:bg-slate-300 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-700 rounded-md py-2 px-3 leading-tight border outline-none outline"
 
       classes += if has_error
         " border-red-600"
       else
-        " border-blue-gray-300"
+        " border-slate-300"
       end
 
       classes += " #{extra_classes}"

data/app/javascript/avo.js

@@ -19,6 +19,17 @@ window.Turbolinks = Turbo
 
 Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: 'replace' }))
 
+function isMac() {
+  const isMac = window.navigator.userAgent.indexOf('Mac OS X')
+
+  if (isMac) {
+    document.body.classList.add('os-mac')
+    document.body.classList.remove('os-pc')
+  } else {
+    document.body.classList.add('os-pc')
+    document.body.classList.remove('os-mac')
+  }
+}
 function initTippy() {
   tippy('[data-tippy="tooltip"]', {
     theme: 'light',
@@ -37,6 +48,7 @@ ActiveStorage.start()
 document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
   initTippy()
+  isMac()
 })
 
 document.addEventListener('turbo:before-fetch-response', (e) => {

data/app/views/avo/actions/show.html.erb

@@ -5,7 +5,7 @@
     data-action-target="controllerDiv"
     data-resource-name="<%= @resource.model_key %>"
     data-resource-id="<%= params[:id] %>"
-    class="hidden text-blue-gray-800"
+    class="hidden text-slate-800"
   >
     <%= form_with model: @model, scope: 'fields', url: "#{@resource.records_path}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
       <%= render Avo::ModalComponent.new do |c| %>

data/app/views/avo/base/_actions.html.erb

@@ -1,7 +1,7 @@
 <% if @actions.count > 0 %>
   <div class="relative z-40 js-actions-dropdown" data-controller="toggle-panel actions-picker">
     <%= a_button class: "focus:outline-none",
-      color: 'light-blue',
+      color: 'sky',
       'data-action': "click->toggle-panel#togglePanel",
       'data-actions-dropdown-button': @resource.model_key do
     %>

data/app/views/avo/base/_filters.html.erb

@@ -1,7 +1,7 @@
 <div data-controller="toggle-panel">
   <div class="relative w-full flex justify-between z-30">
     <%= a_button class: 'focus:outline-none',
-      color: 'blue-gray',
+      color: 'slate',
       title: t('avo.click_to_reveal_filters'),
       'data-button': 'resource-filters',
       'data-action': 'click->toggle-panel#togglePanel',
@@ -24,9 +24,9 @@
 
       <div class="p-4 border-gray-300 border-t">
         <% if params[:filters].present? %>
-          <%= a_link t('avo.reset_filters'), resources_path(resource: @resource, filters: nil, keep_query_params: true), color: 'blue-gray', class: 'w-full justify-center' %>
+          <%= a_link t('avo.reset_filters'), resources_path(resource: @resource, filters: nil, keep_query_params: true), color: 'slate', class: 'w-full justify-center' %>
         <% else %>
-          <%= a_button t('avo.reset_filters'), color: 'blue-gray', class: 'w-full justify-center', disabled: true %>
+          <%= a_button t('avo.reset_filters'), color: 'slate', class: 'w-full justify-center', disabled: true %>
         <% end %>
       </div>
     </div>

data/app/views/avo/home/_actions.html.erb

@@ -7,7 +7,7 @@
     <div class="mt-2">
       <code class="text-lg">Toggle published</code>
       <div class="mt-1">
-        <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:action toggle_published</code>
+        <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:action toggle_published</code>
       </div>
     </div>
 

data/app/views/avo/home/_filters.html.erb

@@ -7,7 +7,7 @@
     <div class="mt-2">
       <code class="text-lg">Published filter</code>
       <div class="mt-1">
-        <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:filter published_filter</code>
+        <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:filter published_filter</code>
       </div>
     </div>
 

data/app/views/avo/home/_resources.html.erb

@@ -20,7 +20,7 @@
         <% models.each do |model| %>
           <code class="text-lg"><%= model.to_s %></code>
           <div>
-            <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:resource <%= model.to_s %></code>
+            <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:resource <%= model.to_s %></code>
           </div>
         <% end %>
       </div>
@@ -30,7 +30,7 @@
       You may generate a resource using the following command:
       <br>
 
-      <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:resource post</code>
+      <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:resource post</code>
     </div>
   <% end %>
 

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

@@ -1,3 +1,3 @@
 <div class="text-center text-sm text-gray-700">
-  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · v<%= Avo::VERSION %>
+  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo::App.license.id %>">v<%= Avo::VERSION %></span>
 </div>

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

@@ -10,7 +10,10 @@
     data-search-target="button"
   >
     <span class="sr-only">Press </span>
-    <kbd class="font-sans"><abbr title="Command" class="no-underline">⌘</abbr></kbd>
+    <kbd class="font-sans">
+      <abbr title="Command" class="no-underline pc:hidden">⌘</abbr>
+      <abbr title="CTRL" class="no-underline mac:hidden">CTRL +&nbsp; </abbr>
+    </kbd>
     <span class="sr-only"> and </span>
     <kbd class="font-sans">K</kbd><span class="sr-only"> to search</span>
   </div>

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

@@ -8,17 +8,17 @@
   per_page_options = per_page_options.sort.uniq
 %>
 
-<div class="bg-white px-4 flex items-center justify-between aborder-t aborder-blue-gray-200 sm:px-6 rounded-xl">
+<div class="bg-white px-4 flex items-center justify-between aborder-t aborder-slate-200 sm:px-6 rounded-xl">
   <div class="hidden sm:flex-2 sm:flex sm:items-center sm:justify-between">
     <div>
-      <div class="text-sm leading-5 text-blue-gray-600 flex items-center">
+      <div class="text-sm leading-5 text-slate-600 flex items-center">
         <div class="mr-2"><%== pagy_info @pagy %></div>
 
         <div data-controller="per-page">
           <div class="flex items-center">
             <%= select_tag 'per_page',
               options_for_select(per_page_options, @index_params[:per_page]),
-              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-400 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-600 rounded-md py-1 px-2 leading-tight border border-blue-gray-300 outline-none focus:border-blue-gray-400 outline w-16 mr-1 text-sm',
+              class: 'appearance-none inline-flex bg-slate-100 disabled:bg-slate-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
               data: {
                 'turbo-frame': turbo_frame,
                 'per-page-target': 'selector',

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

@@ -1,5 +1,5 @@
 
-<thead class="bg-blue-gray-100 border-t border-b border-gray-300 pb-1">
+<thead class="bg-slate-100 border-t border-b border-gray-300 pb-1">
   <th>
     <%== item_select_all_input %>
   </th>
@@ -28,7 +28,7 @@
         sort_by = field.id
         sort_direction = 'desc'
       end
-      classes = "text-blue-gray-600 tracking-tight leading-tight text-xs font-semibold"
+      classes = "text-slate-600 tracking-tight leading-tight text-xs font-semibold"
   %>
     <th class="text-left uppercase px-3 py-2 whitespace-nowrap">
       <% if field.sortable %>

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

@@ -17,7 +17,7 @@
     <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
   <% end %>
 </head>
-<body class="bg-blue-gray-200">
+<body class="bg-slate-200 os-mac">
 
 <div id="app" class="flex min-h-screen flex-row h-full">
   <div class="flex flex-1 w-full">
@@ -29,7 +29,7 @@
           <%= 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) %>
+          <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
         </div>
         <div class="align-end">
           <%= render partial: "avo/partials/profile_dropdown" %>

data/bin/test

@@ -11,7 +11,7 @@ fi;
 
 # Run system tests
 if [[ -z "$1" ]] || [[ "$1" == "system" ]]; then
-  yarn build
+  yarn build:js
   yarn build:css
   bundle exec rspec ./spec --tag type:system
 fi;

data/lib/avo/configuration.rb

@@ -27,6 +27,7 @@ module Avo
     attr_accessor :display_license_request_timeout_error
     attr_accessor :current_user_resource_name
     attr_accessor :raise_error_on_missing_policy
+    attr_accessor :disabled_features
 
     def initialize
       @root_path = "/avo"
@@ -66,6 +67,7 @@ module Avo
       @display_license_request_timeout_error = true
       @current_user_resource_name = "user"
       @raise_error_on_missing_policy = false
+      @disabled_features = []
     end
 
     def locale_tag
@@ -115,6 +117,10 @@ module Avo
     def computed_root_path
       Avo::App.root_path
     end
+
+    def feature_enabled?(feature)
+      !@disabled_features.map(&:to_sym).include?(feature.to_sym)
+    end
   end
 
   def self.configuration

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.19.1.pre.4"
+  VERSION = "1.19.1.pre.5"
 end

data/lib/generators/avo/filter_generator.rb

@@ -5,6 +5,7 @@ module Generators
     class FilterGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path("templates", __dir__)
       class_option :select, type: :boolean
+      class_option :text, type: :boolean
 
       namespace "avo:filter"
 
@@ -12,6 +13,7 @@ module Generators
         type = "boolean"
 
         type = "select" if options[:select]
+        type = "text" if options[:text]
 
         template "filters/#{type}_filter.tt", "app/avo/filters/#{singular_name}.rb"
       end

data/lib/generators/avo/templates/filters/text_filter.tt

@@ -0,0 +1,8 @@
+class <%= class_name.camelize %> < Avo::Filters::TextFilter
+  self.name = '<%= name.underscore.humanize %>'
+  self.button_label = 'Filter by <%= class_name.underscore.humanize.downcase.gsub(' filter', '') %>'
+
+  def apply(request, query, value)
+    query
+  end
+end