From 8ab3d94c1ce3b972a77da331d910189256503996 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 29 Sep 2017 15:11:48 -0600
Subject: [PATCH] Always show common events in the PL section of room settings

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 412f67fc23..59b05dc4ac 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -45,6 +45,15 @@ const plEventsToLabels = {
     "m.room.power_levels": "To change the permissions in the room, you must be a",
 };
 
+const plEventsToShow = {
+    // If an event is listed here, it will be shown in the PL settings. Defaults will be calculated.
+    "m.room.avatar": {isState: true},
+    "m.room.name": {isState: true},
+    "m.room.canonical_alias": {isState: true},
+    "m.room.history_visibility": {isState: true},
+    "m.room.power_levels": {isState: true},
+}
+
 const BannedUser = React.createClass({
     propTypes: {
         canUnban: React.PropTypes.bool,
@@ -556,6 +565,14 @@ module.exports = React.createClass({
         this.forceUpdate();
     },
 
+    _populateDefaultPlEvents: function(eventsSection, stateLevel, eventsLevel) {
+        for (let desiredEvent of Object.keys(plEventsToShow)) {
+            if (!(desiredEvent in eventsSection)) {
+                eventsSection[desiredEvent] = (plEventsToShow[desiredEvent].isState ? stateLevel : eventsLevel);
+            }
+        }
+    },
+
     _renderEncryptionSection: function() {
         var cli = MatrixClientPeg.get();
         var roomState = this.props.room.currentState;
@@ -626,6 +643,8 @@ module.exports = React.createClass({
         var state_level = power_level_event ? parseIntWithDefault(power_levels.state_default, 50) : 0;
         var default_user_level = parseIntWithDefault(power_levels.users_default, 0);
 
+        this._populateDefaultPlEvents(events_levels, state_level, send_level);
+
         var current_user_level = user_levels[user_id];
         if (current_user_level === undefined) {
             current_user_level = default_user_level;