Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb27305b70 | ||
|
|
fcbd9b4b66 |
@@ -15,9 +15,6 @@ import { useTypingVerbs } from '../../hooks/useUserTypingVerb';
|
||||
|
||||
const DEFAULT_VERB = 'typing';
|
||||
|
||||
const joinNames = (parts: string[]): string =>
|
||||
parts.length === 1 ? parts[0] : `${parts.slice(0, -1).join(', ')} and ${parts[parts.length - 1]}`;
|
||||
|
||||
export type RoomViewTypingProps = {
|
||||
room: Room;
|
||||
};
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import React, { useCallback, useState } from 'react';
|
||||
import { Box, Text, IconButton, Scroll, Switch, Button } from 'folds';
|
||||
import { Box, Text, IconButton, Scroll, Switch, Button, Modal, Overlay, OverlayBackdrop, OverlayCenter } from 'folds';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { Icon, Icons } from '../../../components/icons';
|
||||
import { Page, PageContent, PageHeader } from '../../../components/page';
|
||||
import { SequenceCard } from '../../../components/sequence-card';
|
||||
@@ -12,8 +13,12 @@ import {
|
||||
AccountDataEditor,
|
||||
AccountDataSubmitCallback,
|
||||
} from '../../../components/AccountDataEditor';
|
||||
import { TextViewer } from '../../../components/text-viewer';
|
||||
import { copyToClipboard } from '../../../utils/dom';
|
||||
import { stopPropagation } from '../../../utils/keyboard';
|
||||
import { clearProfileCache } from '../../../utils/profileCache';
|
||||
import { AccountData } from './AccountData';
|
||||
import { ProfileFields } from './ProfileFields';
|
||||
|
||||
type DeveloperToolsProps = {
|
||||
requestClose: () => void;
|
||||
@@ -23,6 +28,67 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
|
||||
const [developerTools, setDeveloperTools] = useSetting(settingsAtom, 'developerTools');
|
||||
const [expand, setExpend] = useState(false);
|
||||
const [accountDataType, setAccountDataType] = useState<string | null>();
|
||||
const [profileExpand, setProfileExpand] = useState(false);
|
||||
const [profileUserId, setProfileUserId] = useState(mx.getUserId() ?? '');
|
||||
const [profileFields, setProfileFields] = useState<Record<string, unknown>>({});
|
||||
const [profileSupported, setProfileSupported] = useState(false);
|
||||
const [profileFieldKey, setProfileFieldKey] = useState<string | null>();
|
||||
|
||||
const profileEditable = profileSupported && profileUserId.trim() === mx.getUserId();
|
||||
|
||||
const fetchProfileFields = useCallback(async (userId: string) => {
|
||||
if (!userId) return;
|
||||
|
||||
try {
|
||||
const supported = await mx.doesServerSupportExtendedProfiles();
|
||||
setProfileSupported(supported);
|
||||
setProfileFields(
|
||||
supported
|
||||
? await mx.getExtendedProfile(userId)
|
||||
: ((await mx.getProfileInfo(userId)) as Record<string, unknown>),
|
||||
);
|
||||
} catch (err) {
|
||||
console.error('Failed to fetch profile fields:', err);
|
||||
setProfileSupported(false);
|
||||
setProfileFields({});
|
||||
}
|
||||
}, [mx]);
|
||||
|
||||
const submitProfileField: AccountDataSubmitCallback = useCallback(
|
||||
async (key, content) => {
|
||||
await mx.setExtendedProfileProperty(key, content);
|
||||
setProfileFields((prev) => ({ ...prev, [key]: content }));
|
||||
// The rest of the client reads through the shared profile cache
|
||||
clearProfileCache(profileUserId.trim());
|
||||
},
|
||||
[mx, profileUserId]
|
||||
);
|
||||
|
||||
const deleteProfileField = useCallback(
|
||||
async (key: string) => {
|
||||
try {
|
||||
await mx.deleteExtendedProfileProperty(key);
|
||||
setProfileFields((prev) => {
|
||||
const next = { ...prev };
|
||||
delete next[key];
|
||||
return next;
|
||||
});
|
||||
// The rest of the client reads through the shared profile cache
|
||||
clearProfileCache(profileUserId.trim());
|
||||
} catch (err) {
|
||||
console.error('Failed to delete profile field:', err);
|
||||
}
|
||||
},
|
||||
[mx, profileUserId]
|
||||
);
|
||||
|
||||
const handleProfileExpand = useCallback(
|
||||
(expand: boolean) => {
|
||||
setProfileExpand(expand);
|
||||
if (expand) fetchProfileFields(profileUserId.trim());
|
||||
},
|
||||
[fetchProfileFields, profileUserId]
|
||||
);
|
||||
|
||||
const submitAccountData: AccountDataSubmitCallback = useCallback(
|
||||
async (type, content) => {
|
||||
@@ -42,6 +108,8 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
|
||||
);
|
||||
}
|
||||
|
||||
const closeProfileField = useCallback(() => setProfileFieldKey(undefined), []);
|
||||
|
||||
return (
|
||||
<Page>
|
||||
<PageHeader outlined={false}>
|
||||
@@ -109,6 +177,18 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
|
||||
</SequenceCard>
|
||||
)}
|
||||
</Box>
|
||||
{developerTools && (
|
||||
<ProfileFields
|
||||
userId={profileUserId}
|
||||
fields={profileFields}
|
||||
editable={profileEditable}
|
||||
expand={profileExpand}
|
||||
onUserIdChange={setProfileUserId}
|
||||
onExpandToggle={handleProfileExpand}
|
||||
onSelect={setProfileFieldKey}
|
||||
onDelete={deleteProfileField}
|
||||
/>
|
||||
)}
|
||||
{developerTools && (
|
||||
<AccountData
|
||||
expand={expand}
|
||||
@@ -120,6 +200,38 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
|
||||
</PageContent>
|
||||
</Scroll>
|
||||
</Box>
|
||||
{profileFieldKey !== undefined && (
|
||||
<Overlay open backdrop={<OverlayBackdrop />}>
|
||||
<OverlayCenter>
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
clickOutsideDeactivates: true,
|
||||
onDeactivate: closeProfileField,
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<Modal size="500" variant="Surface">
|
||||
{profileEditable ? (
|
||||
<AccountDataEditor
|
||||
type={profileFieldKey}
|
||||
content={profileFields[profileFieldKey] as object}
|
||||
submitChange={submitProfileField}
|
||||
requestClose={closeProfileField}
|
||||
/>
|
||||
) : (
|
||||
<TextViewer
|
||||
name={profileFieldKey}
|
||||
text={JSON.stringify(profileFields[profileFieldKey], null, 2)}
|
||||
langName="json"
|
||||
requestClose={closeProfileField}
|
||||
/>
|
||||
)}
|
||||
</Modal>
|
||||
</FocusTrap>
|
||||
</OverlayCenter>
|
||||
</Overlay>
|
||||
)}
|
||||
</Page>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
import { Box, Text, Button, Input, MenuItem, IconButton } from 'folds';
|
||||
import { Icon, Icons } from '../../../components/icons';
|
||||
import { SequenceCard } from '../../../components/sequence-card';
|
||||
import { SequenceCardStyle } from '../styles.css';
|
||||
import { SettingTile } from '../../../components/setting-tile';
|
||||
import { CutoutCard } from '../../../components/cutout-card';
|
||||
|
||||
type ProfileFieldsProps = {
|
||||
userId: string;
|
||||
fields: Record<string, unknown>;
|
||||
editable: boolean;
|
||||
expand: boolean;
|
||||
onUserIdChange: (userId: string) => void;
|
||||
onExpandToggle: (expand: boolean) => void;
|
||||
onSelect: (key: string) => void;
|
||||
onDelete: (key: string) => void;
|
||||
};
|
||||
|
||||
export function ProfileFields({
|
||||
userId,
|
||||
fields,
|
||||
editable,
|
||||
expand,
|
||||
onUserIdChange,
|
||||
onExpandToggle,
|
||||
onSelect,
|
||||
onDelete,
|
||||
}: ProfileFieldsProps) {
|
||||
return (
|
||||
<Box direction="Column" gap="100">
|
||||
<Text size="L400">Public Profile Fields</Text>
|
||||
<SequenceCard
|
||||
className={SequenceCardStyle}
|
||||
variant="SurfaceVariant"
|
||||
direction="Column"
|
||||
gap="400"
|
||||
>
|
||||
<SettingTile
|
||||
title="Public Profile Fields"
|
||||
description="Extended profile fields (MSC4133) as the server returns them, not through the client profile cache. Editable only when the user is you and the server supports MSC4133."
|
||||
after={
|
||||
<Button
|
||||
onClick={() => onExpandToggle(!expand)}
|
||||
variant="Secondary"
|
||||
fill="Soft"
|
||||
size="300"
|
||||
radii="300"
|
||||
outlined
|
||||
before={
|
||||
<Icon src={expand ? Icons.ChevronTop : Icons.ChevronBottom} size="100" filled />
|
||||
}
|
||||
>
|
||||
<Text size="B300">{expand ? 'Collapse' : 'Expand'}</Text>
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
<Input
|
||||
size="300"
|
||||
variant="Secondary"
|
||||
style={{ width: '100%' }}
|
||||
value={userId}
|
||||
onChange={(e) => onUserIdChange(e.target.value)}
|
||||
placeholder="@user:server"
|
||||
/>
|
||||
{expand && (
|
||||
<Box direction="Column" gap="100">
|
||||
<Box justifyContent="SpaceBetween">
|
||||
<Text size="L400">Fields</Text>
|
||||
<Text size="L400">Total: {Object.keys(fields).length}</Text>
|
||||
</Box>
|
||||
<CutoutCard>
|
||||
{Object.keys(fields).sort().map((key) => (
|
||||
<MenuItem
|
||||
key={key}
|
||||
variant="Surface"
|
||||
fill="None"
|
||||
size="300"
|
||||
radii="0"
|
||||
after={
|
||||
<Box gap="100" alignItems="Center">
|
||||
{editable && (
|
||||
<IconButton
|
||||
size="200"
|
||||
radii="Round"
|
||||
title={`Delete ${key}`}
|
||||
onClick={() => onDelete(key)}
|
||||
>
|
||||
<Icon size="50" src={Icons.Cross} />
|
||||
</IconButton>
|
||||
)}
|
||||
<Icon size="50" src={Icons.ChevronRight} />
|
||||
</Box>
|
||||
}
|
||||
onClick={() => onSelect(key)}
|
||||
>
|
||||
<Box grow="Yes">
|
||||
<Text size="T200" truncate>
|
||||
{key}
|
||||
</Text>
|
||||
</Box>
|
||||
</MenuItem>
|
||||
))}
|
||||
</CutoutCard>
|
||||
</Box>
|
||||
)}
|
||||
</SequenceCard>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
@@ -126,6 +126,11 @@ export const SETTINGS_SEARCH_CATALOG: SettingsSearchEntry[] = [
|
||||
},
|
||||
{ page: SettingsPages.DeveloperToolsPage, title: 'Access Token', keywords: ['auth', 'secret'] },
|
||||
{ page: SettingsPages.DeveloperToolsPage, title: 'Account Data', keywords: ['global', 'events'] },
|
||||
{
|
||||
page: SettingsPages.DeveloperToolsPage,
|
||||
title: 'Public Profile Fields',
|
||||
keywords: ['profile', 'msc4133', 'json'],
|
||||
},
|
||||
|
||||
// About
|
||||
{ page: SettingsPages.AboutPage, title: 'Clear Cache & Reload', keywords: ['reset', 'storage'] },
|
||||
|
||||
Reference in New Issue
Block a user