@peers-app/peers-ui 0.7.2 → 0.7.3

package/dist/components/group-switcher.js

@@ -170,14 +170,13 @@ function CreateGroupModal({ colorMode, userContext, onClose, onGroupCreated }) {
                 isSecret: true,
                 value: { value: groupKeys.secretKey },
             });
-            // Add current user to the group's users table as trusted
-            await (0, peers_sdk_1.Users)(groupDataContext).save({
-                ...me,
-                trustLevel: peers_sdk_1.TrustLevel.Trusted
-            });
+            // Add current user to the group's users table
+            await (0, peers_sdk_1.Users)(groupDataContext).save(me);
+            // Set trust level for current user in the group context
+            await (0, peers_sdk_1.setUserTrustLevel)(me.userId, peers_sdk_1.TrustLevel.Trusted, groupDataContext);
             // Create group in both user's and group's context
             const groupsTable = (0, peers_sdk_1.Groups)(userContext.userDataContext);
-            const newGroup = await groupsTable.save({
+            const newGroup = await groupsTable.signAndSave({
                 groupId,
                 name: trimmedName,
                 description: description.trim(),
@@ -186,9 +185,9 @@ function CreateGroupModal({ colorMode, userContext, onClose, onGroupCreated }) {
                 disabled: false,
                 publicKey: groupKeys.publicKey,
                 publicBoxKey: groupKeys.publicBoxKey,
-                signature: '', // Will be signed by save()
+                signature: '', // Will be set by signAndSave()
             });
-            await (0, peers_sdk_1.Groups)(groupDataContext).save(newGroup);
+            await (0, peers_sdk_1.Groups)(groupDataContext).signAndSave(newGroup);
             // Auto-install peers-core for the new group
             await peers_sdk_1.rpcServerCalls.addOrUpdatePackage(peers_sdk_1.peersCorePackageId, { dataContextId: groupId }).catch((err) => {
                 console.error('Error auto-installing peers-core for group:', err);

package/dist/globals.d.ts

@@ -16,9 +16,9 @@ export declare const groups: import("@peers-app/peers-sdk").Observable<{
     description: string;
     signature: string;
     publicKey: string;
+    publicBoxKey: string;
     groupId: string;
     founderUserId: string;
-    publicBoxKey: string;
     disabled?: boolean | undefined;
     iconClassName?: string | undefined;
     publicRole?: import("@peers-app/peers-sdk").GroupMemberRole | undefined;

package/dist/screens/contacts/contact-details.js

@@ -66,6 +66,22 @@ const ContactInfo = (props) => {
 };
 const TrustLevelSelector = (props) => {
     const { contact } = props;
+    const [trustLevel, setTrustLevelState] = react_1.default.useState(peers_sdk_1.TrustLevel.Unknown);
+    const [loading, setLoading] = react_1.default.useState(true);
+    react_1.default.useEffect(() => {
+        async function loadTrustLevel() {
+            const userContext = await (0, peers_sdk_1.getUserContext)();
+            const level = await (0, peers_sdk_1.getUserTrustLevel)(userContext.userDataContext, contact.userId);
+            setTrustLevelState(level);
+            setLoading(false);
+        }
+        loadTrustLevel();
+    }, [contact.userId]);
+    async function handleTrustLevelChange(newLevel) {
+        const userContext = await (0, peers_sdk_1.getUserContext)();
+        await (0, peers_sdk_1.setUserTrustLevel)(contact.userId, newLevel, userContext.userDataContext);
+        setTrustLevelState(newLevel);
+    }
     const trustLevels = [
         { value: peers_sdk_1.TrustLevel.Self, label: 'Self', color: 'success' },
         { value: peers_sdk_1.TrustLevel.Trusted, label: 'Trusted', color: 'success' },
@@ -76,9 +92,12 @@ const TrustLevelSelector = (props) => {
         { value: peers_sdk_1.TrustLevel.Untrusted, label: 'Untrusted', color: 'danger' },
         { value: peers_sdk_1.TrustLevel.Malicious, label: 'Malicious', color: 'danger' },
     ];
-    return (react_1.default.createElement("div", { className: "d-flex flex-wrap gap-2" }, trustLevels.map(level => (react_1.default.createElement("button", { key: level.value, className: `btn btn-sm ${contact.trustLevel === level.value
+    if (loading) {
+        return react_1.default.createElement(loading_indicator_1.LoadingIndicator, null);
+    }
+    return (react_1.default.createElement("div", { className: "d-flex flex-wrap gap-2" }, trustLevels.map(level => (react_1.default.createElement("button", { key: level.value, className: `btn btn-sm ${trustLevel === level.value
             ? `btn-${level.color}`
-            : `btn-outline-${level.color}`}`, onClick: () => contact.trustLevel = level.value }, level.label)))));
+            : `btn-outline-${level.color}`}`, onClick: () => handleTrustLevelChange(level.value) }, level.label)))));
 };
 (0, ui_loader_1.registerInternalPeersUI)({
     peersUIId: '00contact00details00component',

package/dist/screens/contacts/contact-list.js

@@ -87,9 +87,10 @@ function ContactList() {
                 name: 'New User',
                 publicKey: '',
                 publicBoxKey: '',
-                trustLevel: peers_sdk_1.TrustLevel.NewUser
             });
             await usersTable.save(newContact);
+            // Set initial trust level
+            await (0, peers_sdk_1.setUserTrustLevel)(userId.trim(), peers_sdk_1.TrustLevel.NewUser, userContext.userDataContext);
             // Navigate to the details screen for the new contact
             (0, globals_1.mainContentPath)(`contacts/${userId.trim()}`);
         }

package/dist/screens/groups/group-details.js

@@ -56,14 +56,14 @@ const GroupDetails = (props) => {
         }
         (0, tabs_state_1.updateActiveTabTitle)(group.name || "Group");
         const groupDoc = userGroupTable.initDoc(group);
-        // Bit of a hack - saves go to both the group and user db
-        const originalSave = groupDoc.save;
+        // saves go to both the group and user db
         groupDoc.save = async () => {
-            const saveResult = await originalSave();
             const groupDataContext = userContext.getDataContext(group.groupId);
             const groupGroupTable = (0, peers_sdk_1.Groups)(groupDataContext);
-            await groupGroupTable.save(saveResult.toJS());
-            return saveResult;
+            const groupData = groupDoc.toJS();
+            await groupGroupTable.signAndSave(groupData);
+            await userGroupTable.signAndSave(groupData);
+            return groupDoc.load();
         };
         const originalDelete = groupDoc.delete;
         groupDoc.delete = async () => {

package/dist/screens/groups/group-list.js

@@ -127,12 +127,11 @@ function GroupList() {
         });
         // add me to the group's users table
         const me = await (0, peers_sdk_1.getMe)();
-        await (0, peers_sdk_1.Users)(groupDataContext).save({
-            ...me,
-            trustLevel: peers_sdk_1.TrustLevel.Trusted
-        });
+        await (0, peers_sdk_1.Users)(groupDataContext).save(me);
+        // Set trust level for current user in the group context
+        await (0, peers_sdk_1.setUserTrustLevel)(me.userId, peers_sdk_1.TrustLevel.Trusted, groupDataContext);
         // create group in both the user's and group's context
-        const group = await (0, peers_sdk_1.Groups)(userContext.userDataContext).save({
+        const group = await (0, peers_sdk_1.Groups)(userContext.userDataContext).signAndSave({
             groupId,
             name: groupName,
             description: '',
@@ -141,9 +140,9 @@ function GroupList() {
             disabled: false,
             publicKey: groupKeys.publicKey,
             publicBoxKey: groupKeys.publicBoxKey,
-            signature: '', // calling save will sign
+            signature: '', // will be set via signAndSave
         });
-        await (0, peers_sdk_1.Groups)(groupDataContext).save(group);
+        await (0, peers_sdk_1.Groups)(groupDataContext).signAndSave(group);
         // Auto-install peers-core for the new group
         await peers_sdk_1.rpcServerCalls.addOrUpdatePackage(peers_sdk_1.peersCorePackageId, { dataContextId: groupId }).catch((err) => {
             console.error('Error auto-installing peers-core for group:', err);

package/dist/screens/groups/group-members.js

@@ -28,14 +28,12 @@ const GroupMembersUI = (props) => {
             // If user found from external source, save to current group
             if (user && user.source !== 'currentDataContext') {
                 try {
-                    const newGroupUser = await groupUsersTable.initRecord({
-                        userId: user.userId,
-                        name: user.name,
-                        publicKey: user.publicKey || '',
-                        publicBoxKey: user.publicBoxKey || '',
-                        trustLevel: peers_sdk_1.TrustLevel.NewUser
-                    });
+                    const newGroupUser = { ...user };
+                    delete newGroupUser.source;
+                    delete newGroupUser.trustLevel;
                     await groupUsersTable.save(newGroupUser);
+                    // Set trust level for this user in the group context
+                    await (0, peers_sdk_1.setUserTrustLevel)(user.userId, peers_sdk_1.TrustLevel.NewUser, groupDataContext);
                     // Update user reference to reflect it's now in current group
                     user.trustLevel = peers_sdk_1.TrustLevel.NewUser;
                     user.source = 'currentDataContext';
@@ -153,7 +151,7 @@ const GroupMembersUI = (props) => {
                         role: newMemberRole
                     });
                 }
-                await groupMembersTable.save(member);
+                await groupMembersTable.signAndSave(member);
             }
             // Reset form
             setSelectedContacts([]);
@@ -176,7 +174,7 @@ const GroupMembersUI = (props) => {
             const member = await groupMembersTable.get(memberId);
             if (member) {
                 member.role = newRole;
-                await groupMembersTable.save(member);
+                await groupMembersTable.signAndSave(member);
                 setRefreshKey(prev => prev + 1);
             }
         }

package/dist/screens/setup-user.js

@@ -46,6 +46,7 @@ const SetupUser = () => {
     const [secretKey, setSecretKey] = (0, react_1.useState)('');
     const [error, setError] = (0, react_1.useState)('');
     const [isValidating, setIsValidating] = (0, react_1.useState)(false);
+    document.getElementById('appLoadingDiv')?.remove();
     const isDark = _colorMode === 'dark';
     const handleNewUser = async () => {
         setError('');

package/dist/tabs-layout/tabs-layout.js

@@ -57,7 +57,6 @@ function TabsLayoutApp() {
     if (userId === undefined) {
         return;
     }
-    document.getElementById('appLoadingDiv')?.remove();
     if (!userId) {
         return react_1.default.createElement(setup_user_1.SetupUser, null);
     }
@@ -84,9 +83,7 @@ function TabsLayout(props) {
     });
     if (!loaded)
         return false;
-    if (globals_1.me.name === globals_1.me.userId) {
-        return react_1.default.createElement(setup_user_1.SetupUser, null);
-    }
+    document.getElementById('appLoadingDiv')?.remove();
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(TabsLayoutInternal, null),
         react_1.default.createElement(command_palette_ui_1.CommandPaletteOverlay, null)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peers-app/peers-ui",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/peers-app/peers-ui.git"
@@ -27,7 +27,7 @@
   },
   "peerDependencies": {
     "bootstrap": "^5.3.3",
-    "@peers-app/peers-sdk": "^0.7.2",
+    "@peers-app/peers-sdk": "^0.7.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
@@ -57,7 +57,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^30.0.5",
     "path-browserify": "^1.0.1",
-    "@peers-app/peers-sdk": "0.7.2",
+    "@peers-app/peers-sdk": "0.7.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "string-width": "^7.1.0",

package/src/components/group-switcher.tsx

@@ -1,4 +1,4 @@
-import { getMe, getUserContext, Groups, IGroup, newid, newKeys, peersCorePackageId, rpcServerCalls, TrustLevel, UserContext, Users } from "@peers-app/peers-sdk";
+import { getMe, getUserContext, Groups, IGroup, newid, newKeys, peersCorePackageId, rpcServerCalls, setUserTrustLevel, TrustLevel, UserContext, Users } from "@peers-app/peers-sdk";
 import React, { useEffect, useState } from 'react';
 import { usePromise } from '../hooks';
 
@@ -229,15 +229,15 @@ function CreateGroupModal({ colorMode, userContext, onClose, onGroupCreated }: C
         value: { value: groupKeys.secretKey },
       });
       
-      // Add current user to the group's users table as trusted
-      await Users(groupDataContext).save({
-        ...me,
-        trustLevel: TrustLevel.Trusted
-      });
+      // Add current user to the group's users table
+      await Users(groupDataContext).save(me);
+
+      // Set trust level for current user in the group context
+      await setUserTrustLevel(me.userId, TrustLevel.Trusted, groupDataContext);
 
       // Create group in both user's and group's context
       const groupsTable = Groups(userContext.userDataContext);
-      const newGroup = await groupsTable.save({
+      const newGroup = await groupsTable.signAndSave({
         groupId,
         name: trimmedName,
         description: description.trim(),
@@ -246,10 +246,10 @@ function CreateGroupModal({ colorMode, userContext, onClose, onGroupCreated }: C
         disabled: false,
         publicKey: groupKeys.publicKey,
         publicBoxKey: groupKeys.publicBoxKey,
-        signature: '', // Will be signed by save()
+        signature: '', // Will be set by signAndSave()
       });
 
-      await Groups(groupDataContext).save(newGroup);
+      await Groups(groupDataContext).signAndSave(newGroup);
 
       // Auto-install peers-core for the new group
       await rpcServerCalls.addOrUpdatePackage(peersCorePackageId, { dataContextId: groupId }).catch((err: any) => {

package/src/screens/contacts/contact-details.tsx

@@ -1,4 +1,4 @@
-import { getUserContext, IDoc, IUser, TrustLevel, Users } from "@peers-app/peers-sdk";
+import { getUserContext, getUserTrustLevel, IDoc, IUser, setUserTrustLevel, TrustLevel, Users } from "@peers-app/peers-sdk";
 import React from "react";
 import { Input } from "../../components/input";
 import { LoadingIndicator } from "../../components/loading-indicator";
@@ -124,6 +124,24 @@ const ContactInfo = (props: { contact: IDoc<IUser> }) => {
 
 const TrustLevelSelector = (props: { contact: IDoc<IUser> }) => {
   const { contact } = props;
+  const [trustLevel, setTrustLevelState] = React.useState<TrustLevel>(TrustLevel.Unknown);
+  const [loading, setLoading] = React.useState(true);
+
+  React.useEffect(() => {
+    async function loadTrustLevel() {
+      const userContext = await getUserContext();
+      const level = await getUserTrustLevel(userContext.userDataContext, contact.userId);
+      setTrustLevelState(level);
+      setLoading(false);
+    }
+    loadTrustLevel();
+  }, [contact.userId]);
+
+  async function handleTrustLevelChange(newLevel: TrustLevel) {
+    const userContext = await getUserContext();
+    await setUserTrustLevel(contact.userId, newLevel, userContext.userDataContext);
+    setTrustLevelState(newLevel);
+  }
 
   const trustLevels = [
     { value: TrustLevel.Self, label: 'Self', color: 'success' },
@@ -136,17 +154,21 @@ const TrustLevelSelector = (props: { contact: IDoc<IUser> }) => {
     { value: TrustLevel.Malicious, label: 'Malicious', color: 'danger' },
   ];
 
+  if (loading) {
+    return <LoadingIndicator />;
+  }
+
   return (
     <div className="d-flex flex-wrap gap-2">
       {trustLevels.map(level => (
         <button
           key={level.value}
           className={`btn btn-sm ${
-            contact.trustLevel === level.value 
-              ? `btn-${level.color}` 
+            trustLevel === level.value
+              ? `btn-${level.color}`
               : `btn-outline-${level.color}`
           }`}
-          onClick={() => contact.trustLevel = level.value}
+          onClick={() => handleTrustLevelChange(level.value)}
         >
           {level.label}
         </button>

package/src/screens/contacts/contact-list.tsx

@@ -1,4 +1,4 @@
-import { getUserContext, ICursorIterable, IUserWithSource, observable, TrustLevel, Users, usersCursor } from "@peers-app/peers-sdk";
+import { getUserContext, ICursorIterable, IUserWithSource, observable, setUserTrustLevel, TrustLevel, Users, usersCursor } from "@peers-app/peers-sdk";
 import React, { useEffect, useState } from 'react';
 import { Input } from '../../components/input';
 import { LazyList } from '../../components/lazy-list';
@@ -49,17 +49,19 @@ export function ContactList() {
     try {
       const userContext = await getUserContext();
       const usersTable = Users(userContext.userDataContext);
-      
+
       const newContact = await usersTable.initRecord({
         userId: userId.trim(),
         name: 'New User',
         publicKey: '',
         publicBoxKey: '',
-        trustLevel: TrustLevel.NewUser
       });
-      
+
       await usersTable.save(newContact);
-      
+
+      // Set initial trust level
+      await setUserTrustLevel(userId.trim(), TrustLevel.NewUser, userContext.userDataContext);
+
       // Navigate to the details screen for the new contact
       mainContentPath(`contacts/${userId.trim()}`);
     } catch (error) {

package/src/screens/groups/group-details.tsx

@@ -26,14 +26,14 @@ export const GroupDetails = (props: IProps) => {
     }
     updateActiveTabTitle(group.name || "Group");
     const groupDoc = userGroupTable.initDoc(group);
-    // Bit of a hack - saves go to both the group and user db
-    const originalSave = groupDoc.save;
+    // saves go to both the group and user db
     groupDoc.save = async () => {
-      const saveResult = await originalSave();
       const groupDataContext = userContext.getDataContext(group.groupId);
       const groupGroupTable = Groups(groupDataContext);
-      await groupGroupTable.save(saveResult.toJS());
-      return saveResult;
+      const groupData = groupDoc.toJS();
+      await groupGroupTable.signAndSave(groupData);
+      await userGroupTable.signAndSave(groupData);
+      return groupDoc.load();
     }
     const originalDelete = groupDoc.delete;
     groupDoc.delete = async () => {

package/src/screens/groups/group-list.tsx

@@ -1,4 +1,4 @@
-import { getMe, getUserContext, Groups, ICursorIterable, IGroup, newid, newKeys, observable, peersCorePackageId, rpcServerCalls, TrustLevel, Users } from "@peers-app/peers-sdk";
+import { getMe, getUserContext, Groups, ICursorIterable, IGroup, newid, newKeys, observable, peersCorePackageId, rpcServerCalls, setUserTrustLevel, TrustLevel, Users } from "@peers-app/peers-sdk";
 import React, { useEffect, useState } from 'react';
 import { Input } from '../../components/input';
 import { LazyList } from '../../components/lazy-list';
@@ -98,13 +98,13 @@ export function GroupList() {
     
     // add me to the group's users table
     const me = await getMe();
-    await Users(groupDataContext).save({
-      ...me,
-      trustLevel: TrustLevel.Trusted
-    });
+    await Users(groupDataContext).save(me);
+
+    // Set trust level for current user in the group context
+    await setUserTrustLevel(me.userId, TrustLevel.Trusted, groupDataContext);
 
     // create group in both the user's and group's context
-    const group = await Groups(userContext.userDataContext).save({
+    const group = await Groups(userContext.userDataContext).signAndSave({
       groupId,
       name: groupName,
       description: '',
@@ -113,9 +113,9 @@ export function GroupList() {
       disabled: false,
       publicKey: groupKeys.publicKey,
       publicBoxKey: groupKeys.publicBoxKey,
-      signature: '', // calling save will sign
+      signature: '', // will be set via signAndSave
     });
-    await Groups(groupDataContext).save(group);
+    await Groups(groupDataContext).signAndSave(group);
 
     // Auto-install peers-core for the new group
     await rpcServerCalls.addOrUpdatePackage(peersCorePackageId, { dataContextId: groupId }).catch((err: any) => {

package/src/screens/groups/group-members.tsx

@@ -1,4 +1,4 @@
-import { GroupMembers, getUserContext, IUserWithSource, usersCursor, getUserById, Users, TrustLevel, GroupMemberRole, getUserRole, getRoleLabel, Groups, UserContext } from "@peers-app/peers-sdk";
+import { GroupMembers, getUserContext, IUserWithSource, usersCursor, getUserById, Users, TrustLevel, GroupMemberRole, getUserRole, getRoleLabel, Groups, UserContext, setUserTrustLevel, IUser } from "@peers-app/peers-sdk";
 import React from "react";
 import { LoadingIndicator } from "../../components/loading-indicator";
 import { Typeahead, TypeaheadItem } from "../../components/typeahead";
@@ -34,16 +34,14 @@ export const GroupMembersUI = (props: GroupMembersUIProps) => {
         // If user found from external source, save to current group
         if (user && user.source !== 'currentDataContext') {
           try {
-            const newGroupUser = await groupUsersTable.initRecord({
-              userId: user.userId,
-              name: user.name,
-              publicKey: user.publicKey || '',
-              publicBoxKey: user.publicBoxKey || '',
-              trustLevel: TrustLevel.NewUser
-            });
-            
+            const newGroupUser: IUser = { ...user };
+            delete (newGroupUser as any).source;
+            delete (newGroupUser as any).trustLevel;
             await groupUsersTable.save(newGroupUser);
-            
+
+            // Set trust level for this user in the group context
+            await setUserTrustLevel(user.userId, TrustLevel.NewUser, groupDataContext);
+
             // Update user reference to reflect it's now in current group
             user.trustLevel = TrustLevel.NewUser;
             user.source = 'currentDataContext';
@@ -183,7 +181,7 @@ export const GroupMembersUI = (props: GroupMembersUIProps) => {
             role: newMemberRole
           });
         }
-        await groupMembersTable.save(member);
+        await groupMembersTable.signAndSave(member);
       }
       
       // Reset form
@@ -210,7 +208,7 @@ export const GroupMembersUI = (props: GroupMembersUIProps) => {
       const member = await groupMembersTable.get(memberId);
       if (member) {
         member.role = newRole;
-        await groupMembersTable.save(member);
+        await groupMembersTable.signAndSave(member);
         setRefreshKey(prev => prev + 1);
       }
     } catch (err) {

package/src/screens/setup-user.tsx

@@ -14,6 +14,8 @@ export const SetupUser = () => {
   const [error, setError] = useState('');
   const [isValidating, setIsValidating] = useState(false);
 
+  document.getElementById('appLoadingDiv')?.remove();
+
   const isDark = _colorMode === 'dark';
 
   const handleNewUser = async () => {

package/src/tabs-layout/tabs-layout.tsx

@@ -23,8 +23,6 @@ export function TabsLayoutApp() {
     return;
   }
 
-  document.getElementById('appLoadingDiv')?.remove();
-
   if (!userId) {
     return <SetupUser />;
   } else {
@@ -53,9 +51,7 @@ export function TabsLayout(props: { userId: string }) {
 
   if (!loaded) return false;
 
-  if (me.name === me.userId) {
-    return <SetupUser />
-  }
+  document.getElementById('appLoadingDiv')?.remove();
 
   return (
     <>