From 28d12016b7a6fd5695ce5fdbe073e36a7400eb54 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 8 Apr 2021 19:18:30 -0600 Subject: [PATCH 1/2] Convert to using EventType enum --- .../tabs/room/RolesRoomSettingsTab.js | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js index 09498e0d4a..a2367e3e3b 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js @@ -1,5 +1,5 @@ /* -Copyright 2019 New Vector Ltd +Copyright 2019, 2021 The Matrix.org Foundation C.I.C. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,17 +22,18 @@ import * as sdk from "../../../../.."; import AccessibleButton from "../../../elements/AccessibleButton"; import Modal from "../../../../../Modal"; import {replaceableComponent} from "../../../../../utils/replaceableComponent"; +import {EventType} from "matrix-js-sdk/src/@types/event"; const plEventsToLabels = { // These will be translated for us later. - "m.room.avatar": _td("Change room avatar"), - "m.room.name": _td("Change room name"), - "m.room.canonical_alias": _td("Change main address for the room"), - "m.room.history_visibility": _td("Change history visibility"), - "m.room.power_levels": _td("Change permissions"), - "m.room.topic": _td("Change topic"), - "m.room.tombstone": _td("Upgrade the room"), - "m.room.encryption": _td("Enable room encryption"), + [EventType.RoomAvatar]: _td("Change room avatar"), + [EventType.RoomName]: _td("Change room name"), + [EventType.RoomCanonicalAlias]: _td("Change main address for the room"), + [EventType.RoomHistoryVisibility]: _td("Change history visibility"), + [EventType.RoomPowerLevels]: _td("Change permissions"), + [EventType.RoomTopic]: _td("Change topic"), + [EventType.RoomTombstone]: _td("Upgrade the room"), + [EventType.RoomEncryption]: _td("Enable room encryption"), // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": _td("Modify widgets"), @@ -40,14 +41,14 @@ const plEventsToLabels = { 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}, - "m.room.topic": {isState: true}, - "m.room.tombstone": {isState: true}, - "m.room.encryption": {isState: true}, + [EventType.RoomAvatar]: {isState: true}, + [EventType.RoomName]: {isState: true}, + [EventType.RoomCanonicalAlias]: {isState: true}, + [EventType.RoomHistoryVisibility]: {isState: true}, + [EventType.RoomPowerLevels]: {isState: true}, + [EventType.RoomTopic]: {isState: true}, + [EventType.RoomTombstone]: {isState: true}, + [EventType.RoomEncryption]: {isState: true}, // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": {isState: true}, From 073c05543ca74d7873cf242fd3c797513aa0caf6 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 8 Apr 2021 19:20:08 -0600 Subject: [PATCH 2/2] Give server ACLs a name in 'roles & permissions' tab The default power levels event includes them, so this helps avoid them showing up as "Send m.room.server_acl events". --- src/components/views/settings/tabs/room/RolesRoomSettingsTab.js | 2 ++ src/i18n/strings/en_EN.json | 1 + 2 files changed, 3 insertions(+) diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js index a2367e3e3b..59a175906d 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js @@ -34,6 +34,7 @@ const plEventsToLabels = { [EventType.RoomTopic]: _td("Change topic"), [EventType.RoomTombstone]: _td("Upgrade the room"), [EventType.RoomEncryption]: _td("Enable room encryption"), + [EventType.RoomServerAcl]: _td("Change server ACLs"), // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": _td("Modify widgets"), @@ -49,6 +50,7 @@ const plEventsToShow = { [EventType.RoomTopic]: {isState: true}, [EventType.RoomTombstone]: {isState: true}, [EventType.RoomEncryption]: {isState: true}, + [EventType.RoomServerAcl]: {isState: true}, // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": {isState: true}, diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index c192e51f96..4c5d2bd6a5 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1361,6 +1361,7 @@ "Change topic": "Change topic", "Upgrade the room": "Upgrade the room", "Enable room encryption": "Enable room encryption", + "Change server ACLs": "Change server ACLs", "Modify widgets": "Modify widgets", "Failed to unban": "Failed to unban", "Unban": "Unban",