glib-web 4.41.0 → 4.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c5782b7132ed122204cc3314927ada0e3804ea47ee795c34d6311a959580b6
-  data.tar.gz: ca30770101141a9388bb11ef182a6c554ada7cc1ba88b068f7e3e0ef130425f6
+  metadata.gz: 10cf86096f7289ec5330a4945455aa966fffa5ec6d25e9eed14a9d1cc05324e5
+  data.tar.gz: 3e5c534eb6a24b7643c2ba053a92dbc85854242af338489244d8f229ee8ea86f
 SHA512:
-  metadata.gz: eef32c78bfbd00ae4082fbd0069b7a92045d253411dc70cd2a82a6218f6b59984362652e63c9ad64bbad0d26bef567a23f7e9d3edfca125d97eb8cd2e6379529
-  data.tar.gz: 84039000106e73c327d049234261c182d099e5f66412138ea7e5cd3abe4921898c5ba4c72640acc2cbf7036955d0a6c6b9994c66b7ca77b3512693ca9f3418b1
+  metadata.gz: 6f4b740caa11bfc6f41686c03c84fcc507ef0de4ae17d8b317b98fcd301c311bfc72eb9eaeb5ac04fe847828e00826234bc3087f72571143fb653b5e0cd92465
+  data.tar.gz: c99131d247a25df28948a755718a63d0d1548eb1d5b149917156340798115a67ab587ceb9c282bbccaeb1e4ddd31e552a9f034c3fa54ca246654c3cbb3f660bc

data/app/controllers/concerns/glib/json/libs.rb

@@ -131,9 +131,10 @@ module Glib::Json::Libs
         redirect_to sign_in_url, **redirect_options
       end
       format.json do
-        render \
+        render(
           json: json_ui_401_response(sign_in_url, **redirect_options),
           status: Rails.env.test? ? :unauthorized : :ok
+        )
       end
       format.csv do
         if Rails.env.test?
@@ -230,7 +231,9 @@ module Glib::Json::Libs
                 view: 'label',
                 text: message
               },
-            ].concat(bottom_views),
+            ].concat(
+              bottom_views
+                        ),
           }
         ]
         # Set this in the project's custom CSS.
@@ -288,6 +291,17 @@ module Glib::Json::Libs
 
   module ClassMethods
 
+    # This usually resides in a base controller class, e.g. ApplicationController.
+    def __json_libs_init_options
+      if instance_variable_defined?(:@__json_libs_init_options)
+        @__json_libs_init_options
+      elsif superclass.respond_to?(:__json_libs_init_options)
+        superclass.__json_libs_init_options
+      else
+        nil
+      end
+    end
+
     def json_libs_init(options)
       include Glib::Json::Transformation
       include Glib::Json::Validation
@@ -296,6 +310,10 @@ module Glib::Json::Libs
       include Glib::Json::Traversal
       include Glib::Json::NewDynamicText
 
+      @__json_libs_init_options = options
+
+      puts "*********** __json_libs_init_options: #{@__json_libs_init_options}"
+
       before_action do
         __json_ui_start(options)
       end
@@ -350,30 +368,37 @@ module Glib::Json::Libs
             redirect_to instance_exec(&sign_in_url_proc)
           end
           format.json do
-            render json: {
-              glib_json_dialog_mode? ? :onLoad : :onResponse => __glib_error_dialog(
-                'Your session has expired', 'Please refresh the page and retry.', ['dialog-csrf-error'], [
-                  {
-                    view: 'button',
-                    text: 'Refresh',
-                    onClick: {
-                      action: 'auth/saveCsrfToken',
-                      token: form_authenticity_token,
-                      onSave: {
-                        action: 'dialogs/close',
-                        onClose: {
-                          action: 'windows/reload',
-                          onReload: {
-                            action: 'snackbars/alert',
-                            message: 'Refreshed. You can try again now.'
+            raise exception if Rails.env.test? || !json_ui_should_render?(self.class.__json_libs_init_options)
+
+            render(
+              json: {
+                glib_json_dialog_mode? ? :onLoad : :onResponse => __glib_error_dialog(
+                  'Your session has expired',
+                  'Please refresh the page and retry.',
+                  ['dialog-csrf-error'],
+                  [
+                    {
+                      view: 'button',
+                      text: 'Refresh',
+                      onClick: {
+                        action: 'auth/saveCsrfToken',
+                        token: form_authenticity_token,
+                        onSave: {
+                          action: 'dialogs/close',
+                          onClose: {
+                            action: 'windows/reload',
+                            onReload: {
+                              action: 'snackbars/alert',
+                              message: 'Refreshed. You can try again now.'
+                            }
                           }
                         }
                       }
-                    }
-                  },
-                ]
-              )
-            }
+                    },
+                  ]
+                )
+              }
+            )
           end
         end
       end

data/app/controllers/concerns/glib/json/ui.rb

@@ -36,6 +36,16 @@ module Glib::Json::Ui
     @__json_ui_rendering != nil
   end
 
+  def json_ui_should_render?(options)
+    when_option = options[:when]
+    if when_option.is_a?(Proc)
+      # should_render = when_option.call(self)
+      instance_exec(&when_option)
+    else
+      when_option == :always
+    end
+  end
+
   def json_ui_page_lifecycle_prop(name)
     if (hash = json_transformation_start).is_a?(Hash) && hash['body']  # A valid page
       original_action = hash[name]
@@ -70,14 +80,7 @@ module Glib::Json::Ui
     @__json_ui_activated = false
     @__json_ui_rendering = nil
 
-    when_option = options[:when]
-    if when_option.is_a?(Proc)
-      # should_render = when_option.call(self)
-      should_render = instance_exec(&when_option)
-    else
-      should_render = when_option == :always
-    end
-
+    should_render = json_ui_should_render?(options)
     if should_render || params[:_render] == 'v1'
       @__json_ui_activated = true
       request.variant = :ui
@@ -114,12 +117,14 @@ module Glib::Json::Ui
 
       renderer_path = params[:_skip_custom_render] == 'true' ? 'layouts/json_ui/no_custom' : options[:renderer_path]
       @__json_ui_orig_page = response.body
-      response.body = render_to_string(
-        template: renderer_path,
-        layout: 'json_ui/renderer',
-        content_type: 'text/html',
-        formats: [:html],
-        locals: { page: hash, options: options }
+      response.body(
+        render_to_string(
+          template: renderer_path,
+          layout: 'json_ui/renderer',
+          content_type: 'text/html',
+          formats: [:html],
+          locals: { page: hash, options: options }
+      )
       )
     end
 end

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

@@ -59,7 +59,7 @@ module Glib
           # menu :leftOuterButtons
           int :imageSize
 
-          panels_builder :content, :header, :footer, :right
+          panels_builder :content, :header, :footer, :right, :left
         end
 
         class Editable < Standard

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

@@ -269,6 +269,14 @@ class Glib::JsonUi::ViewBuilder
     #
     # @see app/views/json_ui/garage/forms/text_validation.json.jbuilder Garage example
     class Email < Text
+      def created
+        super
+        # Assume format validation handled by frontend
+        if @validation.present? && @validation[:format].present?
+          @validation.delete(:format)
+          json.validation @validation
+        end
+      end
     end
 
     # URL input field with URL format validation.
@@ -578,6 +586,7 @@ class Glib::JsonUi::ViewBuilder
 
       # To override the default behaviour
       bool :useChips
+      int :maxChipLines
 
       def options(value)
         @_options = value

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

@@ -274,10 +274,17 @@ module Glib
           @size = value
         end
 
+        def family(value)
+          @family = value.to_s
+        end
+
         # Override
         def created
           if @name
-            json.material do
+            icon_type = @family == 'fontawesome' ? 'fa' :
+                        @family == 'custom' ? 'custom' : 'material'
+
+            json.set!(icon_type) do
               json.name @name
               json.size @size if @size
             end

data/app/models/glib/dummy_job_application.rb

@@ -4,7 +4,7 @@ module Glib
     include ActiveModel::Validations
     include ActiveModel::AttributeMethods
 
-    attr_accessor :name, :age, :position, :words, :accept, :pet_you_have
+    attr_accessor :email, :name, :age, :position, :words, :accept, :pet_you_have
 
     validates :name, :position, presence: true
     validates :accept, acceptance: {}, allow_nil: false
@@ -13,5 +13,6 @@ module Glib
     validates :name, format: { with: /Doe\z/, message: 'This job is for person end with Doe' }
     validates :position, inclusion: { in: ['programmer', 'devops', 'designer'] }, allow_blank: true
     validates :pet_you_have, exclusion: { in: ['crocodile', 'shark' ], message: 'We dont accept that kind of animal!' }, allow_blank: true
+    validates :email, format: { with: /\.doe\z/, message: "This message is never shown because it's handled by frontend" }
   end
 end

data/app/views/json_ui/garage/actions/sheet_content.json.jbuilder

@@ -1,14 +1,24 @@
-sleep 3
+sleep 0.5
 page = json_ui_page json
 
-page.body childViews: ->(body) do
-  body.panels_responsive padding: { all: 16 }, childViews: ->(res) do
-    res.fields_richText value: "<p>#{DateTime.current.to_fs(:rfc822)}</p><p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p>"
-    res.spacer height: 8
-    res.button text: 'close', onClick: ->(action) do
-      action.sheets_close onClose: ->(saction) do
-        saction.snackbars_alert message: 'sheet closed'
+page.body(
+  childViews: ->(body) do
+    body.panels_responsive(
+      padding: { all: 16 },
+      childViews: ->(res) do
+        res.fields_richText value: "<p>#{DateTime.current.to_fs(:rfc822)}</p><p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p>"
+        res.spacer height: 8
+        res.button(
+          text: 'close',
+          onClick: ->(action) do
+            action.sheets_close(
+              onClose: ->(saction) do
+                saction.snackbars_alert message: 'sheet closed'
+              end
+            )
+          end
+        )
       end
-    end
+    )
   end
-end
+)

data/app/views/json_ui/garage/lists/edit_mode.json.jbuilder

@@ -5,6 +5,10 @@ json.title 'Lists'
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 tab_index = params[:tab].to_i
+batch_count = 20
+editable_ids = (0...batch_count).map do |index|
+  "PK_#{(batch_count * tab_index) + index}"
+end
 
 page.header(
   childViews: ->(header) do
@@ -42,7 +46,25 @@ page.form(
         childViews: ->(header) do
           header.panels_horizontal(
             childViews: ->(horizontal) do
-              horizontal.fields_check name: 'user[check_all]', label: 'All', checkValue: true
+              horizontal.fields_check(
+                name: 'user[check_all]',
+                label: 'All',
+                checkValue: true,
+                onChange: ->(action) do
+                  action.runMultiple(
+                    childActions: ->(multiple) do
+                      editable_ids.each do |editable_id|
+                        multiple.logics_set(
+                          targetId: editable_id,
+                          conditionalData: {
+                        value: { "if": [{ "var": 'user[check_all]' }, true, false] }
+                        }
+                        )
+                      end
+                    end
+                  )
+                end
+              )
               horizontal.spacer width: 20
               # header.fields_text width: 'matchParent', styleClass: 'outlined', name: 'user[new_name]', label: 'Item name'
               statuses = [:pending, :active]
@@ -61,23 +83,14 @@ page.form(
       )
       section.rows(
         builder: ->(row) do
-          batch_count = 20
           batch_count.times do |index|
             id = (batch_count * tab_index) + index
-            row.editable title: "Item #{id}", recordId: "PK_#{id}"
+            row.editable id: "PK_#{id}", title: "Item #{id}", recordId: "PK_#{id}"
           end
         end
       )
     end
-    ],
-      fieldCheckValueIf: {
-    "==": [
-    {
-    "var": 'user[check_all]'
-    },
-    true
     ]
-    }
     )
   end
 )

data/app/views/json_ui/garage/test_page/_header.json.jbuilder

@@ -1,4 +1,4 @@
-navs = ['form', 'dialog', 'form_dynamic', 'auto_validate', 'multiupload', 'dirty_state', 'window', 'selectable', 'lifecycle', 'file_upload_new']
+navs = ['form', 'dialog', 'form_dynamic', 'auto_validate', 'multiupload', 'dirty_state', 'window', 'selectable', 'list_editable', 'lifecycle', 'file_upload_new', 'logics_set', 'http', 'sheets', 'snackbars']
 
 view.panels_flow(
   innerPadding: { bottom: 0 },

data/app/views/json_ui/garage/test_page/auto_validate.json.jbuilder

@@ -2,76 +2,75 @@ json.title 'Test Page (Form)'
 
 page = json_ui_page json
 
-page.body childViews: ->(body) do
-  render 'json_ui/garage/test_page/header', view: body
-
-  model = Glib::DummyJobApplication.new(
-    name: 'John Deo',
-    accept: '0',
-    words: '',
-    age: 17,
-    position: 'ceo',
-    pet_you_have: 'crocodile'
-  )
-
-  body.panels_responsive padding: glib_json_padding_body, childViews: ->(res) do
-    res.h2 text: 'Job Application'
-    res.spacer height: 8
-    res.panels_form \
-      url: json_ui_garage_url(path: 'forms/generic_post'),
-      method: 'post',
-      model: model,
-      autoValidate: true,
-      childViews: ->(form) do
-        form.fields_text prop: :name, label: 'name', name: 'user[name]', width: 'matchParent'
-        form.spacer height: 4
-
-        form.fields_text label: 'say hello', name: 'user[say]', width: 'matchParent', validation: { format: { regex: 'hello', message: 'Say hello!' } }, value: 'sup'
-        form.spacer height: 4
-
-        form.fields_number prop: :age, label: 'age', name: 'user[age]', width: 'matchParent'
-        form.spacer height: 4
-
-        form.fields_number \
-          name: 'user[height]',
-          label: 'height',
-          width: 'matchParent',
-          validation: { numericality: { greater_than_or_equal_to: 155, less_than_or_equal_to: 190, message: { greater_than_or_equal_to: 'Too short', less_than_or_equal_to: 'Too long' } } },
-          value: 150
-        form.spacer height: 4
-
-        form.fields_textarea prop: :words, label: 'words', name: 'user[words]', width: 'matchParent'
-        form.spacer height: 4
-
-        form.fields_textarea label: 'Tell me story', name: 'user[story]', width: 'matchParent', validation: { length: { minimum: 1, message: { too_short: { one: 'Min %{count} word', other: 'Min %{count} words' } } } }
-        form.spacer height: 4
-
-        options = ['programmer', 'devops', 'designer', 'ceo', 'office_boy'].map { |v| { text: v.humanize, value: v } }
-        form.fields_select prop: :position, label: 'postion', name: 'user[position]', width: 'matchParent', options: options
-        form.spacer height: 4
-
-        options2 = ['crocodile', 'cat', 'dog', 'bird', 'shark'].map { |v| { text: v.humanize, value: v } }
-        form.fields_select prop: :pet_you_have, label: 'Pet you have', name: 'user[pet_you_have]', width: 'matchParent', options: options2
-        form.spacer height: 4
-
-        form.label text: 'Decision'
-        options3 = ['choose me', 'dont choose me', 'whatever']
-        form.fields_radioGroup value: 'dont choose me', validation: { exclusion: { in: ['dont choose me'], message: 'dont choose me' } }, childViews: ->(radio) do
-          options3.each do |option|
-            radio.fields_radio label: option, value: option
+page.body(
+  childViews: ->(body) do
+    render 'json_ui/garage/test_page/header', view: body
+    model = Glib::DummyJobApplication.new(
+      name: 'John Deo',
+      accept: '0',
+      words: '',
+      age: 17,
+      position: 'ceo',
+      pet_you_have: 'crocodile'
+    )
+    body.panels_responsive(
+      padding: glib_json_padding_body,
+      childViews: ->(res) do
+        res.h2 text: 'Job Application'
+        res.spacer height: 8
+        res.panels_form(
+          url: json_ui_garage_url(path: 'forms/generic_post'),
+          method: 'post',
+          model: model,
+          autoValidate: true,
+          childViews: ->(form) do
+            form.fields_text prop: :name, label: 'name', name: 'user[name]', width: 'matchParent'
+            form.spacer height: 4
+            form.fields_email prop: :email, label: 'email', name: 'user[email]',  width: 'matchParent'
+            form.fields_text label: 'say hello', name: 'user[say]', width: 'matchParent', validation: { format: { regex: 'hello', message: 'Say hello!' } }, value: 'sup'
+            form.spacer height: 4
+            form.fields_number prop: :age, label: 'age', name: 'user[age]', width: 'matchParent'
+            form.spacer height: 4
+            form.fields_number(
+              name: 'user[height]',
+              label: 'height',
+              width: 'matchParent',
+              validation: { numericality: { greater_than_or_equal_to: 155, less_than_or_equal_to: 190, message: { greater_than_or_equal_to: 'Too short', less_than_or_equal_to: 'Too long' } } },
+              value: 150
+            )
+            form.spacer height: 4
+            form.fields_textarea prop: :words, label: 'words', name: 'user[words]', width: 'matchParent'
+            form.spacer height: 4
+            form.fields_textarea label: 'Tell me story', name: 'user[story]', width: 'matchParent', validation: { length: { minimum: 1, message: { too_short: { one: 'Min %{count} word', other: 'Min %{count} words' } } } }
+            form.spacer height: 4
+            options = ['programmer', 'devops', 'designer', 'ceo', 'office_boy'].map { |v| { text: v.humanize, value: v } }
+            form.fields_select prop: :position, label: 'postion', name: 'user[position]', width: 'matchParent', options: options
+            form.spacer height: 4
+            options2 = ['crocodile', 'cat', 'dog', 'bird', 'shark'].map { |v| { text: v.humanize, value: v } }
+            form.fields_select prop: :pet_you_have, label: 'Pet you have', name: 'user[pet_you_have]', width: 'matchParent', options: options2
+            form.spacer height: 4
+            form.label text: 'Decision'
+            options3 = ['choose me', 'dont choose me', 'whatever']
+            form.fields_radioGroup(
+              value: 'dont choose me',
+              validation: { exclusion: { in: ['dont choose me'], message: 'dont choose me' } },
+              childViews: ->(radio) do
+                options3.each do |option|
+                  radio.fields_radio label: option, value: option
+                end
+              end
+            )
+            form.spacer height: 4
+            form.fields_check prop: :accept, label: 'accept', name: 'user[accept]', width: 'matchParent', checkValue: '1'
+            form.spacer height: 4
+            form.spacer height: 4
+            form.fields_submit text: 'submit'
+            form.spacer height: 2
+            form.fields_submit text: 'submit (if form valid)', disableIfFormInvalid: true
           end
-        end
-        form.spacer height: 4
-
-        form.fields_check prop: :accept, label: 'accept', name: 'user[accept]', width: 'matchParent', checkValue: '1'
-        form.spacer height: 4
-
-        form.spacer height: 4
-        form.fields_submit text: 'submit'
-        form.spacer height: 2
-        form.fields_submit text: 'submit (if form valid)', disableIfFormInvalid: true
+        )
+        res.spacer height: 16
       end
-
-    res.spacer height: 16
+    )
   end
-end
+)

data/app/views/json_ui/garage/test_page/http.json.jbuilder

@@ -0,0 +1,70 @@
+json.title 'Test Page (HTTP)'
+
+page = json_ui_page json
+
+page.body(
+  childViews: ->(body) do
+    render 'json_ui/garage/test_page/header', view: body
+    body.panels_responsive(
+      padding: glib_json_padding_body,
+      childViews: ->(res) do
+        res.h2 text: 'HTTP'
+        res.spacer height: 8
+        res.button text: 'http/post', onClick: ->(action) do
+          action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+            subaction.http_post(
+              url: json_ui_garage_url(path: 'forms/basic_post'),
+              formData: { user: { name: { first: 'New', last: 'Joe' } } }
+            )
+          end
+        end
+        res.spacer height: 4
+        res.button text: 'http/post (error page)', onClick: ->(action) do
+          action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+            subaction.http_post(
+              retryLimit: 5,
+              url: json_ui_garage_url(path: SecureRandom.hex(3)),
+              formData: { user: { name: { first: 'New', last: 'Joe' } } }
+            )
+          end
+        end
+        res.spacer height: 4
+        res.button text: 'http/patch', onClick: ->(action) do
+          action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+            subaction.http_patch(
+              url: json_ui_garage_url(path: 'forms/basic_post'),
+              formData: { 'user[name]' => 'Edit Joe' }
+            )
+          end
+        end
+        res.spacer height: 4
+        res.button text: 'http/patch (error page)', onClick: ->(action) do
+          action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+            subaction.http_patch(
+              url: json_ui_garage_url(path: SecureRandom.hex(3)),
+              formData: { 'user[name]' => 'Edit Joe' }
+            )
+          end
+        end
+        res.spacer height: 4
+        res.button text: 'http/delete', onClick: ->(action) do
+          action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+            subaction.http_delete(
+              url: json_ui_garage_url(path: 'forms/basic_post'),
+              formData: { 'user[name]' => 'Delete Joe' }
+            )
+          end
+        end
+        res.spacer height: 4
+        res.button text: 'http/delete (error page)', onClick: ->(action) do
+          action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+            subaction.http_delete(
+              url: json_ui_garage_url(path: SecureRandom.hex(3)),
+              formData: { 'user[name]' => 'Delete Joe' }
+            )
+          end
+        end
+      end
+    )
+  end
+)