From 3284cc730eea51253c0f32c23ee6ea632328e74a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 6 Jul 2020 20:37:04 -0600
Subject: [PATCH] Show ordering options on invites

Fixes https://github.com/vector-im/riot-web/issues/14309
---
 src/components/views/rooms/RoomSublist2.tsx | 61 ++++++++++++---------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 2ca9ec5dd1..f5a1b67571 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -27,7 +27,6 @@ import RoomTile2 from "./RoomTile2";
 import { ResizableBox, ResizeCallbackData } from "react-resizable";
 import { ListLayout } from "../../../stores/room-list/ListLayout";
 import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
-import StyledCheckbox from "../elements/StyledCheckbox";
 import StyledRadioButton from "../elements/StyledRadioButton";
 import RoomListStore from "../../../stores/room-list/RoomListStore2";
 import { ListAlgorithm, SortAlgorithm } from "../../../stores/room-list/algorithms/models";
@@ -35,9 +34,9 @@ import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 import dis from "../../../dispatcher/dispatcher";
 import NotificationBadge from "./NotificationBadge";
 import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
-import Tooltip from "../elements/Tooltip";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import { Key } from "../../../Keyboard";
+import StyledCheckbox from "../elements/StyledCheckbox";
 
 // TODO: Remove banner on launch: https://github.com/vector-im/riot-web/issues/14231
 // TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14231
@@ -311,15 +310,42 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
     }
 
     private renderMenu(): React.ReactElement {
-        // TODO: Get a proper invite context menu, or take invites out of the room list.
-        if (this.props.tagId === DefaultTagID.Invite) {
-            return null;
-        }
-
         let contextMenu = null;
         if (this.state.contextMenuPosition) {
             const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.tagId) === SortAlgorithm.Alphabetic;
             const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
+
+            // Invites don't get some nonsense options, so only add them if we have to. We do
+            // this with an array instead of a containing div to ensure that the DOM structure
+            // is relatively sane.
+            let otherSections = [];
+            if (this.props.tagId !== DefaultTagID.Invite) {
+                otherSections.push(<hr key={otherSections.length} />);
+                otherSections.push(
+                    <div key={otherSections.length}>
+                        <div className='mx_RoomSublist2_contextMenu_title'>{_t("Unread rooms")}</div>
+                        <StyledCheckbox
+                            onChange={this.onUnreadFirstChanged}
+                            checked={isUnreadFirst}
+                        >
+                            {_t("Always show first")}
+                        </StyledCheckbox>
+                    </div>,
+                );
+                otherSections.push(<hr key={otherSections.length} />);
+                otherSections.push(
+                    <div key={otherSections.length}>
+                        <div className='mx_RoomSublist2_contextMenu_title'>{_t("Show")}</div>
+                        <StyledCheckbox
+                            onChange={this.onMessagePreviewChanged}
+                            checked={this.props.layout.showPreviews}
+                        >
+                            {_t("Message preview")}
+                        </StyledCheckbox>
+                    </div>,
+                );
+            }
+
             contextMenu = (
                 <ContextMenu
                     chevronFace="none"
@@ -345,26 +371,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                                 {_t("A-Z")}
                             </StyledRadioButton>
                         </div>
-                        <hr />
-                        <div>
-                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Unread rooms")}</div>
-                            <StyledCheckbox
-                                onChange={this.onUnreadFirstChanged}
-                                checked={isUnreadFirst}
-                            >
-                                {_t("Always show first")}
-                            </StyledCheckbox>
-                        </div>
-                        <hr />
-                        <div>
-                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Show")}</div>
-                            <StyledCheckbox
-                                onChange={this.onMessagePreviewChanged}
-                                checked={this.props.layout.showPreviews}
-                            >
-                                {_t("Message preview")}
-                            </StyledCheckbox>
-                        </div>
+                        {otherSections}
                     </div>
                 </ContextMenu>
             );