@dxos/shell 0.3.11-main.8a2cfe6 → 0.3.11-main.8be6c8a

package/src/panels/IdentityPanel/IdentityPanel.stories.tsx

@@ -8,6 +8,7 @@ import { faker } from '@faker-js/faker';
 import React from 'react';
 
 import { PublicKey } from '@dxos/react-client';
+import { DeviceKind } from '@dxos/react-client/halo';
 import { Invitation } from '@dxos/react-client/invitations';
 import { withTheme } from '@dxos/storybook-utils';
 
@@ -16,6 +17,7 @@ import type { IdentityPanelImplProps } from './IdentityPanelProps';
 import { IdentityActionChooserImpl } from './steps';
 import { StorybookDialog } from '../../components/StorybookDialog';
 import { InvitationManager, type InvitationManagerProps } from '../../steps';
+import { osTranslations } from '../../translations';
 
 faker.seed(1234);
 
@@ -30,12 +32,13 @@ const noOpProps: IdentityPanelImplProps = {
       displayName: faker.person.firstName(),
     },
   },
+  devices: [],
 };
 
 export default {
-  title: 'Panels/Identity',
+  title: 'react-shell/IdentityPanel',
   decorators: [withTheme],
-  parameters: { chromatic: { disableSnapshot: false } },
+  parameters: { translations: [osTranslations], chromatic: { disableSnapshot: false } },
 };
 
 export const IdentityActionChooser = () => {
@@ -50,6 +53,45 @@ export const IdentityActionChooser = () => {
   );
 };
 
+export const UpdateProfileForm = () => {
+  return (
+    <StorybookDialog inOverlayLayout>
+      <IdentityPanelImpl
+        {...noOpProps}
+        activeView='update profile form'
+        IdentityActionChooser={IdentityActionChooserImpl}
+      />
+    </StorybookDialog>
+  );
+};
+
+export const DeviceManager = () => {
+  return (
+    <StorybookDialog inOverlayLayout>
+      <IdentityPanelImpl
+        {...{
+          ...noOpProps,
+          devices: [
+            { deviceKey: PublicKey.random(), kind: DeviceKind.CURRENT },
+            { deviceKey: PublicKey.random(), kind: DeviceKind.TRUSTED },
+            { deviceKey: PublicKey.random(), kind: DeviceKind.TRUSTED },
+          ],
+        }}
+        activeView='device manager'
+        IdentityActionChooser={IdentityActionChooserImpl}
+      />
+    </StorybookDialog>
+  );
+};
+
+export const DeviceManagerEmpty = () => {
+  return (
+    <StorybookDialog inOverlayLayout>
+      <IdentityPanelImpl {...noOpProps} activeView='device manager' IdentityActionChooser={IdentityActionChooserImpl} />
+    </StorybookDialog>
+  );
+};
+
 const DeviceInvitationManagerWithState = (extraProps: InvitationManagerProps) => (
   <StorybookDialog inOverlayLayout>
     <IdentityPanelImpl

package/src/panels/IdentityPanel/IdentityPanel.tsx

@@ -6,7 +6,7 @@ import React, { useEffect, useMemo } from 'react';
 import { generateName } from '@dxos/display-name';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
-import { type Identity, useIdentity } from '@dxos/react-client/halo';
+import { type Identity, useIdentity, useDevices } from '@dxos/react-client/halo';
 import { useInvitationStatus } from '@dxos/react-client/invitations';
 import type { CancellableInvitationObservable } from '@dxos/react-client/invitations';
 import { Avatar, DensityProvider, useId, useJdenticonHref, useTranslation } from '@dxos/react-ui';
@@ -17,7 +17,7 @@ import {
   type IdentityPanelProps,
 } from './IdentityPanelProps';
 import { useIdentityMachine } from './identityMachine';
-import { IdentityActionChooser, ProfileForm } from './steps';
+import { DeviceManager, IdentityActionChooser, ProfileForm } from './steps';
 import { Viewport, Heading, CloseButton } from '../../components';
 import { InvitationManager } from '../../steps';
 
@@ -54,12 +54,14 @@ export const IdentityPanelImpl = (props: IdentityPanelImplProps) => {
   const title = useMemo(() => {
     switch (activeView) {
       case 'device manager':
-      case 'device invitation manager':
         return t('choose devices label');
+      case 'device invitation manager':
+        return t('choose add device label');
       default:
         return t('identity heading');
     }
   }, [activeView, t]);
+  console.log('[IdentityPanelImpl]', { activeView });
   return (
     <DensityProvider density='fine'>
       <IdentityHeading {...{ identity, titleId, title, onDone }} />
@@ -75,6 +77,9 @@ export const IdentityPanelImpl = (props: IdentityPanelImplProps) => {
               invitationUrl={rest.createInvitationUrl(rest.invitationCode!)}
             />
           </Viewport.View>
+          <Viewport.View id='device manager' classNames={viewStyles}>
+            <DeviceManager active={activeView === 'device manager'} {...rest} />
+          </Viewport.View>
           <Viewport.View classNames={viewStyles} id='update profile form'>
             <ProfileForm
               send={rest.send}
@@ -105,6 +110,7 @@ export const IdentityPanel = ({
 }: IdentityPanelProps) => {
   const titleId = useId('identityPanel__heading', propsTitleId);
   const client = useClient();
+  const devices = useDevices();
   const identity = useIdentity();
   if (!identity) {
     console.error('IdentityPanel rendered with no active identity.');
@@ -126,6 +132,8 @@ export const IdentityPanel = ({
         return 'identity action chooser';
       case identityState.matches('managingDeviceInvitation'):
         return 'device invitation manager';
+      case identityState.matches('managingDevices'):
+        return 'device manager';
       case [{ managingProfile: 'idle' }, { managingProfile: 'pending' }].some(identityState.matches):
         return 'update profile form';
       // case identityState.matches('signingOut'):
@@ -135,6 +143,8 @@ export const IdentityPanel = ({
     }
   }, [identityState]);
 
+  console.log({ activeView, identityState });
+
   const onUpdateProfile = async (profile: NonNullable<Identity['profile']>) => {
     identitySend({ type: 'updateProfile' });
     await client.halo.updateProfile(profile);
@@ -143,6 +153,7 @@ export const IdentityPanel = ({
   const implProps = {
     ...props,
     identity,
+    devices,
     activeView,
     send: identitySend,
     titleId,

package/src/panels/IdentityPanel/IdentityPanelProps.ts

@@ -2,19 +2,20 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type cloneElement } from 'react';
-import { type Event, type SingleOrArray } from 'xstate';
+import type { cloneElement } from 'react';
+import type { Event, SingleOrArray } from 'xstate';
 
-import type { Identity } from '@dxos/react-client/halo';
-import { type InvitationStatus } from '@dxos/react-client/invitations';
+import type { Device, Identity } from '@dxos/react-client/halo';
+import type { InvitationStatus } from '@dxos/react-client/invitations';
 
-import { type IdentityEvent } from './identityMachine';
-import { type InvitationManagerProps } from '../../steps';
+import type { IdentityEvent } from './identityMachine';
+import type { InvitationManagerProps } from '../../steps';
 
 export type IdentityPanelImplProps = {
   titleId: string;
   activeView: 'device manager' | 'update profile form' | 'device invitation manager' | 'identity action chooser';
   identity: Identity;
+  devices: Device[];
   onUpdateProfile?: (profile: NonNullable<Identity['profile']>) => Promise<void>;
   createInvitationUrl: (invitationCode: string) => string;
   send?: (event: SingleOrArray<Event<IdentityEvent>>) => void;

package/src/panels/IdentityPanel/identityMachine.ts

@@ -58,6 +58,7 @@ const identityMachine = createMachine<IdentityMachineContext, IdentityEvent>(
     states: {
       choosingAction: {},
       managingDeviceInvitation: {},
+      managingDevices: {},
       managingProfile: {
         initial: 'idle',
         states: {
@@ -73,9 +74,9 @@ const identityMachine = createMachine<IdentityMachineContext, IdentityEvent>(
     },
     on: {
       unchooseAction: { target: '.choosingAction', actions: ['unsetInvitation', 'log'] },
-      chooseDevices: { target: '.managingDeviceInvitation', actions: ['unsetInvitation', 'log'] },
       deselectInvitation: { target: '.choosingAction', actions: ['unsetInvitation', 'log'] },
       selectInvitation: { target: '.managingDeviceInvitation', actions: ['setInvitation', 'log'] },
+      chooseDevices: { target: '.managingDevices', actions: 'log' },
       chooseProfile: { target: '.managingProfile', actions: 'log' },
       // chooseSignOut: { target: '.signingOut', actions: 'log' },
     },

package/src/panels/IdentityPanel/steps/DeviceManager.tsx

@@ -0,0 +1,41 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React from 'react';
+import { type Event, type SingleOrArray } from 'xstate';
+
+import { type Device } from '@dxos/react-client/halo';
+import { useTranslation } from '@dxos/react-ui';
+
+import { Action, Actions, DeviceList } from '../../../components';
+import type { IdentityPanelStepProps } from '../IdentityPanelProps';
+import type { IdentityEvent } from '../identityMachine';
+
+export interface DeviceManagerProps extends Omit<IdentityPanelStepProps, 'send'> {
+  send?: (event: SingleOrArray<Event<IdentityEvent>>) => void;
+  devices: Device[];
+}
+
+export const DeviceManager = ({ devices, active, send }: DeviceManagerProps) => {
+  const { t } = useTranslation('os');
+  const disabled = !active;
+
+  return (
+    <>
+      <div role='none' className='grow'>
+        <DeviceList devices={devices} />
+      </div>
+      <Actions>
+        <Action
+          variant='ghost'
+          disabled={disabled}
+          onClick={() => send?.({ type: 'unchooseAction' })}
+          data-testid={'manage-devices-back'}
+        >
+          {t('back label')}
+        </Action>
+      </Actions>
+    </>
+  );
+};

package/src/panels/IdentityPanel/steps/IdentityActionChooser.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { CaretRight, Plus, Power, UserGear } from '@phosphor-icons/react';
+import { CaretRight, Devices, Plus, Power, UserGear } from '@phosphor-icons/react';
 import React, { useCallback } from 'react';
 
 import { useClient } from '@dxos/react-client';
@@ -70,6 +70,11 @@ export const IdentityActionChooserImpl = ({
             classNames='plb-4'
           >
             <Plus className={getSize(6)} />
+            <span className='grow mli-3'>{t('choose add device label')}</span>
+            <CaretRight weight='bold' className={getSize(4)} />
+          </Action>
+          <Action data-testid='manage-devices' onClick={() => send?.({ type: 'chooseDevices' })} classNames='plb-4'>
+            <Devices className={getSize(6)} />
             <span className='grow mli-3'>{t('choose devices label')}</span>
             <CaretRight weight='bold' className={getSize(4)} />
           </Action>

package/src/panels/IdentityPanel/steps/ProfileForm.tsx

@@ -37,7 +37,7 @@ export const ProfileForm = (props: ProfileFormProps) => {
 };
 
 // TODO(zhenyasav): impl shouldn't need send()
-export const ProfileFormImpl = (props: ProfileFormImplProps) => {
+const ProfileFormImpl = (props: ProfileFormImplProps) => {
   const { active, profile, send, onUpdateProfile, validationMessage } = props;
   const disabled = !active;
   const { t } = useTranslation('os');

package/src/panels/IdentityPanel/steps/index.ts

@@ -2,5 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './DeviceManager';
 export * from './IdentityActionChooser';
 export * from './ProfileForm';

package/src/translations/locales/en-US.ts

@@ -69,7 +69,8 @@ export const os = {
   'selecting identity heading': 'Selecting identity',
   'devices heading': 'Devices',
   'identity heading': 'Profile settings',
-  'choose devices label': 'Add device',
+  'choose add device label': 'Add device',
+  'choose devices label': 'Manage devices',
   'choose profile label': 'Edit profile',
   'choose sign out label': 'Sign out',
   'empty space members message': 'There is nobody in this space yet.',