Restructure new findaproject page for #4129

Gemfile

@@ -104,6 +104,13 @@ group :development, :test do
   gem 'pry-awesome_print'
   gem 'pry-byebug'
   gem 'rspec-rails'
+
+  # Profiling for use in prod
+  gem 'flamegraph'
+  gem 'memory_profiler'
+  gem 'meta_request'
+  gem 'rack-mini-profiler', require: false
+  gem 'stackprof'
 end
 
 gem 'dotenv', group: [:development, :test], require: 'dotenv/load'
@@ -130,13 +137,6 @@ gem 'friendly_id'
 gem 'iso-639'
 gem 'rtl'
 
-# Profiling for use in prod
-gem 'flamegraph'
-gem 'memory_profiler'
-gem 'meta_request'
-gem 'rack-mini-profiler'
-gem 'stackprof'
-
 gem 'bento-sdk', github: 'bentonow/bento-ruby-sdk', branch: 'master'
 gem 'newrelic_rpm'
 

app/controllers/application_controller.rb

@@ -73,11 +73,9 @@ def current_user
     super || guest_user
   end
 
-  #find the guest user account if a guest user session is currently active
+  # find the guest user account if a guest user session is currently active
   def guest_user
-    unless session[:guest_user_id].nil?
-      User.where(id: session[:guest_user_id]).first
-    end
+    User.find_by(id: session[:guest_user_id])
   end
 
   #when the user chooses to transcribe as guest, find guest user id or create new guest user

app/controllers/dashboard_controller.rb

@@ -202,13 +202,20 @@ def landing_page
   def new_landing_page
     @search_results = search_results(params[:search])
 
-    # Get random Collections and DocSets from paying users
-    @owners = User.findaproject_owners.order(:display_name).joins(:collections)
-                  .left_outer_joins(:document_sets).includes(:collections)
-
-    # Sampled Randomly down to 8 items for Carousel
-    docsets = DocumentSet.carousel.includes(:owner).where(owner_user_id: @owners.ids.uniq).sample(5)
-    colls = Collection.carousel.includes(:owner).where(owner_user_id: @owners.ids.uniq).sample(5)
+    users = User.owners
+                .joins(:collections)
+                .left_outer_joins(:document_sets)
+                .includes({ random_collections: :tags }, { random_document_sets: { collection: :tags } })
+
+    @org_owners = users.findaproject_orgs.order(:display_name).distinct
+    @individual_owners = users.findaproject_individuals.order(:display_name).distinct
+
+    docsets = DocumentSet.carousel
+                         .includes(:owner, { next_untranscribed_page: :work })
+                         .where(owner_user_id: @org_owners.select(:id) + @individual_owners.select(:id)).sample(5)
+    colls = Collection.carousel
+                      .includes(:owner, { next_untranscribed_page: :work })
+                      .where(owner_user_id: @org_owners.select(:id) + @individual_owners.select(:id)).sample(5)
     @collections = (docsets + colls).sample(8)
 
     @tag_map = Tag.featured_tags.group(:ai_text).count
@@ -344,6 +351,9 @@ def send_generated_pdf(output_path)
   def search_results(search_key)
     return nil if search_key.nil?
 
-    Collection.search(search_key).unrestricted + DocumentSet.search(search_key).unrestricted
+    collections_query = Collection.search(search_key).unrestricted.includes(:owner)
+    document_sets_query = DocumentSet.search(search_key).unrestricted.includes(:owner)
+
+    collections_query + document_sets_query
   end
 end

app/controllers/user_controller.rb

@@ -140,6 +140,14 @@ def profile
 
     return unless @user.owner?
 
+    if params[:ai_text]
+      @tag = Tag.where(ai_text: params[:ai_text]).first
+      if @tag
+        tag_collections = @tag.collections.where(owner_user_id: @user.id)
+        tag_document_sets = tag_collections.map(&:document_sets).flatten
+        @tag_collections = tag_collections+tag_document_sets
+      end
+    end
     collections = @user.all_owner_collections.carousel
     sets = @user.document_sets.carousel
     @carousel_collections = (collections + sets).sample(8)

app/models/document_set.rb

@@ -118,11 +118,14 @@ def text_and_metadata_entry?
     self.collection.text_and_metadata_entry?
   end
 
-
   def hide_completed
     self.collection.hide_completed
   end
 
+  def tags
+    self.collection.tags
+  end
+
   def review_workflow
     self.collection.review_workflow
   end

app/models/tag.rb

@@ -14,6 +14,10 @@ class Tag < ApplicationRecord
   require 'openai/description_tagger'
   has_and_belongs_to_many :collections
 
+  # scope for only tags that are canonical
+  scope :canonical, -> { where(canonical: true) }
+
+
   # return tags that are canonical and have collections that are unrestricted and have a picture and intro block
   def self.featured_tags
     joins(:collections).where(canonical: true).merge(Collection.unrestricted.has_intro_block.has_picture.not_empty)

app/models/user.rb

@@ -110,16 +110,18 @@ class User < ApplicationRecord
   has_many :notes, -> { order 'created_at DESC' }
   has_many :deeds
 
-  has_many :random_collections,   -> { unrestricted.has_intro_block.not_near_complete.not_empty.random_sample },
+  has_many :random_collections,   -> { unrestricted.has_intro_block.not_near_complete.not_empty },
     class_name: "Collection",  :foreign_key => "owner_user_id"
-  has_many :random_document_sets, -> { unrestricted.has_intro_block.not_near_complete.not_empty.random_sample },
+  has_many :random_document_sets, -> { unrestricted.has_intro_block.not_near_complete.not_empty },
     class_name: "DocumentSet", :foreign_key => "owner_user_id"
 
   has_many :metadata_description_versions, :dependent => :destroy
 
   scope :owners,           -> { where(owner: true) }
   scope :trial_owners,     -> { owners.where(account_type: 'Trial') }
   scope :findaproject_owners, -> { owners.where.not(account_type: [nil, 'Trial', 'Staff']) }
+  scope :findaproject_orgs, -> { owners.where(account_type: ['Large Organization', 'Small Organization']) }
+  scope :findaproject_individuals, -> { owners.where(account_type: ['Legacy', 'Individual Researcher']) }
   scope :paid_owners,      -> { non_trial_owners.where('paid_date > ?', Time.now) }
   scope :expired_owners,   -> { non_trial_owners.where('paid_date <= ?', Time.now) }
   scope :active_mailers,   -> { where(activity_email: true)}

app/views/dashboard/_project_details.html.slim

@@ -0,0 +1,9 @@
+-snippet = truncate(Loofah.fragment(project.intro_block).text(encode_special_chars: false), length: 300, separator: ' ') || ''
+div.projects_details
+  -unless project.picture.blank?
+    .projects_details_image
+      =image_tag(project.picture_url(:thumb), alt: project.title)
+  .projects_collection
+    h5 =link_to project.title, collection_path(owner, project)
+    -unless snippet.empty?
+      .projects_collection_snippet = snippet

app/views/dashboard/browse_tag.html.slim

@@ -4,19 +4,6 @@ h2
 
 / Display a list of collections with teaser images and snippets as tiles
 [email protected] do |collection|
-  -snippet = to_snippet(collection.intro_block)
-  .collection-tile
-    .projects_details_image
-    =link_to(image_tag(collection.picture_url(:thumb), alt: collection.title), collection_path(collection.owner, collection), class: 'collection-tile_image')
-    .collection-tile_content
-      h3 =link_to collection.title, collection_path(collection.owner, collection)
-      p =snippet
-      -collection_stats(collection)
-      .collection-work_stats
-        span 
-          =t('dashboard.owner.n_works', count: collection.works.count)
-        span
-          =render({ :partial => 'shared/progress', :locals => { :collection => collection } })
-
-
+  =render(partial: 'shared/collection_tile', locals: { collection: collection })
+
 

app/views/dashboard/new_landing_page.html.slim

@@ -19,13 +19,15 @@
 
 .columns.project-list
   article.maincol
-    ul.tagcloud
-      -@tag_map.each do |ai_text, collection_count|
-        -if collection_count > 0
-          li data-weight="#{collection_count}"
-            =link_to(ai_text, browse_tag_path(ai_text))
+    -unless params[:search]
+      ul.tagcloud
+        -@tag_map.each do |ai_text, collection_count|
+          -if collection_count > 0
+            li data-weight="#{collection_count}"
+              =link_to(ai_text, browse_tag_path(ai_text))
 
-    -if @search_results && @owners.empty?
+    // show search results instead of owner listing
+    -if @search_results && @org_owners.empty? && @individual_owners.empty?
       -@search_results.each do |sr|
         .project-list_projects
           .projects-owner
@@ -38,35 +40,39 @@
                 .projects_collection_snippet
                   =truncate(Loofah.fragment(sr.intro_block).text(encode_special_chars: false), length: 300, separator: ' ') || ''
 
-    [email protected] do |owner|
-      -if params[:search]
-        -projects = @search_results.select{ |p| p.owner_user_id == owner.id }
-      -else
-        -projects = (owner.random_collections + owner.random_document_sets).sample(3)
-      -unless projects.blank?
-        .project-list_projects
-          .projects-owner
-            h3.projects-owner_title
-              =link_to owner.display_name, user_profile_path(owner)
-            -if owner.about.present?
-              .description
-                =owner.about
-
-          .projects
-            -projects.each do |project|
-              -snippet = truncate(Loofah.fragment(project.intro_block).text(encode_special_chars: false), length: 300, separator: ' ') || ''
-              div.projects_details
-                -unless project.picture.blank?
+    // show listing of all organizations and individual owners
+    -else
+      -[@org_owners, @individual_owners].each do |owners|
+        -owners.each do |owner|
+          -projects = (owner.random_collections.sample(5) + owner.random_document_sets.sample(5))
+          -if projects.count > 0
+            .project-list_projects
+              .projects-owner
+                h3.projects-owner_title
+                  =link_to owner.display_name, user_profile_path(owner)
+                -if owner.picture.present?
                   .projects_details_image
-                    =image_tag(project.picture_url(:thumb), alt: project.title)
-                .projects_collection
-                  h5 =link_to project.title, collection_path(owner, project)
-                  -unless snippet.empty?
-                    .projects_collection_snippet = snippet
-            .projects_link =link_to t('dashboard.landing_page.more'), user_profile_path(owner)
+                    =image_tag(owner.picture_url(:thumb), alt: owner.display_name)
+                -else # find a thumbnail from their collections
+                  / display the most common tags for projects by this owner
+                  -project = projects.first
+                  -if project.picture.present?
+                    .projects_details_image
+                      =image_tag(project.picture_url(:thumb), alt: project.title)
+                -if owner.about.present?
+                  .description
+                    =owner.about
+                -tag_map = projects.flat_map(&:tags).group_by(&:canonical).map { |tag, tag_list| [tag.ai_text, tag_list.size] }.sort_by(&:last).reverse
+                -if tag_map.present?
+                  ul.tagcloud
+                    -tag_map.each do |ai_text, collection_count|
+                      -if collection_count > 0
+                        li
+                          -link_text = "#{ai_text} (#{collection_count})"
+                          =link_to(link_text, tagged_user_profile_path(owner.slug, ai_text))
 
-    .project-list_link
-      =link_to t('.all_collections'), collections_list_path
+      .project-list_link
+        =link_to t('.all_collections'), collections_list_path
 
   aside.sidecol
     =form_tag({:controller => 'dashboard', :action => 'new_landing_page'}, method: :get, enforce_utf8: false, class: 'collection-search') do

app/views/shared/_collection_tile.html.slim

@@ -0,0 +1,14 @@
+-snippet = to_snippet(collection.intro_block)
+.collection-tile
+  .projects_details_image
+  =link_to(image_tag(collection.picture_url(:thumb), alt: collection.title), collection_path(collection.owner, collection), class: 'collection-tile_image')
+  .collection-tile_content
+    h3 =link_to collection.title, collection_path(collection.owner, collection)
+    p =snippet
+    -collection_stats(collection)
+    .collection-work_stats
+      span 
+        =t('dashboard.owner.n_works', count: collection.works.count)
+      span
+        =render({ :partial => 'shared/progress', :locals => { :collection => collection } })
+

app/views/user/_owner_profile.html.slim

@@ -34,6 +34,16 @@ section.user-profile
           h3 =link_to c.title, collection_path(c.owner, c)
           p =snippet
 
+-if @tag 
+  h2 
+    span Collections tagged 
+    i [email protected]_text
+
+    / Display a list of collections with teaser images and snippets as tiles
+    -@tag_collections.each do |collection|
+      = render partial: 'shared/collection_tile', locals: { collection: collection }
+
+
 .columns
   article.maincol
     -if collections_and_document_sets.any?{ |c| c.class == Collection && c.supports_document_sets }

config/initializers/rack_mini_profiler.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+if Rails.env.development?
+  require 'rack-mini-profiler'
+
+  Rack::MiniProfiler.config.position = 'bottom-right'
+  Rack::MiniProfiler.config.show_total_sql_count = true
+
+  Rack::MiniProfilerRails.initialize!(Rails.application)
+end

config/routes.rb

@@ -460,6 +460,7 @@
 
 
   resources :document_sets, except: [:show, :create, :edit]
+  get '/:user_id/tagged/:ai_text', to: 'user#profile', as: :tagged_user_profile
 
   scope ':user_slug' do
     get 'update_profile', to: 'user#update_profile', as: :update_profile
@@ -511,7 +512,6 @@
       get 'start_transcribing', as: :start_transcribing, to: 'collection#start_transcribing'
 
 
-
       #work related routes
       #have to use match because it must be both get and post
       match ':work_id', to: 'display#read_work', via: [:get, :post], as: :read_work