@dxos/shell 0.3.11-main.68db74e → 0.3.11-main.6901f09

package/src/components/Panel/Action.tsx

@@ -6,7 +6,7 @@ import { CaretDown, Check, type IconProps, Placeholder } from '@phosphor-icons/r
 import { useControllableState } from '@radix-ui/react-use-controllable-state';
 import React, { type Dispatch, type FC, forwardRef, type SetStateAction } from 'react';
 
-import { type ButtonProps, Button, type ComponentFragment, DropdownMenu, useTranslation } from '@dxos/react-ui';
+import { type ButtonProps, Button, DropdownMenu, useTranslation } from '@dxos/react-ui';
 import { descriptionText, getSize, mx } from '@dxos/react-ui-theme';
 
 export type LargeButtonProps = ButtonProps & {
@@ -26,21 +26,6 @@ export type BifurcatedActionProps = {
   defaultActiveAction?: string;
 } & Omit<LargeButtonProps, 'children' | 'onClick'>;
 
-const buttonColorFragment: ComponentFragment<LargeButtonProps> = (props: LargeButtonProps) => {
-  const resolvedVariant = props.variant ?? 'default';
-  return [
-    !props.disabled
-      ? resolvedVariant === 'default'
-        ? 'bg-neutral-25 hover:bg-white hover:text-primary-500 active:bg-neutral-25 dark:active:bg-neutral-800'
-        : resolvedVariant === 'ghost'
-        ? 'active:bg-neutral-125 dark:active:bg-neutral-800'
-        : resolvedVariant === 'primary'
-        ? 'active:bg-primary-700 dark:active:bg-primary-500'
-        : ''
-      : '',
-  ];
-};
-
 const defaultActions = {
   noopAction: {
     label: 'No-op',
@@ -76,7 +61,7 @@ export const BifurcatedAction = forwardRef<HTMLButtonElement, BifurcatedActionPr
     <div role='none' className={mx('mbs-2 flex gap-px items-center', isFull && 'is-full')}>
       <Button
         {...rest}
-        classNames={['bs-11 flex-1 min-is-0 flex gap-2 rounded-ie-none', classNames, ...buttonColorFragment(props)]}
+        classNames={['bs-11 flex-1 min-is-0 flex gap-2 rounded-ie-none', classNames]}
         ref={forwardedRef}
         variant={variant}
         onClick={activeAction.onClick}
@@ -86,7 +71,7 @@ export const BifurcatedAction = forwardRef<HTMLButtonElement, BifurcatedActionPr
       </Button>
       <DropdownMenu.Root>
         <DropdownMenu.Trigger asChild>
-          <Button classNames={['bs-11 flex-none rounded-is-none', classNames, ...buttonColorFragment(props)]}>
+          <Button classNames={['bs-11 flex-none rounded-is-none', classNames]}>
             <span className='sr-only'>{t('invite options label')}</span>
             <CaretDown />
           </Button>
@@ -132,7 +117,7 @@ export const Action = forwardRef<HTMLButtonElement, LargeButtonProps>((props, fo
   return (
     <Button
       {...rest}
-      classNames={[isFull && 'is-full', 'bs-11 flex gap-2 mbs-2', ...buttonColorFragment(props), classNames]}
+      classNames={[isFull && 'is-full', 'bs-11 flex gap-2 mbs-2', classNames]}
       ref={forwardedRef}
       variant={variant}
     >

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

@@ -4,9 +4,9 @@
 
 import '@dxosTheme';
 
-import { faker } from '@faker-js/faker';
 import React from 'react';
 
+import { faker } from '@dxos/random';
 import { PublicKey } from '@dxos/react-client';
 import { DeviceKind } from '@dxos/react-client/halo';
 import { Invitation } from '@dxos/react-client/invitations';

package/src/panels/IdentityPanel/IdentityPanel.tsx

@@ -32,7 +32,7 @@ const IdentityHeading = ({ titleId, title, identity, onDone }: IdentityPanelHead
         <Avatar.Frame classNames='block mbs-4 mbe-2 mli-auto chromatic-ignore'>
           <Avatar.Fallback href={fallbackHref} />
         </Avatar.Frame>
-        <Avatar.Label classNames='block text-center font-light text-xl'>
+        <Avatar.Label classNames='block text-center font-light text-xl' data-testid='identityHeading.displayName'>
           {identity.profile?.displayName ?? generateName(identity.identityKey.toHex())}
         </Avatar.Label>
       </Avatar.Root>

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

@@ -88,7 +88,11 @@ export const IdentityActionChooserImpl = ({
             <span className='grow mli-3'>{t('choose profile label')}</span>
             <CaretRight weight='bold' className={getSize(4)} />
           </Action>
-          <Action data-testid='sign-out' onClick={() => send?.({ type: 'chooseSignOut' })} classNames='plb-4'>
+          <Action
+            data-testid='devices-panel.sign-out'
+            onClick={() => send?.({ type: 'chooseSignOut' })}
+            classNames='plb-4'
+          >
             <Power className={getSize(6)} />
             <span className='grow mli-3'>{t('choose sign out label')}</span>
             <CaretRight weight='bold' className={getSize(4)} />

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

@@ -62,6 +62,7 @@ const SignOutChooserImpl = ({ disabled, onResetDevice, onJoinNewIdentity, onBack
         </Action>
         <Action
           variant='primary'
+          data-testid='sign-out.join-new-identity'
           classNames='!bg-error-500 hover:!bg-error-550'
           disabled={disabled}
           onClick={onJoinNewIdentity}
@@ -70,6 +71,7 @@ const SignOutChooserImpl = ({ disabled, onResetDevice, onJoinNewIdentity, onBack
         </Action>
         <Action
           variant='primary'
+          data-testid='sign-out.reset-device'
           classNames='!bg-error-500 hover:!bg-error-550'
           disabled={disabled}
           onClick={onResetDevice}

package/src/panels/JoinPanel/joinMachine.ts

@@ -15,7 +15,7 @@ import {
 } from 'xstate';
 
 import { log } from '@dxos/log';
-import type { Client } from '@dxos/react-client';
+import { type Client, AlreadyJoinedError } from '@dxos/react-client';
 import { type Identity } from '@dxos/react-client/halo';
 import { type AuthenticatingInvitationObservable, Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 
@@ -133,6 +133,12 @@ const getInvitationSubscribable = (
           }
         },
         (error: any) => {
+          if (error instanceof AlreadyJoinedError) {
+            log('[already joined]', { Kind, error });
+            next({ type: `success${Kind}Invitation`, invitation: invitation.get() });
+            return complete?.();
+          }
+
           log.error('[invitation errored]', { Kind, error });
           next({ type: `fail${Kind}Invitation`, reason: 'error' });
           return onError?.(error);
@@ -437,9 +443,8 @@ const useJoinMachine = (
     ({ halo }: JoinMachineContext) => {
       if (halo.unredeemedCode) {
         try {
-          const invitationObservable = client.halo.join(
-            InvitationEncoder.decode(defaultCodeFromUrl('halo', halo.unredeemedCode)),
-          );
+          const invitation = InvitationEncoder.decode(defaultCodeFromUrl('halo', halo.unredeemedCode));
+          const invitationObservable = client.halo.join(invitation);
           return {
             ...halo,
             invitationObservable,
@@ -461,20 +466,12 @@ const useJoinMachine = (
       if (space.unredeemedCode) {
         try {
           const invitation = InvitationEncoder.decode(defaultCodeFromUrl('space', space.unredeemedCode));
-          // Don’t join with the invitation if it has already succeeded.
-          if (space.succeededKeys?.has(invitation.spaceKey?.toHex() ?? 'never')) {
-            return {
-              ...space,
-              invitation,
-            };
-          } else {
-            const invitationObservable = client.spaces.join(invitation);
-            return {
-              ...space,
-              invitationObservable,
-              invitationSubscribable: getInvitationSubscribable('Space', invitationObservable),
-            };
-          }
+          const invitationObservable = client.spaces.join(invitation);
+          return {
+            ...space,
+            invitationObservable,
+            invitationSubscribable: getInvitationSubscribable('Space', invitationObservable),
+          };
         } catch (err) {
           log.error('Could not redeem space invitation code', err);
           return space;

package/src/panels/JoinPanel/steps/AdditionMethodChooser.tsx

@@ -35,7 +35,7 @@ export const AdditionMethodChooser = (viewStateProps: AdditionMethodChooserProps
           before={<Plus className={getSize(6)} />}
           onClick={() => send({ type: 'createIdentity' })}
           data-autofocus='choosingAuthMethod'
-          data-testid='create-identity'
+          data-testid='identity-chooser.create-identity'
         >
           {t('create identity label')}
         </CompoundButton>
@@ -44,7 +44,7 @@ export const AdditionMethodChooser = (viewStateProps: AdditionMethodChooserProps
           description={t('join identity description')}
           before={<QrCode className={getSize(6)} />}
           onClick={() => send({ type: 'acceptHaloInvitation' })}
-          data-testid='join-identity'
+          data-testid='identity-chooser.join-identity'
         >
           {t('join identity label')}
         </CompoundButton>
@@ -55,7 +55,7 @@ export const AdditionMethodChooser = (viewStateProps: AdditionMethodChooserProps
           description={t('recover identity description')}
           before={<Textbox className={getSize(6)} />}
           onClick={() => send({ type: 'recoverIdentity' })}
-          data-testid='recover-identity'
+          data-testid='identity-chooser.recover-identity'
         >
           {t('recover identity label')}
         </CompoundButton>

package/src/panels/JoinPanel/steps/InvitationInput.tsx

@@ -39,12 +39,17 @@ export const InvitationInput = (props: InvitationInputProps) => {
     unredeemedCode && setInputValue(unredeemedCode ?? '');
   }, [unredeemedCode]);
 
-  const handleNext = () =>
+  const handleNext = () => {
+    if (inputValue.trim().length === 0) {
+      return;
+    }
+
     send({
       type: `set${Kind}InvitationCode`,
       code: invitationCodeFromUrl(inputValue),
       ...(Kind === 'Space' && { succeededKeys }),
     });
+  };
 
   const exitAction = (
     <Action
@@ -62,6 +67,7 @@ export const InvitationInput = (props: InvitationInputProps) => {
       <div role='none' className='grow flex flex-col justify-center'>
         <Input
           label={<StepHeading>{t('invitation input label')}</StepHeading>}
+          // TODO(burdon): Translation.
           placeholder='Type an invitation code'
           disabled={disabled}
           value={inputValue}

package/src/panels/JoinPanel/steps/InvitationRescuer.tsx

@@ -39,8 +39,8 @@ const InvitationActions = ({
             failReason === 'timeout'
               ? 'timeout status label'
               : failReason === 'cancelled'
-              ? 'cancelled status label'
-              : 'error status label',
+                ? 'cancelled status label'
+                : 'error status label',
           )}
         </StepHeading>
         <div role='none' className='grow' />

package/src/panels/JoinPanel/steps/ResetIdentity.tsx

@@ -50,7 +50,7 @@ export const ResetIdentityImpl = ({ disabled, validationMessage, onConfirm }: Re
           {...{ validationMessage }}
           label={<StepHeading>{t('reset identity input label', { confirmationValue })}</StepHeading>}
           disabled={disabled}
-          data-testid='identity-input'
+          data-testid='reset-identity-input'
           placeholder={confirmationValue}
           onChange={({ target: { value } }) => setInputValue(value)}
         />

package/src/playwright/invitations-manager.ts

@@ -70,6 +70,10 @@ export class InvitationsManager extends ScopedShellManager {
     return this.peer(id).getByTestId('space-list-item').nth(nth).textContent();
   }
 
+  async getSpaceMembersCount(id: number) {
+    return this.peer(id).getByTestId('space-members-list').locator('li').count();
+  }
+
   async getAuthCode(): Promise<string> {
     return await this._authCode.wait();
   }
@@ -147,7 +151,7 @@ export class InvitationsManager extends ScopedShellManager {
     const peer = this.peer(id);
     // TODO(wittjosiah): Update ids.
     if (type === 'device') {
-      await peer.getByTestId('join-identity').click();
+      await peer.getByTestId('identity-chooser.join-identity').click();
     }
     await peer.getByTestId(`${type === 'device' ? 'halo' : 'space'}-invitation-input`).waitFor({ timeout: 500 });
     await peer.getByTestId(`${type === 'device' ? 'halo' : 'space'}-invitation-input`).fill(invitation);

package/src/playwright/invitations.spec.ts

@@ -185,6 +185,25 @@ test.describe('Invitations', () => {
       expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
     });
 
+    test('already joined', async () => {
+      await manager.createIdentity(0);
+      await manager.createSpace(0);
+      await manager.openPanel(0, 1);
+      const invitation1 = await manager.createInvitation(0, 'space', { authMethod: Invitation.AuthMethod.NONE });
+      const invitation2 = await manager.createInvitation(0, 'space');
+
+      await manager.createIdentity(1);
+      await manager.openPanel(1, 'join');
+      await manager.acceptInvitation(1, 'space', invitation1);
+      await manager.doneInvitation('space', manager.peer(1));
+
+      await manager.openPanel(1, 'join');
+      await manager.acceptInvitation(1, 'space', invitation2);
+      await manager.doneInvitation('space', manager.peer(1));
+
+      expect(await manager.getSpaceMembersCount(0)).to.equal(2);
+    });
+
     test('no auth method', async () => {
       await manager.createIdentity(0);
       await manager.createSpace(0);

package/src/stories/Invitations.e2e-stories.tsx

@@ -4,10 +4,10 @@
 
 import '@dxosTheme';
 
-import { faker } from '@faker-js/faker';
 import { Laptop, Planet, Plus, PlusCircle, SignIn, QrCode, WifiHigh, WifiSlash } from '@phosphor-icons/react';
 import React, { useMemo, useState } from 'react';
 
+import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type Space, type SpaceMember, SpaceProxy, useSpaces } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
@@ -72,7 +72,7 @@ const Panel = ({ id, panel, setPanel }: { id: number; panel?: PanelType; setPane
         <ButtonGroup classNames='mbe-4'>
           {/* <Tooltip content='Create Space'> */}
           <Button
-            onClick={() => client.spaces.create({ name: faker.animal.bird() })}
+            onClick={() => client.spaces.create({ name: faker.commerce.productName() })}
             data-testid='invitations.create-space'
           >
             <PlusCircle className={getSize(6)} />

package/src/styles/invitationStatusStyles.ts

@@ -26,17 +26,17 @@ export const resolvedStrokeColor = (status: Invitation.State) =>
   status === Invitation.State.ERROR
     ? errorStrokeColor
     : status === Invitation.State.CANCELLED || status === Invitation.State.TIMEOUT
-    ? cancelledStrokeColor
-    : successStrokeColor;
+      ? cancelledStrokeColor
+      : successStrokeColor;
 export const resolvedBgColor = (status: Invitation.State) =>
   status === Invitation.State.ERROR
     ? errorBgColor
     : status === Invitation.State.CANCELLED || status === Invitation.State.TIMEOUT
-    ? cancelledBgColor
-    : successBgColor;
+      ? cancelledBgColor
+      : successBgColor;
 export const resolvedTextColor = (status: Invitation.State) =>
   status === Invitation.State.ERROR
     ? errorTextColor
     : status === Invitation.State.CANCELLED || status === Invitation.State.TIMEOUT
-    ? cancelledTextColor
-    : successTextColor;
+      ? cancelledTextColor
+      : successTextColor;

package/src/testing/shell-manager.ts

@@ -2,12 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import type { ConsoleMessage, Page } from '@playwright/test';
+import type { ConsoleMessage, Dialog, Page } from '@playwright/test';
 
 import { sleep, Trigger } from '@dxos/async';
 
 import { ScopedShellManager } from './scoped-shell-manager';
 
+// TODO(wittjosiah): Normalize data-testids between snake and camel case.
+
 export class ShellManager extends ScopedShellManager {
   private _invitationCode = new Trigger<string>();
   private _authCode = new Trigger<string>();
@@ -27,6 +29,10 @@ export class ShellManager extends ScopedShellManager {
 
   // Getters
 
+  async getDisplayName(): Promise<string | null> {
+    return this.shell.getByTestId('identityHeading.displayName').textContent();
+  }
+
   async isCurrentSpaceViewVisible(): Promise<boolean> {
     return await this.shell.getByTestId('current-space-view').isVisible();
   }
@@ -44,29 +50,50 @@ export class ShellManager extends ScopedShellManager {
     await this.shell.getByTestId('halo-invitation-accepted-done').click();
   }
 
-  async closeShell() {
-    await this.page.keyboard.press('Escape');
+  async createDeviceInvitation(): Promise<string> {
+    this._invitationCode = new Trigger<string>();
+    this._authCode = new Trigger<string>();
+    await this.shell.getByTestId('devices-panel.create-invitation').click();
+    return await this._invitationCode.wait();
   }
 
-  // TODO(wittjosiah): These shortcuts are no longer within the SDK so these commands should live elsewhere.
-  async openCurrentSpace() {
-    await this.page.keyboard.press('Meta+.');
+  async resetDevice() {
+    const handleDialog = async (dialog: Dialog) => {
+      if (dialog.type() === 'confirm') {
+        await dialog.accept();
+      }
+    };
+
+    this.page.on('dialog', handleDialog);
+    await this.shell.getByTestId('devices-panel.sign-out').click();
+    await this.shell.getByTestId('sign-out.reset-device').click();
+    this.page.off('dialog', handleDialog);
   }
 
-  async openSpaceList() {
-    await this.page.keyboard.press('Meta+Shift+>');
+  async joinNewIdentity(invitationCode: string) {
+    await this.shell.getByTestId('devices-panel.sign-out').click();
+    await this.shell.getByTestId('sign-out.join-new-identity').click();
+    await this.shell.getByTestId('reset-identity-input').fill('CONFIRM');
+    await this.shell.getByTestId('reset-identity-input-confirm').click();
+    await this.shell.getByTestId('identity-chooser.join-identity').click();
+    await this.inputInvitation('device', invitationCode, this.shell);
   }
 
-  async showAllSpaces() {
-    await this.shell.getByTestId('show-all-spaces').click();
+  async authenticateDevice(authCode: string, skipDone = true) {
+    // Wait for focus to shift before typing.
+    await sleep(1500);
+    await this.authenticateInvitation('device', authCode, this.shell);
+    // TODO(wittjosiah): When "signing out" and joinging a new identity, the done step seems to be skipped.
+    if (!skipDone) {
+      await this.doneInvitation('device', this.shell);
+    }
   }
 
-  async showCurrentSpace() {
-    await this.shell.getByTestId('show-current-space').click();
+  async closeShell() {
+    await this.page.keyboard.press('Escape');
   }
 
   async createSpaceInvitation(): Promise<string> {
-    await this.openCurrentSpace();
     this._invitationCode = new Trigger<string>();
     this._authCode = new Trigger<string>();
     await this.shell.getByTestId('spaces-panel.create-invitation').click();