avo 1.22.0.pre.1 → 1.22.0

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

@@ -1,5 +1,5 @@
 
-<thead class="bg-white border-b border-gray-200 pb-1">
+<thead class="bg-slate-100 border-t border-b border-gray-300 pb-1">
   <th>
     <%== item_select_all_input %>
   </th>
@@ -28,9 +28,9 @@
         sort_by = field.id
         sort_direction = 'desc'
       end
-      classes = "text-gray-500 tracking-tight leading-tight text-sm font-semibold"
+      classes = "text-slate-600 tracking-tight leading-tight text-xs font-semibold"
   %>
-    <th class="text-left uppercase px-3 py-6 whitespace-nowrap">
+    <th class="text-left uppercase px-3 py-2 whitespace-nowrap">
       <% if field.sortable %>
         <%= link_to params.permit!.merge(sort_by: sort_by, sort_direction: sort_direction), class: "flex items-center #{classes} #{'cursor-pointer' if field.sortable}", 'data-turbo-frame': params[:turbo_frame] do %>
           <%= field.name %>

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

@@ -1,23 +1,17 @@
-<% if available_view_types.count > 1 %>
-  <%
-    info = {
-      table: {
-        new_view_type: 'grid',
-        new_icon: 'view-grid',
-        translation_key: 'avo.grid_view',
-      },
-      grid: {
-        new_view_type: 'table',
-        new_icon: 'view-list',
-        translation_key: 'avo.table_view',
-      },
-    }
-  %>
-  <div class="flex">
-    <% available_view_types.each do |type| %>
-      <%= a_link params.permit!.merge(view_type: type), color: :secondary, variant: :outlined, class: view_type.to_s == type.to_s ? 'bg-gray-200' : '', 'data-turbo-frame': turbo_frame, title: t('avo.switch_to_view', view_type: type), 'data-tippy': 'tooltip' do %>
-        <%= svg info[type][:new_icon] %>
-      <% end %>
-    <% end %>
-  </div>
+<%
+  if available_view_types.count > 1
+    case view_type.to_sym
+    when :table
+      new_view_type = 'grid'
+      new_icon = 'view-grid'
+      translation_key = 'avo.grid_view'
+    when :grid
+      new_view_type = 'table'
+      new_icon = 'view-list'
+      translation_key = 'avo.table_view'
+    end
+%>
+  <%= a_link params.permit!.merge(view_type: new_view_type), color: :blue, 'data-turbo-frame': turbo_frame, title: t('avo.switch_to_view', view_type: new_view_type), 'data-tippy': 'tooltip' do %>
+    <%= svg new_icon %> <%= t translation_key, item: @resource.model_class.model_name.human.downcase %>
+  <% end %>
 <% end %>

data/app/views/avo/{partials → sidebar}/_sidebar.html.erb

@@ -1,35 +1,31 @@
-<div class="application-sidebar flex h-full bg-white text-white w-72 z-50 border-r">
+<div class="application-sidebar flex h-full bg-white text-white w-56 z-50 border-r border-gray-300">
   <div class="flex flex-col w-full">
     <%= render partial: "avo/partials/logo" %>
 
     <div class="flex-1 flex flex-col justify-between">
-      <div class="space-y-2">
-        <div class="w-full">
-          <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
-        </div>
+      <div class="tools py-4">
+        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: avo.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">
-          <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources'), icon: svg('resources-icon') %>
           <% Avo::App.resources_navigation(_current_user).sort_by { |r| r.navigation_label }.each do |resource| %>
             <%= render Avo::NavigationLinkComponent.new label: resource.navigation_label, path: resources_path(resource: resource) %>
           <% end %>
-        </div>
 
-        <div class="w-full">
-          <% tools = Avo::App.get_sidebar_partials %>
-
-          <% if tools.present? %>
-            <%= render Avo::NavigationHeadingComponent.new label: t('avo.tools'), icon: svg('tools-icon') %>
+          <% sidebar_partials = Avo::App.get_sidebar_partials %>
+          <% if sidebar_partials.present? %>
+            <%= render Avo::NavigationHeadingComponent.new label: t('avo.tools') %>
 
-            <% tools.each do |partial| %>
+            <% sidebar_partials.each do |partial| %>
               <%= render partial: "/avo/sidebar/items/#{partial}" %>
             <% end %>
           <% end %>
         </div>
+
       </div>
 
       <%= render_license_warnings %>
-      <%= render Avo::SidebarProfileComponent.new user: _current_user %>
     </div>
   </div>
 </div>

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

@@ -17,14 +17,24 @@
     <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
   <% end %>
 </head>
-<body class="bg-gray-100 os-mac">
+<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">
-    <%= render partial: 'avo/partials/sidebar' %>
+    <%= render partial: 'avo/sidebar/sidebar' %>
 
     <div class="flex-1 flex flex-col h-full overflow-auto">
-      <%= render partial: "avo/partials/navbar" %>
+      <div class="relative bg-white p-2 shadow-md h-16 w-full flex flex-shrink-0 items-center z-50 px-6" v-if="layout !== 'blank'">
+        <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) && ::Avo.configuration.feature_enabled?(:global_search) %>
+        </div>
+        <div class="align-end">
+          <%= render partial: "avo/partials/profile_dropdown" %>
+        </div>
+      </div>
 
       <div class="content p-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
         <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>

data/lib/avo/app.rb

@@ -133,10 +133,9 @@ module Avo
       end
 
       def resources_navigation(user = nil)
-        get_available_resources(user)
-          .select do |resource|
-            resource.model_class.present?
-          end
+        get_available_resources(user).select do |resource|
+          resource.model_class.present?
+        end
           .select do |resource|
             resource.visible_on_sidebar
           end

data/lib/avo/fields/key_value_field.rb

@@ -3,10 +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 :delete_text
       attr_reader :disable_editing_keys
       attr_reader :disable_adding_rows
 
@@ -15,10 +11,10 @@ module Avo
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : I18n.translate('avo.key_value_field.key')
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : I18n.translate('avo.key_value_field.value')
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : I18n.translate('avo.key_value_field.add_row')
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : I18n.translate('avo.key_value_field.delete_row')
+        @key_label = args[:key_label] if args[:key_label].present?
+        @value_label = args[:value_label]if args[:value_label].present?
+        @action_text = args[:action_text] if args[:action_text].present?
+        @delete_text = args[:delete_text] if args[:delete_text].present?
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)
@@ -32,6 +28,30 @@ module Avo
         @disable_deleting_rows = args[:disable_deleting_rows].present? ? args[:disable_deleting_rows] : false
       end
 
+      def key_label
+        return @key_label if @key_label.present?
+
+        I18n.translate('avo.key_value_field.key')
+      end
+
+      def value_label
+        return @value_label if @value_label.present?
+
+        I18n.translate('avo.key_value_field.value')
+      end
+
+      def action_text
+        return @action_text if @action_text.present?
+
+        I18n.translate('avo.key_value_field.add_row')
+      end
+
+      def delete_text
+        return @delete_text if @delete_text.present?
+
+        I18n.translate('avo.key_value_field.delete_row')
+      end
+
       def to_permitted_param
         [:"#{id}", "#{id}": {}]
       end

data/lib/avo/version.rb

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

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -94,3 +94,4 @@ en:
     was_successfully_created: 'was successfully created'
     was_successfully_updated: 'was successfully updated'
     clear_value: "Clear value"
+    tools: Tools

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -81,3 +81,4 @@ nb-NO:
     search_placeholder: 'Søk'
     search_cancel_button: 'Avbryt'
     sign_out: 'Logg ut'
+    tools: Redskapene

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -83,3 +83,4 @@ pt-BR:
       placeholder: 'Procurar'
       cancel_button: 'Cancelar'
     sign_out: 'sair'
+    tools: Ferramentas

data/lib/generators/avo/templates/locales/avo.ro.yml

@@ -78,3 +78,4 @@ ro:
       delete_row: 'Sterge rand'
     was_successfully_created: 'a fost creat'
     was_successfully_updated: 'a fost actualizat'
+    tools: Instrumente