avo 1.21.1.pre.1 → 1.22.1.pre.2

data/db/factories.rb

@@ -42,11 +42,11 @@ FactoryBot.define do
   end
 
   factory :comment do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)) }
   end
 
   factory :review do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)) }
   end
 
   factory :person do
@@ -58,11 +58,15 @@ FactoryBot.define do
     type { "Spouse" }
   end
 
+  factory :fish do
+    name { %w[Tilapia Salmon Trout Catfish Pangasius Carp].sample }
+  end
+
   factory :course do
-    name { Faker::Company.name }
+    name { Faker::Educator.unique.course_name }
   end
 
-  factory :link do
-    name { Faker::Internet.url }
+  factory :course_link, class: "Course::Link" do
+    link { Faker::Internet.url }
   end
 end

data/lib/avo/base_resource.rb

@@ -6,7 +6,7 @@ module Avo
 
     include ActionView::Helpers::UrlHelper
 
-    delegate :view_context, to: 'Avo::App'
+    delegate :view_context, to: "Avo::App"
     delegate :main_app, to: :view_context
     delegate :avo, to: :view_context
     delegate :resource_path, to: :view_context
@@ -21,7 +21,7 @@ module Avo
     class_attribute :title, default: :id
     class_attribute :description, default: :id
     class_attribute :search_query, default: nil
-    class_attribute :search_query_help, default: ''
+    class_attribute :search_query_help, default: ""
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
@@ -60,7 +60,7 @@ module Avo
       # This is the search_query scope
       # This should be removed and passed to the search block
       def scope
-        self.query_scope
+        query_scope
       end
 
       # This resolves the scope when doing "where" queries (not find queries)
@@ -128,17 +128,19 @@ module Avo
         end
         .select do |field|
           # Strip out the reflection field in index queries with a parent association.
-          if reflection.present? &&
-              reflection.options.present? &&
-              field.respond_to?(:polymorphic_as) &&
-              field.polymorphic_as.to_s == reflection.options[:as].to_s
-            next
-          end
-          if field.respond_to?(:foreign_key) &&
-              reflection.present? &&
-              reflection.respond_to?(:foreign_key) &&
-              reflection.foreign_key != field.foreign_key
-            next
+          if reflection.present?
+            if reflection.options.present? &&
+                field.respond_to?(:polymorphic_as) &&
+                field.polymorphic_as.to_s == reflection.options[:as].to_s
+              next
+            end
+
+            if field.respond_to?(:foreign_key) &&
+                reflection.respond_to?(:foreign_key) &&
+                reflection.foreign_key != field.foreign_key &&
+                @params[:resource_name] == field.resource.model_key
+              next
+            end
           end
 
           true

data/lib/avo/fields/base_field.rb

@@ -128,11 +128,14 @@ module Avo
         # Get model value
         final_value = @model.send(property) if (model_or_class(@model) == "model") && @model.respond_to?(property)
 
+        # On new views and actions modals we need to prefill the fields
         if (@view === :new) || @action.present?
-          final_value = if default.present? && default.respond_to?(:call)
-            default.call
-          else
-            default
+          if default.present?
+            final_value = if default.respond_to?(:call)
+              default.call
+            else
+              default
+            end
           end
         end
 

data/lib/avo/fields/belongs_to_field.rb

@@ -1,5 +1,62 @@
 module Avo
   module Fields
+
+    # The field can be in multiple scenarios where it needs different types of data and displays the state differently.
+    # For example the non-polymorphic, non-searchable variant is the easiest to support. You only need to populate a simple select with the ID of the associated record and the list of records.
+    # For the searchable polymorphic variant you need to provide the type of the association (Post, Project, Team), the label of the associated record ("Cool post title") and the ID of that record.
+    # Furthermore, the way Avo works, it needs to do some queries on the back-end to fetch the required information.
+    #
+    # Field scenarios:
+    # 1. Create new record
+    #   List of records
+    # 2. Create new record as association
+    #   List of records, the ID
+    # 3. Create new searchable record
+    #   Nothing really. The records will be fetched from the search API
+    # 4. Create new searchable record as association
+    #   The associated record label and ID. The records will be fetched from the search API
+    # 5. Create new polymorphic record
+    #   Type & ID
+    # 6. Create new polymorphic record as association
+    #   Type, list of records, and ID
+    # 7. Create new polymorphic searchable record
+    #   Type, Label and ID
+    # 8. Create new polymorphic searchable record as association
+    #   Type, Label and ID
+    # 9. Edit a record
+    #   List of records & ID
+    # 10. Edit a record as searchable
+    #   Label and ID
+    # 11. Edit a record as an association
+    #   List and ID
+    # 12. Edit a record as an searchable association
+    #   Label and ID
+    # 13. Edit a polymorphic record
+    #   Type, List of records & ID
+    # 14. Edit a polymorphic record as searchable
+    #   Type, Label and ID
+    # 15. Edit a polymorphic record as an association
+    #   Type, List and ID
+    # 16. Edit a polymorphic record as an searchable association
+    #   Type, Label and ID
+    # Also all of the above with a namespaced model `Course/Link`
+
+    # Variants
+    # 1. Select belongs to
+    # 2. Searchable belongs to
+    # 3. Select Polymorphic belongs to
+    # 4. Searchable Polymorphic belongs to
+
+    # Requirements
+    # - list
+    # - ID
+    # - label
+    # - Type
+    # - foreign_key
+    # - foreign_key for poly type
+    # - foreign_key for poly id
+    # - is_disabled?
+
     class BelongsToField < BaseField
       attr_reader :polymorphic_as
       attr_reader :relation_method
@@ -21,7 +78,13 @@ module Avo
       end
 
       def value
-        super(polymorphic_as)
+        if is_polymorphic?
+          # Get the value from the pre-filled assoociation record
+          super(polymorphic_as)
+        else
+          # Get the value from the pre-filled assoociation record
+          super(relation_method)
+        end
       end
 
       # The value
@@ -39,22 +102,40 @@ module Avo
       end
 
       def options
-        ::Avo::Services::AuthorizationService.apply_policy(user, target_resource.class.query_scope).all.map do |model|
-          {
-            value: model.id,
-            label: model.send(target_resource.class.title)
-          }
-        end
+        values_for_type
       end
 
-      def values_for_type(type)
-        ::Avo::Services::AuthorizationService.apply_policy(user, type).all.map do |model|
-          [model.send(App.get_resource_by_model_name(type).class.title), model.id]
+      def values_for_type(model = nil)
+        resource = target_resource
+        resource = App.get_resource_by_model_name model if model.present?
+
+        ::Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope).all.map do |model|
+          [model.send(resource.class.title), model.id]
         end
       end
 
       def database_value
         target_resource.id
+      rescue
+        nil
+      end
+
+      def type_input_foreign_key
+        if is_polymorphic?
+          "#{foreign_key}_type"
+        end
+      end
+
+      def id_input_foreign_key
+        if is_polymorphic?
+          "#{foreign_key}_id"
+        else
+          foreign_key
+        end
+      end
+
+      def is_polymorphic?
+        polymorphic_as.present?
       end
 
       def foreign_key
@@ -118,7 +199,7 @@ module Avo
       end
 
       def target_resource
-        if polymorphic_as.present?
+        if is_polymorphic?
           if value.present?
             return App.get_resource_by_model_name(value.class)
           else

data/lib/avo/fields/key_value_field.rb

@@ -3,10 +3,6 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
-      attr_reader :key_label
-      attr_reader :value_label
-      attr_reader :action_text
-      attr_reader :delete_text
       attr_reader :disable_editing_keys
       attr_reader :disable_adding_rows
 
@@ -15,10 +11,10 @@ module Avo
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : I18n.translate('avo.key_value_field.key')
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : I18n.translate('avo.key_value_field.value')
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : I18n.translate('avo.key_value_field.add_row')
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : I18n.translate('avo.key_value_field.delete_row')
+        @key_label = args[:key_label] if args[:key_label].present?
+        @value_label = args[:value_label]if args[:value_label].present?
+        @action_text = args[:action_text] if args[:action_text].present?
+        @delete_text = args[:delete_text] if args[:delete_text].present?
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)
@@ -32,6 +28,30 @@ module Avo
         @disable_deleting_rows = args[:disable_deleting_rows].present? ? args[:disable_deleting_rows] : false
       end
 
+      def key_label
+        return @key_label if @key_label.present?
+
+        I18n.translate('avo.key_value_field.key')
+      end
+
+      def value_label
+        return @value_label if @value_label.present?
+
+        I18n.translate('avo.key_value_field.value')
+      end
+
+      def action_text
+        return @action_text if @action_text.present?
+
+        I18n.translate('avo.key_value_field.add_row')
+      end
+
+      def delete_text
+        return @delete_text if @delete_text.present?
+
+        I18n.translate('avo.key_value_field.delete_row')
+      end
+
       def to_permitted_param
         [:"#{id}", "#{id}": {}]
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.21.1.pre.1"
+  VERSION = "1.22.1.pre.2"
 end

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -94,3 +94,4 @@ en:
     was_successfully_created: 'was successfully created'
     was_successfully_updated: 'was successfully updated'
     clear_value: "Clear value"
+    tools: Tools

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -81,3 +81,4 @@ nb-NO:
     search_placeholder: 'Søk'
     search_cancel_button: 'Avbryt'
     sign_out: 'Logg ut'
+    tools: Redskapene

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -83,3 +83,4 @@ pt-BR:
       placeholder: 'Procurar'
       cancel_button: 'Cancelar'
     sign_out: 'sair'
+    tools: Ferramentas

data/lib/generators/avo/templates/locales/avo.ro.yml

@@ -78,3 +78,4 @@ ro:
       delete_row: 'Sterge rand'
     was_successfully_created: 'a fost creat'
     was_successfully_updated: 'a fost actualizat'
+    tools: Instrumente

data/public/avo-assets/avo.css

@@ -6651,6 +6651,10 @@ progress[value]::-moz-progress-bar{
   height:10rem
 }
 
+.h-16{
+  height:4rem
+}
+
 .h-full{
   height:100%
 }
@@ -6659,10 +6663,6 @@ progress[value]::-moz-progress-bar{
   height:3rem
 }
 
-.h-16{
-  height:4rem
-}
-
 .h-3{
   height:0.75rem
 }

data/public/avo-assets/avo.js

@@ -81101,18 +81101,18 @@
         const { type } = target.dataset;
         if (this.isSearchable) {
           const textInput = target.querySelector('input[type="text"]');
-          if (textInput) {
-            textInput.setAttribute("valid-name", textInput.getAttribute("name"));
-          }
+          if (textInput)
+            this.nameToValidName(textInput);
           const hiddenInput = target.querySelector('input[type="hidden"]');
-          if (hiddenInput) {
-            hiddenInput.setAttribute("valid-name", hiddenInput.getAttribute("name"));
-          }
+          if (hiddenInput)
+            this.nameToValidName(hiddenInput);
         } else {
           const select = target.querySelector("select");
-          if (select) {
-            select.setAttribute("valid-name", select.getAttribute("name"));
-          }
+          if (select)
+            this.nameToValidName(select);
+          const hiddenInput = target.querySelector('input[type="hidden"]');
+          if (hiddenInput)
+            this.nameToValidName(hiddenInput);
           if (this.selectedType !== type) {
             select.selectedIndex = 0;
           }
@@ -81130,11 +81130,15 @@
       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"));
+        this.validNameToName(textInput);
+        this.validNameToName(hiddenInput);
       } else {
         const select = target.querySelector("select");
-        select.setAttribute("name", select.getAttribute("valid-name"));
+        const hiddenInput = target.querySelector('input[type="hidden"]');
+        this.validNameToName(select);
+        if (hiddenInput) {
+          this.validNameToName(hiddenInput);
+        }
       }
     }
     invalidateTarget(target) {
@@ -81147,10 +81151,17 @@
       } else if (target) {
         try {
           target.querySelector("select").setAttribute("name", "");
+          target.querySelector('input[type="hidden"]').setAttribute("name", "");
         } catch (error2) {
         }
       }
     }
+    validNameToName(target) {
+      target.setAttribute("name", target.getAttribute("valid-name"));
+    }
+    nameToValidName(target) {
+      target.setAttribute("valid-name", target.getAttribute("name"));
+    }
   };
   __publicField(belongs_to_field_controller_default, "targets", ["select", "type", "loadAssociationLink"]);
 
@@ -83368,6 +83379,9 @@
   var esm_default = flatpickr;
 
   // app/javascript/js/controllers/fields/date_field_controller.js
+  function universalTimestamp(timestampStr) {
+    return new Date(new Date(timestampStr).getTime() + new Date(timestampStr).getTimezoneOffset() * 60 * 1e3);
+  }
   var date_field_controller_default = class extends Controller {
     connect() {
       const options = {
@@ -83393,7 +83407,7 @@
         options.time_24hr = castBoolean(this.inputTarget.dataset.time24hr);
         options.appTimezone = this.inputTarget.dataset.timezone;
       } else {
-        currentValue = new Date(this.inputTarget.value);
+        currentValue = universalTimestamp(this.inputTarget.value);
       }
       options.defaultDate = currentValue;
       esm_default(this.inputTarget, options);
@@ -83443,6 +83457,9 @@
         return [];
       }
     }
+    get actionLinks() {
+      return document.querySelectorAll('.js-actions-dropdown a[data-actions-picker-target="resourceAction"]');
+    }
     set currentIds(value) {
       this.stateHolderElement.dataset.selectedResources = JSON.stringify(value);
       if (this.actionsPanelPresent) {
@@ -83476,7 +83493,7 @@
       }
     }
     enableResourceActions() {
-      document.querySelectorAll('.js-actions-dropdown a[data-actions-picker-target="resourceAction"]').forEach((link) => {
+      this.actionLinks.forEach((link) => {
         link.classList.add("text-gray-700");
         link.classList.remove("text-gray-500");
         link.setAttribute("data-href", link.getAttribute("href"));
@@ -83484,7 +83501,7 @@
       });
     }
     disableResourceActions() {
-      document.querySelectorAll('.js-actions-dropdown a[data-actions-picker-target="resourceAction"]').forEach((link) => {
+      this.actionLinks.forEach((link) => {
         link.classList.remove("text-gray-700");
         link.classList.add("text-gray-500");
         link.setAttribute("href", link.getAttribute("data-href"));
@@ -87339,7 +87356,9 @@
         this.hiddenIdTarget.setAttribute("value", item._id);
         this.buttonTarget.setAttribute("value", item._label);
         document.querySelector(".aa-DetachedOverlay").remove();
-        this.clearButtonTarget.classList.remove("hidden");
+        if (this.hasClearButtonTarget) {
+          this.clearButtonTarget.classList.remove("hidden");
+        }
       } else {
         turbo_es2017_esm_exports.visit(item._url, { action: "advance" });
       }
@@ -87398,7 +87417,7 @@
       const that = this;
       this.buttonTarget.onclick = () => this.showSearchPanel();
       this.clearValueTargets.forEach((target) => {
-        if (target.getAttribute("value")) {
+        if (target.getAttribute("value") && this.hasClearButtonTarget) {
           this.clearButtonTarget.classList.remove("hidden");
         }
       });
@@ -87418,7 +87437,9 @@
           return that.debouncedFetch(endpoint).then((response) => response.json()).then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])));
         }
       });
-      this.buttonTarget.removeAttribute("disabled");
+      if (this.buttonTarget.dataset.shouldBeDisabled !== "true") {
+        this.buttonTarget.removeAttribute("disabled");
+      }
     }
   };
   __publicField(search_controller_default, "targets", [
@@ -87779,6 +87800,7 @@
   });
   document.addEventListener("turbo:visit", () => document.body.classList.add("turbo-loading"));
   document.addEventListener("turbo:submit-start", () => document.body.classList.add("turbo-loading"));
+  document.addEventListener("turbo:submit-end", () => document.body.classList.remove("turbo-loading"));
   document.addEventListener("turbo:before-cache", () => {
     document.querySelectorAll("[data-turbo-remove-before-cache]").forEach((element) => element.remove());
   });