@semiont/react-ui 0.2.45 → 0.3.0

package/src/features/resource-viewer/__tests__/ToastNotifications.test.tsx

@@ -19,7 +19,7 @@ import { render, waitFor, act } from '@testing-library/react';
 import { EventBusProvider, resetEventBusForTesting, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
-import { resourceUri } from '@semiont/core';
+import { resourceId } from '@semiont/core';
 import { useMarkFlow } from '../../../hooks/useMarkFlow';
 import { useYieldFlow } from '../../../hooks/useYieldFlow';
 
@@ -38,7 +38,7 @@ vi.mock('../../../components/Toast', () => ({
 
 describe('Toast Notifications - Verifies Toast Integration', () => {
   let eventBusInstance: any;
-  const rUri = resourceUri('https://example.com/resources/test');
+  const rUri = resourceId('test');
 
   beforeEach(() => {
     resetEventBusForTesting();

package/src/features/resource-viewer/__tests__/YieldFlowIntegration.test.tsx

@@ -27,8 +27,8 @@ import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { useBindFlow } from '../../../hooks/useBindFlow';
 import { SSEClient } from '@semiont/api-client';
-import type { ResourceUri, AnnotationUri } from '@semiont/core';
-import { resourceUri, annotationUri } from '@semiont/core';
+import type { AnnotationId, ResourceId } from '@semiont/core';
+import { resourceId, annotationId } from '@semiont/core';
 import type { Emitter } from 'mitt';
 import type { EventMap } from '@semiont/core';
 
@@ -76,38 +76,17 @@ describe('Generation Flow - Feature Integration', () => {
     vi.restoreAllMocks();
   });
 
-  it('should open modal when yield:modal-open event is emitted', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
-
-    const { emitModalOpen } = renderYieldFlow(
-      testResourceUri
-    );
-
-    // Emit modal open event
-    act(() => {
-      emitModalOpen(testAnnotationUri, testResourceUri, 'Test Reference');
-    });
-
-    // Verify modal state updated
-    await waitFor(() => {
-      expect(screen.getByTestId('modal-open')).toHaveTextContent('true');
-      expect(screen.getByTestId('reference-id')).toHaveTextContent(testAnnotationUri);
-      expect(screen.getByTestId('default-title')).toHaveTextContent('Test Reference');
-    });
-  });
-
   it('should call yieldResourceFromAnnotation exactly ONCE when generation starts', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
+    const testResourceId = resourceId('test-resource');
+    const testAnnotationId = annotationId('test-annotation');
 
     const { emitGenerationStart, getEventBus } = renderYieldFlow(
-      testResourceUri
+      testResourceId
     );
 
     // Trigger generation with full options
     act(() => {
-      emitGenerationStart(testAnnotationUri, testResourceUri, {
+      emitGenerationStart(testAnnotationId, testResourceId, {
         title: 'Generated Document',
         prompt: 'Create a comprehensive document',
         language: 'en',
@@ -125,10 +104,10 @@ describe('Generation Flow - Feature Integration', () => {
       expect(generateResourceSpy).toHaveBeenCalledTimes(1);
     });
 
-    // Verify correct parameters
+    // Verify correct parameters — resourceId and annotationId are now bare IDs
     expect(generateResourceSpy).toHaveBeenCalledWith(
-      testResourceUri,
-      testAnnotationUri,
+      testResourceId,
+      testAnnotationId,
       {
         title: 'Generated Document',
         prompt: 'Create a comprehensive document',
@@ -145,16 +124,16 @@ describe('Generation Flow - Feature Integration', () => {
   });
 
   it('should propagate SSE progress events to useYieldProgress state', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
+    const testResourceId = resourceId('test-resource');
+    const testAnnotationId = annotationId('test-annotation');
 
     const { emitGenerationStart, getEventBus } = renderYieldFlow(
-      testResourceUri
+      testResourceId
     );
 
     // Start generation
     act(() => {
-      emitGenerationStart(testAnnotationUri, testResourceUri, {
+      emitGenerationStart(testAnnotationId, testResourceId, {
         title: 'Test Doc',
         context: { sourceText: 'test' },
       });
@@ -182,16 +161,16 @@ describe('Generation Flow - Feature Integration', () => {
   });
 
   it('should handle multiple progress updates correctly', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
+    const testResourceId = resourceId('test-resource');
+    const testAnnotationId = annotationId('test-annotation');
 
     const { emitGenerationStart, getEventBus } = renderYieldFlow(
-      testResourceUri
+      testResourceId
     );
 
     // Start generation
     act(() => {
-      emitGenerationStart(testAnnotationUri, testResourceUri, {
+      emitGenerationStart(testAnnotationId, testResourceId, {
         title: 'Test',
         context: { sourceText: 'test' },
       });
@@ -231,7 +210,7 @@ describe('Generation Flow - Feature Integration', () => {
     act(() => {
       getEventBus().get('yield:finished').next({
         status: 'complete',
-        referenceId: testAnnotationUri,
+        referenceId: testAnnotationId,
         message: 'Document created successfully',
         percentage: 100,
         resourceName: 'Generated Document',
@@ -245,16 +224,16 @@ describe('Generation Flow - Feature Integration', () => {
   });
 
   it('should show success toast on generation complete', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
+    const testResourceId = resourceId('test-resource');
+    const testAnnotationId = annotationId('test-annotation');
 
     const { emitGenerationStart, getEventBus } = renderYieldFlow(
-      testResourceUri
+      testResourceId
     );
 
     // Start generation
     act(() => {
-      emitGenerationStart(testAnnotationUri, testResourceUri, {
+      emitGenerationStart(testAnnotationId, testResourceId, {
         title: 'Test',
         context: { sourceText: 'test' },
       });
@@ -277,7 +256,7 @@ describe('Generation Flow - Feature Integration', () => {
     act(() => {
       getEventBus().get('yield:finished').next({
         status: 'complete',
-        referenceId: testAnnotationUri,
+        referenceId: testAnnotationId,
         resourceName: 'Generated Document',
         percentage: 100,
       });
@@ -288,16 +267,16 @@ describe('Generation Flow - Feature Integration', () => {
   });
 
   it('should clear progress on generation failure', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
+    const testResourceId = resourceId('test-resource');
+    const testAnnotationId = annotationId('test-annotation');
 
     const { emitGenerationStart, getEventBus } = renderYieldFlow(
-      testResourceUri
+      testResourceId
     );
 
     // Start generation
     act(() => {
-      emitGenerationStart(testAnnotationUri, testResourceUri, {
+      emitGenerationStart(testAnnotationId, testResourceId, {
         title: 'Test',
         context: { sourceText: 'test' },
       });
@@ -328,11 +307,11 @@ describe('Generation Flow - Feature Integration', () => {
   });
 
   it('should only call API once even with multiple event listeners', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
+    const testResourceId = resourceId('test-resource');
+    const testAnnotationId = annotationId('test-annotation');
 
     const { emitGenerationStart, getEventBus } = renderYieldFlow(
-      testResourceUri
+      testResourceId
     );
 
     // Add an additional event listener (simulating multiple subscribers)
@@ -341,7 +320,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Trigger generation
     act(() => {
-      emitGenerationStart(testAnnotationUri, testResourceUri, {
+      emitGenerationStart(testAnnotationId, testResourceId, {
         title: 'Test',
         context: { sourceText: 'test' },
       });
@@ -362,16 +341,16 @@ describe('Generation Flow - Feature Integration', () => {
   });
 
   it('should forward final chunk as progress before emitting complete', async () => {
-    const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
-    const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
+    const testResourceId = resourceId('test-resource');
+    const testAnnotationId = annotationId('test-annotation');
 
     const { emitGenerationStart, getEventBus } = renderYieldFlow(
-      testResourceUri
+      testResourceId
     );
 
     // Start generation
     act(() => {
-      emitGenerationStart(testAnnotationUri, testResourceUri, {
+      emitGenerationStart(testAnnotationId, testResourceId, {
         title: 'Test',
         context: { sourceText: 'test' },
       });
@@ -385,7 +364,7 @@ describe('Generation Flow - Feature Integration', () => {
     act(() => {
       getEventBus().get('yield:finished').next({
         status: 'complete',
-        referenceId: testAnnotationUri,
+        referenceId: testAnnotationId,
         message: 'Document created: My Document',
         resourceName: 'My Document',
         percentage: 100,
@@ -405,7 +384,7 @@ describe('Generation Flow - Feature Integration', () => {
  * Returns methods to interact with the rendered component
  */
 function renderYieldFlow(
-  testResourceUri: ResourceUri
+  testResourceId: ResourceId
 ) {
   let eventBusInstance: Emitter<EventMap>;
 
@@ -414,7 +393,7 @@ function renderYieldFlow(
     eventBusInstance = useEventBus();
 
     // Set up resolution flow (resolve:update-body, resolve:link)
-    useBindFlow(testResourceUri);
+    useBindFlow(testResourceId);
 
     return null;
   }
@@ -422,23 +401,18 @@ function renderYieldFlow(
   // Test harness component that uses the hook
   function YieldFlowTestHarness() {
     const {
+      isGenerating,
       generationProgress,
-      generationModalOpen,
-      generationReferenceId,
-      generationDefaultTitle,
     } = useYieldFlow(
       'en',
-      testResourceUri.split('/resources/')[1] || 'test-resource',
+      testResourceId,
       vi.fn()
     );
 
     return (
       <div>
-        <div data-testid="modal-open">{generationModalOpen ? 'true' : 'false'}</div>
-        <div data-testid="reference-id">{generationReferenceId || 'none'}</div>
-        <div data-testid="default-title">{generationDefaultTitle || 'none'}</div>
         <div data-testid="is-generating">
-          {generationProgress ? 'true' : 'false'}
+          {isGenerating ? 'true' : 'false'}
         </div>
         <div data-testid="progress">
           {generationProgress?.message || 'No progress'}
@@ -459,20 +433,9 @@ function renderYieldFlow(
   );
 
   return {
-    emitModalOpen: (
-      annotationUri: AnnotationUri,
-      resourceUri: ResourceUri,
-      defaultTitle: string
-    ) => {
-      eventBusInstance.get('yield:modal-open').next({
-        annotationUri,
-        resourceUri,
-        defaultTitle,
-      });
-    },
     emitGenerationStart: (
-      annotationUri: AnnotationUri,
-      resourceUri: ResourceUri,
+      aId: AnnotationId,
+      rId: ResourceId,
       options: {
         title: string;
         prompt?: string;
@@ -483,8 +446,8 @@ function renderYieldFlow(
       }
     ) => {
       eventBusInstance.get('yield:request').next({
-        annotationUri,
-        resourceUri,
+        annotationId: aId,
+        resourceId: rId,
         options,
       });
     },

package/src/features/resource-viewer/__tests__/annotation-progress-flow.test.tsx

@@ -180,7 +180,7 @@ describe('Detection Progress Flow Integration (Layer 3)', () => {
     expect(screen.queryByText(/Analyzing/)).not.toBeInTheDocument();
 
     // Click annotate button
-    const annotateButton = screen.getByRole('button', { name: /✨ Annotate/ });
+    const annotateButton = screen.getByRole('button', { name: /✨\s*Annotate/ });
     await user.click(annotateButton);
 
     // Simulate SSE progress chunk #1: Starting
@@ -244,7 +244,7 @@ describe('Detection Progress Flow Integration (Layer 3)', () => {
     renderDetectionFlow();
 
     // Click annotate button
-    const annotateButton = screen.getByRole('button', { name: /✨ Annotate/ });
+    const annotateButton = screen.getByRole('button', { name: /✨\s*Annotate/ });
     await user.click(annotateButton);
 
     // Simulate initial progress
@@ -284,7 +284,7 @@ describe('Detection Progress Flow Integration (Layer 3)', () => {
 
     renderDetectionFlow();
 
-    const annotateButton = screen.getByRole('button', { name: /✨ Annotate/ });
+    const annotateButton = screen.getByRole('button', { name: /✨\s*Annotate/ });
     await user.click(annotateButton);
 
     // Simulate progress with request parameters
@@ -310,7 +310,7 @@ describe('Detection Progress Flow Integration (Layer 3)', () => {
 
     renderDetectionFlow();
 
-    const annotateButton = screen.getByRole('button', { name: /✨ Annotate/ });
+    const annotateButton = screen.getByRole('button', { name: /✨\s*Annotate/ });
     await user.click(annotateButton);
 
     // Show progress