wco_models 3.1.0.210 → 3.1.0.213

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed21f322429c28e1da97d3d9c831d5b3edceb255faa2ca04d21bb893713c8739
-  data.tar.gz: c40855a81e965afe69e2a4e950af56b4c4775156b03f9429e03ba8a116d7ef3a
+  metadata.gz: 6e065101cb33dbeaf417ea5aedc2cf588d291430d40cb19521efe4daad2e1016
+  data.tar.gz: 3e58043aa47eb24a005985e97e0d6ed0a12eb0f5f04360391f2f81052207440a
 SHA512:
-  metadata.gz: 61846f58930bb2eb6d7bd6fe70f531177bec6e39dd7820361d9810fa4f6cde0c653b30b4421340f060bd2794e353b048257ca7421f78d9167803ac0f73f4c016
-  data.tar.gz: 842b75a3c46213a54b620c1f3f30a2e26e41f2fce07fb9c78927ad4b209fc6d358529e81d79be48bfe06b03224dc4c4679c8cdf0044e624d8d08cf47eae6739c
+  metadata.gz: 72e5731bf2e25209eb6f0b7cf9dd9df06cf0770dea002ca9b5af4a560bb3700c657556546c5bc0b4903e23042477ecce3b27565d44099f02b4cd8463a86822e4
+  data.tar.gz: 867125c0a713c9b5e9489091ee85abd60ab5893938dbb74d18073746748ae567357e1ed4a8c1a41cbf29a4f3b25dbacb7d37b3d74fb8f7b73f97aa42c469185a

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/assets/stylesheets/wco/main.scss

@@ -46,15 +46,20 @@ table.bordered {
   // border-right: 0;
 
 
-  th, thead {
+  th {
     background: #ddd;
+    border: 1px solid gray;
     font-weight: bold;
+    padding: 0.5em;
   }
 
   td {
     border: 1px solid gray;
     border-top: 0;
     border-left: 0;
+
+    padding: 0.5em;
+    vertical-align: top;
   }
   .latest-at {
     width: 100px;

data/app/controllers/wco/leadsets_controller.rb

@@ -70,7 +70,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
   end
 
   def update
-    params[:leadset][:serverhost_ids].delete ''
+    params[:leadset][:serverhost_ids].present? && params[:leadset][:serverhost_ids].delete('')
     @leadset = Leadset.find params[:id]
     authorize! :update, @leadset
     if @leadset.update_attributes params[:leadset].permit!

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/mailers/wco_email/application_mailer.rb

@@ -14,17 +14,6 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
           subject: "POX::#{@msg.subject}" )
   end
 
-  def shared_galleries profiles, gallery
-    return if profiles.count == 0
-    @gallery        = gallery
-    @domain         = Rails.application.config.action_mailer.default_url_options[:host]
-    @galleries_path = IshManager::Engine.routes.url_helpers.galleries_path
-    @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
-    mail( :to => '314658@gmail.com',
-          :bcc => profiles.map { |p| p.email },
-          :subject => 'You got new shared galleries on pi manager' )
-  end
-
   def option_alert option
     @option = option
     mail({
@@ -33,19 +22,6 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     })
   end
 
-  def stock_alert watch_id
-    @watch = Iro::OptionWatch.find watch_id
-    mail({
-      to: @watch.profile.email,
-      subject: "Iro Watch Alert :: #{@watch.ticker} is #{@watch.direction} #{@watch.mark}."
-    })
-  end
-
-  def test_email
-    mail( to: DEFAULT_RECIPIENT, subject: "Test email at #{Time.now}" )
-  end
-
-
   def send_context_email ctx_id
     @ctx         = Ctx.find ctx_id
     @renderer    = self.class.renderer ctx: @ctx
@@ -85,6 +61,29 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
           content_type: "text/html" )
   end
 
+  def shared_galleries profiles, gallery
+    return if profiles.count == 0
+    @gallery        = gallery
+    @domain         = Rails.application.config.action_mailer.default_url_options[:host]
+    @galleries_path = IshManager::Engine.routes.url_helpers.galleries_path
+    @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
+    mail( :to => '314658@gmail.com',
+          :bcc => profiles.map { |p| p.email },
+          :subject => 'You got new shared galleries on pi manager' )
+  end
+
+  def stock_alert watch_id
+    @watch = Iro::OptionWatch.find watch_id
+    mail({
+      to: @watch.profile.email,
+      subject: "Iro Watch Alert :: #{@watch.ticker} is #{@watch.direction} #{@watch.mark}."
+    })
+  end
+
+  def test_email
+    mail( to: DEFAULT_RECIPIENT, subject: "Test email at #{Time.now}" )
+  end
+
 
   def self.renderer ctx:
     out = self.new

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/models/wco_hosting/appliance.rb

@@ -41,11 +41,11 @@ class WcoHosting::Appliance
   def tmpl
     appliance_tmpl
   end
-  delegate :kind, to: :appliance_tmpl
+  delegate :kind,          to: :appliance_tmpl
+  delegate :playbook_name, to: :appliance_tmpl
 
   belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost', optional: true
 
-
   STATE_PENDING    = 'pending'
   STATE_LIVE       = 'live'
   STATE_TERMINATED = 'terminated'

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -7,6 +7,27 @@ class WcoHosting::ApplianceTmpl
   include Wco::Utils
   store_in collection: 'wco_appliance_tmpls'
 
+  ## 2023-12-08 :: These names are impossible to change already.
+  KIND_CRM        = 'crm'        # trash
+  KIND_DRUPAL     = 'drupal'     # drupal
+  KIND_HELLOWORLD = 'helloworld' # static
+  KIND_IROWOR     = 'irowor'     # ror
+  KIND_JENKINS    = 'jenkins'    # jenkins
+  KIND_MATOMO     = 'matomo'     # docker
+  KIND_MOODLE     = 'moodle'     # docker
+  KIND_PRESTASHOP = 'prestashop' # docker
+  KIND_REACT      = 'react'      # static
+  KIND_SMT        = 'smt'        # ror
+  KIND_WORDPRESS  = 'wordpress'  # docker
+  KIND_TRASH      = 'trash'      # trash
+  KIND_TMP        = 'tmp'        # static
+
+  KINDS = [ nil, KIND_CRM, KIND_DRUPAL, KIND_HELLOWORLD, KIND_IROWOR,
+    KIND_JENKINS, KIND_MATOMO, KIND_MOODLE, KIND_PRESTASHOP,
+    KIND_REACT,
+    KIND_SMT,
+    KIND_WORDPRESS, KIND_TRASH, KIND_TMP ]
+
   field :kind, type: :string
   validates :kind, uniqueness: { scope: :version }, presence: true
 
@@ -17,6 +38,20 @@ class WcoHosting::ApplianceTmpl
   def name
     "#{kind} #{version}"
   end
+
+  def playbook_name
+    case kind
+    when KIND_SMT
+      return 'hosted-packagedapp'
+    when KIND_DRUPAL
+      return 'hosted-drupal'
+    when KIND_HELLOWORLD
+      return 'hosted-static'
+    else
+      throw '0ip - not implemented'
+    end
+  end
+
   field :descr, type: :string
 
   field :ecs_task_definition_erb, type: :string
@@ -48,26 +83,6 @@ class WcoHosting::ApplianceTmpl
     end
   end
 
-  ## 2023-12-08 :: These names are impossible to change already.
-  KIND_CRM        = 'crm'
-  KIND_DRUPAL     = 'drupal'
-  KIND_HELLOWORLD = 'helloworld'
-  KIND_IROWOR     = 'irowor'
-  KIND_JENKINS    = 'jenkins'
-  KIND_MATOMO     = 'matomo'
-  KIND_MOODLE     = 'moodle'
-  KIND_PRESTASHOP = 'prestashop'
-  KIND_REACT      = 'react'
-  KIND_SMT        = 'smt'
-  KIND_WORDPRESS  = 'wordpress'
-  KIND_TRASH      = 'trash'
-  KIND_TMP        = 'tmp'
-
-  KINDS = [ nil, KIND_CRM, KIND_DRUPAL, KIND_HELLOWORLD, KIND_IROWOR,
-    KIND_JENKINS, KIND_MATOMO, KIND_MOODLE, KIND_PRESTASHOP,
-    KIND_REACT,
-    KIND_SMT,
-    KIND_WORDPRESS, KIND_TRASH, KIND_TMP ]
 
 
 

data/app/models/wco_hosting/serverhost.rb

@@ -44,12 +44,18 @@ class WcoHosting::Serverhost
     # all.map { |s| [s.name, s.id] }
   end
 
+  ##
+  ## @TODO: this can be very different, depending on kindset.
+  ##
   def add_docker_service app
     @obj = app
     cmd =<<~AOL
       cd #{ANSIBLE_ROOT}
       . zenv/bin/activate
-      ansible-playbook -i inventory/do.yml --limit #{self.name} playbooks/hosted-packagedapp.yml --extra-vars '{"appliance_slug": "#{app.slug}", "codebase_zip": "#{app.tmpl.volume_zip_url}", "app_port": "#{app.port}"}'
+      ansible-playbook -i inventory/do.yml --limit #{self.name} playbooks/#{app.playbook_name}.yml --extra-vars '{
+        "appliance_slug": "#{app.slug}",
+        "codebase_zip": "#{app.tmpl.volume_zip_url}",
+        "app_port": "#{app.port}"}'
     AOL
     do_exec cmd
   end
@@ -78,7 +84,7 @@ class WcoHosting::Serverhost
   def create_subdomain app
     @obj = app
     Wco::Log.puts! @obj, 'Creating subdomain...', obj: @obj
-    client = DropletKit::Client.new(access_token: DO_DOMAIN_TOKEN)
+    client = DropletKit::Client.new(access_token: ::DO_DOMAIN_TOKEN)
     record = DropletKit::DomainRecord.new(
       type: 'A',
       name: app.subdomain,

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/app/views/wco_email/application_mailer/test_email.html.erb

@@ -0,0 +1 @@
+<p>This is a test email.</p>

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.210
+  version: 3.1.0.213
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-20 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -686,6 +686,7 @@ files:
 - app/views/wco_email/application_mailer/_footer_unsubscribe.html.erb
 - app/views/wco_email/application_mailer/_header_logo.html.erb
 - app/views/wco_email/application_mailer/forwarder_notify.html.erb
+- app/views/wco_email/application_mailer/test_email.html.erb
 - app/views/wco_email/contexts/_form_reply_mini.haml
 - app/views/wco_email/conversations/_table.haml
 - app/views/wco_email/email_layouts/_m20221201react.html.erb