wco_models 3.1.0.151 → 3.1.0.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e824b16145363e5d17b5d92ec49ad8eed54b66493576073881120a6b45da2c3
-  data.tar.gz: b317c3d100065b7bb886493af60a8ca0588150b896243a6228ad721a0a820c0a
+  metadata.gz: d25598a6db9204889720f02b371b8e1d206724f49af7dbbf6122f15973d00a8a
+  data.tar.gz: e5b36788322711cbbd54463d38d9dd3e45684c4679002048784a7f3d3768d106
 SHA512:
-  metadata.gz: babbbaad0b95c6aa87a58c0e15dadd69e532d258190292c5a532af6ecc7aaeb469e49f672eb62c4e339186a51faa9675d930e6d871e9ac814b282d8f1cdf1fe3
-  data.tar.gz: 57c2329932c5d2e763732b19f543228f521871443b7b1cbec198f3adea9d10d9df7edb532e919a01cd04d44d16b66cea6097f7f60deb3229b4377c31aea030fb
+  metadata.gz: cb1ca289cc7a97e4f423d5c6928e162bd471d00a8c18f2d2061ed8a6fb387a31c23c383a64762cbf007120162c822a8554468dcc2fab2c70dcd17f8f46a693da
+  data.tar.gz: be52e2c4133a04e9fb9af78921cf5548b287c0ef917bafeae90fa9948654cddc293f6145a2260add440675bac78ec5864485ab2e3778a0f3d2af0d19058deb98

data/app/controllers/wco/profiles_controller.rb

@@ -1,6 +1,18 @@
 
 class Wco::ProfilesController < Wco::ApplicationController
 
+  def create
+    @profile = Wco::Profile.new params[:profile].permit!
+    authorize! :create, @profile
+    if @profile.save
+      flash_notice @profile
+      redirect_to action: :index
+    else
+      flash_alert @profile
+      render action: 'new'
+    end
+  end
+
   def edit
     @profile = Wco::Profile.find params[:id]
     authorize! :update, @profile
@@ -9,6 +21,15 @@ class Wco::ProfilesController < Wco::ApplicationController
   def index
     @profiles = Wco::Profile.all
     authorize! :index, Wco::Profile
+    if params[:q]
+      q = URI.decode(params[:q])
+      @profiles = @profiles.where({ email: /#{q}/i })
+    end
+  end
+
+  def new
+    @new_profile = Wco::Profile.new
+    authorize! :new, @new_profile
   end
 
   def update

data/app/controllers/wco/reports_controller.rb

@@ -34,7 +34,7 @@ class Wco::ReportsController < Wco::ApplicationController
 
   def index
     authorize! :index, Wco::Report
-    @reports = Wco::Report.all
+    @reports = Wco::Report.all.page( params[:reports_page] ).per( current_profile.per_page )
     if params[:deleted]
       @reports = Wco::Report.unscoped.where( :deleted_at.ne => nil )
     end

data/app/controllers/wco/sites_controller.rb

@@ -38,6 +38,11 @@ class Wco::SitesController < Wco::ApplicationController
     @new_site = Wco::Site.new
   end
 
+  def show
+    @site = Wco::Site.find params[:id]
+    authorize! :show, @site
+  end
+
   def update
     @site = Wco::Site.find params[:id]
     authorize! :update, @site

data/app/controllers/wco/tags_controller.rb

@@ -91,6 +91,7 @@ class Wco::TagsController < Wco::ApplicationController
 
   def set_lists
     @new_tag = Wco::Tag.new
+    @sites_list = Wco::Site.list
     @tags = Wco::Tag.all.order_by( slug: :asc )
     @tags_list = Wco::Tag.list
   end

data/app/models/wco/log.rb

@@ -6,8 +6,8 @@ class Wco::Log
   include Mongoid::Paranoia
   store_in collection: 'wco_logs'
 
-  field :label,   type: :string
-  field :message, type: :string
+  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
 

data/app/models/wco/profile.rb

@@ -12,6 +12,8 @@ class Wco::Profile
   field :per_page, type: :integer, default: 25
   field :show_n_thumbs, type: :integer, default: 8
 
+  has_many :reports, class_name: 'Wco::Report'
+
   belongs_to :leadset,          class_name: 'Wco::Leadset', inverse_of: :profile,         optional: true
   has_many :newsitems, class_name: 'Wco::Newsitem'
   has_and_belongs_to_many :shared_galleries, class_name: 'Wco::Gallery', inverse_of: :shared_profiles

data/app/models/wco/report.rb

@@ -10,11 +10,12 @@ class Wco::Report
   store_in collection: 'wco_reports'
 
   field :title
-  validates :title, presence: true, uniqueness: true
+  validates :title, presence: true # , uniqueness: true
   index({ title: 1 }, { unique: true })
   def name ; title ; end
 
   field :subtitle
+  field :legacy_id, type: String
 
   field :slug
   validates :slug, presence: true, uniqueness: true
@@ -27,7 +28,10 @@ class Wco::Report
   field :y, :type => Float
   field :z, :type => Float
 
-  # has_one :photo
+  belongs_to :author, class_name: 'Wco::Profile'
+
+  # has_one :image_thumb
+  # has_one :image_hero
 
   has_and_belongs_to_many :tags
 

data/app/models/wco/site.rb

@@ -16,6 +16,7 @@ class Wco::Site
 
   has_many :publishers # , class_name: 'Wco::Publisher'
   has_many :headlines # , class_name: 'Wco::Newstitle'
+  has_many :tags, class_name: 'Wco::Tag'
 
   field :slug
   validates :slug, presence: true, uniqueness: true
@@ -65,4 +66,39 @@ class Wco::Site
     )
   end
 
+  def wp_import
+    site = self
+
+    root_tag = Wco::Tag.find_or_create_by slug: "#{site.slug}_wp-import", site_id: site.id
+    url      = "#{site.origin}/wp-json/wp/v2/posts"
+    pi_admin = Wco::Profile.find_or_create_by email: 'admin@piousbox.com'
+    n_pages  = 12
+    per_page = 100
+
+    (1..n_pages).each do |page|
+      print "Page #{page}"
+
+      posts = HTTParty.get url, query: { per_page: per_page, page: page }
+      posts.each do |post|
+        report = Wco::Report.new({
+          legacy_id: post['id'],
+          created_at: post['date'],
+          slug: post['link'].sub(site.origin, ''),
+          title: post['title']['rendered'],
+          subtitle: post['excerpt']['rendered'],
+          body: post['content']['rendered'],
+          author: pi_admin,
+          tag_ids: ( [ root_tag ] + site.tags.where( :legacy_id.in => post['categories'] ) ).map(&:id),
+        })
+
+        if report.save
+          print '^'
+        else
+          puts report.errors.messages
+        end
+      end
+    end
+    puts "ok"
+  end
+
 end

data/app/models/wco/tag.rb

@@ -9,9 +9,10 @@ class Wco::Tag
   validates :slug, presence: true, uniqueness: true
   index({ slug: -1 })
 
-  belongs_to :parent, class_name: 'Wco::Tag', inverse_of: :sons
+  belongs_to :parent, class_name: 'Wco::Tag', inverse_of: :sons, optional: true
   has_many :sons, class_name: 'Wco::Tag', inverse_of: :parent
 
+  belongs_to :site, class_name: 'Wco::Site', optional: true
   has_many :email_filters, class_name: 'WcoEmail::EmailFilter', inverse_of: :tag
 
   has_and_belongs_to_many :conversations, class_name: 'WcoEmail::Conversation', index: true

data/app/models/wco/utils.rb

@@ -17,6 +17,15 @@ module Wco::Utils
     out.with_indifferent_access
   end
 
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+  module ClassMethods
+    def list
+      [[nil,nil]] + all.map { |a| [ a, a.id ] }
+    end
+  end
+
   private
 
   def set_slug

data/app/models/wco_hosting/appliance.rb

@@ -3,21 +3,25 @@ class WcoHosting::Appliance
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paranoia
+  include Wco::Utils
   store_in collection: 'wco_appliances'
 
   has_many :logs, as: :obj, class_name: 'Wco::Log'
-  field :stdout, type: :string, default: ''
-  field :stderr, type: :string, default: ''
+  has_many :files,          class_name: 'WcoHosting::File'
 
+  field :rc_json, type: Object, default: '{}'
+  def rc
+    OpenStruct.new JSON.parse rc_json
+  end
 
   belongs_to :leadset,      class_name: 'Wco::Leadset', inverse_of: :appliances
   belongs_to :subscription, class_name: 'Wco::Subscription' # , inverse_of: :appliance
 
-  field :service_name
-  before_validation :set_service_name, on: :create, unless: ->{ service_name }
-  def set_service_name
-    self[:service_name] = host.gsub(".", "_")
-  end
+  # field :service_name
+  # before_validation :set_service_name, on: :create, unless: ->{ service_name }
+  # def set_service_name
+  #   self[:service_name] = host.gsub(".", "_")
+  # end
 
 
   belongs_to :environment, class_name: 'WcoHosting::Environment', inverse_of: :appliances, optional: true
@@ -26,9 +30,9 @@ class WcoHosting::Appliance
   end
 
   field :subdomain
-  field :domain
+  belongs_to :domain, class_name: 'WcoHosting::Domain'
   def host
-    "#{subdomain}.#{domain}"
+    "#{subdomain}.#{domain.name}"
   end
 
   field :n_retries, type: :integer, default: 3
@@ -37,9 +41,7 @@ class WcoHosting::Appliance
   def tmpl
     appliance_tmpl
   end
-  def kind
-    tmpl.kind
-  end
+  delegate :kind, to: :appliance_tmpl
 
   belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost', optional: true
 
@@ -51,7 +53,7 @@ class WcoHosting::Appliance
   field :state, default: STATE_PENDING
 
   def to_s
-    service_name
+    appliance_tmpl # kind
   end
 end
 

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -4,6 +4,7 @@ class WcoHosting::ApplianceTmpl
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paranoia
+  include Wco::Utils
   store_in collection: 'wco_appliance_tmpls'
 
   field :kind, type: :string
@@ -75,9 +76,7 @@ class WcoHosting::ApplianceTmpl
   has_many :appliances, class_name: 'WcoHosting::Appliance'
   has_many :subscriptions, as: :product, class_name: 'Wco::Subscription'
   has_many :prices, as: :product, class_name: 'Wco::Price'
-
-  # has_and_belongs_to_many :leadsets, class_name: 'Wco::Leadset'
-  # has_many :appliance_tmpl_leadsets, class_name: 'WcoHosting::ApplianceTmplLeadset'
+  has_and_belongs_to_many :task_tmpls, class_name: 'WcoHosting::TaskTmpl'
 
   field :product_id # stripe
 
@@ -91,9 +90,6 @@ class WcoHosting::ApplianceTmpl
     self.product_id = stripe_product.id
   end
 
-  def self.list
-    [[nil,nil]] + all.map { |a| [ a.kind, a.id ] }
-  end
   def to_s
     "#{kind}-#{version}"
   end

data/app/models/wco_hosting/environment.rb

@@ -3,6 +3,7 @@ class WcoHosting::Environment
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paranoia
+  include Wco::Utils
   store_in collection: 'wco_environments'
 
   belongs_to :leadset,      class_name: 'Wco::Leadset', inverse_of: :environments
@@ -16,6 +17,7 @@ class WcoHosting::Environment
   ## variable @env in execution environments
   field :env_json, type: Object, default: '{}'
 
+
   def to_s
     name
   end

data/app/models/wco_hosting/file.rb

@@ -0,0 +1,16 @@
+
+class WcoHosting::File
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_hosting_files'
+
+  belongs_to :serverhost, class_name: 'WcoHosting::Serverhost'
+  belongs_to :appliance,  class_name: 'WcoHosting::Appliance'
+
+  field :path,         type: :string
+  field :template_erb, type: :string
+  field :pre_exe,      type: :string
+  field :post_exe,     type: :string
+
+end

data/app/models/wco_hosting/runner.rb

@@ -10,6 +10,7 @@ class WcoHosting::Runner
 
   TASK_REDEPLOY_ECS_TASK_DEFINITION = 'redeploy-ecs-task-definition'
   TASK_REDEPLOY_ECS_TASK            = 'redeploy-ecs-task'
+  TASK_SYNC_ECS_TASK                = 'sync-ecs-task'
   TASKS = []
 
   def self.do_exec cmd

data/app/models/wco_hosting/serverhost.rb

@@ -28,6 +28,7 @@ class WcoHosting::Serverhost
   # field :ssh_key
 
   has_many :appliances, class_name: 'WcoHosting::Appliance'
+  has_many :files,      class_name: 'WcoHosting::File'
 
   def create_appliance app
     # puts! app, 'Serverhost#create_appliance'

data/app/models/wco_hosting/task.rb

@@ -5,4 +5,7 @@ class WcoHosting::Task
   include Mongoid::Paranoia
   store_in collection: 'wco_tasks'
 
+  belongs_to :task_tmpl,      class_name: 'WcoHosting::TaskTmpl'
+  belongs_to :appliance_tmpl, class_name: 'WcoHosting::ApplianceTmpl'
+
 end

data/app/models/wco_hosting/task_tmpl.rb

@@ -8,4 +8,13 @@ class WcoHosting::TaskTmpl
   field :slug
   validates :slug, presence: true
 
+  has_many :tasks, class_name: 'WcoHosting::Task'
+  has_and_belongs_to_many :appliance_tmpls, class_name: 'WcoHosting::ApplianceTmpl'
+
+  def to_s
+    slug
+  end
+  def self.list
+    [[nil,nil]] + all.map { |t| [t, t.id] }
+  end
 end

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

@@ -12,7 +12,7 @@
       %i.material-icons visibility_off
   = render 'meta', :item => gallery
 
-  = render '/wco/tags/list_mini', tags: gallery.tags, resource: gallery
+  = render '/wco/tags/list_chips', tags: gallery.tags, resource: gallery
 
   %ul
     %li slug :: #{gallery.slug}

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

@@ -14,7 +14,7 @@
     - if galleries.length > 0
       = form_tag update_galleries_path do
 
-        = render '/wco/tags/list_mini', tags: @tags
+        = render '/wco/tags/list_chips', tags: @tags
 
         = submit_tag 'Add Tags', data: { confirm: 'Are you sure?' }
           

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

@@ -1,6 +1,10 @@
 
 .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 )

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

@@ -0,0 +1,5 @@
+
+.profiles-new.maxwidth
+  .header
+    %h5.title New Profile
+  = render 'form', profile: @new_profile

data/app/views/wco/reports/{_list.haml → _index.haml}

@@ -1,7 +1,8 @@
 
 - config ||= {}
 
-.reports--list
+.reports--index
+  = paginate reports, :param_name => :reports_page, :views_prefix => 'wco'
   %ul
     - reports.each do |ttt|
       %li.Card
@@ -15,5 +16,5 @@
             .gray.mini= ttt.id
         - if !config[:skip_tags]
           .flex-row
-            = render '/wco/tags/index_inline', tags: ttt.tags
-
+            = render '/wco/tags/list_chips', tags: ttt.tags
+  = paginate reports, :param_name => :reports_page, :views_prefix => 'wco'

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

@@ -3,4 +3,4 @@
   .header
     %h5.title
       = render 'header'
-  = render 'wco/reports/list', reports: @reports
+  = render 'wco/reports/index', reports: @reports

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

@@ -7,7 +7,6 @@
     `#{@report.slug}`
     .gray.mini= @report.id
 
-  .descr= raw @report.body
-  -# %pre.descr= raw @report.body
+  = render 'wco/tags/index_chips', tags: @report.tags
 
-  = @report.inspect
+  .descr= raw @report.body

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

@@ -11,14 +11,14 @@
       -# %th kind
       %th origin
       -# %th post_path
-    - @sites.each do |ttt|
+    - @sites.each do |site|
       %tr
         %td
           .flex-row
-            = button_to '[x]', site_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
-            = link_to '[~]', edit_site_path(ttt)
-            .gray.mini= ttt.id
-        %td= ttt.slug
-        -# %td= ttt.kind
-        %td= ttt.origin
-        -# %td= ttt.post_path
+            = button_to '[x]', site_path(site), method: :delete, data: { confirm: 'Are you sure?' }
+            = link_to '[~]', edit_site_path(site)
+            .gray.mini= site.id
+        %td= link_to site.slug, site_path(site)
+        -# %td= site.kind
+        %td= site.origin
+        -# %td= site.post_path

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

@@ -0,0 +1,8 @@
+
+.sites-show.maxwidth
+  .header
+    %h5.title
+      = @site
+
+  = render '/wco/tags/header'
+  = render '/wco/tags/index', tags: @site.tags

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

@@ -2,6 +2,9 @@
 .tags--form
   = form_for tag do |f|
 
+    .d-flex
+      %label site
+      = f.select :site_id, options_for_select(@sites_list, selected: tag.site_id), {}, class: 'select2'
     .field
       %label slug
       = f.text_field :slug

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

@@ -1,6 +1,7 @@
 
-= link_to "Tags (#{Wco::Tag.all.length})", wco.tags_path
-.inline-search
-  = form_tag wco.tags_path, method: :get do
-    = text_field_tag :q
-= link_to '[+]', wco.new_tag_path
+.d-flex
+  = link_to "Tags (#{Wco::Tag.all.length})", wco.tags_path
+  .inline-search
+    = form_tag wco.tags_path, method: :get do
+      = text_field_tag :q
+  = link_to '[+]', wco.new_tag_path

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

@@ -0,0 +1 @@
+app/views/wco/tags/_index_chips.haml

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

@@ -22,4 +22,4 @@
       = render 'wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
     %li.d-flex
       <b>Reports (#{@reports.length}):&nbsp;</b>
-      = render 'wco/reports/list', reports: @reports, config: { skip_tags: true }
+      = render 'wco/reports/index', reports: @reports, config: { skip_tags: true }

data/app/views/wco_email/conversations/_table.haml

@@ -40,7 +40,7 @@
             -#     = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
 
           %td.tags.mini
-            = render '/wco/tags/list_mini', tags: conv.tags, cache_key: conv.cache_key, config: OpenStruct.new( without_checkbox: true )
+            = render '/wco/tags/list_chips', tags: conv.tags, cache_key: conv.cache_key, config: OpenStruct.new( without_checkbox: true )
           %td.latest-at
             = pp_date conv.latest_at
             = pp_time conv.latest_at

data/lib/tasks/wp_tasks.rake

@@ -0,0 +1,10 @@
+
+namespace :wp do
+
+  desc 'import a whole site into reports'
+  task :import_all_reports => :environment do
+    site     = Wco::Site.find_by slug: 'pi-drup-prod'
+    site.wp_import
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.151
+  version: 3.1.0.153
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -475,6 +475,7 @@ files:
 - app/models/wco_hosting/appliance_tmpl.rb
 - app/models/wco_hosting/domain.rb
 - app/models/wco_hosting/environment.rb
+- app/models/wco_hosting/file.rb
 - app/models/wco_hosting/runner.rb
 - app/models/wco_hosting/serverhost.rb
 - app/models/wco_hosting/subdomain.rb
@@ -582,6 +583,7 @@ files:
 - app/views/wco/profiles/_header.haml
 - app/views/wco/profiles/edit.haml
 - app/views/wco/profiles/index.haml
+- app/views/wco/profiles/new.haml
 - app/views/wco/publishers/_form.haml
 - app/views/wco/publishers/_header.haml
 - app/views/wco/publishers/edit.haml
@@ -589,7 +591,7 @@ files:
 - app/views/wco/publishers/new.haml
 - app/views/wco/reports/_form.haml
 - app/views/wco/reports/_header.haml
-- app/views/wco/reports/_list.haml
+- app/views/wco/reports/_index.haml
 - app/views/wco/reports/edit.haml
 - app/views/wco/reports/index.haml
 - app/views/wco/reports/index_table.haml
@@ -600,10 +602,12 @@ files:
 - app/views/wco/sites/edit.haml
 - app/views/wco/sites/index.haml
 - app/views/wco/sites/new.haml
+- app/views/wco/sites/show.haml
 - app/views/wco/tags/_form.haml
 - app/views/wco/tags/_header.haml
 - app/views/wco/tags/_index.haml
-- app/views/wco/tags/_list_mini.haml
+- app/views/wco/tags/_index_chips.haml
+- app/views/wco/tags/_list_chips.haml
 - app/views/wco/tags/edit.haml
 - app/views/wco/tags/index.haml
 - app/views/wco/tags/new.haml
@@ -660,6 +664,7 @@ files:
 - config/routes.rb
 - lib/tasks/db_tasks.rake
 - lib/tasks/office_tasks.rake
+- lib/tasks/wp_tasks.rake
 - lib/wco/ai_writer.rb
 - lib/wco/engine.rb
 - lib/wco/office_worker.rb