glib-web 6.10.4 → 6.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af62a06f4071bb5b2779e61b2dfa771d9984d4f2f15bd6ed121fd71a676d7918
-  data.tar.gz: f5100fe92e6d2959a4479b82887e0009c0aaea1a2ef419f1ae6205c8fbda427b
+  metadata.gz: 817984b6f3889911d4fbfa93df3612733ccdc32c424e1047d9fe3a578d771057
+  data.tar.gz: dc7aa2551592c95d7808061645eb2c67c7d1c910e9acd994a4357db824ea33a5
 SHA512:
-  metadata.gz: b0e19fa8b04dc2a7d44826f0c28eefe5411610d26226180dbd20079af4287177d44967331c56dd1c0dc7ebf0b3f01df08f1a38939958fe58c37a08183e8d10c0
-  data.tar.gz: 3c717ab4989d1e67f712d7d118d77cc6e99d136e0b1ed2e4e403a0974d0c364f705d064bad706b5f1bbfeca295333c523708e76f259a78cba969e958f6a494de
+  metadata.gz: 1f271cf7c9b788dbd9c3cd6e7bafe9cbb020156194cd2f52a6db592616691aa80a297b8f214eb2622b7129abc408a876d8335153aef8cc4031a2e168c58257d2
+  data.tar.gz: 52f8ae7045f853ffe7315eed140613d27080ee68868ce7fe603d43266d3968f600779283d6449fbf246066481eac6078925364a48f06c2438b288de5be44b8ad

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

@@ -493,129 +493,23 @@ class Glib::JsonUi::ViewBuilder
       end
     end
 
-    class BulkEdit2 < View
+    # The generic bulk-edit table: form-peer submission, per-row POSTs,
+    # viewCells/viewHeaders, plus the full parse/gate/dedup config so any
+    # consumer can compose specialized import behavior (it replaced the
+    # retired bulkEdit2 and bulkEditSg -- see the component's header comment
+    # for the full mapping).
+    class BulkEdit3 < View
       hash :import, required: [:submitUrl, :paramName]
 
       # Override
       def created
-        # bulkEdit2 is a form PEER, not a form child: it answers the same
+        # bulkEdit3 is a form PEER, not a form child: it answers the same
         # forms_submit action a form does (forms/directSubmit) and submits its
         # rows itself to `import.submitUrl`. Inside a form, its repeated
         # per-row input names would collide with the form's FormData scans
         # (duplicate-name warnings, dirty-baseline pollution) while adding
         # nothing to the form's submission -- so, like a nested form, reject
         # the arrangement at render time.
-        if page.current_form
-          raise 'panels_bulkEdit2 is not allowed inside a form; place it as a sibling and target it with forms_submit targetId'
-        end
-      end
-
-      # Maximum number of data rows an uploaded file may contain; files with
-      # more rows are rejected with an error dialog. No limit when unset.
-      int :maxRows
-
-      # string :statusViewIdPrefix
-      array :viewHeaders
-
-      # string :paramNameForFormData
-      string :paramNameForRowId
-      action :onCellChange
-      action :onRowsLoad
-      action :onRowsSelect
-      action :onRowsSucceed
-      action :onSubmitStart
-      action :onSubmitEnd
-
-      # Experimental
-      # panels_builder :accessory, :header, :footer
-
-      def viewCells(values)
-        json.set! 'viewCells' do
-          values.each do |value|
-            value.call(page.view_builder)
-          end
-        end
-      end
-
-      def dataRows(value)
-        json.dataRows value
-      end
-
-      def viewRows(value)
-        json.viewRows value
-      end
-
-    end
-
-    # The Surfguard members-import table: a fork of bulkEdit2's builder for
-    # glib-web-npm's bulkEditSg component (same skeleton — form-peer
-    # submission, per-row POSTs, viewCells/viewHeaders — plus the Surfguard
-    # parse inputs). Deliberately SG-specific; consolidate with BulkEdit2 when
-    # a second consumer proves which props generalize.
-    class BulkEditSg < View
-      hash :import, required: [:submitUrl, :paramName]
-
-      # Override
-      def created
-        # Same form-peer rule as bulkEdit2 (see its comment).
-        if page.current_form
-          raise 'panels_bulkEditSg is not allowed inside a form; place it as a sibling and target it with forms_submit targetId'
-        end
-      end
-
-      # Maximum number of data rows an uploaded file may contain; files with
-      # more rows are rejected with an error dialog. No limit when unset.
-      int :maxRows
-
-      array :viewHeaders
-
-      # string :paramNameForFormData
-      string :paramNameForRowId
-      action :onCellChange
-      action :onRowsLoad
-      action :onRowsSelect
-      action :onRowsSucceed
-      # Fires when non-importable rows drain out of the table on save (they
-      # never POST), so the page can keep its Loaded/Uploaded/Skipped
-      # arithmetic honest.
-      action :onRowsSkip
-      action :onSubmitStart
-      action :onSubmitEnd
-
-      # Surfguard file shape: CSV header => form field. The parser follows
-      # this map, so a header-spelling fix is a one-line server change.
-      hash :headerMap
-      array :requiredHeaders
-      string :statusFilter
-
-      def viewCells(values)
-        json.set! 'viewCells' do
-          values.each do |value|
-            value.call(page.view_builder)
-          end
-        end
-      end
-
-      def dataRows(value)
-        json.dataRows value
-      end
-
-      def viewRows(value)
-        json.viewRows value
-      end
-
-    end
-
-    # The generic bulk-edit table: bulkEdit2's skeleton plus everything
-    # bulkEditSg hard-coded for the Surfguard imports, expressed as config so
-    # any consumer can compose the same behavior (bulkEditSg's replacement --
-    # see the component's header comment for the full mapping).
-    class BulkEdit3 < View
-      hash :import, required: [:submitUrl, :paramName]
-
-      # Override
-      def created
-        # Same form-peer rule as bulkEdit2 (see its comment).
         if page.current_form
           raise 'panels_bulkEdit3 is not allowed inside a form; place it as a sibling and target it with forms_submit targetId'
         end
@@ -641,7 +535,7 @@ class Glib::JsonUi::ViewBuilder
       action :onSubmitEnd
 
       # The file shape. Without it the table takes plain CSVs (header row
-      # first, header names = field ids -- the bulkEdit2 shape):
+      # first, header names = field ids):
       #   detectHeader: { allOf: [...], anyOf: [...], scanRows: N } -- find
       #     the header row BY CONTENT (report preambles survive);
       #   headerMap: { csvHeader => field } -- header-keyed, order-independent
@@ -716,36 +610,6 @@ class Glib::JsonUi::ViewBuilder
 
     end
 
-    # deprecated
-    class BulkEdit < View
-      hash :nextPage
-      hash :export, required: [:label, :fileName]
-      hash :import, required: [:submitUrl, :paramName]
-      action :onScrollToTop
-      action :onScrollToBottom
-      string :statusViewIdPrefix
-      action :onLoadRows
-
-      # Experimental
-      panels_builder :accessory, :header, :footer
-
-      def firstSection(block)
-        json.sections [1] do
-          block.call page.table_section_builder
-        end
-      end
-
-      def sections(blocks)
-        json.sections do
-          blocks.each do |block|
-            json.child! do
-              block.call page.table_section_builder
-            end
-          end
-        end
-      end
-    end
-
     # Scrollable container panel for content that exceeds viewport height.
     #
     # Scroll panels automatically add scrollbars when content overflows.

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

@@ -37,17 +37,17 @@ page.scroll childViews: ->(scroll) do
         displayed: false
     end
 
-    wres.panels_bulkEdit2 \
+    wres.panels_bulkEdit3 \
       id: 'import_table',
       width: 'matchParent',
       paramNameForRowId: 'row_id',
       import: { submitUrl: json_ui_garage_url(path: 'forms/bulk_edit_post2'), paramName: 'user' },
       viewHeaders: [
-        { text: 'Month', id: 'month', importable: true, tooltip: { text: 'Month', placement: 'top' } },
-        { 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 }
+        { text: 'Month', id: 'month', tooltip: { text: 'Month', placement: 'top' } },
+        { text: 'Electricity usage', id: 'electricity_usage' },
+        { text: 'Gas usage', id: 'gas_usage' },
+        { text: 'Sources', id: 'sources' },
+        { text: 'Compliant', id: 'compliant' }
       ],
       viewCells: [
         ->(view) do

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

@@ -56,7 +56,6 @@ nav_groups = {
     'flow',
     'grid',
     'horizontal',
-    'panels_bulkEdit2',
     'pagination',
     'responsive',
     'scroll',

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

@@ -83,13 +83,13 @@ page.body(
       padding: glib_json_padding_body,
       childViews: ->(res) do
         res.h2 text: 'Overview'
-        res.p text: 'panels_bulkEdit3 is the generic bulk-edit table: bulkEdit2’s skeleton plus config-driven file parsing, row gates, read-only columns, view chips and submission extras.'
+        res.p text: 'panels_bulkEdit3 is the generic bulk-edit table: cells, pagination and one-POST-per-row submission, plus config-driven file parsing, row gates, read-only columns, view chips and submission extras.'
         res.spacer height: 12
         res.hr width: 'matchParent'
 
         res.h2 text: 'Basic example (plain CSV)'
         res.spacer height: 8
-        res.p text: 'Without parse config the table takes plain CSVs: header row first, header names as field ids (the bulkEdit2 shape). maxRows 3 rejects oversized files whole.'
+        res.p text: 'Without parse config the table takes plain CSVs: header row first, header names as field ids. maxRows 3 rejects oversized files whole.'
         res.spacer height: 8
         res.panels_horizontal(
           align: 'middle',

data/lib/glib/json_crawler/action_crawlers/forms_submit.rb

@@ -16,7 +16,7 @@ module Glib
         raise "Submit action needs to be inside a form: #{http.router.last_log}" unless form
 
         case Glib::JsonUi::Name.normalize(form['view'])
-        when 'panels/bulkEdit2', 'panels/bulkEdit3'
+        when 'panels/bulkEdit3'
           method = 'post'
           action = "forms/#{method}"
           url = form['import']['submitUrl']

data/lib/glib/test_helpers.rb

@@ -239,7 +239,6 @@ module Glib
         name = Glib::JsonUi::Name.normalize(view['view'])
         name&.start_with?('panels/form') ||
           name&.start_with?('panels/fullPageForm') ||
-          name == 'panels/bulkEdit2' ||
           name == 'panels/bulkEdit3' ||
           name == 'panels/splitForm'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 6.10.4
+  version: 6.12.0
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-19 00:00:00.000000000 Z
+date: 2026-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -499,7 +499,6 @@ files:
 - app/views/json_ui/garage/test_page/multimedia_video.json.jbuilder
 - app/views/json_ui/garage/test_page/pagination.json.jbuilder
 - app/views/json_ui/garage/test_page/panels.json.jbuilder
-- app/views/json_ui/garage/test_page/panels_bulkEdit2.json.jbuilder
 - app/views/json_ui/garage/test_page/panels_bulkEdit3.json.jbuilder
 - app/views/json_ui/garage/test_page/popovers.json.jbuilder
 - app/views/json_ui/garage/test_page/progressCircle.json.jbuilder

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

@@ -1,244 +0,0 @@
-json.title 'Test Page (Panels Bulk Edit 2)'
-
-page = json_ui_page json
-
-options = [{ text: 'yes', value: 'yes' }, { text: 'no', value: 'no' }]
-source_options = ['Generators', 'Power Station', 'Solar Panels'].map do |source|
-  { text: source, value: source }
-end
-
-default_headers = [
-  { text: 'Month', id: 'month', importable: true, tooltip: { text: 'Month', placement: 'top' } },
-  { 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 }
-]
-
-default_cells = [
-  ->(view) do
-    view.fields_number width: 'matchParent'
-  end,
-  ->(view) do
-    view.fields_number width: 'matchParent'
-  end,
-  ->(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
-]
-
-[
-  { text: 'Month', id: 'month', importable: true },
-  { text: 'Usage (kWh)', id: 'electricity_usage', importable: true },
-  { text: 'Usage (Therms)', id: 'gas_usage', importable: true }
-]
-
-[
-  ->(view) do
-    view.fields_number width: 120
-  end,
-  ->(view) do
-    view.fields_number width: 140
-  end,
-  ->(view) do
-    view.fields_number width: 140
-  end
-]
-
-import_settings = { submitUrl: json_ui_garage_url(path: 'forms/bulk_edit_post2'), paramName: 'user' }
-
-render 'json_ui/garage/test_page/header', json: json, page: page
-
-page.body(
-  childViews: ->(body) do
-    body.panels_responsive(
-      padding: glib_json_padding_body,
-      childViews: ->(res) do
-        res.h2 text: 'Overview'
-        res.p text: 'panels_bulkEdit2 renders an editable grid with import-backed rows and bulk submission events.'
-        res.spacer height: 12
-        res.hr width: 'matchParent'
-        res.h2 text: 'Basic example'
-        res.spacer height: 8
-        res.panels_horizontal(
-          align: 'middle',
-          childViews: ->(horizontal) do
-            horizontal.label text: 'Loaded: '
-            horizontal.label id: 'bulk_edit_loaded_count', text: '0'
-            horizontal.spacer width: 12
-            horizontal.label text: 'Selected: '
-            horizontal.label id: 'bulk_edit_selected_count', text: '0'
-            horizontal.spacer width: 12
-            horizontal.chip id: 'bulk_edit_succeeded_count', styleClass: 'success', text: 'Uploaded: 0', displayed: false
-          end
-        )
-        res.spacer height: 8
-        res.panels_bulkEdit2(
-          id: 'bulk_edit_main',
-          width: 'matchParent',
-          paramNameForRowId: 'row_id',
-          # Files with more data rows than this are rejected wholesale with an
-          # error dialog (the header row doesn't count).
-          maxRows: 3,
-          import: import_settings,
-          viewHeaders: default_headers,
-          viewCells: default_cells,
-          onCellChange: ->(action) do
-            action.snackbars_alert debug: true, paramName: 'message', fieldName: 'row'
-          end,
-          onSubmitStart: ->(action) do
-            action.runMultiple(
-              childActions: ->(multiple) do
-                multiple.components_set targetId: 'bulk_edit_submit_top', data: { disabled: true }
-                multiple.components_set targetId: 'bulk_edit_submit_bottom', data: { disabled: true }
-                multiple.components_set targetId: 'bulk_edit_cancel', data: { displayed: true }
-              end
-            )
-          end,
-          onSubmitEnd: ->(action) do
-            action.runMultiple(
-              childActions: ->(multiple) do
-                multiple.components_set targetId: 'bulk_edit_submit_top', data: { disabled: false }
-                multiple.components_set targetId: 'bulk_edit_submit_bottom', data: { disabled: false }
-                multiple.components_set targetId: 'bulk_edit_cancel', data: { displayed: false }
-              end
-            )
-          end,
-          onRowsLoad: ->(action) do
-            action.runMultiple(
-              debug: true,
-              fieldName: 'data',
-              childActions: ->(multiple) do
-                multiple.logics_set(
-                  targetId: 'bulk_edit_loaded_count',
-                  debug: true,
-                  paramName: 'variables',
-                  fieldName: 'data',
-                  conditionalData: {
-                  text: { "count": [{ "var": 'data.loadedRows' }] }
-                  }
-                )
-                multiple.components_set targetId: 'bulk_edit_submit_top', data: { displayed: true }
-                multiple.components_set targetId: 'bulk_edit_submit_bottom', data: { displayed: true }
-              end
-            )
-          end,
-          onRowsSelect: ->(action) do
-            action.logics_set(
-              targetId: 'bulk_edit_selected_count',
-              debug: true,
-              paramName: 'variables',
-              fieldName: 'data',
-              conditionalData: {
-              text: { "count": [{ "var": 'data.selectedRows' }] }
-              }
-            )
-          end,
-          onRowsSucceed: ->(action) do
-            action.logics_set(
-              targetId: 'bulk_edit_succeeded_count',
-              debug: true,
-              paramName: 'variables',
-              fieldName: 'data',
-              conditionalData: {
-              text: {
-              "printf": [
-              'Uploaded: {0}',
-              { "count": [{ "var": 'data.succeededRows' }] }
-              ]
-              },
-              displayed: true
-              }
-            )
-          end
-        )
-        res.spacer height: 12
-        res.panels_flow(
-          innerPadding: { bottom: 0 },
-          childViews: ->(flow) do
-            flow.button(
-              id: 'bulk_edit_submit_top',
-              text: 'Submit (top)',
-              displayed: false,
-              onClick: ->(action) do
-                action.forms_submit targetId: 'bulk_edit_main'
-              end
-            )
-            flow.spacer width: 8
-            flow.button(
-              id: 'bulk_edit_submit_bottom',
-              text: 'Submit (bottom)',
-              displayed: false,
-              onClick: ->(action) do
-                action.forms_submit targetId: 'bulk_edit_main'
-              end
-            )
-            flow.spacer width: 8
-            flow.button(
-              id: 'bulk_edit_cancel',
-              text: 'Cancel import',
-              displayed: false,
-              onClick: ->(action) do
-                action.components_invoke targetId: 'bulk_edit_main', name: 'cancelImport'
-              end
-            )
-          end
-        )
-        res.spacer height: 12
-        res.hr width: 'matchParent'
-        # res.h2 text: 'Variants/props'
-        # res.spacer height: 8
-        # res.panels_flow innerPadding: { bottom: 0 }, childViews: ->(flow) do
-        #   flow.button text: 'Default columns', onClick: ->(action) do
-        #     action.components_set targetId: 'bulk_edit_main', data: { viewHeaders: default_headers, viewCells: default_cells }
-        #   end
-        #   flow.spacer width: 8
-        #   flow.button text: 'Compact columns', onClick: ->(action) do
-        #     action.components_set targetId: 'bulk_edit_main', data: { viewHeaders: compact_headers, viewCells: compact_cells }
-        #   end
-        #   flow.spacer width: 8
-        #   flow.button text: 'Reset counts', onClick: ->(action) do
-        #     action.runMultiple childActions: ->(multiple) do
-        #       multiple.components_set targetId: 'bulk_edit_loaded_count', data: { text: '0' }
-        #       multiple.components_set targetId: 'bulk_edit_selected_count', data: { text: '0' }
-        #       multiple.components_set targetId: 'bulk_edit_succeeded_count', data: { text: 'Uploaded: 0', displayed: false }
-        #     end
-        #   end
-        # end
-        # res.spacer height: 12
-        # res.hr width: 'matchParent'
-        res.h2 text: 'Actions/events'
-        res.spacer height: 8
-        res.panels_flow(
-          innerPadding: { bottom: 0 },
-          childViews: ->(flow) do
-            flow.button(
-              text: 'Submit (forms_submit)',
-              onClick: ->(action) do
-                action.forms_submit targetId: 'bulk_edit_main'
-              end
-            )
-            flow.spacer width: 8
-            flow.button(
-              text: 'Cancel import (invoke)',
-              onClick: ->(action) do
-                action.components_invoke targetId: 'bulk_edit_main', name: 'cancelImport'
-              end
-            )
-          end
-        )
-        res.spacer height: 12
-        res.hr width: 'matchParent'
-        res.h2 text: 'Edge/advanced'
-        res.spacer height: 8
-        res.label text: 'Swap to compact headers then try editing rows before submitting.'
-      end
-    )
-  end
-)