Merge pull request #935 from objectstack-ai/copilot/fix-detail-page-error

Author: hotlong

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

@@ -1,8 +1,9 @@
 /**
- * RecordDetailView — Edit recordId stripping tests
+ * RecordDetailView — recordId handling tests
  *
- * Validates that when editing from the detail page, the objectName prefix
- * is stripped from the URL-based recordId before passing to the onEdit callback.
+ * Validates that the URL-based recordId is passed through as-is to the
+ * findOne API and onEdit callback. The navigation code puts the actual
+ * record._id into the URL, so no prefix stripping is needed.
  *
  * Related: objectstack-ai/objectui — "Record not found" bug
  */
@@ -29,7 +30,7 @@ function createMockDataSource(): DataSource {
         },
       };
     },
-    findOne: vi.fn().mockResolvedValue({ id: '1772350253615-4', name: 'Alice' }),
+    findOne: vi.fn().mockResolvedValue({ id: 'contact-1772350253615-4', name: 'Alice' }),
     find: vi.fn().mockResolvedValue({ data: [] }),
     create: vi.fn().mockResolvedValue({ id: '1' }),
     update: vi.fn().mockResolvedValue({ id: '1' }),
@@ -75,8 +76,8 @@ function renderDetailView(
 
 // ─── Tests ───────────────────────────────────────────────────────────────────
 
-describe('RecordDetailView — onEdit recordId stripping', () => {
-  it('strips objectName prefix from recordId when editing', async () => {
+describe('RecordDetailView — recordId handling', () => {
+  it('passes URL recordId as-is to findOne (with objectName prefix)', async () => {
     const onEdit = vi.fn();
     const ds = createMockDataSource();
 
@@ -87,18 +88,18 @@ describe('RecordDetailView — onEdit recordId stripping', () => {
       expect(screen.getByRole('heading', { level: 1 })).toHaveTextContent('Alice');
     });
 
-    // findOne should be called with the stripped ID (no objectName prefix)
-    expect(ds.findOne).toHaveBeenCalledWith('contact', '1772350253615-4');
+    // findOne should be called with the FULL URL recordId (no stripping)
+    expect(ds.findOne).toHaveBeenCalledWith('contact', 'contact-1772350253615-4');
 
     // Click the Edit button
     const editButton = await screen.findByRole('button', { name: /edit/i });
     await userEvent.click(editButton);
 
-    // The onEdit callback should receive the STRIPPED recordId (no objectName prefix)
+    // The onEdit callback should receive the FULL recordId
     expect(onEdit).toHaveBeenCalledWith(
       expect.objectContaining({
-        id: '1772350253615-4',
-        _id: '1772350253615-4',
+        id: 'contact-1772350253615-4',
+        _id: 'contact-1772350253615-4',
       }),
     );
   });
@@ -113,13 +114,13 @@ describe('RecordDetailView — onEdit recordId stripping', () => {
       expect(screen.getByRole('heading', { level: 1 })).toHaveTextContent('Alice');
     });
 
-    // findOne should be called with the original ID (no prefix to strip)
+    // findOne should be called with the original ID unchanged
     expect(ds.findOne).toHaveBeenCalledWith('contact', 'plain-id-12345');
 
     const editButton = await screen.findByRole('button', { name: /edit/i });
     await userEvent.click(editButton);
 
-    // No prefix to strip — should pass the original recordId unchanged
+    // Should pass the original recordId unchanged
     expect(onEdit).toHaveBeenCalledWith(
       expect.objectContaining({
         id: 'plain-id-12345',

apps/console/src/components/RecordDetailView.tsx

@@ -34,10 +34,10 @@ export function RecordDetailView({ dataSource, objects, onEdit }: RecordDetailVi
   const [recordViewers, setRecordViewers] = useState<PresenceUser[]>([]);
   const objectDef = objects.find((o: any) => o.name === objectName);
 
-  // Strip objectName prefix from URL-based recordId (e.g. "contact-123" → "123")
-  const pureRecordId = recordId && objectName && recordId.startsWith(`${objectName}-`)
-    ? recordId.slice(objectName.length + 1)
-    : recordId;
+  // Use the URL recordId as-is — it contains the actual record _id.
+  // Navigation code passes `record._id || record.id` directly into the URL
+  // without adding any prefix, so no stripping is needed.
+  const pureRecordId = recordId;
 
   const currentUser = user
     ? { id: user.id, name: user.name, avatar: user.image }

packages/plugin-detail/src/DetailView.tsx

@@ -85,9 +85,27 @@ export const DetailView: React.FC<DetailViewProps> = ({
 
     if (dataSource && schema.objectName && schema.resourceId) {
       setLoading(true);
-      dataSource.findOne(schema.objectName, schema.resourceId).then((result) => {
-         setData(result);
-         setLoading(false);
+      const objectName = schema.objectName;
+      const resourceId = schema.resourceId;
+      const prefix = `${objectName}-`;
+
+      dataSource.findOne(objectName, resourceId).then((result) => {
+        if (result) {
+          setData(result);
+          setLoading(false);
+          return;
+        }
+        // Fallback: try alternate ID format for backward compatibility
+        const altId = resourceId.startsWith(prefix)
+          ? resourceId.slice(prefix.length)   // strip prefix
+          : `${prefix}${resourceId}`;          // prepend prefix
+        return dataSource.findOne(objectName, altId).then((fallbackResult) => {
+          setData(fallbackResult);
+          setLoading(false);
+        }).catch(() => {
+          setData(null);
+          setLoading(false);
+        });
       }).catch((err) => {
          console.error('Failed to fetch detail data:', err);
          setLoading(false);