wco_models 3.1.0.212 → 3.1.0.214

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ce9287983a420344ec45522cb35c6e8a44c77778f0c519b4de471250cb8d28
-  data.tar.gz: bc7c4abacc63202c4f5f6982a15571327e4f739cb156e58ad423b084b6dec3ab
+  metadata.gz: cdeac595a719fd8ca76e389973edd35dcebde79b128db8b2b0336ce5b90138d2
+  data.tar.gz: 012f0b8ba7459279cd2781260aab2549d7aac5dc4b1c2543813bc9537fbd2b07
 SHA512:
-  metadata.gz: 4dda730058477e870a2b8f79879044b4b4a7b9a5473be8b72a504dbacfc656b1faf008273032017d709db31ee6633a311957d6bcfe86287f81062b3e4d1a81b6
-  data.tar.gz: 615c6699f124ad7357680091acbdb79d6a087186acf7641993c506bef60851725a379397a1c1c669604a3d866c62f64919cf4fa368da55384155d818cef67820
+  metadata.gz: 9b2269ccb090f1d833206ae2ff0da27ef239ca28133bc31c269897a6a892614f40ea0128807c488e2ef829f6d27ef33d732feb3a3fc7f678f71042770052c9b7
+  data.tar.gz: 2f12f75f8feca3fde8a3b5599e3ff8d92ed6330e7aa57e8af959e832c24aec083b6df67befa01ffef45379fe20f99502216ee37e4efa226bb329094c96784309

data/README.txt

@@ -1,5 +1,17 @@
 
-Wco Models.
+WasyaCo Models. The functionality shared across all (most) projects, including:
+* The ActiveRecord models
+* some stylesheets,
+* some javascript.
+
+== Setup ==
+
+Docker is reqiured for development. It is used for mongo, and localstack.
+
+Some infrastructure is driven by ansible - therefore, local python is required:
+
+  python3 -m venv zenv
+  . zenv/bin/activate
 
 == Test ==
 

data/app/controllers/wco/office_action_templates_controller.rb

@@ -25,9 +25,14 @@ class Wco::OfficeActionTemplatesController < Wco::ApplicationController
   def perform
     @oat = OAT.find params[:id]
     authorize! :run, @oat
-    @conversations = WcoEmail::Conversation.find( params[:conversation_ids] )
-    out = eval( @oat.action_exe )
+    @conversations = WcoEmail::Conversation.find( params[:conversation_ids] ) if params[:conversation_ids].present?
+    if 'rb' == @oat.action_type
+      out = eval( @oat.action_exe )
+    elsif 'sh' == @oat.action_type
+      out = `#{@oat.action_exe}`
+    end
     flash_notice out
+    redirect_to action: :index
   end
 
   def show

data/app/controllers/wco/office_actions_controller.rb

@@ -15,6 +15,17 @@ class Wco::OfficeActionsController < Wco::ApplicationController
     redirect_to action: :index
   end
 
+  def destroy
+    @oa = OA.find params[:id]
+    authorize! :destroy, @oa
+    if @oa.delete
+      flash_notice @oa
+    else
+      flash_alert @oa
+    end
+    redirect_to action: :index
+  end
+
   def edit
     @oa = OA.find params[:id]
     authorize! :edit, @oa

data/app/models/wco/office_action_template.rb

@@ -16,6 +16,7 @@ class Wco::OfficeActionTemplate
   belongs_to :from,      polymorphic: true,            optional: true
   belongs_to :publisher, class_name: 'Wco::Publisher', optional: true
 
+  field :action_type, type: :string, default: 'rb' # 'js', 'rb', 'sh'
   field :action_exe, type: :string
   validates :action_exe, presence: true
   def do_run

data/app/models/wco/price.rb

@@ -8,7 +8,11 @@ class Wco::Price
   ## Wco::Product, WcoHosting::ApplianceTmpl
   belongs_to :product, polymorphic: true
 
-  belongs_to :leadset, class_name: 'Wco::Leadset'
+  ## 2025-09-12 This used to be required - but I think it's unreasonable...
+  ##   all leadsets can have the same price.
+  ##   but I'll keep this around - to be able to override per-leadset.
+  ##   something else may be broken b/c I made this optional.
+  belongs_to :leadset, class_name: 'Wco::Leadset', optional: true
 
   has_many :subscriptions, class_name: 'Wco::Subscription', inverse_of: :price, foreign_key: :wco_price_id
 

data/app/views/wco/leadsets/_form.haml

@@ -47,7 +47,7 @@
       - @appliance_tmpl_prices_list.each do |price|
         .descr
           = check_box_tag 'leadset[appliance_tmpl_ids][]', price.id, leadset.appliance_tmpls.include?(price)
-          %label= price.product.name
+          %label= price.product&.name
 
 
   .actions

data/app/views/wco/office_action_templates/_form.haml

@@ -9,8 +9,11 @@
       %label Slug
       = f.text_field :slug, class: 'w-100'
 
+    .field
+      %label action_type
+      = f.select :action_type, options_for_select( [ nil, 'js', 'rb', 'sh' ], selected: oat.action_type )
     .descr
-      available vars: @conversations , @oat ,
+      rb available vars: @conversations , @oat ,
     .field
       %label action_exe
       = f.text_area :action_exe, class: :monospace

data/app/views/wco/office_action_templates/index.haml

@@ -6,10 +6,15 @@
   %ul
     - @oats.each do |oat|
       %li
-        = link_to '[~]', edit_office_action_template_path(oat)
-        .d-inline-block= button_to 'x', office_action_template_path(oat), method: :delete, html: { confirm: 'Are you sure?' }
-        = link_to oat.slug, office_action_template_path(oat)
-        %br
+        .d-flex
+          = link_to '[~]', edit_office_action_template_path(oat)
+           
+          = button_to 'x', office_action_template_path(oat), method: :delete, data: { confirm: 'Are you sure?' }
+           
+          = link_to oat.slug, office_action_template_path(oat)
+           
+          = button_to 'Run', office_action_templates_perform_path(oat), data: { confirm: 'Are you sure?' }
+
         = render '/wco/office_action_templates/ties', ties: oat.ties, oat: oat
         -# = oat.inspect
 

data/app/views/wco/office_action_templates/show.haml

@@ -6,7 +6,7 @@
     = link_to '[~]', edit_office_action_template_path(@oat)
 
   .a
-    %label action_exe
+    %label action_exe #{@oat.action_type}
     %pre.mono.descr= @oat.action_exe
 
   .a

data/app/views/wco/office_actions/_actions.haml

@@ -3,5 +3,5 @@
   %h5 Office Action
   .d-inline-block
     = select_tag :office_action_template, options_for_select(@office_action_templates_list), class: 'select2'
-  %a.btn.office-action-templates-perform-btn{ href: "javascript: void(0)", data: { url: wco.office_action_templates_perform_path } }
+  %a.btn.office-action-templates-perform-btn{ href: "javascript: void(0)", data: { url: wco.oat_perform_with_conversations_path } }
     Perform

data/app/views/wco/office_actions/_index.haml

@@ -6,6 +6,8 @@
       = link_to '[~]', edit_office_action_path(oa)
        
       = link_to oa.slug, office_action_path(oa)
+       
+      = button_to 'x', office_action_path(oa), method: :delete, data: { confirm: 'Are you sure?' }
       %ul
         %li
           .gray.mini= oa.id

data/config/routes.rb

@@ -44,7 +44,9 @@ Wco::Engine.routes.draw do
   resources :obfuscated_redirects
 
   post 'office_action_templates',         to: 'office_action_templates#update'
-  post 'office_action_templates/perform', to: 'office_action_templates#perform', as: :office_action_templates_perform
+  post 'office_action_templates/perform', to: 'office_action_templates#perform', as: :oat_perform_with_conversations ## from the mailbox, the oat_id is passed as a body param.
+  post 'office_action_templates/:id/perform', to: 'office_action_templates#perform', as: :oat_perform
+  get  'office_action_templates/:id/perform', to: 'office_action_templates#perform'
   resources :office_action_templates
   resources :office_actions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.212
+  version: 3.1.0.214
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey