spree_cm_commissioner 2.6.0 → 2.6.1.pre.patch1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ee7dd96d331aa9bc7b6c623122bfc392eb750b18e4b0862b369320cbc4dbb1
-  data.tar.gz: 34144c8f2905396882d00c544ef24f3624135eaf534d9c0eeb47de3f2ea79674
+  metadata.gz: 274cc050ff740aa833dcaabe59107c1aa8d62888208331930c3d07c5b54ecddf
+  data.tar.gz: 24b5ba546e632c0170730bd70656004a9f6a754bbb491aa63745ffdded7997b4
 SHA512:
-  metadata.gz: 6435ba7b9dc0d4581c9f970562ec45b3eb0645731e107adba712e199234fad6de29c05d74f770b3cf5aab612e48aa613ea913615793de0a1ebd90ba89e4db447
-  data.tar.gz: 2d44d9326fcfa39419d7fc39d84d1d28aea75cbb99c866699e9a1a7741bce095a0bc20f532a069225abd783128fe7c3160da9b942a52b48c67ecdde8d667ca9e
+  metadata.gz: a3941126c0368b51bbd9ef5d88b48eb67eb3c42452328957df2de6bbadf18fcc55b5b5f219ce51fe4b0dfe8c9a5395069ecc48f85a1d17e03a15ae367c582ced
+  data.tar.gz: f39c889290db96eb38154db411eddb8f99a92bb4c048b69e0b85fc6ca04213d21425f81aee79ac52811a15af464a3b4a8f2b5bc1c0b527c8d732010a6c3fbf77

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.6.0)
+    spree_cm_commissioner (2.6.1.pre.patch1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/spree/admin/system/cache_controller.rb

@@ -0,0 +1,30 @@
+module Spree
+  module Admin
+    module System
+      class CacheController < Spree::Admin::BaseController
+        def show; end
+
+        def invalidate
+          @patterns = params[:patterns].to_s
+
+          patterns = @patterns.split("\n").map(&:strip).compact_blank
+
+          if patterns.empty?
+            flash.now[:error] = 'Please enter at least one pattern.' # rubocop:disable Rails/I18nLocaleTexts
+            render :show and return
+          end
+
+          result = SpreeCmCommissioner::InvalidateCacheRequest.call(patterns: patterns)
+
+          if result.success?
+            flash[:success] = "Cache invalidated successfully for #{patterns.size} pattern(s)."
+            redirect_to admin_system_cache_path
+          else
+            flash.now[:error] = result.message
+            render :show
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/system/waiting_room_controller.rb

@@ -0,0 +1,35 @@
+module Spree
+  module Admin
+    module System
+      class WaitingRoomController < Spree::Admin::BaseController
+        def show
+          @fetcher = SpreeCmCommissioner::WaitingRoomSystemMetadataFetcher.new
+          @fetcher.load_document_data
+
+          @active_sesions_count = SpreeCmCommissioner::WaitingRoomSession.active.count
+        end
+
+        def modify_multiplier
+          modifier = params[:multiplier]&.to_i || 0
+          SpreeCmCommissioner::WaitingRoomSystemMetadataSetter.new.modify_multiplier(modifier)
+
+          redirect_back fallback_location: admin_system_waiting_room_path
+        end
+
+        def modify_max_thread_count
+          modifier = params[:max_thread_count]&.to_i || 0
+          SpreeCmCommissioner::WaitingRoomSystemMetadataSetter.new.modify_max_thread_count(modifier)
+
+          redirect_back fallback_location: admin_system_waiting_room_path
+        end
+
+        def force_pull
+          SpreeCmCommissioner::WaitingRoomLatestSystemMetadataPullerJob.perform_now
+          SpreeCmCommissioner::WaitingGuestsCallerJob.perform_now
+
+          redirect_back fallback_location: admin_system_waiting_room_path
+        end
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/pin_code.rb

@@ -132,7 +132,7 @@ module SpreeCmCommissioner
         'SpreeCmCommissioner::PinCodeMobileConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
         'SpreeCmCommissioner::PinCodeUpdateUserLogin' => I18n.t('pincode.readable_type.update_user_login'),
         'SpreeCmCommissioner::PinCodeEmailConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
-        'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code'),
+        'SpreeCmCommissioner::PinCodeOtp' => I18n.t('pincode.readable_type.otp_code'),
         'SpreeCmCommissioner::PinCodeTelegram' => I18n.t('pincode.readable_type.telegram_verification')
       }
     end

data/app/services/spree_cm_commissioner/api_caches/invalidate.rb

@@ -106,15 +106,15 @@ module SpreeCmCommissioner
       def homepage_section_patterns
         homepage_segment.flat_map do |segment|
           [
-            "/api/v2/storefront/homepage/#{segment}/homepage_sections",
-            "/api/v2/tenant/homepage/#{segment}/homepage_sections"
+            "/api/v2/storefront/homepage/#{segment}/homepage_sections*",
+            "/api/v2/tenant/homepage/#{segment}/homepage_sections*"
           ]
         end
       end
 
       def homepage_background_patterns
         homepage_segment.map do |segment|
-          "/api/v2/storefront/homepage/#{segment}/homepage_background"
+          "/api/v2/storefront/homepage/#{segment}/homepage_background*"
         end
       end
     end

data/app/views/spree/admin/exports/index.html.erb

@@ -18,7 +18,6 @@
           <th>Status</th>
           <th>Public Metadata</th>
           <th>Private Metadata</th>
-          <th>File</th>
           <th>Created At</th>
           <th>Actions</th>
         </tr>
@@ -66,15 +65,6 @@
                 <span class="text-muted">-</span>
               <% end %>
             </td>
-            <td>
-              <% if export.exported_file.attached? %>
-                <%= link_to export.exported_file_name, export.exported_file_url, target: '_blank', class: 'btn btn-sm btn-outline-primary' %>
-                <br>
-                <small class="text-muted"><%= number_to_human_size(export.file_size_bytes) %></small>
-              <% else %>
-                <span class="text-muted">-</span>
-              <% end %>
-            </td>
             <td><small><%= l(export.created_at, format: :short) %></small></td>
             <td data-hook="admin_exports_index_row_actions" class="actions">
               <span class="d-flex justify-content-end">

data/app/views/spree/admin/shared/_system_tabs.html.erb

@@ -0,0 +1,19 @@
+<% content_for :page_title do %>
+  <%= Spree.t('system') %>
+<% end %>
+
+<% content_for(:page_tabs) do %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'activity.svg',
+      Spree.t(:waiting_room),
+      admin_system_waiting_room_path,
+      class: "nav-link #{'active' if current == :waiting_room}" %>
+  <% end %>
+
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'cloud.svg',
+      Spree.t(:cdn_cache),
+      admin_system_cache_path,
+      class: "nav-link #{'active' if current == :cache}" %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/system/cache/show.html.erb

@@ -0,0 +1,18 @@
+<%= render 'spree/admin/shared/system_tabs', current: :cache %>
+
+<div class="card">
+  <div class="card-body">
+    <%= form_tag invalidate_admin_system_cache_path, method: :post do %>
+      <div class="form-group">
+        <label for="patterns">Patterns</label>
+        <%= text_area_tag :patterns, @patterns,
+              id: 'patterns',
+              class: 'form-control font-monospace',
+              rows: 8,
+              placeholder: "/api/v2/storefront/homepage/general/homepage_sections*\n/api/v2/storefront/products/*" %>
+        <small class="form-text text-muted">One pattern per line. Use <code>*</code> as wildcard.</small>
+      </div>
+      <%= button_tag 'Invalidate', type: :submit, class: 'btn btn-primary' %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/system/{show.html.erb → waiting_room/show.html.erb}

@@ -1,12 +1,10 @@
-<% content_for :page_title do %>
-  <%= link_to Spree.t('system'), spree.admin_system_path %>
-<% end %>
+<%= render 'spree/admin/shared/system_tabs', current: :waiting_room %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:force_pull), force_pull_admin_system_path, method: :post, class: "btn btn-outline-primary" %>
+  <%= button_link_to Spree.t(:force_pull), force_pull_admin_system_waiting_room_path, method: :post, class: "btn btn-outline-primary" %>
 <% end %>
 
-<div class="table-responsive border rounded bg-white">
+<div class="bg-white border rounded table-responsive">
   <table class="table" data-hook>
     <thead class="text-muted">
       <tr data-hook="admin_system_index_headers">
@@ -32,13 +30,13 @@
         {
           field_name: :max_thread_count,
           value: @fetcher.max_thread_count,
-          modify_path: modify_max_thread_count_admin_system_path
+          modify_path: modify_max_thread_count_admin_system_waiting_room_path
         },
         {
           field_name: :multiplier,
           value: @fetcher.multiplier,
           value_suffix: "%",
-          modify_path: modify_multiplier_admin_system_path
+          modify_path: modify_multiplier_admin_system_waiting_room_path
         },
       ] %>
 

data/config/routes.rb

@@ -8,11 +8,21 @@ Spree::Core::Engine.add_routes do
   namespace :admin do
     post '/invalidate_api_caches', to: 'base#invalidate_api_caches'
 
-    resource :system, controller: :system do
-      collection do
-        post :force_pull
-        post :modify_multiplier
-        post :modify_max_thread_count
+    get '/system', to: redirect('/admin/system/waiting_room')
+
+    namespace :system do
+      resource :waiting_room, controller: :waiting_room, only: [:show] do
+        collection do
+          post :force_pull
+          post :modify_multiplier
+          post :modify_max_thread_count
+        end
+      end
+
+      resource :cache, controller: :cache, only: [:show] do
+        collection do
+          post :invalidate
+        end
       end
     end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.6.0'.freeze
+  VERSION = '2.6.1-patch1'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1.pre.patch1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-24 00:00:00.000000000 Z
+date: 2026-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -883,7 +883,8 @@ files:
 - app/controllers/spree/admin/s3_presigned_urls_controller.rb
 - app/controllers/spree/admin/sprite_import_controller.rb
 - app/controllers/spree/admin/stock_managements_controller.rb
-- app/controllers/spree/admin/system_controller.rb
+- app/controllers/spree/admin/system/cache_controller.rb
+- app/controllers/spree/admin/system/waiting_room_controller.rb
 - app/controllers/spree/admin/taxon_childrens_controller.rb
 - app/controllers/spree/admin/taxon_vendors_controller.rb
 - app/controllers/spree/admin/taxons_controller_decorator.rb
@@ -2329,6 +2330,7 @@ files:
 - app/views/spree/admin/shared/_products.html.erb
 - app/views/spree/admin/shared/_send_all_form.html.erb
 - app/views/spree/admin/shared/_send_test_form.html.erb
+- app/views/spree/admin/shared/_system_tabs.html.erb
 - app/views/spree/admin/shared/_taxon_tabs.html.erb
 - app/views/spree/admin/shared/_vectors_option_type_tabs.html.erb
 - app/views/spree/admin/shared/_vectors_tabs.html.erb
@@ -2346,7 +2348,8 @@ files:
 - app/views/spree/admin/stock_managements/_variant_stock_items.html.erb
 - app/views/spree/admin/stock_managements/calendar.html.erb
 - app/views/spree/admin/stock_managements/index.html.erb
-- app/views/spree/admin/system/show.html.erb
+- app/views/spree/admin/system/cache/show.html.erb
+- app/views/spree/admin/system/waiting_room/show.html.erb
 - app/views/spree/admin/taxon_childrens/index.html.erb
 - app/views/spree/admin/taxon_vendors/_form.html.erb
 - app/views/spree/admin/taxon_vendors/edit.html.erb
@@ -3282,9 +3285,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1

data/app/controllers/spree/admin/system_controller.rb

@@ -1,44 +0,0 @@
-module Spree
-  module Admin
-    class SystemController < Spree::Admin::ResourceController
-      skip_before_action :load_resource
-
-      def show
-        @fetcher = SpreeCmCommissioner::WaitingRoomSystemMetadataFetcher.new
-        @fetcher.load_document_data
-
-        @active_sesions_count = SpreeCmCommissioner::WaitingRoomSession.active.count
-      end
-
-      def modify_multiplier
-        modifier = params[:multiplier]&.to_i || 0
-        SpreeCmCommissioner::WaitingRoomSystemMetadataSetter.new.modify_multiplier(modifier)
-
-        redirect_back fallback_location: collection_url
-      end
-
-      def modify_max_thread_count
-        modifier = params[:max_thread_count]&.to_i || 0
-        SpreeCmCommissioner::WaitingRoomSystemMetadataSetter.new.modify_max_thread_count(modifier)
-
-        redirect_back fallback_location: collection_url
-      end
-
-      def force_pull
-        SpreeCmCommissioner::WaitingRoomLatestSystemMetadataPullerJob.perform_now
-        SpreeCmCommissioner::WaitingGuestsCallerJob.perform_now
-
-        redirect_back fallback_location: collection_url
-      end
-
-      def model_class
-        nil
-      end
-
-      # override
-      def collection_url(options = {})
-        admin_system_url(options)
-      end
-    end
-  end
-end