avo 1.4.0.pre.1 → 1.4.0

data/app/components/avo/fields/text_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/text_field/index_component.html.erb

@@ -0,0 +1,3 @@
+<%= index_field_wrapper field: @field do %>
+  <%= link_to_if @field.link_to_resource, @field.value, resource_path %>
+<% end %>

data/app/components/avo/fields/text_field/index_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextField::IndexComponent < Avo::Fields::IndexComponent
+end

data/app/components/avo/fields/text_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextField::ShowComponent < Avo::Fields::ShowComponent
+end

data/app/components/avo/{edit/fields/textarea_field_component.html.erb → fields/textarea_field/edit_component.html.erb}

@@ -3,5 +3,5 @@
     class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
     placeholder: @field.placeholder,
     disabled: @field.readonly,
-    rows: @field.meta[:rows] %>
+    rows: @field.rows %>
 <% end %>

data/app/components/avo/fields/textarea_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextareaField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/textarea_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextareaField::ShowComponent < Avo::Fields::ShowComponent
+end

data/app/components/avo/{edit/fields/trix_field_component.html.erb → fields/trix_field/edit_component.html.erb}

@@ -13,8 +13,7 @@
       id: trix_id,
       class: helpers.input_classes('w-full hidden', has_error: (@resource.model.present? and @resource.model.errors.include?(@field.id))),
       placeholder: @field.placeholder,
-      disabled: @field.readonly,
-      rows: @field.meta[:rows]
+      disabled: @field.readonly
     %>
   </div>
 <% end %>

data/app/components/avo/fields/trix_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/trix_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TrixField::ShowComponent < Avo::Fields::ShowComponent
+end

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

@@ -36,9 +36,8 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
-      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
-      <%#= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:via_resource_class] %>
+      <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_detach_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:turbo_frame] %>
     <% end %>
   <% end %>
 

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

@@ -8,7 +8,7 @@
     </div>
   </td>
   <% @resource.get_fields(reflection: @reflection).each_with_index do |field, index| %>
-    <%= index_field field, index, @resource %>
+    <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model) %>
   <% end %>
   <td class="text-right whitespace-nowrap px-2">
     <div class="flex items-center justify-end flex-grow-0 h-full w-full">

data/app/components/avo/panel_component.html.erb

@@ -1,7 +1,7 @@
 <div <%== data_attributes %>>
   <div class="mb-6">
     <div>
-      <% if show_breadcrumbs? %>
+      <% if display_breadcrumbs? %>
         <div class="breadcrumbs">
           <%= helpers.render_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
         </div>

data/app/components/avo/panel_component.rb

@@ -6,11 +6,11 @@ class Avo::PanelComponent < ViewComponent::Base
   renders_one :bare_content
   renders_one :footer
 
-  def initialize(title: nil, body_classes: nil, data: {}, show_breadcrumbs: true)
+  def initialize(title: nil, body_classes: nil, data: {}, display_breadcrumbs: false)
     @title = title
     @body_classes = body_classes
     @data = data
-    @show_breadcrumbs = show_breadcrumbs
+    @display_breadcrumbs = display_breadcrumbs
   end
 
   private
@@ -23,7 +23,7 @@ class Avo::PanelComponent < ViewComponent::Base
     end.join
   end
 
-  def show_breadcrumbs?
-    @show_breadcrumbs
+  def display_breadcrumbs?
+    @display_breadcrumbs
   end
 end

data/app/components/avo/views/resource_edit_component.html.erb

@@ -3,7 +3,7 @@
     <%= form_with model: @resource.model, url: helpers.resource_path(@resource.model), method: :put, multipart: true do |form| %>
       <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>
 
-      <%= render Avo::PanelComponent.new(title: resource_panel[:name]) do |c| %>
+      <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
             <%= a_link back_path do %>
@@ -20,7 +20,7 @@
 
         <% c.body do %>
           <% @resource.get_fields.each_with_index do |field, index| %>
-            <%= edit_field field, index, @resource, form unless field.computed %>
+            <%= render field.component_for_view(:edit).new(field: field, resource: @resource, index: index, form: form) unless field.computed %>
           <% end %>
         <% end %>
       <% end %>

data/app/components/avo/views/resource_index_component.html.erb

@@ -1,4 +1,4 @@
-<%= render Avo::PanelComponent.new title: title, body_classes: 'py-4', data: { component: 'resources-index' }, show_breadcrumbs: @reflection.blank? do |c| %>
+<%= render Avo::PanelComponent.new(title: title, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
   <% c.tools do %>
     <%= render 'actions' if @actions.present? %>
 
@@ -50,8 +50,8 @@
     <% end %>
   <% end %>
 
-  <% if view_type.to_sym == :grid %>
-    <% c.bare_content do %>
+  <% c.bare_content do %>
+    <% if view_type.to_sym == :grid %>
       <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
 
       <div class="bg-white rounded-xl shadow-xl mt-8 py-6">

data/app/components/avo/views/resource_new_component.html.erb

@@ -1,7 +1,7 @@
 <div>
   <% @resource.panels.each do |resource_panel| %>
     <%= form_with model: @resource.model, url: helpers.resources_path(@resource.model, via_relation_class: params[:via_relation_class], via_resource_id: params[:via_resource_id]), local: true, multipart: true do |form| %>
-      <%= render Avo::PanelComponent.new(title: resource_panel[:name]) do |c| %>
+      <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
             <%= a_link back_path do %>
@@ -16,7 +16,7 @@
 
         <% c.body do %>
           <% @resource.get_fields.each_with_index do |field, index| %>
-            <%= edit_field field, index, @resource, form unless field.computed %>
+            <%= render field.component_for_view(:edit).new(field: field, resource: @resource, index: index, form: form) unless field.computed %>
           <% end %>
         <% end %>
       <% end %>

data/app/components/avo/views/resource_show_component.html.erb

@@ -3,7 +3,7 @@
   data-selected-resources="[<%= @resource.model.id %>]"
 >
   <% @resource.panels.each do |resource_panel| %>
-    <%= render Avo::PanelComponent.new(title: resource_panel[:name], show_breadcrumbs: @reflection.blank?) do |c| %>
+    <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: @reflection.blank?) do |c| %>
       <% c.tools do %>
         <% if resource_panel[:name] == @resource.default_panel_name %>
           <%= render 'actions' %>
@@ -47,7 +47,7 @@
       <% c.body do %>
         <% if fields_by_panel[resource_panel[:name]].present? %>
           <% fields_by_panel[resource_panel[:name]].each_with_index do |field, index| %>
-            <%= show_field field, index, @resource %>
+            <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
           <% end %>
         <% end %>
       <% end %>
@@ -57,19 +57,19 @@
   <% if @reflection.blank? %>
     <% if has_one_panels.present? %>
       <% has_one_panels.each_with_index do |field, index| %>
-        <%= show_field field, index, @resource %>
+        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
 
     <% if has_many_panels.present? %>
       <% has_many_panels.each_with_index do |field, index| %>
-        <%= show_field field, index, @resource %>
+        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
 
     <% if has_as_belongs_to_many_panels.present? %>
       <% has_as_belongs_to_many_panels.each_with_index do |field, index| %>
-        <%= show_field field, index, @resource %>
+        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
   <% end %>

data/app/controllers/avo/base_controller.rb

@@ -53,7 +53,19 @@ module Avo
       @resource = @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
 
       @page_title = @resource.default_panel_name
-      add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+
+      # If we're accessing this resource via another resource add the parent to the breadcrumbs.
+      if params[:via_resource_class].present? && params[:via_resource_id].present?
+        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
+        via_model = via_resource.model_class.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)
+      else
+        add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+      end
+
       add_breadcrumb @resource.model_title
     end
 
@@ -70,7 +82,19 @@ module Avo
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       @page_title = @resource.default_panel_name
-      add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+
+      # If we're accessing this resource via another resource add the parent to the breadcrumbs.
+      if params[:via_resource_class].present? && params[:via_resource_id].present?
+        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
+        via_model = via_resource.model_class.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)
+      else
+        add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+      end
+
       add_breadcrumb @resource.model_title, resource_path(@resource.model)
       add_breadcrumb t("avo.edit").humanize
     end

data/app/controllers/avo/home_controller.rb

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

data/app/controllers/avo/search_controller.rb

@@ -8,7 +8,7 @@ module Avo
       @authorization.set_record(resource_model).authorize_action :index
       resources = []
 
-      App.get_resources
+      App.resources
         .select { |resource| resource.search.present? }
         .select { |resource| AuthorizationService.authorize_action _current_user, resource.model, "index" }
         .each do |resource_model|

data/app/helpers/avo/resources_helper.rb

@@ -14,50 +14,6 @@ module Avo
       }
     end
 
-    def index_field(field, index, resource)
-      component = field.component_name(:index)
-
-      if Object.const_defined? component
-        render component.safe_constantize.new(field: field, resource: resource, index: index)
-      else
-        render partial: field.partial_path_for(:index), locals: {
-          field: field,
-          index: index,
-          resource: resource
-        }
-      end
-    end
-
-    def show_field(field, index, resource)
-      component = field.component_name(:show)
-
-      if Object.const_defined? component
-        render component.safe_constantize.new(field: field, resource: resource, index: index)
-      else
-        render partial: field.partial_path_for(:show), locals: {
-          field: field,
-          index: index,
-          resource: resource
-        }
-      end
-    end
-
-    def edit_field(field, index, resource, form, displayed_in_modal: false)
-      component = field.component_name(:edit)
-
-      if Object.const_defined? component
-        render component.safe_constantize.new(field: field, resource: resource, index: index, form: form, displayed_in_modal: displayed_in_modal)
-      else
-        render partial: field.partial_path_for(:edit), locals: {
-          field: field,
-          index: index,
-          resource: resource,
-          form: form,
-          displayed_in_modal: displayed_in_modal
-        }
-      end
-    end
-
     def index_field_wrapper(**args, &block)
       render Index::FieldWrapperComponent.new(**args) do
         capture(&block)

data/app/packs/entrypoints/application.css

@@ -18,6 +18,7 @@
 
 @import './../stylesheets/components/status.css';
 @import './../stylesheets/components/code.css';
+@import './../stylesheets/components/progress.css';
 @import './../stylesheets/tailwindcss/components.css';
 
 @import './../stylesheets/tailwindcss/utilities.css';

data/app/packs/js/controllers/fields/key_value_controller.js

@@ -116,7 +116,6 @@ export default class extends Controller {
   data-index="${index}"
   ${this[`${id}InputDisabled`] ? "disabled='disabled'" : ''}
   value="${id === 'key' ? key : value}"
-  autofocus
 />`
   }
 

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

@@ -0,0 +1,13 @@
+progress {
+  @apply h-2 bg-white border border-gray-400 rounded shadow-inner;
+}
+progress[value]::-webkit-progress-bar {
+  @apply bg-white border border-gray-500 rounded shadow-inner;
+}
+progress[value]::-webkit-progress-value{
+  @apply bg-green-600 rounded;
+
+}
+progress[value]::-moz-progress-bar {
+  @apply bg-green-600 rounded appearance-none;
+}

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

@@ -21,7 +21,7 @@
 
         <% if @action.get_fields.present? %>
           <% @action.get_fields.each_with_index do |field, index| %>
-            <%= edit_field field, index, nil, form, displayed_in_modal: true %>
+            <%= render field.component_for_view(:edit).new field: field, resource: @resource, index: index, form: form, displayed_in_modal: true %>
           <% end %>
         <% end %>
 

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

@@ -0,0 +1,19 @@
+<div data-controller="toggle-panel">
+  <a href="javascript:void(0);" class="flex items-center cursor-pointer font-semibold text-gray-700" data-action="click->toggle-panel#togglePanel">
+    <% if _current_user.respond_to? 'avatar' %>
+      <%= image_tag _current_user.avatar, class: "h-12 rounded-full border-4 border-white mr-1" if _current_user.avatar.present? %>
+    <% end %>
+    <% if _current_user.name.present? %>
+      <%= _current_user.name %>
+    <% elsif _current_user.email.present? %>
+      <%= _current_user.email %>
+    <% else %>
+      Avo user
+    <% end %>
+    <%= svg 'chevron-down', class: "ml-1 h-4" %>
+  </a>
+
+  <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
+    <%= button_to "Sign out", main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+  </div>
+</div>

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

@@ -19,15 +19,18 @@
     <%= 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" v-if="layout !== 'blank'">
-        <div class="ml-6">
+      <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 justify-center">
-          <div class="w-64">
+          <div class="w-64 flex">
             <%# <resources-search :global="true"> %>
           </div>
         </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 %>">

data/avo.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
   spec.add_dependency "rails", ">= 6.0"
-  spec.add_dependency "pagy", ">= 3.1.3", "< 4.0"
+  spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk"
   spec.add_dependency "countries"
   spec.add_dependency "pundit"

data/db/factories.rb

@@ -13,6 +13,7 @@ FactoryBot.define do
     name { Faker::Company.name }
     description { Faker::Lorem.paragraph(sentence_count: 4) }
     url { Faker::Internet.url }
+    color { Faker::Color.hex_color }
   end
 
   factory :post do
@@ -24,6 +25,7 @@ FactoryBot.define do
         Time.now - rand(10...365).days
       end
     end
+    status { 0 }
   end
 
   factory :project do
@@ -36,5 +38,6 @@ FactoryBot.define do
     users_required { Faker::Number.between(from: 10, to: 100) }
     started_at { Time.now - rand(10...365).days }
     meta { [{foo: "bar", hey: "hi"}, {bar: "baz"}, {hoho: "hohoho"}].sample }
+    progress { Faker::Number.between(from: 0, to: 100) }
   end
 end