glib-web 3.10.0 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 017c468688e16caca324d9eb790e5392cdcf220b5f259cfd926f7d05a0f2823f
-  data.tar.gz: 473404c0d90bf386e723e1c62f65456b4e0375932c144063d1c07526dad3e3f2
+  metadata.gz: 67a72ba29ae5a4a9d5d61d529db6ad2316af2fb2d76042ca7fda76b309b5dcba
+  data.tar.gz: c3e935f1d809ee9ce3ec3fa78bdf53250303192949909b12ebf8ac5f9f27f7b3
 SHA512:
-  metadata.gz: e35b713b672704816511274ee46282209d190b067c4ae012cb4b0a00cf5d443d00345384f487e7afdb33526df82178bf621deaef3a04b001653ca772b651e028
-  data.tar.gz: 224571d4d294707c2f9b1967f8a444e0718b333a616923d62c69a808b9852111b870a1d9d30f9036ad2e950cf7fb0cde45acdad91eb592b643c1c7c2e77d90b3
+  metadata.gz: 588dc4f17590880d8c0e6eaacf7f467a1db815a24e317d0d458449c7065d9dbd8ac77ddf7b621581a48992528306334d45439f8b9a1b7acaf4c4e42d53b72ba9
+  data.tar.gz: c1d4655e081970ad4739397ce2b0f221cb7a491757c9da532c433dd85245ba0a4b39e87164c00a2e83942e008c439298b76d528b7bd65cb93abf5b8b54ec089d

data/app/helpers/glib/enum_helper.rb

@@ -1,10 +1,22 @@
 module Glib
   module EnumHelper
-    def glib_enum_options(clazz, enum_field, keys = nil)
-      # keys ||= clazz.send("#{enum_field}s").keys
+    def glib_enum_options(clazz, enum_field, keys: nil, include_hints: false)
+      enum_name = enum_field.to_s
+      keys ||= clazz.defined_enums[enum_name].keys
+      keys.map do |i|
+        text = clazz.glib_enum_humanize(enum_field, i)
 
-      keys ||= clazz.send(enum_field.to_s.pluralize).keys
-      keys.map { |i| { text: clazz.glib_enum_humanize(enum_field, i), value: i } }
+        if text.nil?
+          raise "activerecord.attributes.#{clazz.model_name.i18n_key}.#{enum_field.to_s.pluralize}.#{i}"
+        end
+
+        if include_hints
+          i18n_key = clazz.model_name.i18n_key
+          hint = I18n.t("dt_models.#{i18n_key}.#{enum_name.pluralize}.#{i}.hint")
+          text += " #{hint}"
+        end
+        { text: text, value: i }
+      end
     end
 
     # See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones and description

data/app/helpers/glib/forms_helper.rb

@@ -1,15 +1,16 @@
 module Glib
   module FormsHelper
     def glib_form_field_label(model_name, prop, args = {})
-      I18n.t("dt_models.#{model_name}.#{prop}.label", args.merge(default: nil)) || I18n.t("activerecord.attributes.#{model_name}.#{prop}", args)
+      I18n.t("dt_models.#{model_name}.#{prop}.label", **args.merge(default: nil)) ||
+        I18n.t("activerecord.attributes.#{model_name}.#{prop}", **args)
     end
 
     def glib_form_hint_label(model_name, prop, args = {})
-      I18n.t("dt_models.#{model_name}.#{prop}.hint", args.merge(default: nil))
+      I18n.t("dt_models.#{model_name}.#{prop}.hint", **args.merge(default: nil))
     end
 
     def glib_form_placeholder_label(model_name, prop, args = {})
-      I18n.t("dt_models.#{model_name}.#{prop}.placeholder", args.merge(default: nil))
+      I18n.t("dt_models.#{model_name}.#{prop}.placeholder", **args.merge(default: nil))
     end
   end
 end

data/app/helpers/glib/json_ui/styling_helper.rb

@@ -5,7 +5,7 @@ module Glib
       ### Padding
 
       def glib_json_padding_body
-        { top: 12, left: 20, right: 20, bottom: 12 }
+        { x: 20, y: 12, top: 22 }
       end
 
       def glib_json_padding_list

data/app/helpers/glib/json_ui/view_builder/fields.rb

@@ -48,8 +48,8 @@ class Glib::JsonUi::ViewBuilder
       # Override
       def created
         if @prop && (form = page.current_form)
-          dynamic_group = form.current_dynamic_group
-          context = dynamic_group || form
+          association = form.nested_associations.last
+          context = association || form
 
           context.field_assert_respond_to(@prop)
 
@@ -57,10 +57,11 @@ class Glib::JsonUi::ViewBuilder
           @label ||= context.field_label(@prop, @label_args || {})
           @hint ||= context.hint_label(@prop, @hint_args || {})
           @placeholder ||= context.placeholder_label(@prop, @placeholder_args || {})
+          @validation ||= context.field_validation(@prop)
 
-          if dynamic_group.nil?
-            @value ||= form.field_value(@prop)
-            @validation ||= form.field_validation(@prop)
+          if form.current_dynamic_group.nil?
+            # This is not relevant inside a dynamic group
+            @value ||= context.field_value(@prop)
           end
         end
         json.name @name
@@ -201,47 +202,23 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class DynamicGroup < AbstractField
+      include Panels::ModelPanel
+
       string :titlePrefix
-      # panels_builder :content, :template
+      panels_builder :content, :template
       hash :groupFieldProperties
 
       # NOTE: Consider using sub-panel instead (e.g. groupTemplate)
       # views :groupTemplateViews
 
-      attr_writer :model
-
-      def model(model)
-        @model = model
-        @model_name = @model.class.model_name.singular
-      end
-
-      def field_name(prop, multiple)
-        prop
-      end
-
-      def field_label(prop, args)
-        @delegate_class.field_label(@model, @model_name, prop, args)
-      end
-
-      def hint_label(prop, args)
-        @delegate_class.hint_label(@model_name, prop, args)
-      end
-
-      def placeholder_label(prop, args)
-        @delegate_class.placeholder_label(@model_name, prop, args)
-      end
-
-      def field_assert_respond_to(prop)
-        raise "Please specify a model for #{self.class.component_name} before using its property" unless @model
-        @delegate_class.field_assert_respond_to(@model, prop)
-      end
-
       def content(value)
         @delegate_class = Glib::JsonUi::ViewBuilder::Panels::Form
         form = page.current_form
 
         form.current_dynamic_group = self
+        form.nested_associations << self
         value.call(page.content_builder([:template]))
+        form.nested_associations.pop
         form.current_dynamic_group = nil
       end
     end

data/app/helpers/glib/json_ui/view_builder/panels.rb

@@ -1,12 +1,17 @@
 class Glib::JsonUi::ViewBuilder
   module Panels
     class Form < View
+      attr_reader :model_name # See Panels::Form.field_name
       attr_accessor :current_dynamic_group
 
       action :onSubmit
       string :paramNameForFormData
       bool :local
 
+      def nested_associations
+        @nested_associations ||= []
+      end
+
       # TODO: Enable this when we know it won't break existing apps.
       # Even for pure client-side apps, this is required because form.validate() requires a URL to construct form data.
       # required :url
@@ -39,19 +44,45 @@ class Glib::JsonUi::ViewBuilder
       end
 
       def field_name(prop, multiple)
-        self.class.field_name(@model, @model_name, prop, multiple)
+        self.class.field_name(@model, prop, multiple, page)
       end
 
-      def self.field_name(model, model_name, prop, multiple)
+      def self.field_name(model, prop, multiple, page)
+        form = page.current_form
+        include_form_model = true
+        reversed_model_panels = []
+        form.nested_associations.reverse.each do |panel|
+          if panel.is_a?(Fields::DynamicGroup)
+            include_form_model = false
+            break # Remove anything before Fields::DynamicGroup
+          end
+          reversed_model_panels << panel
+        end
+
+        name = include_form_model ? form.model_name : ''
+        reversed_model_panels.reverse.each do |panel|
+          index_exists = !panel.assoc_order_index.nil?
+          field_name = index_exists ? panel.model_name.pluralize : panel.model_name
+          name += "[#{field_name}_attributes]"
+          if index_exists
+            index = panel.assoc_order_index == :auto ? '' : panel.assoc_order_index
+            name += "[#{index}]"
+          end
+        end
+
         suffix = is_array_association?(model, prop) || multiple ? '[]' : ''
-        "#{model_name}[#{prop}]#{suffix}"
+        "#{name}[#{prop}]#{suffix}"
       end
 
       def field_value(prop)
-        if self.class.is_array_association?(@model, prop)
-          @model.send(prop)&.map { |record| record.id }
+        self.class.field_value(@model, prop)
+      end
+
+      def self.field_value(model, prop)
+        if is_array_association?(model, prop)
+          model.send(prop)&.map { |record| record.id }
         else
-          @model.send(prop)
+          model.send(prop)
         end
       end
 
@@ -84,8 +115,12 @@ class Glib::JsonUi::ViewBuilder
       end
 
       def field_validation(prop)
+        self.class.field_validation(@model, prop)
+      end
+
+      def self.field_validation(model, prop)
         validations = {}
-        @model.class.validators_on(prop).each do |validator|
+        model.class.validators_on(prop).each do |validator|
           if validator.kind == :presence
             validations[:required] = { message: 'Required' }
           end
@@ -332,5 +367,61 @@ class Glib::JsonUi::ViewBuilder
       # end
     end
 
+    module ModelPanel
+      attr_reader :model_name # See Panels::Form.field_name
+      attr_reader :assoc_order_index
+
+      def model(model)
+        @model = model
+        @model_name = @model.class.model_name.singular
+      end
+
+      def order_index(index)
+        @assoc_order_index = index
+      end
+
+      def field_name(prop, multiple)
+        @delegate_class.field_name(@model, prop, multiple, page)
+      end
+
+      def field_value(prop)
+        @delegate_class.field_value(@model, prop)
+      end
+
+      def field_label(prop, args)
+        @delegate_class.field_label(@model, @model_name, prop, args)
+      end
+
+      def hint_label(prop, args)
+        @delegate_class.hint_label(@model_name, prop, args)
+      end
+
+      def placeholder_label(prop, args)
+        @delegate_class.placeholder_label(@model_name, prop, args)
+      end
+
+      def field_validation(prop)
+        @delegate_class.field_validation(@model, prop)
+      end
+
+      def field_assert_respond_to(prop)
+        raise "Please specify a model for #{self.class.component_name} before using its property" unless @model
+        @delegate_class.field_assert_respond_to(@model, prop)
+      end
+    end
+
+    class Association < View
+      include ModelPanel
+
+      def childViews(value)
+        @delegate_class = Glib::JsonUi::ViewBuilder::Panels::Form
+        form = page.current_form
+
+        form.nested_associations << self
+        json.set!(:childViews) { value.call(page.view_builder) }
+        form.nested_associations.pop
+      end
+    end
+
   end
 end

data/app/models/concerns/glib/enum_humanization.rb

@@ -11,19 +11,20 @@ module Glib
       extend ClassMethods
     end
 
-    def glib_enum_humanize(enum_name, default_value = nil)
-      self.class.glib_enum_humanize(enum_name, send(enum_name), default_value)
+    def glib_enum_humanize(enum_name, default_enum_value = nil)
+      self.class.glib_enum_humanize(enum_name, send(enum_name) || default_enum_value)
     end
   end
 
   module ClassMethods
-    def glib_enum_humanize(enum_name, enum_value, default_value = nil)
+    def glib_enum_humanize(enum_name, enum_value, default_translation = nil)
       if enum_value
-        if default_value.nil? && Rails.env.development?
-          i18n_key = "activerecord.attributes.#{model_name.i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}"
-          I18n.t(i18n_key, raise: I18n::MissingTranslationData)
+        translation_key = "activerecord.attributes.#{model_name.i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}"
+
+        if default_translation.nil? && Rails.env.development?
+          I18n.t(translation_key, raise: I18n::MissingTranslationData)
         else
-          I18n.t(i18n_key, default: default_value)
+          I18n.t(translation_key, default: default_translation)
         end
       end
     end

data/app/models/concerns/glib/soft_deletable.rb

@@ -1,40 +1,72 @@
 # To use this, simply:
 # - Include the module
 # - Add this migration: `add_column :model, :deleted_at, :datetime, null: true`
-#
-# After that, any call to `destroy` will automatically be a soft-deletion.
 module Glib
   module SoftDeletable
     extend ActiveSupport::Concern
 
+    module ClassMethods
+      def auto_hide_soft_deleted_records
+        column_name = :deleted_at
+        default_scope { where(column_name => nil) }
+
+        if Rails.env.development? || Rails.env.test?
+          raise ActiveRecord::ConfigurationError, "#{table_name}.#{column_name} need to be indexed" unless connection.index_exists?(table_name, column_name)
+        end
+      end
+
+      # `behaviour` can be either `:soft_destroy` or `:hard_destroy``
+      def on_mark_for_destruction(behaviour)
+        @__glib_mark_for_destruction_behaviour = behaviour
+      end
+
+      def __mark_for_destruction_behaviour
+        @__glib_mark_for_destruction_behaviour ||= :disallowed
+      end
+    end
+
     included do
-      default_scope { where(deleted_at: nil) }
+      extend ClassMethods
+
       scope :with_deleted, -> { unscope(where: :deleted_at) }
 
-      # "Soft delete" - set deleted_at if it is nil, actually destroy the record
-      # if forced.
-      #
-      # @param force [Boolean]
-      def destroy(force = nil)
-        return force_destroy_record if force == :force
-        return self if deleted?
+      # Override
+      def destroy
+        if marked_for_destruction?
+          case (behaviour = self.class.__mark_for_destruction_behaviour)
+          when :soft_destroy
+            soft_destroy
+          when :hard_destroy
+            # Make sure that the associated records are handled the same way as this record (i.e. the parent record).
+            mark_applicable_associations_for_destruction
+
+            hard_destroy
+          when :disallowed
+            raise_hard_delete_disallowed
+          else
+            raise "Unsupported on_mark_for_destruction behaviour: #{behaviour}"
+          end
+
+          return true # Tell Rails that destroy has succeeded
+        end
 
-        soft_destroy_record
+        raise_hard_delete_disallowed
       end
 
-      # More explicit naming which is sometimes useful for readability.
-      def soft_destroy
-        soft_destroy_record
+
+      def hard_destroy
+        method(:destroy).super_method.call
       end
 
-      # Revive a soft-deleted record and associated records if soft-deleted,
-      # otherwise return self
-      def revive
-        return self unless deleted?
+      def soft_destroy
+        ActiveRecord::Base.transaction do
+          _soft_destroy
+        end
+      end
 
+      def undo_soft_destroy
         ActiveRecord::Base.transaction do
-          update(deleted_at: nil)
-          revive_associated_records
+          _undo_soft_destroy
         end
       end
 
@@ -43,34 +75,69 @@ module Glib
         deleted_at.present?
       end
 
+      # Bypass validation because it is impossible to ensure records that have circular dependencies are valid at all time because
+      # records are updated/validated one at a time.
+      # Besides, it's probably not a good idea to prevent soft-deletion of objects that are already not valid.
+      def _soft_destroy
+        update_columns(deleted_at: DateTime.current)
+        soft_destroy_associated_records
+      end
+
+      def _undo_soft_destroy
+        undo_soft_destroy_associated_records
+        update_columns(deleted_at: nil)
+      end
+
       private
-        def force_destroy_record
-          ActiveRecord::Base.transaction do
-            destroy_associated_records(:force)
-            method(:destroy).super_method.call
+        def mark_applicable_associations_for_destruction
+          self.class.reflect_on_all_associations.each do |assoc|
+            next unless assoc.options[:dependent] == :destroy
+
+            process_soft_deletable_relationship(assoc.name) do |record|
+              record.mark_for_destruction
+            end
           end
         end
 
-        def soft_destroy_record
-          ActiveRecord::Base.transaction do
-            destroy_associated_records
-            update(deleted_at: Time.zone.now)
+        def raise_hard_delete_disallowed
+          raise ActiveRecord::ConfigurationError, "Hard deletion is not allowed for #{self.class.name}"
+        end
+
+        def process_soft_deletable_relationship(relationship, &block)
+          association(relationship) # Raises an exception if relationship doesn't exist. This is a security safe guard.
+
+          # Use `send()` instead of `association(relationship).scope` because the latter returns new record objects as opposed
+          # to existing objects which could cause a side effect.
+          relation = send(relationship)
+
+          if relation.respond_to?(:find_each)
+            relation.find_each do |record|
+              block.call(record)
+            end
+          else
+            block.call(relation) unless relation.nil? # Process a single record
           end
         end
 
-        def destroy_associated_records(force = nil)
-          associated_records.each { |r| r.destroy(force) }
+        def soft_destroy_associated_records
+          soft_deletable_associations.each do |relationship|
+            process_soft_deletable_relationship(relationship) { |record| record._soft_destroy }
+          end
         end
 
-        def revive_associated_records
-          associated_records.each(&:revive)
+        def undo_soft_destroy_associated_records
+          soft_deletable_associations.each do |relationship|
+            process_soft_deletable_relationship(relationship) { |record| record._undo_soft_destroy }
+          end
         end
 
         # This should return an array of all associated records of an object that
-        # should be soft deleted with it (i.e. those that have dependent: :destroy
-        # set). In principle we could figure this out automatically but in the
-        # interest of simplicity we'll just define it manually for each class.
-        def associated_records
+        # should be soft deleted with it. This provides a non-intrusive way that can
+        # co-exist with hard deletion (e.g. using `dependent: :destroy`), which means
+        # that the model can use both for different purposes.
+        # For example, a model may use soft-deletion for archiving and hard-deletion
+        # for editing (e.g. using `accepts_nested_attributes_for``)
+        def soft_deletable_associations
           []
         end
     end

data/app/models/glib/application_record.rb

@@ -7,14 +7,16 @@ module Glib
     scope :created_asc, -> { order(created_at: :asc) }
     scope :created_desc, -> { order(created_at: :desc) }
 
-    # def glib_enum_humanize(enum_name, default_value = nil)
-    #   self.class.glib_enum_humanize(enum_name, send(enum_name), default_value)
-    # end
+    def self.glib_has_one_attached(field_name)
+      has_one_attached field_name
 
-    # def self.glib_enum_humanize(enum_name, enum_value, default_value = nil)
-    #   if enum_value
-    #     I18n.t("activerecord.attributes.#{model_name.i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}", default: default_value)
-    #   end
-    # end
+      define_method("#{field_name}=") do |value|
+        if value == ''
+          send(field_name).detach
+        else
+          super(value)
+        end
+      end
+    end
   end
 end

data/app/views/json_ui/garage/forms/file_upload.json.jbuilder

@@ -25,8 +25,8 @@ page.form options.merge(childViews: ->(form) do
   form.fields_file name: 'user[pdf1][]', width: 'matchParent', label: 'PDF Document', accepts: rules, directUploadUrl: rails_direct_uploads_url,
     placeholderView: { type: 'image', width: 100, height: 100, url: 'data:image/webp;base64,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' }
 
-  rules = { fileType: 'pdf', maxFileSize: 5000 }
-  form.fields_file name: 'user[pdf2][]', width: 'matchParent', label: 'PDF Document', accepts: rules, directUploadUrl: rails_direct_uploads_url
+  rules = { fileType: ['pdf', 'image'], maxFileSize: 5000 }
+  form.fields_file name: 'user[pdf2][]', width: 'matchParent', label: 'PDF/Image File', accepts: rules, directUploadUrl: rails_direct_uploads_url
 
   rules = { fileType: 'zip', maxFileSize: 5000 }
   form.fields_file name: 'user[zip][]', width: 'matchParent', label: 'ZIP Document', accepts: rules, directUploadUrl: rails_direct_uploads_url

data/app/views/json_ui/garage/forms/index.json.jbuilder

@@ -50,8 +50,9 @@ page.list sections: [
       template.thumbnail title: 'Submit on Change', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/submit_on_change')
       end
-
-
+      template.thumbnail title: 'Dynamic Group', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'forms/dynamic_group')
+      end
     end
   end, ->(section) do
     section.header padding: glib_json_padding_list, childViews: ->(header) do
@@ -105,7 +106,6 @@ page.list sections: [
     section.header padding: glib_json_padding_list, childViews: ->(header) do
       header.h2 text: 'Web Only'
     end
-
     section.rows builder: ->(template) do
       template.thumbnail title: 'Basic Rich Text Editor', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/rich_text')
@@ -124,9 +124,6 @@ page.list sections: [
     end
 
     section.rows builder: ->(template) do
-      template.thumbnail title: 'Dynamic Group', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'forms/dynamic_group')
-      end
       template.thumbnail title: 'Dynamic Select', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/dynamic_select')
       end

data/app/views/json_ui/garage/forms/selects.json.jbuilder

@@ -56,7 +56,7 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
   options = []
   languages.each do |group, sub|
     options << { type: 'label', text: group }
-    options.concat(sub.map { |k, v| { value: k, text: v } })
+    options.concat(sub.map { |k, v| { value: k, text: v, subtitle: 'Country' } })
     options << { type: 'divider' }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.1
 platform: ruby
 authors:
 - ''