summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/access_history_modal.jsx100
-rw-r--r--web/react/components/activity_log_modal.jsx116
-rw-r--r--web/react/components/create_comment.jsx65
-rw-r--r--web/react/components/create_post.jsx101
-rw-r--r--web/react/components/navbar.jsx2
-rw-r--r--web/react/components/post.jsx2
-rw-r--r--web/react/components/post_list.jsx35
-rw-r--r--web/react/components/post_right.jsx3
-rw-r--r--web/react/components/sidebar_header.jsx4
-rw-r--r--web/react/components/user_settings.jsx172
-rw-r--r--web/react/components/user_settings_modal.jsx2
11 files changed, 418 insertions, 184 deletions
diff --git a/web/react/components/access_history_modal.jsx b/web/react/components/access_history_modal.jsx
new file mode 100644
index 000000000..b23b3213f
--- /dev/null
+++ b/web/react/components/access_history_modal.jsx
@@ -0,0 +1,100 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var UserStore = require('../stores/user_store.jsx');
+var AsyncClient = require('../utils/async_client.jsx');
+var Utils = require('../utils/utils.jsx');
+
+function getStateFromStoresForAudits() {
+ return {
+ audits: UserStore.getAudits()
+ };
+}
+
+module.exports = React.createClass({
+ componentDidMount: function() {
+ UserStore.addAuditsChangeListener(this._onChange);
+ AsyncClient.getAudits();
+
+ var self = this;
+ $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) {
+ self.setState({ moreInfo: [] });
+ });
+ },
+ componentWillUnmount: function() {
+ UserStore.removeAuditsChangeListener(this._onChange);
+ },
+ _onChange: function() {
+ this.setState(getStateFromStoresForAudits());
+ },
+ handleMoreInfo: function(index) {
+ var newMoreInfo = this.state.moreInfo;
+ newMoreInfo[index] = true;
+ this.setState({ moreInfo: newMoreInfo });
+ },
+ getInitialState: function() {
+ var initialState = getStateFromStoresForAudits();
+ initialState.moreInfo = [];
+ return initialState;
+ },
+ render: function() {
+ var accessList = [];
+ var currentHistoryDate = null;
+
+ for (var i = 0; i < this.state.audits.length; i++) {
+ var currentAudit = this.state.audits[i];
+ var newHistoryDate = new Date(currentAudit.create_at);
+ var newDate = null;
+
+ if (!currentHistoryDate || currentHistoryDate.toLocaleDateString() !== newHistoryDate.toLocaleDateString()) {
+ currentHistoryDate = newHistoryDate;
+ newDate = (<div> {currentHistoryDate.toDateString()} </div>);
+ }
+
+ accessList[i] = (
+ <div className="access-history__table">
+ <div className="access__date">{newDate}</div>
+ <div className="access__report">
+ <div className="report__time">{newHistoryDate.toLocaleTimeString(navigator.language, {hour: '2-digit', minute:'2-digit'})}</div>
+ <div className="report__info">
+ <div>{"IP: " + currentAudit.ip_address}</div>
+ { this.state.moreInfo[i] ?
+ <div>
+ <div>{"Session ID: " + currentAudit.session_id}</div>
+ <div>{"URL: " + currentAudit.action.replace("/api/v1", "")}</div>
+ </div>
+ :
+ <a href="#" onClick={this.handleMoreInfo.bind(this, i)}>More info</a>
+ }
+ </div>
+ {i < this.state.audits.length - 1 ?
+ <div className="divider-light"/>
+ :
+ null
+ }
+ </div>
+ </div>
+ );
+ }
+
+ return (
+ <div>
+ <div className="modal fade" ref="modal" id="access-history" tabIndex="-1" role="dialog" aria-hidden="true">
+ <div className="modal-dialog modal-lg">
+ <div className="modal-content">
+ <div className="modal-header">
+ <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 className="modal-title" id="myModalLabel">Access History</h4>
+ </div>
+ <div ref="modalBody" className="modal-body">
+ <form role="form">
+ { accessList }
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
new file mode 100644
index 000000000..d6f8f40eb
--- /dev/null
+++ b/web/react/components/activity_log_modal.jsx
@@ -0,0 +1,116 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var UserStore = require('../stores/user_store.jsx');
+var Client = require('../utils/client.jsx');
+var AsyncClient = require('../utils/async_client.jsx');
+
+function getStateFromStoresForSessions() {
+ return {
+ sessions: UserStore.getSessions(),
+ server_error: null,
+ client_error: null
+ };
+}
+
+module.exports = React.createClass({
+ submitRevoke: function(altId) {
+ var self = this;
+ Client.revokeSession(altId,
+ function(data) {
+ AsyncClient.getSessions();
+ }.bind(this),
+ function(err) {
+ state = getStateFromStoresForSessions();
+ state.server_error = err;
+ this.setState(state);
+ }.bind(this)
+ );
+ },
+ componentDidMount: function() {
+ UserStore.addSessionsChangeListener(this._onChange);
+ AsyncClient.getSessions();
+
+ var self = this;
+ $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) {
+ self.setState({ moreInfo: [] });
+ });
+ },
+ componentWillUnmount: function() {
+ UserStore.removeSessionsChangeListener(this._onChange);
+ },
+ _onChange: function() {
+ this.setState(getStateFromStoresForSessions());
+ },
+ handleMoreInfo: function(index) {
+ var newMoreInfo = this.state.moreInfo;
+ newMoreInfo[index] = true;
+ this.setState({ moreInfo: newMoreInfo });
+ },
+ getInitialState: function() {
+ var initialState = getStateFromStoresForSessions();
+ initialState.moreInfo = [];
+ return initialState;
+ },
+ render: function() {
+ var activityList = [];
+ var server_error = this.state.server_error ? this.state.server_error : null;
+
+ for (var i = 0; i < this.state.sessions.length; i++) {
+ var currentSession = this.state.sessions[i];
+ var lastAccessTime = new Date(currentSession.last_activity_at);
+ var firstAccessTime = new Date(currentSession.create_at);
+ var devicePicture = "";
+
+ if (currentSession.props.platform === "Windows") {
+ devicePicture = "fa fa-windows";
+ }
+ else if (currentSession.props.platform === "Macintosh" || currentSession.props.platform === "iPhone") {
+ devicePicture = "fa fa-apple";
+ }
+
+ activityList[i] = (
+ <div className="activity-log__table">
+ <div className="activity-log__report">
+ <div className="report__platform"><i className={devicePicture} />{currentSession.props.platform}</div>
+ <div className="report__info">
+ <div>{"Last activity: " + lastAccessTime.toDateString() + ", " + lastAccessTime.toLocaleTimeString()}</div>
+ { this.state.moreInfo[i] ?
+ <div>
+ <div>{"First time active: " + firstAccessTime.toDateString() + ", " + lastAccessTime.toLocaleTimeString()}</div>
+ <div>{"OS: " + currentSession.props.os}</div>
+ <div>{"Browser: " + currentSession.props.browser}</div>
+ <div>{"Session ID: " + currentSession.alt_id}</div>
+ </div>
+ :
+ <a href="#" onClick={this.handleMoreInfo.bind(this, i)}>More info</a>
+ }
+ </div>
+ </div>
+ <div className="activity-log__action"><button onClick={this.submitRevoke.bind(this, currentSession.alt_id)} className="btn btn-primary">Logout</button></div>
+ </div>
+ );
+ }
+
+ return (
+ <div>
+ <div className="modal fade" ref="modal" id="activity-log" tabIndex="-1" role="dialog" aria-hidden="true">
+ <div className="modal-dialog modal-lg">
+ <div className="modal-content">
+ <div className="modal-header">
+ <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 className="modal-title" id="myModalLabel">Active Devices</h4>
+ </div>
+ <div ref="modalBody" className="modal-body">
+ <form role="form">
+ { activityList }
+ </form>
+ { server_error }
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 6ed0f0b34..3f8e9ed2e 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -5,6 +5,7 @@ var client = require('../utils/client.jsx');
var AsyncClient =require('../utils/async_client.jsx');
var SocketStore = require('../stores/socket_store.jsx');
var ChannelStore = require('../stores/channel_store.jsx');
+var PostStore = require('../stores/post_store.jsx');
var Textbox = require('./textbox.jsx');
var MsgTyping = require('./msg_typing.jsx');
var FileUpload = require('./file_upload.jsx');
@@ -43,6 +44,7 @@ module.exports = React.createClass({
client.createPost(post, ChannelStore.getCurrent(),
function(data) {
+ PostStore.storeCommentDraft(this.props.rootId, null);
this.setState({ messageText: '', submitting: false, post_error: null, server_error: null });
this.clearPreviews();
AsyncClient.getPosts(true, this.props.channelId);
@@ -82,16 +84,33 @@ module.exports = React.createClass({
}
},
handleUserInput: function(messageText) {
+ var draft = PostStore.getCommentDraft(this.props.rootId);
+ if (!draft) {
+ draft = { previews: [], uploadsInProgress: 0};
+ }
+ draft.message = messageText;
+ PostStore.storeCommentDraft(this.props.rootId, draft);
+
$(".post-right__scroll").scrollTop($(".post-right__scroll")[0].scrollHeight);
$(".post-right__scroll").perfectScrollbar('update');
this.setState({messageText: messageText});
},
handleFileUpload: function(newPreviews) {
+ var draft = PostStore.getCommentDraft(this.props.rootId);
+ if (!draft) {
+ draft = { message: '', uploadsInProgress: 0, previews: []}
+ }
+
$(".post-right__scroll").scrollTop($(".post-right__scroll")[0].scrollHeight);
$(".post-right__scroll").perfectScrollbar('update');
- var oldPreviews = this.state.previews;
+ var previews = this.state.previews.concat(newPreviews);
var num = this.state.uploadsInProgress;
- this.setState({previews: oldPreviews.concat(newPreviews), uploadsInProgress:num-1});
+
+ draft.previews = previews;
+ draft.uploadsInProgress = num-1;
+ PostStore.storeCommentDraft(this.props.rootId, draft);
+
+ this.setState({previews: previews, uploadsInProgress: num-1});
},
handleUploadError: function(err) {
this.setState({ server_error: err });
@@ -107,10 +126,43 @@ module.exports = React.createClass({
break;
}
}
+
+ var draft = PostStore.getCommentDraft();
+ if (!draft) {
+ draft = { message: '', uploadsInProgress: 0};
+ }
+ draft.previews = previews;
+ PostStore.storeCommentDraft(draft);
+
this.setState({previews: previews});
},
getInitialState: function() {
- return { messageText: '', uploadsInProgress: 0, previews: [], submitting: false };
+ PostStore.clearCommentDraftUploads();
+
+ var draft = PostStore.getCommentDraft(this.props.rootId);
+ messageText = '';
+ uploadsInProgress = 0;
+ previews = [];
+ if (draft) {
+ messageText = draft.message;
+ uploadsInProgress = draft.uploadsInProgress;
+ previews = draft.previews
+ }
+ return { messageText: messageText, uploadsInProgress: uploadsInProgress, previews: previews, submitting: false };
+ },
+ componentWillReceiveProps: function(newProps) {
+ if(newProps.rootId !== this.props.rootId) {
+ var draft = PostStore.getCommentDraft(newProps.rootId);
+ messageText = '';
+ uploadsInProgress = 0;
+ previews = [];
+ if (draft) {
+ messageText = draft.message;
+ uploadsInProgress = draft.uploadsInProgress;
+ previews = draft.previews
+ }
+ this.setState({ messageText: messageText, uploadsInProgress: uploadsInProgress, previews: previews });
+ }
},
setUploads: function(val) {
var oldInProgress = this.state.uploadsInProgress
@@ -126,6 +178,13 @@ module.exports = React.createClass({
var numToUpload = newInProgress - oldInProgress;
if (numToUpload <= 0) return 0;
+ var draft = PostStore.getCommentDraft(this.props.rootId);
+ if (!draft) {
+ draft = { message: '', previews: []};
+ }
+ draft.uploadsInProgress = newInProgress;
+ PostStore.storeCommentDraft(this.props.rootId, draft);
+
this.setState({uploadsInProgress: newInProgress});
return numToUpload;
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index d38a6798f..91d070958 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -31,6 +31,11 @@ module.exports = React.createClass({
post.message = this.state.messageText;
+ // if this is a reply, trim off any carets from the beginning of a message
+ if (this.state.rootId && post.message.startsWith("^")) {
+ post.message = post.message.replace(/^\^+\s*/g, "");
+ }
+
if (post.message.trim().length === 0 && this.state.previews.length === 0) {
return;
}
@@ -50,7 +55,7 @@ module.exports = React.createClass({
post.message,
false,
function(data) {
- PostStore.storeDraft(data.channel_id, user_id, null);
+ PostStore.storeDraft(data.channel_id, null);
this.setState({ messageText: '', submitting: false, post_error: null, previews: [], server_error: null, limit_error: null });
if (data.goto_location.length > 0) {
@@ -68,9 +73,12 @@ module.exports = React.createClass({
post.channel_id = this.state.channel_id;
post.filenames = this.state.previews;
+ post.root_id = this.state.rootId;
+ post.parent_id = this.state.parentId;
+
client.createPost(post, ChannelStore.getCurrent(),
function(data) {
- PostStore.storeDraft(data.channel_id, data.user_id, null);
+ PostStore.storeDraft(data.channel_id, null);
this.setState({ messageText: '', submitting: false, post_error: null, previews: [], server_error: null, limit_error: null });
this.resizePostHolder();
AsyncClient.getPosts(true);
@@ -84,7 +92,13 @@ module.exports = React.createClass({
}.bind(this),
function(err) {
var state = {}
- state.server_error = err.message;
+
+ if (err.message === "Invalid RootId parameter") {
+ if ($('#post_deleted').length > 0) $('#post_deleted').modal('show');
+ } else {
+ state.server_error = err.message;
+ }
+
state.submitting = false;
this.setState(state);
}.bind(this)
@@ -92,6 +106,17 @@ module.exports = React.createClass({
}
$(".post-list-holder-by-time").perfectScrollbar('update');
+
+ if (this.state.rootId || this.state.parentId) {
+ this.setState({rootId: "", parentId: "", caretCount: 0});
+
+ // clear the active thread since we've now sent our message
+ AppDispatcher.handleViewAction({
+ type: ActionTypes.RECEIVED_ACTIVE_THREAD_CHANGED,
+ root_id: "",
+ parent_id: ""
+ });
+ }
},
componentDidUpdate: function() {
this.resizePostHolder();
@@ -112,6 +137,63 @@ module.exports = React.createClass({
handleUserInput: function(messageText) {
this.resizePostHolder();
this.setState({messageText: messageText});
+
+ // look to see if the message begins with any carets to indicate that it's a reply
+ var replyMatch = messageText.match(/^\^+/g);
+ if (replyMatch) {
+ // the number of carets indicates how many message threads back we're replying to
+ var caretCount = replyMatch[0].length;
+
+ // note that if someone else replies to this thread while a user is typing a reply, the message to which they're replying
+ // won't change unless they change the number of carets. this is probably the desired behaviour since we don't want the
+ // active message thread to change without the user noticing
+ if (caretCount != this.state.caretCount) {
+ this.setState({caretCount: caretCount});
+
+ var posts = PostStore.getCurrentPosts();
+
+ var rootId = "";
+
+ // find the nth most recent post that isn't a comment on another (ie it has no parent) where n is caretCount
+ for (var i = 0; i < posts.order.length; i++) {
+ var postId = posts.order[i];
+
+ if (posts.posts[postId].parent_id === "") {
+ caretCount -= 1;
+
+ if (caretCount < 1) {
+ rootId = postId;
+ break;
+ }
+ }
+ }
+
+ // only dispatch an event if something changed
+ if (rootId != this.state.rootId) {
+ // set the parent id to match the root id so that we're replying to the first post in the thread
+ var parentId = rootId;
+
+ // alert the post list so that it can display the active thread
+ AppDispatcher.handleViewAction({
+ type: ActionTypes.RECEIVED_ACTIVE_THREAD_CHANGED,
+ root_id: rootId,
+ parent_id: parentId
+ });
+ }
+ }
+ } else {
+ if (this.state.caretCount > 0) {
+ this.setState({caretCount: 0});
+
+ // clear the active thread since there no longer is one
+ AppDispatcher.handleViewAction({
+ type: ActionTypes.RECEIVED_ACTIVE_THREAD_CHANGED,
+ root_id: "",
+ parent_id: ""
+ });
+ }
+ }
+
var draft = PostStore.getCurrentDraft();
if (!draft) {
draft = {}
@@ -127,7 +209,7 @@ module.exports = React.createClass({
$(window).trigger('resize');
},
handleFileUpload: function(newPreviews, channel_id) {
- var draft = PostStore.getDraft(channel_id, UserStore.getCurrentId());
+ var draft = PostStore.getDraft(channel_id);
if (!draft) {
draft = {}
draft['message'] = '';
@@ -148,7 +230,7 @@ module.exports = React.createClass({
} else {
draft['previews'] = draft['previews'].concat(newPreviews);
draft['uploadsInProgress'] = draft['uploadsInProgress'] > 0 ? draft['uploadsInProgress'] - 1 : 0;
- PostStore.storeDraft(channel_id, UserStore.getCurrentId(), draft);
+ PostStore.storeDraft(channel_id, draft);
}
},
handleUploadError: function(err) {
@@ -174,10 +256,12 @@ module.exports = React.createClass({
},
componentDidMount: function() {
ChannelStore.addChangeListener(this._onChange);
+ PostStore.addActiveThreadChangedListener(this._onActiveThreadChanged);
this.resizePostHolder();
},
componentWillUnmount: function() {
ChannelStore.removeChangeListener(this._onChange);
+ PostStore.removeActiveThreadChangedListener(this._onActiveThreadChanged);
},
_onChange: function() {
var channel_id = ChannelStore.getCurrentId();
@@ -194,6 +278,11 @@ module.exports = React.createClass({
this.setState({ channel_id: channel_id, messageText: messageText, initialText: messageText, submitting: false, post_error: null, previews: previews, uploadsInProgress: uploadsInProgress });
}
},
+ _onActiveThreadChanged: function(rootId, parentId) {
+ // note that we register for our own events and set the state from there so we don't need to manually set
+ // our state and dispatch an event each time the active thread changes
+ this.setState({"rootId": rootId, "parentId": parentId});
+ },
getInitialState: function() {
PostStore.clearDraftUploads();
@@ -204,7 +293,7 @@ module.exports = React.createClass({
previews = draft['previews'];
messageText = draft['message'];
}
- return { channel_id: ChannelStore.getCurrentId(), messageText: messageText, uploadsInProgress: 0, previews: previews, submitting: false, initialText: messageText };
+ return { channel_id: ChannelStore.getCurrentId(), messageText: messageText, uploadsInProgress: 0, previews: previews, submitting: false, initialText: messageText, caretCount: 0 };
},
setUploads: function(val) {
var oldInProgress = this.state.uploadsInProgress
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 34c65c34f..500fabb0e 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -28,7 +28,7 @@ function getCountsStateFromStores() {
} else {
if (channelMember.mention_count > 0) {
count += channelMember.mention_count;
- } else if (channel.total_msg_count - channelMember.msg_count > 0) {
+ } else if (channelMember.notify_level !== "quiet" && channel.total_msg_count - channelMember.msg_count > 0) {
count += 1;
}
}
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index e72a2d001..e3586ecde 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -83,7 +83,7 @@ module.exports = React.createClass({
<img className="post-profile-img" src={"/api/v1/users/" + post.user_id + "/image?time=" + timestamp} height="36" width="36" />
</div>
: null }
- <div className="post__content">
+ <div className={"post__content" + (this.props.isActiveThread ? " active-thread__content" : "")}>
<PostHeader ref="header" post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} isLastComment={this.props.isLastComment} />
<PostBody post={post} sameRoot={this.props.sameRoot} parentPost={parentPost} posts={posts} handleCommentClick={this.handleCommentClick} />
<PostInfo ref="info" post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" />
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index a2b2ae03f..8dc5013ca 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -22,7 +22,8 @@ function getStateFromStores() {
return {
post_list: PostStore.getCurrentPosts(),
- channel: channel
+ channel: channel,
+ activeThreadRootId: ""
};
}
@@ -51,6 +52,7 @@ module.exports = React.createClass({
ChannelStore.addChangeListener(this._onChange);
UserStore.addStatusesChangeListener(this._onTimeChange);
SocketStore.addChangeListener(this._onSocketChange);
+ PostStore.addActiveThreadChangedListener(this._onActiveThreadChanged);
$(".post-list-holder-by-time").perfectScrollbar();
@@ -131,6 +133,7 @@ module.exports = React.createClass({
ChannelStore.removeChangeListener(this._onChange);
UserStore.removeStatusesChangeListener(this._onTimeChange);
SocketStore.removeChangeListener(this._onSocketChange);
+ PostStore.removeActiveThreadChangedListener(this._onActiveThreadChanged);
$('body').off('click.userpopover');
},
resize: function() {
@@ -229,6 +232,9 @@ module.exports = React.createClass({
this.refs[id].forceUpdateInfo();
}
},
+ _onActiveThreadChanged: function(rootId, parentId) {
+ this.setState({"activeThreadRootId": rootId});
+ },
getMorePosts: function(e) {
e.preventDefault();
@@ -348,8 +354,8 @@ module.exports = React.createClass({
if (ChannelStore.isDefault(channel)) {
more_messages = (
<div className="channel-intro">
- <h4 className="channel-intro-title">Welcome</h4>
- <p>
+ <h4 className="channel-intro__title">Beginning of {ui_name}</h4>
+ <p className="channel-intro__content">
Welcome to {ui_name}!
<br/><br/>
{"This is the first channel " + strings.Team + "mates see when they"}
@@ -366,27 +372,27 @@ module.exports = React.createClass({
} else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
more_messages = (
<div className="channel-intro">
- <h4 className="channel-intro-title">Welcome</h4>
- <p>
+ <h4 className="channel-intro__title">Beginning of {ui_name}</h4>
+ <p className="channel-intro__content">
{"This is the start of " + ui_name + ", a channel for conversations you’d prefer out of more focused channels."}
<br/>
- <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={ui_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
</p>
+ <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={ui_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
</div>
);
} else {
var ui_type = channel.type === 'P' ? "private group" : "channel";
more_messages = (
<div className="channel-intro">
- <h4 className="channel-intro-title">Welcome</h4>
- <p>
+ <h4 className="channel-intro__title">Beginning of {ui_name}</h4>
+ <p className="channel-intro__content">
{ creator_name != "" ? "This is the start of the " + ui_name + " " + ui_type + ", created by " + creator_name + " on " + utils.displayDate(channel.create_at) + "."
: "This is the start of the " + ui_name + " " + ui_type + ", created on "+ utils.displayDate(channel.create_at) + "." }
{ channel.type === 'P' ? " Only invited members can see this private group." : " Any member can join and read this channel." }
<br/>
- <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
- <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#channel_invite"><i className="fa fa-user-plus"></i>Invite others to this {ui_type}</a>
</p>
+ <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
+ <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#channel_invite"><i className="fa fa-user-plus"></i>Invite others to this {ui_type}</a>
</div>
);
}
@@ -420,7 +426,14 @@ module.exports = React.createClass({
// it is the last comment if it is last post in the channel or the next post has a different root post
var isLastComment = utils.isComment(post) && (i === 0 || posts[order[i-1]].root_id != post.root_id);
- var postCtl = <Post ref={post.id} sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
+ // check if this is part of the thread that we're currently replying to
+ var isActiveThread = this.state.activeThreadRootId && (post.id === this.state.activeThreadRootId || post.root_id === this.state.activeThreadRootId);
+
+ var postCtl = (
+ <Post ref={post.id} sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id}
+ posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} isActiveThread={isActiveThread}
+ />
+ );
currentPostDay = utils.getDateForUnixTicks(post.create_at);
if (currentPostDay.toDateString() != previousPostDay.toDateString()) {
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 7315266e6..93f5d91b0 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -293,6 +293,8 @@ module.exports = React.createClass({
});
},
componentDidUpdate: function() {
+ $(".post-right__scroll").scrollTop($(".post-right__scroll")[0].scrollHeight);
+ $(".post-right__scroll").perfectScrollbar('update');
this.resize();
},
componentWillUnmount: function() {
@@ -351,6 +353,7 @@ module.exports = React.createClass({
$(".post-right__scroll").css("height", height + "px");
$(".post-right__scroll").scrollTop(100000);
$(".post-right__scroll").perfectScrollbar();
+ $(".post-right__scroll").perfectScrollbar('update');
},
render: function() {
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index bab2897b6..7a7e92854 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -115,7 +115,11 @@ module.exports = React.createClass({
return (
<div className="team__header theme">
<a className="settings_link" href="#" data-toggle="modal" data-target="#user_settings1">
+ { me.last_picture_update ?
<img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
+ :
+ <div />
+ }
<div className="header__info">
<div className="user__name">{ '@' + me.username}</div>
<div className="team__name">{ teamDisplayName }</div>
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 59c97c309..ad890334e 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -5,6 +5,8 @@ var UserStore = require('../stores/user_store.jsx');
var SettingItemMin = require('./setting_item_min.jsx');
var SettingItemMax = require('./setting_item_max.jsx');
var SettingPicture = require('./setting_picture.jsx');
+var AccessHistoryModal = require('./access_history_modal.jsx');
+var ActivityLogModal = require('./activity_log_modal.jsx');
var client = require('../utils/client.jsx');
var AsyncClient = require('../utils/async_client.jsx');
var utils = require('../utils/utils.jsx');
@@ -443,149 +445,6 @@ var NotificationsTab = React.createClass({
}
});
-function getStateFromStoresForSessions() {
- return {
- sessions: UserStore.getSessions(),
- server_error: null,
- client_error: null
- };
-}
-
-var SessionsTab = React.createClass({
- submitRevoke: function(altId) {
- client.revokeSession(altId,
- function(data) {
- AsyncClient.getSessions();
- }.bind(this),
- function(err) {
- state = this.getStateFromStoresForSessions();
- state.server_error = err;
- this.setState(state);
- }.bind(this)
- );
- },
- componentDidMount: function() {
- UserStore.addSessionsChangeListener(this._onChange);
- AsyncClient.getSessions();
- },
- componentWillUnmount: function() {
- UserStore.removeSessionsChangeListener(this._onChange);
- },
- _onChange: function() {
- this.setState(getStateFromStoresForSessions());
- },
- getInitialState: function() {
- return getStateFromStoresForSessions();
- },
- render: function() {
- var server_error = this.state.server_error ? this.state.server_error : null;
-
- return (
- <div>
- <div className="modal-header">
- <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
- <h4 className="modal-title" ref="title"><i className="modal-back"></i>Sessions</h4>
- </div>
- <div className="user-settings">
- <h3 className="tab-header">Sessions</h3>
- <div className="divider-dark first"/>
- { server_error }
- <div className="table-responsive" style={{ maxWidth: "560px", maxHeight: "300px" }}>
- <table className="table-condensed small">
- <thead>
- <tr><th>Id</th><th>Platform</th><th>OS</th><th>Browser</th><th>Created</th><th>Last Activity</th><th>Revoke</th></tr>
- </thead>
- <tbody>
- {
- this.state.sessions.map(function(value, index) {
- return (
- <tr key={ "" + index }>
- <td style={{ whiteSpace: "nowrap" }}>{ value.alt_id }</td>
- <td style={{ whiteSpace: "nowrap" }}>{value.props.platform}</td>
- <td style={{ whiteSpace: "nowrap" }}>{value.props.os}</td>
- <td style={{ whiteSpace: "nowrap" }}>{value.props.browser}</td>
- <td style={{ whiteSpace: "nowrap" }}>{ new Date(value.create_at).toLocaleString() }</td>
- <td style={{ whiteSpace: "nowrap" }}>{ new Date(value.last_activity_at).toLocaleString() }</td>
- <td><button onClick={this.submitRevoke.bind(this, value.alt_id)} className="pull-right btn btn-primary">Revoke</button></td>
- </tr>
- );
- }, this)
- }
- </tbody>
- </table>
- </div>
- <div className="divider-dark"/>
- </div>
- </div>
- );
- }
-});
-
-function getStateFromStoresForAudits() {
- return {
- audits: UserStore.getAudits()
- };
-}
-
-var AuditTab = React.createClass({
- componentDidMount: function() {
- UserStore.addAuditsChangeListener(this._onChange);
- AsyncClient.getAudits();
- },
- componentWillUnmount: function() {
- UserStore.removeAuditsChangeListener(this._onChange);
- },
- _onChange: function() {
- this.setState(getStateFromStoresForAudits());
- },
- getInitialState: function() {
- return getStateFromStoresForAudits();
- },
- render: function() {
- return (
- <div>
- <div className="modal-header">
- <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
- <h4 className="modal-title" ref="title"><i className="modal-back"></i>Activity Log</h4>
- </div>
- <div className="user-settings">
- <h3 className="tab-header">Activity Log</h3>
- <div className="divider-dark first"/>
- <div className="table-responsive">
- <table className="table-condensed small">
- <thead>
- <tr>
- <th>Time</th>
- <th>Action</th>
- <th>IP Address</th>
- <th>Session</th>
- <th>Other Info</th>
- </tr>
- </thead>
- <tbody>
- {
- this.state.audits.map(function(value, index) {
- return (
- <tr key={ "" + index }>
- <td className="text-nowrap">{ new Date(value.create_at).toLocaleString() }</td>
- <td className="text-nowrap">{ value.action.replace("/api/v1", "") }</td>
- <td className="text-nowrap">{ value.ip_address }</td>
- <td className="text-nowrap">{ value.session_id }</td>
- <td className="text-nowrap">{ value.extra_info }</td>
- </tr>
- );
- }, this)
- }
- </tbody>
- </table>
- </div>
- <div className="divider-dark"/>
- </div>
- </div>
- );
- }
-});
-
var SecurityTab = React.createClass({
submitPassword: function(e) {
e.preventDefault();
@@ -637,6 +496,12 @@ var SecurityTab = React.createClass({
updateConfirmPassword: function(e) {
this.setState({ confirm_password: e.target.value });
},
+ handleHistoryOpen: function() {
+ $("#user_settings1").modal('hide');
+ },
+ handleDevicesOpen: function() {
+ $("#user_settings1").modal('hide');
+ },
getInitialState: function() {
return { current_password: '', new_password: '', confirm_password: '' };
},
@@ -711,6 +576,10 @@ var SecurityTab = React.createClass({
<div className="divider-dark first"/>
{ passwordSection }
<div className="divider-dark"/>
+ <br></br>
+ <a data-toggle="modal" className="security-links" data-target="#access-history" href="#" onClick={this.handleHistoryOpen}><i className="fa fa-clock-o"></i>View Access History</a>
+ <b> </b>
+ <a data-toggle="modal" className="security-links" data-target="#activity-log" href="#" onClick={this.handleDevicesOpen}><i className="fa fa-globe"></i>View and Logout of Active Devices</a>
</div>
</div>
);
@@ -1225,23 +1094,6 @@ module.exports = React.createClass({
<NotificationsTab user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
</div>
);
-
- /* Temporarily removing sessions and activity_log tabs
-
- } else if (this.props.activeTab === 'sessions') {
- return (
- <div>
- <SessionsTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
- </div>
- );
- } else if (this.props.activeTab === 'activity_log') {
- return (
- <div>
- <AuditTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
- </div>
- );
- */
-
} else if (this.props.activeTab === 'appearance') {
return (
<div>
diff --git a/web/react/components/user_settings_modal.jsx b/web/react/components/user_settings_modal.jsx
index 1761e575a..421027244 100644
--- a/web/react/components/user_settings_modal.jsx
+++ b/web/react/components/user_settings_modal.jsx
@@ -30,8 +30,6 @@ module.exports = React.createClass({
tabs.push({name: "security", ui_name: "Security", icon: "glyphicon glyphicon-lock"});
tabs.push({name: "notifications", ui_name: "Notifications", icon: "glyphicon glyphicon-exclamation-sign"});
tabs.push({name: "appearance", ui_name: "Appearance", icon: "glyphicon glyphicon-wrench"});
- //tabs.push({name: "sessions", ui_name: "Sessions", icon: "glyphicon glyphicon-globe"});
- //tabs.push({name: "activity_log", ui_name: "Activity Log", icon: "glyphicon glyphicon-time"});
return (
<div className="modal fade" ref="modal" id="user_settings1" role="dialog" aria-hidden="true">
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 10:01:23 +0000