wco_models 3.1.0.246 → 3.1.0.247

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129831dfab8ccdbb40ccdef3b12ff74fa4bb568b2d71456ea30095971992c905
-  data.tar.gz: eba14a3662226e81fdeb2aaf77aa457df5155d9a913ee4e07da4ac6c7c5ccdeb
+  metadata.gz: 50588aa763ca804b8220051b0867eb3aa63c226c599ce732c9676a0b06e3808c
+  data.tar.gz: 442cb7d8a2dd4cf256b34ebac779a7958faed8e2c141672f35ef495a84b93a5d
 SHA512:
-  metadata.gz: 24d783dc8abd8e9a74d6673aa4b834eaac7ae673a5529b03183b8c1d7f278bdbda4541aa84ebab4d3fcdfe0e9e79dcb991fcb8ec364cff3b5be0a6334d8cb158
-  data.tar.gz: a56d2634a3c4f495fbe2acd7a15d9e6a9cb7a28e8da9067b76c26c39eee27d90ab89019a7dbd9c7b3f845f085584de69356d39d26f44eae1d8f66b5dd55a142f
+  metadata.gz: 62a65f04bfe70321ce6ccb231773db2368ede20502df293cde6d2223a1643aee2354b32ba31a70ae9b3a5eebc7ae752ee4b8e56bea6ec21b37f8052bb043724f
+  data.tar.gz: 8c1784a7644e1ff1a7a56ac895e9ab43cf0c9a01815596eb7a8a7bdd7d5b2fca79d8a4f6e8989f170a5a7653e87a9ea3c36a74d9e7e163a17bd0902306949101

data/app/assets/javascripts/wco/collapse-expand.js

@@ -27,4 +27,5 @@ $(function () {
   })
 
   console.log('Loaded wco/collapse-expand.js')
-}); // END
+
+}); // END

data/app/assets/javascripts/wco/tags.js

@@ -0,0 +1,76 @@
+
+// console.log('Loaded wco/tags.js')
+
+$(function() {
+
+  $(".add-tag-many-btn").click(function(e) {
+    logg('here?')
+
+    if ( !confirm('Are you sure?') ) { return; }
+
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const a_tag = $("select[name='a_tag']").val()
+    const out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    let data = {
+      resource_ids: out,
+      jwt_token: jwt_token,
+      id: a_tag,
+    }
+    $.ajax({
+      url: action_path,
+      type: 'POST',
+      data: data,
+      success: e => {
+        logg((e||{}).responseText, 'Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'Err')
+        location.reload()
+      },
+    })
+
+  })
+
+
+  $(".remove-tag-btn").click(function(e) {
+    if ( !confirm('Are you sure?') ) { return; }
+
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const emailtag = $("select[name='emailtag']").val()
+    const out = []
+
+    $( $(".conversations-list input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: action_path,
+      type: 'POST',
+      data: {
+        ids: out,
+        jwt_token: jwt_token,
+        slug: emailtag,
+      },
+      success: e => {
+        logg((e||{}).responseText, 'Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'Err')
+        location.reload()
+      },
+    })
+
+  })
+
+})

data/app/assets/stylesheets/wco/leads_leadsets.scss

@@ -1,13 +1,10 @@
 
-.Leads {
+.--index,
+.Leads,
+.Leadsets, {
   border: 1px solid var(--wco-color-2);
-  border-radius: .5em;
+  border-radius: 0.5em;
   padding: 0.5em;
+  margin-bottom: 0.5em;
 }
 
-
-.Leadsets {
-  border: 1px solid var(--wco-color-2);
-  border-radius: .5em;
-  padding: 0.5em;
-}

data/app/assets/stylesheets/wco/main.scss

@@ -70,6 +70,19 @@ table.bordered {
   }
 }
 
+table {
+  thead.sticky {
+    background: #ccc;
+
+    th {
+      position: sticky;
+      top: 0;
+      background: white;
+      z-index: 10;
+    }
+  }
+}
+
 /* C */
 
 .code,
@@ -84,6 +97,10 @@ textarea.monospace {
 
 /* D */
 
+.d-flex {
+  align-items: baseline;
+}
+
 .descr {
   border: 1px solid red;
   border-radius: 0.5em;

data/app/controllers/wco/leadsets_controller.rb

@@ -61,6 +61,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
     end
 
     @leads         = @leadset.leads.page( params[:leads_page] ).per( current_profile.per_page )
+    @logs          = @leadset.logs.page( params[:logs_page] ).per( current_profile.per_page )
     @subscriptions = @leadset.subscriptions
     @invoices      = @leadset.invoices
   end

data/app/controllers/wco/office_actions_controller.rb

@@ -42,6 +42,9 @@ class Wco::OfficeActionsController < Wco::ApplicationController
   def index
     authorize! :index, OA
     @oas = OA.all
+    if params[:status]
+      @oas = @oas.where( status: params[:status] )
+    end
   end
 
   def new

data/app/controllers/wco/tags_controller.rb

@@ -33,6 +33,17 @@ class Wco::TagsController < Wco::ApplicationController
   def index
     authorize! :index, Wco::Tag
     @tags = Wco::Tag.all
+
+    tags = Wco::Tag.all.to_a.group_by(&:parent_id)
+    build_tree = lambda do |parent_id|
+      (tags[parent_id] || []).sort_by { |tag| tag.slug.downcase }.map do |tag|
+        { tag: tag, sons: build_tree.call(tag.id) }
+      end
+    end
+    @tree = build_tree.call(nil)
+
+
+    @template = params[:template] || 'index_tree'
   end
 
   def new
@@ -50,6 +61,20 @@ class Wco::TagsController < Wco::ApplicationController
     redirect_to request.referrer
   end
 
+  def add_to_many
+    @tag = Wco::Tag.find params[:id]
+    resources = params[:resource].constantize.find params[:resource_ids]
+    authorize! :update, @tag
+
+    flags = []
+    resources.each do |resource|
+      resource.tags.push @tag
+      flags.push resource.save
+    end
+    flash_notice flags
+    # redirect_to request.referrer
+  end
+
   def remove_from
     @tag = Wco::Tag.find params[:id]
     resource = params[:resource].constantize.find params[:resource_id]
@@ -61,15 +86,27 @@ class Wco::TagsController < Wco::ApplicationController
     redirect_to request.referrer
   end
 
+  def remove_from_many
+    @tag = Wco::Tag.find params[:id]
+    resources = params[:resource].constantize.find params[:resource_ids]
+    authorize! :update, @tag
+
+    flags = []
+    resources.each do |resource|
+      resource.tags.delete @tag
+      flags.push resource.save
+    end
+    flash_notice flags
+    # redirect_to request.referrer
+  end
+
   def show
     @tag = Wco::Tag.find params[:id]
     authorize! :show, @tag
 
-    @galleries = @tag.galleries(
-      ).page( params[:galleries_page] ).per( current_profile.per_page )
-
-    @reports = @tag.reports(
-      ).page( params[:reports_page] ).per( current_profile.per_page )
+    @galleries = @tag.galleries.page( params[:galleries_page] ).per( current_profile.per_page )
+    @leadsets = @tag.leadsets.page( params[::Wco::Leadset::PAGE_PARAM_NAME] ).per( current_profile.per_page )
+    @reports = @tag.reports.page( params[:reports_page] ).per( current_profile.per_page )
 
   end
 

data/app/mailers/wco_email/application_mailer.rb

@@ -51,14 +51,22 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
       subject:      rendered_subject,
     })
 
+    profile = Wco::Profile.find_by email: @ctx.from_email
+    delivery_options = {
+      user_name: profile.smtp_username,
+      password: profile.smtp_password,
+      address: profile.smtp_host,
+      post: profile.smtp_port,
+    };
+
     mail( from:    @ctx.from_email,
           to:      @ctx.to_email,
           cc:      @ctx.cc,
-          ## 2024-07-30 I'm no longer sending these to google.
-          # bcc:     "poxlovibb1@gmail.com",
+          bcc:     DEFAULT_BCC,
           subject: rendered_subject,
           body:    rendered_str,
-          content_type: "text/html" )
+          content_type: "text/html",
+          delivery_method_options: delivery_options )
   end
 
   def shared_galleries profiles, gallery

data/app/models/ability.rb

@@ -10,7 +10,7 @@ class Ability
 
     if user
 
-      if [ ENV['EMAIL'] ].include? user.email
+      if [ ENV['EMAIL'], 'piousbox@gmail.com' ].include? user.email
         can :manage, :all
       end
 

data/app/models/wco/leadset.rb

@@ -27,7 +27,8 @@ class Wco::Leadset
     find_or_create_by( company_url: _domain )
   end
 
-
+  field :company_name # for chatgpt scraping
+  has_many :logs, inverse_of: :obj
 
   field :email
   index({ email: 1 }, { name: 'email' })

data/app/models/wco/log.rb

@@ -9,7 +9,7 @@ class Wco::Log
   field :label,   type: :string ## can be the stream: 'stdout' or 'stderr'
   field :message, type: :string ## can be json
 
-  belongs_to :obj, polymorphic: true, optional: true
+  belongs_to :obj, polymorphic: true, optional: true # eg site
 
   has_and_belongs_to_many :tags
 

data/app/models/wco/profile.rb

@@ -9,6 +9,8 @@ class Wco::Profile
   index({ email: 1 }, { name: 'email' })
   validates :email, presence: true, uniqueness: true
 
+  field :name
+
 
   field :per_page, type: :integer, default: 25
   field :show_n_thumbs, type: :integer, default: 8
@@ -23,6 +25,12 @@ class Wco::Profile
   field :schwab_exec_id_token,      type: :string
   field :schwab_account_hash,       type: :string
 
+  field :smtp_enabled, type: Boolean
+  field :smtp_host
+  field :smtp_username
+  field :smtp_password
+  field :smtp_port
+
 
   has_many :newsvideos, class_name: 'Wco::Newsvideo'
   has_many :reports, class_name: 'Wco::Report'

data/app/models/wco_email/email_filter_condition.rb

@@ -14,6 +14,8 @@ class WcoEmail::EmailFilterCondition
 
   field :matchtype, type: String
   validates :matchtype, presence: true, inclusion: WcoEmail::EmailFilter::MATCHTYPE_OPTS
+  def operator;    matchtype;     end
+  def operator= a; matchtype = a; end
 
   field :value
   validates :value, presence: true
@@ -28,7 +30,7 @@ class WcoEmail::EmailFilterCondition
         if leadset.tags.include?( this_tag )
           ;
         else
-          reason = "{email_skip_filter ? 'skip_' : ''}condition leadset not-has-tag #{this_tag} NOT met"
+          reason = "#{email_skip_filter ? 'skip_' : ''}condition leadset not-has-tag #{this_tag} NOT met"
         end
       end
     when WcoEmail::FIELD_TO

data/app/models/wco_email/email_template.rb

@@ -103,8 +103,9 @@ class WcoEmail::EmailTemplate
   ];
   field :from_email
   def self.from_emails_list
-    # [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
-    FROM_EMAILS_2
+    [[nil,nil]] + Wco::Profile.where( smtp_enabled: true ).map do |p|
+      [ "#{p.name} <#{p.email}>", p.email ]
+    end
   end
 
   SIGNATURE = <<~AOL

data/app/models/wco_email/message.rb

@@ -229,6 +229,26 @@ class WcoEmail::Message
     end
   end
 
+  def save_attachment_postal att
+    if att['content_type'].include? 'image'
+      photo = ::Wco::Photo.new({
+        content_type:      att['content_type'],
+        email_message_id:  self.id,
+        image_data:        att['data'],
+        original_filename: att['filename'],
+      })
+      photo.decode_base64_image ## _TODO: why?
+      puts! photo.save, 'saved image attachment?'
+    else
+      asset = ::Wco::Asset.new({
+        email_message: self,
+        filename:      att['filename'],
+        object:        att['data'],
+      })
+      puts! asset.save, 'saved non-img asset?'
+    end
+  end
+
   def save_attachment att, filename: "no-filename-specified"
     config = JSON.parse(stub.config)
     if defined?( config['process_images'] ) &&

data/app/models/wco_email/message_stub.rb

@@ -45,6 +45,144 @@ class WcoEmail::MessageStub
     {}
   AOL
 
+  def do_process_json
+    stub = self
+    @client ||= Aws::S3::Client.new(::SES_S3_CREDENTIALS)
+
+    json = JSON.parse( @client.get_object( bucket: stub.bucket, key: stub.object_key ).body.read )
+    subject = json['subject']
+    message_id = json['message_id']
+
+    ## Conversation
+    if json['in_reply_to']
+      in_reply_to_msg = WcoEmail::Message.where({ message_id: json['in_reply_to'] }).first
+      if !in_reply_to_msg
+        @conv = WcoEmail::Conversation.find_or_create_by({
+          subject: subject,
+        })
+        in_reply_to_msg = WcoEmail::Message.find_or_create_by({
+          message_id: json['in_reply_to'],
+          conversation: @conv,
+        })
+      end
+      @conv = in_reply_to_msg.conversation
+    else
+      @conv = WcoEmail::Conversation.unscoped.find_or_create_by({
+        subject: subject,
+      })
+      @conv.deleted_at = nil
+    end
+
+    ## Leadset, Lead
+    from       = json['mail_from'] || "nobody@unknown-doma.in"
+    @lead      = Wco::Lead.find_or_create_by_email( from )
+    @conv.leads.push @lead
+    @leadset   = Wco::Leadset.from_email from
+    @conv.leadsets.push @leadset
+
+    ## message
+    @message = WcoEmail::Message.create!({
+      stub:         stub,
+      conversation: @conv,
+      lead:         @lead,
+
+      message_id:     message_id,
+      in_reply_to_id: json['in_reply_to'],
+      object_key:     stub.object_key,
+
+      subject: subject,
+      date:    json['date'].to_s,
+
+      from:  from,
+
+      to:  json['to'],
+      tos: [ json['to'] ],
+
+      cc:  json['cc'],
+      ccs: [ json['cc'] ],
+
+      part_html: json['html_body'],
+      part_txt:  json['plain_body'],
+    })
+
+    ## Attachments
+    json['attachments'].each do |att|
+      @message.save_attachment_postal( att )
+    end
+
+    ## _TODO
+    # the_mail.cc&.each do |cc|
+    #   Wco::Lead.find_or_create_by_email( cc )
+    # end
+
+    @conv.update_attributes({
+      status:      WcoEmail::Conversation::STATUS_UNREAD,
+      latest_at:   json['date'].to_s || Time.now.to_datetime,
+      from_emails: ( @conv.from_emails + [ from ]).uniq,
+      preview:     @message.preview_str,
+    })
+
+    ## tags
+    @conv.tags.push Wco::Tag.inbox
+    @conv.tags.push stub.tags
+    @conv.save
+
+
+    ## Actions & Filters
+    email_filters = WcoEmail::EmailFilter.all
+    email_filters.each do |filter|
+      reason = nil
+      if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
+        reason = 'from_regex'
+      end
+      if filter.from_exact.present? && @message.from.downcase.include?( filter.from_exact.downcase )
+        reason = 'from_exact'
+      end
+      if filter.body_exact.present? && @message.part_html&.include?( filter.body_exact )
+        reason = 'body_exact'
+      end
+      if filter.subject_regex.present? && @message.subject.match( filter.subject_regex )
+        reason = 'subject_regex'
+      end
+      if filter.subject_exact.present? && @message.subject.downcase.include?( filter.subject_exact.downcase )
+        reason = 'subject_exact'
+      end
+
+      filter.conditions.each do |scond|
+        reason ||= scond.apply(leadset: @leadset, message: @message )
+      end
+
+      if reason
+        puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
+
+        ## skip
+        skip_reason = nil
+        if filter.skip_to_exact.present? && @message.to&.downcase.include?( filter.skip_to_exact.downcase )
+          skip_reason = 'skip_to_exact'
+        end
+        if filter.skip_from_regex.present? && @message.from.downcase.match( filter.skip_from_regex )
+          skip_reason = 'skip_from_regex'
+        end
+
+        filter.skip_conditions.each do |scond|
+          skip_reason ||= scond.apply(leadset: @leadset, message: @message )
+        end
+
+        if skip_reason
+          puts! "NOT Applying filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
+        else
+          @message.apply_filter( filter )
+        end
+      end
+    end
+
+    stub.update_attributes({ status: WcoEmail::MessageStub::STATUS_PROCESSED })
+
+    ## Notification
+    ## _TODO
+  end
+
+
   def do_process
     if Rails.env.production?
       @client ||= Aws::S3::Client.new({
@@ -101,7 +239,6 @@ class WcoEmail::MessageStub
     conv.leads.push lead
     leadset   = Wco::Leadset.from_email from
     conv.leadsets.push leadset
-    # conv.save
 
     message   = WcoEmail::Message.unscoped.where( message_id: message_id ).first
     if message
@@ -203,8 +340,8 @@ class WcoEmail::MessageStub
         reason = 'subject_exact'
       end
 
-      filter.conditions.each do |scond|
-        reason ||= scond.apply(leadset: leadset, message: @message )
+      filter.conditions.each do |cond|
+        reason ||= cond.apply(leadset: leadset, message: @message )
       end
 
       if reason
@@ -219,8 +356,8 @@ class WcoEmail::MessageStub
           skip_reason = 'skip_from_regex'
         end
 
-        filter.skip_conditions.each do |scond|
-          skip_reason ||= scond.apply(leadset: leadset, message: @message )
+        filter.skip_conditions.each do |skip_cond|
+          skip_reason ||= skip_cond.apply(leadset: leadset, message: @message )
         end
 
         if skip_reason

data/app/views/layouts/wco/application.haml

@@ -39,9 +39,10 @@
     = render '/wco/main_footer'
     = render '/wco/analytics' if Rails.env.production?
 
-    %script{:src => "https://js.stripe.com/v3/"}
-    :javascript
-      stripe = Stripe('#{::STRIPE_PK}', { apiVersion: '2020-08-27' });
+    - if defined?( ::STRIPE_PK )
+      %script{:src => "https://js.stripe.com/v3/"}
+      :javascript
+        stripe = Stripe('#{::STRIPE_PK}', { apiVersion: '2020-08-27' });
 
     -# = render '/wco/application/auth_widget'
 

data/app/views/wco/_main_header.haml

@@ -3,7 +3,7 @@
 
   -# %i.fa.fa-compress.collapse-expand#collapseHeaderMain
   -#   Wco Suite
-  .maxwidth
+  .a{ style: 'max-width: 1200px; margin: auto; ' }
 
     %i.fa.fa-compress.collapse-expand#collapseHeaderModels
       Wco Suite

data/app/views/wco/_select_all.haml

@@ -1,5 +1,5 @@
 
 .d-flex
-  .label.mini All
+  %label.mini All
   = check_box_tag :select_all
   .n-selected -

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

@@ -7,7 +7,7 @@
 - galleries ||= @galleries
 
 
-.galleries--index.maxwidth
+.Galleries.galleries--index.--index
   = render '/wco/galleries/header_mini', galleries: galleries
 
   .padded

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

@@ -1,7 +1,10 @@
 
-%ul.leads--list
-  - leads.each do |lead|
-    %li.item
-      = image_tag lead.photo.photo.url(:thumb) if lead.photo
-      = link_to lead, lead_path(lead)
-      = link_to '[~]', edit_lead_path(lead)
+.Leads.leads--index.--index
+  <b>Leads:</b>
+  %ul
+    - leads.each do |lead|
+      %li.item
+        = image_tag lead.photo.photo.url(:thumb) if lead.photo
+        = link_to lead, wco.lead_path(lead)
+        = link_to '[~]', wco.edit_lead_path(lead)
+        <b>Tags:</b> #{ lead.tags.map { |tag| tag.to_s } }

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

@@ -3,12 +3,18 @@
 
 = form_for leadset, :as => :leadset, :url => url do |f|
 
-  .field
-    = f.label :company_url
-    = f.text_field :company_url
+  .row
+    .col-6
+      .field
+        %label company_url
+        = f.text_field :company_url
+    .col-6
+      .field
+        %label company_name
+        = f.text_field :company_name
 
   .field
-    = f.label :email
+    %label email
     = f.text_field :email
   .field
     %label mangle_subject

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

@@ -0,0 +1,10 @@
+
+.Leadsets.--index
+  .d-inline <b>Leadsets (#{leadsets.length}):</b>
+  = paginate leadsets, :param_name => ::Wco::Leadset::PAGE_PARAM_NAME, :views_prefix => 'wco'
+  %ul
+    - leadsets.each do |ls|
+      %li
+        = link_to ls.company_url, wco.leadset_path( ls )
+        = link_to '[~]', wco.edit_leadset_path( ls )
+        <b>Tags:</b> #{ ls.tags.map { |tag| tag.to_s } }

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

@@ -5,27 +5,26 @@
     (#{Wco::Leadset.all.length})
     = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
 
-  .actions
-    %label.select-all
-      = check_box_tag :select_all
-      select all
-      .n-selected -
-    = button_tag 'Delete', method: :delete, class: 'delete-btn'
+  .actions.d-flex
+    .a.mr-2= button_tag 'Delete', method: :delete, class: 'delete-btn'
+    = render 'wco/tags/actions', resource: 'Wco::Leadset'
 
   .float-right= render '/wco/search', path: leadsets_path
   = paginate @leadsets, :param_name => :leadsets_page, :views_prefix => 'wco'
   %table.bordered
     %thead
       %tr
-        %th &nbsp;
-        %th.company-url Company Url
+        %th.select-all.nosort
+          = render '/wco/select_all'
+        %th.company-url company_url
         %th Tags
         %th Leads
 
     %tbody
-      - @leadsets.each_with_index do |leadset, idx1|
+      - @leadsets.each_with_index do |leadset, idx|
         %tr
-          %td
+          %td.select-all
+            .gray= idx+1
             = check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
 
           %td

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

@@ -11,38 +11,35 @@
           %li <b>Email:</b> #{@leadset.email}
           %li <b>company_url</b>: #{@leadset.company_url}
           %li <b>customer_id</b>: #{@leadset.customer_id}
-      -# tags
       .col-6
+        -# tags
         Tags:
         = render '/wco/tags/index_chips', tags: @leadset.tags
 
-    %hr
-    .row
-      -# serverhosts
-      .col-6.border-right
-        = render 'wco_hosting/serverhosts/list', serverhosts: @leadset.serverhosts
-      .col-6
-        &nbsp;
-
-    %hr
-    .row
-      -# environments
-      .col-md-6
-        - if defined?( wco_hosting )
+    -# false
+    - if false && defined?( wco_hosting )
+      %hr
+      .row
+        .col-8.border-right
+          -# serverhosts
+          = render 'wco_hosting/serverhosts/list', serverhosts: @leadset.serverhosts
+        .col-4
+          -# environments
           .header
             %h5.title Environments (#{@leadset.environments.length}) #{link_to '[+]', wco_hosting.new_environment_path({ leadset_id: @leadset.id }) }
           %ul
             - @leadset.environments.each do |env|
               %li= env
+
+          -# appliances
+          .header
+            %h5.title Appliances (#{@leadset.appliances.length})
+          = render 'wco_hosting/appliances/list', appliances: @leadset.appliances
+
     %hr
     .row
-      -# appliances
       .col-md-6.border-right
-        .header
-          %h5.title Appliances (#{@leadset.appliances.length})
-
-      -# subscriptions
-      .col-md-6
+        -# subscriptions
         .header
           %h5.title.collapse-expand#subscriptionsList
             Subscriptions (#{@subscriptions.length})
@@ -56,18 +53,15 @@
             %tr
               %td= i.product.name
               %td= i.price
-
-    %hr
-    .row
-      -# invoices
-      .col-md-12
+      .col-md-6
+        -# invoices
         .header
           %h5.title.collapse-expand#invoicesList
             Invoices  (#{@leadset.invoices.length})
             = link_to '[+stripe]', new_invoice_stripe_path({ leadset_id: @leadset.id })
             = link_to '[+pdf]', new_invoice_pdf_path({ leadset_id: @leadset.id })
 
-        = render '/wco/invoices/index_list', invoices: @invoices
+        = render '/wco/invoices/list', invoices: @invoices
 
         %p Next invoice number: #{@leadset.next_invoice_number}
 
@@ -78,11 +72,10 @@
           = check_box_tag 'replace'
           = submit_tag 'Go >', data: { confirm: 'Are you sure?' }
 
-    %hr
-    .row
-      -# leads
+    .row.mt-3
       .col-12
-        .header
-          %h5.title.collapse-expand#leads Leads
         = render '/wco/leads/index', leads: @leads
 
+    .row.mt-3
+      .col-12
+        = render '/wco/logs/index', logs: @logs

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

@@ -2,6 +2,7 @@
 - logs ||= @logs
 
 .logs--index
+  Logs:
   = form_tag logs_bulkop_path, method: :delete do
     = hidden_field_tag :authenticity_token, form_authenticity_token
     .d-flex-row

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

@@ -1,5 +1,7 @@
 
 = link_to "Office Actions (#{Wco::OfficeAction.all.length})", wco.office_actions_path
+= link_to '[A]', wco.office_actions_path(status: 'active')
+ 
 .inline-search
   = form_tag wco.office_actions_path, method: :get do
     = text_field_tag :q

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

@@ -1,7 +1,7 @@
 
 .office-actions-index.maxwidth
 
-  %h5 Office actions (#{@oas.length})
+  %h5.text-center Office actions `#{params[:status]}` (#{@oas.length})
 
   = render 'index', oas: @oas
 

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

@@ -1,41 +1,71 @@
 
 .profiles--form
   = form_for profile do |f|
-    .field
-      %label email
-      = f.text_field :email
-
-    .field
-      %label role
-      = f.select :role, options_for_select(Wco::Profile.roles_list, selected: profile.role )
-
-    .field
-      %label schwab_access_token
-      = f.text_field :schwab_access_token
-    .field
-      %label schwab_refresh_token
-      = f.text_field :schwab_refresh_token
-    .field
-      %label schwab_id_token
-      = f.text_field :schwab_id_token
-
-    %br
-    %br
-    .field
-      %label schwab_exec_access_token
-      = f.text_field :schwab_exec_access_token
-    .field
-      %label schwab_exec_refresh_token
-      = f.text_field :schwab_exec_refresh_token
-    .field
-      %label schwab_exec_id_token
-      = f.text_field :schwab_exec_id_token
+
+    .row
+
+      .field
+        %label email
+        = f.text_field :email
+
+      .field
+        %label name
+        = f.text_field :name
+
+      .field
+        %label role
+        = f.select :role, options_for_select(Wco::Profile.roles_list, selected: profile.role )
+
+      .field
+        %label leadset
+        = f.select :leadset, options_for_select(Wco::Leadset.list, selected: profile.leadset_id )
 
     %hr
+    .row
+      .col-6
+        .field
+          %label schwab_access_token
+          = f.text_field :schwab_access_token
+        .field
+          %label schwab_refresh_token
+          = f.text_field :schwab_refresh_token
+        .field
+          %label schwab_id_token
+          = f.text_field :schwab_id_token
+      .col-6
+        .field
+          %label schwab_exec_access_token
+          = f.text_field :schwab_exec_access_token
+        .field
+          %label schwab_exec_refresh_token
+          = f.text_field :schwab_exec_refresh_token
+        .field
+          %label schwab_exec_id_token
+          = f.text_field :schwab_exec_id_token
+
+    %hr
+    .row
+      .col-2
+        .field
+          %label smtp_enabled
+          = f.check_box :smtp_enabled
+      .col-10
+        .field
+          %label smtp_host
+          = f.text_field :smtp_host
+
+        .field
+          %label smtp_username
+          = f.text_field :smtp_username
+
+        .field
+          %label smtp_password
+          = f.text_field :smtp_password
+
+        .field
+          %label smtp_port
+          = f.text_field :smtp_port
 
-    .field
-      %label leadset
-      = f.select :leadset, options_for_select(Wco::Leadset.list, selected: profile.leadset_id )
 
     .actions
       = f.submit 'Go'

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

@@ -0,0 +1,13 @@
+
+
+.tags--actions.bordered.inline-block.mb-2.descr
+  %label tags/_actions
+  .d-inline-block
+    = select_tag :a_tag, options_for_select(@tags_list), class: 'select2'
+  %a.btn.bordered.add-tag-many-btn{ href: "javascript: void(0)", data: { url: wco.add_tag_to_many_path(resource) } }
+    %i.material-icons add
+    tag
+  %a.btn.bordered.rm-tag-many-btn{ href: "javascript: void(0)", data: { url: wco.rm_tag_from_many_path(resource) } }
+    %i.material-icons remove
+    tag
+

data/app/views/wco/tags/_header.haml

@@ -2,4 +2,6 @@
 .header
   %h5.title
     Tags (#{Wco::Tag.all.length}) 
+    = link_to '[#]', wco.tags_path(template: 'index_table')
+    = link_to '[/|\\]', wco.tags_path(template: 'index_tree')
     = link_to '[+]', wco.new_tag_path

data/app/views/wco/tags/_index_chips.haml

@@ -10,11 +10,11 @@
         = check_box_tag 'tag_ids[]', tag.id
       = link_to tag.slug, wco.tag_path( tag )
       - if defined? resource
-        .mini.d-inline-block= button_to 'x', remove_tag_from_path(id: tag.id, resource: resource.class, resource_id: resource.id, ), method: 'delete', data: { confirm: 'Are you sure?' }
+        .mini.d-inline-block= button_to 'x', wco.remove_tag_from_path(id: tag.id, resource: resource.class, resource_id: resource.id, ), method: 'delete', data: { confirm: 'Are you sure?' }
 
   - if defined? resource
     .d-inline-block
-      = form_tag add_tag_to_path( resource: resource.class, resource_id: resource.id ) do
+      = form_tag wco.add_tag_to_path( resource: resource.class, resource_id: resource.id ) do
         .d-inline-block= select_tag :id, options_for_select( @tags_list ), class: 'select2'
         = submit_tag '+Tag', data: { confirm: 'Are you sure?' }
 

data/app/views/wco/tags/_index_table.haml

@@ -1,21 +1,21 @@
 
 %table.bordered.tags--index.maxwidth
-  %thead
+  %thead.sticky
     %tr
-      %td  
-      %td N Conv
-      %td N Stubs
+      %th  
+      %th N Conv
+      %th N Stubs
 
-      %td N Headlines
+      %th N Headlines
 
-      %td N Galleries
-      %td N Reports
-      %td N Videos
+      %th N Galleries
+      %th N Reports
+      %th N Videos
 
-      %td N leadsets
-      %td N Leads
+      %th N Leadsets
+      %th N Leads
 
-      %td N Logs
+      %th N Logs
   %tbody
     - tags.each do |tag|
       %tr

data/app/views/wco/tags/_index_tree.haml

@@ -0,0 +1,9 @@
+
+%ul
+  - nodes.each do |node|
+    %li
+      = link_to '[~]', wco.edit_tag_path(node[:tag][:id])
+      = link_to node[:tag].slug, wco.tag_path(node[:tag][:id])
+
+      - if node[:sons].present?
+        = render 'wco/tags/index_tree', nodes: node[:sons]

data/app/views/wco/tags/_menuitem.haml

@@ -1,6 +1,8 @@
 
 .d-flex
   = link_to "Tags (#{Wco::Tag.all.length})", wco.tags_path
+  = link_to '[#]', wco.tags_path(template: 'index_table')
+  = link_to '[/|\\]', wco.tags_path(template: 'index_tree')
    
   .inline-search
     = form_tag wco.tags_path, method: :get do

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

@@ -1,9 +1,16 @@
 
 .tags-index.padded
   .header
-    %h5.title Tags (#{@tags.length})
+    %h5.title
+      Tags #{@template} (#{@tags.length}) 
+      = link_to( '[#]', url_for(params.to_unsafe_h.merge(template: "index_table")) )
+       
+      = link_to( '[/|\\]', url_for(params.to_unsafe_h.merge(template: "index_tree")) )
 
-  = render 'index_table', tags: @tags
+  - if 'index_table' == @template
+    = render @template, tags: @tags
+  - else
+    = render @template, nodes: @tree
 
   %hr
 

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

@@ -4,36 +4,46 @@
   .text-center
     %h5 Tag `#{@tag.slug}`
 
-  %ul
-    - if defined? wco_email
-      %li.d-flex
-        <b>Conversations (#{@tag.conversations.length}):&nbsp;</b>
-        - if @tag.conversations.present?
-          .Conversations
-            = render '/wco_email/conversations/table', convs: @tag.conversations.page( params[::WcoEmail::Conversation::PAGE_PARAM_NAME] )
-      %li.d-flex
-        <b>EmailTemplates (#{@tag.email_templates.length}):&nbsp;</b>
-        - if @tag.email_templates.present?
-          .EmailTemplates
-            = render '/wco_email/email_templates/index_mini', email_templates: @tag.email_templates
-      %li.d-flex
-        <b>Message Stubs (#{@tag.message_stubs.length}):&nbsp;</b>
-        = render '/wco_email/message_stubs/index', stubs: @tag.message_stubs.page( params[::WcoEmail::MessageStub::PAGE_PARAM_NAME] )
-
-    %li.d-flex
-      <b>Galleries (#{@galleries.length}):&nbsp;</b>
-      = render '/wco/galleries/index', galleries: @galleries.page( params[::Wco::Gallery::PAGE_PARAM_NAME] ), config: { skip_tags: true }
-    %li.d-flex
-      <b>Headlines (#{@tag.headlines.length}):&nbsp;</b>
-      = render '/wco/headlines/index', headlines: @tag.headlines.page( params[::Wco::Headline::PAGE_PARAM_NAME] )
-
-    %li.d-flex
-      <b>Leadsets (#{@tag.leadsets.length}):&nbsp;</b>
-      = render '/wco/leadsets/index_list', leadsets: @tag.leadsets.page( params[::Wco::Leadset::PAGE_PARAM_NAME] )
-    %li.d-flex
-      <b>Leads (#{@tag.leads.length}):&nbsp;</b>
-      = render '/wco/leads/index', leads: @tag.leads.page( params[::Wco::Lead::PAGE_PARAM_NAME] )
-
-    %li.d-flex
-      <b>Reports (#{@reports.length}):&nbsp;</b>
-      = render '/wco/reports/index', reports: @reports.page( params[::Wco::Report::PAGE_PARAM_NAME] ), config: { skip_tags: true }
+  - if defined?( wco_email )
+    .a
+      - if @tag.conversations.present?
+        %i.fa.fa-compress.collapse-expand#conversations
+          Conversations (#{@tag.conversations.length}):
+        .descr= render '/wco_email/conversations/table', convs: @tag.conversations.page( params[::WcoEmail::Conversation::PAGE_PARAM_NAME] )
+
+    .a
+      - if @tag.email_templates.present?
+        %hr
+        %i.fa.fa-compress.collapse-expand#emailTemplates
+          EmailTemplates (#{@tag.email_templates.length}):
+        .EmailTemplates
+          = render '/wco_email/email_templates/index_mini', email_templates: @tag.email_templates
+
+    .a
+      %hr
+      %i.fa.fa-compress.collapse-expand#messageStubs
+        Message Stubs (#{@tag.message_stubs.length}):
+      = render '/wco_email/message_stubs/index', stubs: @tag.message_stubs.page( params[::WcoEmail::MessageStub::PAGE_PARAM_NAME] )
+
+  %hr
+  %i.fa.fa-compress.collapse-expand#galleries
+    Galleries (#{@galleries.length}):
+  = render '/wco/galleries/index', galleries: @galleries.page( params[::Wco::Gallery::PAGE_PARAM_NAME] ), config: { skip_tags: true }
+
+  %hr
+  %i.fa.fa-compress.collapse-expand#leadsets
+    Leadsets: (#{@leadsets.length}):
+  = render '/wco/leadsets/index', leadsets: @leadsets
+
+  %hr
+  %i.fa.fa-compress.collapse-expand#leads
+    Leads: (#{@tag.leads.length}):
+  = render '/wco/leads/index', leads: @tag.leads.page( params[::Wco::Lead::PAGE_PARAM_NAME] )
+
+  %hr
+  %i.fa.fa-compress.collapse-expand#reports
+    Reports: (#{@reports.length}):
+  .d-flex
+    = render '/wco/reports/index', reports: @reports.page( params[::Wco::Report::PAGE_PARAM_NAME] ), config: { skip_tags: true }
+
+

data/config/routes.rb

@@ -71,6 +71,7 @@ Wco::Engine.routes.draw do
   resources :office_action_templates
 
   post 'office_actions/:id/run', to: 'office_actions#do_run', as: :run_office_action
+  get  'office_actions/active', to: 'office_actions#index', defaults: { status: 'active' }, as: :active_office_actions
   resources :office_actions
 
   resources :prices
@@ -95,8 +96,12 @@ Wco::Engine.routes.draw do
   resources :sitemap_paths, as: :spaths
   resources :subscriptions
 
+  ## only one resource
   delete 'tags/remove/:id/from/:resource/:resource_id', to: 'tags#remove_from', as: :remove_tag_from
   post   'tags/add-to/:resource/:resource_id', to: 'tags#add_to', as: :add_tag_to
+  ## many resources
+  post   'tags/add-to-many/:resource',  to: 'tags#add_to_many',  as: :add_tag_to_many
+  post   'tags/rm-from-many/:resource', to: 'tags#rm_from_many', as: :rm_tag_from_many
   resources :tags
 
   ## In order to have unsubscribes_url , unsubscribes must be in wco .

data/lib/wco_models.rb

@@ -46,7 +46,7 @@ module WcoEmail
   FIELD_BODY    = 'body'
   FIELD_EXE     = 'exe'
   FIELD_FROM    = 'from'
-  FIELD_LEADSET = 'leadset'
+  FIELD_LEADSET = 'leadset_id'
   FIELD_SUBJECT = 'subject'
   FIELD_TO      = 'to'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.246
+  version: 3.1.0.247
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-27 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -404,6 +404,7 @@ files:
 - app/assets/javascripts/wco/invoices.js
 - app/assets/javascripts/wco/office_action_templates.js
 - app/assets/javascripts/wco/shared.js
+- app/assets/javascripts/wco/tags.js
 - app/assets/stylesheets/dark_theme.css
 - app/assets/stylesheets/light_theme.css
 - app/assets/stylesheets/production_theme.scss
@@ -572,8 +573,8 @@ files:
 - app/views/wco/headlines/new.haml
 - app/views/wco/invoices/_form.haml
 - app/views/wco/invoices/_header.haml
-- app/views/wco/invoices/_index_list.haml
 - app/views/wco/invoices/_index_table.haml
+- app/views/wco/invoices/_list.haml
 - app/views/wco/invoices/edit.haml
 - app/views/wco/invoices/index.haml
 - app/views/wco/invoices/new_pdf.haml
@@ -598,6 +599,7 @@ files:
 - app/views/wco/leads/show.haml
 - app/views/wco/leadsets/_form.haml
 - app/views/wco/leadsets/_header.haml
+- app/views/wco/leadsets/_index.haml
 - app/views/wco/leadsets/_index_chips.haml
 - app/views/wco/leadsets/_index_list.haml
 - app/views/wco/leadsets/edit.haml
@@ -698,11 +700,13 @@ files:
 - app/views/wco/sites/index.haml
 - app/views/wco/sites/new.haml
 - app/views/wco/sites/show.haml
+- app/views/wco/tags/_actions.haml
 - app/views/wco/tags/_form.haml
 - app/views/wco/tags/_header.haml
 - app/views/wco/tags/_index.haml
 - app/views/wco/tags/_index_chips.haml
 - app/views/wco/tags/_index_table.haml
+- app/views/wco/tags/_index_tree.haml
 - app/views/wco/tags/_list_chips.haml
 - app/views/wco/tags/_menuitem.haml
 - app/views/wco/tags/edit.haml