Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes

src/components/views/rooms/AppsDrawer.js

@@ -55,9 +55,6 @@ module.exports = React.createClass({
             this.scalarClient = new ScalarAuthClient();
             this.scalarClient.connect().done(() => {
                 this.forceUpdate();
-                if (this.state.apps && this.state.apps.length < 1) {
-                    this.onClickAddWidget();
-                }
             // TODO -- Handle Scalar errors
             // },
             // (err) => {
@@ -66,6 +63,8 @@ module.exports = React.createClass({
             //     });
             });
         }
+
+        this.dispatcherRef = dis.register(this.onAction.bind(this));
     },
 
     componentWillUnmount: function() {
@@ -73,6 +72,27 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
         }
+        dis.unregister(this.dispatcherRef);
+    },
+
+    componentWillReceiveProps(newProps) {
+        // Room has changed probably, update apps
+        this._updateApps();
+    },
+
+    onAction: function(action) {
+        switch (action.action) {
+            case 'appsDrawer':
+                // When opening the app draw when there aren't any apps, auto-launch the
+                // integrations manager to skip the awkward click on "Add widget"
+                if (action.show) {
+                    const apps = this._getApps();
+                    if (apps.length === 0) {
+                        this._launchManageIntegrations();
+                    }
+                }
+                break;
+        }
     },
 
     /**
@@ -95,7 +115,7 @@ module.exports = React.createClass({
         return pathTemplate;
     },
 
-    _initAppConfig: function(appId, app) {
+    _initAppConfig: function(appId, app, sender) {
         const user = MatrixClientPeg.get().getUser(this.props.userId);
         const params = {
             '$matrix_user_id': this.props.userId,
@@ -113,6 +133,7 @@ module.exports = React.createClass({
         app.id = appId;
         app.name = app.name || app.type;
         app.url = this.encodeUri(app.url, params);
+        app.creatorUserId = (sender && sender.userId) ? sender.userId : null;
 
         return app;
     },
@@ -133,18 +154,12 @@ module.exports = React.createClass({
         return appsStateEvents.filter((ev) => {
             return ev.getContent().type && ev.getContent().url;
         }).map((ev) => {
-            return this._initAppConfig(ev.getStateKey(), ev.getContent());
+            return this._initAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
         });
     },
 
     _updateApps: function() {
         const apps = this._getApps();
-        if (apps.length < 1) {
-            dis.dispatch({
-                action: 'appsDrawer',
-                show: false,
-            });
-        }
         this.setState({
             apps: apps,
         });
@@ -159,13 +174,21 @@ module.exports = React.createClass({
         }
     },
 
-    onClickAddWidget: function(e) {
-        if (e) {
-            e.preventDefault();
-        }
+    _launchManageIntegrations: function() {
+        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+        const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
+                this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId, 'add_integ') :
+                null;
+        Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+            src: src,
+        }, "mx_IntegrationsManager");
+    },
 
+    onClickAddWidget: function(e) {
+        e.preventDefault();
         // Display a warning dialog if the max number of widgets have already been added to the room
-        if (this.state.apps && this.state.apps.length >= MAX_WIDGETS) {
+        const apps = this._getApps();
+        if (apps && apps.length >= MAX_WIDGETS) {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             const errorMsg = `The maximum number of ${MAX_WIDGETS} widgets have already been added to this room.`;
             console.error(errorMsg);
@@ -175,14 +198,7 @@ module.exports = React.createClass({
             });
             return;
         }
-
-        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-        const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
-                this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId, 'add_integ') :
-                null;
-        Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
-            src: src,
-        }, "mx_IntegrationsManager");
+        this._launchManageIntegrations();
     },
 
     render: function() {
@@ -197,18 +213,26 @@ module.exports = React.createClass({
                     fullWidth={arr.length<2 ? true : false}
                     room={this.props.room}
                     userId={this.props.userId}
+                    show={this.props.showApps}
+                    creatorUserId={app.creatorUserId}
                 />);
             });
 
-        const addWidget = (
-            <div onClick={this.onClickAddWidget}
+        let addWidget;
+        if (this.props.showApps &&
+            this.state.apps &&
+            this.state.apps.length < 2 &&
+            this._canUserModify()
+        ) {
+            addWidget = <div
+                onClick={this.onClickAddWidget}
                 role="button"
                 tabIndex="0"
                 className="mx_AddWidget_button"
                 title={_t('Add a widget')}>
                 [+] {_t('Add a widget')}
-            </div>
-        );
+            </div>;
+        }
 
         return (
             <div className="mx_AppsDrawer">