glib-web 4.10.6 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0711a808828a6946ba4ec082755d8180a8437241b09c775ec674e4c1cb64388b
-  data.tar.gz: 40b1bda454b973e258b2bf2dd5621515e0f4ef00ce32013f212ccd6603af3c45
+  metadata.gz: 3ebaad0db46b2de735aeab4b86abcbd6d436b2c9350d4a4da402f54f7fe6c8ec
+  data.tar.gz: 29433f78f6f0fb2b3a21ef52108feb97fdac0bf9af7693b37dde9b17f3b9070c
 SHA512:
-  metadata.gz: d2a75a8f46b4acda54a0fdc37feb8fee6fadac5b342ff016412b16565d0cf9c4e7e77d26e4b4640f5a83df105f24f3bda48c4bca644ec80c7c411fc341ac9321
-  data.tar.gz: 9554b47291f05a584dca44b56bc174986a820567e50e48a14007693818d48b7730101fcf2642c179b620e9bfba01f7a5a5a584b93cf7953a5fe663af1218970e
+  metadata.gz: f31a55f1ac2485426a381b933ece050fb967571b9de2255cce345be1a3f0136e45f432132c79118c45f376792aa32cb7b677d4d1594db014515348b0fcafeda5
+  data.tar.gz: 3f4f47a8b1566f503d8073f6817c73dde15ef2f70861ba89330781b2f62676da9fdd829e61e9de0fb2f64586b6581032cd4d958d4dd61c204b7c6eb1bc0fd26c

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

@@ -1,8 +1,8 @@
 class Glib::JsonUi::ActionBuilder
   module Components
-    class Method < Action
+    class Invoke < Action
       string :name
-      hash :parameter
+      hash :arguments
     end
 
     class Find < Action

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

@@ -8,7 +8,6 @@ class Glib::JsonUi::ActionBuilder
       hash :variables
       action :onSet
       bool :cacheData
-      bool :debug
 
       def dataBuilder(block)
         json.data do

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

@@ -17,6 +17,12 @@ module Glib
 
       class Action < JsonUiElement
         string :targetId
+        string :paramName
+
+        # TODO: Rename to fromFieldName or previousFieldName or valueFromFieldName or fieldValueFromName
+        string :fieldName
+        bool :debug
+
         # def analytics(value)
         #   if value.is_a?(String)
         #     @analyticsEnabled = true

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

@@ -201,6 +201,7 @@ class Glib::JsonUi::ViewBuilder
 
       panels_builder :accessory, :header, :footer
       bool :clearable
+      bool :csvMode
 
       def options(value)
         @_options = value

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

@@ -370,18 +370,20 @@ class Glib::JsonUi::ViewBuilder
     class BulkEdit2 < View
       hash :import, required: [:submitUrl, :paramName]
 
-      string :statusViewIdPrefix
+      # string :statusViewIdPrefix
       array :viewHeaders
 
-      action :onLoadRows
+      # string :paramNameForFormData
+      string :paramNameForRowId
       action :onCellChange
-      string :paramNameForFormData
-      action :onRowSelected
+      action :onRowsLoad
+      action :onRowsSelect
+      action :onRowsSucceed
       action :onSubmitStart
       action :onSubmitEnd
 
       # Experimental
-      panels_builder :accessory, :header, :footer
+      # panels_builder :accessory, :header, :footer
 
       def viewCells(values)
         json.set! 'viewCells' do

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

@@ -1,8 +1,12 @@
-sleep 0.1
-row_id = params[:user]['rowId']
-# status = [:saved, :failed][rand(0..1)]
-status = :saved
+sleep 1
+row_id = params[:user]['row_id']
+status = [:succeeded, :failed][rand(0..1)]
+# status = :succeeded
+#status = :failed
 
 json_ui_response json do |action|
-  action.components_method targetId: 'bulkEdit', name: 'updateRow', parameter: { rowId: row_id, status: status }
+  action.components_invoke \
+    targetId: 'import_table',
+    name: 'updateRow',
+    arguments: { rowId: row_id, status: status, message: 'Response from server' }
 end

data/app/views/json_ui/garage/tables/bulk_edit.json.jbuilder

@@ -32,19 +32,46 @@ page.scroll childViews: ->(scroll) do
   #   end
 
   options = [{ text: 'yes', value: 'yes' }, { text: 'no', value: 'no' }]
+  source_options = ['Generators', 'Power Station', 'Solar Panels'].map do |o|
+    { text: o, value: o }
+  end
+
+  #  { text: 'Solar Panels', value: 'solar_panels' },
+  #  { text: 'Generators', value: 'generators' },
+  #  { text: 'Power Station', value: 'power_station' }
+
   scroll.button displayed: false, id: 'submit_top', text: 'submit', onClick: ->(action) do
     action.forms_submit targetId: 'bulkEdit'
   end
   scroll.panels_responsive styleClass: 'overflow-y-auto', width: 'matchParent', height: 500, childViews: ->(wres) do
+    wres.panels_horizontal align: 'middle', childViews: ->(horizontal) do
+      horizontal.label text: 'Total: '
+      horizontal.label id: 'loaded_count', text: '0'
+
+      horizontal.label text: " #{symbol_horizontal_separator} "
+
+      horizontal.label text: 'Selected: '
+      horizontal.label id: 'selected_count', text: '0'
+
+      horizontal.label text: " #{symbol_horizontal_separator} "
+      horizontal.chip \
+        id: 'succeeded_count',
+        styleClass: 'success',
+        text: 'Uploaded: ',
+        displayed: false
+    end
+
     scroll.panels_bulkEdit2 \
-      id: 'bulkEdit',
+      id: 'import_table',
       width: 'matchParent',
       backgroundColor: '#e2e2e2',
+      paramNameForRowId: 'row_id',
       import: { submitUrl: json_ui_garage_url(path: 'forms/bulk_edit_post2'), paramName: 'user' },
       viewHeaders: [
         { text: 'Month', id: 'month', importable: true },
         { text: 'Electricity usage', id: 'electricity_usage', importable: true },
         { text: 'Gas usage', id: 'gas_usage', importable: true },
+        { text: 'Sources', id: 'sources', importable: true },
         { text: 'Compliant', id: 'compliant', importable: true }
       ],
       viewCells: [
@@ -57,35 +84,83 @@ page.scroll childViews: ->(scroll) do
         ->(view) do
           view.fields_number width: 'matchParent'
         end,
+        ->(view) do
+          view.fields_select width: 'matchParent', options: source_options, multiple: true
+        end,
         ->(view) do
           view.fields_select width: 'matchParent', options: options
         end
       ],
-      paramNameForFormData: 'message',
+      # paramNameForFormData: 'message',
       onCellChange: ->(action) do
-        action.snackbars_alert
-      end,
-      onLoadRows: ->(action) do
-        action.runMultiple childActions: ->(multiple) do
-          multiple.snackbars_alert message: 'rows loaded'
-          multiple.components_set targetId: 'submit_top', data: { displayed: true }
-          multiple.components_set targetId: 'submit_bottom', data: { displayed: true }
-        end
+        action.snackbars_alert debug: true, paramName: 'message', fieldName: 'row'
       end,
       onSubmitStart: ->(action) do
         action.runMultiple childActions: ->(multiple) do
           multiple.components_set targetId: 'submit_top', data: { disabled: true }
           multiple.components_set targetId: 'submit_bottom', data: { disabled: true }
+          multiple.components_set targetId: 'cancel_button', data: { displayed: true }
         end
       end,
       onSubmitEnd: ->(action) do
         action.runMultiple childActions: ->(multiple) do
           multiple.components_set targetId: 'submit_top', data: { disabled: false }
           multiple.components_set targetId: 'submit_bottom', data: { disabled: false }
+          multiple.components_set targetId: 'cancel_button', data: { displayed: false }
+        end
+      end,
+      onRowsLoad: ->(action) do
+        action.runMultiple debug: true, fieldName: 'data', childActions: ->(multiple) do
+          multiple.logics_set \
+            targetId: 'loaded_count',
+            debug: true,
+            paramName: 'variables',
+            fieldName: 'data',
+            conditionalData: {
+              text: { "count": [{ "var": 'data.loadedRows' }] }
+            }
+          multiple.components_set targetId: 'submit_top', data: { displayed: true }
+          multiple.components_set targetId: 'submit_bottom', data: { displayed: true }
         end
+      end,
+      onRowsSelect: ->(action) do
+        action.logics_set \
+          targetId: 'selected_count',
+          debug: true,
+          paramName: 'variables',
+          fieldName: 'data',
+          conditionalData: {
+            text: { "count": [{ "var": 'data.selectedRows' }] }
+          }
+      end,
+      onRowsSucceed: ->(action) do
+        action.logics_set \
+          targetId: 'succeeded_count',
+          debug: true,
+          paramName: 'variables',
+          fieldName: 'data',
+          conditionalData: {
+            text: {
+              "printf": [
+                "Uploaded: {0}",
+                { "count": [{ "var": 'data.succeededRows' }] }
+              ]
+            },
+            displayed: true
+          }
       end
   end
   scroll.button displayed: false, id: 'submit_bottom', text: 'submit', onClick: ->(action) do
-    action.forms_submit targetId: 'bulkEdit'
+    action.forms_submit targetId: 'import_table'
+  end
+
+  scroll.button displayed: false, id: 'cancel_button', text: 'Cancel', onClick: ->(action) do
+    action.sheets_select message: 'Are you sure?', buttons: ->(menu) do
+      menu.button text: 'Yes, cancel the import', onClick: ->(subaction) do
+        action.components_invoke \
+          targetId: 'import_table',
+          name: 'cancelImport'
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.10.6
+  version: 4.11.0
 platform: ruby
 authors:
 - ''
@@ -403,7 +403,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''