Skip to content

Fix results json #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manosim merged 5 commits into from
May 24, 2015
Merged

Fix results json #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb3f92d
Change group function to string
May 24, 2015
e992cd9
Initial state of notifications - null
May 24, 2015
7bebab2
Create arrays of grouped notifications
May 24, 2015
a31ede9
Render without using underscore
May 24, 2015
cc58e04
Show all repos
May 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/js/components/notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var Notifications = React.createClass({

getInitialState: function() {
return {
notifications: {},
notifications: [],
loading: true
};
},
Expand All @@ -36,14 +36,7 @@ var Notifications = React.createClass({
var wrapperClass = 'container-fluid main-container notifications';
var self = this;

if (!_.isEmpty(this.state.notifications)) {
notifications = (
_.map(this.state.notifications, function(repo, i) {
var repoFullName = repo[0].repository.full_name;
return <Repository repo={repo} repoName={repoFullName} key={i} />;
})
);
} else {
if (_.isEmpty(this.state.notifications)) {
wrapperClass += ' all-read';
notifications = (
<div>
Expand All @@ -52,6 +45,14 @@ var Notifications = React.createClass({
<img className='img-responsive emoji' src='images/rocket.png' />
</div>
);
} else {
notifications = (
this.state.notifications.map(function(obj, i) {
console.log(obj);
var repoFullName = obj[0].repository.full_name;
return <Repository repo={obj} repoName={repoFullName} key={repoFullName} />;
})
);
}

return (
Expand Down
14 changes: 5 additions & 9 deletions src/js/components/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,17 @@ var Repository = React.createClass({
},

render: function () {
var notifications = (
_.map(this.props.repo, function(notification, i) {
return (
<SingleNotification notification={notification} key={i} />
);
})
);

return (
<div>
<div className='row repository'>
<div className='col-xs-2'><img className='avatar' src={this.getAvatar()} /></div>
<div className='col-xs-10 name' onClick={this.openBrowser}>{this.props.repoName}</div>
</div>
{notifications}

{this.props.repo.map(function(obj, i) {
return <SingleNotification notification={obj} key={obj.id} />;
})}

</div>
);
}
Expand Down
13 changes: 9 additions & 4 deletions src/js/stores/notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var NotificationsStore = Reflux.createStore({
listenables: Actions,

init: function () {
this._notifications = undefined;
this._notifications = [];
},

updateTrayIcon: function (notifications) {
Expand Down Expand Up @@ -41,11 +41,16 @@ var NotificationsStore = Reflux.createStore({

onGetNotificationsCompleted: function (notifications) {
var groupedNotifications = _.groupBy(notifications, function(object){
return object.repository.name;
return object.repository.full_name;
});

this._notifications = groupedNotifications;
this.trigger(groupedNotifications);
var array= [];
_.map(groupedNotifications, function(obj, i) {
array.push(obj);
});

this._notifications = array;
this.trigger(this._notifications);
},

onGetNotificationsFailed: function (error) {
Expand Down