- {{top-period-chooser period=period}}
+ {{period-chooser period=period action="changePeriod"}}
diff --git a/app/assets/javascripts/discourse/templates/site-map.hbs b/app/assets/javascripts/discourse/templates/site-map.hbs
index 34660f8f6..d4be2d7bd 100644
--- a/app/assets/javascripts/discourse/templates/site-map.hbs
+++ b/app/assets/javascripts/discourse/templates/site-map.hbs
@@ -22,6 +22,8 @@
{{/if}}
+
{{#link-to 'directory'}}{{i18n "directory.title"}}{{/link-to}}
+
{{plugin-outlet "site-map-links"}}
{{#if showKeyboardShortcuts}}
diff --git a/app/assets/javascripts/discourse/views/directory-show.js.es6 b/app/assets/javascripts/discourse/views/directory-show.js.es6
new file mode 100644
index 000000000..9fdb9eb2d
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/directory-show.js.es6
@@ -0,0 +1,5 @@
+import LoadMore from 'discourse/mixins/load-more';
+
+export default Discourse.View.extend(LoadMore, {
+ eyelineSelector: '.directory tbody tr'
+});
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 489ed3c13..b318d01a1 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -29,7 +29,6 @@
//= require ./discourse/models/post-stream
//= require ./discourse/models/topic-details
//= require ./discourse/models/topic
-//= require ./discourse/models/top-period
//= require ./discourse/controllers/controller
//= require ./discourse/controllers/discovery-sortable
//= require ./discourse/controllers/object
@@ -51,7 +50,6 @@
//= require ./discourse/routes/user-topic-list
//= require ./discourse/routes/user-activity-stream
//= require ./discourse/routes/topic-from-params
-//= require ./discourse/components/top-title
//= require ./discourse/components/text-field
//= require ./discourse/components/visible
//= require ./discourse/components/conditional-loading-spinner
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index e9b1645da..3ac9c951e 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -226,11 +226,12 @@ ol.category-breadcrumb {
}
.period-chooser {
-
+ display: inline-block;
@include unselectable;
h2 {
float: left;
+ margin: 5px 0 10px;
}
button {
@@ -274,6 +275,10 @@ ol.category-breadcrumb {
.top-title-buttons {
display: inline;
+
+ button {
+ margin-right: 0.5em;
+ }
}
div.education {
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
new file mode 100644
index 000000000..d11141fbe
--- /dev/null
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -0,0 +1,46 @@
+.directory {
+ margin-bottom: 100px;
+
+ .period-chooser {
+ float: left;
+ }
+ .total-rows {
+ margin-top: 0.5em;
+ color: darken(scale-color-diff(), 20%);
+ float: right;
+ }
+ .spinner {
+ clear: both;
+ }
+
+ table {
+ width: 100%;
+ margin-top: 1em;
+ margin-bottom: 1em;
+
+ td, th {
+ padding: 0.5em;
+ text-align: left;
+ border-bottom: 1px solid scale-color-diff();
+ }
+
+ th.sortable {
+ cursor: pointer;
+
+ width: 13%;
+ i.fa {
+ margin-left: 1em;
+ }
+
+ &:hover {
+ background-color: scale-color-diff();
+ }
+ }
+
+ td.likes {
+ i {
+ color: $love;
+ }
+ }
+ }
+}
diff --git a/app/controllers/directory_controller.rb b/app/controllers/directory_controller.rb
new file mode 100644
index 000000000..aea4bbc20
--- /dev/null
+++ b/app/controllers/directory_controller.rb
@@ -0,0 +1,8 @@
+class DirectoryController < ApplicationController
+ # This controller just exists to avoid 404s and to have the ember app load up
+ def index
+ end
+
+ def show
+ end
+end
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
new file mode 100644
index 000000000..221149d22
--- /dev/null
+++ b/app/controllers/directory_items_controller.rb
@@ -0,0 +1,35 @@
+class DirectoryItemsController < ApplicationController
+ PAGE_SIZE = 50
+
+ def index
+ id = params.require(:id)
+ period_type = DirectoryItem.period_types[id.to_sym]
+ raise Discourse::InvalidAccess.new(:period_type) unless period_type
+
+ result = DirectoryItem.where(period_type: period_type).includes(:user)
+
+ order = params[:order] || DirectoryItem.headings.first
+ if DirectoryItem.headings.include?(order.to_sym)
+ dir = params[:asc] ? 'ASC' : 'DESC'
+ result = result.order("directory_items.#{order} #{dir}")
+ end
+
+ if period_type == DirectoryItem.period_types[:all]
+ result = result.includes(:user_stat)
+ end
+ page = params[:page].to_i
+ result = result.order('users.username')
+ result_count = result.dup.count
+ result = result.limit(PAGE_SIZE).offset(PAGE_SIZE * page)
+
+ serialized = serialize_data(result, DirectoryItemSerializer)
+
+ more_params = params.slice(:id, :order, :asc)
+ more_params[:page] = page + 1
+
+ render_json_dump directory_items: serialized,
+ total_rows_directory_items: result_count,
+ load_more_directory_items: directory_items_path(more_params)
+
+ end
+end
diff --git a/app/jobs/scheduled/directory_refresh.rb b/app/jobs/scheduled/directory_refresh.rb
new file mode 100644
index 000000000..2809ac210
--- /dev/null
+++ b/app/jobs/scheduled/directory_refresh.rb
@@ -0,0 +1,9 @@
+module Jobs
+ class DirectoryRefresh < Jobs::Scheduled
+ every 1.hour
+
+ def execute(args)
+ DirectoryItem.refresh!
+ end
+ end
+end
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
new file mode 100644
index 000000000..d2b8c02a5
--- /dev/null
+++ b/app/models/directory_item.rb
@@ -0,0 +1,57 @@
+class DirectoryItem < ActiveRecord::Base
+ belongs_to :user
+ has_one :user_stat, foreign_key: :user_id, primary_key: :user_id
+
+ def self.headings
+ @headings ||= [:likes_received,
+ :likes_given,
+ :topics_entered,
+ :topic_count,
+ :post_count]
+ end
+
+ def self.period_types
+ @types ||= Enum.new(:all, :yearly, :monthly, :weekly, :daily)
+ end
+
+ def self.refresh!
+ ActiveRecord::Base.transaction do
+ exec_sql "TRUNCATE TABLE directory_items"
+ period_types.keys.each {|p| refresh_period!(p)}
+ end
+ end
+
+ def self.refresh_period!(period_type)
+ since = case period_type
+ when :daily then 1.day.ago
+ when :weekly then 1.week.ago
+ when :monthly then 1.month.ago
+ when :yearly then 1.year.ago
+ else 1000.years.ago
+ end
+
+ exec_sql "INSERT INTO directory_items
+ (period_type, user_id, likes_received, likes_given, topics_entered, topic_count, post_count)
+ SELECT
+ :period_type,
+ u.id,
+ SUM(CASE WHEN ua.action_type = :was_liked_type THEN 1 ELSE 0 END),
+ SUM(CASE WHEN ua.action_type = :like_type THEN 1 ELSE 0 END),
+ (SELECT COUNT(topic_id) FROM topic_views AS v WHERE v.user_id = u.id AND v.viewed_at > :since),
+ SUM(CASE WHEN ua.action_type = :new_topic_type THEN 1 ELSE 0 END),
+ SUM(CASE WHEN ua.action_type = :reply_type THEN 1 ELSE 0 END)
+ FROM users AS u
+ LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id
+ WHERE u.active
+ AND NOT u.blocked
+ AND COALESCE(ua.created_at, :since) >= :since
+ AND u.id > 0
+ GROUP BY u.id",
+ period_type: period_types[period_type],
+ since: since,
+ like_type: UserAction::LIKE,
+ was_liked_type: UserAction::WAS_LIKED,
+ new_topic_type: UserAction::NEW_TOPIC,
+ reply_type: UserAction::REPLY
+ end
+end
diff --git a/app/serializers/directory_item_serializer.rb b/app/serializers/directory_item_serializer.rb
new file mode 100644
index 000000000..242196a83
--- /dev/null
+++ b/app/serializers/directory_item_serializer.rb
@@ -0,0 +1,35 @@
+class DirectoryItemSerializer < ApplicationSerializer
+
+ attributes :id,
+ :username,
+ :uploaded_avatar_id,
+ :avatar_template,
+ :time_read
+
+ attributes *DirectoryItem.headings
+
+ def id
+ object.user_id
+ end
+
+ def username
+ object.user.username
+ end
+
+ def uploaded_avatar_id
+ object.user.uploaded_avatar_id
+ end
+
+ def avatar_template
+ object.user.avatar_template
+ end
+
+ def time_read
+ AgeWords.age_words(object.user_stat.time_read)
+ end
+
+ def include_time_read?
+ object.period_type == DirectoryItem.period_types[:all]
+ end
+
+end
diff --git a/app/serializers/directory_serializer.rb b/app/serializers/directory_serializer.rb
new file mode 100644
index 000000000..415d9b7bf
--- /dev/null
+++ b/app/serializers/directory_serializer.rb
@@ -0,0 +1,9 @@
+class DirectorySerializer < ApplicationSerializer
+ attributes :id
+ has_many :directory_items, serializer: DirectoryItemSerializer, embed: :objects
+
+ def id
+ object.filter
+ end
+
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1b01d8f57..2320f3730 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -237,6 +237,19 @@ en:
sent_by_user: "Sent by
{{user}}"
sent_by_you: "Sent by
you"
+ directory:
+ title: "User Directory"
+ likes_given: "Likes Given"
+ likes_received: "Likes Received"
+ topics_entered: "Topics Entered"
+ time_read: "Time Read"
+ topic_count: "Topics"
+ post_count: "Replies"
+ no_results: "No results were found for this time period."
+ total_rows:
+ one: "1 user found"
+ other: "%{count} users found"
+
groups:
visible: "Group is visible to all users"
title:
diff --git a/config/routes.rb b/config/routes.rb
index 427a31960..a3cfd922b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,6 +25,9 @@ Discourse::Application.routes.draw do
resources :about
+ resources :directory
+ resources :directory_items
+
get "site" => "site#site"
namespace :site do
get "settings"
diff --git a/db/migrate/20150318143915_create_directory_items.rb b/db/migrate/20150318143915_create_directory_items.rb
new file mode 100644
index 000000000..37f08336a
--- /dev/null
+++ b/db/migrate/20150318143915_create_directory_items.rb
@@ -0,0 +1,16 @@
+class CreateDirectoryItems < ActiveRecord::Migration
+ def change
+ create_table :directory_items do |t|
+ t.integer :period_type, null: false
+ t.references :user, null: false
+ t.integer :likes_received, null: false
+ t.integer :likes_given, null: false
+ t.integer :topics_entered, null: false
+ t.integer :topic_count, null: false
+ t.integer :post_count, null: false
+ t.timestamps
+ end
+
+ add_index :directory_items, :period_type
+ end
+end
diff --git a/spec/controllers/directory_items_controller_spec.rb b/spec/controllers/directory_items_controller_spec.rb
new file mode 100644
index 000000000..bc36d9b86
--- /dev/null
+++ b/spec/controllers/directory_items_controller_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe DirectoryItemsController do
+
+ it "requires an `id` param" do
+ ->{ xhr :get, :index }.should raise_error
+ end
+
+ it "requires a proper `id` param" do
+ xhr :get, :index, id: 'eviltrout'
+ response.should_not be_success
+ end
+
+ context "with data" do
+ before do
+ Fabricate(:user)
+ DirectoryItem.refresh!
+ end
+
+ it "succeeds with a valid value" do
+ xhr :get, :index, id: 'all'
+ response.should be_success
+ json = ::JSON.parse(response.body)
+
+ json.should be_present
+ json['directory_items'].should be_present
+ json['total_rows_directory_items'].should be_present
+ json['load_more_directory_items'].should be_present
+ end
+ end
+end
diff --git a/spec/models/directory_item_spec.rb b/spec/models/directory_item_spec.rb
new file mode 100644
index 000000000..624027c24
--- /dev/null
+++ b/spec/models/directory_item_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe DirectoryItem do
+ context 'refresh' do
+ let!(:user) { Fabricate(:user) }
+
+ it "creates the record for the user" do
+ DirectoryItem.refresh!
+ expect(DirectoryItem.where(period_type: DirectoryItem.period_types[:all])
+ .where(user_id: user.id)
+ .exists?).to be_true
+ end
+
+ end
+end
diff --git a/test/javascripts/fixtures/directory-fixtures.js.es6 b/test/javascripts/fixtures/directory-fixtures.js.es6
new file mode 100644
index 000000000..cb70d2aa7
--- /dev/null
+++ b/test/javascripts/fixtures/directory-fixtures.js.es6
@@ -0,0 +1,3 @@
+export default {
+ "directory_items": {"directory_items":[{"id":32,"username":"codinghorror","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/codinghorror/{size}/2.png","time_read":"55d","likes_received":9370,"likes_given":7725,"topics_entered":11453,"topic_count":184,"post_count":12263},{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/2.png","time_read":"52d","likes_received":7834,"likes_given":2693,"topics_entered":11024,"topic_count":276,"post_count":7802},{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/2.png","time_read":"25d","likes_received":2383,"likes_given":319,"topics_entered":8041,"topic_count":34,"post_count":1602},{"id":6626,"username":"riking","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/riking/{size}/2.png","time_read":"17d","likes_received":2101,"likes_given":2756,"topics_entered":9055,"topic_count":163,"post_count":2548},{"id":1995,"username":"zogstrip","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/zogstrip/{size}/2.png","time_read":"32d","likes_received":1838,"likes_given":4588,"topics_entered":10823,"topic_count":16,"post_count":2050},{"id":8300,"username":"cpradio","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/cpradio/{size}/2.png","time_read":"11d","likes_received":1538,"likes_given":1001,"topics_entered":6121,"topic_count":111,"post_count":1430},{"id":2,"username":"neil","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/neil/{size}/2.png","time_read":"24d","likes_received":1238,"likes_given":684,"topics_entered":3250,"topic_count":27,"post_count":969},{"id":4263,"username":"mcwumbly","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/mcwumbly/{size}/2.png","time_read":"15d","likes_received":1223,"likes_given":1296,"topics_entered":5924,"topic_count":81,"post_count":1031},{"id":5351,"username":"erlend_sh","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/erlend_sh/{size}/2.png","time_read":"9d","likes_received":1115,"likes_given":747,"topics_entered":3260,"topic_count":154,"post_count":721},{"id":5559,"username":"downey","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/downey/{size}/2.png","time_read":"5d","likes_received":983,"likes_given":1713,"topics_entered":2995,"topic_count":131,"post_count":850},{"id":2770,"username":"awesomerobot","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/awesomerobot/{size}/2.png","time_read":"9d","likes_received":952,"likes_given":195,"topics_entered":2411,"topic_count":13,"post_count":402},{"id":9775,"username":"elberet","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/elberet/{size}/2.png","time_read":"7d","likes_received":930,"likes_given":159,"topics_entered":4077,"topic_count":28,"post_count":755},{"id":8222,"username":"techAPJ","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/techapj/{size}/2.png","time_read":"12d","likes_received":791,"likes_given":1005,"topics_entered":3691,"topic_count":43,"post_count":463},{"id":6060,"username":"lightyear","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lightyear/{size}/2.png","time_read":"3d","likes_received":708,"likes_given":330,"topics_entered":1717,"topic_count":34,"post_count":312},{"id":8,"username":"geek","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/geek/{size}/2.png","time_read":"20d","likes_received":634,"likes_given":152,"topics_entered":920,"topic_count":48,"post_count":298},{"id":464,"username":"DeanMarkTaylor","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/deanmarktaylor/{size}/2.png","time_read":"10d","likes_received":578,"likes_given":299,"topics_entered":2976,"topic_count":116,"post_count":485},{"id":11160,"username":"boomzilla","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/boomzilla/{size}/2.png","time_read":"1d","likes_received":561,"likes_given":398,"topics_entered":822,"topic_count":23,"post_count":185},{"id":4457,"username":"Lee_Ars","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lee_ars/{size}/2.png","time_read":"3d","likes_received":530,"likes_given":163,"topics_entered":2250,"topic_count":46,"post_count":327},{"id":8571,"username":"tobiaseigen","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tobiaseigen/{size}/2.png","time_read":"6d","likes_received":524,"likes_given":1275,"topics_entered":2545,"topic_count":140,"post_count":435},{"id":3,"username":"supermathie","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/supermathie/{size}/2.png","time_read":"20d","likes_received":510,"likes_given":312,"topics_entered":1733,"topic_count":62,"post_count":438},{"id":8493,"username":"PJH","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/pjh/{size}/2.png","time_read":"3d","likes_received":458,"likes_given":96,"topics_entered":1219,"topic_count":74,"post_count":318},{"id":8617,"username":"Mittineague","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/mittineague/{size}/2.png","time_read":"16d","likes_received":415,"likes_given":291,"topics_entered":6662,"topic_count":22,"post_count":757},{"id":10778,"username":"Lid","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lid/{size}/2.png","time_read":"8d","likes_received":398,"likes_given":296,"topics_entered":1771,"topic_count":82,"post_count":307},{"id":6548,"username":"michaeld","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/michaeld/{size}/2.png","time_read":"3d","likes_received":387,"likes_given":165,"topics_entered":1407,"topic_count":48,"post_count":330},{"id":471,"username":"BhaelOchon","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/bhaelochon/{size}/2.png","time_read":"22d","likes_received":386,"likes_given":765,"topics_entered":8051,"topic_count":55,"post_count":486},{"id":4881,"username":"gerhard","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/gerhard/{size}/2.png","time_read":"6d","likes_received":360,"likes_given":393,"topics_entered":3030,"topic_count":57,"post_count":250},{"id":5707,"username":"trident","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/trident/{size}/2.png","time_read":"6d","likes_received":344,"likes_given":181,"topics_entered":4905,"topic_count":2,"post_count":549},{"id":3987,"username":"Sander78","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sander78/{size}/2.png","time_read":"3d","likes_received":326,"likes_given":276,"topics_entered":3613,"topic_count":94,"post_count":392},{"id":3415,"username":"radq","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/radq/{size}/2.png","time_read":"3d","likes_received":299,"likes_given":110,"topics_entered":2503,"topic_count":16,"post_count":157},{"id":2989,"username":"meglio","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/meglio/{size}/2.png","time_read":"3d","likes_received":280,"likes_given":436,"topics_entered":1086,"topic_count":198,"post_count":458},{"id":4,"username":"stienman","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/stienman/{size}/2.png","time_read":"15d","likes_received":276,"likes_given":100,"topics_entered":291,"topic_count":13,"post_count":132},{"id":10855,"username":"abarker","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/abarker/{size}/2.png","time_read":"1d","likes_received":270,"likes_given":131,"topics_entered":703,"topic_count":14,"post_count":77},{"id":9653,"username":"TechnoBear","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/technobear/{size}/2.png","time_read":"4d","likes_received":263,"likes_given":507,"topics_entered":2931,"topic_count":51,"post_count":220},{"id":7948,"username":"probus","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/probus/{size}/2.png","time_read":"6d","likes_received":261,"likes_given":71,"topics_entered":2399,"topic_count":51,"post_count":206},{"id":9741,"username":"chapel","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/chapel/{size}/2.png","time_read":"2d","likes_received":239,"likes_given":169,"topics_entered":1228,"topic_count":11,"post_count":167},{"id":8810,"username":"fantasticfears","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/fantasticfears/{size}/2.png","time_read":"4d","likes_received":213,"likes_given":184,"topics_entered":2161,"topic_count":29,"post_count":227},{"id":38,"username":"frandallfarmer","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/frandallfarmer/{size}/2.png","time_read":"19d","likes_received":212,"likes_given":104,"topics_entered":3169,"topic_count":6,"post_count":114},{"id":8085,"username":"watchmanmonitor","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/watchmanmonitor/{size}/2.png","time_read":"2d","likes_received":202,"likes_given":654,"topics_entered":1453,"topic_count":73,"post_count":278},{"id":8909,"username":"AdamCapriola","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/adamcapriola/{size}/2.png","time_read":"3d","likes_received":200,"likes_given":179,"topics_entered":1689,"topic_count":49,"post_count":169},{"id":14,"username":"clay","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/clay/{size}/2.png","time_read":"14d","likes_received":183,"likes_given":103,"topics_entered":780,"topic_count":24,"post_count":97},{"id":6613,"username":"haiku","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/haiku/{size}/2.png","time_read":"3d","likes_received":183,"likes_given":308,"topics_entered":1919,"topic_count":33,"post_count":188},{"id":13132,"username":"purldator","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/purldator/{size}/2.png","time_read":"4d","likes_received":178,"likes_given":685,"topics_entered":1891,"topic_count":20,"post_count":299},{"id":810,"username":"ChrisHanel","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/chrishanel/{size}/2.png","time_read":"16d","likes_received":169,"likes_given":42,"topics_entered":639,"topic_count":9,"post_count":94},{"id":2625,"username":"kpfleming","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/kpfleming/{size}/2.png","time_read":"10d","likes_received":165,"likes_given":288,"topics_entered":2539,"topic_count":15,"post_count":233},{"id":7717,"username":"lake54","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lake54/{size}/2.png","time_read":"2d","likes_received":148,"likes_given":440,"topics_entered":1604,"topic_count":33,"post_count":194},{"id":8018,"username":"shivermetimbers","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/shivermetimbers/{size}/2.png","time_read":"15h","likes_received":139,"likes_given":40,"topics_entered":185,"topic_count":30,"post_count":181},{"id":2316,"username":"pakl","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/pakl/{size}/2.png","time_read":"14d","likes_received":135,"likes_given":198,"topics_entered":1034,"topic_count":46,"post_count":130},{"id":3681,"username":"Ajarn","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/ajarn/{size}/2.png","time_read":"3d","likes_received":126,"likes_given":664,"topics_entered":1893,"topic_count":46,"post_count":291},{"id":7229,"username":"DavidGNavas","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/davidgnavas/{size}/2.png","time_read":"4d","likes_received":124,"likes_given":210,"topics_entered":2032,"topic_count":17,"post_count":60},{"id":3062,"username":"Sailsman63","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sailsman63/{size}/2.png","time_read":"8d","likes_received":124,"likes_given":139,"topics_entered":4257,"topic_count":10,"post_count":146}],"total_rows_directory_items":12546,"load_more_directory_items":"/directory_items?id=all&order=likes_received&page=1"}
+};
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 06ebebbd7..cc51c3db0 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -7,6 +7,10 @@ function parsePostData(query) {
return result;
}
+function clone(obj) {
+ return JSON.parse(JSON.stringify(obj));
+}
+
function response(code, obj) {
if (typeof code === "object") {
obj = code;
@@ -24,6 +28,11 @@ const _widgets = [
{id: 124, name: 'Evil Repellant'}
];
+const _moreWidgets = [
+ {id: 223, name: 'Bass Lure'},
+ {id: 224, name: 'Good Repellant'}
+];
+
export default function() {
const server = new Pretender(function() {
@@ -101,12 +110,23 @@ export default function() {
this.put('/widgets/:widget_id', function(request) {
const w = _widgets.findBy('id', parseInt(request.params.widget_id));
- const cloned = JSON.parse(JSON.stringify(w));
- return response({ widget: cloned });
+ return response({ widget: clone(w) });
});
- this.get('/widgets', function() {
- return response({ widgets: _widgets });
+ this.get('/widgets', function(request) {
+ let result = _widgets;
+
+ const qp = request.queryParams;
+ if (qp) {
+ if (qp.name) { result = result.filterBy('name', qp.name); }
+ if (qp.id) { result = result.filterBy('id', parseInt(qp.id)); }
+ }
+
+ return response({ widgets: result, total_rows_widgets: 4, load_more_widgets: '/load-more-widgets' });
+ });
+
+ this.get('/load-more-widgets', function() {
+ return response({ widgets: _moreWidgets, total_rows_widgets: 4, load_more_widgets: '/load-more-widgets' });
});
this.delete('/widgets/:widget_id', success);
diff --git a/test/javascripts/integration/directory-test.js.es6 b/test/javascripts/integration/directory-test.js.es6
new file mode 100644
index 000000000..84c3c3007
--- /dev/null
+++ b/test/javascripts/integration/directory-test.js.es6
@@ -0,0 +1,8 @@
+integration("User Directory");
+
+test("Visit Page", function() {
+ visit("/directory/all");
+ andThen(function() {
+ ok(exists('.directory table tr'), "has a list of users");
+ });
+});
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js.es6
new file mode 100644
index 000000000..7ce1f4ebf
--- /dev/null
+++ b/test/javascripts/models/result-set-test.js.es6
@@ -0,0 +1,28 @@
+module('result-set');
+
+import ResultSet from 'discourse/models/result-set';
+import createStore from 'helpers/create-store';
+
+test('defaults', function() {
+ const rs = ResultSet.create({ content: [] });
+ equal(rs.get('length'), 0);
+ equal(rs.get('totalRows'), 0);
+ ok(!rs.get('loadMoreUrl'));
+ ok(!rs.get('loading'));
+ ok(!rs.get('loadingMore'));
+});
+
+test('pagination support', function() {
+ const store = createStore();
+ store.findAll('widget').then(function(rs) {
+ equal(rs.get('length'), 2);
+ equal(rs.get('totalRows'), 4);
+ ok(rs.get('loadMoreUrl'), 'has a url to load more');
+
+ rs.loadMore().then(function() {
+ equal(rs.get('length'), 4);
+ ok(!rs.get('loadMoreUrl'));
+ });
+ });
+
+});
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6
index 20f5cce30..d9e68fc78 100644
--- a/test/javascripts/models/store-test.js.es6
+++ b/test/javascripts/models/store-test.js.es6
@@ -19,7 +19,20 @@ test('find', function() {
store.find('widget', 123).then(function(w2) {
equal(w, w2);
});
+ });
+});
+test('find with object id', function() {
+ const store = createStore();
+ store.find('widget', {id: 123}).then(function(w) {
+ equal(w.get('firstObject.name'), 'Trout Lure');
+ });
+});
+
+test('find with query param', function() {
+ const store = createStore();
+ store.find('widget', {name: 'Trout Lure'}).then(function(w) {
+ equal(w.get('firstObject.id'), 123);
});
});
@@ -33,7 +46,7 @@ test('update', function() {
test('findAll', function() {
const store = createStore();
store.findAll('widget').then(function(result) {
- equal(result.length, 2);
+ equal(result.get('length'), 2);
const w = result.findBy('id', 124);
equal(w.get('name'), 'Evil Repellant');
});