avo 2.16.0 → 2.16.1.pre.1.nativefields

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

@@ -21,6 +21,10 @@ export default class extends Controller {
     disableMobile: Boolean,
   }
 
+  flatpickrInstance;
+
+  cachedInitialValue;
+
   get browserZone() {
     const time = DateTime.local()
 
@@ -59,6 +63,10 @@ export default class extends Controller {
   }
 
   connect() {
+    // Cache the initial value so we can fill it back on disconnection.
+    // We do that so the JS parser will continue to work when the user hits the back button to return on this page.
+    this.cacheInitialValue()
+
     if (this.isOnShow || this.isOnIndex) {
       this.initShow()
     } else if (this.isOnEdit) {
@@ -66,6 +74,18 @@ export default class extends Controller {
     }
   }
 
+  disconnect() {
+    if (this.isOnShow || this.isOnIndex) {
+      this.context.element.innerText = this.cachedInitialValue
+    } else if (this.isOnEdit) {
+      if (this.flatpickrInstance) this.flatpickrInstance.destroy()
+    }
+  }
+
+  cacheInitialValue() {
+    this.cachedInitialValue = this.initialValue
+  }
+
   // Turns the value in the controller wrapper into the timezone of the browser
   initShow() {
     let value = this.parsedValue
@@ -115,7 +135,7 @@ export default class extends Controller {
       options.defaultDate = universalTimestamp(this.initialValue)
     }
 
-    flatpickr(this.fakeInputTarget, options)
+    this.flatpickrInstance = flatpickr(this.fakeInputTarget, options)
 
     if (this.enableTimeValue) {
       this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())

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

@@ -25,6 +25,8 @@ export default class extends Controller {
 
   debouncedFetch = debouncePromise(fetch, this.searchDebounce);
 
+  destroyMethod;
+
   get dataset() {
     return this.autocompleteTarget.dataset
   }
@@ -56,97 +58,52 @@ export default class extends Controller {
     return this.dataset.searchResource === 'global'
   }
 
-  searchUrl(query) {
-    const url = URI()
-
-    return url.segment(this.searchSegments()).search(this.searchParams(query)).toString()
-  }
-
-  searchSegments() {
-    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']
-    }
-
-    return segments
-  }
-
-  searchParams(query) {
-    let params = {
-      q: query,
-      global: false,
-    }
-
-    if (this.isGlobalSearch) {
-      params.global = true
-    }
+  connect() {
+    const that = this
 
-    if (this.isBelongsToSearch || this.isHasManySearch) {
-      params = this.addAssociationParams(params)
-      params = this.addReflectionParams(params)
+    this.buttonTarget.onclick = () => this.showSearchPanel()
 
-      if (this.isBelongsToSearch) {
-        params = {
-          ...params,
-          // eslint-disable-next-line camelcase
-          via_parent_resource_id: this.dataset.viaParentResourceId,
-          // eslint-disable-next-line camelcase
-          via_parent_resource_class: this.dataset.viaParentResourceClass,
-          // eslint-disable-next-line camelcase
-          via_relation: this.dataset.viaRelation,
-        }
+    this.clearValueTargets.forEach((target) => {
+      if (target.getAttribute('value') && this.hasClearButtonTarget) {
+        this.clearButtonTarget.classList.remove('hidden')
       }
-    }
-
-    return params
-  }
+    })
 
-  addAssociationParams(params) {
-    params = {
-      ...params,
-      // eslint-disable-next-line camelcase
-      via_association: this.dataset.viaAssociation,
-      // eslint-disable-next-line camelcase
-      via_association_id: this.dataset.viaAssociationId,
+    if (this.isGlobalSearch) {
+      Mousetrap.bind(['command+k', 'ctrl+k'], () => this.showSearchPanel())
     }
 
-    return params
-  }
-
-  addReflectionParams(params) {
-    params = {
-      ...params,
-      // eslint-disable-next-line camelcase
-      via_reflection_class: this.dataset.viaReflectionClass,
-      // eslint-disable-next-line camelcase
-      via_reflection_id: this.dataset.viaReflectionId,
-    }
+    autocomplete({
+      container: this.autocompleteTarget,
+      placeholder: this.translationKeys.placeholder,
+      translations: {
+        detachedCancelButtonText: this.translationKeys.cancel_button,
+      },
+      autoFocus: true,
+      openOnFocus: true,
+      detachedMediaQuery: '',
+      getSources: ({ query }) => {
+        document.body.classList.add('search-loading')
+        const endpoint = that.searchUrl(query)
 
-    return params
-  }
+        return that
+          .debouncedFetch(endpoint)
+          .then((response) => {
+            document.body.classList.remove('search-loading')
 
-  handleOnSelect({ item }) {
-    if (this.isBelongsToSearch) {
-      this.updateFieldAttribute(this.hiddenIdTarget, 'value', item._id)
-      this.updateFieldAttribute(this.buttonTarget, 'value', item._label)
+            return response.json()
+          })
+          .then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])))
+      },
+    })
 
-      document.querySelector('.aa-DetachedOverlay').remove()
+    // document.addEventListener('turbo:before-render', destroy)
+    // this.destroyMethod = destroy
 
-      if (this.hasClearButtonTarget) {
-        this.clearButtonTarget.classList.remove('hidden')
-      }
-    } else {
-      Turbo.visit(item._url, { action: 'advance' })
+    // When using search for belongs-to
+    if (this.buttonTarget.dataset.shouldBeDisabled !== 'true') {
+      this.buttonTarget.removeAttribute('disabled')
     }
-
-    // On searchable belongs to the class `aa-Detached` remains on the body making it unscrollable
-    document.body.classList.remove('aa-Detached')
   }
 
   addSource(resourceName, data) {
@@ -221,59 +178,106 @@ export default class extends Controller {
     }
   }
 
-  showSearchPanel() {
-    this.autocompleteTarget.querySelector('button').click()
+  handleOnSelect({ item }) {
+    if (this.isBelongsToSearch) {
+      this.updateFieldAttribute(this.hiddenIdTarget, 'value', item._id)
+      this.updateFieldAttribute(this.buttonTarget, 'value', item._label)
+
+      document.querySelector('.aa-DetachedOverlay').remove()
+
+      if (this.hasClearButtonTarget) {
+        this.clearButtonTarget.classList.remove('hidden')
+      }
+    } else {
+      Turbo.visit(item._url, { action: 'advance' })
+    }
+
+    // On searchable belongs to the class `aa-Detached` remains on the body making it unscrollable
+    document.body.classList.remove('aa-Detached')
   }
 
-  clearValue() {
-    this.clearValueTargets.map((t) => this.updateFieldAttribute(t, 'value', ''))
-    this.clearButtonTarget.classList.add('hidden')
+  searchUrl(query) {
+    const url = URI()
+
+    return url.segment(this.searchSegments()).search(this.searchParams(query)).toString()
   }
 
-  connect() {
-    const that = this
+  searchSegments() {
+    let segments = [
+      window.Avo.configuration.root_path,
+      'avo_api',
+      this.dataset.searchResource,
+      'search',
+    ]
 
-    this.buttonTarget.onclick = () => this.showSearchPanel()
+    if (this.isGlobalSearch) {
+      segments = [window.Avo.configuration.root_path, 'avo_api', 'search']
+    }
 
-    this.clearValueTargets.forEach((target) => {
-      if (target.getAttribute('value') && this.hasClearButtonTarget) {
-        this.clearButtonTarget.classList.remove('hidden')
-      }
-    })
+    return segments
+  }
+
+  searchParams(query) {
+    let params = {
+      q: query,
+      global: false,
+    }
 
     if (this.isGlobalSearch) {
-      Mousetrap.bind(['command+k', 'ctrl+k'], () => this.showSearchPanel())
+      params.global = true
     }
 
-    const { destroy } = autocomplete({
-      container: this.autocompleteTarget,
-      placeholder: this.translationKeys.placeholder,
-      translations: {
-        detachedCancelButtonText: this.translationKeys.cancel_button,
-      },
-      openOnFocus: true,
-      detachedMediaQuery: '',
-      getSources: ({ query }) => {
-        document.body.classList.add('search-loading')
-        const endpoint = that.searchUrl(query)
+    if (this.isBelongsToSearch || this.isHasManySearch) {
+      params = this.addAssociationParams(params)
+      params = this.addReflectionParams(params)
 
-        return that
-          .debouncedFetch(endpoint)
-          .then((response) => {
-            document.body.classList.remove('search-loading')
+      if (this.isBelongsToSearch) {
+        params = {
+          ...params,
+          // eslint-disable-next-line camelcase
+          via_parent_resource_id: this.dataset.viaParentResourceId,
+          // eslint-disable-next-line camelcase
+          via_parent_resource_class: this.dataset.viaParentResourceClass,
+          // eslint-disable-next-line camelcase
+          via_relation: this.dataset.viaRelation,
+        }
+      }
+    }
 
-            return response.json()
-          })
-          .then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])))
-      },
-    })
+    return params
+  }
 
-    document.addEventListener('turbo:before-render', destroy)
+  addAssociationParams(params) {
+    params = {
+      ...params,
+      // eslint-disable-next-line camelcase
+      via_association: this.dataset.viaAssociation,
+      // eslint-disable-next-line camelcase
+      via_association_id: this.dataset.viaAssociationId,
+    }
 
-    // When using search for belongs-to
-    if (this.buttonTarget.dataset.shouldBeDisabled !== 'true') {
-      this.buttonTarget.removeAttribute('disabled')
+    return params
+  }
+
+  addReflectionParams(params) {
+    params = {
+      ...params,
+      // eslint-disable-next-line camelcase
+      via_reflection_class: this.dataset.viaReflectionClass,
+      // eslint-disable-next-line camelcase
+      via_reflection_id: this.dataset.viaReflectionId,
     }
+
+    return params
+  }
+
+  showSearchPanel() {
+    this.autocompleteTarget.querySelector('button').click()
+  }
+
+  clearValue() {
+    this.clearValueTargets.map((target) => this.updateFieldAttribute(target, 'value', ''))
+    this.clearButtonTarget.classList.add('hidden')
   }
 
   // Private

data/avo.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "active_link_to"
   spec.add_dependency "image_processing"
   spec.add_dependency "view_component", "2.60"
-  spec.add_dependency "hotwire-rails"
+  spec.add_dependency "turbo-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/base_resource.rb

@@ -30,6 +30,7 @@ module Avo
     class_attribute :search_query, default: nil
     class_attribute :search_query_help, default: ""
     class_attribute :includes, default: []
+    class_attribute :authorization_policy
     class_attribute :translation_key
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
@@ -92,7 +93,7 @@ module Avo
       end
 
       def authorization
-        Avo::Services::AuthorizationService.new Avo::App.current_user
+        Avo::Services::AuthorizationService.new Avo::App.current_user, model_class, policy_class: authorization_policy
       end
 
       def order_actions
@@ -285,8 +286,9 @@ module Avo
       model
     end
 
-    def authorization
-      Avo::Services::AuthorizationService.new(user, model || model_class)
+    def authorization(user: nil)
+      current_user = user || Avo::App.current_user
+      Avo::Services::AuthorizationService.new(current_user, model || model_class, policy_class: authorization_policy)
     end
 
     def file_hash

data/lib/avo/concerns/fetches_things.rb

@@ -48,9 +48,11 @@ module Avo
         end
 
         # Returns the Avo resource by singular snake_cased name
+        # From all the resources that use the same model_class, it will fetch the first one in alphabetical order
         #
         # get_resource_by_name('User') => UserResource
         # get_resource_by_name(User) => UserResource
+
         def get_resource_by_model_name(klass)
           # Fetch the mappings imposed by the user.
           # If they are present, use those ones.

data/lib/avo/fields/base_field.rb

@@ -76,6 +76,8 @@ module Avo
         @as_description = args[:as_description] || false
         @index_text_align = args[:index_text_align] || :left
         @html = args[:html] || nil
+        @view = args[:view] || nil
+        @value = args[:value] || nil
 
         @args = args
 
@@ -155,6 +157,8 @@ module Avo
       end
 
       def value(property = nil)
+        return @value if @value.present?
+
         property ||= id
 
         # Get model value

data/lib/avo/fields/select_field.rb

@@ -30,6 +30,7 @@ module Avo
           if display_value
             options.invert
           else
+            # We need to use the label attribute as the option value because Rails casts it like that
             options.map { |label, value| [label, label] }.to_h
           end
         elsif display_value

data/lib/avo/menu/menu.rb

@@ -1,2 +1,4 @@
 class Avo::Menu::Menu < OpenStruct
+
+
 end

data/lib/avo/services/authorization_service.rb

@@ -5,13 +5,14 @@ module Avo
       attr_accessor :record
 
       class << self
-        def authorize(user, record, action, **args)
+        def authorize(user, record, action, policy_class: nil, **args)
           return true if skip_authorization
           return true if user.nil?
 
+          policy_class ||= Pundit.policy(user, record)&.class
           begin
-            if Pundit.policy user, record
-              Pundit.authorize user, record, action
+            if policy_class&.new(user, record)
+              Pundit.authorize user, record, action, policy_class: policy_class
             end
 
             true
@@ -28,7 +29,7 @@ module Avo
           end
         end
 
-        def authorize_action(user, record, action, **args)
+        def authorize_action(user, record, action, policy_class: nil, **args)
           action = Avo.configuration.authorization_methods.stringify_keys[action.to_s] || action
 
           # If no action passed we should raise error if the user wants that.
@@ -41,16 +42,18 @@ module Avo
 
           # Add the question mark if it's missing
           action = "#{action}?" unless action.end_with? "?"
-
-          authorize user, record, action, **args
+          authorize(user, record, action, policy_class: policy_class, **args)
         end
 
-        def apply_policy(user, model)
-          return model if skip_authorization
-          return model if user.nil?
+        def apply_policy(user, model, policy_class: nil)
+          return model if skip_authorization || user.nil?
 
           begin
-            Pundit.policy_scope! user, model
+            if policy_class
+              policy_class::Scope.new(user, model).resolve
+            else
+              Pundit.policy_scope! user, model
+            end
           rescue Pundit::NotDefinedError => e
             return model unless Avo.configuration.raise_error_on_missing_policy
 
@@ -68,12 +71,12 @@ module Avo
           end.to_h
         end
 
-        def get_policy(user, record)
-          Pundit.policy user, record
-        end
+        def defined_methods(user, record, policy_class: nil, **args)
+          return Pundit.policy!(user, record).methods if policy_class.nil?
 
-        def defined_methods(user, record, **args)
-          Pundit.policy!(user, record).methods
+          # I'm aware this will not raise a Pundit error.
+          # Should the policy not exist, it will however raise an uninitialized constant error, which is probably what we want when specifying a custom policy
+          policy_class.new(user, record).methods
         rescue Pundit::NotDefinedError => e
           return [] unless Avo.configuration.raise_error_on_missing_policy
 
@@ -87,13 +90,14 @@ module Avo
         end
       end
 
-      def initialize(user = nil, record = nil)
+      def initialize(user = nil, record = nil, policy_class: nil)
         @user = user
         @record = record
+        @policy_class = policy_class || Pundit.policy(user, record)&.class
       end
 
       def authorize(action, **args)
-        self.class.authorize(user, record, action, **args)
+        self.class.authorize(user, record, action, policy_class: @policy_class, **args)
       end
 
       def set_record(record)
@@ -109,15 +113,15 @@ module Avo
       end
 
       def authorize_action(action, **args)
-        self.class.authorize_action(user, record, action, **args)
+        self.class.authorize_action(user, record, action, policy_class: @policy_class, **args)
       end
 
       def apply_policy(model)
-        self.class.apply_policy(user, model)
+        self.class.apply_policy(user, model, policy_class: @policy_class)
       end
 
       def defined_methods(model, **args)
-        self.class.defined_methods(user, model, **args)
+        self.class.defined_methods(user, model, policy_class: @policy_class, **args)
       end
 
       def has_method?(method, **args)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.16.0" unless const_defined?(:VERSION)
+  VERSION = "2.16.1.pre.1.nativefields" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/field/components/edit_component.html.erb.tt

@@ -1,4 +1,4 @@
-<%%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%%= field_wrapper **field_wrapper_args do %>
   <%%= @form.text_field @field.id,
     class: classes("w-full"),
     placeholder: @field.placeholder,

data/lib/generators/avo/templates/field/components/show_component.html.erb.tt

@@ -1,3 +1,3 @@
-<%%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%%= field_wrapper **field_wrapper_args do %>
   <%%= @field.value %>
 <%% end %>

data/public/avo-assets/avo.base.css

@@ -6445,6 +6445,11 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-right:1.5rem
 }
 
+.-mx-4{
+  margin-left:-1rem;
+  margin-right:-1rem
+}
+
 .mt-3{
   margin-top:0.75rem
 }
@@ -6573,10 +6578,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-left:auto
 }
 
-.mt-12{
-  margin-top:3rem
-}
-
 .-mb-2{
   margin-bottom:-0.5rem
 }
@@ -6585,6 +6586,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-top:1.5rem
 }
 
+.mt-12{
+  margin-top:3rem
+}
+
 .mr-px{
   margin-right:1px
 }
@@ -6865,6 +6870,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   flex-grow:0
 }
 
+.flex-grow{
+  flex-grow:1
+}
+
 .-translate-x-1\/2{
   --tw-translate-x:-50%;
   transform:translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))
@@ -8076,6 +8085,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   opacity:1
 }
 
+.opacity-80{
+  opacity:0.8
+}
+
 .shadow-panel{
   --tw-shadow:0px 4px 8px rgba(0, 0, 0, 0.04), 0px 0px 2px rgba(0, 0, 0, 0.06), 0px 0px 1px rgba(0, 0, 0, 0.04);
   --tw-shadow-colored:0px 4px 8px var(--tw-shadow-color), 0px 0px 2px var(--tw-shadow-color), 0px 0px 1px var(--tw-shadow-color);
@@ -8120,6 +8133,11 @@ trix-toolbar .trix-button-group:not(:first-child){
   filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)
 }
 
+.sepia{
+  --tw-sepia:sepia(100%);
+  filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)
+}
+
 .filter{
   filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)
 }
@@ -9580,13 +9598,13 @@ trix-editor {
     padding-right:1.5rem
   }
 
-  .md\:pb-0{
-    padding-bottom:0px
-  }
-
   .md\:pt-0{
     padding-top:0px
   }
+
+  .md\:pb-0{
+    padding-bottom:0px
+  }
 }
 
 @media (min-width: 1024px){