avo 1.21.0.pre.1 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2009c14b639e720209ef1c2d56c84ac7936cfa96cb71dd4306b02695cae3ade5
-  data.tar.gz: 4e99a479bc58b1da03e2e13f63e1921b1e652724b2d5b8d394964dad6a43a8ae
+  metadata.gz: ad998ae9691ee49081421f3db40c867fadf49c16d692722723277b43a631a1f7
+  data.tar.gz: 572ca7ed862e4e8bc3a784ed6c47402b5725ca9e99e286104f70739263e89590
 SHA512:
-  metadata.gz: 91a4af05f9cc03bdf76751a140697a0ef6d5782f5a049e39023d7dffba3074c16d01204f36608c2f8d776b6f3f72d885bd91f49b6e38ab14ac7b951df13667c9
-  data.tar.gz: 18d41c5e64b507ab27025b4af7fe7b99987d45897b6e717022fcebe8e5debd32dab26aa96a24611a8534ffcaa0f6744932d277d37421e1865722b0f728234516
+  metadata.gz: 3d69b2cb4c5691376fb8b3e7fcb26fabadde724d1de17fd015d03b94ddb4f833423bd018f033db10b02ad0c773d9151199d9c63acccdc59b707c9f8b18d42d8c
+  data.tar.gz: 40d1d605818269b2af621b3c4640a35117e4f53463151c0e339860ca763d8d8a04a7df4a56c1fa4f43ad8e8fa039ef61518055015bcc4d194cfaddcf430f048e

data/Gemfile

@@ -30,7 +30,7 @@ gem "rails", "~> 6.1.0"
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
 # Use Puma as the app server
-gem "puma", "~> 5.5.1"
+gem "puma", "~> 5.6.2"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem "jbuilder", "~> 2.7"
 # Use Redis adapter to run Action Cable in production
@@ -77,6 +77,8 @@ group :development do
   # gem 'ruby-prof'
 
   # gem 'pry-rails'
+
+  gem 'htmlbeautifier'
 end
 
 group :development, :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.21.0.pre.1)
+    avo (1.21.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -175,6 +175,7 @@ GEM
       rails (>= 6.0.0)
       stimulus-rails
       turbo-rails
+    htmlbeautifier (1.4.1)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -229,8 +230,6 @@ GEM
     nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -239,7 +238,7 @@ GEM
       ast (~> 2.4.1)
     pg (1.3.1)
     public_suffix (4.0.6)
-    puma (5.5.2)
+    puma (5.6.2)
       nio4r (~> 2.0)
     pundit (2.1.1)
       activesupport (>= 3.0.0)
@@ -419,6 +418,7 @@ DEPENDENCIES
   fuubar
   gem-release
   hotwire-rails
+  htmlbeautifier
   httparty
   image_processing (~> 1.2)
   iso
@@ -429,7 +429,7 @@ DEPENDENCIES
   meta-tags
   net-smtp
   pg (>= 0.18, < 2.0)
-  puma (~> 5.5.1)
+  puma (~> 5.6.2)
   pundit
   rails (~> 6.1.0)
   rails-controller-testing

data/app/assets/svgs/x.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+</svg>

data/app/components/avo/fields/belongs_to_field/autocomplete_component.html.erb

@@ -0,0 +1,22 @@
+<div data-controller="search" class="resource-search flex items-center h-full w-full" data-turbo-remove-before-cache>
+  <div class="w-full hidden"
+    data-search-target="autocomplete"
+    data-search-resource="<%= @model_key %>"
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-via-association="belongs_to"
+  ></div>
+  <div class="relative w-full" autocomplete="off">
+    <%= @form.text_field @field.foreign_key,
+      value: field_label,
+      class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)), 'data-search-target': 'button clearValue',
+      placeholder: @field.placeholder,
+      disabled: true %>
+    <div class="absolute top-1/2 left-auto right-3 mr-px -mt-2 cursor-pointer hidden text-gray-500"
+      data-tippy="tooltip"
+      data-search-target="clearButton"
+      title="<%= I18n.translate 'avo.clear_value' %>"
+      data-action="click->search#clearValue"
+      ><%= helpers.svg 'x', class: 'h-4' %></div>
+  </div>
+  <%= @form.hidden_field @foreign_key, value: field_value, 'data-search-target': 'hiddenId clearValue' %>
+</div>

data/app/components/avo/fields/belongs_to_field/autocomplete_component.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
+  def initialize(form:, field:, type: nil, model_key:, foreign_key:)
+    @form = form
+    @field = field
+    @type = type
+    @model_key = model_key
+    @foreign_key = foreign_key
+  end
+
+  def field_label
+    if searchable?
+      @field.value&.class == @type ? @field.field_label : nil
+    else
+      @field.field_label
+    end
+  end
+
+  def field_value
+    if searchable?
+      @field.value&.class == @type ? @field.field_value : nil
+    else
+      @field.field_value
+    end
+  end
+
+  private
+
+  def searchable?
+    @type.present?
+  end
+end

data/app/components/avo/fields/belongs_to_field/edit_component.html.erb

@@ -1,22 +1,34 @@
-<% if @field.types.present? %>
-  <div data-controller="belongs-to-field">
+<%
+  if @field.types.present? # It's a polymorphic association
+
+  # Set the model keys so we can pass them over
+  model_keys = @field.types.map do |type|
+    resource = Avo::App.get_resource_by_model_name(type.to_s)
+    [type.to_s, resource.model_key]
+  end.to_h
+%>
+  <div data-controller="belongs-to-field"
+    data-searchable="<%= @field.searchable %>"
+    data-association="<%= @field.id %>"
+    data-association-class="<%= @field&.target_resource&.model_class || nil %>"
+  >
     <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
       <%= @form.select "#{@field.foreign_key}_type", @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
         {
+          value: @field.value,
           include_blank: @field.placeholder,
         },
         {
           class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
           disabled: disabled,
           'data-belongs-to-field-target': "select",
-          'data-action': 'change->belongs-to-field#changedType'
+          'data-action': 'change->belongs-to-field#changeType'
         }
         %>
       <%
         # If the select field is disabled, no value will be sent. It's how HTML works.
         # Thus the extra hidden field to actually send the related id to the server.
-        if disabled
-      %>
+        if disabled %>
         <%= @form.hidden_field "#{@field.foreign_key}_type" %>
       <% end %>
     <% end %>
@@ -26,21 +38,18 @@
         data-type="<%= type %>"
       >
         <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: type.to_s.underscore.humanize do %>
-          <%= @form.select "#{@field.foreign_key}_id", @field.values_for_type(type),
-            {
-              include_blank: @field.placeholder,
-            },
-            {
-              class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-              disabled: disabled
-            }
+          <% if @field.searchable %>
+            <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form, field: @field, type: type, model_key: model_keys[type.to_s], foreign_key: "#{@field.foreign_key}_id" %>
+          <% else %>
+            <%= @form.select "#{@field.foreign_key}_id", options_for_select(@field.values_for_type(type), @field.value&.class == type ? @field.field_value : nil),
+              {
+                include_blank: @field.placeholder,
+              },
+              {
+                class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+                disabled: disabled
+              }
             %>
-          <%
-            # If the select field is disabled, no value will be sent. It's how HTML works.
-            # Thus the extra hidden field to actually send the related id to the server.
-            if disabled
-          %>
-            <%= @form.hidden_field "#{@field.foreign_key}_id" %>
           <% end %>
         <% end %>
       </div>
@@ -48,21 +57,18 @@
   </div>
 <% else %>
   <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-    <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
-      {
-        include_blank: @field.placeholder,
-      },
-      {
-        class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-        disabled: disabled
-      }
+    <% if @field.searchable %>
+      <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form, field: @field, model_key: @field.target_resource&.model_key, foreign_key: @field.foreign_key %>
+    <% else %>
+      <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
+        {
+          include_blank: @field.placeholder,
+        },
+        {
+          class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+          disabled: disabled
+        }
       %>
-    <%
-      # If the select field is disabled, no value will be sent. It's how HTML works.
-      # Thus the extra hidden field to actually send the related id to the server.
-      if disabled
-    %>
-      <%= @form.hidden_field @field.foreign_key %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -24,7 +24,7 @@
         data-selected-resources="[]"
       >
         <div class="flex items-center px-6 w-64">
-          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_class.model_name.plural} if @resource.search_query.present? %>
+          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_key} if @resource.search_query.present? %>
         </div>
         <div class="flex justify-end items-center px-6 space-x-3">
           <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>

data/app/controllers/avo/relations_controller.rb

@@ -4,11 +4,11 @@ module Avo
   class RelationsController < BaseController
     before_action :set_model, only: [:show, :index, :new, :create, :destroy]
     before_action :set_related_resource_name
-    before_action :set_related_resource
-    before_action :hydrate_related_resource
+    before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy]
+    before_action :hydrate_related_resource, only: [:show, :index, :new, :create, :destroy]
     before_action :set_related_model, only: [:show]
-    before_action :set_attachment_class
-    before_action :set_attachment_resource
+    before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy]
+    before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy]
     before_action :set_attachment_model, only: [:create, :destroy]
     before_action :set_reflection, only: [:index, :show]
 

data/app/controllers/avo/search_controller.rb

@@ -60,7 +60,6 @@ module Avo
           _id: model.id,
           _label: resource.label,
           _url: resource.record_path,
-          model: model
         }
 
         if App.license.has_with_trial(:enhanced_search_results)

data/app/javascript/js/controllers/fields/belongs_to_field_controller.js

@@ -1,65 +1,128 @@
 import { Controller } from 'stimulus'
 
 export default class extends Controller {
-  static targets = ['select', 'type']
+  static targets = ['select', 'type', 'loadAssociationLink'];
+
+  defaults = {};
 
   get selectedType() {
     return this.selectTarget.value
   }
 
-  connect() {
-    this.setValidNames()
-    this.changedType()
+  get isSearchable() {
+    return this.context.scope.element.dataset.searchable === 'true'
   }
 
-  setValidNames() {
-    this.typeTargets.forEach((target) => {
-      const { type } = target.dataset
-      const select = target.querySelector('select')
-      const name = select.getAttribute('name')
+  get association() {
+    return this.context.scope.element.dataset.association
+  }
 
-      select.setAttribute('valid-name', name)
-      if (this.selectedType !== type) {
-        select.selectedIndex = 0
-      }
-    })
+  get associationClass() {
+    return this.context.scope.element.dataset.associationClass
   }
 
-  changedType() {
-    this.hideAllTypeTargets()
-    this.enableType(this.selectTarget.value)
+  connect() {
+    this.copyValidNames()
+    this.changeType() // Do the initial type change
   }
 
-  hideAllTypeTargets() {
+  changeType() {
+    this.hideAllTypes()
+    this.showType(this.selectTarget.value)
+  }
+
+  // Private
+
+  hideAllTypes() {
     this.typeTargets.forEach((target) => {
-      this.hideTarget(target)
+      target.classList.add('hidden')
+
       this.invalidateTarget(target)
     })
   }
 
-  hideTarget(target) {
-    target.classList.add('hidden')
-  }
+  /**
+   * Used for invalidating select fields when switching between types so they don't automatically override the previous id.
+   * Ex: There are two types Article and Project and the Comment has commentable_id 3 and commentable_type: Article
+   * When you change the type from Project to Article the Project field will override the commentable_id value
+   * because it was rendered later (alphabetical sorting) and the browser will pick that one up.
+   * So we go and copy the name attribute to valid-name for all types and then copy it back to name when the user selects it.
+   */
 
-  invalidateTarget(target) {
-    const select = target.querySelector('select')
+  /**
+   * This method does the initial copying from name to valid-name.
+   */
+  copyValidNames() {
+    this.typeTargets.forEach((target) => {
+      const { type } = target.dataset
 
-    select.setAttribute('name', '')
-  }
+      if (this.isSearchable) {
+        const textInput = target.querySelector('input[type="text"]')
+        if (textInput) {
+          textInput.setAttribute('valid-name', textInput.getAttribute('name'))
+        }
 
-  validateTarget(target) {
-    const select = target.querySelector('select')
-    const validName = select.getAttribute('valid-name')
+        const hiddenInput = target.querySelector('input[type="hidden"]')
+        if (hiddenInput) {
+          hiddenInput.setAttribute(
+            'valid-name',
+            hiddenInput.getAttribute('name'),
+          )
+        }
+      } else {
+        const select = target.querySelector('select')
+        if (select) {
+          select.setAttribute('valid-name', select.getAttribute('name'))
+        }
 
-    select.setAttribute('name', validName)
+        if (this.selectedType !== type) {
+          select.selectedIndex = 0
+        }
+      }
+    })
   }
 
-  enableType(type) {
-    const target = this.typeTargets.find((typeTarget) => typeTarget.dataset.type === type)
-
+  showType(type) {
+    const target = this.typeTargets.find(
+      (typeTarget) => typeTarget.dataset.type === type,
+    )
     if (target) {
       target.classList.remove('hidden')
+
       this.validateTarget(target)
     }
   }
+
+  /**
+   * Copy value from `valid-name` to `name`
+   */
+  validateTarget(target) {
+    if (this.isSearchable) {
+      const textInput = target.querySelector('input[type="text"]')
+      const hiddenInput = target.querySelector('input[type="hidden"]')
+
+      textInput.setAttribute('name', textInput.getAttribute('valid-name'))
+      hiddenInput.setAttribute('name', hiddenInput.getAttribute('valid-name'))
+    } else {
+      const select = target.querySelector('select')
+      select.setAttribute('name', select.getAttribute('valid-name'))
+    }
+  }
+
+  /**
+   * nullify the `name` attribute
+   */
+  invalidateTarget(target) {
+    if (this.isSearchable) {
+      // Wrapping it in a try/catch to counter turbo's cache system (going back to the edit page after initial save)
+      try {
+        target.querySelector('input[type="text"]').setAttribute('name', '')
+        target.querySelector('input[type="hidden"]').setAttribute('name', '')
+      } catch {}
+    } else if (target) {
+      try {
+        target.querySelector('select').setAttribute('name', '')
+      } catch (error) {}
+    }
+  }
 }

data/app/javascript/js/controllers/search_controller.js

@@ -3,17 +3,40 @@ import * as Mousetrap from 'mousetrap'
 import { Controller } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
 import { autocomplete } from '@algolia/autocomplete-js'
+import URI from 'urijs'
 import debouncePromise from '../helpers/debounce_promise'
 
+/**
+ * The search controller is used in three places.
+ * 1. Global search (on the top navbar) and can search through multiple resources.
+ * 2. Resource search (on the Index page on top of the table panel) and will search one resource
+ * 3. belongs_to field. This requires a bit more cleanup because the user will not navigate away from the page.
+ * It will replace the id and label in some fields on the page and also needs a "clear" button which clears the information so the user can submit the form without a value.
+ */
 export default class extends Controller {
-  static targets = ['autocomplete', 'button']
+  static targets = [
+    'autocomplete',
+    'button',
+    'hiddenId',
+    'visibleLabel',
+    'clearValue',
+    'clearButton',
+  ];
+
+  debouncedFetch = debouncePromise(fetch, this.searchDebounce);
+
+  get dataset() {
+    return this.autocompleteTarget.dataset
+  }
 
-  debouncedFetch = debouncePromise(fetch, this.debounceTimeout)
+  get searchDebounce() {
+    return window.Avo.configuration.search_debounce
+  }
 
   get translationKeys() {
     let keys
     try {
-      keys = JSON.parse(this.autocompleteTarget.dataset.translationKeys)
+      keys = JSON.parse(this.dataset.translationKeys)
     } catch (error) {
       keys = {}
     }
@@ -21,20 +44,48 @@ export default class extends Controller {
     return keys
   }
 
-  get debounceTimeout() {
-    return this.autocompleteTarget.dataset.debounceTimeout
+  get isBelongsToSearch() {
+    return this.dataset.viaAssociation === 'belongs_to'
   }
 
-  get searchResource() {
-    return this.autocompleteTarget.dataset.searchResource
+  get isGlobalSearch() {
+    return this.dataset.searchResource === 'global'
   }
 
-  get isGlobalSearch() {
-    return this.searchResource === 'global'
+  searchUrl(query) {
+    const url = URI()
+
+    let params = { q: query }
+    let segments = [
+      window.Avo.configuration.root_path,
+      'avo_api',
+      this.dataset.searchResource,
+      'search',
+    ]
+
+    if (this.isGlobalSearch) {
+      segments = [window.Avo.configuration.root_path, 'avo_api', 'search']
+    }
+
+    if (this.isBelongsToSearch) {
+      // eslint-disable-next-line camelcase
+      params = { ...params, via_association: this.dataset.viaAssociation }
+    }
+
+    return url.segment(segments).search(params).toString()
   }
 
-  get searchUrl() {
-    return this.isGlobalSearch ? `${window.Avo.configuration.root_path}/avo_api/search` : `${window.Avo.configuration.root_path}/avo_api/${this.searchResource}/search`
+  handleOnSelect({ item }) {
+    if (this.isBelongsToSearch) {
+      this.hiddenIdTarget.setAttribute('value', item._id)
+      this.buttonTarget.setAttribute('value', item._label)
+
+      document.querySelector('.aa-DetachedOverlay').remove()
+
+      this.clearButtonTarget.classList.remove('hidden')
+    } else {
+      Turbo.visit(item._url, { action: 'advance' })
+    }
   }
 
   addSource(resourceName, data) {
@@ -43,9 +94,7 @@ export default class extends Controller {
     return {
       sourceId: resourceName,
       getItems: () => data.results,
-      onSelect({ item }) {
-        Turbo.visit(item._url, { action: 'replace' })
-      },
+      onSelect: that.handleOnSelect.bind(that),
       templates: {
         header() {
           return `${data.header.toUpperCase()} ${data.help}`
@@ -84,7 +133,10 @@ export default class extends Controller {
           })
         },
         noResults() {
-          return that.translationKeys.no_item_found.replace('%{item}', resourceName)
+          return that.translationKeys.no_item_found.replace(
+            '%{item}',
+            resourceName,
+          )
         },
       },
     }
@@ -94,11 +146,22 @@ export default class extends Controller {
     this.autocompleteTarget.querySelector('button').click()
   }
 
+  clearValue() {
+    this.clearValueTargets.map((e) => e.setAttribute('value', ''))
+    this.clearButtonTarget.classList.add('hidden')
+  }
+
   connect() {
     const that = this
 
     this.buttonTarget.onclick = () => this.showSearchPanel()
 
+    this.clearValueTargets.forEach((target) => {
+      if (target.getAttribute('value')) {
+        this.clearButtonTarget.classList.remove('hidden')
+      }
+    })
+
     if (this.isGlobalSearch) {
       Mousetrap.bind(['command+k', 'ctrl+k'], () => this.showSearchPanel())
     }
@@ -112,12 +175,15 @@ export default class extends Controller {
       openOnFocus: true,
       detachedMediaQuery: '',
       getSources: ({ query }) => {
-        const endpoint = `${that.searchUrl}?q=${query}`
+        const endpoint = that.searchUrl(query)
 
-        return that.debouncedFetch(endpoint)
+        return that
+          .debouncedFetch(endpoint)
           .then((response) => response.json())
           .then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])))
       },
     })
+
+    this.buttonTarget.removeAttribute('disabled')
   }
 }

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

@@ -3,7 +3,6 @@
     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' %>"}'
-    data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
   >
   </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"

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

@@ -2,4 +2,5 @@
   window.Avo = window.Avo || { configuration: {} }
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
   Avo.configuration.root_path = '<%= Avo::App.root_path %>'
+  Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
 <% end %>

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

@@ -3,7 +3,6 @@
     data-search-target="autocomplete"
     data-search-resource="<%= resource %>"
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
-    data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
   >
   </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>

data/db/factories.rb

@@ -45,6 +45,10 @@ FactoryBot.define do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
   end
 
+  factory :review do
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
+  end
+
   factory :person do
     name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
   end

data/lib/avo/fields/base_field.rb

@@ -136,7 +136,7 @@ module Avo
           end
         end
 
-        # Run callback block if present
+        # Run computable callback block if present
         if computable && block.present?
           final_value = instance_exec(@model, @resource, @view, self, &block)
         end