avo 1.25.2 → 2.0.0

data/app/controllers/avo/{relations_controller.rb → associations_controller.rb}

@@ -1,7 +1,7 @@
 require_dependency "avo/base_controller"
 
 module Avo
-  class RelationsController < BaseController
+  class AssociationsController < BaseController
     before_action :set_model, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
@@ -61,10 +61,8 @@ module Avo
       respond_to do |format|
         if @model.save
           format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
-          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 }
         end
       end
     end

data/app/controllers/avo/attachments_controller.rb

@@ -17,12 +17,8 @@ module Avo
       }
     end
 
-    def show
-    end
-
     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
+      attachment = ActiveStorage::Attachment.find(params[:attachment_id])
       path = resource_path(model: @model, resource: @resource)
 
       if attachment.present?

data/app/controllers/avo/base_controller.rb

@@ -13,14 +13,14 @@ module Avo
     before_action :cache_applied_filters, only: :index
 
     def index
-      @page_title = resource_name.humanize
-      add_breadcrumb resource_name.humanize
+      @page_title = @resource.plural_name.humanize
+      add_breadcrumb @resource.plural_name.humanize
 
       set_index_params
       set_filters
       set_actions
 
-      # If we don't get a query object predefined from a child controller like relations, just spin one up
+      # If we don't get a query object predefined from a child controller like associations, just spin one up
       unless defined? @query
         @query = @resource.class.query_scope
       end
@@ -30,7 +30,7 @@ module Avo
         @query = @query.unscoped
       end
 
-      # Eager load the relations
+      # Eager load the associations
       if @resource.includes.present?
         @query = @query.includes(*@resource.includes)
       end
@@ -62,9 +62,9 @@ module Avo
     def show
       set_actions
 
-      @resource = @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
+      @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
 
-      @page_title = @resource.default_panel_name
+      @page_title = @resource.default_panel_name.to_s
 
       # 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?
@@ -75,25 +75,26 @@ module Avo
         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: @resource)
+        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       end
 
       add_breadcrumb @resource.model_title
+      add_breadcrumb I18n.t("avo.details").upcase_first
     end
 
     def 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: @resource)
+      @page_title = @resource.default_panel_name.to_s
+      add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       add_breadcrumb t("avo.new").humanize
     end
 
     def edit
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
-      @page_title = @resource.default_panel_name
+      @page_title = @resource.default_panel_name.to_s
 
       # 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?
@@ -104,7 +105,7 @@ module Avo
         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: @resource)
+        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       end
 
       add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
@@ -155,11 +156,9 @@ module Avo
           end
 
           format.html { redirect_to redirect_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
-          format.json { render :show, status: :created, location: @model }
         else
-          flash[:error] = t "avo.you_missed_something_check_form"
+          flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :new, status: :unprocessable_entity }
-          format.json { render json: @model.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -172,11 +171,9 @@ module Avo
       respond_to do |format|
         if saved
           format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
-          format.json { render :show, status: :ok, location: @model }
         else
-          flash[:error] = t "avo.you_missed_something_check_form"
+          flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :edit, status: :unprocessable_entity }
-          format.json { render json: @model.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -291,13 +288,12 @@ 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, view: @view)
-          end
-          .select { |action| action.visible_in_view }
+      @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

data/app/controllers/avo/dashboards_controller.rb

@@ -0,0 +1,28 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class DashboardsController < ApplicationController
+    before_action :set_dashboard
+
+    def show
+    end
+
+    def card
+      @card = @dashboard.items.find do |item|
+        next unless item.is_card?
+
+        item.id.to_s == params[:card_id]
+      end.tap do |card|
+        card.hydrate(dashboard: @dashboard, params: params)
+      end
+    end
+
+    private
+
+    def set_dashboard
+      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil?
+    end
+  end
+end

data/app/controllers/avo/private_controller.rb

@@ -0,0 +1,8 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class PrivateController < ApplicationController
+    def design
+    end
+  end
+end

data/app/helpers/avo/application_helper.rb

@@ -16,8 +16,8 @@ module Avo
       }
     end
 
-    def empty_state(resource_name)
-      render partial: "avo/partials/empty_state", locals: {resource_name: resource_name}
+    def empty_state(**args)
+      render Avo::EmptyStateComponent.new **args
     end
 
     def turbo_frame_wrap(name, &block)
@@ -26,56 +26,26 @@ module Avo
       end
     end
 
-    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"
-      end
-
-      locals = {
-        label: label,
-        args: args
-      }
-
-      if block
-        render layout: "avo/partials/a_button", locals: locals do
-          capture(&block)
-        end
-      else
-        render partial: "avo/partials/a_button", locals: locals
+    def a_button(**args, &block)
+      render Avo::ButtonComponent.new(is_link: false, **args) do
+        capture(&block) if block_given?
       end
     end
 
-    def a_link(label, url = nil, **args, &block)
-      args[:class] = button_classes(args[:class], color: args[:color], variant: args[:variant], size: args[:size])
-
-      if block
-        url = label
-      end
-
-      locals = {
-        label: label,
-        url: url,
-        args: args
-      }
-
-      if block
-        render layout: "avo/partials/a_link", locals: locals do
-          capture(&block)
-        end
-      else
-        render partial: "avo/partials/a_link", locals: locals
+    def a_link(path = nil, **args, &block)
+      render Avo::ButtonComponent.new(path, is_link: true, **args) do
+        capture(&block) if block_given?
       end
     end
 
-    def button_classes(extra_classes = nil, color: nil, variant: nil, size: :md)
-      classes = "inline-flex flex-grow-0 items-center text-sm font-bold leading-none fill-current whitespace-nowrap transition duration-100 rounded-lg shadow-xl transform transition duration-100 active:translate-x-px active:translate-y-px cursor-pointer disabled:cursor-not-allowed #{extra_classes}"
+    def button_classes(extra_classes = nil, color: nil, variant: nil, size: :md, active: false)
+      classes = "inline-flex flex-grow-0 items-center text-sm font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 rounded transform transition duration-100 active:translate-x-px active:translate-y-px cursor-pointer disabled:cursor-not-allowed #{extra_classes}"
 
       if color.present?
         if variant.present? && (variant.to_sym == :outlined)
           classes += " bg-white border"
 
-          classes += " hover:border-#{color}-700 border-#{color}-600 text-#{color}-600 hover:text-#{color}-700 disabled:border-gray-300 disabled:text-gray-600"
+          classes += " hover:border-#{color}-700 border-#{color}-500 text-#{color}-600 hover:text-#{color}-700 disabled:border-gray-300 disabled:text-gray-600"
         else
           classes += " text-white bg-#{color}-500 hover:bg-#{color}-600 disabled:bg-#{color}-300"
         end
@@ -88,9 +58,11 @@ module Avo
       when :xs
         " p-2 py-1"
       when :sm
-        " p-3"
+        " py-1 px-4"
       when :md
-        " p-4"
+        " py-2 px-4"
+      when :xl
+        " py-3 px-4"
       else
         " p-4"
       end
@@ -100,9 +72,19 @@ module Avo
 
     def svg(file_name, **args)
       options = {}
-      options[:class] = args[:class].present? ? args[:class] : "h-4 mr-1"
+      options[:class] = args[:class].present? ? args[:class] : ""
       options[:class] += args[:extra_class].present? ? " #{args[:extra_class]}" : ""
 
+      if args[:'data-target'].present?
+        options[:'data-target'] = args[:'data-target']
+      end
+      if args[:'data-tippy'].present?
+        options[:'data-tippy'] = args[:'data-tippy']
+      end
+      if args[:title].present?
+        options[:title] = args[:title]
+      end
+
       # Create the path to the svgs directory
       file_path = "#{Avo::Engine.root}/app/assets/svgs/#{file_name}"
       file_path = "#{file_path}.svg" unless file_path.end_with? ".svg"
@@ -110,7 +92,7 @@ module Avo
       # Create a cache hash
       hash = Digest::MD5.hexdigest "#{file_path.underscore}_#{options}"
 
-      svg_content = Avo::App.cache_store.fetch "svg_file_#{hash}", expires_in: 1.year, cache_nils: false do
+      svg_content = Avo::App.cache_store.fetch "svg_file_#{hash}", expires_in: 1.week, cache_nils: false do
         if File.exist?(file_path)
           file = File.read(file_path)
 
@@ -134,12 +116,12 @@ module Avo
     end
 
     def input_classes(extra_classes = "", has_error: false)
-      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 = "appearance-none inline-flex bg-gray-100 disabled:cursor-not-allowed text-gray-600 disabled:opacity-50 rounded py-2 px-3 leading-tight border focus:border-gray-600 focus-visible:ring-0 focus:text-gray-700"
 
       classes += if has_error
         " border-red-600"
       else
-        " border-slate-300"
+        " border-gray-200"
       end
 
       classes += " #{extra_classes}"

data/app/helpers/avo/resources_helper.rb

@@ -47,7 +47,7 @@ module Avo
 
     def item_selector_input(floating: false, size: :md)
       "<input type='checkbox'
-        class='mx-3 #{"absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block" if floating} #{size.to_sym == :lg ? "w-5 h-5" : "w-4 h-4"}'
+        class='mx-3 rounded #{"absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block" if floating} #{size.to_sym == :lg ? "w-5 h-5" : "w-4 h-4"}'
         data-action='input->item-selector#toggle input->item-select-all#update'
         data-item-select-all-target='itemCheckbox'
         name='#{t "avo.select_item"}'
@@ -58,7 +58,7 @@ module Avo
 
     def item_select_all_input
       "<input type='checkbox'
-        class='mx-3 w-4 h-4'
+        class='mx-3 rounded w-4 h-4'
         data-action='input->item-select-all#toggle'
         data-item-select-all-target='checkbox'
         name='#{t "avo.select_all"}'

data/app/helpers/avo/url_helpers.rb

@@ -4,20 +4,16 @@ module Avo
       return if resource.nil?
 
       existing_params = {}
-      begin
-        if keep_query_params
+      if keep_query_params
+        begin
           existing_params =
             Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
+        rescue
         end
-      rescue
       end
 
-      # Create the `route_key` from the model key so the namespaced models get the proper path (SomeModule::Post -> some_module_post).
-      # Add the `_index` suffix for the uncountable models so they get the correct path (`fish_index`)
-      route_key = resource.model_key
-      route_key << "_index" if resource.model_name.singular == resource.model_name.plural
-
-      avo.send :"resources_#{route_key}_path", **existing_params, **args
+      # 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(

data/app/javascript/avo.js

@@ -8,16 +8,23 @@ import { Turbo } from '@hotwired/turbo-rails'
 import Rails from '@rails/ujs'
 import tippy from 'tippy.js'
 
+import 'chartkick/chart.js/chart.esm'
+
 // Toastr alerts
 import './js/active-storage'
 import './js/controllers'
-import './js/toastr'
 
 Rails.start()
 
 window.Turbolinks = Turbo
 
-Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: 'replace' }))
+let scrollTop = null
+Mousetrap.bind('r r r', () => {
+  // Cpture scroll position
+  scrollTop = document.scrollingElement.scrollTop
+
+  Turbo.visit(window.location.href, { action: 'replace' })
+})
 
 function isMac() {
   const isMac = window.navigator.userAgent.indexOf('Mac OS X')
@@ -36,6 +43,7 @@ function initTippy() {
     content(reference) {
       const title = reference.getAttribute('title')
       reference.removeAttribute('title')
+      reference.removeAttribute('data-tippy')
 
       return title
     },
@@ -49,6 +57,18 @@ document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
   initTippy()
   isMac()
+
+  // Restore scroll position after r r r turbo reload
+  if (scrollTop) {
+    setTimeout(() => {
+      document.scrollingElement.scrollTo(0, scrollTop)
+      scrollTop = 0
+    }, 50)
+  }
+})
+
+document.addEventListener('turbo:frame-load', () => {
+  initTippy()
 })
 
 document.addEventListener('turbo:before-fetch-response', (e) => {

data/app/javascript/js/application.js

@@ -1,5 +1,5 @@
+import { Alert, Popover } from 'tailwindcss-stimulus-components'
 import { Application } from '@hotwired/stimulus'
-import { Popover } from 'tailwindcss-stimulus-components'
 
 const application = Application.start()
 
@@ -8,6 +8,7 @@ application.debug = false
 window.Stimulus = application
 
 // Register stimulus-components controller
+application.register('alert', Alert)
 application.register('popover', Popover)
 
 export { application }

data/app/javascript/js/controllers/actions_picker_controller.js

@@ -4,30 +4,32 @@ import { Controller } from '@hotwired/stimulus'
 export default class extends Controller {
   static targets = ['resourceAction', 'standaloneAction']
 
+  static classes = ['enabled', 'disabled']
+
   target = {}
 
+  get targetIsDisabled() {
+    return this.target.dataset.disabled === 'true'
+  }
+
   enableTarget() {
-    if (this.targetIsDisabled(this.target)) {
-      this.target.classList.remove('cursor-wait', 'text-gray-500', 'hover:bg-blue-300')
-      this.target.classList.add('text-gray-700', 'hover:bg-blue-500')
+    if (this.targetIsDisabled) {
+      this.target.classList.remove(...this.disabledClasses)
+      this.target.classList.add(...this.enabledClasses)
       this.target.dataset.disabled = false
     }
   }
 
   disableTarget() {
-    this.target.classList.add('cursor-wait', 'text-gray-500', 'hover:bg-blue-300')
-    this.target.classList.remove('text-gray-700', 'hover:bg-blue-500')
+    this.target.classList.remove(...this.enabledClasses)
+    this.target.classList.add(...this.disabledClasses)
     this.target.dataset.disabled = true
   }
 
-  targetIsDisabled() {
-    return this.target.dataset.disabled === 'true'
-  }
-
   visitAction(event) {
     this.target = event.target
 
-    if (this.targetIsDisabled()) {
+    if (this.targetIsDisabled) {
       event.preventDefault()
 
       return

data/app/javascript/js/controllers/dashboard_card_controller.js

@@ -0,0 +1,33 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ['card'];
+
+  interval;
+
+  get parentTurboFrame() {
+    return this.context.scope.element.closest('turbo-frame')
+  }
+
+  get refreshInterval() {
+    if (this.cardTarget.dataset.refreshEvery) {
+      return parseInt(this.cardTarget.dataset.refreshEvery, 10) * 1000
+    }
+
+    return undefined
+  }
+
+  connect() {
+    if (this.refreshInterval) {
+      this.interval = setInterval(() => {
+        this.parentTurboFrame.reload()
+      }, this.refreshInterval)
+    }
+  }
+
+  cardTargetDisconnected() {
+    if (this.interval) {
+      clearInterval(this.interval)
+    }
+  }
+}

data/app/javascript/js/controllers/item_selector_controller.js

@@ -5,6 +5,10 @@ export default class extends Controller {
 
   checkbox = {};
 
+  enabledClasses = ['text-black', 'hover:bg-blue-500', 'hover:text-white']
+
+  disabledClasses = ['text-gray-500']
+
   get actionsPanelPresent() {
     return this.actionsButtonElement !== null
   }
@@ -72,8 +76,8 @@ export default class extends Controller {
 
   enableResourceActions() {
     this.actionLinks.forEach((link) => {
-      link.classList.add('text-gray-700')
-      link.classList.remove('text-gray-500')
+      link.classList.add(...this.enabledClasses)
+      link.classList.remove(...this.disabledClasses)
       link.setAttribute('data-href', link.getAttribute('href'))
       link.dataset.disabled = false
     })
@@ -81,8 +85,8 @@ export default class extends Controller {
 
   disableResourceActions() {
     this.actionLinks.forEach((link) => {
-      link.classList.remove('text-gray-700')
-      link.classList.add('text-gray-500')
+      link.classList.remove(...this.enabledClasses)
+      link.classList.add(...this.disabledClasses)
       link.setAttribute('href', link.getAttribute('data-href'))
       link.dataset.disabled = true
     })

data/app/javascript/js/controllers/mobile_controller.js

@@ -0,0 +1,9 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ['sidebar']
+
+  toggleSidebar() {
+    this.sidebarTarget.classList.toggle('hidden')
+  }
+}

data/app/javascript/js/controllers/select_controller.js

@@ -0,0 +1,23 @@
+import { Controller } from '@hotwired/stimulus'
+import URI from 'urijs'
+
+export default class extends Controller {
+  static targets = ['select']
+
+  get parentTurboFrame() {
+    return this.context.scope.element.closest('turbo-frame')
+  }
+
+  onChange(e) {
+    if (!this.parentTurboFrame.src) return
+
+    // Get the frame URL
+    const url = new URI(this.parentTurboFrame.src)
+    // update the url with the new range param
+    url.search({ ...url.query(true), range: e.currentTarget.value })
+    // change the src of the frame
+    this.parentTurboFrame.src = url.toString()
+    // reload the frame with new range
+    this.parentTurboFrame.reload()
+  }
+}

data/app/javascript/js/controllers.js

@@ -7,6 +7,7 @@ import AttachmentsController from './controllers/attachments_controller'
 import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
 import BooleanFilterController from './controllers/boolean_filter_controller'
 import CodeFieldController from './controllers/fields/code_field_controller'
+import DashboardCardController from './controllers/dashboard_card_controller'
 import DateFieldController from './controllers/fields/date_field_controller'
 import FilterController from './controllers/filter_controller'
 import HiddenInputController from './controllers/hidden_input_controller'
@@ -14,10 +15,12 @@ import ItemSelectAllController from './controllers/item_select_all_controller'
 import ItemSelectorController from './controllers/item_selector_controller'
 import KeyValueController from './controllers/fields/key_value_controller'
 import LoadingButtonController from './controllers/loading_button_controller'
+import MobileController from './controllers/mobile_controller'
 import ModalController from './controllers/modal_controller'
 import MultipleSelectFilterController from './controllers/multiple_select_filter_controller'
 import PerPageController from './controllers/per_page_controller'
 import SearchController from './controllers/search_controller'
+import SelectController from './controllers/select_controller'
 import SelectFilterController from './controllers/select_filter_controller'
 import SimpleMdeController from './controllers/fields/simple_mde_controller'
 import TextFilterController from './controllers/text_filter_controller'
@@ -30,15 +33,18 @@ application.register('actions-picker', ActionsPickerController)
 application.register('alerts', AlertsController)
 application.register('attachments', AttachmentsController)
 application.register('boolean-filter', BooleanFilterController)
+application.register('dashboard-card', DashboardCardController)
 application.register('filter', FilterController)
 application.register('hidden-input', HiddenInputController)
 application.register('item-select-all', ItemSelectAllController)
 application.register('item-selector', ItemSelectorController)
 application.register('loading-button', LoadingButtonController)
+application.register('mobile', MobileController)
 application.register('modal', ModalController)
 application.register('multiple-select-filter', MultipleSelectFilterController)
 application.register('per-page', PerPageController)
 application.register('search', SearchController)
+application.register('select', SelectController)
 application.register('select-filter', SelectFilterController)
 application.register('text-filter', TextFilterController)
 application.register('tippy', TippyController)