glib-web 3.28.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 575e99be2d5c58f1f7c9422f254b6a4b5b24180c82b38496e84c8dec22c41bcc
-  data.tar.gz: 76e6c254672deb1e9cd34a9452978ef4c9c32fc276fb8ac3e1e6eec1cbe8df85
+  metadata.gz: 075c1d55a3db9efb8b8fd9302c410203f54f3feaf13e9debb3273fab7facf009
+  data.tar.gz: c9f19882259bb4e898578994734ece1c472a63b0dfffd7b41cb9fa8a3f89d1bb
 SHA512:
-  metadata.gz: a32237713616d6611d7cc6e57f57d81e7ff02823a68ed1d633e5de7276d4894ce67f30ff1766bda40df3bde0d53a9d69db2c677b740b266ae040e98f91c72a0b
-  data.tar.gz: 5fb068a0f809fc0ab4245fcbf1116758c253b04629a378fe8bd262486dc18d55490ac1cd854e0b4c1494a98cc4414abb108eb7f60baf1a84752565f66b7049ff
+  metadata.gz: 7c07ee59726cdf85c3cedf5970097fff38916c1e56d062332f61d7fd2692ebf316d9eacb32c9d6e4a65bedec4af28f66ceddf86fe95c84d0fba87ec215250ca6
+  data.tar.gz: 70d5e728d9730c9b0f2d63d9d34bea15654d8d8048eba682f114ec29c937020c1e058d205d523837a63ea54fa3ef878de498cd310cf1d96e52b435d7ded18109

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

@@ -74,7 +74,7 @@ module Glib::Json::Libs
     url.sub(/[\&\?]format=json/, '');
   end
 
-  def glib_redirect_to(url, return_to_previous: false)
+  def glib_redirect_to(url, return_to_previous: false, status: :ok)
     url = __delete_redirect_back_url(url) if return_to_previous
 
     respond_to do |format|
@@ -87,7 +87,7 @@ module Glib::Json::Libs
           return
         end
 
-        json_ui_redirect_to url
+        json_ui_redirect_to url, status: status
       end
     end
   end
@@ -235,7 +235,7 @@ module Glib::Json::Libs
     end
   end
 
-  def json_ui_redirect_to(url)
+  def json_ui_redirect_to(url, status: :ok)
     # Use windows_reload instead of windows_open so clicking back will skip the bridging page.
     # on_response = { action: 'windows/open', url: url }
     on_response = { action: 'windows/reload', url: url }
@@ -248,7 +248,7 @@ module Glib::Json::Libs
 
     # Use onResponse because it is harder to guarantee that `onLoad` executes in Vuejs because it relies
     # on app.vue's reactivity.
-    render json: { onResponse: on_response }
+    render json: { onResponse: on_response }, status: status
   end
 
   module ClassMethods

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

@@ -202,14 +202,6 @@ module Glib
             else
               data = {}
               name = value
-              # data = { material: { name: value } }
-
-              # name = value
-
-              # TODO: deprecated
-              # json.set!(propName) do
-              #   json.name name
-              # end
             end
 
             json.set!(propName) do

data/app/helpers/glib/json_ui/action_builder/components.rb

@@ -10,11 +10,6 @@ class Glib::JsonUi::ActionBuilder
       action :onFind
     end
 
-    class Update < Action
-      string :targetId
-      views :views
-    end
-
     # Experimental
     class ReplaceChildren < Action
       string :targetId

data/app/helpers/glib/json_ui/action_builder/dialogs.rb

@@ -7,26 +7,9 @@ class Glib::JsonUi::ActionBuilder
       action :onClose
     end
 
-    # class Show < Action
-    #   string :body
-    #   action :onLoad
-    #   action :onClose
-    # end
-
-    # Deprecated in favour of `sheets/select`
-    class Options < Action
-      string :message
-
-      def buttons(block)
-        json.buttons do
-          block.call page.menu_builder
-        end
-      end
-    end
 
     class Show < Action
       panels_builder :content, :body
-      bool :showClose # deprecated
       bool :disableCloseButton
       string :fullscreen # mobile, always
       length :width
@@ -45,7 +28,6 @@ class Glib::JsonUi::ActionBuilder
 
     class Open < Action
       string :url, cache: true
-      bool :showClose # deprecated
       bool :disableCloseButton
       string :fullscreen
       length :width
@@ -54,13 +36,8 @@ class Glib::JsonUi::ActionBuilder
       bool :updateExisting
     end
 
-    # Deprecation canceled. This is still useful for a scenario where the previous dialog
-    # was unknown, so we simply want to reload its content.
     class Reload < Action
-      # Deprecated. Should just use dialogs_show or dialogs_open if
-      # these attributes are needed.
       string :url, cache: true
-      bool :showClose # deprecated
       bool :disableCloseButton
       string :fullscreen # mobile, always
       length :width

data/app/helpers/glib/json_ui/action_builder/logics.rb

@@ -0,0 +1,11 @@
+class Glib::JsonUi::ActionBuilder
+  module Logics
+    class Set < Action
+      string :targetId
+      hash :conditionalData
+      hash :data
+      hash :variables
+      action :onSet
+    end
+  end
+end

data/app/helpers/glib/json_ui/action_builder/popovers.rb

@@ -1,14 +1,5 @@
 class Glib::JsonUi::ActionBuilder
   module Popovers
-    # Deprecated. Use popovers_show instead.
-    class Open < Action
-      string :key
-      views :childViews
-      string :placement
-      int :offset
-      int :width
-      singleton_array :styleClass, :styleClasses
-    end
 
     class Show < Action
       panels_builder :content, :body

data/app/helpers/glib/json_ui/action_builder/windows.rb

@@ -20,6 +20,7 @@ class Glib::JsonUi::ActionBuilder
 
     class Reload < Action
       string :url, cache: true
+      bool :disableDirtyCheck
       action :onReload
     end
 
@@ -42,11 +43,6 @@ class Glib::JsonUi::ActionBuilder
       action :onOpen
     end
 
-    # Any component can listen to the refresh_state event and react appropriately.
-    # E.g. Stripe credit card component can refresh its token to make sure it is not stale.
-    class RefreshState < Action
-    end
-
     class Print < Action
     end
   end

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

@@ -110,30 +110,6 @@ module Glib
         end
       end
 
-      module Logics
-        # Future: Replace showIf and loadIf
-        # Example:
-        # `submitWhenNotDisplayed` is false by default
-        # fields_text id: 'my_text', displayed: false, submitWhenNotDisplayed: true
-        #
-        # logics_if condition: { '==', BLAH1, BLAH2 }, true: ->(action) do
-        #   action.components_set targetId: 'my_text', displayed: true
-        # end
-        #
-        # class If < Action
-        #   hash :condition
-        #   action :true
-        #   action :false
-        # end
-
-        class Set < Action
-          string :targetId
-          hash :conditionalData
-          hash :variables
-          action :onSet
-        end
-      end
-
       module Timeouts
         class Set < Action
           string :timerId

data/app/helpers/glib/json_ui/builder/mouse_events.rb

@@ -17,13 +17,6 @@ module Glib
           key = 'tooltip_test'
         end
         onMouseEnter ->(action) do
-          # action.popovers_open(
-          #   key: key,
-          #   placement: options[:placement] || 'top',
-          #   childViews: ->(view) {
-          #     view.p styleClass: 'tooltip', text: options[:text]
-          #   }
-          # )
 
           action.popovers_show(
             key: key,

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

@@ -3,12 +3,12 @@ module Glib
     module Default
       def default_accepts(value)
         default_max_size_error = {
-          body: I18n.t('common.accepts.max_file_size_error.body', default: '') || 'Files exceed the maximum size',
-          button: I18n.t('common.accepts.max_file_size_error.button', default: '') || 'Dismiss'
+          body: I18n.t('glib.accepts.max_file_size_error.body', default: nil) || 'Files exceed the maximum size',
+          button: I18n.t('glib.accepts.max_file_size_error.button', default: nil) || 'Dismiss'
         }
         default_max_length_error = {
-          body: I18n.t('common.accepts.max_file_length_error.body', default: '') || 'Files exceed the maximum limit per upload',
-          button: I18n.t('common.accepts.max_file_length_error.button', default: '') || 'Dismiss'
+          body: I18n.t('glib.accepts.max_file_length_error.body', default: nil) || 'Files exceed the maximum limit per upload',
+          button: I18n.t('glib.accepts.max_file_length_error.button', default: nil) || 'Dismiss'
         }
 
         {

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

@@ -43,9 +43,6 @@ module Glib
           string :paramNameForNewSectionIndex
           string :paramNameForNewSectionedRowIndex
 
-          string :id # Deprecated
-          string :paramNameForNewIndex # Deprecated
-
           panels_builder :accessory, :header, :body, :footer
         end
 

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

@@ -237,7 +237,7 @@ module Glib
         def form(options = {})
           form = Glib::JsonUi::ViewBuilder::Panels::Form.new(json, self)
           form.childViews(->(view_builder) { })
-          panel_options = options.slice!(:url, :method, :local, :onSubmit, :paramNameForFormData, :model, :onChange)
+          panel_options = options.slice!(:url, :method, :local, :onSubmit, :paramNameForFormData, :model, :onChange, :onChangeAndLoad)
 
           json.fullPageForm do
             json.view 'panels/fullPageForm'
@@ -283,6 +283,12 @@ module Glib
             end
           end
 
+          if (on_unload = options[:unload])
+            json.onUnload do
+              on_unload.call @action_builder
+            end
+          end
+
           if (on_refocus = options[:refocus])
             json.onRefocus do
               on_refocus.call @action_builder

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

@@ -9,6 +9,7 @@ class Glib::JsonUi::ViewBuilder
       hash :validation
       bool :disableDirtyCheck
       action :onChange
+      action :onChangeAndLoad
       string :paramNameForFormData
       string :paramNameForFieldName
 
@@ -155,9 +156,6 @@ class Glib::JsonUi::ViewBuilder
       def value(value)
         @value = value if value != Glib::Value::DEFAULT
       end
-
-      # TODO: Remove (deprecated). Where possible, use value instead of this
-      bool :checked
     end
 
     # This doesn't use camel case because some terms have become single words (e.g. snackbar)
@@ -173,15 +171,6 @@ class Glib::JsonUi::ViewBuilder
       string :cacheKey
     end
 
-    # Deprecated
-    # Just use fields_select with options provided by the backend. This allows greater flexibility,
-    # which is important because different systems might want to use different values for
-    # countries as well as for regions, e.g. alpha2 vs alpha3
-    # See app/views/json_ui/garage/forms/pickers.json.jbuilder for an example
-    class Country < AbstractField
-      hash :region
-    end
-
     class Select < AbstractField
       array :options
       # bool :readOnly
@@ -209,14 +198,6 @@ class Glib::JsonUi::ViewBuilder
       end
     end
 
-    # TODO: Remove (deprecated)
-    class Autocomplete < AbstractField
-      array :options
-      # bool :readOnly
-      bool :multiple, cache: true
-      # bool :manualEntry
-      hash :append
-    end
 
     class DynamicSelect < AbstractField
       array :selectedOptions
@@ -286,7 +267,6 @@ class Glib::JsonUi::ViewBuilder
       string :fileUrl
       string :fileTitle
       string :uploadText
-      string :uploadIcon # deprecated
       hash :placeholderView
       hash :infoSpec
       string :storagePrefix
@@ -298,9 +278,9 @@ class Glib::JsonUi::ViewBuilder
 
       def created
         @buttonLabels ||= ActiveSupport::HashWithIndifferentAccess.new
-        @buttonLabels['change'] ||= I18n.t('common.change') if I18n.exists?('common.change')
-        @buttonLabels['upload'] ||= I18n.t('common.upload') if I18n.exists?('common.upload')
-        @buttonLabels['delete'] ||= I18n.t('common.delete') if I18n.exists?('common.delete')
+        @buttonLabels['change'] ||= I18n.t('glib.change') if I18n.exists?('glib.change')
+        @buttonLabels['upload'] ||= I18n.t('glib.upload') if I18n.exists?('glib.upload')
+        @buttonLabels['delete'] ||= I18n.t('glib.delete') if I18n.exists?('glib.delete')
 
         json.set! :buttonLabels, @buttonLabels
 
@@ -331,7 +311,6 @@ class Glib::JsonUi::ViewBuilder
       array :files
       string :directUploadUrl
       string :uploadTitle
-      string :uploadFailedText # deprecated
       action :onFinishUpload
       string :strategy # can be "delegate" or "dropUpload"
       string :url # http post end point if you don't want to use onFinishUpload
@@ -341,15 +320,6 @@ class Glib::JsonUi::ViewBuilder
 
       required :accepts, :directUploadUrl
 
-      # deprecated
-      def title(value)
-        @placeholder = value
-      end
-
-      # deprecated
-      def subtitle(value)
-        @hint = value
-      end
 
       def accepts(value)
         @accepts = value
@@ -366,11 +336,11 @@ class Glib::JsonUi::ViewBuilder
       def created
         super
 
-        @placeholder ||= I18n.t('common.multi_upload.placeholder', default: nil)
-        @hint ||= I18n.t('common.multi_upload.hint', default: nil)
+        @placeholder ||= I18n.t('glib.multi_upload.placeholder', default: nil)
+        @hint ||= I18n.t('glib.multi_upload.hint', default: nil)
 
         ['200', '403', '401', 'else'].each do |status|
-          key = "common.multi_upload.responseMessages.#{status}"
+          key = "glib.multi_upload.responseMessages.#{status}"
           @responseMessages[status] = I18n.t(key) if I18n.exists?(key)
         end
         json.responseMessages (@responseMessages || {}).reverse_merge({
@@ -469,7 +439,6 @@ class Glib::JsonUi::ViewBuilder
     class Otp < AbstractField
       int     :length
       string :type
-      string :align # deprecated
     end
 
     class Rating < AbstractField

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

@@ -6,6 +6,7 @@ class Glib::JsonUi::ViewBuilder
 
       action :onSubmit
       action :onChange
+      action :onChangeAndLoad
       string :paramNameForFormData
       bool :local
 

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

@@ -41,16 +41,15 @@ module Glib
         hash :padding
         singleton_array :styleClass, :styleClasses
 
-        hash :valueIf
-
         hash :showIf
         hash :loadIf
         action :onIfTrue
         action :onIfFalse
 
+        bool :displayed
+        bool :submitWhenNotDisplayed
+
         hash :analytics
-        # hash :tooltip
-        array :extensions # deprecated
         hash :dragData
 
         def self.component_name
@@ -166,9 +165,6 @@ module Glib
       class Icon < View
         badgeable
 
-        # TODO: Remove later. Deprecated.
-        icon :spec
-
         action :onClick
         color :color
 
@@ -204,13 +200,6 @@ module Glib
         action :onClick
         color :color
         bool :disabled
-
-        # TODO: This should be deprecated in favour of `popovers/open`
-        def childButtons(block)
-          json.childButtons do
-            block.call page.menu_builder
-          end
-        end
       end
 
       class Fab < View

data/app/policies/glib/application_policy.rb

@@ -125,12 +125,6 @@ module Glib
       controller.helpers
     end
 
-    # TODO: Remove. Deprecated
-    # private  # Used by child
-    # def public?
-    #   true
-    # end
-
     class Scope
       attr_reader :user, :scope
 

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

@@ -4,14 +4,10 @@ section.header padding: glib_json_padding_list, childViews: ->(header) do
 end
 
 section.rows builder: ->(template) do
-  template.thumbnail title: 'components/update (Deprecated)', onClick: ->(action) do
-    action.windows_open url: json_ui_garage_url(path: 'views/components_update')
+  template.thumbnail title: 'components/replace', onClick: ->(action) do
+    action.windows_open url: json_ui_garage_url(path: 'views/components_replace')
   end
 
-  # template.thumbnail title: 'components/replace', onClick: ->(action) do
-  #   action.windows_open url: json_ui_garage_url(path: 'views/components')
-  # end
-
   template.thumbnail title: 'components/set', onClick: ->(action) do
     action.windows_open url: json_ui_garage_url(path: 'views/components_set')
   end

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

@@ -40,20 +40,6 @@ section.rows builder: ->(template) do
   #   end
   # end
 
-  # TODO: Deprecate
-  template.thumbnail title: 'dialogs/option (Deprecated)', onClick: ->(action) do
-    # TODO: Rename to `dialogs/menu`
-    action.dialogs_options message: 'Select one', buttons: ->(menu) do
-      menu.button text: 'Option1', onClick: ->(action) do
-        action.dialogs_alert message: 'Option 1'
-      end
-      menu.button text: 'Option2', onClick: ->(action) do
-        action.dialogs_alert message: 'Option 2'
-      end
-      menu.button text: 'Cancel'
-    end
-  end
-
   template.thumbnail title: 'dialogs/show', onClick: ->(action) do
     render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :show
   end

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

@@ -16,7 +16,7 @@ section.rows builder: ->(template) do
     action.windows_reload url: json_ui_garage_url(path: 'actions/index', reload_counter: reload_counter + 1)
   end
 
-  template.thumbnail title: "components/update (counter: #{reload_counter})", onClick: ->(action) do
+  template.thumbnail title: "components/replace (counter: #{reload_counter})", onClick: ->(action) do
     action.http_get url: json_ui_garage_url(path: 'actions/partial_update', reload_counter: reload_counter + 1)
   end
 end

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

@@ -1,5 +1,5 @@
 json_ui_response_with_view json do |action|
-  action.components_update targetId: 'action_list', views: ->(update) do
+  action.components_replace targetId: 'action_list', views: ->(update) do
     render "#{@path_prefix}/actions/list", panel: update
   end
 end

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

@@ -7,6 +7,4 @@ info = "Method: #{request.method}\nForm Data:\n"
 
 info += JSON.pretty_generate(params.require(:user).to_unsafe_h)
 
-action.dialogs_alert message: info, onClose: ->(action) do
-  action.windows_refreshState
-end
+action.dialogs_alert message: info

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

@@ -1,5 +1,5 @@
 name = params[:name]
-action.components_update targetId: 'greeting', views: ->(update) do
+action.components_replace targetId: 'greeting', views: ->(update) do
   update.panels_vertical childViews: ->(vertical) do
     name = params[:name]
     vertical.fields_hidden name: 'name', value: name

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

@@ -6,26 +6,9 @@ if text.length > min_chars
     form.markdown \
       text: text.truncate(min_chars),
       styleClasses: ['line-clamp', "line-clamp-#{max_lines}"],
-      showIf: {
-        "!=": [
-          {
-            "var": toggle_name
-          },
-          'true'
-        ]
-      }
-    form.markdown \
-      text: text,
-      showIf: {
-        "==": [
-          {
-            "var": toggle_name
-          },
-          'true'
-        ]
-      }
+      id: "#{id}-off"
+    form.markdown id: "#{id}-on", text: text
 
-    # NOTE: Don't put a valueIf here in an attempt to implement accordions. It won't work due to circular updates, presumably between valueIf and the on/off icons and labels.
     form.fields_check \
       width: 'matchParent',
       offIcon: 'expand_more',
@@ -35,7 +18,31 @@ if text.length > min_chars
       checkValue: 'true',
       uncheckValue: nil,
       name: toggle_name,
-      disableDirtyCheck: true
+      disableDirtyCheck: true,
+      onChangeAndLoad: ->(action) do
+        action.runMultiple childActions: ->(saction) do
+          saction.logics_set targetId: "#{id}-on", conditionalData: {
+            displayed: {
+              "==": [
+                {
+                  "var": toggle_name
+                },
+                'true'
+              ]
+            }
+          }
+          saction.logics_set targetId: "#{id}-off", conditionalData: {
+            displayed: {
+              "!=": [
+                {
+                  "var": toggle_name
+                },
+                'true'
+              ]
+            }
+          }
+        end
+      end
 
     @__read_more_index += 1
   end