Matrix Identity
diff --git a/scripts/deploy.py b/scripts/deploy.py
index e7ad3f78..e8fd9aa4 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -14,6 +14,7 @@ import subprocess
import sys
import tarfile
import shutil
+import glob
try:
# python3
@@ -66,7 +67,7 @@ class Deployer:
self.bundles_path = None
self.should_clean = False
# filename -> symlink path e.g 'config.localhost.json' => '../localhost/config.json'
- self.config_locations = {}
+ self.symlink_paths = {}
self.verify_signature = True
def deploy(self, tarball, extract_path):
@@ -98,11 +99,11 @@ class Deployer:
print ("Extracted into: %s" % extracted_dir)
- if self.config_locations:
- for config_filename, config_loc in self.config_locations.iteritems():
+ if self.symlink_paths:
+ for link_path, file_path in self.symlink_paths.iteritems():
create_relative_symlink(
- target=config_loc,
- linkname=os.path.join(extracted_dir, config_filename)
+ target=file_path,
+ linkname=os.path.join(extracted_dir, link_path)
)
if self.bundles_path:
@@ -165,9 +166,10 @@ if __name__ == "__main__":
)
)
parser.add_argument(
- "--config", nargs='?', default='./config.json', help=(
- "Write a symlink at config.json in the extracted tarball to this \
- location. (Default: '%(default)s')"
+ "--include", nargs='*', default='./config*.json', help=(
+ "Symlink these files into the root of the deployed tarball. \
+ Useful for config files and home pages. Supports glob syntax. \
+ (Default: '%(default)s')"
)
)
parser.add_argument(
@@ -182,8 +184,8 @@ if __name__ == "__main__":
deployer.packages_path = args.packages_dir
deployer.bundles_path = args.bundles_dir
deployer.should_clean = args.clean
- deployer.config_locations = {
- "config.json": args.config,
- }
+
+ for include in args.include:
+ deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
deployer.deploy(args.tarball, args.extract_path)
diff --git a/scripts/redeploy.py b/scripts/redeploy.py
index e10a48c0..2dac2931 100755
--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -15,6 +15,7 @@ import json, requests, tarfile, argparse, os, errno
import time
import traceback
from urlparse import urljoin
+import glob
from flask import Flask, jsonify, request, abort
@@ -188,15 +189,12 @@ if __name__ == "__main__":
)
)
- def _raise(ex):
- raise ex
-
- # --config config.json=../../config.json --config config.localhost.json=./localhost.json
+ # --include ../../config.json ./localhost.json homepages/*
parser.add_argument(
- "--config", action="append", dest="configs",
- type=lambda kv: kv.split("=", 1) if "=" in kv else _raise(Exception("Missing =")), help=(
- "A list of configs to symlink into the extracted tarball. \
- For example, --config config.json=../config.json config2.json=../test/config.json"
+ "--include", nargs='*', default='./config*.json', help=(
+ "Symlink these files into the root of the deployed tarball. \
+ Useful for config files and home pages. Supports glob syntax. \
+ (Default: '%(default)s')"
)
)
parser.add_argument(
@@ -220,7 +218,9 @@ if __name__ == "__main__":
deployer = Deployer()
deployer.bundles_path = args.bundles_dir
deployer.should_clean = args.clean
- deployer.config_locations = dict(args.configs) if args.configs else {}
+
+ for include in args.include:
+ deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
# we don't pgp-sign jenkins artifacts; instead we rely on HTTPS access to
@@ -234,13 +234,13 @@ if __name__ == "__main__":
deploy_tarball(args.tarball_uri, build_dir)
else:
print(
- "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Config locations: %s" %
+ "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Include files: %s" %
(args.port,
arg_extract_path,
" (clean after)" if deployer.should_clean else "",
arg_symlink,
arg_jenkins_url,
- deployer.config_locations,
+ deployer.symlink_paths,
)
)
app.run(host="0.0.0.0", port=args.port, debug=True)
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 9120de8c..f867cd32 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -1,5 +1,7 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2017 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,8 +16,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import React from 'react';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
import sdk from 'matrix-react-sdk';
@@ -26,26 +26,31 @@ import Analytics from 'matrix-react-sdk/lib/Analytics';
import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
import Modal from 'matrix-react-sdk/lib/Modal';
import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
+import { showGroupInviteDialog } from 'matrix-react-sdk/lib/GroupInvite';
module.exports = React.createClass({
displayName: 'RightPanel',
propTypes: {
- // TODO: This should not be a prop, it should be received from the RoomViewStore
+ // TODO: We're trying to move away from these being props, but we need to know
+ // whether we should be displaying a room or group member list
roomId: React.PropTypes.string, // if showing panels for a given room, this is set
+ groupId: React.PropTypes.string, // if showing panels for a given group, this is set
collapsed: React.PropTypes.bool, // currently unused property to request for a minimized view of the panel
},
Phase: {
- MemberList: 'MemberList',
+ RoomMemberList: 'RoomMemberList',
+ GroupMemberList: 'GroupMemberList',
FilePanel: 'FilePanel',
NotificationPanel: 'NotificationPanel',
- MemberInfo: 'MemberInfo',
+ RoomMemberInfo: 'RoomMemberInfo',
+ GroupMemberInfo: 'GroupMemberInfo',
},
componentWillMount: function() {
this.dispatcherRef = dis.register(this.onAction);
- var cli = MatrixClientPeg.get();
+ const cli = MatrixClientPeg.get();
cli.on("RoomState.members", this.onRoomStateMember);
},
@@ -57,14 +62,20 @@ module.exports = React.createClass({
},
getInitialState: function() {
- return {
- phase: this.Phase.MemberList
- };
+ if (this.props.groupId) {
+ return {
+ phase: this.Phase.GroupMemberList,
+ };
+ } else {
+ return {
+ phase: this.Phase.RoomMemberList,
+ };
+ }
},
onMemberListButtonClick: function() {
Analytics.trackEvent('Right Panel', 'Member List Button', 'click');
- this.setState({ phase: this.Phase.MemberList });
+ this.setState({ phase: this.Phase.RoomMemberList });
},
onFileListButtonClick: function() {
@@ -89,19 +100,23 @@ module.exports = React.createClass({
return;
}
- // call ChatInviteDialog
- dis.dispatch({
- action: 'view_invite',
- roomId: this.props.roomId,
- });
+ if (this.state.phase === this.Phase.GroupMemberList) {
+ showGroupInviteDialog(this.props.groupId);
+ } else {
+ // call AddressPickerDialog
+ dis.dispatch({
+ action: 'view_invite',
+ roomId: this.props.roomId,
+ });
+ }
},
onRoomStateMember: function(ev, state, member) {
// redraw the badge on the membership list
- if (this.state.phase == this.Phase.MemberList && member.roomId === this.props.roomId) {
+ if (this.state.phase == this.Phase.RoomMemberList && member.roomId === this.props.roomId) {
this._delayedUpdate();
}
- else if (this.state.phase === this.Phase.MemberInfo && member.roomId === this.props.roomId &&
+ else if (this.state.phase === this.Phase.RoomMemberInfo && member.roomId === this.props.roomId &&
member.userId === this.state.member.userId) {
// refresh the member info (e.g. new power level)
this._delayedUpdate();
@@ -119,39 +134,55 @@ module.exports = React.createClass({
});
if (payload.member) {
this.setState({
- phase: this.Phase.MemberInfo,
+ phase: this.Phase.RoomMemberInfo,
member: payload.member,
});
+ } else {
+ if (this.props.roomId) {
+ this.setState({
+ phase: this.Phase.RoomMemberList
+ });
+ } else if (this.props.groupId) {
+ this.setState({
+ phase: this.Phase.GroupMemberList,
+ groupId: payload.groupId,
+ member: payload.member,
+ });
+ }
}
- else {
- this.setState({
- phase: this.Phase.MemberList
- });
- }
- }
- else if (payload.action === "view_room") {
- if (this.state.phase === this.Phase.MemberInfo) {
- this.setState({
- phase: this.Phase.MemberList
- });
- }
+ } else if (payload.action === "view_group") {
+ this.setState({
+ phase: this.Phase.GroupMemberList,
+ groupId: payload.groupId,
+ member: null,
+ });
+ } else if (payload.action === "view_group_user") {
+ this.setState({
+ phase: this.Phase.GroupMemberInfo,
+ groupId: payload.groupId,
+ member: payload.member,
+ });
+ } else if (payload.action === "view_room") {
+ this.setState({
+ phase: this.Phase.RoomMemberList
+ });
}
},
render: function() {
- var MemberList = sdk.getComponent('rooms.MemberList');
- var NotificationPanel = sdk.getComponent('structures.NotificationPanel');
- var FilePanel = sdk.getComponent('structures.FilePanel');
- var TintableSvg = sdk.getComponent("elements.TintableSvg");
- var buttonGroup;
- var inviteGroup;
- var panel;
+ const MemberList = sdk.getComponent('rooms.MemberList');
+ const GroupMemberList = sdk.getComponent('groups.GroupMemberList');
+ const NotificationPanel = sdk.getComponent('structures.NotificationPanel');
+ const FilePanel = sdk.getComponent('structures.FilePanel');
+ const TintableSvg = sdk.getComponent("elements.TintableSvg");
+ let inviteGroup;
+ let panel;
- var filesHighlight;
- var membersHighlight;
- var notificationsHighlight;
+ let filesHighlight;
+ let membersHighlight;
+ let notificationsHighlight;
if (!this.props.collapsed) {
- if (this.state.phase == this.Phase.MemberList || this.state.phase === this.Phase.MemberInfo) {
+ if (this.state.phase == this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo) {
membersHighlight = ;
}
else if (this.state.phase == this.Phase.FilePanel) {
@@ -162,11 +193,11 @@ module.exports = React.createClass({
}
}
- var membersBadge;
- if ((this.state.phase == this.Phase.MemberList || this.state.phase === this.Phase.MemberInfo) && this.props.roomId) {
- var cli = MatrixClientPeg.get();
- var room = cli.getRoom(this.props.roomId);
- var user_is_in_room;
+ let membersBadge;
+ if ((this.state.phase == this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo) && this.props.roomId) {
+ const cli = MatrixClientPeg.get();
+ const room = cli.getRoom(this.props.roomId);
+ let user_is_in_room;
if (room) {
membersBadge = room.getJoinedMembers().length;
user_is_in_room = room.hasMembershipState(
@@ -186,48 +217,72 @@ module.exports = React.createClass({
}
+ let headerButtons = [];
if (this.props.roomId) {
- buttonGroup =
-
-
-
-
-
-
-
-
-
-
;
+ headerButtons.push(
+ { membersBadge ? membersBadge : }
-
-
- { membersBadge ? membersBadge : }
+
+
+ );
}
if (!this.props.collapsed) {
- if(this.props.roomId && this.state.phase == this.Phase.MemberList) {
+ if (this.props.roomId && this.state.phase == this.Phase.RoomMemberList) {
panel =
+
+ { _t('Invite to this group') }
+