update room devtool to new sdk

This commit is contained in:
Ajay Bura 2026-07-24 15:09:35 +05:30
commit 7787055df1
5 changed files with 300 additions and 219 deletions

View file

@ -14,7 +14,6 @@ import {
Scroll,
config,
} from 'folds';
import { MatrixError } from 'matrix-js-sdk';
import { Cursor } from '../plugins/text-area';
import { syntaxErrorPosition } from '../utils/dom';
import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
@ -57,7 +56,7 @@ function AccountDataEdit({
EDITOR_INTENT_SPACE_COUNT
);
const [submitState, submit] = useAsyncCallback<void, MatrixError, [string, object]>(submitChange);
const [submitState, submit] = useAsyncCallback<void, unknown, [string, object]>(submitChange);
const submitting = submitState.status === AsyncStatus.Loading;
const handleSubmit: FormEventHandler<HTMLFormElement> = (evt) => {
@ -159,7 +158,9 @@ function AccountDataEdit({
{submitState.status === AsyncStatus.Error && (
<Text size="T200" style={{ color: color.Critical.Main }}>
<b>{submitState.error.message}</b>
<b>
{submitState.error instanceof Error ? submitState.error.message : 'Unknown Error'}
</b>
</Text>
)}
</Box>

View file

@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react';
import React, { useCallback, useMemo, useState } from 'react';
import {
Box,
Text,
@ -12,6 +12,9 @@ import {
config,
color,
} from 'folds';
import { putRoomAccountData } from 'neurone/lib/api/matrix/client/v3/user';
import { parseMatrixResp } from 'neurone/lib/matrix-request';
import { AccountDataEvent, StateEventWithoutRoomId } from 'neurone/lib/api/types';
import { Page, PageContent, PageHeader } from '../../../components/page';
import { SequenceCard } from '../../../components/sequence-card';
import { SequenceCardStyle } from '../styles.css';
@ -20,54 +23,240 @@ import { useSetting } from '../../../state/hooks/settings';
import { settingsAtom } from '../../../state/settings';
import { copyToClipboard } from '../../../utils/dom';
import { useRoom } from '../../../hooks/useRoom';
import { useRoomState } from '../../../hooks/useRoomState';
import { StateEventEditor, StateEventInfo } from './StateEventEditor';
import { SendRoomEvent } from './SendRoomEvent';
import { useRoomAccountData } from '../../../hooks/useRoomAccountData';
import { StateEventEditor } from './StateEventEditor';
import { EventLocation, SendRoomEvent } from './SendRoomEvent';
import { CutoutCard } from '../../../components/cutout-card';
import {
AccountDataEditor,
AccountDataSubmitCallback,
} from '../../../components/AccountDataEditor';
import { useMatrixClient } from '../../../hooks/useMatrixClient';
import { useClient } from '../../../hooks/useClient';
import { useRoomState } from '../../../hooks/storage/useRoomStateEvent';
import { JoinRoomStateObject } from '../../../../client/storage/collections';
import { useRoomAccountData } from '../../../hooks/storage/useRoomAccountData';
export function RoomStateList({
onCompose,
onView,
}: {
onCompose: (location: EventLocation) => void;
onView: (event: StateEventWithoutRoomId) => void;
}) {
const roomId = useRoom();
const roomStateResult = useRoomState(roomId);
const [expandStateType, setExpandStateType] = useState<string>();
const typeToEvents = useMemo(() => {
const events = roomStateResult.value ?? [];
const tToE = new Map<string, JoinRoomStateObject[]>();
events.forEach((event) => {
const list = tToE.get(event.type) ?? [];
list.push(event);
tToE.set(event.type, list);
});
return tToE;
}, [roomStateResult]);
return (
<Box direction="Column" gap="100">
<Box justifyContent="SpaceBetween">
<Text size="L400">Events</Text>
{roomStateResult.value && <Text size="L400">Total: {roomStateResult.value.length}</Text>}
</Box>
<CutoutCard>
<MenuItem
onClick={() => onCompose({ stateKey: '' })}
variant="Surface"
fill="None"
size="300"
radii="0"
before={<Icon size="50" src={Icons.Plus} />}
>
<Box grow="Yes">
<Text size="T200" truncate>
Add New
</Text>
</Box>
</MenuItem>
{Array.from(typeToEvents.keys())
.sort()
.map((eventType) => {
const expanded = eventType === expandStateType;
const events = typeToEvents.get(eventType);
if (!events) return null;
return (
<Box id={eventType} key={eventType} direction="Column" gap="100">
<MenuItem
onClick={() => setExpandStateType(expanded ? undefined : eventType)}
variant="Surface"
fill="None"
size="300"
radii="0"
before={
<Icon size="50" src={expanded ? Icons.ChevronBottom : Icons.ChevronRight} />
}
after={<Text size="L400">{events.length}</Text>}
>
<Box grow="Yes">
<Text size="T200" truncate>
{eventType}
</Text>
</Box>
</MenuItem>
{expanded && (
<div
style={{
marginLeft: config.space.S400,
borderLeft: `${config.borderWidth.B300} solid ${color.Surface.ContainerLine}`,
}}
>
<MenuItem
onClick={() => onCompose({ type: eventType, stateKey: '' })}
variant="Surface"
fill="None"
size="300"
radii="0"
before={<Icon size="50" src={Icons.Plus} />}
>
<Box grow="Yes">
<Text size="T200" truncate>
Add New
</Text>
</Box>
</MenuItem>
{Array.from(events)
.sort()
.map((eventObj) => (
<MenuItem
onClick={() => {
onView(eventObj.event);
}}
key={eventObj.event.state_key}
variant="Surface"
fill="None"
size="300"
radii="0"
after={<Icon size="50" src={Icons.ChevronRight} />}
>
<Box grow="Yes">
<Text size="T200" truncate>
{eventObj.event.state_key
? `"${eventObj.event.state_key}"`
: 'Default'}
</Text>
</Box>
</MenuItem>
))}
</div>
)}
</Box>
);
})}
</CutoutCard>
</Box>
);
}
export function AccountDataList({
onCompose,
}: {
onCompose: (event: AccountDataEvent | null) => void;
}) {
const roomId = useRoom();
const accountDataResult = useRoomAccountData(roomId);
return (
<Box direction="Column" gap="100">
<Box justifyContent="SpaceBetween">
<Text size="L400">Events</Text>
{accountDataResult.value && (
<Text size="L400">Total: {accountDataResult.value.length}</Text>
)}
</Box>
<CutoutCard>
<MenuItem
variant="Surface"
fill="None"
size="300"
radii="0"
before={<Icon size="50" src={Icons.Plus} />}
onClick={() => onCompose(null)}
>
<Box grow="Yes">
<Text size="T200" truncate>
Add New
</Text>
</Box>
</MenuItem>
{Array.from(accountDataResult.value ?? [])
.sort((e1, e2) => (e1.type < e2.type ? -1 : 1))
.map((event) => (
<MenuItem
key={event.type}
variant="Surface"
fill="None"
size="300"
radii="0"
after={<Icon size="50" src={Icons.ChevronRight} />}
onClick={() => onCompose(event.event)}
>
<Box grow="Yes">
<Text size="T200" truncate>
{event.type}
</Text>
</Box>
</MenuItem>
))}
</CutoutCard>
</Box>
);
}
type DeveloperToolsProps = {
requestClose: () => void;
};
export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
const [developerTools, setDeveloperTools] = useSetting(settingsAtom, 'developerTools');
const mx = useMatrixClient();
const room = useRoom();
const roomState = useRoomState(room);
const accountData = useRoomAccountData(room);
const ct = useClient();
const roomId = useRoom();
const [expandState, setExpandState] = useState(false);
const [expandStateType, setExpandStateType] = useState<string>();
const [openStateEvent, setOpenStateEvent] = useState<StateEventInfo>();
const [composeEvent, setComposeEvent] = useState<{ type?: string; stateKey?: string }>();
const [openStateEvent, setOpenStateEvent] = useState<StateEventWithoutRoomId>();
const [composeEvent, setComposeEvent] = useState<EventLocation>();
const [expandAccountData, setExpandAccountData] = useState(false);
const [accountDataType, setAccountDataType] = useState<string | null>();
const [openAccountData, setOpenAccountData] = useState<AccountDataEvent | null | undefined>();
const handleClose = useCallback(() => {
setOpenStateEvent(undefined);
setComposeEvent(undefined);
setAccountDataType(undefined);
setOpenAccountData(undefined);
}, []);
const submitAccountData: AccountDataSubmitCallback = useCallback(
async (type, content) => {
await mx.setRoomAccountData(room.roomId, type, content);
const resp = await ct.requestAuthJSON(
putRoomAccountData({
pathParams: { roomId, type, userId: ct.session.userId },
body: content,
})
);
const [err] = await parseMatrixResp(resp);
if (err) throw new Error(err.data.error ?? err.data.errcode);
},
[mx, room.roomId]
[ct, roomId]
);
if (accountDataType !== undefined) {
if (openAccountData !== undefined) {
return (
<AccountDataEditor
type={accountDataType ?? undefined}
content={accountDataType ? accountData.get(accountDataType) : undefined}
type={openAccountData?.type}
content={openAccountData?.content}
submitChange={submitAccountData}
requestClose={handleClose}
/>
@ -79,7 +268,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
}
if (openStateEvent) {
return <StateEventEditor {...openStateEvent} requestClose={handleClose} />;
return <StateEventEditor event={openStateEvent} requestClose={handleClose} />;
}
return (
@ -130,10 +319,10 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
>
<SettingTile
title="Room ID"
description={`Copy room ID to clipboard. ("${room.roomId}")`}
description={`Copy room ID to clipboard. ("${roomId}")`}
after={
<Button
onClick={() => copyToClipboard(room.roomId ?? '<NO_ROOM_ID_FOUND>')}
onClick={() => copyToClipboard(roomId)}
variant="Secondary"
fill="Soft"
size="300"
@ -205,111 +394,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
}
/>
{expandState && (
<Box direction="Column" gap="100">
<Box justifyContent="SpaceBetween">
<Text size="L400">Events</Text>
<Text size="L400">Total: {roomState.size}</Text>
</Box>
<CutoutCard>
<MenuItem
onClick={() => setComposeEvent({ stateKey: '' })}
variant="Surface"
fill="None"
size="300"
radii="0"
before={<Icon size="50" src={Icons.Plus} />}
>
<Box grow="Yes">
<Text size="T200" truncate>
Add New
</Text>
</Box>
</MenuItem>
{Array.from(roomState.keys())
.sort()
.map((eventType) => {
const expanded = eventType === expandStateType;
const stateKeyToEvents = roomState.get(eventType);
if (!stateKeyToEvents) return null;
return (
<Box id={eventType} key={eventType} direction="Column" gap="100">
<MenuItem
onClick={() =>
setExpandStateType(expanded ? undefined : eventType)
}
variant="Surface"
fill="None"
size="300"
radii="0"
before={
<Icon
size="50"
src={expanded ? Icons.ChevronBottom : Icons.ChevronRight}
/>
}
after={<Text size="L400">{stateKeyToEvents.size}</Text>}
>
<Box grow="Yes">
<Text size="T200" truncate>
{eventType}
</Text>
</Box>
</MenuItem>
{expanded && (
<div
style={{
marginLeft: config.space.S400,
borderLeft: `${config.borderWidth.B300} solid ${color.Surface.ContainerLine}`,
}}
>
<MenuItem
onClick={() =>
setComposeEvent({ type: eventType, stateKey: '' })
}
variant="Surface"
fill="None"
size="300"
radii="0"
before={<Icon size="50" src={Icons.Plus} />}
>
<Box grow="Yes">
<Text size="T200" truncate>
Add New
</Text>
</Box>
</MenuItem>
{Array.from(stateKeyToEvents.keys())
.sort()
.map((stateKey) => (
<MenuItem
onClick={() => {
setOpenStateEvent({
type: eventType,
stateKey,
});
}}
key={stateKey}
variant="Surface"
fill="None"
size="300"
radii="0"
after={<Icon size="50" src={Icons.ChevronRight} />}
>
<Box grow="Yes">
<Text size="T200" truncate>
{stateKey ? `"${stateKey}"` : 'Default'}
</Text>
</Box>
</MenuItem>
))}
</div>
)}
</Box>
);
})}
</CutoutCard>
</Box>
<RoomStateList onCompose={setComposeEvent} onView={setOpenStateEvent} />
)}
</SequenceCard>
<SequenceCard
@ -341,49 +426,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
</Button>
}
/>
{expandAccountData && (
<Box direction="Column" gap="100">
<Box justifyContent="SpaceBetween">
<Text size="L400">Events</Text>
<Text size="L400">Total: {accountData.size}</Text>
</Box>
<CutoutCard>
<MenuItem
variant="Surface"
fill="None"
size="300"
radii="0"
before={<Icon size="50" src={Icons.Plus} />}
onClick={() => setAccountDataType(null)}
>
<Box grow="Yes">
<Text size="T200" truncate>
Add New
</Text>
</Box>
</MenuItem>
{Array.from(accountData.keys())
.sort()
.map((type) => (
<MenuItem
key={type}
variant="Surface"
fill="None"
size="300"
radii="0"
after={<Icon size="50" src={Icons.ChevronRight} />}
onClick={() => setAccountDataType(type)}
>
<Box grow="Yes">
<Text size="T200" truncate>
{type}
</Text>
</Box>
</MenuItem>
))}
</CutoutCard>
</Box>
)}
{expandAccountData && <AccountDataList onCompose={setOpenAccountData} />}
</SequenceCard>
</Box>
)}

View file

@ -1,5 +1,4 @@
import React, { useCallback, useRef, useState, FormEventHandler, useEffect } from 'react';
import { MatrixError } from 'matrix-js-sdk';
import {
Box,
Chip,
@ -14,25 +13,30 @@ import {
TextArea as TextAreaComponent,
Input,
} from 'folds';
import { putSend, putStateEvent } from 'neurone/lib/api/matrix/client/v3/rooms';
import { parseMatrixResp } from 'neurone/lib/matrix-request';
import { Page, PageHeader } from '../../../components/page';
import { useMatrixClient } from '../../../hooks/useMatrixClient';
import { useRoom } from '../../../hooks/useRoom';
import { useAlive } from '../../../hooks/useAlive';
import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor';
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { syntaxErrorPosition } from '../../../utils/dom';
import { Cursor } from '../../../plugins/text-area';
import { useClient } from '../../../hooks/useClient';
const EDITOR_INTENT_SPACE_COUNT = 2;
export type SendRoomEventProps = {
export type EventLocation = {
type?: string;
stateKey?: string;
};
export type SendRoomEventProps = EventLocation & {
requestClose: () => void;
};
export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventProps) {
const mx = useMatrixClient();
const room = useRoom();
const ct = useClient();
const roomId = useRoom();
const alive = useAlive();
const composeStateEvent = typeof stateKey === 'string';
@ -44,18 +48,28 @@ export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventPro
);
const [submitState, submit] = useAsyncCallback<
object,
MatrixError,
void,
unknown,
[string, string | undefined, object]
>(
useCallback(
(evtType, evtStateKey, evtContent) => {
if (typeof evtStateKey === 'string') {
return mx.sendStateEvent(room.roomId, evtType as any, evtContent, evtStateKey);
}
return mx.sendEvent(room.roomId, evtType as any, evtContent);
async (evtType, evtStateKey, evtContent) => {
const resp = await ct.requestAuthJSON(
typeof evtStateKey === 'string'
? putStateEvent({
pathParams: { roomId, eventType: evtType, stateKey: evtStateKey },
body: evtContent,
})
: putSend({
pathParams: { roomId, eventType: evtType, txnId: ct.getTxnId() },
body: evtContent,
})
);
const [err] = await parseMatrixResp(resp);
if (err) throw new Error(err.data.error ?? err.data.errcode);
},
[mx, room]
[ct, roomId]
)
);
const submitting = submitState.status === AsyncStatus.Loading;
@ -162,7 +176,9 @@ export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventPro
{submitState.status === AsyncStatus.Error && (
<Text size="T200" style={{ color: color.Critical.Main }}>
<b>{submitState.error.message}</b>
<b>
{submitState.error instanceof Error ? submitState.error.message : 'Unknown Error'}
</b>
</Text>
)}
</Box>

View file

@ -13,24 +13,24 @@ import {
Spinner,
Button,
} from 'folds';
import { MatrixError } from 'matrix-js-sdk';
import { StateEventWithoutRoomId } from 'neurone/lib/api/types';
import { putStateEvent } from 'neurone/lib/api/matrix/client/v3/rooms';
import { parseMatrixResp } from 'neurone/lib/matrix-request';
import { Page, PageHeader } from '../../../components/page';
import { SequenceCard } from '../../../components/sequence-card';
import { TextViewerContent } from '../../../components/text-viewer';
import { useStateEvent } from '../../../hooks/useStateEvent';
import { useRoom } from '../../../hooks/useRoom';
import { StateEvent } from '../../../../types/matrix/room';
import { useMatrixClient } from '../../../hooks/useMatrixClient';
import { useAlive } from '../../../hooks/useAlive';
import { Cursor } from '../../../plugins/text-area';
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { syntaxErrorPosition } from '../../../utils/dom';
import { SettingTile } from '../../../components/setting-tile';
import { SequenceCardStyle } from '../styles.css';
import { usePowerLevels } from '../../../hooks/usePowerLevels';
import { usePowerLevelsContext } from '../../../hooks/usePowerLevels';
import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor';
import { useRoomCreators } from '../../../hooks/useRoomCreators';
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
import { useClient } from '../../../hooks/useClient';
const EDITOR_INTENT_SPACE_COUNT = 2;
@ -41,8 +41,8 @@ type StateEventEditProps = {
requestClose: () => void;
};
function StateEventEdit({ type, stateKey, content, requestClose }: StateEventEditProps) {
const mx = useMatrixClient();
const room = useRoom();
const ct = useClient();
const roomId = useRoom();
const alive = useAlive();
const defaultContentStr = useMemo(
@ -57,10 +57,20 @@ function StateEventEdit({ type, stateKey, content, requestClose }: StateEventEdi
EDITOR_INTENT_SPACE_COUNT
);
const [submitState, submit] = useAsyncCallback<object, MatrixError, [object]>(
const [submitState, submit] = useAsyncCallback<void, unknown, [object]>(
useCallback(
(c) => mx.sendStateEvent(room.roomId, type as any, c, stateKey),
[mx, room, type, stateKey]
async (c) => {
const resp = await ct.requestAuthJSON(
putStateEvent({
pathParams: { roomId, eventType: type, stateKey },
body: c,
})
);
const [err] = await parseMatrixResp(resp);
if (err) throw new Error(err.data.error ?? err.data.errcode);
},
[ct, roomId, type, stateKey]
)
);
const submitting = submitState.status === AsyncStatus.Loading;
@ -157,7 +167,9 @@ function StateEventEdit({ type, stateKey, content, requestClose }: StateEventEdi
{submitState.status === AsyncStatus.Error && (
<Text size="T200" style={{ color: color.Critical.Main }}>
<b>{submitState.error.message}</b>
<b>
{submitState.error instanceof Error ? submitState.error.message : 'Unknown Error'}
</b>
</Text>
)}
</Box>
@ -232,29 +244,26 @@ function StateEventView({ content, eventJSONStr, onEditContent }: StateEventView
);
}
export type StateEventInfo = {
type: string;
stateKey: string;
};
export type StateEventEditorProps = StateEventInfo & {
export type StateEventEditorProps = {
event: StateEventWithoutRoomId;
requestClose: () => void;
};
export function StateEventEditor({ type, stateKey, requestClose }: StateEventEditorProps) {
const mx = useMatrixClient();
const room = useRoom();
const stateEvent = useStateEvent(room, type as unknown as StateEvent, stateKey);
export function StateEventEditor({ event, requestClose }: StateEventEditorProps) {
const ct = useClient();
const roomId = useRoom();
const [editContent, setEditContent] = useState<object>();
const powerLevels = usePowerLevels(room);
const creators = useRoomCreators(room);
const powerLevels = usePowerLevelsContext();
const creators = useRoomCreators(roomId);
const permissions = useRoomPermissions(creators, powerLevels);
const canEdit = permissions.stateEvent(type, mx.getSafeUserId());
const canEdit = permissions.stateEvent(event.type, ct.session.userId);
const eventJSONStr = useMemo(() => {
if (!stateEvent) return '';
return JSON.stringify(stateEvent.event, null, EDITOR_INTENT_SPACE_COUNT);
}, [stateEvent]);
const eventJSONStr = useMemo(
() => JSON.stringify(event, null, EDITOR_INTENT_SPACE_COUNT),
[event]
);
const handleCloseEdit = useCallback(() => {
setEditContent(undefined);
@ -284,14 +293,14 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi
<Box grow="Yes" direction="Column">
{editContent ? (
<StateEventEdit
type={type}
stateKey={stateKey}
type={event.type}
stateKey={event.state_key}
content={editContent}
requestClose={handleCloseEdit}
/>
) : (
<StateEventView
content={stateEvent?.getContent() ?? {}}
content={event.content}
onEditContent={canEdit ? setEditContent : undefined}
eventJSONStr={eventJSONStr}
/>

View file

@ -43,3 +43,15 @@ export const useRoomStateEvents = (
return stateEventResult;
};
export const useRoomState = (roomId: string): PendingObservableResult<JoinRoomStateObject[]> => {
const ct = useClient();
const eventsPromise = useMemo(
() => ct.storage.joinRoomState.observableRead.queryIndex('roomId', roomId),
[ct, roomId]
);
const eventsResult = useObservableValuePromise(eventsPromise);
return eventsResult;
};