@vertesia/ui 1.6.0-dev.20260912.110338Z → 1.6.0-dev.20260918.061604Z

package/src/shell/login/signInUtils.ts

@@ -1,3 +1,4 @@
+import { Env } from '@vertesia/ui/env';
 import { getFirebaseAuth, setFirebaseTenant } from '@vertesia/ui/session';
 import {
     type AuthProvider,
@@ -197,7 +198,7 @@ export async function startSignIn(
     } else {
         // No tenant — clear any stale tenant routing from a prior attempt.
         localStorage.removeItem('tenantName');
-        if (auth.tenantId) auth.tenantId = null;
+        auth.tenantId = Env.firebase?.tenantId ?? null;
     }
 
     writePendingSignin({ email, provider: effectiveIdp, tenantName });
@@ -205,12 +206,19 @@ export async function startSignIn(
     return { ok: true };
 }
 
-/** Starts a provider sign-in directly, skipping email/tenant resolution and clearing any tenant routing. */
+/** Starts sign-in without email discovery, preserving an explicitly configured tenant. */
 export function startSignInWithoutTenant(provider: ProviderId, redirectTo?: string): void {
     const auth = getFirebaseAuth();
     localStorage.removeItem('tenantName');
-    if (auth.tenantId) auth.tenantId = null;
-    void signInWithRedirect(auth, buildFirebaseProvider(provider, undefined, redirectTo));
+    auth.tenantId = Env.firebase?.tenantId ?? null;
+    void signInWithRedirect(
+        auth,
+        buildFirebaseProvider(
+            Env.firebase?.tenantId ? ((Env.firebase.providerType as ProviderId) ?? 'oidc') : provider,
+            undefined,
+            redirectTo,
+        ),
+    );
 }
 
 export function providerLabel(id: ProviderId): string {

package/src/widgets/markdown/CollaborativeMarkdownRenderer.test.tsx

@@ -412,11 +412,19 @@ describe('collaborative Markdown actions', () => {
         await user.click(screen.getByRole('button', { name: 'Insert component after this block' }));
         await user.click(await screen.findByRole('menuitem', { name: 'Paragraph' }));
 
-        const editor = await screen.findByRole('textbox');
+        // The lazy editor first renders a textarea with the same template text. Wait for
+        // the actual rich-text editor before selecting and pasting into its content.
+        const editor = await waitFor(() => {
+            const textbox = screen.getByRole('textbox');
+            expect(textbox.getAttribute('contenteditable')).toBe('true');
+            expect(textbox.textContent).toBe('Paragraph');
+            return textbox;
+        });
         await user.click(editor);
+        await user.keyboard('{Control>}a{/Control}');
         // Paste in one operation — char-by-char typing races ProseMirror in jsdom and drops chars.
         await user.paste('Inserted paragraph.');
-        await waitFor(() => expect(editor.textContent ?? '').toContain('Inserted paragraph.'));
+        await waitFor(() => expect(editor.textContent).toBe('Inserted paragraph.'));
         fireEvent.click(screen.getByRole('button', { name: 'Send' }));
 
         await waitFor(() => expect(onAction).toHaveBeenCalledTimes(1));
@@ -425,7 +433,7 @@ describe('collaborative Markdown actions', () => {
                 action: 'edit',
                 user_change: {
                     before: 'Original paragraph.',
-                    after: expect.stringMatching(/^Original paragraph\.\n\n.*Inserted paragraph\.$/),
+                    after: 'Original paragraph.\n\nInserted paragraph.',
                 },
             }),
         );