nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Address code smells from #30453 (#31083)

Browse Source 
* check recents length

* Improve sorting logic in capabilities dialog

* Fix allowedHosts regex array check

* Remove double negative in filter checks

* prettier
This commit is contained in:
David Langley
2025-10-29 08:52:17 +00:00
committed by GitHub
parent 3e809cd661
commit 80a7de4314
7 changed files with 207 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/dialogs/InviteDialog.tsx
View File

@@ -415,7 +415,7 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
// We mutate the given set so that any later callers avoid duplicating these users
excludedTargetIds.add(userId);
}
if (!recents) logger.warn("[Invite:Recents] No recents to suggest!");
if (recents.length === 0) logger.warn("[Invite:Recents] No recents to suggest!");
// Sort the recents by last active to save us time later
recents.sort((a, b) => b.lastActive - a.lastActive);

11
src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
View File

@@ -91,12 +91,13 @@ export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<
const isTimelineA = isTimelineCapability(capA);
const isTimelineB = isTimelineCapability(capB);
if (!isTimelineA && !isTimelineB) return lexicographicCompare(capA, capB);
if (isTimelineA && !isTimelineB) return 1;
if (!isTimelineA && isTimelineB) return -1;
if (isTimelineA && isTimelineB) return lexicographicCompare(capA, capB);
// Sort timeline capabilities to the bottom, non-timeline to the top
if (isTimelineA !== isTimelineB) {
return isTimelineA ? 1 : -1;
}
return 0;
// Both are the same type (both timeline or both non-timeline), sort lexicographically
return lexicographicCompare(capA, capB);
});
const checkboxRows = orderedCapabilities.map(([cap, isChecked], i) => {
const text = CapabilityText.for(cap, this.props.widgetKind);

8
src/components/views/dialogs/spotlight/SpotlightDialog.tsx
View File

@@ -1144,7 +1144,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
if (rovingContext.state.activeNode && rovingContext.state.nodes.length > 0) {
let nodes = rovingContext.state.nodes;
if (!query && !filter !== null) {
if (!query && filter === null) {
// If the current selection is not in the recently viewed row then only include the
// first recently viewed so that is the target when the user is switching into recently viewed.
const keptRecentlyViewedRef = nodeIsForRecentlyViewed(rovingContext.state.activeNode)
@@ -1164,7 +1164,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
// only handle these keys when we are in the recently viewed row of options
if (
!query &&
!filter !== null &&
filter === null &&
rovingContext.state.activeNode &&
rovingContext.state.nodes.length > 0 &&
nodeIsForRecentlyViewed(rovingContext.state.activeNode)
@@ -1226,8 +1226,8 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
<>
<kbd>↓</kbd>
<kbd>↑</kbd>
{!filter !== null && !query && <kbd>←</kbd>}
{!filter !== null && !query && <kbd>→</kbd>}
{filter === null && !query && <kbd>←</kbd>}
{filter === null && !query && <kbd>→</kbd>}
</>
),
},

2
src/utils/permalinks/Permalinks.ts
View File

@@ -217,7 +217,7 @@ export class RoomPermalinkCreator {
const allowed = aclEvent.getContent<{ allow: string[] }>().allow;
allowedHostsRegexps = []; // we don't want to use the default rule here
if (Array.isArray(denied)) {
if (Array.isArray(allowed)) {
allowed.forEach((h) => allowedHostsRegexps.push(getRegex(h)));
}
}