- {{notification-item notification=n scope=n.scope}}
+ {{notification-item notification=n}}
{{format-date n.created_at leaveAgo="true"}}
@@ -24,7 +24,7 @@
{{/each}}
{{#conditional-loading-spinner condition=loading}}
- {{#unless canLoadMore}}
+ {{#unless model.canLoadMore}}
{{#if showDismissButton}}
{{i18n 'user.dismiss_notifications'}}
diff --git a/app/assets/javascripts/discourse/views/user-notification-history.js.es6 b/app/assets/javascripts/discourse/views/user-notifications.js.es6
similarity index 61%
rename from app/assets/javascripts/discourse/views/user-notification-history.js.es6
rename to app/assets/javascripts/discourse/views/user-notifications.js.es6
index 90dfc8e401e..c6741020445 100644
--- a/app/assets/javascripts/discourse/views/user-notification-history.js.es6
+++ b/app/assets/javascripts/discourse/views/user-notifications.js.es6
@@ -2,6 +2,5 @@ import LoadMore from "discourse/mixins/load-more";
export default Ember.View.extend(LoadMore, {
eyelineSelector: '.user-stream .notification',
- classNames: ['user-stream', 'notification-history'],
- templateName: 'user/notifications'
+ classNames: ['user-stream', 'notification-history']
});
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 7325fc8fac6..6a42a5bc673 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -1,56 +1,51 @@
+require_dependency 'notification_serializer'
+
class NotificationsController < ApplicationController
before_filter :ensure_logged_in
- def recent
- notifications = Notification.recent_report(current_user, 10)
+ def index
+ user = current_user
+ if params[:recent].present?
+ notifications = Notification.recent_report(current_user, 10)
- if notifications.present?
- # ordering can be off due to PMs
- max_id = notifications.map(&:id).max
- current_user.saw_notification_id(max_id) unless params.has_key?(:silent)
+ if notifications.present?
+ # ordering can be off due to PMs
+ max_id = notifications.map(&:id).max
+ current_user.saw_notification_id(max_id) unless params.has_key?(:silent)
+ end
+ current_user.reload
+ current_user.publish_notifications_state
+
+ render_serialized(notifications, NotificationSerializer, root: :notifications)
+ else
+ offset = params[:offset].to_i
+ user = User.find_by_username(params[:username].to_s) if params[:username]
+
+ guardian.ensure_can_see_notifications!(user)
+
+ notifications = Notification.where(user_id: user.id)
+ .visible
+ .includes(:topic)
+ .order(created_at: :desc)
+
+ total_rows = notifications.dup.count
+ notifications = notifications.offset(offset).limit(60)
+ render_json_dump(notifications: serialize_data(notifications, NotificationSerializer),
+ total_rows_notifications: total_rows,
+ load_more_notifications: notifications_path(username: user.username, offset: offset + 60))
end
- current_user.reload
- current_user.publish_notifications_state
- render_serialized(notifications, NotificationSerializer)
end
- def history
- params.permit(:before, :user)
- params[:before] ||= 1.day.from_now
-
- user = current_user
- user = User.find_by_username(params[:user].to_s) if params[:user]
-
- unless guardian.can_see_notifications?(user)
- return render json: {errors: [I18n.t('js.errors.reasons.forbidden')]}, status: 403
- end
-
- notifications = Notification.where(user_id: user.id)
- .visible
- .includes(:topic)
- .limit(60)
- .where('created_at < ?', params[:before])
- .order(created_at: :desc)
-
- render_serialized(notifications, NotificationSerializer)
- end
-
- def reset_new
- params.permit(:user)
-
- user = current_user
- if params[:user]
- user = User.find_by_username(params[:user].to_s)
- end
-
- Notification.where(user_id: user.id).includes(:topic).where(read: false).update_all(read: true)
+ def mark_read
+ Notification.where(user_id: current_user.id).includes(:topic).where(read: false).update_all(read: true)
current_user.saw_notification_id(Notification.recent_report(current_user, 1).max)
current_user.reload
current_user.publish_notifications_state
- render nothing: true
+ render json: success_json
end
+
end
diff --git a/app/serializers/notification_serializer.rb b/app/serializers/notification_serializer.rb
index 50d0b1ef7b7..28d92f19c5c 100644
--- a/app/serializers/notification_serializer.rb
+++ b/app/serializers/notification_serializer.rb
@@ -1,6 +1,7 @@
class NotificationSerializer < ApplicationSerializer
- attributes :notification_type,
+ attributes :id,
+ :notification_type,
:read,
:created_at,
:post_number,
diff --git a/config/routes.rb b/config/routes.rb
index 28254886624..7fe30be8f6c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -329,9 +329,8 @@ Discourse::Application.routes.draw do
end
end
- get "notifications" => "notifications#recent"
- get "notifications/history" => "notifications#history"
- put "notifications/reset-new" => 'notifications#reset_new'
+ get 'notifications' => 'notifications#index'
+ put 'notifications/mark-read' => 'notifications#mark_read'
match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete", via: [:get, :post]
match "/auth/failure", to: "users/omniauth_callbacks#failure", via: [:get, :post]
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index cb9771447d0..175aea63b6a 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -6,17 +6,17 @@ describe NotificationsController do
let!(:user) { log_in }
it 'should succeed for recent' do
- xhr :get, :recent
+ xhr :get, :index, recent: true
expect(response).to be_success
end
it 'should succeed for history' do
- xhr :get, :history
+ xhr :get, :index
expect(response).to be_success
end
- it 'should succeed for history' do
- xhr :get, :reset_new
+ it 'should succeed' do
+ xhr :put, :mark_read
expect(response).to be_success
end
@@ -24,7 +24,7 @@ describe NotificationsController do
notification = Fabricate(:notification, user: user)
expect(user.reload.unread_notifications).to eq(1)
expect(user.reload.total_unread_notifications).to eq(1)
- xhr :get, :recent
+ xhr :get, :index, recent: true
expect(user.reload.unread_notifications).to eq(0)
expect(user.reload.total_unread_notifications).to eq(1)
end
@@ -33,7 +33,7 @@ describe NotificationsController do
notification = Fabricate(:notification, user: user)
expect(user.reload.unread_notifications).to eq(1)
expect(user.reload.total_unread_notifications).to eq(1)
- xhr :get, :recent, silent: true
+ xhr :get, :index, recent: true, silent: true
expect(user.reload.unread_notifications).to eq(1)
expect(user.reload.total_unread_notifications).to eq(1)
end
@@ -42,7 +42,7 @@ describe NotificationsController do
notification = Fabricate(:notification, user: user)
expect(user.reload.unread_notifications).to eq(1)
expect(user.reload.total_unread_notifications).to eq(1)
- xhr :put, :reset_new
+ xhr :put, :mark_read
user.reload
expect(user.reload.unread_notifications).to eq(0)
expect(user.reload.total_unread_notifications).to eq(0)
@@ -51,7 +51,7 @@ describe NotificationsController do
context 'when not logged in' do
it 'should raise an error' do
- expect { xhr :get, :recent }.to raise_error(Discourse::NotLoggedIn)
+ expect { xhr :get, :index, recent: true }.to raise_error(Discourse::NotLoggedIn)
end
end
diff --git a/test/javascripts/controllers/header-test.js.es6 b/test/javascripts/controllers/header-test.js.es6
deleted file mode 100644
index 4b82269b7f6..00000000000
--- a/test/javascripts/controllers/header-test.js.es6
+++ /dev/null
@@ -1,33 +0,0 @@
-moduleFor("controller:header", "controller:header", {
- needs: ['controller:application']
-});
-
-test("showNotifications action", function() {
- let resolveRequestWith;
- const request = new Ember.RSVP.Promise(function(resolve) {
- resolveRequestWith = resolve;
- });
-
- const currentUser = Discourse.User.create({ unread_notifications: 1});
- const controller = this.subject({ currentUser: currentUser });
- const viewSpy = { showDropdownBySelector: sinon.spy() };
-
- sandbox.stub(Discourse, "ajax").withArgs("/notifications").returns(request);
-
- Ember.run(function() {
- controller.send("showNotifications", viewSpy);
- });
-
- equal(controller.get("notifications"), null, "notifications are null before data has finished loading");
- equal(currentUser.get("unread_notifications"), 1, "current user's unread notifications count is not zeroed before data has finished loading");
- ok(viewSpy.showDropdownBySelector.calledWith("#user-notifications"), "dropdown with loading glyph is shown before data has finished loading");
-
- Ember.run(function() {
- resolveRequestWith(["notification"]);
- });
-
- // Can't use deepEquals because controller.get("notifications") is an ArrayProxy, not an Array
- ok(controller.get("notifications").indexOf("notification") !== -1, "notification is in the controller");
- equal(currentUser.get("unread_notifications"), 0, "current user's unread notifications count is zeroed after data has finished loading");
- ok(viewSpy.showDropdownBySelector.calledWith("#user-notifications"), "dropdown with notifications is shown after data has finished loading");
-});
diff --git a/test/javascripts/controllers/notification-test.js.es6 b/test/javascripts/controllers/notification-test.js.es6
deleted file mode 100644
index e663eeda5d9..00000000000
--- a/test/javascripts/controllers/notification-test.js.es6
+++ /dev/null
@@ -1,56 +0,0 @@
-import Site from 'discourse/models/site';
-
-function buildFixture() {
- return {
- notification_type: 1, //mentioned
- post_number: 1,
- topic_id: 1234,
- slug: "a-slug",
- data: {
- topic_title: "some title",
- display_username: "velesin"
- },
- site: Site.current()
- };
-}
-
-moduleFor("controller:notification");
-
-test("scope property is correct", function() {
- const controller = this.subject(buildFixture());
- equal(controller.get("scope"), "notifications.mentioned");
-});
-
-test("username property is correct", function() {
- const controller = this.subject(buildFixture());
- equal(controller.get("username"), "velesin");
-});
-
-test("description property returns badge name when there is one", function() {
- const fixtureWithBadgeName = _.extend({}, buildFixture(), { data: { badge_name: "badge" } });
- const controller = this.subject(fixtureWithBadgeName);
- equal(controller.get("description"), "badge");
-});
-
-test("description property returns empty string when there is no topic title", function() {
- const fixtureWithEmptyTopicTitle = _.extend({}, buildFixture(), { data: { topic_title: "" } });
- const controller = this.subject(fixtureWithEmptyTopicTitle);
- equal(controller.get("description"), "");
-});
-
-test("description property returns topic title", function() {
- const fixtureWithTopicTitle = _.extend({}, buildFixture(), { data: { topic_title: "topic" } });
- const controller = this.subject(fixtureWithTopicTitle);
- equal(controller.get("description"), "topic");
-});
-
-test("url property returns badge's url when there is a badge", function() {
- const fixtureWithBadge = _.extend({}, buildFixture(), { data: { badge_id: 1, badge_name: "Badge Name"} });
- const controller = this.subject(fixtureWithBadge);
- equal(controller.get("url"), "/badges/1/badge-name");
-});
-
-test("url property returns topic's url when there is a topic", function() {
- const controller = this.subject(buildFixture());
- equal(controller.get("url"), "/t/a-slug/1234");
-});
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js.es6
index 40e4e6a2b64..22493d34ee2 100644
--- a/test/javascripts/fixtures/notification_fixtures.js.es6
+++ b/test/javascripts/fixtures/notification_fixtures.js.es6
@@ -1,2 +1,2 @@
/*jshint maxlen:10000000 */
-export default {"/notifications": [ { notification_type: 2, read: true, post_number: 2, topic_id: 1234, slug: "a-slug", data: { topic_title: "some title", display_username: "velesin" } } ] };
+export default {"/notifications": {notifications: [ { id: 123, notification_type: 2, read: true, post_number: 2, topic_id: 1234, slug: "a-slug", data: { topic_title: "some title", display_username: "velesin" } } ] }};
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6
index 182532b139d..6c81595723d 100644
--- a/test/javascripts/models/rest-model-test.js.es6
+++ b/test/javascripts/models/rest-model-test.js.es6
@@ -36,7 +36,7 @@ test('updating simultaneously', function() {
expect(2);
const store = createStore();
- store.find('widget', 123).then(function(widget) {
+ return store.find('widget', 123).then(function(widget) {
const firstPromise = widget.update({ name: 'new name' });
const secondPromise = widget.update({ name: 'new name' });
@@ -90,7 +90,7 @@ test('creating simultaneously', function() {
test('destroyRecord', function() {
const store = createStore();
- store.find('widget', 123).then(function(widget) {
+ return store.find('widget', 123).then(function(widget) {
widget.destroyRecord().then(function(result) {
ok(result);
});
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js.es6
index 2df92f5bd55..c846fd88720 100644
--- a/test/javascripts/models/result-set-test.js.es6
+++ b/test/javascripts/models/result-set-test.js.es6
@@ -20,6 +20,7 @@ test('pagination support', function() {
equal(rs.get('totalRows'), 4);
ok(rs.get('loadMoreUrl'), 'has a url to load more');
ok(!rs.get('loadingMore'), 'it is not loading more');
+ ok(rs.get('canLoadMore'));
const promise = rs.loadMore();
@@ -28,6 +29,7 @@ test('pagination support', function() {
ok(!rs.get('loadingMore'), 'it finished loading more');
equal(rs.get('length'), 4);
ok(!rs.get('loadMoreUrl'));
+ ok(!rs.get('canLoadMore'));
});
});
});