avo 1.25.0 → 2.1.1

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

@@ -1,9 +1,5 @@
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new title: 'Welcome to Avo' do |c| %>
-    <% c.tools do %>
-      <div class="text-sm italic">This page is visible only in development. It will be hidden in other environments.</div>
-    <% end %>
-
+  <%= render Avo::PanelComponent.new title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.' do |c| %>
     <% c.body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">

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

@@ -1,6 +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 href="https://avohq.io/pricing" target="_blank" class="rounded bg-orange-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 mr-1" %> Warning. <%= @custom_tools_alert_visible %> This page will not be visible in a production environment.
   </a>
 </div>
 

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

@@ -1,11 +1,11 @@
-<div data-controller="search" class="global-search" data-turbo-remove-before-cache>
-  <div class="inline-block"
+<div data-controller="search" class="relative flex global-search rounded border border-gray-200 sm:min-w-[16rem]" data-turbo-remove-before-cache>
+  <div class="flex-1 text-gray-500"
     data-search-target="autocomplete"
     data-search-resource="global"
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>", "placeholder": "<%= I18n.translate 'avo.search.placeholder' %>", "cancel_button": "<%= I18n.translate 'avo.search.cancel_button' %>"}'
   >
   </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"
+  <div class="absolute top-1/2 hidden sm:inline-flex text-gray-400 text-sm leading-5 py-0.5 px-1.5 border border-gray-300 rounded-md cursor-pointer -translate-y-1/2 left-auto right-0 mr-4"
     data-search-target="button"
   >
     <span class="sr-only">Press </span>

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

@@ -1 +1 @@
-<%= link_to Avo.configuration.app_name, '/', class: 'text-green-600 font-semibold', target: :_blank %>
+<%= link_to Avo.configuration.app_name, '/', class: 'text-blue-500 font-semibold', target: :_blank %>

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

@@ -1,3 +1,3 @@
-<%= link_to root_path, class: 'logo-placeholder h-16 bg-white p-2 flex justify-center' do %>
+<%= link_to root_path, class: 'logo-placeholder h-20 bg-white p-4 flex justify-start' do %>
   <%= image_tag '/avo-assets/logo.png', class: 'h-full', title: 'Avo' %>
 <% end %>

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

@@ -0,0 +1,11 @@
+<div class="relative bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-8 border-b space-x-4 lg:space-x-0 min-h-[4rem]" v-if="layout !== 'blank'">
+  <%= a_button class: 'lg:hidden', icon: 'menu', data: { action: 'click->mobile#toggleSidebar' } %>
+  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-8">
+    <div class="m-0">
+      <%= render partial: "avo/partials/header" %>
+    </div>
+    <div class="flex">
+      <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
+    </div>
+  </div>
+</div>

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

@@ -5,5 +5,5 @@
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
   >
   </div>
-  <div class="hidden relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>
+  <div class="hidden relative inline-flex text-gray-400 text-sm border border-gray-300 rounded cursor-pointer" data-search-target="button"></div>
 </div>

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

@@ -11,4 +11,4 @@
   end
 %>
 
-<%= svg icon, class: 'inline-block fill-current text-gray-500 relative leading-none min-w-4 min-h-full ml-1 h-4' %>
+<%= svg icon, class: 'inline-block fill-current text-gray-500 relative leading-none min-w-[1rem] min-h-full ml-1 h-4' %>

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

@@ -1,6 +1,6 @@
 
-<thead class="bg-slate-100 border-t border-b border-gray-300 pb-1">
-  <th>
+<thead class="bg-white border-b border-gray-200 pb-1">
+  <th class="rounded-lg">
     <%== item_select_all_input %>
   </th>
   <%
@@ -28,9 +28,9 @@
         sort_by = field.id
         sort_direction = 'desc'
       end
-      classes = "text-slate-600 tracking-tight leading-tight text-xs font-semibold"
+      classes = "text-gray-500 tracking-tight leading-tight text-sm font-semibold"
   %>
-    <th class="text-left uppercase px-3 py-2 whitespace-nowrap">
+    <th class="text-left uppercase px-3 py-4 whitespace-nowrap rounded-l">
       <% 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,17 +1,37 @@
-<%
-  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 %>
+<% if available_view_types.count > 1 %>
+  <%
+    info = {
+      table: {
+        new_view_type: 'table',
+        new_icon: 'table-view-type',
+        translation_key: 'avo.table_view',
+      },
+      grid: {
+        new_view_type: 'grid',
+        new_icon: 'grid-view-type',
+        translation_key: 'avo.grid_view',
+      },
+    }
+  %>
+  <div class="flex">
+    <div class="button-group">
+      <% available_view_types.each do |type| %>
+        <% is_active_view = view_type.to_s == type.to_s %>
+
+        <%= a_link url_for(params.permit!.merge(view_type: type)).to_s,
+          icon: info[type][:new_icon],
+          color: is_active_view ? :gray : :primary,
+          rounded: false,
+          size: :sm,
+          class: is_active_view ? ' bg-gray-100 border-gray-300' : ' z-20',
+          title: t('avo.switch_to_view', view_type: type),
+          data: {
+            tippy: 'tooltip',
+            'turbo-frame': turbo_frame,
+            control: "view-type-toggle-#{type}"
+          }
+        %>
+      <% end %>
+    </div>
+  </div>
 <% end %>

data/app/views/avo/private/_links_and_buttons.html.erb

@@ -0,0 +1,57 @@
+<%
+  entities = [:button, :link]
+  sizes = [:lg, :md, :sm, :xs]
+  styles = [:primary, :outline]
+  colors = [:primary, :gray, :red, :orange, :green]
+  states = [:regular, :hover, :disabled, :active]
+%>
+<div class="px-6 space-y-4">
+  <% entities.each do |entity| %>
+    <h3><%= entity.to_s.humanize.capitalize.pluralize %></h3>
+    <div class="flex flex-col space-y-4">
+      <% sizes.each do |size| %>
+        <div class="text-lg">size: <%= size %></div>
+        <div class="flex flex-col space-y-1">
+          <% styles.each do |style| %>
+            <% colors.each do |color| %>
+              <% next if style == :primary && color != :primary %>
+              <div class="flex space-x-1">
+                <% states.each do |state| %>
+                  <%
+                    extra_classes = ""
+                    case state
+                    when :active
+                      extra_classes += " active"
+                    when :hover
+                      extra_classes += " hover"
+                    end
+                  %>
+                  <%
+                    a_button_or_link = "a_#{entity}"
+                    args = {icon: 'arrow-left', style: style, color: color, size: size, class: extra_classes, disabled: state == :disabled}
+                  %>
+                  <% if entity == :link %>
+                    <div>
+                      <%= send a_button_or_link, '/admin/avo_private/design', **args do %>
+                        <%= entity.to_s.humanize.capitalize %> <%= state %>
+                      <% end %>
+                    </div>
+                  <% else %>
+                    <div>
+                      <%= send a_button_or_link, **args do %>
+                        <%= entity.to_s.humanize.capitalize %> <%= state %>
+                      <% end %>
+                    </div>
+                    <div>
+                      <%= a_button icon: 'bell', style: style, color: color, size: size, class: extra_classes, disabled: state == :disabled %>
+                    </div>
+                  <% end %>
+                <% end %>
+              </div>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/views/avo/private/design.html.erb

@@ -0,0 +1,27 @@
+<div class="flex flex-col">
+  <%= render Avo::PanelComponent.new title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.' do |c| %>
+    <% c.tools do %>
+      <%= a_link('/admin', icon: 'arrow-left', style: :primary, is_link: true) do %>
+        Primary
+      <% end %>
+
+      <%= a_link('/admin', icon: 'arrow-left', style: :outline, is_link: true) do %>
+        Secondary
+      <% end %>
+
+      <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :red, is_link: true) do %>
+        Red
+      <% end %>
+
+      <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :orange, is_link: true) do %>
+        Red
+      <% end %>
+    <% end %>
+
+    <% c.body do %>
+      <div class="flex flex-col justify-between py-6 min-h-24">
+        <%= render 'links_and_buttons' %>
+      </div>
+    <% end %>
+  <% end %>
+</div>

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

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <%= display_meta_tags site: Avo.configuration.app_name, reverse: true, separator: "—" %>
 
   <%= csrf_meta_tags %>
@@ -17,43 +18,38 @@
     <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
   <% end %>
 </head>
-<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/sidebar/sidebar' %>
-
-    <div class="flex-1 flex flex-col h-full overflow-auto">
-      <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>
+<body class="bg-application os-mac">
+<div class="relative flex flex-1 w-full min-h-full" data-controller="mobile">
+  <%= render Avo::SidebarComponent.new %>
+
+  <div class="lg:pl-64 flex-1 flex flex-col min-h-full max-w-full">
+    <%= render partial: "avo/partials/navbar" %>
 
-      <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 %>
+    <div class="content py-4 lg:py-8 px-4 lg:px-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
+      <%= 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 class="flex flex-1 flex-col justify-between items-stretch space-y-8">
+        <%= yield %>
+        <%= render partial: "avo/partials/footer" %>
       </div>
     </div>
   </div>
-  <%= turbo_frame_tag 'actions_show' %>
-  <%= turbo_frame_tag 'attach_modal' %>
-  <%= turbo_frame_tag 'destroy_attachment_form' %>
+</div>
 
-  <%= turbo_frame_tag 'alerts' do %>
-    <%= render Avo::AlertsComponent.new %>
+<%= turbo_frame_tag 'actions_show' %>
+<%= turbo_frame_tag 'attach_modal' %>
+<%= turbo_frame_tag 'destroy_attachment_form' %>
+
+<%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-50 pointer-events-none" do %>
+  <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+
+  <% # In case we have other general error messages %>
+  <% if @errors.present? %>
+    <% @errors.each do |message| %>
+      <%= render Avo::AlertComponent.new :error, message %>
+    <% end %>
   <% end %>
-</div>
+<% end %>
 
 <%= render partial: "avo/partials/scripts" %>
 <!-- Avo version: <%= Avo::VERSION %> -->

data/avo.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors = ["Adrian Marin", "Mihai Marin"]
   spec.email = ["avo@avohq.io"]
   spec.homepage = "https://avohq.io"
-  spec.summary = "Configuration-based, no-maintenance, extendable Ruby on Rails admin."
-  spec.description = "Avo is a beautiful next-generation framework that empowers you, the developer, to create fantastic admin panels for your Ruby on Rails apps with the flexibility to fit your needs as you grow."
+  spec.summary = "Configuration-based, no-maintenance, extendable Ruby on Rails admin panel framework."
+  spec.description = "Avo abstracts away the common parts of building apps, letting your engineers work on your app's essential components. The result is a full-featured admin panel that works out of the box, ready to give to your end-users."
   spec.license = "Commercial"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
       "public gem pushes."
   end
 
+  spec.required_ruby_version = ">= 2.4.0"
   spec.post_install_message = "Thank you for using Avo 💪  Docs are available at https://docs.avohq.io"
 
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
@@ -44,5 +45,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
+  spec.add_dependency "chartkick"
   spec.add_dependency "dry-initializer"
 end

data/bin/dev

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-if ! command -v foreman &> /dev/null
-then
-  echo "Installing foreman..."
-  gem install foreman
-fi
+PORT="${PORT:-3030}"
+export PORT
 
-foreman start -f Procfile.dev
+if command -v overmind &> /dev/null; then
+  overmind start -f Procfile.dev "$@"
+else
+  foreman start -f Procfile.dev "$@"
+fi

data/config/routes.rb

@@ -4,6 +4,9 @@ Avo::Engine.routes.draw do
   get "resources", to: redirect("/admin")
   post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 
+  get "/dashboards/:dashboard_id", to: "dashboards#show"
+  get "/dashboards/:dashboard_id/cards/:card_id", to: "dashboards#card"
+
   scope "avo_api", as: "avo_api" do
     get "/search", to: "search#index"
     get "/:resource_name/search", to: "search#show"
@@ -14,12 +17,11 @@ Avo::Engine.routes.draw do
 
   scope "resources", as: "resources" do
     # Attachments
-    get "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#show"
-    delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#destroy"
+    delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:attachment_id", to: "attachments#destroy"
 
     # Ordering
     patch "/:resource_name/:id/order", to: "resources#order"
-    patch "/:resource_name/:id/:related_name/:related_id/order", to: "relations#order", as: "associations_order"
+    patch "/:resource_name/:id/:related_name/:related_id/order", to: "associations#order", as: "associations_order"
 
     # Actions
     get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"
@@ -27,13 +29,19 @@ Avo::Engine.routes.draw do
 
     # Generate resource routes as below:
     # resources :posts
-    Avo::DynamicRouter::routes(self)
-
-    # Relations
-    get "/:resource_name/:id/:related_name/new", to: "relations#new", as: "associations_new"
-    get "/:resource_name/:id/:related_name/", to: "relations#index", as: "associations_index"
-    get "/:resource_name/:id/:related_name/:related_id", to: "relations#show", as: "associations_show"
-    post "/:resource_name/:id/:related_name", to: "relations#create", as: "associations_create"
-    delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy", as: "associations_destroy"
+    Avo::DynamicRouter.routes(self)
+
+    # Associations
+    get "/:resource_name/:id/:related_name/new", to: "associations#new", as: "associations_new"
+    get "/:resource_name/:id/:related_name/", to: "associations#index", as: "associations_index"
+    get "/:resource_name/:id/:related_name/:related_id", to: "associations#show", as: "associations_show"
+    post "/:resource_name/:id/:related_name", to: "associations#create", as: "associations_create"
+    delete "/:resource_name/:id/:related_name/:related_id", to: "associations#destroy", as: "associations_destroy"
+  end
+
+  if Rails.env.development? or Rails.env.staging?
+    scope "avo_private", as: "avo_private" do
+      get "/design", to: "private#design"
+    end
   end
 end

data/lib/avo/app.rb

@@ -1,6 +1,7 @@
 module Avo
   class App
     class_attribute :resources, default: []
+    class_attribute :dashboards, default: []
     class_attribute :cache_store, default: nil
     class_attribute :fields, default: []
     class_attribute :request, default: nil
@@ -9,6 +10,8 @@ module Avo
     class_attribute :current_user, default: nil
     class_attribute :root_path, default: nil
     class_attribute :view_context, default: nil
+    class_attribute :params, default: {}
+    class_attribute :translation_enabled, default: false
 
     class << self
       def boot
@@ -23,14 +26,16 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:, root_path:, view_context:)
+      def init(request:, context:, current_user:, root_path:, view_context:, params:)
         self.request = request
         self.context = context
         self.current_user = current_user
         self.root_path = root_path
         self.view_context = view_context
+        self.params = params
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
+        self.translation_enabled = license.has(:localization)
 
         # Set the current host for ActiveStorage
         begin
@@ -44,6 +49,7 @@ module Avo
         end
 
         init_resources
+        init_dashboards if license.has_with_trial(:dashboards)
       end
 
       # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
@@ -82,6 +88,23 @@ module Avo
           end
       end
 
+      def init_dashboards
+        self.dashboards = Dashboards::BaseDashboard.descendants
+          .select do |dashboard|
+            dashboard != Dashboards::BaseDashboard
+          end
+          .uniq do |dashboard|
+            dashboard.id
+          end
+      end
+
+      # Returns the Avo dashboard by id
+      def get_dashboard_by_id(id)
+        dashboards.find do |dashboard|
+          dashboard.id == id
+        end
+      end
+
       # Returns the Avo resource by camelized name
       #
       # get_resource_by_name('User') => UserResource
@@ -132,15 +155,26 @@ module Avo
           .sort_by { |r| r.name }
       end
 
+      def get_available_dashboards(user = nil)
+        dashboards.sort_by { |r| r.name }
+      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
       end
 
+      def get_dashboards(user = nil)
+        return [] unless App.license.has_with_trial(:resource_ordering)
+
+        get_available_dashboards(user)
+      end
+
       # Insert any partials that we find in app/views/avo/sidebar/items.
       def get_sidebar_partials
         Dir.glob(Rails.root.join("app", "views", "avo", "sidebar", "items", "*.html.erb"))

data/lib/avo/base_action.rb

@@ -27,16 +27,16 @@ module Avo
       def form_data_attributes
         # We can't respond with a file download from Turbo se we disable it on the form
         if may_download_file
-          { 'turbo': false }
+          {turbo: false, remote: false}
         else
-          { 'turbo-frame': '_top', 'action-target': 'form' }
+          {"turbo-frame": "_top", "action-target": "form"}
         end
       end
 
       # We can't respond with a file download from Turbo se we disable close the modal manually after a while (it's a hack, we know)
       def submit_button_data_attributes
         if may_download_file
-          { action: 'click->modal#delayedClose' }
+          {action: "click->modal#delayedClose"}
         else
           {}
         end
@@ -109,7 +109,7 @@ module Avo
       args = {
         fields: processed_fields,
         current_user: current_user,
-        resource: resource,
+        resource: resource
       }
 
       args[:models] = models unless standalone

data/lib/avo/base_resource.rb

@@ -11,6 +11,7 @@ module Avo
     delegate :avo, to: :view_context
     delegate :resource_path, to: :view_context
     delegate :resources_path, to: :view_context
+    delegate :t, to: ::I18n
 
     attr_accessor :view
     attr_accessor :model
@@ -26,7 +27,7 @@ module Avo
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
-    class_attribute :translation_enabled
+    class_attribute :translation_enabled, default: false
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
     class_attribute :actions_loader
@@ -38,8 +39,11 @@ module Avo
     class_attribute :resolve_query_scope
     class_attribute :resolve_find_scope
     class_attribute :ordering
+    class_attribute :hide_from_global_search, default: false
 
     class << self
+      delegate :t, to: ::I18n
+
       def grid(&block)
         grid_collector = GridCollector.new
         grid_collector.instance_eval(&block)
@@ -92,8 +96,12 @@ module Avo
 
     def initialize
       unless self.class.model_class.present?
-        self.class.model_class = model_class.base_class
+        if model_class.present?
+          self.class.model_class = model_class.base_class
+        end
       end
+
+      self.class.translation_enabled = ::Avo::App.translation_enabled
     end
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
@@ -209,11 +217,11 @@ module Avo
 
       case @view
       when :show
-        I18n.t("avo.resource_details", item: name.downcase, title: model_title).upcase_first
+        model_title
       when :edit
-        I18n.t("avo.update_item", item: name.downcase, title: model_title).upcase_first
+        model_title
       when :new
-        I18n.t("avo.create_new_item", item: name.downcase).upcase_first
+        t("avo.create_new_item", item: name.downcase).upcase_first
       end
     end
 
@@ -242,9 +250,18 @@ module Avo
       class_name_without_resource.safe_constantize
     end
 
+    def model_id
+      @model.send id
+    end
+
     def model_title
-      return @model.send title if @model.present?
+      return name if @model.nil?
 
+      the_title = @model.send title
+      return the_title if the_title.present?
+
+      model_id
+    rescue
       name
     end
 
@@ -265,11 +282,13 @@ module Avo
     end
 
     def name
+      default = class_name_without_resource.titlecase
+
       return @name if @name.present?
 
-      return I18n.t(translation_key, count: 1).capitalize if translation_key
+      return t(translation_key, count: 1, default: default).capitalize if translation_key
 
-      class_name_without_resource.titlecase
+      default
     end
 
     def singular_name
@@ -277,9 +296,11 @@ module Avo
     end
 
     def plural_name
-      return I18n.t(translation_key, count: 2).capitalize if translation_key
+      default = name.pluralize
+
+      return t(translation_key, count: 2, default: default).capitalize if translation_key
 
-      name.pluralize
+      default
     end
 
     def underscore_name