Merge pull request #601 from objectstack-ai/copilot/fix-ci-errors-one-more-time

Author: hotlong

apps/console/src/__tests__/BrowserSimulation.test.tsx

@@ -307,8 +307,12 @@ describe('Console Application Simulation', () => {
             { id: '2', name: 'Item 2', amount: 200 }
         ];
 
+        const originalFind = mocks.MockDataSource.prototype.find;
         const findSpy = vi.spyOn(mocks.MockDataSource.prototype, 'find')
-            .mockResolvedValue({ data: seedData });
+            .mockImplementation(async function (this: any, objectName: string) {
+                if (objectName === 'kitchen_sink') return { data: seedData };
+                return originalFind.call(this, objectName);
+            });
 
         renderApp('/kitchen_sink');
 
@@ -326,6 +330,8 @@ describe('Console Application Simulation', () => {
             expect(screen.getByText('Item 1')).toBeInTheDocument();
         }, { timeout: 5000 });
         expect(screen.getByText('Item 2')).toBeInTheDocument();
+
+        findSpy.mockRestore();
     });
 
 });
@@ -728,7 +734,7 @@ describe('Kanban Integration', () => {
             data: initialData 
         } as any);
 
-        vi.spyOn(mocks.MockDataSource.prototype, 'getObjectSchema').mockResolvedValue({
+        const schemaSpy = vi.spyOn(mocks.MockDataSource.prototype, 'getObjectSchema').mockResolvedValue({
             name: 'project_task',
             fields: {
                 title: { type: 'text', label: 'Title' },
@@ -772,6 +778,10 @@ describe('Kanban Integration', () => {
         // For now, we verify the component can handle the initial load
         // and that data source was called correctly
         expect(findSpy).toHaveBeenCalledWith('project_task', expect.any(Object));
+
+        // Restore spies to avoid affecting subsequent tests
+        findSpy.mockRestore();
+        schemaSpy.mockRestore();
     });
 });
 
@@ -828,23 +838,23 @@ describe('Dashboard Integration', () => {
     };
 
     it('Scenario A: Dashboard Page Rendering', async () => {
-        renderApp('/dashboard/showcase_dashboard');
+        renderApp('/dashboard/crm_dashboard');
 
         await waitFor(() => {
-            expect(screen.getByText(/Platform Showcase/i)).toBeInTheDocument();
-        });
+            expect(screen.getByText(/CRM Overview/i)).toBeInTheDocument();
+        }, { timeout: 10000 });
 
-        expect(screen.getByText(/Records by Category/i)).toBeInTheDocument();
+        expect(screen.getByText(/Revenue Trends/i)).toBeInTheDocument();
     });
 
     it('Scenario B: Help Page Rendering', async () => {
-        renderApp('/page/showcase_help');
+        renderApp('/page/crm_help');
 
         await waitFor(() => {
-            expect(screen.getByText(/Platform Showcase/i)).toBeInTheDocument();
-        });
+            expect(screen.getByText(/CRM Help Guide/i)).toBeInTheDocument();
+        }, { timeout: 10000 });
 
-        expect(screen.getByText(/Supported Field Types/i)).toBeInTheDocument();
+        expect(screen.getByText(/Keyboard Shortcuts/i)).toBeInTheDocument();
     });
 
     it('Scenario C: Component Registry Check', async () => {

apps/console/src/__tests__/SystemPages.test.tsx

@@ -130,7 +130,7 @@ describe('AuditLogPage', () => {
     });
     wrap(<AuditLogPage />);
     await waitFor(() => {
-      expect(mockFind).toHaveBeenCalledWith('sys_audit_log', expect.objectContaining({ $orderby: 'createdAt desc' }));
+      expect(mockFind).toHaveBeenCalledWith('sys_audit_log', expect.objectContaining({ $orderby: { createdAt: 'desc' } }));
     });
     expect(screen.getByText('create')).toBeInTheDocument();
   });

apps/console/src/components/AppHeader.tsx

@@ -64,10 +64,22 @@ export function AppHeader({ appName, objects, connectionState, presenceUsers, ac
       try {
         const [presenceResult, activityResult] = await Promise.all([
           dataSource.find('sys_presence').catch(() => ({ data: [] })),
-          dataSource.find('sys_activity', { $orderby: 'timestamp desc', $top: 20 }).catch(() => ({ data: [] })),
+          dataSource.find('sys_activity', { $orderby: { timestamp: 'desc' }, $top: 20 }).catch(() => ({ data: [] })),
         ]);
-        if (presenceResult.data?.length) setApiPresenceUsers(presenceResult.data);
-        if (activityResult.data?.length) setApiActivities(activityResult.data);
+        if (presenceResult.data?.length) {
+          const data = presenceResult.data as Record<string, unknown>[];
+          const users = data.filter(
+            (u): u is PresenceUser & Record<string, unknown> => typeof u.userId === 'string'
+          );
+          if (users.length) setApiPresenceUsers(users);
+        }
+        if (activityResult.data?.length) {
+          const data = activityResult.data as Record<string, unknown>[];
+          const items = data.filter(
+            (a): a is ActivityItem & Record<string, unknown> => typeof a.type === 'string'
+          );
+          if (items.length) setApiActivities(items);
+        }
       } catch {
         // Fallback to defaults handled below
       }

apps/console/src/pages/system/AuditLogPage.tsx

@@ -25,7 +25,7 @@ export function AuditLogPage() {
     if (!dataSource) return;
     setLoading(true);
     try {
-      const result = await dataSource.find('sys_audit_log', { $orderby: 'createdAt desc' });
+      const result = await dataSource.find('sys_audit_log', { $orderby: { createdAt: 'desc' } });
       setRecords(result.data || []);
     } catch {
       toast.error('Failed to load audit logs');

packages/plugin-detail/src/RelationshipGraph.tsx

@@ -92,7 +92,7 @@ function computeLayout(
   // Level 2+: related records of related records
   if (levels >= 2) {
     const ringRadius2 = Math.min(width, height) * 0.46;
-    let level2Nodes: { node: GraphNode; parentX: number; parentY: number; parentId: string }[] = [];
+    const level2Nodes: { node: GraphNode; parentX: number; parentY: number; parentId: string }[] = [];
 
     level1Nodes.forEach((parentNode) => {
       const parentLayoutNode = nodes.find((n) => n.id === parentNode.id);

packages/plugin-grid/src/useGroupReorder.ts

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { useState, useCallback, useMemo } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 
 export interface UseGroupReorderOptions {
   /** Initial ordered list of group keys. */
@@ -43,7 +43,7 @@ export function useGroupReorder({ groupKeys }: UseGroupReorderOptions): UseGroup
   const [draggingKey, setDraggingKey] = useState<string | null>(null);
 
   // Keep internal order in sync when the source list changes (new groups added/removed).
-  useMemo(() => {
+  useEffect(() => {
     setOrder((prev) => {
       const prevSet = new Set(prev);
       const nextSet = new Set(groupKeys);