avo 1.18.2 → 1.19.0

data/app/controllers/avo/attachments_controller.rb

@@ -23,13 +23,14 @@ module Avo
     def destroy
       blob = ActiveStorage::Blob.find(params[:signed_attachment_id])
       attachment = blob.attachments.find_by record_id: params[:id], record_type: @model.class.to_s
+      path = resource_path(model: @model, resource: @resource)
 
       if attachment.present?
         attachment.destroy
 
-        redirect_to params[:referrer] || resource_path(@model), notice: t("avo.attachment_destroyed")
+        redirect_to params[:referrer] || path, notice: t("avo.attachment_destroyed")
       else
-        redirect_back fallback_location: resource_path(@model), notice: t("avo.failed_to_find_attachment")
+        redirect_back fallback_location: path, notice: t("avo.failed_to_find_attachment")
       end
     end
   end

data/app/controllers/avo/base_controller.rb

@@ -11,6 +11,7 @@ module Avo
     before_action :cache_applied_filters, only: :index
 
     def index
+      @view = :index
       @page_title = resource_name.humanize
       add_breadcrumb resource_name.humanize
 
@@ -58,6 +59,7 @@ module Avo
     end
 
     def show
+      @view = :show
       set_actions
 
       @resource = @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
@@ -70,25 +72,27 @@ module Avo
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
-        add_breadcrumb via_resource.plural_name, resources_path(via_resource.model_class)
-        add_breadcrumb via_resource.model_title, resource_path(via_model)
+        add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
+        add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
       else
-        add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+        add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
       end
 
       add_breadcrumb @resource.model_title
     end
 
     def new
+      @view = :new
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
       @page_title = @resource.default_panel_name
-      add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+      add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
       add_breadcrumb t("avo.new").humanize
     end
 
     def edit
+      @view = :edit
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       @page_title = @resource.default_panel_name
@@ -99,13 +103,13 @@ module Avo
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
-        add_breadcrumb via_resource.plural_name, resources_path(via_resource.model_class)
-        add_breadcrumb via_resource.model_title, resource_path(via_model)
+        add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)
+        add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
       else
-        add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+        add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
       end
 
-      add_breadcrumb @resource.model_title, resource_path(@resource.model)
+      add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
       add_breadcrumb t("avo.edit").humanize
     end
 
@@ -117,9 +121,10 @@ module Avo
       respond_to do |format|
         if saved
           redirect_path = if params[:via_relation_class].present? && params[:via_resource_id].present?
-            resource_path(params[:via_relation_class].safe_constantize, resource_id: params[:via_resource_id])
+            parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class].safe_constantize
+            resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
           else
-            resource_path(@model)
+            resource_path(model: @model, resource: @resource)
           end
 
           format.html { redirect_to redirect_path, notice: "#{@model.class.name} was successfully created." }
@@ -139,7 +144,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          format.html { redirect_to params[:referrer] || resource_path(@model), notice: "#{@model.class.name} was successfully updated." }
+          format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} was successfully updated." }
           format.json { render :show, status: :ok, location: @model }
         else
           flash[:error] = t "avo.you_missed_something_check_form"
@@ -153,19 +158,17 @@ module Avo
       @model.destroy!
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resources_path(@model, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t("avo.resource_destroyed", attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t("avo.resource_destroyed", attachment_class: @attachment_class) }
         format.json { head :no_content }
       end
     end
 
     private
 
-    def model_route_key
-      singular_name @resource.model_class
-    end
-
     def model_params
-      request_params = params.require(model_route_key).permit(permitted_params)
+      model_param_key = @resource.singular_model_key
+
+      request_params = params.require(model_param_key).permit(permitted_params)
 
       if @resource.devise_password_optional && request_params[:password].blank? && request_params[:password_confirmation].blank?
         request_params.delete(:password_confirmation)
@@ -248,9 +251,13 @@ module Avo
         model = @resource.class.find_scope.find params[:resource_id]
       end
 
-      @actions = @resource.get_actions.map do |action|
-        action.new(model: model, resource: @resource)
-      end
+      @actions =
+        @resource
+          .get_actions
+          .map do |action|
+            action.new(model: model, resource: @resource, view: @view)
+          end
+          .select { |action| action.visible_in_view }
     end
 
     def applied_filters
@@ -282,7 +289,7 @@ module Avo
     end
 
     def applied_filters_cache_key
-      "avo.base_controller.#{@resource.route_key}.applied_filters"
+      "avo.base_controller.#{@resource.model_key}.applied_filters"
     end
   end
 end

data/app/controllers/avo/home_controller.rb

@@ -7,8 +7,12 @@ module Avo
         redirect_to Avo.configuration.home_path
       elsif !Rails.env.development?
         @page_title = "Get started"
-        redirect_to resources_path Avo::App.resources.min_by { |resource| resource.route_key }.model_class
+        resource = Avo::App.resources.min_by { |resource| resource.model_key }
+        redirect_to resources_path(resource: resource)
       end
     end
+
+    def failed_to_load
+    end
   end
 end

data/app/controllers/avo/relations_controller.rb

@@ -48,8 +48,8 @@ module Avo
 
       respond_to do |format|
         if @model.save
-          format.html { redirect_to resource_path(@model), notice: t("avo.attachment_class_attached", attachment_class: @attachment_class) }
-          format.json { render :show, status: :created, location: resource_path(@model) }
+          format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @attachment_class) }
+          format.json { render :show, status: :created, location: resource_path(model: @model, resource: @resource) }
         else
           format.html { render :new }
           format.json { render json: @model.errors, status: :unprocessable_entity }
@@ -65,7 +65,7 @@ module Avo
       end
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resource_path(@model), notice: t("avo.attachment_class_detached", attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_detached", attachment_class: @attachment_class) }
       end
     end
 

data/app/controllers/avo/search_controller.rb

@@ -59,7 +59,7 @@ module Avo
         result = {
           _id: model.id,
           _label: resource.label,
-          _url: resource.avo_path,
+          _url: resource.record_path,
           model: model
         }
 

data/app/helpers/avo/application_helper.rb

@@ -39,6 +39,10 @@ module Avo
 
     def a_button(label = nil, **args, &block)
       args[:class] = button_classes(args[:class], color: args[:color], variant: args[:variant], size: args[:size])
+      if args[:spinner]
+        args["data-controller"] = "loading-button"
+        # args["data-action"] = "click->loading-button#onClick"
+      end
 
       locals = {
         label: label,
@@ -159,17 +163,7 @@ module Avo
       if model.instance_of?(Class)
         model
       else
-        model.class.base_class
-      end
-    end
-
-    def singular_name(model_or_class)
-      model_class = get_model_class model_or_class
-
-      if ActiveModel::Naming.uncountable? model_class
-        model_class.base_class.model_name.route_key.singularize.gsub('_index', '')
-      else
-        model_class.base_class.model_name.route_key.singularize
+        model.class
       end
     end
   end

data/app/helpers/avo/resources_helper.rb

@@ -42,7 +42,7 @@ module Avo
     end
 
     def item_selector_init(resource)
-      "data-resource-name='#{resource.model_class.model_name.route_key}' data-resource-id='#{resource.model.id}' data-controller='item-selector'"
+      "data-resource-name='#{resource.model_key}' data-resource-id='#{resource.model.id}' data-controller='item-selector'"
     end
 
     def item_selector_input(floating: false, size: :md)

data/app/helpers/avo/url_helpers.rb

@@ -0,0 +1,77 @@
+module Avo
+  module UrlHelpers
+    def resources_path(resource:, keep_query_params: false, **args)
+      return if resource.nil?
+
+      existing_params = {}
+      begin
+        if keep_query_params
+          existing_params =
+            Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
+        end
+      rescue
+      end
+
+      # This entry uses `route_key` instead of `model_key` because it's rails that needs `fish_index` to build the correct path
+      avo.send :"resources_#{resource.route_key}_path", **existing_params, **args
+    end
+
+    def resource_path(
+      model:,
+      resource:,
+      resource_id: nil,
+      keep_query_params: false,
+      **args
+    )
+      if model.respond_to? :id
+        id = model
+      elsif resource_id.present?
+        id = resource_id
+      end
+
+      avo.send :"resources_#{resource.singular_model_key}_path", id, **args
+    end
+
+    def new_resource_path(model:, resource:, **args)
+      avo.send :"new_resources_#{resource.singular_model_key}_path", **args
+    end
+
+    def edit_resource_path(model:, resource:, **args)
+      avo.send :"edit_resources_#{resource.singular_model_key}_path", model, **args
+    end
+
+    def resource_attach_path(resource, model_id, related_name, related_id = nil)
+      helpers.avo.resources_associations_new_path(resource.singular_model_key, model_id, related_name)
+    end
+
+    def resource_detach_path(
+      model_name, # teams
+      model_id, # 1
+      related_name, # admin
+      related_id = nil
+    )
+      avo.resources_associations_destroy_path(model_name, model_id, related_name, related_id)
+    end
+
+    def related_resources_path(
+      parent_model,
+      model,
+      keep_query_params: false,
+      **args
+    )
+      return if model.nil?
+
+      existing_params = {}
+
+      begin
+        if keep_query_params
+          existing_params =
+            Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
+        end
+      rescue
+      end
+
+      avo.resources_associations_index_path(@parent_resource.model_class.model_name.route_key, @parent_resource.model.id, **existing_params, **args )
+    end
+  end
+end

data/app/packs/entrypoints/application.css

@@ -17,6 +17,7 @@
 @import './../stylesheets/breadcrumbs.css';
 @import './../stylesheets/search.css';
 @import './../stylesheets/active-storage.css';
+@import './../stylesheets/spinner.css';
 
 @import './../stylesheets/components/status.css';
 @import './../stylesheets/components/code.css';

data/app/packs/entrypoints/application.js

@@ -46,6 +46,13 @@ document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
   initTippy()
 })
+
+document.addEventListener('turbo:before-fetch-response', (e) => {
+  if (e.detail.fetchResponse.response.status === 500) {
+    const id = e.srcElement.getAttribute('id')
+    e.srcElement.src = `${window.Avo.configuration.root_path}/failed_to_load?turbo_frame=${id}`
+  }
+})
 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', () => {

data/app/packs/js/controllers/loading_button_controller.js

@@ -0,0 +1,22 @@
+import { Controller } from 'stimulus'
+
+export default class extends Controller {
+  spinnerMarkup = `<div class="button-spinner">
+  <div class="double-bounce1"></div>
+  <div class="double-bounce2"></div>
+</div>`;
+
+  connect() {
+    const button = this.context.scope.element
+    this.context.scope.element.addEventListener('click', () => {
+      button.style.width = `${button.getBoundingClientRect().width}px`
+      button.style.height = `${button.getBoundingClientRect().height}px`
+      button.innerHTML = this.spinnerMarkup
+      button.classList.add('justify-center')
+
+      setTimeout(() => {
+        button.setAttribute('disabled', 'disabled')
+      }, 1)
+    })
+  }
+}

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

@@ -5,8 +5,8 @@
   position: relative;
 }
 
-
-.double-bounce1, .double-bounce2 {
+.spinner .double-bounce1,
+.spinner .double-bounce2 {
   width: 100%;
   height: 100%;
   border-radius: 50%;
@@ -16,26 +16,33 @@
   top: 0;
   left: 0;
 
-  -webkit-animation: sk-bounce 2.0s infinite ease-in-out;
-  animation: sk-bounce 2.0s infinite ease-in-out;
+  -webkit-animation: sk-bounce 2s infinite ease-in-out;
+  animation: sk-bounce 2s infinite ease-in-out;
 }
 
-.double-bounce2 {
-  -webkit-animation-delay: -1.0s;
-  animation-delay: -1.0s;
+.spinner .double-bounce2 {
+  -webkit-animation-delay: -1s;
+  animation-delay: -1s;
 }
 
 @-webkit-keyframes sk-bounce {
-  0%, 100% { -webkit-transform: scale(0.0) }
-  50% { -webkit-transform: scale(1.0) }
+  0%,
+  100% {
+    -webkit-transform: scale(0);
+  }
+  50% {
+    -webkit-transform: scale(1);
+  }
 }
 
 @keyframes sk-bounce {
-  0%, 100% {
-    transform: scale(0.0);
-    -webkit-transform: scale(0.0);
-  } 50% {
-    transform: scale(1.0);
-    -webkit-transform: scale(1.0);
+  0%,
+  100% {
+    transform: scale(0);
+    -webkit-transform: scale(0);
+  }
+  50% {
+    transform: scale(1);
+    -webkit-transform: scale(1);
   }
 }

data/app/packs/stylesheets/spinner.css

@@ -0,0 +1,49 @@
+.button-spinner {
+  width: 24px;
+  height: 24px;
+
+  position: relative;
+  margin: 100px auto;
+}
+
+.button-spinner > .double-bounce1,
+.button-spinner > .double-bounce2 {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background-color: #333;
+  opacity: 0.5;
+  position: absolute;
+  top: 0;
+  left: 0;
+
+  -webkit-animation: sk-bounce 2s infinite ease-in-out;
+  animation: sk-bounce 2s infinite ease-in-out;
+}
+
+.button-spinner > .double-bounce2 {
+  -webkit-animation-delay: -1s;
+  animation-delay: -1s;
+}
+
+@-webkit-keyframes sk-bounce {
+  0%,
+  100% {
+    -webkit-transform: scale(0);
+  }
+  50% {
+    -webkit-transform: scale(1);
+  }
+}
+
+@keyframes sk-bounce {
+  0%,
+  100% {
+    transform: scale(0);
+    -webkit-transform: scale(0);
+  }
+  50% {
+    transform: scale(1);
+    -webkit-transform: scale(1);
+  }
+}

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

@@ -3,11 +3,11 @@
     data-controller="action"
     data-no-confirmation="<%= @action.no_confirmation %>"
     data-action-target="controllerDiv"
-    data-resource-name="<%= @resource.model_class.model_name.route_key %>"
+    data-resource-name="<%= @resource.model_key %>"
     data-resource-id="<%= params[:id] %>"
     class="hidden text-blue-gray-800"
   >
-    <%= form_with model: @model, scope: 'fields', url: "#{avo.root_path}resources/#{@resource.model_class.model_name.route_key}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
+    <%= 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| %>
         <% c.heading do %>
           <%= @action.action_name %>

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

@@ -3,7 +3,7 @@
     <%= a_button class: "focus:outline-none",
       color: 'light-blue',
       'data-action': "click->toggle-panel#togglePanel",
-      'data-actions-dropdown-button': @resource.model_class.model_name.route_key do
+      'data-actions-dropdown-button': @resource.model_key do
     %>
       <%= svg 'arrow-left', class: 'h-4 mr-1 transform -rotate-90' %> <%= t 'avo.actions' %>
     <% end %>
@@ -14,8 +14,8 @@
       <%
         @actions.each_with_index do |action, index|
           path = action_name == 'show' ?
-            "#{avo.root_path}resources/#{@resource.model_class.model_name.route_key}/#{@model.id}/actions/#{action.param_id}" :
-            "#{avo.root_path}resources/#{@resource.model_class.model_name.route_key}/actions/#{action.param_id}"
+            "#{@resource.record_path}/actions/#{action.param_id}" :
+            "#{@resource.records_path}/actions/#{action.param_id}"
           if action_name == 'show' || action.standalone
             disabled = false
           else

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

@@ -24,7 +24,7 @@
 
       <div class="p-4 border-gray-300 border-t">
         <% if params[:filters].present? %>
-          <%= a_link t('avo.reset_filters'), resources_path(@resource.model_class, 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: 'blue-gray', class: 'w-full justify-center' %>
         <% else %>
           <%= a_button t('avo.reset_filters'), color: 'blue-gray', class: 'w-full justify-center', disabled: true %>
         <% end %>

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

@@ -0,0 +1,3 @@
+<%= turbo_frame_wrap(params[:turbo_frame]) do %>
+  <%= render 'avo/partials/failed_state' %>
+<% end %>

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

@@ -0,0 +1,16 @@
+<%
+  classes = 'absolute inset-auto left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2'
+  label = t 'avo.failed_to_load'
+%>
+<div class="relative flex-1 py-12">
+  <div class="relative block text-gray-300 h-40 w-full">
+    <%= svg 'avocado', class: "#{classes} h-20 text-gray-400" %>
+    <%= svg 'code', class: "#{classes} h-8 -ml-20 -mt-12" %>
+    <%= svg 'fire', class: "#{classes} h-8 -ml-10 -mt-24" %>
+    <%= svg 'color-swatch', class: "#{classes} h-8 ml-8 -mt-24" %>
+    <%= svg 'globe', class: "#{classes} h-8 ml-20 -mt-12" %>
+    <%= svg 'library', class: "#{classes} h-8 -ml-20 mt-4" %>
+    <%= svg 'photograph', class: "#{classes} h-8 ml-20 mt-4" %>
+  </div>
+  <div class="relative block text-center text-lg text-gray-400 font-semibold -mt-10"><%= label %> <%= params[:turbo_frame].to_s.humanize.downcase if params[:turbo_frame].present? %></div>
+</div>

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

@@ -29,9 +29,9 @@
 
           <% per_page_options.each do |option| %>
             <% if @parent_resource.present? %>
-              <%= link_to "Change to #{option} items per page", related_resources_path(@parent_resource.model, @resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <%= link_to "Change to #{option} items per page", related_resources_path(@parent_resource.model_class, @resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
             <% else %>
-              <%= link_to "Change to #{option} items per page", resources_path(@resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <%= link_to "Change to #{option} items per page", resources_path(resource: @resource, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
             <% end %>
           <% end %>
         </div>

data/app/views/avo/relations/new.html.erb

@@ -22,8 +22,6 @@
         </div>
       </div>
 
-      <%#= form.hidden_field :resource_ids, value: params[:resource_ids], 'data-action-target': 'resourceIds' %>
-
       <% c.controls do %>
         <%= a_button t('avo.cancel'), 'data-action': 'click->modal#close', size: :sm %>
         <%= a_button t('avo.attach'), type: :submit, color: :green, size: :sm %>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -12,7 +12,7 @@
 
         <div class="w-full">
           <% 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.model_class) %>
+            <%= render Avo::NavigationLinkComponent.new label: resource.navigation_label, path: resources_path(resource: resource) %>
           <% end %>
 
           <% sidebar_partials = Avo::App.get_sidebar_partials %>

data/app/views/kaminari/_page.html.erb

@@ -1,4 +1,4 @@
-<% url = resources_path(@resource.model_class, page: page, keep_query_params: true) %>
+<% url = resources_path(resource: @resource, page: page, keep_query_params: true) %>
 <% if page.current? %>
   <button type="button" class="hidden md:inline-flex -ml-px relative items-center px-4 py-2 border bg-gray-100 text-sm leading-5 font-medium text-gray-700 hover:text-gray-500 z-10 outline-none border-primary-300 active:bg-gray-100 transition ease-in-out duration-150">
     <%= page %>

data/config/routes.rb

@@ -10,6 +10,8 @@ Avo::Engine.routes.draw do
     post "/resources/:resource_name/:id/attachments/", to: "attachments#create"
   end
 
+  get "failed_to_load", to: "home#failed_to_load"
+
   scope "resources", as: "resources" do
     # Attachments
     get "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#show"
@@ -24,10 +26,10 @@ Avo::Engine.routes.draw do
     instance_eval(&Avo::App.draw_routes)
 
     # Relations
-    get "/:resource_name/:id/:related_name/new", to: "relations#new"
-    get "/:resource_name/:id/:related_name/", to: "relations#index"
-    get "/:resource_name/:id/:related_name/:related_id", to: "relations#show"
-    post "/:resource_name/:id/:related_name", to: "relations#create"
-    delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy"
+    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"
   end
 end

data/lib/avo/app.rb

@@ -8,6 +8,7 @@ module Avo
     class_attribute :license, default: nil
     class_attribute :current_user, default: nil
     class_attribute :root_path, default: nil
+    class_attribute :view_context, default: nil
 
     class << self
       def boot
@@ -22,11 +23,12 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:, root_path:)
+      def init(request:, context:, current_user:, root_path:, view_context:)
         self.request = request
         self.context = context
         self.current_user = current_user
         self.root_path = root_path
+        self.view_context = view_context
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
 
@@ -167,13 +169,7 @@ module Avo
               resource.is_a? Class
             end
             .map do |resource|
-              route_key = if resource.model_class.present?
-                resource.model_class.model_name.plural.to_sym
-              else
-                resource.to_s.underscore.gsub("_resource", "").downcase.pluralize.to_sym
-              end
-
-              resources route_key
+              resources resource.new.model_key
             end
         end
       end