thredded-workgroup 0.2.0 → 0.2.1

data/app/controllers/concerns/thredded/workgroup/all_unread_followed_topics.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Thredded
+  module Workgroup
+    module AllUnreadFollowedTopics
+      extend ActiveSupport::Concern
+      included do
+        include Pundit
+        helper_method :all_unread_followed_topics_count
+      end
+
+      # @return [ActiveRecord::Relation]
+      def all_topics_scope
+        @all_topics_scope ||=
+          policy_scope(Thredded::Topic.all).joins(:messageboard).merge(policy_scope(Thredded::Messageboard.all))
+      end
+
+      # @return Integer
+      def all_unread_followed_topics_count
+        @all_unread_followed_topics_count ||=
+          if thredded_signed_in?
+            all_topics_scope.unread_followed_by(thredded_current_user).count
+          else
+            0
+          end
+      end
+
+      # need to define `thredded_current_user` and possibly `pundit_user`
+    end
+  end
+end

data/app/controllers/thredded/application_controller.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_dependency File.expand_path("../../app/controllers/thredded/application_controller",
+                                    Thredded::Engine.called_from)
+
+module Thredded
+  module ApplicationControllerRetaining
+    def topics_scope
+      return super if messageboard_or_nil
+      all_topics_scope
+    end
+
+    def unread_followed_topics_count
+      return super if messageboard_or_nil
+      all_unread_followed_topics_count
+    end
+  end
+  class ApplicationController
+    include Thredded::Workgroup::AllUnreadFollowedTopics
+
+    prepend ::Thredded::ApplicationControllerRetaining
+  end
+end

data/app/controllers/thredded/posts_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_dependency File.expand_path("../../app/controllers/thredded/posts_controller", Thredded::Engine.called_from)
 
 module Thredded

data/app/controllers/thredded/workgroup/application_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module Workgroup
     class ApplicationController < Thredded::ApplicationController

data/app/controllers/thredded/workgroup/navs_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module Workgroup
     class NavsController < Thredded::Workgroup::ApplicationController

data/app/controllers/thredded/workgroup/read_states_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Thredded
+  module Workgroup
+    class ReadStatesController < ::Thredded::Workgroup::ApplicationController
+      before_action :thredded_require_login!
+
+      def mark_all_topics_read
+        ::Thredded::Workgroup::MarkAllTopicsReadJob.perform_later(thredded_current_user) if thredded_signed_in?
+        redirect_to request.referer, flash: { notice: "Marking all topics as read (will take a few seconds)" }
+      end
+    end
+  end
+end

data/app/controllers/thredded/workgroup/topics_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# frozen_string_literal: true # frozen_string_literal: true
+
+module Thredded
+  module Workgroup
+    class TopicsController < Thredded::Workgroup::ApplicationController
+      before_action :thredded_require_login!
+
+      def kick
+        if (user_topic_follow = UserTopicFollow.where(topic_id: params[:id], user_id: params[:user_id]).first)
+          user_topic_follow.destroy
+        end
+        render plain: "Ok"
+      end
+    end
+  end
+end

data/app/helpers/thredded/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_dependency File.expand_path("../../app/helpers/thredded/application_helper", Thredded::Engine.called_from)
 module Thredded
   module ApplicationHelper

data/app/helpers/thredded/workgroup/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module Workgroup
     module ApplicationHelper

data/app/jobs/thredded/workgroup/mark_all_topics_read_job.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Thredded
+  module Workgroup
+    class MarkAllTopicsReadJob < ::ActiveJob::Base
+      def perform(user)
+        ::Thredded::Topic.unread(user).each do |topic|
+          ::Thredded::UserTopicReadState.touch!(user.id, topic.last_post)
+        end
+      end
+    end
+  end
+end

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_dependency File.expand_path("../../app/view_hooks/thredded/all_view_hooks", Thredded::Engine.called_from)
+
+module Thredded
+  class AllViewHooks
+    prepend ::Thredded::Workgroup::ViewHooks
+  end
+end

data/app/view_hooks/thredded/workgroup/view_hooks.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Thredded
+  module Workgroup
+    module ViewHooks
+      attr_reader :topic_with_last_post
+
+      def initialize
+        super
+        @topic_with_last_post = TopicWithLastPost.new
+      end
+
+      # View hooks for a Topic when displaying last post.
+      class TopicWithLastPost
+        # @return [Thredded::AllViewHooks::ViewHook]
+        attr_reader :last_post_with_controls
+
+        # @return [Thredded::AllViewHooks::ViewHook]
+        attr_reader :last_post
+
+        def initialize
+          @last_post_with_controls = Thredded::AllViewHooks::ViewHook.new
+          @last_post = Thredded::AllViewHooks::ViewHook.new
+        end
+      end
+    end
+  end
+end

data/app/view_models/thredded/topic_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_dependency File.expand_path("../../app/view_models/thredded/topic_view", Thredded::Engine.called_from)
 module Thredded
   class TopicView < Thredded::BaseTopicView
@@ -11,5 +12,21 @@ module Thredded
       page = @read_state.first_unread_post_page || @read_state.last_read_post_page
       Thredded::UrlsHelper.topic_path(@topic, page: page, anchor: anchor)
     end
+
+    def reply_path
+      Thredded::UrlsHelper.topic_path(@topic, page: last_page, anchor: "new_post")
+    end
+
+    def mark_as_unread_path
+      Thredded::UrlsHelper.mark_as_unread_post_path(id: last_post.id, format: :json)
+    end
+
+    def mark_as_read_path
+      Thredded::UrlsHelper.mark_as_read_post_path(id: last_post.id, format: :json)
+    end
+
+    def last_page
+      (@topic.posts_count / Thredded.posts_per_page.to_f).ceil # TODO: doesn't account for visibility
+    end
   end
 end

data/app/view_models/thredded/topics_page_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_dependency File.expand_path("../../app/view_models/thredded/topics_page_view", Thredded::Engine.called_from)
 module Thredded
   module TopicsPageViewWithLastPost

data/app/views/thredded/shared/nav/_unread_topics.html.erb

@@ -0,0 +1 @@
+<% # overriding thredded's view  %>

data/app/views/thredded/topics/_followers.html.erb

@@ -0,0 +1,23 @@
+<% if Thredded.show_topic_followers %>
+  <%= define_svg_icons "thredded/follow.svg", "thredded/unfollow.svg" %>
+  <div class="thredded--topic-followers">
+    <% if topic.followers.length > 0 %>
+      <%= t('thredded.topics.followed_by')%>
+      <% topic.followers.each do |user| %>
+        <span class="thredded--follower user-<%= user.id %>">
+          <%= user_mention(user) %>
+          <%- if user == thredded_current_user %>
+            <%= t("thredded.workgroup.following.you")%>
+          <%- else %>
+            <button class="thredded--follower--remove" data-kick-path="<%= thredded_workgroup.kick_topic_path(topic.to_model.id, user_id: user.id) %>" title="Remove follower" aria-label="Remove follower">
+              <%= shared_inline_svg "thredded/follow.svg", class: "thredded--topics--follow-icon", role: "img" %>
+              <%= shared_inline_svg "thredded/unfollow.svg", class: "thredded--topics--unfollow-icon", role: "img" %>
+            </button>
+          <%- end %>
+        </span>
+      <% end %>
+    <% else %>
+      <%= t('thredded.topics.followed_by_noone')%>
+    <% end %>
+  </div>
+<% end %>

data/app/views/thredded/topics/_topic.html.erb

@@ -2,22 +2,18 @@
     id:    dom_id(topic),
     class: ['thredded--topics--topic', topic_css_classes(topic)],
     data: {topic: topic.id, messageboard: topic.messageboard_id} do %>
-  <div class="thredded--topics--posts-count"><%= topic.posts_count %></div>
+
+  <div class="thredded--topic--read-state-toggle">
+    <%= shared_inline_svg("thredded/workgroup/envelope-open-o.svg", class: "thredded--topics--read-icon thredded--icon", role: "img", viewBox: "0 0 1792 1792",  title: "Mark as read") %>
+    <%= shared_inline_svg("thredded/workgroup/envelope-o.svg", class: "thredded--topics--unread-icon thredded--icon", role: "img", viewBox: "0 0 1792 1792", title: "Mark as unread") %>
+  </div>
 
   <h1 class="thredded--topics--title">
     <span class="thredded--topic-title"><%= link_to topic.title, topic.path %></span>
-    <% unless messageboard_or_nil #don't show if being viewed in the context of a messageboard%>
-      <cite class="thredded--messageboard-name">
-        <%= link_to topic.messageboard_name, topic.messageboard_path %>
-      </cite>
-    <% end %>
-    <svg viewBox="0 0 116 121" class="thredded--topics--follow-icon">
-      <% if topic.followed? %>
-        <use xlink:href="#thredded-follow-icon"/>
-      <% else %>
-        <use xlink:href="#thredded-unfollow-icon"/>
-      <% end %>
-    </svg>
+    <a href="#" class="thredded-follow-toggle js-thredded-follow-toggle">
+      <%= shared_inline_svg "thredded/follow.svg", class: "thredded--topics--follow-icon", role: "img" %>
+      <%= shared_inline_svg "thredded/unfollow.svg", class: "thredded--topics--unfollow-icon", role: "img" %>
+    </a>
   </h1>
 
   <% if topic.categories.any? %>
@@ -26,26 +22,27 @@
     </ul>
   <% end %>
 
+  <cite class="thredded--topics--updated-by">
+    <%= time_ago topic.last_post_at %>
+    <%= user_link topic.last_user %>
+  </cite>
+
+  <% if local_assigns[:show_messageboard] %>
+    <span class="thredded--topics--messageboard">
+      <%= t 'thredded.topics.in_messageboard_html',
+            messageboard_link: link_to(topic.messageboard_name, topic.messageboard_path) %>
+    </span>
+  <% end %>
 
   <% if topic.blocked? && topic.can_moderate? %>
     <span class="thredded--topics--moderation-state thredded--alert thredded--alert-danger">
       <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: topic.last_moderation_record %>
     </span>
   <% end %>
+  <%= render 'thredded/workgroup/topics/last_post_with_controls', topic: topic if topic.last_post %>
+<% end %>
 
-  <%= render partial: 'thredded/topics/followers', locals: {topic: topic} %>
-
-  <div class='thredded--topic-post-and-last-user thredded--condensed'>
-    <div class="thredded--topic-source">
-      <cite class="thredded--topics--updated-by">
-        <%= topic.last_user.thredded_display_name %>
-        <%= time_ago topic.last_post_at %>
-      </cite>
-    </div>
-
-    <div class="thredded--last-post">
-      <%= render 'thredded/posts_common/content', post: topic.last_post if topic.last_post %>
-    </div>
-  </div>
-
+<% if local_assigns[:sticky_topics_divider] &&
+    !topic_iteration.last? && topic.sticky? && !topics[topic_counter + 1].sticky? %>
+  <%= render 'thredded/topics/sticky_topics_divider' %>
 <% end %>

data/app/views/thredded/workgroup/navs/_personal_nav.html.erb

@@ -1,6 +1,12 @@
 <ul class="thredded--workgroup">
   <li class="<%= Thredded::Workgroup.navbar_class(params, :unread) %>">
-    <%= link_to t('thredded.workgroup.unread.link'), thredded_workgroup.unread_nav_path%>
+    <%= link_to thredded_workgroup.unread_nav_path do%>
+      <%= t('thredded.workgroup.unread.link') %>
+      <% if all_unread_followed_topics_count > 0 -%>
+      <span class="thredded--user-navigation--unread-topics--followed-count"><%=shared_inline_svg "thredded/follow.svg", class: "thredded--unread-topics--followed-icon", role:"img" %>
+        <%= all_unread_followed_topics_count %></span>
+      <% end -%>
+    <% end -%>
   </li>
   <li class="<%= Thredded::Workgroup.navbar_class(params, :awaiting) %>">
     <%= link_to thredded_workgroup.awaiting_nav_path do %>

data/app/views/thredded/workgroup/navs/all_topics.html.erb

@@ -6,4 +6,4 @@
   </ul>
 <% end %>
 
-<%= render partial: 'thredded/topics/topics_with_last_post'%>
+<%= render partial: 'thredded/workgroup/topics/topics_with_last_post'%>

data/app/views/thredded/workgroup/navs/awaiting.html.erb

@@ -6,4 +6,4 @@
   </ul>
 <% end %>
 
-<%= render partial: 'thredded/topics/topics_with_last_post'%>
+<%= render partial: 'thredded/workgroup/topics/topics_with_last_post'%>

data/app/views/thredded/workgroup/navs/following.html.erb

@@ -6,4 +6,4 @@
   </ul>
 <% end %>
 
-<%= render partial: 'thredded/topics/topics_with_last_post'%>
+<%= render partial: 'thredded/workgroup/topics/topics_with_last_post'%>

data/app/views/thredded/workgroup/navs/unread.html.erb

@@ -6,4 +6,4 @@
   </ul>
 <% end %>
 
-<%= render partial: 'thredded/topics/topics_with_last_post'%>
+<%= render partial: 'thredded/workgroup/topics/topics_with_last_post'%>

data/app/views/thredded/workgroup/topics/_controls.html.erb

@@ -0,0 +1,21 @@
+<div class="thredded--topic-controls">
+  <a class="thredded--topic--read-state-toggle thredded--topic--mark-as-read thredded--button" data-post-path="<%= topic.mark_as_read_path %>">
+    <%= shared_inline_svg("thredded/workgroup/envelope-open-o.svg", class: "thredded--topics--read-icon thredded--icon", role: "img", viewBox: "0 0 1792 1792") %>
+    <%= t("thredded.topics.mark_read")%>
+  </a>
+  <a class="thredded--topic--read-state-toggle thredded--topic--mark-as-unread thredded--button" data-post-path="<%= topic.mark_as_unread_path %>">
+    <%= shared_inline_svg("thredded/workgroup/envelope-o.svg", class: "thredded--topics--unread-icon thredded--icon", role: "img", viewBox: "0 0 1792 1792") %>
+    <%= t("thredded.topics.mark_unread")%>
+  </a>
+  <a class="thredded--topic--view-button thredded--button" href="<%= topic.reply_path %>">
+    <%= t("thredded.topics.view_or_reply")%>
+  </a>
+  <a href="#" class="js-thredded-follow-toggle thredded--topic--follow thredded--button">
+    <%= shared_inline_svg "thredded/follow.svg", class: "thredded--icon", role: "img" %>
+    <%= t("thredded.topics.follow")%>
+  </a>
+  <a href="#" class="js-thredded-follow-toggle thredded--topic--unfollow thredded--button">
+    <%= shared_inline_svg "thredded/unfollow.svg", class: "thredded--icon", role: "img" %>
+    <%= t("thredded.topics.unfollow")%>
+  </a>
+</div>

data/app/views/thredded/workgroup/topics/_last_post.html.erb

@@ -0,0 +1,11 @@
+<%= view_hooks.topic_with_last_post.last_post.render self, topic: topic do %>
+  <div class="thredded--topic-source">
+    <cite class="thredded--topics--updated-by">
+      <%= topic.last_user.thredded_display_name %>
+      <%= time_ago topic.last_post_at %>
+    </cite>
+  </div>
+  <div class="thredded--last-post">
+    <%= render 'thredded/posts_common/content', post: topic.last_post %>
+  </div>
+<% end %>

data/app/views/thredded/workgroup/topics/_last_post_with_controls.html.erb

@@ -0,0 +1,12 @@
+<%= view_hooks.topic_with_last_post.last_post_with_controls.render self, topic: topic do %>
+  <div class="thredded--topic-last-post-with-controls">
+    <%= render "thredded/workgroup/topics/controls", topic: topic %>
+    <div class='thredded--topic-post-and-last-user thredded--condensable thredded--condensable--condensed'>
+      <%= render "thredded/workgroup/topics/last_post", topic: topic %>
+      <div class="thredded--condensable--overflow-only">
+        <span class="thredded--condensable--expand"><%= t("thredded.workgroup.condensable.read_all") %></span>
+        <span class="thredded--condensable--condense"><%= t("thredded.workgroup.condensable.read_less") %></span>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/thredded/workgroup/topics/_topics_with_last_post.html.erb

@@ -0,0 +1,16 @@
+<%= define_svg_icons 'thredded/follow.svg', 'thredded/unfollow.svg' %>
+
+<%= thredded_page do %>
+  <%= content_tag :section, class: 'thredded--main-section thredded--topics', 'data-thredded-topics' => true do %>
+    <%= render @topics, show_messageboard: !messageboard_or_nil %>
+  <% end %>
+
+  <%= link_to t("thredded.nav.mark_all_read"),
+      mark_all_topics_read_path,
+      class: 'thredded--button thredded--button-light thredded--button-wide',
+      method: :put -%>
+
+  <footer>
+    <%= paginate @topics %>
+  </footer>
+<% end %>

data/bin/rails.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # This command will automatically be run when you run "rails"
 # with Rails 4 gems installed from the root of your application.
 

data/bin/rspec

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #

data/bin/update_from_thredded

@@ -21,6 +21,7 @@ cp -pR $(bundle show thredded)/spec/dummy ./spec/dummy
 
 # update some standard helpful files
 cp $(bundle show thredded)/spec/support/features/fake_content.rb spec/support/features/fake_content.rb
+cp $(bundle show thredded)/spec/lib/thredded/all_view_hooks_spec.rb spec/lib/thredded/all_view_hooks_spec.rb
 
 # restore thredded-workgroup config, emoji
 mv ./tmp/upgradecache/thredded_workgroup.rb ./spec/dummy/config/initializers/